Bump to add icedtea6-bin and icedtea:6 as alternatives.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/java-virtuals/jdk-with-com-sun/ChangeLog b/java-virtuals/jdk-with-com-sun/ChangeLog
index a44ab555586697014bb82fbaa8ac8005322715f3..7a17332f610e7ea78a429f95aa739c222cc2424d 100644 (file)
--- a/java-virtuals/jdk-with-com-sun/ChangeLog
+++ b/java-virtuals/jdk-with-com-sun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for java-virtuals/jdk-with-com-sun
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.7 2009/12/23 00:51:23 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.8 2010/04/19 14:38:32 caster Exp $
+
+*jdk-with-com-sun-20100419 (19 Apr 2010)
+
+  19 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  -jdk-with-com-sun-20080505.ebuild, +jdk-with-com-sun-20100419.ebuild:
+  Bump to add icedtea6-bin and icedtea:6 as alternatives.
 
   23 Dec 2009; Vlastimil Babka <caster@gentoo.org>
   -jdk-with-com-sun-1.4.ebuild:

diff --git a/java-virtuals/jdk-with-com-sun/Manifest b/java-virtuals/jdk-with-com-sun/Manifest
index 54efde456f68e3fe5f61488c2fcecf7bf4e6a875..f04acf04662097fe7e9d6f2957d16e2137b73916 100644 (file)
--- a/java-virtuals/jdk-with-com-sun/Manifest
+++ b/java-virtuals/jdk-with-com-sun/Manifest
@@ -1,4 +1,4 @@
 EBUILD jdk-with-com-sun-20080505-r1.ebuild 759 RMD160 5dcae2f0cffcedc06ca9f960f473ce436f8934e0 SHA1 a8bbe3de43e23f52fea3e36c0bdd6f679c298dea SHA256 a3f9d97cb9cd61dc1057ab011ac9412f1200717919826dd79111715e16308070
-EBUILD jdk-with-com-sun-20080505.ebuild 702 RMD160 ee1197096f813c9ba70317aab1c0828cf7eedd45 SHA1 3fcb1749a641788092260dd7608c333407ce1978 SHA256 c8cb959f3cc5cbd6eb8595042018818da2f80ceb3cc780112913fb5eb9cd246c
-MISC ChangeLog 1322 RMD160 6182df6fe4fbeda74a05196c3af34fc7996a8dab SHA1 ace59523ba280c3e1624946b69854cedf4ecd008 SHA256 2f825c352ded7ff7a9b33fdf0c90fb5e24bcaaeef803d364f20c8ba864bc532f
+EBUILD jdk-with-com-sun-20100419.ebuild 825 RMD160 8828ed61511342a7da1e4095afb1d3e779dc63eb SHA1 db60ef3bf2519bda44293883c492ba8f95b3c1d2 SHA256 1beb7b44e1c4dae312b62016a67a6239e66a43a0bc1382986357a866c11bcb32
+MISC ChangeLog 1546 RMD160 aceb096494c7436a8801ae7d6aaf4325860cf172 SHA1 188978db23f2ff114733256813273ab09cda1671 SHA256 666d5bb54219d4e4a9a9b3acb21d09525191f6d582f959cc4b1c7794dbf48c9b
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9

diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild
similarity index 58%
rename from java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505.ebuild
rename to java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild
index ebdf497d5c32391fe4f6016ce399b1b0424e2ec4..b7bf64d8ba143f35c7f4b2c93ff6889ac0c5dd10 100644 (file)
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20080505.ebuild
+++ b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.ebuild,v 1.3 2008/05/30 17:23:26 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20100419.ebuild,v 1.1 2010/04/19 14:38:32 caster Exp $
 
 EAPI=1
 
@@ -12,17 +12,20 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
 RDEPEND="|| (
+                       dev-java/icedtea6-bin
+                       =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.5
+                       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 diable-jdk-1.5"
+JAVA_VIRTUAL_VM="icedtea6-bin icedtea6 sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 diablo-jdk-1.5 blackdown-jdk-1.4.2"