Bump to 1.22.5, fixes #192840. Thanks to Ian Stakenvicius for the updated ebuild

Package-Manager: portage-2.2_rc43/cvs/Linux x86_64

5 files changed, 146 insertions, 6 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index f3e2845e3d6b..325d7ecfbf84 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/freewrl
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.17 2007/07/22 10:02:16 dberkholz Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.18 2009/10/05 15:42:05 patrick Exp $
+
+*freewrl-1.22.5 (05 Oct 2009)
+
+  05 Oct 2009; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.5.ebuild,
+  metadata.xml:
+  Bump to 1.22.5, fixes #192840. Thanks to Ian Stakenvicius for the updated
+  ebuild
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   freewrl-1.16.1.ebuild, freewrl-1.18.10.ebuild, freewrl-1.18.14.ebuild,
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 1b6598c7fd30..e832ec2fd153 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -6,9 +6,11 @@ DIST freewrl-1.16.1.tar.gz 3333751 RMD160 96643006d28a0aa54222829140fed41446d21a
 DIST freewrl-1.18.10.tar.gz 3581122 RMD160 db3f699ae96104ed347a7ffbb615c1e90600457f SHA1 e6912e36da1c27753284c03c7fcc37b67827a436 SHA256 7d6dd3ca3f39605b7703736d168e3d99231a3ccf9f199ae6a459adc82463f35e
 DIST freewrl-1.18.14.tar.gz 3515019 RMD160 cc5a2b17a06cca79002476c81b34c72585ad078f SHA1 90a14ad4387209590bdfadf4b4af5e25e8bfe180 SHA256 fa12172675ca6c309a10545b23c5cab01a236f37613635bf0f26ae666d56323e
 DIST freewrl-1.19.1.tar.gz 3526871 RMD160 d2e0c6d12161201d08e6e6f4295315275fed36f6 SHA1 d1e02005eafbdb042142553778fb812c1c7bd5d7 SHA256 01e9b25f403a7996442cdcb307e8edbdb85c909d0de711e949589f49cdaceac3
+DIST freewrl-1.22.5.tar.bz2 1218770 RMD160 a4794e37cfcce753231b58ea9a315ae49c17ac70 SHA1 0dc99ae6cd750ebbbcfb412ce89fee4e7291b023 SHA256 0d00214d908ca2c4d618490c5364837cb100a50f21106b32627879005a270df8
 EBUILD freewrl-1.16.1.ebuild 1667 RMD160 a76bff77d8cdef26023977d2018e2ec10683cc37 SHA1 a8b36bd26c29a983ec9ce3fe4c804376c2cacf77 SHA256 1b39f53d2f93c06529e4861f45aafa4411a2b865fac6153a8b0926fb73bd0ef0
 EBUILD freewrl-1.18.10.ebuild 1743 RMD160 85d71dd90726f127f75443b8fc291cac5890a755 SHA1 24dac15f2b8c4e951f1b6b47bc25afaec3147c1b SHA256 fa82d62cac6afd8e2d9782557a9629c671092c5813514924f5d727acb28c66ae
 EBUILD freewrl-1.18.14.ebuild 1705 RMD160 b6d88f90f0435025b60fe846795473cd531a58e1 SHA1 55d5a15dfc60eec0505cb27e64da589e8ae7efe7 SHA256 6fe5f137f4232decd6ff60ede45dccb58538a7157dff198c1e9e539093db3b5d
 EBUILD freewrl-1.19.1.ebuild 1704 RMD160 01a3a602412e3d7c0a847aae2bf9ee1caafea6ef SHA1 f93b15527fe5af15f8c8a76fe16a3c79e081aa55 SHA256 9d7b6fc20f5f906854c960daf2658be78a3106bbfdd04e7404cf11b6a71207a5
-MISC ChangeLog 2532 RMD160 d87d89a9dc5476381eb30505b7e7e4d45ae4efba SHA1 6d3dda93285d7b5740fa6a5ae468789c6de4741f SHA256 4aa69936c0f936a6fac106907203bf9e61332e961db1a530d1f3a284be4b30b3
-MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
+EBUILD freewrl-1.22.5.ebuild 3982 RMD160 43999a1fcbfee78be7ecdfc7c3a8f94076932db2 SHA1 16d9301dbcdafa00d44a0cc896f0764e995f85f8 SHA256 5406cf6b43d37c391f7fb23c5fc8fb6f3c5ca1ffe222f6bdcddea89621942a61
+MISC ChangeLog 2737 RMD160 73921c648bcb734bb5993a2b7ab5c754fe0ab148 SHA1 edd16fe78c2614728cf4d0f564d070c03cf98580 SHA256 5dbfa666ab026191bebe1c79aee083df43b651b2ee0e4044b56f8645570fddbe
+MISC metadata.xml 350 RMD160 81ba49d6172e3886bd035a45540e4d3e94711a64 SHA1 ebfd9ecd654dddb74b4b8b4d69e46ae700c4a899 SHA256 cb1acc9c7446e4a76cf716ed00a86f074bb71a7088ac0a9cd3c8ad330443c438
diff --git a/media-gfx/freewrl/freewrl-1.22.5.ebuild b/media-gfx/freewrl/freewrl-1.22.5.ebuild
new file mode 100644
index 000000000000..b2b0a96c45bc
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-1.22.5.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.5.ebuild,v 1.1 2009/10/05 15:42:05 patrick Exp $
+
+EAPI="2"
+
+inherit nsplugins eutils flag-o-matic
+
+DESCRIPTION="VRML2 and X3D compliant browser"
+SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
+HOMEPAGE="http://freewrl.sourceforge.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug libeai +motif nsplugin +sox spidermonkey static +xulrunner"
+
+COMMONDEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libX11
+	motif? ( x11-libs/openmotif )
+	media-libs/mesa
+	media-libs/glew
+	virtual/opengl
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/imlib2
+	>=media-libs/freetype-2
+	curl? ( net-misc/curl )
+	xulrunner? ( net-libs/xulrunner )
+	!xulrunner? (
+		spidermonkey? ( dev-lang/spidermonkey )
+		!spidermonkey? ( || (
+			=www-client/mozilla-firefox-3*[-xulrunner]
+			=www-client/mozilla-firefox-2*
+		) )
+	)
+	nsplugin? ( || ( xulrunner? ( net-libs/xulrunner )
+		>=www-client/mozilla-firefox-2.0 ) )"
+DEPEND="${COMMONDEPEND}
+	>=dev-util/pkgconfig-0.22"
+RDEPEND="${COMMONDEPEND}
+	media-fonts/ttf-bitstream-vera
+	media-gfx/imagemagick
+	app-arch/unzip
+	sox? ( media-sound/sox )"
+
+pkg_setup() {
+	if use xulrunner && use spidermonkey; then
+		eerror "Please choose only one of xulrunner or spidermonkey."
+		die "Cannot USE both spidermonkey and xulrunner"
+	fi
+}
+
+src_configure() {
+	local myconf="--with-fontsdir=/usr/share/fonts/ttf-bitstream-vera
+		--with-imageconvert=/usr/bin/convert
+		--with-unzip=/usr/bin/unzip"
+	if use motif; then
+		myconf="${myconf} --with-x --with-target=motif"
+	else
+		myconf="${myconf} --with-x --with-target=x11"
+	fi
+	if use nsplugin; then
+		myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
+	fi
+	if use sox; then
+		myconf="${myconf} --with-soundconv=/usr/bin/sox"
+	fi
+	if use xulrunner; then
+		if has_version net-libs/xulrunner:1.9 ; then
+			# fix missing library path to xulrunner-1.9 libraries
+			append-ldflags "-R/usr/$(get_libdir)/xulrunner-1.9/lib"
+		fi
+	elif use spidermonkey; then
+		# disable the checks for other js libs, in case they are installed
+		myconf="${myconf} --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js --disable-seamonkey-js"
+		# spidermonkey has no pkg-config, so override ./configure
+		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
+		JAVASCRIPT_ENGINE_LIBS="-ljs"
+		if has_version dev-lang/spidermonkey[threadsafe] ; then
+			JAVASCRIPT_ENGINE_CFLAGS="${JAVASCRIPT_ENGINE_CFLAGS} -DJS_THREADSAFE $(pkg-config --cflags nspr)"
+			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
+		fi
+		export JAVASCRIPT_ENGINE_CFLAGS
+		export JAVASCRIPT_ENGINE_LIBS
+	else
+		# disable checks for xulrunner libs, in case they are installed
+		myconf="${myconf} --disable-mozilla-js --disable-xulrunner-js"
+		# not using xulrunner, so ./configure grabs js directly from firefox/mozilla/thunderbird/wherever
+		if has_version =www-client/mozilla-firefox-3* ; then
+			# override ./configure for firefox-3 as pkg-config doesn't detect the right settings
+			export MOZILLA_PLUGIN_CFLAGS="-I/usr/include/mozilla-firefox/stable $(pkg-config --cflags nspr)"
+			export MOZILLA_PLUGIN_LIBS=" "
+			export JAVASCRIPT_ENGINE_CFLAGS="-DXP_UNIX -DJS_THREADSAFE -DMOZILLA_JS_UNSTABLE_INCLUDES ${MOZILLA_PLUGIN_CFLAGS}"
+			export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -L/usr/$(get_libdir)/mozilla-firefox -lmozjs"
+			append-ldflags "-R/usr/$(get_libdir)/mozilla-firefox"
+		fi
+	fi
+	econf	${myconf} \
+		$(use_enable curl libcurl) \
+		$(use_enable debug) \
+		$(use_enable libeai) \
+		$(use_enable nsplugin plugin) \
+		$(use_enable static) \
+		$(use_enable sox sound)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# remove unneeded .la files (as per Flameeyes' rant)
+	cd "${D}"
+	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
+}
diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
index efa54454de71..71c55eb381d6 100644
--- a/media-gfx/freewrl/metadata.xml
+++ b/media-gfx/freewrl/metadata.xml
@@ -3,4 +3,9 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer><email>hanno@gentoo.org</email></maintainer>
+<use> 
+	<flag name='libeai'>Build EAI C library</flag>
+	<flag name='spidermonkey'>Use spidermonkey instead of Firefox</flag>
+</use>
+
 </pkgmetadata>
diff --git a/media-gfx/wally/Manifest b/media-gfx/wally/Manifest
index 98ca1094d03d..3a4cdf9d0f81 100644
--- a/media-gfx/wally/Manifest
+++ b/media-gfx/wally/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX disable_popup.patch 586 RMD160 0cb29c31a0c6533cce50ed5fce2bb008fb330936 SHA1 89afb0b380a74a467fafe3e988e842130da99a6a SHA256 6faee25c30bf75b51fbbc3b04fab4da6050830148120095b0065827b317244ff
 DIST wally-2.0.1.tar.gz 591973 RMD160 a70537e4b7ed8fbb2e7ca6ef6b402504d912e502 SHA1 56014784c14c3464ef32a60ffa8193696b6502db SHA256 14885d50f46eb07f9d232b4065bb8618274c24fd0d9ebcaec541f9a5f55e4bc5
 DIST wally-2.0.3.tar.gz 639339 RMD160 03c1424181849e125500cae90a76aef323906300 SHA1 2a1132d79b11541d682bbec88eb68f3ef1fc129e SHA256 00fc3ea2afc0dd791d5b0260225e53e47a3491e4c6fe9a91a954e11ffd9dac79
 EBUILD wally-2.0.1.ebuild 720 RMD160 c99de7d3a6996c17585441fab5ba2cee3a329dd4 SHA1 3606ae3411599795fd94c662d38cbf0f8f1ef3fd SHA256 31d818b76c68fe52ff065c8bb7763a58d7be00350a76748067bba0429c7c443f
-EBUILD wally-2.0.3.ebuild 1177 RMD160 bebaebb0f8ebc11c80828b2209147db10121170c SHA1 4876ea2d86d5599301c1be21a9d0fd82ecbdbc03 SHA256 94c6c864211f950a66c0ecdc3506da05212256944764fc40fe1c0e4f44c67c14
-MISC ChangeLog 2458 RMD160 08f86f6ec0fafe70dfc89197c7f6263a1d26ccde SHA1 f45388f5d0762f997e41a9545daefef23fe5747a SHA256 d6966141e733c0061b80fc9f9c2cbeb8e37b6424e2285251e114cedd51bc53e0
+EBUILD wally-2.0.3.ebuild 1190 RMD160 6c1f2fa5b25f49604ac461ec32ce421038804ca4 SHA1 3775448648bc03252454eb153803294cc5c502ed SHA256 ae30ecf73d0f59efdaeaf1481beb7904aafc64b49c1f656a6753daef31bdc838
+MISC ChangeLog 2636 RMD160 b51dbae8d8e29317a3ad855f161a3f05b3b79abf SHA1 aaf13e8a5ef2f2f7642334793df50f35e3a6902c SHA256 b15c3e0dfb0163b9e572c36523ef326bfdf4c1cdcd3d161fc38dc42548a497c8
 MISC metadata.xml 260 RMD160 c11322cb6bc216e2428f91054488c358f04cc829 SHA1 b1c62bc34df6401eb72e9fceb10e5210e0399bbf SHA256 6bee883bb3b105ca14d1affe8ec193d911ebe1b78c341cf7a2aacec75955b5bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrKFNMACgkQjDdoMVfcAHgQIwCgzSlgsF0ax1mFkoGd8ZNC+Het
+WugAn3S7SaQ2QkeG40mIZBG7/H4dRqGp
+=br8/
+-----END PGP SIGNATURE-----