Moving virtual/jdk depends first so that the JDK's JRE will provide thisvirtual rather then requiring a JDK & a JRE to be installed by default. Discussed a similiar change with nichoj which involved moving the body of the virtual/jdk's depends to here but this is more effiecent and portable.

Package-Manager: portage-2.1.1_pre3-r5

6 files changed, 36 insertions, 39 deletions

diff --git a/virtual/jre/ChangeLog b/virtual/jre/ChangeLog
index d820fad87be7..36614d2ec9f9 100644
--- a/virtual/jre/ChangeLog
+++ b/virtual/jre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gentoo-x86/virtual
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/ChangeLog,v 1.4 2006/07/21 00:26:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/ChangeLog,v 1.5 2006/07/27 15:16:29 cardoe Exp $
+
+  27 Jul 2006; <dougg@gentoo.org> jre-1.3.ebuild, jre-1.4.1.ebuild,
+  jre-1.4.2.ebuild, jre-1.5.0.ebuild:
+  Moving virtual/jdk depends first so that the JDK's JRE will provide
+  thisvirtual rather then requiring a JDK & a JRE to be installed by default.
+  Discussed a similiar change with nichoj which involved moving the body of
+  the virtual/jdk's depends to here but this is more effiecent and portable.
 
   21 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> jre-1.5.0.ebuild:
   Add diablo-jre-bin as option for the jre 1.5, for FreeBSD, and add ~x86-fbsd
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index 4eade8cdd9f7..e165baca97d6 100644
--- a/virtual/jre/Manifest
+++ b/virtual/jre/Manifest
@@ -1,26 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-EBUILD jre-1.3.ebuild 457 RMD160 cd6dbd322ac61fa64bea54804c64ea030a6f8bae SHA1 3b45b02479b8a110922bb36bff0762e92f092fe9 SHA256 bf05d2189a734c115051d32f663d10a56e721cf46c5a9f2ec72c048c4a9a8cb7
-MD5 c5f7297df63feadf88d93470a1093fb3 jre-1.3.ebuild 457
-RMD160 cd6dbd322ac61fa64bea54804c64ea030a6f8bae jre-1.3.ebuild 457
-SHA256 bf05d2189a734c115051d32f663d10a56e721cf46c5a9f2ec72c048c4a9a8cb7 jre-1.3.ebuild 457
-EBUILD jre-1.4.1.ebuild 459 RMD160 3b67705ab618bace62e3df83f90bdb5d75daa699 SHA1 e7f9b8fa6c6a655da2d3aa8964fa7bce9ef81eaa SHA256 79ba68387002e77adf9d8ee7a1ab4b1b50c8d3648cb7cd6f8b3e9de7cd6b8e53
-MD5 da8149bf87dfc24009c9f078212b4c3b jre-1.4.1.ebuild 459
-RMD160 3b67705ab618bace62e3df83f90bdb5d75daa699 jre-1.4.1.ebuild 459
-SHA256 79ba68387002e77adf9d8ee7a1ab4b1b50c8d3648cb7cd6f8b3e9de7cd6b8e53 jre-1.4.1.ebuild 459
-EBUILD jre-1.4.2.ebuild 542 RMD160 bc26159b745a967750e26cdf9076c64e22d8325a SHA1 4363d8c4a9416a3ac8fde6f742f0486f6688ccc5 SHA256 32e59406bfd1b480c1f25df1ab17b027785270768092faccf68b1d96f6d4112e
-MD5 318eab78879f6ed0ed18fef65a1f57b4 jre-1.4.2.ebuild 542
-RMD160 bc26159b745a967750e26cdf9076c64e22d8325a jre-1.4.2.ebuild 542
-SHA256 32e59406bfd1b480c1f25df1ab17b027785270768092faccf68b1d96f6d4112e jre-1.4.2.ebuild 542
-EBUILD jre-1.5.0.ebuild 505 RMD160 a81371af39e2096cea1e7af66f33e61257032326 SHA1 ed327c8c97e73419e058c9595bdd57335ec66c60 SHA256 7df4a46f30f2b6b67bad7c4b26369751e4c34fcfa76fbd9880656f915ab4e918
-MD5 6a8c2af6f750a5ec239ed34745739ab9 jre-1.5.0.ebuild 505
-RMD160 a81371af39e2096cea1e7af66f33e61257032326 jre-1.5.0.ebuild 505
-SHA256 7df4a46f30f2b6b67bad7c4b26369751e4c34fcfa76fbd9880656f915ab4e918 jre-1.5.0.ebuild 505
-MISC ChangeLog 958 RMD160 4c4f9d3160fd3f55c4fa6d88d14b27e449ca2037 SHA1 4f334f0b2887abb1ef97f713760fa382a656de60 SHA256 6f49d7ba93a8510ffd32d5d199803a7864bcc070440ba08d1cb8100ae839f9c0
-MD5 96aeb96f7647da2b7832c701682aa942 ChangeLog 958
-RMD160 4c4f9d3160fd3f55c4fa6d88d14b27e449ca2037 ChangeLog 958
-SHA256 6f49d7ba93a8510ffd32d5d199803a7864bcc070440ba08d1cb8100ae839f9c0 ChangeLog 958
+EBUILD jre-1.3.ebuild 455 RMD160 38309c5b58e703cd8021921145b1cee4cf4d3286 SHA1 639b2b7d7d0915e63711258c58233d72747fb1b5 SHA256 f91254348ff799d55c561213deb9a21f6b17c15b8b7d4469d2ed69a40cef5a2e
+MD5 4af434a250ae805b28b89dade23c36bb jre-1.3.ebuild 455
+RMD160 38309c5b58e703cd8021921145b1cee4cf4d3286 jre-1.3.ebuild 455
+SHA256 f91254348ff799d55c561213deb9a21f6b17c15b8b7d4469d2ed69a40cef5a2e jre-1.3.ebuild 455
+EBUILD jre-1.4.1.ebuild 457 RMD160 4adb3c5da67494b51bb5e1194e8c9e0424a39314 SHA1 1c907c01bfc784bc69dd11d2c4f6466238901b3c SHA256 fbc92145b8ca2f28e3fd9672edf6e17dbd8d0970c4b3612d142c51f0856f05d3
+MD5 1116126605ab2dfd92f93e7e147b6e72 jre-1.4.1.ebuild 457
+RMD160 4adb3c5da67494b51bb5e1194e8c9e0424a39314 jre-1.4.1.ebuild 457
+SHA256 fbc92145b8ca2f28e3fd9672edf6e17dbd8d0970c4b3612d142c51f0856f05d3 jre-1.4.1.ebuild 457
+EBUILD jre-1.4.2.ebuild 540 RMD160 fd82b78bd4b51334e2adb2d61e45fa037242fc70 SHA1 088fc9382ada7a082dfb26718e21115e4f7d80af SHA256 c4848475474608c1d8f7b5afe21ca0eda0155995c70e5807dcf49e48870d302f
+MD5 0d40deb8fc776e376153b937ff3b55ba jre-1.4.2.ebuild 540
+RMD160 fd82b78bd4b51334e2adb2d61e45fa037242fc70 jre-1.4.2.ebuild 540
+SHA256 c4848475474608c1d8f7b5afe21ca0eda0155995c70e5807dcf49e48870d302f jre-1.4.2.ebuild 540
+EBUILD jre-1.5.0.ebuild 502 RMD160 3f2b89bf065d0f9215204577d8d95175df21a4b1 SHA1 c79d99323a19d9031b1e45056084928ab4beed2e SHA256 b671894a35af6e4beaf46b691ffb16dc6a14c1d3f36101ac429065270297cc22
+MD5 677922af45451825bce7b9c84d1228a4 jre-1.5.0.ebuild 502
+RMD160 3f2b89bf065d0f9215204577d8d95175df21a4b1 jre-1.5.0.ebuild 502
+SHA256 b671894a35af6e4beaf46b691ffb16dc6a14c1d3f36101ac429065270297cc22 jre-1.5.0.ebuild 502
+MISC ChangeLog 1363 RMD160 c3ee14d31af8f98691c9fada68014da0155deb53 SHA1 f8e97746f09403b6207ff3d189cbb96e17178821 SHA256 e5a5a6f1670340d2290e6d952a349dfc9ed2d5b9ab78a3cacca8721d313fc890
+MD5 04d522a1c64a5013db4ecdafe701c400 ChangeLog 1363
+RMD160 c3ee14d31af8f98691c9fada68014da0155deb53 ChangeLog 1363
+SHA256 e5a5a6f1670340d2290e6d952a349dfc9ed2d5b9ab78a3cacca8721d313fc890 ChangeLog 1363
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -37,10 +34,3 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-jre-1.5.0 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-jre-1.5.0 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-jre-1.5.0 1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwB8+AiZjviIA2XgRAhOvAKCiNl9sDLqpPniipyWnCf7bLGfP8wCcDzDS
-Iz8T2okCQ+RjGpS2hk4doYA=
-=Axzx
------END PGP SIGNATURE-----
diff --git a/virtual/jre/jre-1.3.ebuild b/virtual/jre/jre-1.3.ebuild
index f7ea96cb1a63..47402eb646d5 100644
--- a/virtual/jre/jre-1.3.ebuild
+++ b/virtual/jre/jre-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.3.ebuild,v 1.1 2006/07/06 10:28:48 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.3.ebuild,v 1.2 2006/07/27 15:16:29 cardoe Exp $
 
 DESCRIPTION="Virtual for JRE"
 HOMEPAGE="http://java.sun.com/"
@@ -12,8 +12,8 @@ KEYWORDS="~ppc x86"
 IUSE=""
 
 DEPEND="|| (
+		=virtual/jdk-1.3*
 		=dev-java/blackdown-jre-1.3*
 		=dev-java/compaq-jre-1.3*
-		=virtual/jdk-1.3*
 	)"
 RDEPEND="${DEPEND}"
diff --git a/virtual/jre/jre-1.4.1.ebuild b/virtual/jre/jre-1.4.1.ebuild
index 166efbf4d652..b9c654af4a2c 100644
--- a/virtual/jre/jre-1.4.1.ebuild
+++ b/virtual/jre/jre-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.4.1.ebuild,v 1.2 2006/07/08 18:38:34 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.4.1.ebuild,v 1.3 2006/07/27 15:16:29 cardoe Exp $
 
 DESCRIPTION="Virtual for JRE"
 HOMEPAGE="http://java.sun.com/"
@@ -12,8 +12,8 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="|| (
+		=virtual/jdk-1.4.1*
 		=dev-java/blackdown-jre-1.4.1*
 		=dev-java/kaffe-1.1*
-		=virtual/jdk-1.4.1*
 	)"
 RDEPEND="${DEPEND}"
diff --git a/virtual/jre/jre-1.4.2.ebuild b/virtual/jre/jre-1.4.2.ebuild
index fd27268adb29..8820a3ed6fc7 100644
--- a/virtual/jre/jre-1.4.2.ebuild
+++ b/virtual/jre/jre-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.4.2.ebuild,v 1.1 2006/07/08 15:16:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.4.2.ebuild,v 1.2 2006/07/27 15:16:29 cardoe Exp $
 
 DESCRIPTION="Virtual for JRE"
 HOMEPAGE="http://java.sun.com/"
@@ -12,10 +12,10 @@ KEYWORDS="amd64 ia64 ppc ppc64 ~s390 x86"
 IUSE=""
 
 DEPEND="|| (
+		=virtual/jdk-1.4.2*
 		=dev-java/blackdown-jre-1.4.2*
 		=dev-java/kaffe-1.1*
 		=dev-java/sun-jre-bin-1.4.2*
 		=dev-java/ibm-jre-bin-1.4.2*
-		=virtual/jdk-1.4.2*
 	)"
 RDEPEND="${DEPEND}"
diff --git a/virtual/jre/jre-1.5.0.ebuild b/virtual/jre/jre-1.5.0.ebuild
index af7b6a1f6e9b..b20a7f61e2b3 100644
--- a/virtual/jre/jre-1.5.0.ebuild
+++ b/virtual/jre/jre-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.5.0.ebuild,v 1.2 2006/07/21 00:26:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.5.0.ebuild,v 1.3 2006/07/27 15:16:29 cardoe Exp $
 
 DESCRIPTION="Virtual for JRE"
 HOMEPAGE="http://java.sun.com/"
@@ -12,8 +12,8 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="|| (
+		=virtual/jdk-1.5.0*
 		=dev-java/sun-jre-bin-1.5.0*
 		=dev-java/diablo-jre-bin-1.5.0*
-		=virtual/jdk-1.5.0*
 	)"
 RDEPEND="${DEPEND}"