Bump, modified ebuild by Ian
authorPatrick Lauer <patrick@gentoo.org>
Thu, 28 Jul 2011 16:28:14 +0000 (16:28 +0000)
committerPatrick Lauer <patrick@gentoo.org>
Thu, 28 Jul 2011 16:28:14 +0000 (16:28 +0000)
Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

media-gfx/freewrl/ChangeLog
media-gfx/freewrl/Manifest
media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild [new file with mode: 0644]
media-gfx/freewrl/metadata.xml

index e4a6c86ae7497ae121a9122c1b576bf27edc6f71..9ee81fe7bacbbf7ecfc535022379fe8ef237cc61 100644 (file)
@@ -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:
index a95ec6c57d594146a08ad0cb8bafe02dbc2b345a..029f6ad54f0cd64b5db43daecd82368532c6e262 100644 (file)
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST freewrl-1.22.10.tar.bz2 1548349 RMD160 9ff1894c59e48e0c9412fa068ff52f75d45f6a6c SHA1 94ecc960a1936692aeee2ec232bb31561fac5958 SHA256 b52999a1754968c8f889de0f98566dceb2ddd70eec1d68d2d4f07a90292a466e
+DIST freewrl-1.22.12_pre2.tar.bz2 1747154 RMD160 fe8e83ff5928e6ad35aafa65ba5cca1459c45de8 SHA1 104f7769e615eea61015930b089b77dec7b7420c SHA256 2b82c0cea0241acc849635cab204c6a2c412dc94f66fc030fc8991ee274818e8
 DIST freewrl-1.22.9.tar.bz2 1457743 RMD160 f8c3a2c12422bed747bd71704ef05cdaa646de13 SHA1 7f3becb4f64b3c9caa32a7d9a35e61b3cc7eab41 SHA256 0ad0e264351018015e2a6fe7cd4c2f7c3e3f486ddc85be9b680e013981f05804
 EBUILD freewrl-1.22.10-r1.ebuild 3578 RMD160 ac6072e32c9118de2e18703ad65826408ef36591 SHA1 cb870deb1b9b403db4d2774e500906ba91b83e3f SHA256 369fcb8001fe22922a245f736562460c3a6410e5d486cf1a98f29359ed22b424
 EBUILD freewrl-1.22.10.ebuild 3526 RMD160 ba890e879752cc4a269606fe4b3e2a109b93ba1c SHA1 7e49e50a4c37b7ffc0bc4c42b9ae55d57b5159e8 SHA256 bb7f090af2e0c87fbc72e379d4eb240091c3366b0c6fd69d93ecd7104985db12
+EBUILD freewrl-1.22.12_pre2.ebuild 4864 RMD160 1ba1be1a227b1bcfa180566428dcaed4aaeb8f7f SHA1 d8d719618792fa64c997bc15b20c5082ffa4f39f SHA256 c2fb7dd0a15d8b59500676d69cb4238d71defd54cf51d9e23e2adf1e4e7f8d35
 EBUILD freewrl-1.22.9.ebuild 3069 RMD160 3adb6255da5a523583e977823739d7368be903e8 SHA1 47aae0e84128d15e849a75235d1880f518776985 SHA256 a6e0f83b3c3d4a3ad9bb1acf32fa21947b1177555ff38cf0d99b01543850ecac
-MISC ChangeLog 5168 RMD160 2588aeb5fa6791c40ae8cec72a02fd8cb331b8b4 SHA1 df61be47a532dfff2a784222e8f4df384e299686 SHA256 d925948275a5cf6e1c9b1e30087053a6dfbfc5537c8917d1a83a13ef6ad449f4
-MISC metadata.xml 552 RMD160 ef3eca4d7c6f76c0442a987ff5916d68fbfe6d4d SHA1 51c1146433e244c29ecb210d72c35b8054cdee2b SHA256 f85e5ec3121bcb3552984a6c49183dd41e2fe9eb85770fc6c0b636123c42526d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJOAVNpAAoJEO/kOhxWD91k+QoQAJGWLtMEeM03HAg39TK/fBW7
-+QhK5ocVpldaypUWKpdBMwCqykKLaocvzJWOW56Ve0RHsg03uPijslc03YUF01HH
-dNRMsEHpD0qUMdGLEqmjUc/aObSQ7EGl6IXt52NJNnHEJa0zSU0B3ddKjz3HKG/r
-/8AK1L99Qfq0rM2P/MwbJuw5TzDBARE0bCJo+MW9zMZEKdkCyFSI2n0r/N8ScKcZ
-scbo0gaWkUoztECA52xM5/EZzHkXh8l3m6ESgmi2VKBquZIHnVerRFHszMq1jitn
-LjrPfjDhM//EbwsreJ3YcclZUFAhlacb+Q2pXOYH4Ql45heirPVz/iaA4/OFJ6Ry
-zUvXUIre5c/ZfG4avo6ZozMPoOdSI46esHsWXOHQJ6qaxVBfVb4stJXYjIsfO3LN
-wY+H2m2QcWcXoNh1RpgEzI0XAv/SDwRQ4audHDHFvm0Wmt6iHkQX3/+b1mY5oFDZ
-eUxfp6dQsRRczMWf/npl47oDlZcjR6u10xUfz2xEPfhTfZZBEOAnZZZnCR1CMgqe
-nIbHj7p3NdPYvRR2TQRnynwOe9pryjzqBPFNDEOh4Oa+sbA02Yd8jWF5qhYY6NIR
-73D20JBdA2cICYK+JHUsI/Nj9V5rWb9pAtCE/1B5enbGAjYhYphcPyltOsfI9UjF
-U9te5XIw1sELU/SqscpW
-=Pw58
------END PGP SIGNATURE-----
+MISC ChangeLog 5332 RMD160 f832bbeb7ce11ebe5d421394764b0a863d304aa8 SHA1 d810fb589d6d330488ff65092c2880fab588e7f3 SHA256 b5d4e98c28585e51b646b441cb4cd769d2dda3512bf036226f56732eb474e4c8
+MISC metadata.xml 863 RMD160 000f2c6b960dcaec7391eb3e5511ed141b0b0fad SHA1 d8b3e3eb5bc30bd19516eb38285d23603d8ab9b3 SHA256 d251acb2b3ef7c97f43b2ba5a98813e80ce8a2163a343a376e6958e1ea5d4060
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 (file)
index 0000000..c9d289e
--- /dev/null
@@ -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
index 979ff88326c67b9d30bda1b640426798442a04a7..3422fdd2c329f9605f82b39869609e60835d7a10 100644 (file)
        <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>