Bump

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

3 files changed, 126 insertions, 3 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index da3a72188b64..d62cc8f2287a 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/freewrl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.19 2009/10/05 19:59:33 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.20 2010/01/07 16:58:21 patrick Exp $
+
+*freewrl-1.22.6 (07 Jan 2010)
+
+  07 Jan 2010; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.6.ebuild:
+  Bump
 
   05 Oct 2009; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Taking over package from hanno with ian as proxy maintainer
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 02be908f516a..75e44bfd08bf 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -7,10 +7,12 @@ DIST freewrl-1.18.10.tar.gz 3581122 RMD160 db3f699ae96104ed347a7ffbb615c1e906004
 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
+DIST freewrl-1.22.6.tar.bz2 1705519 RMD160 82810cbb09e4325ebcdc577edef8c70ae53ac11c SHA1 431a73b94bbbdacfa201b59bc8dc61c1bdb8d16c SHA256 25d60ffd8231eddcbff7343bdd62f94c7419a5adeaad59da5118a5be1e9d9afb
 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
 EBUILD freewrl-1.22.5.ebuild 3982 RMD160 43999a1fcbfee78be7ecdfc7c3a8f94076932db2 SHA1 16d9301dbcdafa00d44a0cc896f0764e995f85f8 SHA256 5406cf6b43d37c391f7fb23c5fc8fb6f3c5ca1ffe222f6bdcddea89621942a61
-MISC ChangeLog 2864 RMD160 8717df0cf96e7dc8bae0e7ceba84b58a62c9e606 SHA1 9b88d2096457215ae4f0359853df6ec4c08477b2 SHA256 94f162c148d3eecce6e051748086149b9914f865189f972c7d82626b788534c2
+EBUILD freewrl-1.22.6.ebuild 3982 RMD160 e2411f9d44939aefc7862bffe96c51d2578d7a13 SHA1 4001ee7cd55a83199f2ce6f7200c5b35004df3ee SHA256 d2b4650505a61524fbb61a8b8728aa59de96a89bcd84a574a5d9b5fa37ef008f
+MISC ChangeLog 2977 RMD160 82246ae4556831e5b9e495ae1037d9c5d2b4b286 SHA1 9293ffe0132d7c78ae75b655c363c15568ddd5ff SHA256 4442e0131c2243822a566b8f434878db4a83a12f14e102db27ad44ffb6260519
 MISC metadata.xml 503 RMD160 5bbf672ae7eed0972c89f35b88992ca08fc6c12a SHA1 bffee1c6d7993a7c1aaf6398b97a929a2513a42f SHA256 fe5c89809fcea77a155c9304c25a9bb0315adcf74d1c485caa66e67466b9f812
diff --git a/media-gfx/freewrl/freewrl-1.22.6.ebuild b/media-gfx/freewrl/freewrl-1.22.6.ebuild
new file mode 100644
index 000000000000..b30ae239f1a0
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-1.22.6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.6.ebuild,v 1.1 2010/01/07 16:58:21 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
+}