diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2011-11-08 19:01:23 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2011-11-08 19:01:23 +0000 |
| commit | f44c8133a82215b108918a898b081a8534f815d1 (patch) | |
| tree | 9b5c8e4530eb0f4a8ff2fbda46ca2bc05ce0352b /dev-java | |
| parent | Add app-text/notecase-pro-3.5.1 (diff) | |
| download | gentoo-2-f44c8133a82215b108918a898b081a8534f815d1.tar.gz gentoo-2-f44c8133a82215b108918a898b081a8534f815d1.tar.bz2 gentoo-2-f44c8133a82215b108918a898b081a8534f815d1.zip | |
Allow building of icedtea with icedtea-bin-6, bug 389885
(Portage version: 2.1.10.32/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/icedtea/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-7.2.0-r1.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 90e644066bc9..71cac8d654ef 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -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: diff --git a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild index 44b68eac04a4..1e42f1c8f515 100644 --- a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild +++ b/dev-java/icedtea/icedtea-6.1.10.4-r1.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/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 @@ src_configure() { 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 diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild index a2ec24055e04..ae2f4f95dcab 100644 --- a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild +++ b/dev-java/icedtea/icedtea-7.2.0-r1.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/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 @@ src_configure() { 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 |