* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
@ 2011-11-08 19:01 Ralph Sennhauser (sera)
0 siblings, 0 replies; 9+ messages in thread
From: Ralph Sennhauser (sera) @ 2011-11-08 19:01 UTC (permalink / raw
To: gentoo-commits
sera 11/11/08 19:01:23
Modified: ChangeLog icedtea-7.2.0-r1.ebuild
icedtea-6.1.10.4-r1.ebuild
Log:
Allow building of icedtea with icedtea-bin-6, bug 389885
(Portage version: 2.1.10.32/cvs/Linux x86_64)
Revision Changes Path
1.43 dev-java/icedtea/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.42&r2=1.43
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog 7 Nov 2011 16:02:21 -0000 1.42
+++ ChangeLog 8 Nov 2011 19:01:23 -0000 1.43
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.42 2011/11/07 16:02:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.43 2011/11/08 19:01:23 sera Exp $
+
+ 08 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+ icedtea-7.2.0-r1.ebuild:
+ Allow building of icedtea with icedtea-bin-6, bug 389885
07 Nov 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.10.4.ebuild,
icedtea-6.1.10.4-r1.ebuild, icedtea-7.2.0-r1.ebuild:
1.7 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.6&r2=1.7
Index: icedtea-7.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- icedtea-7.2.0-r1.ebuild 7 Nov 2011 16:02:21 -0000 1.6
+++ icedtea-7.2.0-r1.ebuild 8 Nov 2011 19:01:23 -0000 1.7
@@ -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/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.6 2011/11/07 16:02:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.7 2011/11/08 19:01:23 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -171,7 +171,7 @@
local config procs rhino_jar
local vm=$(java-pkg_get-current-vm)
- if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" ]] ; then
+ if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]] ; then
# We can't currently bootstrap with a IcedTea6 JVM :(
config="${config} --disable-bootstrap"
elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" && "${vm}" != "icedtea7" && "${vm}" != "icedtea-7" ]] ; then
1.3 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.2&r2=1.3
Index: icedtea-6.1.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icedtea-6.1.10.4-r1.ebuild 7 Nov 2011 16:02:21 -0000 1.2
+++ icedtea-6.1.10.4-r1.ebuild 8 Nov 2011 19:01:23 -0000 1.3
@@ -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/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.2 2011/11/07 16:02:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.3 2011/11/08 19:01:23 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -174,7 +174,7 @@
local vmhome="/usr/lib/jvm/${vm}"
# IcedTea6 can't be built using IcedTea7; its class files are too new
- if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" ]] ; then
+ if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]]; then
# If we are upgrading icedtea, then we don't need to bootstrap.
config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap"
elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
@ 2011-11-10 21:42 Ralph Sennhauser (sera)
0 siblings, 0 replies; 9+ messages in thread
From: Ralph Sennhauser (sera) @ 2011-11-10 21:42 UTC (permalink / raw
To: gentoo-commits
sera 11/11/10 21:42:13
Modified: ChangeLog icedtea-7.2.0-r1.ebuild
icedtea-6.1.10.4-r1.ebuild
Log:
Fix building with unusal locales, bug #330433 #389717
(Portage version: 2.1.10.33/cvs/Linux x86_64)
Revision Changes Path
1.44 dev-java/icedtea/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.43&r2=1.44
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog 8 Nov 2011 19:01:23 -0000 1.43
+++ ChangeLog 10 Nov 2011 21:42:12 -0000 1.44
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.43 2011/11/08 19:01:23 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.44 2011/11/10 21:42:12 sera Exp $
+
+ 10 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+ icedtea-7.2.0-r1.ebuild:
+ Fix building with unusal locales, bug #330433 #389717
08 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
icedtea-7.2.0-r1.ebuild:
1.8 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.7&r2=1.8
Index: icedtea-7.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- icedtea-7.2.0-r1.ebuild 8 Nov 2011 19:01:23 -0000 1.7
+++ icedtea-7.2.0-r1.ebuild 10 Nov 2011 21:42:12 -0000 1.8
@@ -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/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.7 2011/11/08 19:01:23 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.8 2011/11/10 21:42:12 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -127,6 +127,9 @@
return
fi
+ # icedtea doesn't like some locales. #330433 #389717
+ export LANG="C" LC_ALL="C"
+
# quite a hack since java-config does not provide a way for a package
# to limit supported VM's for building and their preferred order
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
1.4 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.3&r2=1.4
Index: icedtea-6.1.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icedtea-6.1.10.4-r1.ebuild 8 Nov 2011 19:01:23 -0000 1.3
+++ icedtea-6.1.10.4-r1.ebuild 10 Nov 2011 21:42:13 -0000 1.4
@@ -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/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.3 2011/11/08 19:01:23 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.4 2011/11/10 21:42:13 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -134,6 +134,9 @@
return
fi
+ # icedtea doesn't like some locales. #330433 #389717
+ export LANG="C" LC_ALL="C"
+
# quite a hack since java-config does not provide a way for a package
# to limit supported VM's for building and their preferred order
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
@ 2011-11-18 11:01 Ralph Sennhauser (sera)
0 siblings, 0 replies; 9+ messages in thread
From: Ralph Sennhauser (sera) @ 2011-11-18 11:01 UTC (permalink / raw
To: gentoo-commits
sera 11/11/18 11:01:47
Modified: ChangeLog icedtea-7.2.0-r1.ebuild
icedtea-6.1.10.4-r1.ebuild
Log:
Add --disable-bootstrap on PaX enabled hosts when building using IcedTea7. Bug #389751.
(Portage version: 2.1.10.35/cvs/Linux x86_64)
Revision Changes Path
1.48 dev-java/icedtea/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.47&r2=1.48
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog 13 Nov 2011 22:39:22 -0000 1.47
+++ ChangeLog 18 Nov 2011 11:01:45 -0000 1.48
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.47 2011/11/13 22:39:22 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.48 2011/11/18 11:01:45 sera Exp $
+
+ 18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+ icedtea-7.2.0-r1.ebuild:
+ Add --disable-bootstrap on PaX enabled hosts when building using IcedTea7.
+ Bug #389751.
13 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r1.ebuild:
Fix building with PaX enabled kernels. Bug #389751. Thanks to Daniel Kuehn
1.12 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.11&r2=1.12
Index: icedtea-7.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- icedtea-7.2.0-r1.ebuild 13 Nov 2011 22:39:22 -0000 1.11
+++ icedtea-7.2.0-r1.ebuild 18 Nov 2011 11:01:45 -0000 1.12
@@ -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/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.11 2011/11/13 22:39:22 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.12 2011/11/18 11:01:45 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -170,9 +170,9 @@
}
java_prepare() {
- # Fix building with PaX enabled kernels. Bug #389751
+ # Fix non bootstrap builds with PaX enabled kernels. Bug #389751
# Move applying test_gamma.patch to before creating boot copy.
- if grep '^PaX:' /proc/self/status > /dev/null; then
+ if host-is-pax; then
sed -i -e 's|patches/boot/test_gamma.patch||' Makefile.in || die
sed -i -e 's|openjdk-boot|openjdk|g' patches/boot/test_gamma.patch || die
export DISTRIBUTION_PATCHES=patches/boot/test_gamma.patch
@@ -187,10 +187,19 @@
local config procs rhino_jar
local vm=$(java-pkg_get-current-vm)
- if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]] ; then
+ if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
# We can't currently bootstrap with a IcedTea6 JVM :(
config="${config} --disable-bootstrap"
- elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" && "${vm}" != "icedtea7" && "${vm}" != "icedtea-7" && "${vm}" != "icedtea-bin-7" ]] ; then
+ elif has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
+ # We can't currently bootstrap with a PaX enabled kernel :(
+ host-is-pax && config="${config} --disable-bootstrap"
+ elif has "${vm}" gcj-jdk cacao; then
+ if host-is-pax; then
+ eerror "Can't currently bootstrap IcedTea using gcj-jdk or cacao on a PaX enabled host"
+ eerror "Sorry for the inconvenience"
+ die "Use an existing IcedTea build instead or disable PaX on the host"
+ fi
+ else
eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
fi
1.5 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.4&r2=1.5
Index: icedtea-6.1.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icedtea-6.1.10.4-r1.ebuild 10 Nov 2011 21:42:13 -0000 1.4
+++ icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 11:01:47 -0000 1.5
@@ -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/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.4 2011/11/10 21:42:13 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.5 2011/11/18 11:01:47 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -177,10 +177,10 @@
local vmhome="/usr/lib/jvm/${vm}"
# IcedTea6 can't be built using IcedTea7; its class files are too new
- if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]]; then
+ if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
# If we are upgrading icedtea, then we don't need to bootstrap.
config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap"
- elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
+ elif has "${vm}" gcj-jdk cacao; then
# For other 1.5 JDKs e.g. GCJ, CACAO.
config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
config="${config} --with-jdk-home=${vmhome}"
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
@ 2011-11-18 16:41 Vlastimil Babka (caster)
0 siblings, 0 replies; 9+ messages in thread
From: Vlastimil Babka (caster) @ 2011-11-18 16:41 UTC (permalink / raw
To: gentoo-commits
caster 11/11/18 16:41:38
Modified: ChangeLog icedtea-7.2.0-r1.ebuild
icedtea-6.1.10.4-r1.ebuild
Log:
Fix detection of parallel jobs from MAKEOPTS to handle all syntax variants. Fixes bug #337827 and #389791. Using syntax from waf-utils.eclass
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
Revision Changes Path
1.49 dev-java/icedtea/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.48&r2=1.49
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChangeLog 18 Nov 2011 11:01:45 -0000 1.48
+++ ChangeLog 18 Nov 2011 16:41:38 -0000 1.49
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.48 2011/11/18 11:01:45 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.49 2011/11/18 16:41:38 caster Exp $
+
+ 18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+ icedtea-7.2.0-r1.ebuild:
+ Fix detection of parallel jobs from MAKEOPTS to handle all syntax variants.
+ Fixes bug #337827 and #389791. Using syntax from waf-utils.eclass
18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
icedtea-7.2.0-r1.ebuild:
1.13 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.12&r2=1.13
Index: icedtea-7.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- icedtea-7.2.0-r1.ebuild 18 Nov 2011 11:01:45 -0000 1.12
+++ icedtea-7.2.0-r1.ebuild 18 Nov 2011 16:41:38 -0000 1.13
@@ -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/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.12 2011/11/18 11:01:45 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.13 2011/11/18 16:41:38 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -204,12 +204,12 @@
die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
fi
- # OpenJDK-specific parallelism support.
- procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
- if [[ -n ${procs} ]] ; then
- config="${config} --with-parallel-jobs=${procs}";
- einfo "Configuring using --with-parallel-jobs=${procs}"
- fi
+ # OpenJDK-specific parallelism support. Bug #389791, #337827
+ # Implementation modified from waf-utils.eclass
+ # Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+ local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+ config="${config} --with-parallel-jobs=${procs}";
+ einfo "Configuring using --with-parallel-jobs=${procs}"
if use_zero ; then
config="${config} --enable-zero"
1.6 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.5&r2=1.6
Index: icedtea-6.1.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 11:01:47 -0000 1.5
+++ icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 16:41:38 -0000 1.6
@@ -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/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.5 2011/11/18 11:01:47 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.6 2011/11/18 16:41:38 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -189,12 +189,12 @@
die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
fi
- # OpenJDK-specific parallelism support.
- procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
- if [[ -n ${procs} ]] ; then
- config="${config} --with-parallel-jobs=${procs}";
- einfo "Configuring using --with-parallel-jobs=${procs}"
- fi
+ # OpenJDK-specific parallelism support. Bug #389791, #337827
+ # Implementation modified from waf-utils.eclass
+ # Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+ local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+ config="${config} --with-parallel-jobs=${procs}";
+ einfo "Configuring using --with-parallel-jobs=${procs}"
if use_zero ; then
config="${config} --enable-zero"
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
@ 2011-11-18 18:11 Ralph Sennhauser (sera)
0 siblings, 0 replies; 9+ messages in thread
From: Ralph Sennhauser (sera) @ 2011-11-18 18:11 UTC (permalink / raw
To: gentoo-commits
sera 11/11/18 18:11:15
Modified: ChangeLog icedtea-7.2.0-r1.ebuild
icedtea-6.1.10.4-r1.ebuild
Log:
Add additional PaX markings to executables for x86. Bug 389751
(Portage version: 2.1.10.35/cvs/Linux x86_64)
Revision Changes Path
1.50 dev-java/icedtea/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.49&r2=1.50
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog 18 Nov 2011 16:41:38 -0000 1.49
+++ ChangeLog 18 Nov 2011 18:11:15 -0000 1.50
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.49 2011/11/18 16:41:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.50 2011/11/18 18:11:15 sera Exp $
+
+ 18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+ icedtea-7.2.0-r1.ebuild:
+ Add additional PaX markings to executables for x86. Bug 389751
18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
icedtea-7.2.0-r1.ebuild:
1.14 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.13&r2=1.14
Index: icedtea-7.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- icedtea-7.2.0-r1.ebuild 18 Nov 2011 16:41:38 -0000 1.13
+++ icedtea-7.2.0-r1.ebuild 18 Nov 2011 18:11:15 -0000 1.14
@@ -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/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.13 2011/11/18 16:41:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.14 2011/11/18 18:11:15 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -287,7 +287,9 @@
# Set PaX markings on all JDK/JRE executables to allow code-generation on
# the heap by the JIT compiler.
- pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
+ local marks="m"
+ use x86 && marks="msp"
+ pax-mark ${marks} $(list-paxables "${ddest}"{,/jre}/bin/*)
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
1.7 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.6&r2=1.7
Index: icedtea-6.1.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 16:41:38 -0000 1.6
+++ icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 18:11:15 -0000 1.7
@@ -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/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.6 2011/11/18 16:41:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.7 2011/11/18 18:11:15 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -269,7 +269,9 @@
# Set PaX markings on all JDK/JRE executables to allow code-generation on
# the heap by the JIT compiler.
- pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
+ local marks="m"
+ use x86 && marks="msp"
+ pax-mark ${marks} $(list-paxables "${ddest}"{,/jre}/bin/*)
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
@ 2011-11-18 21:02 Vlastimil Babka (caster)
0 siblings, 0 replies; 9+ messages in thread
From: Vlastimil Babka (caster) @ 2011-11-18 21:02 UTC (permalink / raw
To: gentoo-commits
caster 11/11/18 21:02:03
Modified: ChangeLog icedtea-7.2.0-r1.ebuild
icedtea-6.1.10.4-r1.ebuild
Log:
Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it used only for ppc/ppc64. This functionality was experimental and brought more problems than benefits. Also remove the bootstrapping with cacao due to failures. Fixes numerous bugs.
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
Revision Changes Path
1.51 dev-java/icedtea/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.50&r2=1.51
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog 18 Nov 2011 18:11:15 -0000 1.50
+++ ChangeLog 18 Nov 2011 21:02:01 -0000 1.51
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.50 2011/11/18 18:11:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.51 2011/11/18 21:02:01 caster Exp $
+
+ 18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+ icedtea-7.2.0-r1.ebuild:
+ Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it
+ used only for ppc/ppc64. This functionality was experimental and brought more
+ problems than benefits. Also remove the bootstrapping with cacao due to
+ failures. Fixes numerous bugs.
18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
icedtea-7.2.0-r1.ebuild:
1.15 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.14&r2=1.15
Index: icedtea-7.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- icedtea-7.2.0-r1.ebuild 18 Nov 2011 18:11:15 -0000 1.14
+++ icedtea-7.2.0-r1.ebuild 18 Nov 2011 21:02:01 -0000 1.15
@@ -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/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.14 2011/11/18 18:11:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.15 2011/11/18 21:02:01 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -25,8 +25,6 @@
JAXWS_TARBALL="a2ebfdc9db7e.tar.gz"
JDK_TARBALL="2054526dd141.tar.gz"
LANGTOOLS_TARBALL="9b85f1265346.tar.gz"
-CACAO_TARBALL="4549072ab2de.tar.gz"
-JAMVM_TARBALL="310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz"
SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive/${OPENJDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/corba/archive/${CORBA_TARBALL}
@@ -34,14 +32,13 @@
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/${JAXWS_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/${JDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/${HOTSPOT_TARBALL}
- http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}
- jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/jamvm-${JAMVM_TARBALL} )"
+ http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}"
HOMEPAGE="http://icedtea.classpath.org"
S=${WORKDIR}/${ICEDTEA_PKG}
# Missing options:
# shark - needs adding
-IUSE="debug doc examples jamvm javascript +nsplugin pulseaudio systemtap +webstart zero"
+IUSE="debug doc examples javascript +nsplugin pulseaudio systemtap +webstart"
RDEPEND=">=net-print/cups-1.2.12
>=x11-libs/libX11-1.1.3
@@ -63,7 +60,8 @@
x11-proto/xineramaproto
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
javascript? ( dev-java/rhino:1.6 )
- zero? ( virtual/libffi )
+ ppc? ( virtual/libffi )
+ ppc64? ( virtual/libffi )
>=x11-libs/libXrender-0.9.4
systemtap? ( >=dev-util/systemtap-1 )
!dev-java/icedtea:0
@@ -81,7 +79,6 @@
DEPEND="${RDEPEND}
|| (
>=dev-java/gcj-jdk-4.3
- >=dev-java/cacao-0.99.2
dev-java/icedtea-bin:7
dev-java/icedtea-bin:6
dev-java/icedtea:7
@@ -107,19 +104,6 @@
JAVA_PKG_WANT_TARGET="1.5"
pkg_setup() {
-# Shark support disabled for now - still experimental and needs sys-devel/llvm
-# if use shark ; then
-# if ( ! use x86 && ! use sparc && ! use ppc ) ; then
-# eerror "The Shark JIT has known issues on 64-bit platforms. Please rebuild"
-# errror "without the shark USE flag turned on."
-# die "Rebuild without the shark USE flag on."
-# fi
-# if ( ! use zero ) ; then
-# eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-# die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-# fi
-# fi
-
if use nsplugin && ! use webstart ; then
elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
fi
@@ -151,8 +135,6 @@
JAVA_PKG_FORCE_VM="icedtea-bin-6"
elif has_version dev-java/gcj-jdk; then
JAVA_PKG_FORCE_VM="gcj-jdk"
- elif has_version dev-java/cacao; then
- JAVA_PKG_FORCE_VM="cacao"
else
die "Unable to find a supported VM for building"
fi
@@ -193,7 +175,7 @@
elif has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
# We can't currently bootstrap with a PaX enabled kernel :(
host-is-pax && config="${config} --disable-bootstrap"
- elif has "${vm}" gcj-jdk cacao; then
+ elif has "${vm}" gcj-jdk ; then
if host-is-pax; then
eerror "Can't currently bootstrap IcedTea using gcj-jdk or cacao on a PaX enabled host"
eerror "Sorry for the inconvenience"
@@ -201,7 +183,7 @@
fi
else
eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
- die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
+ die "Install a GNU Classpath JDK (gcj-jdk)"
fi
# OpenJDK-specific parallelism support. Bug #389791, #337827
@@ -211,7 +193,7 @@
config="${config} --with-parallel-jobs=${procs}";
einfo "Configuring using --with-parallel-jobs=${procs}"
- if use_zero ; then
+ if need_zero ; then
config="${config} --enable-zero"
else
config="${config} --disable-zero"
@@ -221,15 +203,6 @@
rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
fi
-# CACAO disabled until it has OpenJDK7 support
-# if use cacao ; then
-# config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}";
-# fi
-
- if use jamvm ; then
- config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}";
- fi
-
unset_vars
econf ${config} \
@@ -246,7 +219,8 @@
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
$(use_with javascript rhino ${rhino_jar}) \
- $(use_enable zero) \
+ --disable-cacao \
+ --disable-jamvm \
$(use_enable pulseaudio pulse-java) \
$(use_enable systemtap)
}
@@ -323,8 +297,8 @@
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
}
-use_zero() {
- use zero || ( ! use amd64 && ! use x86 && ! use sparc )
+need_zero() {
+ ! use amd64 && ! use x86 && ! use sparc
}
pkg_preinst() {
1.8 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.7&r2=1.8
Index: icedtea-6.1.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 18:11:15 -0000 1.7
+++ icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 21:02:03 -0000 1.8
@@ -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/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.7 2011/11/18 18:11:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.8 2011/11/18 21:02:03 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -25,22 +25,18 @@
JAXWS_TARBALL="jdk6-jaxws-b20.zip"
JAF_TARBALL="jdk6-jaf-b20.zip"
HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz"
-CACAO_TARBALL="c7bf150bfa46.tar.gz"
-JAMVM_TARBALL="jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz"
SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
- hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )
- cacao? ( http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} )
- jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} )"
+ hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )"
HOMEPAGE="http://icedtea.classpath.org"
S=${WORKDIR}/${ICEDTEA_PKG}
# Missing options:
# shark - needs adding
-IUSE="cacao debug doc examples +hs20 jamvm javascript nio2 +nsplugin +nss pulseaudio systemtap +webstart +xrender zero"
+IUSE="debug doc examples +hs20 javascript nio2 +nsplugin +nss pulseaudio systemtap +webstart +xrender"
# JTReg doesn't pass at present
RESTRICT="test"
@@ -64,7 +60,8 @@
x11-proto/xineramaproto
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
javascript? ( dev-java/rhino:1.6 )
- zero? ( virtual/libffi )
+ ppc? ( virtual/libffi )
+ ppc64? ( virtual/libffi )
xrender? ( >=x11-libs/libXrender-0.9.4 )
systemtap? ( >=dev-util/systemtap-1 )
!dev-java/icedtea6
@@ -82,7 +79,6 @@
DEPEND="${RDEPEND}
|| (
( >=dev-java/gcj-jdk-4.3 >=app-admin/eselect-ecj-0.5-r1 )
- ( >=dev-java/cacao-0.99.2 >=app-admin/eselect-ecj-0.5-r1 )
dev-java/icedtea-bin:6
dev-java/icedtea:${SLOT}
)
@@ -113,19 +109,6 @@
JAVA_PKG_WANT_TARGET="1.5"
pkg_setup() {
-# Shark support disabled for now - still experimental and needs sys-devel/llvm
-# if use shark ; then
-# if ( ! use x86 && ! use sparc && ! use ppc ) ; then
-# eerror "The Shark JIT has known issues on 64-bit platforms. Please rebuild"
-# errror "without the shark USE flag turned on."
-# die "Rebuild without the shark USE flag on."
-# fi
-# if ( ! use zero ) ; then
-# eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-# die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-# fi
-# fi
-
if use nsplugin && ! use webstart ; then
elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
fi
@@ -151,8 +134,6 @@
JAVA_PKG_FORCE_VM="icedtea-bin-6"
elif has_version dev-java/gcj-jdk; then
JAVA_PKG_FORCE_VM="gcj-jdk"
- elif has_version dev-java/cacao; then
- JAVA_PKG_FORCE_VM="cacao"
else
die "Unable to find a supported VM for building"
fi
@@ -180,13 +161,13 @@
if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
# If we are upgrading icedtea, then we don't need to bootstrap.
config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap"
- elif has "${vm}" gcj-jdk cacao; then
- # For other 1.5 JDKs e.g. GCJ, CACAO.
+ elif has "${vm}" gcj-jdk; then
+ # For other 1.5 JDKs e.g. GCJ
config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
config="${config} --with-jdk-home=${vmhome}"
else
eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
- die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
+ die "Install a GNU Classpath JDK (gcj-jdk)"
fi
# OpenJDK-specific parallelism support. Bug #389791, #337827
@@ -196,7 +177,7 @@
config="${config} --with-parallel-jobs=${procs}";
einfo "Configuring using --with-parallel-jobs=${procs}"
- if use_zero ; then
+ if need_zero ; then
config="${config} --enable-zero"
else
config="${config} --disable-zero"
@@ -210,14 +191,6 @@
config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}"
fi
- if use cacao ; then
- config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
- fi
-
- if use jamvm ; then
- config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
- fi
-
unset_vars
econf ${config} \
@@ -229,8 +202,8 @@
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
$(use_with javascript rhino ${rhino_jar}) \
- $(use_enable cacao) \
- $(use_enable jamvm) \
+ --disable-cacao \
+ --disable-jamvm \
$(use_enable pulseaudio pulse-java) \
$(use_enable xrender) \
$(use_enable systemtap) \
@@ -303,8 +276,8 @@
set_java_env "${T}/icedtea.env"
}
-use_zero() {
- use zero || ( ! use amd64 && ! use x86 && ! use sparc )
+need_zero() {
+ ! use amd64 && ! use x86 && ! use sparc
}
pkg_preinst() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
@ 2011-11-18 21:18 Vlastimil Babka (caster)
0 siblings, 0 replies; 9+ messages in thread
From: Vlastimil Babka (caster) @ 2011-11-18 21:18 UTC (permalink / raw
To: gentoo-commits
caster 11/11/18 21:18:40
Modified: ChangeLog icedtea-7.2.0-r1.ebuild
icedtea-6.1.10.4-r1.ebuild
Log:
Add missing cpio dep and remove the old libXext version variant, bug #389599.
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
Revision Changes Path
1.52 dev-java/icedtea/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.51&r2=1.52
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog 18 Nov 2011 21:02:01 -0000 1.51
+++ ChangeLog 18 Nov 2011 21:18:40 -0000 1.52
@@ -1,259 +1,8 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.51 2011/11/18 21:02:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.52 2011/11/18 21:18:40 caster Exp $
18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
icedtea-7.2.0-r1.ebuild:
- Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it
- used only for ppc/ppc64. This functionality was experimental and brought more
- problems than benefits. Also remove the bootstrapping with cacao due to
- failures. Fixes numerous bugs.
-
- 18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
- icedtea-7.2.0-r1.ebuild:
- Add additional PaX markings to executables for x86. Bug 389751
-
- 18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
- icedtea-7.2.0-r1.ebuild:
- Fix detection of parallel jobs from MAKEOPTS to handle all syntax variants.
- Fixes bug #337827 and #389791. Using syntax from waf-utils.eclass
-
- 18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
- icedtea-7.2.0-r1.ebuild:
- Add --disable-bootstrap on PaX enabled hosts when building using IcedTea7.
- Bug #389751.
-
- 13 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r1.ebuild:
- Fix building with PaX enabled kernels. Bug #389751. Thanks to Daniel Kuehn
- <enhaisa@gmail.com> and Magnus Granberg <zorry@gentoo.org> for their help
- finding the patch
-
- 12 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r1.ebuild:
- Use java-vm_sandbox-predict for installing the controle file
-
- 11 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
- Support building using icedtea-bin-7.
-
- 10 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
- icedtea-7.2.0-r1.ebuild:
- Fix building with unusal locales, bug #330433 #389717
-
- 08 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
- icedtea-7.2.0-r1.ebuild:
- Allow building of icedtea with icedtea-bin-6, bug 389885
-
- 07 Nov 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.10.4.ebuild,
- icedtea-6.1.10.4-r1.ebuild, icedtea-7.2.0-r1.ebuild:
- Prepare for icedtea-bin version and VMHANDLE migration.
-
- 06 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
- Fix build due to missing ant class when xalan and xerces are not installed,
- bug #389625.
-
- 05 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
- Relax lcms dep to allow the stable 2.0a satisfy it.
-
- 05 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> icedtea-7.2.0-r1.ebuild:
- QA fix: add missing cpio dependency.
-
- 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
- Add ~x86 keyword.
-
-*icedtea-7.2.0-r1 (04 Nov 2011)
-
- 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-7.2.0-r1.ebuild:
- Version bump from the java-overlay, bug #382485.
-
- 04 Nov 2011; Vlastimil Babka <caster@gentoo.org>
- -files/6.1.10.2-371405-linux_version.patch, -files/6.1.9.6-sparc.patch:
- Remove unused patches.
-
-*icedtea-6.1.10.4-r1 (04 Nov 2011)
-
- 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.4-r1.ebuild:
- Revbump to use EAPI=4 and change the VMHANDLE icedtea6 to the standard
- icedtea-6. System vm setting is upgraded automatically. Any user-vm setting
- have to be migrated manually.
-
- 30 Oct 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.10.2.ebuild,
- -icedtea-6.1.10.3.ebuild, icedtea-6.1.10.4.ebuild:
- Package move icedtea6-bin to icedtea-bin.
-
-*icedtea-6.1.10.4 (21 Oct 2011)
-
- 21 Oct 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.4.ebuild:
- Version bump, security bug #387637.
-
- 09 Sep 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.2.ebuild,
- icedtea-6.1.10.3.ebuild:
- Use /usr/lib instead of get_libdir for the vmhome path, bug #380853.
-
-*icedtea-6.1.10.3 (22 Jul 2011)
-
- 22 Jul 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.3.ebuild:
- Version bump, from java-overlay.
-
- 17 Jul 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.9.7-r1.ebuild,
- -icedtea-6.1.10.ebuild, -icedtea-6.1.10.1.ebuild, icedtea-6.1.10.2.ebuild,
- +files/6.1.10.2-371405-linux_version.patch:
- Apply patch for Linux 3.* compatibility from overlay, fixing buf #371405.
- Remove old versions.
-
-*icedtea-6.1.10.2 (09 Jun 2011)
-
- 09 Jun 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.2.ebuild:
- Version bump, security bug #370787.
-
- 22 Apr 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml:
- Spelling.
-
-*icedtea-6.1.10.1 (08 Apr 2011)
-
- 08 Apr 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.7-r1.ebuild,
- icedtea-6.1.10.ebuild, +icedtea-6.1.10.1.ebuild, metadata.xml:
- Version bump, bug #361921. Restrict libpng deps on older versions.
-
- 29 Mar 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.7-r1.ebuild,
- icedtea-6.1.10.ebuild:
- Slot GTK+ deps.
-
-*icedtea-6.1.10 (05 Mar 2011)
-
- 05 Mar 2011; <caster@gentoo.org> -icedtea-6.1.9.6.ebuild,
- +icedtea-6.1.10.ebuild, metadata.xml:
- Version bump, bug #357153.
-
-*icedtea-6.1.9.7-r1 (18 Feb 2011)
-
- 18 Feb 2011; Vlastimil Babka <caster@gentoo.org> -files/6.1.9.4-sparc.patch,
- -icedtea-6.1.9.4.ebuild, -icedtea-6.1.9.5.ebuild, +icedtea-6.1.9.7-r1.ebuild,
- -files/6.1.9.5-sparc.patch, -files/icedtea-old.env:
- Version bump, security bug #355127. Webstart and nsplugin are now deferred to
- separate icedtea-web package via PDEPEND.
-
-*icedtea-6.1.9.6 (09 Feb 2011)
-
- 09 Feb 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.6-sparc.patch,
- +icedtea-6.1.9.6.ebuild:
- Version bump, security bug #354231.
-
-*icedtea-6.1.9.5 (02 Feb 2011)
-
- 02 Feb 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.5-sparc.patch,
- +icedtea-6.1.9.5.ebuild, +files/icedtea-old.env, -files/6.1.9.3-sparc.patch,
- -icedtea-6.1.9.3.ebuild, icedtea-6.1.9.4.ebuild, files/icedtea.env:
- Version bump, security bug #353418. Use get_libdir to set proper lib dir in
- the env file.
-
- 21 Jan 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.3.ebuild,
- icedtea-6.1.9.4.ebuild:
- Use virtual/jpeg, bug #347953.
-
- 21 Jan 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.4-sparc.patch:
- Add missing patch from the overlay, sorry. Bug #352314.
-
-*icedtea-6.1.9.4 (21 Jan 2011)
-
- 21 Jan 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.9.1.ebuild,
- -icedtea-6.1.9.2.ebuild, +icedtea-6.1.9.4.ebuild:
- Version bump, including security fix for CVE-2010-4351: IcedTea JNLP
- SecurityManager bypass. Bug #352035.
-
- 20 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
- icedtea-6.1.9.3.ebuild:
- Mark ~ppc/~ppc64 wrt #308513. Thanks to Kris Hepler <khepler@gmail.com>
- for testing.
-
- 12 Dec 2010; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.3-sparc.patch,
- icedtea-6.1.9.3.ebuild:
- Add patch for sparc, bug #344659.
-
- 02 Dec 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.3.ebuild,
- metadata.xml:
- Check that webstart flag is enabled if nsplugin flag is enabled. Document
- this in metadata.xml.
-
-*icedtea-6.1.9.3 (02 Dec 2010)
-
- 02 Dec 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.3.ebuild:
- Version bump.
-
- 26 Nov 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.1.ebuild,
- icedtea-6.1.9.2.ebuild:
- Use versionator for ICEDTEA_VER
-
-*icedtea-6.1.9.2 (25 Nov 2010)
-
- 25 Nov 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.2.ebuild,
- metadata.xml:
- Security version bump, bug #346799, thanks to Andrew John Hughes
- (gnu_andrew@member.fsf.org). Also adds webstart useflag.
-
- 14 Nov 2010; Vlastimil Babka <caster@gentoo.org>
- -files/6.1.8.0-systemtap-gcc-4.5.patch, -icedtea-6.1.8.0.ebuild,
- -icedtea-6.1.8.1.ebuild, -icedtea-6.1.9.ebuild:
- Remove old.
-
- 14 Nov 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.8.0.ebuild,
- icedtea-6.1.8.1.ebuild, icedtea-6.1.9.ebuild, icedtea-6.1.9.1.ebuild:
- Fix eselect-ecj deps.
-
-*icedtea-6.1.9.1 (13 Oct 2010)
-
- 13 Oct 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.1.ebuild,
- metadata.xml:
- Version bump, security bug #340819.
-
-*icedtea-6.1.9 (09 Sep 2010)
-
- 09 Sep 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.ebuild:
- Version bump from java-overlay.
-
-*icedtea-6.1.8.1 (30 Jul 2010)
-
- 30 Jul 2010; Vlastimil Babka <caster@gentoo.org> -files/1.7.2-free.patch,
- -files/6.1.7.3-systemtap-gcc-4.5.patch, -icedtea-6.1.7.2-r1.ebuild,
- -icedtea-6.1.7.3.ebuild, +icedtea-6.1.8.1.ebuild, metadata.xml:
- Security version bump, bug #330205. Remove the older 1.7.x.
-
-*icedtea-6.1.7.3 (03 May 2010)
-
- 03 May 2010; Vlastimil Babka <caster@gentoo.org>
- +files/6.1.7.3-systemtap-gcc-4.5.patch,
- +files/6.1.8.0-systemtap-gcc-4.5.patch, -icedtea-6.1.7.1.ebuild,
- +icedtea-6.1.7.3.ebuild, icedtea-6.1.8.0.ebuild:
- Fix building with gcc-4.5 and USE=systemtap - fixes bug #317343. Bump the
- 6.1.7.2-r1 to 6.7.1.3 (which is the same)for easier sync with the overlay.
-
- 15 Apr 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.8.0.ebuild:
- Add ant-nodeps to DEPEND since it's used in ANT_TASKS variable. Bug
- #315457.
-
-*icedtea-6.1.8.0 (14 Apr 2010)
-
- 14 Apr 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.8.0.ebuild:
- Version bump, based on java-overlay ebuild. Remove the npplugin flag as
- upstream removed the old plugin - the npplugin is now installed simply
- with USE=nsplugin.
-
- 31 Mar 2010; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.7.2.ebuild:
- Remove the unpatched revision.
-
-*icedtea-6.1.7.2-r1 (31 Mar 2010)
-
- 31 Mar 2010; Vlastimil Babka <caster@gentoo.org> +files/1.7.2-free.patch,
- +icedtea-6.1.7.2-r1.ebuild:
- Revbump to fix buffer overflow in npplugin.
-
-*icedtea-6.1.7.2 (31 Mar 2010)
-
- 31 Mar 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.7.2.ebuild:
- Version bump, security bug #312297.
-
-*icedtea-6.1.7.1 (04 Mar 2010)
-
- 04 Mar 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.7.1.ebuild,
- +files/generate-cacerts.pl, +files/icedtea.env, +metadata.xml:
- Import of ebuild by Andrew John Hughes (gnu_andrew@member.fsf.org) from
- java-overlay.
+ Add missing cpio dep and remove the old libXext version variant, bug #389599.
1.16 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.15&r2=1.16
Index: icedtea-7.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- icedtea-7.2.0-r1.ebuild 18 Nov 2011 21:02:01 -0000 1.15
+++ icedtea-7.2.0-r1.ebuild 18 Nov 2011 21:18:40 -0000 1.16
@@ -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/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.15 2011/11/18 21:02:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.16 2011/11/18 21:18:40 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -51,6 +51,7 @@
>=x11-libs/libXau-1.0.3
>=x11-libs/libXdmcp-1.0.2
>=x11-libs/libXtst-1.0.3
+ >=x11-libs/libXext-1.1.1
virtual/jpeg
>=media-libs/libpng-1.2
>=media-libs/giflib-4.1.6
@@ -86,6 +87,8 @@
)
app-arch/zip
>=dev-libs/libxslt-1.1.26
+ >=x11-proto/xextproto-7.1.1
+ x11-proto/xproto
>=dev-java/ant-core-1.8.1
dev-java/ant-nodeps
app-misc/ca-certificates
1.9 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.8&r2=1.9
Index: icedtea-6.1.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 21:02:03 -0000 1.8
+++ icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 21:18:40 -0000 1.9
@@ -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/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.8 2011/11/18 21:02:03 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.9 2011/11/18 21:18:40 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -90,15 +90,11 @@
app-misc/ca-certificates
dev-lang/perl
dev-libs/openssl
- || (
- (
- >=x11-libs/libXext-1.1.1
- >=x11-proto/xextproto-7.1.1
- x11-proto/xproto
- )
- <x11-libs/libXext-1.1.1
- )
- sys-apps/lsb-release"
+ >=x11-libs/libXext-1.1.1
+ >=x11-proto/xextproto-7.1.1
+ x11-proto/xproto
+ sys-apps/lsb-release
+ app-arch/cpio"
PDEPEND="webstart? ( dev-java/icedtea-web:6 )
nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
@ 2011-11-18 22:00 Ralph Sennhauser (sera)
0 siblings, 0 replies; 9+ messages in thread
From: Ralph Sennhauser (sera) @ 2011-11-18 22:00 UTC (permalink / raw
To: gentoo-commits
sera 11/11/18 22:00:16
Modified: ChangeLog icedtea-7.2.0-r1.ebuild
icedtea-6.1.10.4-r1.ebuild
Log:
Remove unneeded pkg_postinst
(Portage version: 2.1.10.35/cvs/Linux x86_64)
Revision Changes Path
1.53 dev-java/icedtea/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.52&r2=1.53
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog 18 Nov 2011 21:18:40 -0000 1.52
+++ ChangeLog 18 Nov 2011 22:00:15 -0000 1.53
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.52 2011/11/18 21:18:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.53 2011/11/18 22:00:15 sera Exp $
+
+ 18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+ icedtea-7.2.0-r1.ebuild:
+ Remove unneeded pkg_postinst
18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
icedtea-7.2.0-r1.ebuild:
1.17 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.16&r2=1.17
Index: icedtea-7.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- icedtea-7.2.0-r1.ebuild 18 Nov 2011 21:18:40 -0000 1.16
+++ icedtea-7.2.0-r1.ebuild 18 Nov 2011 22:00:15 -0000 1.17
@@ -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/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.16 2011/11/18 21:18:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.17 2011/11/18 22:00:15 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -315,8 +315,3 @@
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
fi
}
-
-pkg_postinst() {
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-}
1.10 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.9&r2=1.10
Index: icedtea-6.1.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 21:18:40 -0000 1.9
+++ icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 22:00:16 -0000 1.10
@@ -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/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.9 2011/11/18 21:18:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.10 2011/11/18 22:00:16 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -287,8 +287,3 @@
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
fi
}
-
-pkg_postinst() {
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-}
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild
@ 2011-11-21 11:40 Ralph Sennhauser (sera)
0 siblings, 0 replies; 9+ messages in thread
From: Ralph Sennhauser (sera) @ 2011-11-21 11:40 UTC (permalink / raw
To: gentoo-commits
sera 11/11/21 11:40:06
Modified: ChangeLog icedtea-7.2.0-r1.ebuild
icedtea-6.1.10.4-r1.ebuild
Log:
Use java-vm-2.eclass to set PaX markings
(Portage version: 2.1.10.35/cvs/Linux x86_64)
Revision Changes Path
1.54 dev-java/icedtea/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.53&r2=1.54
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog 18 Nov 2011 22:00:15 -0000 1.53
+++ ChangeLog 21 Nov 2011 11:40:06 -0000 1.54
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.53 2011/11/18 22:00:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.54 2011/11/21 11:40:06 sera Exp $
+
+ 21 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+ icedtea-7.2.0-r1.ebuild:
+ Use java-vm-2.eclass to set PaX markings
18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
icedtea-7.2.0-r1.ebuild:
1.18 dev-java/icedtea/icedtea-7.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild?r1=1.17&r2=1.18
Index: icedtea-7.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- icedtea-7.2.0-r1.ebuild 18 Nov 2011 22:00:15 -0000 1.17
+++ icedtea-7.2.0-r1.ebuild 21 Nov 2011 11:40:06 -0000 1.18
@@ -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/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.17 2011/11/18 22:00:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.18 2011/11/21 11:40:06 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -9,7 +9,7 @@
EAPI="4"
-inherit flag-o-matic java-pkg-2 java-vm-2 pax-utils versionator
+inherit flag-o-matic java-pkg-2 java-vm-2 versionator
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
SLOT="7"
@@ -262,12 +262,6 @@
# doins can't handle symlinks.
cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
- # Set PaX markings on all JDK/JRE executables to allow code-generation on
- # the heap by the JIT compiler.
- local marks="m"
- use x86 && marks="msp"
- pax-mark ${marks} $(list-paxables "${ddest}"{,/jre}/bin/*)
-
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
if use examples; then
@@ -280,6 +274,9 @@
# Fix the permissions.
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+ # Needs to be done before generating cacerts
+ java-vm_set-pax-markings "${ddest}"
+
# We need to generate keystore - bug #273306
einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
mkdir "${T}/certgen" && cd "${T}/certgen" || die
1.11 dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild?r1=1.10&r2=1.11
Index: icedtea-6.1.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- icedtea-6.1.10.4-r1.ebuild 18 Nov 2011 22:00:16 -0000 1.10
+++ icedtea-6.1.10.4-r1.ebuild 21 Nov 2011 11:40:06 -0000 1.11
@@ -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/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.10 2011/11/18 22:00:16 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.11 2011/11/21 11:40:06 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -236,12 +236,6 @@
# doins can't handle symlinks.
cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
- # Set PaX markings on all JDK/JRE executables to allow code-generation on
- # the heap by the JIT compiler.
- local marks="m"
- use x86 && marks="msp"
- pax-mark ${marks} $(list-paxables "${ddest}"{,/jre}/bin/*)
-
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
if use examples; then
@@ -254,6 +248,9 @@
# Fix the permissions.
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+ # Needs to be done before generating cacerts
+ java-vm_set-pax-markings "${ddest}"
+
# We need to generate keystore - bug #273306
einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
mkdir "${T}/certgen" && cd "${T}/certgen" || die
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-11-21 11:40 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-18 18:11 [gentoo-commits] gentoo-x86 commit in dev-java/icedtea: ChangeLog icedtea-7.2.0-r1.ebuild icedtea-6.1.10.4-r1.ebuild Ralph Sennhauser (sera)
-- strict thread matches above, loose matches on Subject: below --
2011-11-21 11:40 Ralph Sennhauser (sera)
2011-11-18 22:00 Ralph Sennhauser (sera)
2011-11-18 21:18 Vlastimil Babka (caster)
2011-11-18 21:02 Vlastimil Babka (caster)
2011-11-18 16:41 Vlastimil Babka (caster)
2011-11-18 11:01 Ralph Sennhauser (sera)
2011-11-10 21:42 Ralph Sennhauser (sera)
2011-11-08 19:01 Ralph Sennhauser (sera)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox