Bump, thanks to Ian for the patch

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

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index ca31516f9168390651595165cea2773d7bf71c60..b9e33d00034a1285c7044eace1c7b97ecadd97ce 100644 (file)
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/freewrl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.24 2010/03/10 14:13:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.25 2010/06/08 22:47:58 patrick Exp $
+
+*freewrl-1.22.8 (08 Jun 2010)
+
+  08 Jun 2010; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.8.ebuild,
+  metadata.xml:
+  Bump, thanks to Ian for the patch
 
   10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   freewrl-1.22.6-r1.ebuild, +files/freewrl-1.22.6-libpng14.patch:

diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 34ee915a2197250e17188bccf800ffeb37421049..8612bdfd7fbc4af49028416b580fcdd24ca04bdd 100644 (file)
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,6 +1,8 @@
 AUX freewrl-1.22.6-libpng14.patch 438 RMD160 d6a2c42fd1f409957deee6625109e96e7c747262 SHA1 1904e7f5d3240d3d2f1ac780073c86f753f616ba SHA256 00fc60512ee2630c9053ebfa28d2587e0f2ae6e2fefc9b1fe217aa8c3fc32d26
 AUX freewrl-1.22.6-xulrunner192-fixes.patch 5730 RMD160 43a56dcf2fc50b4961c47504447424d22b63c74d SHA1 f8ef8775e190c778fa0dfa1331f603f52304bd41 SHA256 ab2da7f73867858c97e818a7bd2fbf5adb04df0357daf9e48a4baf707584c0d0
 DIST freewrl-1.22.6.tar.bz2 1705519 RMD160 82810cbb09e4325ebcdc577edef8c70ae53ac11c SHA1 431a73b94bbbdacfa201b59bc8dc61c1bdb8d16c SHA256 25d60ffd8231eddcbff7343bdd62f94c7419a5adeaad59da5118a5be1e9d9afb
+DIST freewrl-1.22.8.tar.bz2 1437467 RMD160 965e47030679502f89d843bfd0b8f6dab782d286 SHA1 b005515fb1b98a4452837ea5966b0bf3705b2606 SHA256 199b9e8e5a36411d67572b2d52cfc74e917d966238366106409b172edcd16960
 EBUILD freewrl-1.22.6-r1.ebuild 4584 RMD160 b761c7deccda1f46802b8fb11a0c574486465ce5 SHA1 68cc86d0709f6d6e4f776ffb486215532ecbc558 SHA256 17e82e25e5c6735de58bdd5f5e55c67d1721210afc7969a1b0117bcb25a4b3f2
-MISC ChangeLog 3546 RMD160 4f20802e7e65b462be1f09fed6ccc373d3931db5 SHA1 b932f1b981304068b514d9a317b76ba7e7e957e0 SHA256 240afdc0d85c9cc2849e9795eef13e4107acfdfd30a7c85432a65e49c19e9b24
-MISC metadata.xml 503 RMD160 5bbf672ae7eed0972c89f35b88992ca08fc6c12a SHA1 bffee1c6d7993a7c1aaf6398b97a929a2513a42f SHA256 fe5c89809fcea77a155c9304c25a9bb0315adcf74d1c485caa66e67466b9f812
+EBUILD freewrl-1.22.8.ebuild 4534 RMD160 ba108d8aa0eee430143887bdd9b47d14d63994b9 SHA1 1da0c4439ab55a44cbe7b38ae132e91444678d68 SHA256 93e69e3de0a2774a20e840ee9b393a5499806e8196cded16f28a80720b40fb62
+MISC ChangeLog 3702 RMD160 c6c5b23270b1c3d3a2fee49e73614e7e95586df9 SHA1 f089b92ec4e755529852127727252544589f6744 SHA256 6b4e5dd5ecbdf574d0d4692f2eac73e0a5fa72802fc4f8a1636ded805653087e
+MISC metadata.xml 552 RMD160 ef3eca4d7c6f76c0442a987ff5916d68fbfe6d4d SHA1 51c1146433e244c29ecb210d72c35b8054cdee2b SHA256 f85e5ec3121bcb3552984a6c49183dd41e2fe9eb85770fc6c0b636123c42526d

diff --git a/media-gfx/freewrl/freewrl-1.22.8.ebuild b/media-gfx/freewrl/freewrl-1.22.8.ebuild
new file mode 100644 (file)
index 0000000..13e0915
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-1.22.8.ebuild
@@ -0,0 +1,133 @@
+# 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.8.ebuild,v 1.1 2010/06/08 22:47:58 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 +glew +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
+       glew? ( 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_prepare() {
+       # A hack to get around expat being grabbed from xulrunner
+       if use xulrunner && has_version ">=net-libs/xulrunner-1.9.2"; 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="--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 glew; then
+               myconf="${myconf} --without-glew"
+       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
+                       if has_version ">=net-libs/xulrunner-1.9.2"; then
+                               # more hack to get around expat being grabbed from xulrunner
+                               myconf="${myconf} --with-expat=${S}/src/lib"
+                       else
+                               # fix missing library path to xulrunner-1.9 libraries
+                               append-ldflags "-R/usr/$(get_libdir)/xulrunner-1.9/lib"
+                       fi
+               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
+}
\ No newline at end of file

diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
index 3544b747a8af19037a4760c8fe19e1af4731e9ed..979ff88326c67b9d30bda1b640426798442a04a7 100644 (file)
--- a/media-gfx/freewrl/metadata.xml
+++ b/media-gfx/freewrl/metadata.xml
@@ -11,6 +11,7 @@
        <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>
 </use>