[gentoo-commits] repo/gentoo:master commit in: media-gfx/freewrl/

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     799c4248b68c0071380826d5533dd84ee6581f44
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 22:28:37 2017 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 22:31:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=799c4248

media-gfx/freewrl-9999: changed upstream code branch, added deps and config for RBP

Package-Manager: portage-2.3.0

 media-gfx/freewrl/freewrl-9999.ebuild | 13 ++++++++-----
 media-gfx/freewrl/metadata.xml        |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
index b2efb48..a25bdd1 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,6 +9,7 @@ inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
+	EGIT_BRANCH="develop"
 	S="${WORKDIR}/${P}/freex3d"
 	SRC_URI=
 	KEYWORDS=
@@ -21,7 +22,7 @@ DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
 HOMEPAGE="http://freewrl.sourceforge.net/"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
+IUSE="curl debug java libeai motif +nsplugin opencl osc rbp +sox static-libs"
 
 COMMONDEPEND="x11-libs/libICE
 	x11-libs/libSM
@@ -44,6 +45,7 @@ COMMONDEPEND="x11-libs/libICE
 	curl? ( net-misc/curl )
 	osc? ( media-libs/liblo )
 	opencl? ( virtual/opencl )
+	rbp? ( dev-games/ode:0=[double-precision] )
 	dev-lang/spidermonkey:0="
 DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
@@ -64,7 +66,7 @@ src_prepare() {
 
 src_configure() {
 	# list of js libs without .pc support, to disable ./configure auto-checking
-	local spidermonkeys=( mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js )
+	local spidermonkeys=( mozilla-js )
 	# list of .pc supported spidermonkeys, to disable ./configure auto-checking
 	local spidermonkeys_pc=( mozjs187 mozjs185 )
 
@@ -73,10 +75,10 @@ src_configure() {
 		--with-x
 		--with-imageconvert=/usr/bin/convert
 		--with-unzip=/usr/bin/unzip
-		--disable-mozjs-17.0
+		--with-javascript=spidermonkey
 		${spidermonkeys[@]/#/ --disable-}"
 
-	if has_version "<dev-lang/spidermonkey-1.8.5" ; then
+	if has_version "<dev-lang/spidermonkey-1.8.5:0" ; then
 		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
 		myconf+="${spidermonkeys_pc[@]/#/ --disable-}"
 		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
@@ -105,6 +107,7 @@ src_configure() {
 		$(use_enable java) \
 		$(use_enable nsplugin plugin) \
 		$(use_enable osc) \
+		$(use_enable rbp) \
 		$(use_enable static-libs static) \
 		$(use_enable sox sound) \
 		$(usex sox "--with-soundconv=/usr/bin/sox") \

diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
index 7c9a304..21fdcd5 100644
--- a/media-gfx/freewrl/metadata.xml
+++ b/media-gfx/freewrl/metadata.xml
@@ -18,6 +18,7 @@ Cubes; the list goes on and on.  With royalty free open standards, your models w
 		<flag name="libeai">Build EAI C library</flag>
 		<flag name="opencl">Enable OpenCL support</flag>
 		<flag name="osc">Allows for OSC-based control and communication between multiple freewrl instances</flag>
+		<flag name="rbp">Enable support for Rigid Body Physics</flag>
 		<flag name="java">Build and install java EAI/SAI support library</flag>
 	</use>
 	<upstream>