Prepare for icedtea-bin version and VMHANDLE migration.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/java-virtuals/jdk-with-com-sun/ChangeLog b/java-virtuals/jdk-with-com-sun/ChangeLog
index 80ec16eb0cdc623f6e37f2b0499b6e573b4c1308..4fe32dc2cf5e08105dddc3b117a16adf94f5ea7d 100644 (file)
--- a/java-virtuals/jdk-with-com-sun/ChangeLog
+++ b/java-virtuals/jdk-with-com-sun/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for java-virtuals/jdk-with-com-sun
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.14 2011/10/30 14:08:24 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.15 2011/11/07 16:08:10 caster Exp $
+
+*jdk-with-com-sun-20111107 (07 Nov 2011)
+
+  07 Nov 2011; Vlastimil Babka <caster@gentoo.org>
+  -jdk-with-com-sun-20080505-r1.ebuild, -jdk-with-com-sun-20100419.ebuild,
+  -jdk-with-com-sun-20110911.ebuild, +jdk-with-com-sun-20111107.ebuild:
+  Prepare for icedtea-bin version and VMHANDLE migration.
 
   30 Oct 2011; Vlastimil Babka <caster@gentoo.org>
   jdk-with-com-sun-20100419.ebuild, jdk-with-com-sun-20110911.ebuild,

diff --git a/java-virtuals/jdk-with-com-sun/Manifest b/java-virtuals/jdk-with-com-sun/Manifest
index 18b7debdc16a8b04522c245ac7002ee7e36a015d..a02fb06be9116c2608e2372a089dd16f62ff5533 100644 (file)
--- a/java-virtuals/jdk-with-com-sun/Manifest
+++ b/java-virtuals/jdk-with-com-sun/Manifest
@@ -1,6 +1,4 @@
-EBUILD jdk-with-com-sun-20080505-r1.ebuild 757 RMD160 fa5c173201f2980b2a0463c6a656b0e0a692ad64 SHA1 b10406b7922162522f860d66be19b90830465c2b SHA256 86ddb2f7511bbeb27a722d89b70c13af771947e48dd7f34b3ff510f6645ac5b4
-EBUILD jdk-with-com-sun-20100419.ebuild 822 RMD160 7c8b43d0c58a7590e33eefac55fd6e066b1ddaff SHA1 f47d144d330e12c2074519f7c641851174e322c6 SHA256 f9ad1524760a90ebbc78a9b1fbde7bab303b23e1d8c993ad780d76b77171b7d3
-EBUILD jdk-with-com-sun-20110911.ebuild 788 RMD160 8c9b0be320d3f866b9c7acf6565f8ff4375b7bdf SHA1 578c25315ae47cf6b8dda2047428facea436349e SHA256 0b1aca94555bcde7ed899c10d2856178c8cda983607e7a4ed0a4dabda8e89246
 EBUILD jdk-with-com-sun-20111030.ebuild 810 RMD160 1db7d17eb31cf18c4482d4d75e2e534f5c098049 SHA1 190b58aca17f811015b765fad567b6b5641e54e3 SHA256 d0c0aec8990ab985ce24ae309c546886e2316be3a5701da22b1333749363a768
-MISC ChangeLog 2480 RMD160 affb6cd8bed26d4183dbc1ded64f0bc5610c6fc7 SHA1 964f8d43d9a5d62919cffa10c7fae9af31ed4779 SHA256 0f60d00e01e24d8e1ecacfdca134f5f3db5bd4003fe95107b756db2845191e17
+EBUILD jdk-with-com-sun-20111107.ebuild 824 RMD160 fe0dd267514225e7d6913c6fce102da76372b794 SHA1 88f8023d6ff82755d478d960665daef46b05610a SHA256 fc724c2b6b76099e36203c27c5a929ee14f7b0c90a9086cbc44844999743db95
+MISC ChangeLog 2779 RMD160 5dd4e5466ca980271c605d97acdaa53d1c5e58fc SHA1 1b871afa24f1d6b09113a19085055194703906b4 SHA256 8777f729c8015c4f3c3d34326d8fe03a5b5b1111a927c2a9cfeaa66e82af769a
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9

diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild
deleted file mode 100644 (file)
index 9892f0c..0000000
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505-r1.ebuild,v 1.3 2010/04/23 12:13:36 aballier Exp $
-
-EAPI=1
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual ebuilds that require internal com.sun classes from a JDK"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-                       dev-java/sun-jdk:1.6
-                       dev-java/sun-jdk:1.5
-                       dev-java/sun-jdk:1.4
-                       dev-java/diablo-jdk:1.6
-                       dev-java/blackdown-jdk:1.4.2
-               )
-               >=dev-java/java-config-2.1.6
-               "
-
-JAVA_VIRTUAL_VM="sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 diablo-jdk-1.6 blackdown-jdk-1.4.2"

diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild
deleted file mode 100644 (file)
index 84da1df..0000000
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild,v 1.5 2011/10/30 14:08:24 caster Exp $
-
-EAPI=1
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual ebuilds that require internal com.sun classes from a JDK"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-                       dev-java/icedtea-bin:6
-                       dev-java/icedtea:6
-                       dev-java/sun-jdk:1.6
-                       dev-java/sun-jdk:1.5
-                       dev-java/sun-jdk:1.4
-                       dev-java/diablo-jdk:1.6
-                       dev-java/blackdown-jdk:1.4.2
-               )
-               >=dev-java/java-config-2.1.6
-               "
-
-JAVA_VIRTUAL_VM="icedtea6-bin icedtea6 sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 diablo-jdk-1.6 blackdown-jdk-1.4.2"

diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20110911.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111107.ebuild
similarity index 70%
rename from java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20110911.ebuild
rename to java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111107.ebuild
index 16e2fce1d4222b4066cf6bf95b6eac004f985d0a..33049240527772dfe8d7b302817639bf08ea425b 100644 (file)
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20110911.ebuild
+++ b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111107.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/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20110911.ebuild,v 1.2 2011/10/30 14:08:24 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111107.ebuild,v 1.1 2011/11/07 16:08:10 caster Exp $
 
 EAPI=1
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
@@ -26,4 +26,4 @@ RDEPEND="|| (
                        dev-java/diablo-jdk:1.6
                )"
 
-JAVA_VIRTUAL_VM="icedtea6-bin icedtea6 sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 oracle-jdk-bin-1.7 diablo-jdk-1.6"
+JAVA_VIRTUAL_VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 oracle-jdk-bin-1.7 diablo-jdk-1.6"