Bump, modified ebuild by Ian

(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

3 files changed, 156 insertions, 4 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index e4a6c86ae749..9ee81fe7bacb 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/freewrl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.34 2011/06/22 02:28:51 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.35 2011/07/28 16:28:14 patrick Exp $
+
+*freewrl-1.22.12_pre2 (28 Jul 2011)
+
+  28 Jul 2011; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.12_pre2.ebuild,
+  metadata.xml:
+  Bump, modified ebuild by Ian
 
   22 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   freewrl-1.22.10-r1.ebuild:
diff --git a/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild b/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild
new file mode 100644
index 000000000000..c9d289efbe01
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild,v 1.1 2011/07/28 16:28:14 patrick Exp $
+
+EAPI="2"
+
+inherit nsplugins eutils flag-o-matic java-pkg-opt-2
+
+DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
+SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
+HOMEPAGE="http://freewrl.sourceforge.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug expat +glew java libeai motif +nsplugin osc +sox static-libs xulrunner"
+
+COMMONDEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libX11
+	motif? ( x11-libs/openmotif )
+	!motif? ( x11-libs/libXaw )
+	media-libs/mesa
+	glew? ( media-libs/glew )
+	virtual/opengl
+	media-libs/libpng
+	virtual/jpeg
+	media-libs/imlib2
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	osc? ( media-libs/liblo )
+	!xulrunner? ( dev-lang/spidermonkey )
+	xulrunner? ( net-libs/xulrunner !=dev-lang/spidermonkey-1.8.2* )
+	nsplugin? ( !xulrunner? ( www-client/firefox ) )"
+DEPEND="${COMMONDEPEND}
+	>=dev-util/pkgconfig-0.22
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${COMMONDEPEND}
+	media-fonts/dejavu
+	|| ( media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] )
+	app-arch/unzip
+	java? ( >=virtual/jre-1.4 )
+	sox? ( media-sound/sox )"
+
+src_prepare() {
+	# A hack to get around expat being grabbed from xulrunner
+	if use expat ; then
+		mkdir "${S}/src/lib/include";
+		cp /usr/include/expat.h "${S}/src/lib/include/";
+		cp /usr/include/expat_external.h "${S}/src/lib/include/";
+	fi
+}
+
+src_configure() {
+	local myconf="--enable-fontconfig
+		--with-x
+		--with-imageconvert=/usr/bin/convert
+		--with-unzip=/usr/bin/unzip"
+	if use motif; then
+		myconf="${myconf} --with-target=motif --with-statusbar=standard"
+	else
+		myconf="${myconf} --with-target=x11 --with-statusbar=hud"
+	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 expat; then
+		myconf="${myconf} --without-expat"
+	fi
+	if use xulrunner; then
+		# more hack to get around expat being grabbed from xulrunner
+		if use expat ; then
+			myconf="${myconf} --with-expat=${S}/src/lib"
+		fi
+	else
+		# disable the checks for other js libs, in case they are installed
+		if has_version ">=dev-lang/spidermonkey-1.8.5" ; then
+			# spidermonkey-1.8.5 provides a .pc to pkg-config, it should be findable via mozjs185
+			myconf="${myconf} --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js --disable-seamonkey-js --disable-firefox2-js"
+		else
+			myconf="${myconf} --disable-mozjs185 --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js --disable-seamonkey-js"
+			# 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
+				# spidermonkey-1.8 changed the name of the lib
+				JAVASCRIPT_ENGINE_LIBS="-lmozjs"
+			else
+				JAVASCRIPT_ENGINE_LIBS="-ljs"
+			fi
+			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
+		fi
+	fi
+	econf	${myconf} \
+		$(use_enable curl libcurl) \
+		$(use_with glew) \
+		$(use_enable debug) $(use_enable debug thread_colorized) \
+		$(use_enable libeai) \
+		$(use_enable java) \
+		$(use_enable nsplugin plugin) \
+		$(use_enable osc) \
+		$(use_enable static-libs static) \
+		$(use_enable sox sound)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use java; then
+		java-pkg_dojar src/java/vrml.jar
+		insinto /usr/share/${PN}/lib
+		doins src/java/java.policy
+		# install vrml.jar as a JRE extension
+		dodir /usr/java/packages/lib/ext
+		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
+		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
+		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
+		elog "java policy:"
+		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
+	fi
+
+	# remove unneeded .la files (as per Flameeyes' rant)
+	cd "${D}"
+	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
+}
+
+pkg_postinst() {
+	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
+	elog "path.  If you do not have firefox installed or you wish to use a different"
+	elog "web browser to open links that are within VRML / X3D files, please be sure to"
+	elog "specify the command via your BROWSER environment variable."
+}
\ No newline at end of file
diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
index 979ff88326c6..3422fdd2c329 100644
--- a/media-gfx/freewrl/metadata.xml
+++ b/media-gfx/freewrl/metadata.xml
@@ -11,9 +11,12 @@
 	<name>Ian Stakenvicius (proxy-maintainer)</name>
 </maintainer>
 <use> 
-	<flag name='glew'>Enable glew extensions</flag>
-	<flag name='libeai'>Build EAI C library</flag>
-	<flag name='spidermonkey'>Use spidermonkey instead of Firefox</flag>
+        <flag name='glew'>Enable glew extensions</flag>
+        <flag name='libeai'>Build EAI C library</flag>
+        <flag name='spidermonkey'>Use spidermonkey instead of Firefox</flag>
+        <flag name='xulrunner'>Use libmozjs from xulrunner instead of using spidermonkey</flag>
+        <flag name='osc'>Allows for OSC-based control and communication between multiple freewrl instances</flag>
+        <flag name='java'>Build and install java EAI/SAI support library</flag>
 </use>
 
 </pkgmetadata>