Allow building of icedtea with icedtea-bin-6, bug 389885

Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 90e644066bc95822d684bafd8a51f15fe0e00cde..71cac8d654efc8fbcd84eba1188144b5c0d5ae7f 100644 (file)
--- 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/Manifest b/dev-java/icedtea/Manifest
index 52e89d7d6e9355133b81642cf52427e5cf30c49d..0058a53973b00d46078b6d0a314b70ba81bdb970 100644 (file)
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -17,7 +17,7 @@ DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
-EBUILD icedtea-6.1.10.4-r1.ebuild 11009 RMD160 15f411ef70304f00cf2ecde4d239d9512a3bd460 SHA1 5e27b44557c8ffa13a902ae02ba981c1b3f9a6e8 SHA256 c1918323719382d96ebae25b24901f78e20e1b51bc76785292309f9d34665634
-EBUILD icedtea-7.2.0-r1.ebuild 11027 RMD160 0c0de56c4b587a30d324d8a2fd3932a8d1ddd21c SHA1 097dfc0413544f66f62da4ea2242f512150f0ae6 SHA256 fa307ab5ed119350aabd3df7f0662d60dfe32573dc0230ddd857b80dae2850e1
-MISC ChangeLog 8197 RMD160 dfdeb09bf8c1d4d5164167aa811a1fe6f829a2fd SHA1 11b72812b012899ed278600696dfbc78734218d6 SHA256 fe16abd904e3e539b142fed507f971eaf7fe11ba2f6fd2bef0e50274e0bf5b40
+EBUILD icedtea-6.1.10.4-r1.ebuild 11036 RMD160 e60f488dda3d73dd6643073164cb814bbc117114 SHA1 6af738562b5e16c882daf68731460da15fb334c1 SHA256 25449a430a310f5c963c146f1f6bc484561b632f58f7e95c25d9f50c1db8277a
+EBUILD icedtea-7.2.0-r1.ebuild 11055 RMD160 f627dd3e8ae5e261dfb48bb35c8d59cf27783128 SHA1 0219cf940e52fb524dae1413857a46fb479b11df SHA256 98929206f044b36106e2485722c6808f95b7460fd3b8b916483ccb68f82b68f9
+MISC ChangeLog 8360 RMD160 f5a19969ab72c9ad6f4d241638a56c46d689f357 SHA1 5ebaa1e2f8166c0cf2f12381386d5bf2d8caab05 SHA256 2a02828ebf9e5482f7d3e0e477e6e68bd1a82cc2a79a3a36247effcf33bde437
 MISC metadata.xml 1567 RMD160 7cb547ff92d8896cdbb0dd53aa682fe31d027b4e SHA1 c42d533a391f98fa303b591a4ba1471e0de94b7c SHA256 596df17fd33825a2abb567685bda63f6ff56cbfa616911199855e3fac8bec5e4

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 44b68eac04a4a292af9698becb524100025892df..1e42f1c8f5155d5f687ae857633cf01ca3f7c635 100644 (file)
--- 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 a2ec24055e047ce2147f07de3a6b9b365282f2eb..ae2f4f95dcabec72461da8bc7a0dd57c3454eb46 100644 (file)
--- 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