fixed dependencies to rely directly on spidermonkey instead of optionally on xulrunne...

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index 7e763e6a77d14f9fff4ee31efb937d615f287c4e..9e9c40a555c92cb25e686337336d7af841729566 100644 (file)
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.38 2011/10/13 20:34:46 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.39 2011/11/22 19:53:15 axs Exp $
+
+  22 Nov 2011; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.12_pre2.ebuild,
+  metadata.xml:
+  fixed dependencies to rely directly on spidermonkey instead of optionally on
+  xulrunner, and to rely on npapi-sdk instead of xulrunner or firefox
 
   13 Oct 2011; Ian Stakenvicius <axs@gentoo.org> ChangeLog:
   Taking over maintainership, thanks Patrick!

diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index d1f616e3cc77313593321e374f773223601211de..1475955d7b1f51e30ad165f8cf23e8ee929e2edd 100644 (file)
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST freewrl-1.22.12_pre2.tar.bz2 1747154 RMD160 fe8e83ff5928e6ad35aafa65ba5cca1459c45de8 SHA1 104f7769e615eea61015930b089b77dec7b7420c SHA256 2b82c0cea0241acc849635cab204c6a2c412dc94f66fc030fc8991ee274818e8
-EBUILD freewrl-1.22.12_pre2.ebuild 4867 RMD160 2ad6c6e39252c72790c33c08c0e0214335585e52 SHA1 049030afdf49419ffa0830e4801abae2c940606f SHA256 18e4326b8d6f2624858afea76a40bcc979392c4b93b5120ae0833d54a9a0fcf9
-MISC ChangeLog 5642 RMD160 2e87ed5a1e421e709f6ac89c174bce254f7b9914 SHA1 4ee124e69a3b6d90055e0e9db6cfb2a7bfc70c33 SHA256 c6b01c722b2449e8c289baec02746d820e8110f619355cbe91b7ca35aa2d950e
-MISC metadata.xml 643 RMD160 3eddaf2415c0aa57d453549b82b5803349ec5990 SHA1 cb57014ea46db1b673d400f9b04d7712b3fc10db SHA256 fc16133e22e56613c18a97371943b23b300dbcbaed7493f1ed9bb3797c598ff1
+EBUILD freewrl-1.22.12_pre2.ebuild 4666 RMD160 40b33714d25ed2ac8203489d9da9b8f651301e17 SHA1 988ba963b4d16844d721fc79f7e06c73a11795f7 SHA256 a0f81d9bf262994b381414ce5152b857e8f21bb3e9825591dcb536c1e058f2be
+MISC ChangeLog 5886 RMD160 8ac1be7cda29ab8181534b54d5293559e490d200 SHA1 40109e777ae08b569c895af1a0577bf2de50a636 SHA256 26442b4f931721067d6f964fa15bed8a3a7ef6d49f16aaea6ef6b197c3ba65f8
+MISC metadata.xml 547 RMD160 9d5b1f027da48321e26e79fafbe6f8a0695dd307 SHA1 26476c1d5f7e99b2498462a351018dbf16ddd934 SHA256 7d745ed3fa96fd3febcb5f3f9891b87c29a8c24ac7614840c6f7a378b20feb37
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk7L/Z0ACgkQAJxUfCtlWe3ThgEA3BVouHvBsqKmbVZ5yqFqocwi
+w+0kqJh6gTH+7rBFdMcBAIML1/lllCOtMV/gaCCnbuViaoAL0otvLcwe/Y9Akhdr
+=9cnn
+-----END PGP SIGNATURE-----

diff --git a/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild b/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild
index 374c41c8192f72d1d5cffa3b3d3cead7f870ad88..cab9b78d8a29a9877f1f8f8ed6be0f3993916044 100644 (file)
--- a/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild
+++ b/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2011/07/28 16:50:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild,v 1.3 2011/11/22 19:53:15 axs Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ 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"
+IUSE="curl debug expat +glew java libeai motif +nsplugin osc +sox static-libs"
 
 COMMONDEPEND="x11-libs/libXau
        x11-libs/libXdmcp
@@ -32,12 +32,11 @@ COMMONDEPEND="x11-libs/libXau
        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 ) )"
+       dev-lang/spidermonkey"
 DEPEND="${COMMONDEPEND}
        >=dev-util/pkgconfig-0.22
-       java? ( >=virtual/jdk-1.4 )"
+       java? ( >=virtual/jdk-1.4 )
+       nsplugin? ( =net-misc/npapi-sdk-0.27 )"
 RDEPEND="${COMMONDEPEND}
        media-fonts/dejavu
        || ( media-gfx/imagemagick
@@ -46,15 +45,6 @@ RDEPEND="${COMMONDEPEND}
        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
@@ -67,44 +57,41 @@ src_configure() {
        fi
        if use nsplugin; then
                myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
+               # override auto-detection for npapi headers, can be removed for next upstream release
+               myconf="${myconf} --disable-mozilla-plugin --disable-xulrunner-plugin --disable-seamonkey-plugin --disable-firefox-plugin"
+               MOZILLA_PLUGIN_CFLAGS="$(pkg-config --cflags npapi-sdk)"
+               MOZILLA_PLUGIN_LIBS="$(pkg-config --libs npapi-sdk)"
+               export MOZILLA_PLUGIN_CFLAGS
+               export MOZILLA_PLUGIN_LIBS
        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
+       # 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
-               # 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"
+               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
-                       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
+                       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
        econf   ${myconf} \
                $(use_enable curl libcurl) \
                $(use_with glew) \
+               $(use_with expat) \
                $(use_enable debug) $(use_enable debug thread_colorized) \
                $(use_enable libeai) \
                $(use_enable java) \

diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
index accd7ccc219a97a42e49bbd52a5579191eba16e5..2dd4b2b92242217041f75a7af4ff3559133429bb 100644 (file)
--- a/media-gfx/freewrl/metadata.xml
+++ b/media-gfx/freewrl/metadata.xml
@@ -8,7 +8,6 @@
 <use> 
         <flag name='glew'>Enable glew extensions</flag>
         <flag name='libeai'>Build EAI C library</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>