fixed configuration error when building against spidermonkeys older than 1.8.5; migrated live ebuild to new git upstream repo

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

5 files changed, 27 insertions, 27 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index adeb24d9132c..3af3c47c9d6f 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/freewrl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.53 2013/12/23 16:20:49 axs Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.54 2014/03/12 14:24:13 axs Exp $
+
+  12 Mar 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  freewrl-1.22.13-r1.ebuild, freewrl-1.22.13-r3.ebuild, freewrl-9999.ebuild:
+  fixed configuration error when building against spidermonkeys older than
+  1.8.5; migrated live ebuild to new git upstream repo
 
 *freewrl-1.22.13-r3 (23 Dec 2013)
 
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 22456baaa358..4ecee628eb56 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -5,15 +5,15 @@ AUX freewrl-1.22.13-desktop.patch 350 SHA256 09176fe7ef22d8d0a2381bfb70edbacc999
 AUX freewrl-1.22.13-fontconfig-match.patch 666 SHA256 81ad402685aac3746a1d3fefe3ce77e46f0d7521e721d02f6ceb2fa60b9501c5 SHA512 8f92238be4568bea9959ffd9ac81920633340e583d175e6a35add48edbaa41aa937aa9d7494261e2edf83bbdfeadbfe597b5881c3dbf2ef9e9bf2f3ce4a508f5 WHIRLPOOL 991306f3174466a7505a85592db0b6196f0f55fe4d5b0cb70b72b20c101d7f637b4dac34c2fd9c6b5e627c7c88ccdfc8db4a2b91b863271699fd75d130b4c0b0
 AUX freewrl-1.22.13-mozjs187-config.patch 486 SHA256 340a489d70b1e0d450b779f35686f09c1a50ba62cd8de5bb34340dec8c5ad561 SHA512 69985ba98ca8c12e59b6aba2fda004931778f138dfd90a45fd9a65027961401f6a377bfbc55f9fb2614ada5ac291922809dc87ea8ad7bdf93bdc78ddb3c3b298 WHIRLPOOL f54fb2c381f9fcd0c284898d49c9fd10e0210ade9399a47f241c4657d0c0e6f00edcfb1c3624164ad884562a1eea905f4a59b64979d4110ba3404430eef10e67
 DIST freewrl-1.22.13.1.tar.bz2 1830305 SHA256 29069d63604dbbfde0f684f342f34e9d0eb216a026f83317a00fbdd31ece17e8 SHA512 6e751835a256ce08d4099e5301c0702e28e5cae2e77d8a51ab38f6f0c08680f22a9ef25ef9d2bb860680fc8c1fc22cfebf14cfb14b50ee514b5ef76e71ab1192 WHIRLPOOL 58d301f4f3c1d145b041bb626c8af18954d9cd3da88f348d2341928c2ff050b15e077855b1ef5a2fe18b2218b8d2f8a75e229ca5bf5d683c0c98e4ed132f71cd
-EBUILD freewrl-1.22.13-r1.ebuild 4484 SHA256 30a6a5334ea57c14e4338987ba1700be6258b019ec0c8dddfbb418346dca53bf SHA512 04314af88ce9f656bd3fb655cc63ba6fe7828bf610d8c91fdf11a0c76faab9bcd8d0936ff915f716ba36b97865a5a9cbd32697615150f3249962603ef660c98a WHIRLPOOL b6f8b255d6c3b19d33f4743b3c1825f562245df3f6998e538e6fd1ae259933a0c7a131add833c8f0c10a4988899d05d79cdb3e19e10889f75b6ea71252ac1449
-EBUILD freewrl-1.22.13-r3.ebuild 4526 SHA256 693dff5797fb73fbc1fee26f75be741ad6ccdccbbd147aaecabbbfe50c41211e SHA512 3da6115aa105d3eab3c0de5fa6a2cb17bed70b72171868cc59c971d53ddbe3911a553942e3502e5534d6165918245e81a1ccb57277a91635d5b62acf94dd8a2c WHIRLPOOL ca349ae431c2061dde894a334f3b6fcb4176c5f4ec769c9b0d8bc8c0bb5e3b4c8bdf51c2a6add4ede4e2e19ad8f7fc123af5d783c73aacc5a4d3cfc4bb52d69a
-EBUILD freewrl-9999.ebuild 4766 SHA256 de3abfdc53179406b38dc977aaec9021873fe6fa11a408a6f3b8f081b057c28f SHA512 c42fbd14d951ed364ce29487abef6b03fba4e1b401f3071339ecf62cc076b25c5fa373e65e38a036cde16bc0bcf8b243d20302c0f23391722b33f69c9b594a3e WHIRLPOOL fed3edb8866ef868a7785a55b08e6bad46f06bd8277f76dba45990a1edcf6d95de9f483fdf648cb44c857ea5f9e8dfb131eab302aed6cad888e0ab512ecd7c3a
-MISC ChangeLog 8329 SHA256 bc2064b96d0ce58050ac9368cae9c23b503155f9bf4d1efdc79f4486e8d70831 SHA512 e94abf921d19153f01b85758da547e7ce84d146ac12054f9d6c576f20305b45d96b094823aba43a44bba922db80c0350c71c33fe2a090d73791fcdd1cc212ef6 WHIRLPOOL 6222756ca7c32f6f917bf9e516a46bcc7b6ff1499cded1fd8de4f0bd8ef8a6ff4a00b458820f2ac069a64fc3632bdfaae285e3b5ac122d9d10cb4e6f6784175b
+EBUILD freewrl-1.22.13-r1.ebuild 4488 SHA256 711052b9f7615edb8d6bb1cb0f06a5e66f5e78bc5c3cb81a02cf44218b7786bb SHA512 244bf3695e7fa3f1e0e8c721e2ac5da2ee4c4d67330afddabbde69dbb2ccd873c69f7acc48603235624ff580c44eca8a41cfab44ddff2a26be00accd6de6a2ce WHIRLPOOL 68d860744ce5b28871044435e0a60259714481705461e6bbcd8751fa9364e9f69a9ac7ac88edf9a2d8b0a5a8e40c288a1e5234c58a8f9717642fcbc4b3d279f3
+EBUILD freewrl-1.22.13-r3.ebuild 4530 SHA256 12befc9dfc53446c6d7cb6d799d9d841c88be293fd23f866c032d5f019857b2c SHA512 4089f72849f2f6b049a53f4060c53db2dd46665011fceb25a53048649dc2bf26d9b1fc87a98b9106623d54449472c6dd67deb7a1272a3751d9f153ce83b139fb WHIRLPOOL 23564a5be5605908cd3143df7f0b5eae55d28cd519b9ba83a26cc004d28f14d691bace8d0e1ab08ce953dd215edda606e3b1047c3566daadc83eb2caaaa18e19
+EBUILD freewrl-9999.ebuild 4618 SHA256 84353243fdd8e8fd8d9f2b1bfaf54954a7c9beb0d47a5f4b0d56dece7703e516 SHA512 f62dfa733d8aa3d03d3b5ea87bff050b1e590fbce1d8fbd3e487958ee03a7cd6dabb5496c3e0c2eca405251c8075c0561a4b9011c9f040805d83c84120fe574f WHIRLPOOL 4637496d32923f39262979f1d59299f5247e9fd744e43105a4680764b00975dc243785929706f2cf2250ebb84970c7fdc966abf1b2f2f8792407d15cf9856a87
+MISC ChangeLog 8594 SHA256 252a2ad3deed7e56efecf801838f743fe59c5ff81764f6e81078543434e59e7f SHA512 0686ec57d4d8672f82ca7a308498b58d91f2071b16972230dc630255796f531d3ba9eb6ca9ca07d774befad90ea432fb87cbdc737f0f6e88b298ac7d5141df2a WHIRLPOOL e3cedb783a8d79e2e4b543d88f4787e671c0a1bbdf537d4e2749dcd985911fc64361b9e318fb748f4a8e07e25df683c67ea24606bdcb88e70fb36042064c778f
 MISC metadata.xml 547 SHA256 7d745ed3fa96fd3febcb5f3f9891b87c29a8c24ac7614840c6f7a378b20feb37 SHA512 0aaab59986ebcf9e64ef7ae5e1ff32e7e3a07de5e095245a1e2b1676c85f5e23f32a56da37f60dfb3cc6ba1c2f1837d792c2fc8ee9c5418f89c04d30345df877 WHIRLPOOL 8decb4e0059bb3075e79ad43e39640b1d28daebad84157f47320bb23f426dcba9ad062d262466b320e240c933999411c6e822b0a740eb93d2c363d2e304608b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlK4YuMACgkQ2ugaI38ACPDEjgD+KEysMbXvcutIk3cdW0HUkRUu
-BWmZWfZnbWlrRp//m/oA/jhyoQx/tOt1gDE4Jj8QJmegsLg1Wq8l44L+63vEeggb
-=CJbr
+iF4EAREIAAYFAlMgbhwACgkQ2ugaI38ACPD57QEAnzDaEfQjiFypUboTtXeEGMqP
+GNLIIHTHPQbIwGCYtBsA/ivrE+TmSSjpCtiJwugOd9TZrvroL80RZfdF3xFB8nEL
+=0/ty
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/freewrl/freewrl-1.22.13-r1.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r1.ebuild
index 775baa51456e..31493c559590 100644
--- a/media-gfx/freewrl/freewrl-1.22.13-r1.ebuild
+++ b/media-gfx/freewrl/freewrl-1.22.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r1.ebuild,v 1.4 2013/08/09 13:42:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r1.ebuild,v 1.5 2014/03/12 14:24:13 axs Exp $
 
 EAPI=4
 
@@ -71,7 +71,7 @@ src_configure() {
 		myconf+=" --with-soundconv=/usr/bin/sox"
 	fi
 	# disable the checks for other js libs, in case they are installed
-	if has_version ">=dev-lang/spidermonkey-1.8.5" ; then
+	if has_version ">=dev-lang/spidermonkey-1.8.5:0" ; then
 		# spidermonkey-1.8.5 provides a .pc to pkg-config, it should be findable via mozjs185
 		for x in mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js; do
 			myconf+=" --disable-${x}"
@@ -82,7 +82,7 @@ src_configure() {
 		done
 		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
 		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-		if has_version ">=dev-lang/spidermonkey-1.8" ; then
+		if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
 			# spidermonkey-1.8 changed the name of the lib
 			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
 		else
diff --git a/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
index f82a52194771..20753e0a8f87 100644
--- a/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
+++ b/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild,v 1.1 2013/12/23 16:20:49 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild,v 1.2 2014/03/12 14:24:13 axs Exp $
 
 EAPI=5
 
@@ -72,7 +72,7 @@ src_configure() {
 		myconf+=" --with-soundconv=/usr/bin/sox"
 	fi
 	# disable the checks for other js libs, in case they are installed
-	if has_version ">=dev-lang/spidermonkey-1.8.5" ; then
+	if has_version ">=dev-lang/spidermonkey-1.8.5:0" ; then
 		# spidermonkey-1.8.5 provides a .pc to pkg-config, it should be findable via mozjs185
 		for x in mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js; do
 			myconf+=" --disable-${x}"
@@ -83,7 +83,7 @@ src_configure() {
 		done
 		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
 		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-		if has_version ">=dev-lang/spidermonkey-1.8" ; then
+		if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
 			# spidermonkey-1.8 changed the name of the lib
 			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
 		else
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
index 63e8c0753f69..8e7be2e3d8f8 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -1,20 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild,v 1.3 2013/12/23 16:20:49 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild,v 1.4 2014/03/12 14:24:13 axs Exp $
 
 EAPI=5
 
 inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
 
 if [[ ${PV} == "9999" ]]; then
-	inherit cvs
-	ECVS_SERVER="freewrl.cvs.sourceforge.net:/cvsroot/freewrl/"
-	ECVS_USER="anonymous"
-	ECVS_PASS=""
-	ECVS_AUTH="pserver"
-	ECVS_MODULE="freewrl/freex3d"
-	ECVS_TOP_DIR="${DISTDIR}/cvs-src/freewrl/freex3d"
-	S="${WORKDIR}/freewrl/freex3d"
+	inherit git-r3
+	EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
+	S="${WORKDIR}/${P}/freex3d"
 	SRC_URI=
 	KEYWORDS=
 else