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

(Portage version: 2.2_rc43/cvs/Linux x86_64)

3 files changed, 130 insertions, 2 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/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>