More specific versions.

Package-Manager: portage-2.1.1_pre2-r4

5 files changed, 28 insertions, 63 deletions

diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 6ca98403a30e..e153a626a7bc 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -5,18 +5,22 @@ EBUILD jdk-1.3.ebuild 462 RMD160 da0c22ad2b57e00e394784d068261464bb6729ce SHA1 f
 MD5 bcb65b0f4245666c031df18b676b222b jdk-1.3.ebuild 462
 RMD160 da0c22ad2b57e00e394784d068261464bb6729ce jdk-1.3.ebuild 462
 SHA256 93daf9132ee541c399145910754c6608e8053c9d09374c6e2a71a6becb95eaca jdk-1.3.ebuild 462
-EBUILD jdk-1.4.ebuild 541 RMD160 bfb72af9a82e9e59faa768cae23e5a64a877c553 SHA1 3f4f8483ff89c1375d57bc21601526ebb6e28c4c SHA256 7e2d98dd6ebbc175cbef76d7c076fd6d70d7c48bd74445af7cf46efbea7d213f
-MD5 b47b36a5b627cf58759fdbeb4f4e09e2 jdk-1.4.ebuild 541
-RMD160 bfb72af9a82e9e59faa768cae23e5a64a877c553 jdk-1.4.ebuild 541
-SHA256 7e2d98dd6ebbc175cbef76d7c076fd6d70d7c48bd74445af7cf46efbea7d213f jdk-1.4.ebuild 541
-EBUILD jdk-1.5.ebuild 492 RMD160 a4433ea9e88f45664a03a89b5abb7580a206f5b0 SHA1 ecbf5b5a37fc05ca09b8195cfe53d9ae26e05152 SHA256 cd292f27d1dc83de93c0e0e74c8b78a6fd63f5587cdbe4be4b7251547e5048a4
-MD5 05c59bab2a6ac76324486c8d4af4784c jdk-1.5.ebuild 492
-RMD160 a4433ea9e88f45664a03a89b5abb7580a206f5b0 jdk-1.5.ebuild 492
-SHA256 cd292f27d1dc83de93c0e0e74c8b78a6fd63f5587cdbe4be4b7251547e5048a4 jdk-1.5.ebuild 492
-MISC ChangeLog 430 RMD160 c9cde61bfac3adc2d14264795ced88fc115b0649 SHA1 3bd8d8b002749f693d01171bbbfb3914e694d3ae SHA256 5d0499ebc46af4f8ccd6dd33b1041be1dc6236ba389bf2af26c7824ab811b746
-MD5 2f5beb2375eb4404d993bd7d88807403 ChangeLog 430
-RMD160 c9cde61bfac3adc2d14264795ced88fc115b0649 ChangeLog 430
-SHA256 5d0499ebc46af4f8ccd6dd33b1041be1dc6236ba389bf2af26c7824ab811b746 ChangeLog 430
+EBUILD jdk-1.4.1.ebuild 530 RMD160 0b3f0ab3ecc21f4dc553a9c8c02ce25e0fc200ee SHA1 80b1a78258441179166a0a03074dc7d0de39cd38 SHA256 350ec3c7392121c38e4102a5340dff9233637e7d811116e90cad7166491591fc
+MD5 002a35bfee132d3d1b69b1f604a2e345 jdk-1.4.1.ebuild 530
+RMD160 0b3f0ab3ecc21f4dc553a9c8c02ce25e0fc200ee jdk-1.4.1.ebuild 530
+SHA256 350ec3c7392121c38e4102a5340dff9233637e7d811116e90cad7166491591fc jdk-1.4.1.ebuild 530
+EBUILD jdk-1.4.2.ebuild 551 RMD160 845457c8970510723e4eadf5818e9330d803ecec SHA1 0f476603e193fb649cf49bd90d2c3419cb011400 SHA256 4cdaf7baf8d8a76d4e15c3b4151583cc917bf6a111d4331644f0e29ec6e3f764
+MD5 811cd81ee65119082ed4938fe9aef5ec jdk-1.4.2.ebuild 551
+RMD160 845457c8970510723e4eadf5818e9330d803ecec jdk-1.4.2.ebuild 551
+SHA256 4cdaf7baf8d8a76d4e15c3b4151583cc917bf6a111d4331644f0e29ec6e3f764 jdk-1.4.2.ebuild 551
+EBUILD jdk-1.5.0.ebuild 500 RMD160 4fe6a044c4e5950636d181f4b35becff0cc4ad11 SHA1 a6d1b775d65b5336211aa22c2842a2126608b073 SHA256 10dcc365f159c8b5c8e94cf14ef031d1d2e45ddba3b2552e20771f3bba84e022
+MD5 0bc8f1209af75ddea580ecedd1720575 jdk-1.5.0.ebuild 500
+RMD160 4fe6a044c4e5950636d181f4b35becff0cc4ad11 jdk-1.5.0.ebuild 500
+SHA256 10dcc365f159c8b5c8e94cf14ef031d1d2e45ddba3b2552e20771f3bba84e022 jdk-1.5.0.ebuild 500
+MISC ChangeLog 679 RMD160 979b5c5f2d1955673a5fdf350fcb9fb98355bf07 SHA1 f454712b73a9195cca674be8b917e4f3ca594094 SHA256 a62c5ceb67d7d7dfc5c08e95cf82b4249b0012e62f7bef5db08d5fd3706a70d4
+MD5 25e564a28bf39bda7f1fb9e04b7ce522 ChangeLog 679
+RMD160 979b5c5f2d1955673a5fdf350fcb9fb98355bf07 ChangeLog 679
+SHA256 a62c5ceb67d7d7dfc5c08e95cf82b4249b0012e62f7bef5db08d5fd3706a70d4 ChangeLog 679
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -24,16 +28,19 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-jdk-1.3 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-jdk-1.3 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-jdk-1.3 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-jdk-1.4 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-jdk-1.4 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-jdk-1.4 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-jdk-1.5 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-jdk-1.5 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-jdk-1.5 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-jdk-1.4.1 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-jdk-1.4.1 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-jdk-1.4.1 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-jdk-1.4.2 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-jdk-1.4.2 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-jdk-1.4.2 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-jdk-1.5.0 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-jdk-1.5.0 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-jdk-1.5.0 1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFErOclgo/w9rxVVVERAtKEAKCUF2TK4aGsAqVmCmENNHb9kD1quwCgkSY1
-kX3k/b0Su3iuAoD6tJKU2KU=
-=ItoK
+iD8DBQFEr8wFgo/w9rxVVVERAqGWAKCdiifOO8gq+BexnzdBqkqFJSIIIACgv/ra
+gtRYXFIlSW+Q1MQnHV3GA1g=
+=/5QC
 -----END PGP SIGNATURE-----
diff --git a/virtual/jdk/files/digest-jdk-1.4 b/virtual/jdk/files/digest-jdk-1.4
deleted file mode 100644
index 8b137891791f..000000000000
--- a/virtual/jdk/files/digest-jdk-1.4
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/virtual/jdk/files/digest-jdk-1.5 b/virtual/jdk/files/digest-jdk-1.5
deleted file mode 100644
index 8b137891791f..000000000000
--- a/virtual/jdk/files/digest-jdk-1.5
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/virtual/jdk/jdk-1.4.ebuild b/virtual/jdk/jdk-1.4.ebuild
deleted file mode 100644
index beb8ead66383..000000000000
--- a/virtual/jdk/jdk-1.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.4.ebuild,v 1.1 2006/07/06 10:33:58 nelchael Exp $
-
-DESCRIPTION="Virtual for JDK"
-HOMEPAGE="http://java.sun.com/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="1.4"
-KEYWORDS="amd64 ia64 ppc ppc64 ~s390 x86"
-IUSE=""
-
-DEPEND="|| (
-		=dev-java/blackdown-jdk-1.4*
-		=dev-java/kaffe-1.1*
-		=dev-java/sun-jdk-1.4*
-		=dev-java/ibm-jdk-bin-1.4*
-		=dev-java/jrockit-jdk-bin-1.4*
-	)"
-RDEPEND="${DEPEND}"
diff --git a/virtual/jdk/jdk-1.5.ebuild b/virtual/jdk/jdk-1.5.ebuild
deleted file mode 100644
index 323fdc32e0ba..000000000000
--- a/virtual/jdk/jdk-1.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.ebuild,v 1.1 2006/07/06 10:33:58 nelchael Exp $
-
-DESCRIPTION="Virtual for JDK"
-HOMEPAGE="http://java.sun.com/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="1.5"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
-IUSE=""
-
-DEPEND="|| (
-		=dev-java/sun-jdk-1.5*
-		=dev-java/ibm-jdk-bin-1.5*
-		=dev-java/jrockit-jdk-bin-1.5*
-	)"
-RDEPEND="${DEPEND}"