Prepare for icedtea-bin version and VMHANDLE migration.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 751628f65da9b3d4f4966aa213ea865f3672a883..5232594a6e47eac36ad0e3c6d2fe7a1512659a11 100644 (file)
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/jdk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.40 2011/11/04 15:14:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.41 2011/11/07 16:05:27 caster Exp $
+
+  07 Nov 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.6.0.ebuild:
+  Prepare for icedtea-bin version and VMHANDLE migration.
 
   04 Nov 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.5.0.ebuild,
   jdk-1.6.0.ebuild, jdk-1.7.0.ebuild:

diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 493e13c180f0985f53a8b551e04e1a089739c4ff..bdf5a3d8cc4c59044068e2b04a55d88576339609 100644 (file)
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,5 +1,5 @@
 EBUILD jdk-1.5.0.ebuild 1253 RMD160 5c13282b63e0211ccf9cb70c432894c49623eb21 SHA1 e82ac6e40f4442fe3dd7608a79d1f6e961ed1cd1 SHA256 71ccc8c9f2b3d76b3eec89b1d8143865c506c7a4e4ba26924a157531959c9ace
-EBUILD jdk-1.6.0.ebuild 1855 RMD160 0639b75c4d403d9fd4eb6dba32e74c02197fe8b7 SHA1 478d307f018f94641aac44b17232be2001d2eb12 SHA256 18c4e0a1a72fc9850c2bf0d510683b40d48519937467a55fa8ce2ea2e2bbf160
+EBUILD jdk-1.6.0.ebuild 1969 RMD160 fd662e306f5a46e0321082adb52ba80fca2b754e SHA1 b543913d0cbc737f8b2260b551025d68b269d4aa SHA256 4df8c2c63100f98ed220347314fb7055ae114f93f0cfd76f7093e86f9ebf5a44
 EBUILD jdk-1.7.0.ebuild 404 RMD160 4fb96a823d41b6656ef6613c58c7456ed4953497 SHA1 c7a936b8265a0ef31faa988cd6b97d714c36846a SHA256 00fa3cf51ce94e6c9b8389a824d2a91f5038c8554f49101dfe7496929d1b0a29
-MISC ChangeLog 5548 RMD160 594d92f0a67c09808db1ce20b43cf14e8787225d SHA1 802d45b38f3e37e4c85071e2b98172ea3a6b56d1 SHA256 1d8d98e250fc53c21b11cc8a45ae55e5ff369e069b9022184d0fcd7dd151de31
+MISC ChangeLog 5676 RMD160 f5718702b10eff5a63b1802fe5cc9e1882bf8771 SHA1 0d0f7fcfc63829405071304cc0ba2e38bc0ecc66 SHA256 fdc293bb190c56d93310e1308765b65a044ebdea4aa1c7c950184b382b6e303a
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb

diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild
index fe0d2166363f0644c3c1bd885b9550b8f8745002..db1395329f03d79625f3c48485738eacf9494793 100644 (file)
--- a/virtual/jdk/jdk-1.6.0.ebuild
+++ b/virtual/jdk/jdk-1.6.0.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/virtual/jdk/jdk-1.6.0.ebuild,v 1.22 2011/11/04 15:14:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.23 2011/11/07 16:05:27 caster Exp $
 
 DESCRIPTION="Virtual for JDK"
 HOMEPAGE=""
@@ -27,7 +27,9 @@ COMMON_INC="
                =dev-java/winjdk-bin-1.6.0*
 "
 
+# icedtea-bin-1* is old versioning scheme of icedtea-bin-6*
 X86_OPTS="|| (
+               =dev-java/icedtea-bin-6*
                =dev-java/icedtea-bin-1*
                =dev-java/icedtea-6*
                =dev-java/sun-jdk-1.6.0*
@@ -35,6 +37,7 @@ X86_OPTS="|| (
        )"
 
 X86_PREFIX_OPTS="|| (
+               =dev-java/icedtea-bin-6*
                =dev-java/icedtea-bin-1*
                =dev-java/sun-jdk-1.6.0*
                ${COMMON_INC}