Add icedtea-bin-7 variant.

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

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 5232594a6e47eac36ad0e3c6d2fe7a1512659a11..91188302576570bbaf261411b3815f4581bf5dfd 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.41 2011/11/07 16:05:27 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.42 2011/11/11 10:54:24 caster Exp $
+
+  11 Nov 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.7.0.ebuild:
+  Add icedtea-bin-7 variant.
 
   07 Nov 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.6.0.ebuild:
   Prepare for icedtea-bin version and VMHANDLE migration.

diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index bdf5a3d8cc4c59044068e2b04a55d88576339609..d061a4bc650f2e8fed77ed5d2573719cd5650d64 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 1969 RMD160 fd662e306f5a46e0321082adb52ba80fca2b754e SHA1 b543913d0cbc737f8b2260b551025d68b269d4aa SHA256 4df8c2c63100f98ed220347314fb7055ae114f93f0cfd76f7093e86f9ebf5a44
-EBUILD jdk-1.7.0.ebuild 404 RMD160 4fb96a823d41b6656ef6613c58c7456ed4953497 SHA1 c7a936b8265a0ef31faa988cd6b97d714c36846a SHA256 00fa3cf51ce94e6c9b8389a824d2a91f5038c8554f49101dfe7496929d1b0a29
-MISC ChangeLog 5676 RMD160 f5718702b10eff5a63b1802fe5cc9e1882bf8771 SHA1 0d0f7fcfc63829405071304cc0ba2e38bc0ecc66 SHA256 fdc293bb190c56d93310e1308765b65a044ebdea4aa1c7c950184b382b6e303a
+EBUILD jdk-1.7.0.ebuild 431 RMD160 4f8a97fc2f48710cb5fd53aeccbba89a4dfb9f44 SHA1 9343d66d0bbb0fa95c5ad1ed256d2971f2f81c22 SHA256 5ead7ed1a9e6d87ff5ad08995e472b55165aaef6491181bef9fa8f8b96d4833e
+MISC ChangeLog 5775 RMD160 ea110308b33a47fb2e041a9018bd7c9aabe58206 SHA1 5748682fbdef3d4f1ec54a3973935fb19baeb87d SHA256 de0cece2c38cc4a1c53b73443132612233caffad20b868ba9236aa6464ef5482
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb

diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild
index 8ce847ca247b7bdc948ff702ce4d6dd9da4a342d..b90af994083e6940b2aa2bf5e3310166d02fcc1f 100644 (file)
--- a/virtual/jdk/jdk-1.7.0.ebuild
+++ b/virtual/jdk/jdk-1.7.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.7.0.ebuild,v 1.3 2011/11/04 15:14:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.4 2011/11/11 10:54:24 caster Exp $
 
 DESCRIPTION="Virtual for JDK"
 HOMEPAGE=""
@@ -12,6 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="|| (
+               =dev-java/icedtea-bin-7*
                =dev-java/icedtea-7*
                =dev-java/oracle-jdk-bin-1.7.0*
        )"