summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2011-12-01 04:43:54 +0000
committerIan Stakenvicius <axs@gentoo.org>2011-12-01 04:43:54 +0000
commite8bd40c7915ef3af25451549a5638bfea83d744b (patch)
tree8eec590f296c96a6d0ad2709789ed3d08cf80c76 /media-gfx
parentKeep third_party/khronos. (diff)
downloadgentoo-2-e8bd40c7915ef3af25451549a5638bfea83d744b.tar.gz
gentoo-2-e8bd40c7915ef3af25451549a5638bfea83d744b.tar.bz2
gentoo-2-e8bd40c7915ef3af25451549a5638bfea83d744b.zip
fixed expat lib path error, bug 376863 (reopened)
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/freewrl/ChangeLog5
-rw-r--r--media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index 9e9c40a555c9..50efdced90b9 100644
--- 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/freewrl-1.22.12_pre2.ebuild b/media-gfx/freewrl/freewrl-1.22.12_pre2.ebuild
index cab9b78d8a29..9eeaf1957603 100644
--- 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