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.

(Portage version: 2.1.1_pre3-r5)

5 files changed, 16 insertions, 9 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/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}"