chewi 15/06/20 13:45:07
Modified: icedtea-7.2.5.5.ebuild icedtea-6.1.13.7.ebuild
ChangeLog
Log:
Remove redundant --with-ecj-jar code as javac from gcj-jdk always
takes precedence. Remove redundant bootstrap_impossible code as this
is no longer relevant. Remove references to the old VM handles as the
dependencies will ensure that the new ones are always present anyway.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
9C6D7DE4)
Revision Changes Path
1.5 dev-java/icedtea/icedtea-7.2.5.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild?r1=1.4&r2=1.5
Index: icedtea-7.2.5.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icedtea-7.2.5.5.ebuild 23 May 2015 23:05:43 -0000 1.4
+++ icedtea-7.2.5.5.ebuild 20 Jun 2015 13:45:07 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild,v
1.4 2015/05/23 23:05:43 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild,v
1.5 2015/06/20 13:45:07 chewi Exp $
# Build written by Andrew John Hughes ([email protected])
# *********************************************************
@@ -179,7 +179,7 @@
icedtea_check_requirements
JAVA_PKG_WANT_BUILD_VM="
- icedtea-7 icedtea-bin-7 icedtea7
+ icedtea-7 icedtea-bin-7
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
@@ -204,25 +204,17 @@
}
src_configure() {
- local bootstrap cacao_config config hotspot_port hs_tarball use_cacao
use_zero zero_config
+ local cacao_config config hotspot_port hs_tarball use_cacao use_zero
zero_config
local vm=$(java-pkg_get-current-vm)
- # Whether to bootstrap
- bootstrap="disable"
- if use jbootstrap; then
- bootstrap="enable"
- fi
-
- if has "${vm}" gcj-jdk; then
- # gcj-jdk ensures ecj is present.
+ # gcj-jdk ensures ecj is present.
+ if use jbootstrap || has "${vm}" gcj-jdk; then
use jbootstrap || einfo "bootstrap is necessary when building
with ${vm}, ignoring USE=\"-jbootstrap\""
- bootstrap="enable"
- local ecj_jar="$(readlink
"${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
- config+=" --with-ecj-jar=${ecj_jar}"
+ config+=" --enable-bootstrap"
+ else
+ config+=" --disable-bootstrap"
fi
- config+=" --${bootstrap}-bootstrap"
-
# Use Zero if requested
if use zero; then
use_zero="yes"
1.4 dev-java/icedtea/icedtea-6.1.13.7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.7.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.7.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.7.ebuild?r1=1.3&r2=1.4
Index: icedtea-6.1.13.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.7.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icedtea-6.1.13.7.ebuild 21 May 2015 09:01:24 -0000 1.3
+++ icedtea-6.1.13.7.ebuild 20 Jun 2015 13:45:07 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.7.ebuild,v
1.3 2015/05/21 09:01:24 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.7.ebuild,v
1.4 2015/06/20 13:45:07 chewi Exp $
# Build written by Andrew John Hughes ([email protected])
# *********************************************************
@@ -143,7 +143,7 @@
icedtea_check_requirements
JAVA_PKG_WANT_BUILD_VM="
- icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+ icedtea-6 icedtea-bin-6
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
@@ -167,34 +167,18 @@
export LANG="C" LC_ALL="C"
}
-bootstrap_impossible() {
- # Fill this according to testing what works and what not
- has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
src_configure() {
- local bootstrap cacao_config config hotspot_port use_cacao use_zero
zero_config
+ local cacao_config config hotspot_port use_cacao use_zero zero_config
local vm=$(java-pkg_get-current-vm)
- # IcedTea6 can't be built using IcedTea7; its class files are too new
- # Whether to bootstrap
- bootstrap="disable"
- if use jbootstrap; then
- if bootstrap_impossible "${vm}"; then
- einfo "Bootstrap with ${vm} is currently not possible
and thus disabled, ignoring USE=jbootstrap"
- else
- bootstrap="enable"
- fi
- fi
-
- if has "${vm}" gcj-jdk; then
- # gcj-jdk ensures ecj is present.
+ # gcj-jdk ensures ecj is present.
+ if use jbootstrap || has "${vm}" gcj-jdk; then
use jbootstrap || einfo "bootstrap is necessary when building
with ${vm}, ignoring USE=\"-jbootstrap\""
- bootstrap="enable"
+ config+=" --enable-bootstrap"
+ else
+ config+=" --disable-bootstrap"
fi
- config+=" --${bootstrap}-bootstrap"
-
# Use Zero if requested
if use zero; then
use_zero="yes"
1.137 dev-java/icedtea/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.137&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.137&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.136&r2=1.137
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- ChangeLog 23 May 2015 23:05:43 -0000 1.136
+++ ChangeLog 20 Jun 2015 13:45:07 -0000 1.137
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/icedtea
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.136
2015/05/23 23:05:43 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.137
2015/06/20 13:45:07 chewi Exp $
+
+ 20 Jun 2015; James Le Cuirot <[email protected]> icedtea-6.1.13.7.ebuild,
+ icedtea-7.2.5.5.ebuild:
+ Remove redundant --with-ecj-jar code as javac from gcj-jdk always takes
+ precedence. Remove redundant bootstrap_impossible code as this is no longer
+ relevant. Remove references to the old VM handles as the dependencies will
+ ensure that the new ones are always present anyway.
23 May 2015; James Le Cuirot <[email protected]> icedtea-7.2.5.5.ebuild:
~arm keyword but only for 7. We're phasing 6 out so I don't think we'll
bother
