Prepare for icedtea-bin version and VMHANDLE migration.

(Portage version: 2.2.0_alpha68/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 11 insertions, 64 deletions

diff --git a/java-virtuals/jdk-with-com-sun/ChangeLog b/java-virtuals/jdk-with-com-sun/ChangeLog
index 80ec16eb0cdc..4fe32dc2cf5e 100644
--- 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/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
index 9892f0cfe3ac..000000000000
--- 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
index 84da1df654d0..000000000000
--- 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
index 16e2fce1d422..330492405277 100644
--- 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"