fixed expat lib path error, bug 376863 (reopened)

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

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index 9e9c40a555c92cb25e686337336d7af841729566..50efdced90b95f8585abfd9d05ef1f4873766266 100644 (file)
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,9 @@
 # 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.39 2011/11/22 19:53:15 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.40 2011/12/01 04:43:54 axs Exp $
+
+  01 Dec 2011; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.12_pre2.ebuild:
+  fixed expat lib path error, bug 376863 (reopened)
 
   22 Nov 2011; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.12_pre2.ebuild,
   metadata.xml:

diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 1475955d7b1f51e30ad165f8cf23e8ee929e2edd..0341d8c98a99d6568eba86eb0355dcfb952a129a 100644 (file)
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST freewrl-1.22.12_pre2.tar.bz2 1747154 RMD160 fe8e83ff5928e6ad35aafa65ba5cca1459c45de8 SHA1 104f7769e615eea61015930b089b77dec7b7420c SHA256 2b82c0cea0241acc849635cab204c6a2c412dc94f66fc030fc8991ee274818e8
-EBUILD freewrl-1.22.12_pre2.ebuild 4666 RMD160 40b33714d25ed2ac8203489d9da9b8f651301e17 SHA1 988ba963b4d16844d721fc79f7e06c73a11795f7 SHA256 a0f81d9bf262994b381414ce5152b857e8f21bb3e9825591dcb536c1e058f2be
-MISC ChangeLog 5886 RMD160 8ac1be7cda29ab8181534b54d5293559e490d200 SHA1 40109e777ae08b569c895af1a0577bf2de50a636 SHA256 26442b4f931721067d6f964fa15bed8a3a7ef6d49f16aaea6ef6b197c3ba65f8
+EBUILD freewrl-1.22.12_pre2.ebuild 4708 RMD160 2007e2105d7cfa5337d5b38c757b164a71037136 SHA1 c573454f71daad13895087d3b6fcffa2a4cd8ebb SHA256 a2934cc440775bc601e9ad9d6f3e595d1a4e0bc4d0af1eaab0ead015ebfab539
+MISC ChangeLog 6017 RMD160 99e2c9b3dae51c19bee193f1fee2377d21fa62c8 SHA1 388d397f70d3b3b721a66575000f34019fdac8da SHA256 a032c876eeeac12fa75b3d9d0022222889638d5d45bd36b48175aae0d912bd80
 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
+iF4EAREIAAYFAk7XBfoACgkQAJxUfCtlWe1WhgEAntWagOT765oxreG/1+RFJKIp
+VCPDXFj3IfuOD+pMM3UBAKCkfthZHWd1nUhmlJLl+nvP1T/bigYp7TrkE1BmJO+l
+=ZyAL
 -----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 cab9b78d8a29a9877f1f8f8ed6be0f3993916044..9eeaf195760354b0ecc7ef873f031f0746b07557 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.3 2011/11/22 19:53:15 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild,v 1.4 2011/12/01 04:43:54 axs Exp $
 
 EAPI="2"
 
@@ -88,10 +88,12 @@ src_configure() {
                export JAVASCRIPT_ENGINE_CFLAGS
                export JAVASCRIPT_ENGINE_LIBS
        fi
+       if ! use expat; then
+               myconf="${myconf} --without-expat"
+       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) \
@@ -105,9 +107,9 @@ 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
+               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