axs 14/03/14 13:45:19
Modified: freewrl-1.22.13-r3.ebuild freewrl-9999.ebuild
ChangeLog
Removed: freewrl-1.22.13-r1.ebuild
Log:
more java build fixes; remove old
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
2B6559ED)
Revision Changes Path
1.3 media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild?r1=1.2&r2=1.3
Index: freewrl-1.22.13-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freewrl-1.22.13-r3.ebuild 12 Mar 2014 14:24:13 -0000 1.2
+++ freewrl-1.22.13-r3.ebuild 14 Mar 2014 13:45:19 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild,v 1.2
2014/03/12 14:24:13 axs Exp $
+# $Header:
/var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild,v 1.3
2014/03/14 13:45:19 axs Exp $
EAPI=5
@@ -46,11 +46,12 @@
src_prepare() {
epatch "${FILESDIR}"/${P}-fontconfig-match.patch
- if has_version ">=dev-lang/spidermonkey-1.8.7" ; then
+ if has_version ">=dev-lang/spidermonkey-1.8.7:0" ; then
epatch "${FILESDIR}"/${P}-mozjs187-config.patch
- eautoreconf
fi
epatch "${FILESDIR}"/${P}-desktop.patch
+ epatch "${FILESDIR}"/${P}-java-fix.patch
+ eautoreconf
}
src_configure() {
@@ -89,7 +90,7 @@
else
JAVASCRIPT_ENGINE_LIBS="-ljs"
fi
- if has_version dev-lang/spidermonkey[threadsafe] ; then
+ if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE
$(pkg-config --cflags nspr)"
JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr)
${JAVASCRIPT_ENGINE_LIBS}"
fi
1.5 media-gfx/freewrl/freewrl-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild?r1=1.4&r2=1.5
Index: freewrl-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freewrl-9999.ebuild 12 Mar 2014 14:24:13 -0000 1.4
+++ freewrl-9999.ebuild 14 Mar 2014 13:45:19 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild,v 1.4
2014/03/12 14:24:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild,v 1.5
2014/03/14 13:45:19 axs Exp $
EAPI=5
@@ -80,13 +80,13 @@
# spidermonkey pre-1.8.5 has no pkg-config, so override
./configure
myconf+="${spidermonkeys_pc[@]/#/ --disable-}"
JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
- if has_version ">=dev-lang/spidermonkey-1.8" ; then
+ if has_version ">=dev-lang/spidermonkey-1.8:0" ; 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
+ if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE
$(pkg-config --cflags nspr)"
JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr)
${JAVASCRIPT_ENGINE_LIBS}"
fi
1.55 media-gfx/freewrl/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/ChangeLog?rev=1.55&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/ChangeLog?rev=1.55&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freewrl/ChangeLog?r1=1.54&r2=1.55
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog 12 Mar 2014 14:24:13 -0000 1.54
+++ ChangeLog 14 Mar 2014 13:45:19 -0000 1.55
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/freewrl
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.54
2014/03/12 14:24:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.55
2014/03/14 13:45:19 axs Exp $
+
+ 14 Mar 2014; Ian Stakenvicius (_AxS_) <[email protected]>
+ +files/freewrl-1.22.13-java-fix.patch, -freewrl-1.22.13-r1.ebuild,
+ freewrl-1.22.13-r3.ebuild, freewrl-9999.ebuild:
+ more java build fixes; remove old
12 Mar 2014; Ian Stakenvicius (_AxS_) <[email protected]>
freewrl-1.22.13-r1.ebuild, freewrl-1.22.13-r3.ebuild, freewrl-9999.ebuild:
