reduce elog spam, add EAPI=5 ebuild with slot-operator dep on spidermonkey

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

4 files changed, 158 insertions, 17 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index 838f5bd7cdb6..38d09854ef2d 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/freewrl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.49 2012/10/24 19:12:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.50 2012/11/04 01:21:28 axs Exp $
+
+*freewrl-1.22.13-r2 (04 Nov 2012)
+
+  04 Nov 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13-r1.ebuild,
+  +freewrl-1.22.13-r2.ebuild:
+  reduce elog spam, add EAPI=5 ebuild with slot-operator dep on spidermonkey
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> freewrl-1.22.13-r1.ebuild:
   Update dependency after package move from x11-libs/openmotif to
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 4499d681d3cb..0da40a92468d 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -4,23 +4,14 @@ Hash: SHA256
 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 4380 SHA256 d65f9c26c54c166050d4ceae41608370be75aa2b819f50dfb128bdc8a502f9ad SHA512 924529a25a0c675eddd597d895f4f19f7ef89c6572ca923a7bd36e4eee4c6856e64dddcb87cf6597bf20000d14ef3483bcacbb870c6b56afa9298a26d5389d6d WHIRLPOOL 69005c301efd8198e57476fc8797bf29219e93865ab93fcdd209d2c3b0f9fcf1a1ff5e255d9513595bd1a8f64d693f065c097b5baa2823089eb96723cf70c060
-MISC ChangeLog 7494 SHA256 f8376d7bab185308f91beac2890c88eaf0710f1246e610393c7f11e8ddd9ae91 SHA512 254f625630de8db695a9a915fba7af69ff7613b12333d074480589500792862eeab814c79a13fd8875655810886d6b86e2a36c83209415a806a96bd908ca2285 WHIRLPOOL 70e7f71d13e923411f9aae054de936b05e1c83e9e1b118e1f11c79dabf4c2ca09c612f2f41dd313b1575f15680d7b1d5b77f6e73a897b33aff99382899c72dd8
+EBUILD freewrl-1.22.13-r1.ebuild 4482 SHA256 29b1a2671106263a627a5c6e2494d16569e2095a0d47e7a3e71f5d3348cf6832 SHA512 35b7ff821c70dac5a485acd7095ac811eb2abd772ef2bb2999454293c85386e7f772399bb23510654892e204f98f1486bab8d31be24a85bfa7017ed4a5520a96 WHIRLPOOL bd192396d883049e210fbf6f5f5e0dd3d23fa6187906dbb022ba4c6215710c02a6b02aa36937a7f7e792d11f6002c51ec46ce0705124253a5e6a2e1daf7c0641
+EBUILD freewrl-1.22.13-r2.ebuild 4484 SHA256 6b11c1ae4478ea3004bc3bb89b1d7d3041e3a9fa35aa6bb67cbfeeac6033b791 SHA512 7854d9fb57aff405b3975dd10ee165a02948d461ad7684e43aaf32ec1173f8240109857d09605f7d54b422d3a6de179ee44d78c00ff89733232fb6013b74aa71 WHIRLPOOL 020a682888421a8bcad0fc4981f2ad6759e77db81dd5eb35dc5701fca7dbcb5fde3fc931a07d93544b9177d0d1a3e6902227ce2597f6308fbd2a5cddd1b84323
+MISC ChangeLog 7713 SHA256 b47f30de13738c52f6750bcf7d7a3c81bc23f668dcae503c92f04b12510643e5 SHA512 6aca665707e35cd51e2b24b82e5b9a25b0d9b114a9e20344bff1184ef18e1d396b7427617e6da29690b7c46e4be5c013970b670d2f6dc51f9f0f5bcd48b7a203 WHIRLPOOL 5139821166b41a4335ba24412990622306065180fc036093c80ad95b623848387d399f9877ab814308d1137322e6f68d7eb34ff2f2b8ee711f402f76180f6537
 MISC metadata.xml 547 SHA256 7d745ed3fa96fd3febcb5f3f9891b87c29a8c24ac7614840c6f7a378b20feb37 SHA512 0aaab59986ebcf9e64ef7ae5e1ff32e7e3a07de5e095245a1e2b1676c85f5e23f32a56da37f60dfb3cc6ba1c2f1837d792c2fc8ee9c5418f89c04d30345df877 WHIRLPOOL 8decb4e0059bb3075e79ad43e39640b1d28daebad84157f47320bb23f426dcba9ad062d262466b320e240c933999411c6e822b0a740eb93d2c363d2e304608b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiD2YAAoJEDxpGckxwJCBTGUP/3wF8u5LroRQkRzu98SCNHu/
-7ca/SYPEsGhyR0Ae/kwWqff67sh3DXOVBJ18ZJxRBtSXiNaTt9oCvYr4tIM0u94/
-QVSp4JqsG+W1/B/z6R/GD2QEO11AYyod4QIgerzuJwsha8ssuCbxOHOHsA8Dgrt1
-OPJPB2CJCXVXAZTl/VBUhJhP8MoxR7wDjn0L30m++y24QhGr7jOKeciGyCXqDoeD
-yN+WhonnrvVWKCeSGFfaxniNNVecyo/KTepue2M913vuQgM99eKVPzrCCWfgsIAZ
-woKKPcXUaJJWKvOpJKgTUOTgEMSQfNkgVaOd62py6iJBQpXUxr44KdoPGmM1R8mb
-neAHojTjogD/5147J43pLJ4/0rSL69Y9m9aRlNmD7h0Wxt1Y/Xpi8Bl0mD6fNujO
-NwEfzHnGtJ2l3AC0mllzZ3wexvdRcu0aaiZoqq3OYaPzW0B4EWO6xghvVH1N2Yu2
-jpqSXdAnHnSpc3EuriOFcD06fykM5cw647yyG/9GTt88j1ce8K8JOq1CiS7sgR2u
-v807rKDnUakDuUtat1Fpv2BMEv1492nFA7sfGnezk36T/Z4qu3/7FDUr/Pz4zLVD
-Rlhj09+fYesUSeMDidJHQa24v/ckVLF6v021MWHdOfadq2tw8HuQkom76WzGfus7
-MKKacucbV6Tu6LG3KpiQ
-=0Lsl
+iF4EAREIAAYFAlCVwysACgkQ2ugaI38ACPAgJAEAhIIJw7FCJyPtJXGVdAhUxIxi
+vsmuLvLOrPtKQmG/5YYA/jcozJC9CYKl8j8GN+6CqYo4pmyQ0TdFiNyBRqKR+3YO
+=Tctr
 -----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 158cdf7796f7..d167efcef0e7 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-2012 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.2 2012/10/24 19:12:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r1.ebuild,v 1.3 2012/11/04 01:21:28 axs Exp $
 
 EAPI=4
 
@@ -117,10 +117,12 @@ src_install() {
 		# 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
+		if ! has_version "media-gfx/freewrl[java]" ; then
 		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
 	fi
 
 	# remove unneeded .la files (as per Flameeyes' rant)
@@ -129,8 +131,10 @@ src_install() {
 }
 
 pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
 	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."
+	fi
 }
diff --git a/media-gfx/freewrl/freewrl-1.22.13-r2.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r2.ebuild
new file mode 100644
index 000000000000..fbdef2ad90d3
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-1.22.13-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/11/04 01:21:28 axs Exp $
+
+EAPI=5
+
+inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+
+DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
+HOMEPAGE="http://freewrl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug +glew java libeai motif +nsplugin osc +sox static-libs"
+
+COMMONDEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libX11
+	motif? ( x11-libs/motif )
+	!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 )
+	osc? ( media-libs/liblo )
+	dev-lang/spidermonkey:="
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.4 )
+	nsplugin? ( net-misc/npapi-sdk )"
+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() {
+	epatch "${FILESDIR}"/${P}-fontconfig-match.patch
+	if has_version ">=dev-lang/spidermonkey-1.8.7" ; then
+		epatch "${FILESDIR}"/${P}-mozjs187-config.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconf="--enable-fontconfig
+		--without-expat
+		--with-x
+		--with-imageconvert=/usr/bin/convert
+		--with-unzip=/usr/bin/unzip"
+	if use motif; then
+		myconf+=" --with-target=motif --with-statusbar=standard"
+	else
+		myconf+=" --with-target=x11 --with-statusbar=hud"
+	fi
+	if use nsplugin; then
+		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
+		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
+	fi
+	if use sox; then
+		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
+		# 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}"
+		done
+	else
+		for x in mozjs187 mozjs185 mozilla-js xulrunner-js firefox-js seamonkey-js; do
+			myconf+=" --disable-${x}"
+		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
+			# 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+=" -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
+	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
+
+	if use java; then
+		insinto /usr/share/${PN}/lib
+		doins src/java/java.policy
+		java-pkg_regjar src/java/vrml.jar
+		# 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
+		if ! has_version "media-gfx/freewrl[java]" ; then
+		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
+	fi
+
+	# remove unneeded .la files (as per Flameeyes' rant)
+	cd "${D}"
+	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+	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."
+	fi
+}