Changed order of dependencies, so that kaffe isn\'t the second choice.

Package-Manager: portage-2.1.2_pre2-r6

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 85136d74e523ed2cf5384ea6add43c77d19d786d..733f5c4d09dae51b87efdafa4fbdce9d0daa17d3 100644 (file)
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/jdk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.7 2006/09/03 01:41:51 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.8 2006/10/11 03:24:07 nichoj Exp $
+
+  11 Oct 2006; Joshua Nichols <nichoj@gentoo.org> jdk-1.4.2.ebuild:
+  Changed order of dependencies, so that kaffe isn't the second choice.
 
   03 Sep 2006; Joshua Nichols <nichoj@gentoo.org> jdk-1.3.ebuild,
   jdk-1.4.1.ebuild:

diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 1e83ccef266a256367fec8a6c62e4379b91c316e..e2c346de79124034d1710ebbc60235333b771356 100644 (file)
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -2,18 +2,18 @@ EBUILD jdk-1.4.1.ebuild 393 RMD160 77bd7b66407fea175b5ea542a1eb17a9c82401df SHA1
 MD5 f8ee157fa3da215b4a7059ae2ea3224d jdk-1.4.1.ebuild 393
 RMD160 77bd7b66407fea175b5ea542a1eb17a9c82401df jdk-1.4.1.ebuild 393
 SHA256 05bb7689d45bbeb33a32cc7ffb871343c5a98dc6c45b4ba27521bded53fe344e jdk-1.4.1.ebuild 393
-EBUILD jdk-1.4.2.ebuild 542 RMD160 233ed9767c390d1b0be1f70c42c508ff2226c07e SHA1 3d2896ada4cfe49ccb468904b395d00cf8eaf6d2 SHA256 c79c2a1622e2fc4a11ad72f3ed26e2190ffb1620f0df24a95db3eee624b1e13f
-MD5 43f471cbb842a7f85944019101e62459 jdk-1.4.2.ebuild 542
-RMD160 233ed9767c390d1b0be1f70c42c508ff2226c07e jdk-1.4.2.ebuild 542
-SHA256 c79c2a1622e2fc4a11ad72f3ed26e2190ffb1620f0df24a95db3eee624b1e13f jdk-1.4.2.ebuild 542
+EBUILD jdk-1.4.2.ebuild 540 RMD160 24465652077bca429156b38c8e13c1310cff86ac SHA1 d117deef79c712af07ab338378f0876d0cb848f6 SHA256 13f688cb8f54d6d8e75893daa9dfef6a60a95b6c4abb128dc1d6893cccef1946
+MD5 c5b043cfa9a93a10e4f462fd4780dc46 jdk-1.4.2.ebuild 540
+RMD160 24465652077bca429156b38c8e13c1310cff86ac jdk-1.4.2.ebuild 540
+SHA256 13f688cb8f54d6d8e75893daa9dfef6a60a95b6c4abb128dc1d6893cccef1946 jdk-1.4.2.ebuild 540
 EBUILD jdk-1.5.0.ebuild 531 RMD160 9229ada1a7faddd931b15544c8f7455afa1747b3 SHA1 f1788b88acf9249b1107a43d0c8b69a387627e02 SHA256 6b3a41f6e590308eeea63cdf5559146b3bae5499b0edfdda6da4e0eefdfc9800
 MD5 fe8bd7082b80d1cce054ce6a6ef9a449 jdk-1.5.0.ebuild 531
 RMD160 9229ada1a7faddd931b15544c8f7455afa1747b3 jdk-1.5.0.ebuild 531
 SHA256 6b3a41f6e590308eeea63cdf5559146b3bae5499b0edfdda6da4e0eefdfc9800 jdk-1.5.0.ebuild 531
-MISC ChangeLog 1223 RMD160 0b2d27773ba55c9655fbd82efcea17c51d959e03 SHA1 a1fe5189ce7851968f10413468f79b9bd9af6f73 SHA256 2125b944cff23cf12e185e7a35f3039325f92f8a8ef67e998454773eef778ad6
-MD5 a80bec9f83edcec72f9ba45e29f49894 ChangeLog 1223
-RMD160 0b2d27773ba55c9655fbd82efcea17c51d959e03 ChangeLog 1223
-SHA256 2125b944cff23cf12e185e7a35f3039325f92f8a8ef67e998454773eef778ad6 ChangeLog 1223
+MISC ChangeLog 1364 RMD160 41ae30edd25f6bebec034d162b65f724711fa3b8 SHA1 248d4ae0c873e260e2cd24204a26d2ede45a9384 SHA256 4a78e78dec2022d3273cdbde26a47c7484ca592aa5a9b299c4eb4b95717b56df
+MD5 7e33d04b4e2b161c97364ba7e713b2ea ChangeLog 1364
+RMD160 41ae30edd25f6bebec034d162b65f724711fa3b8 ChangeLog 1364
+SHA256 4a78e78dec2022d3273cdbde26a47c7484ca592aa5a9b299c4eb4b95717b56df ChangeLog 1364
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158

diff --git a/virtual/jdk/jdk-1.4.2.ebuild b/virtual/jdk/jdk-1.4.2.ebuild
index b0bac823d0697ed318643bb730303ccbec8909a0..ff53c7abe306cd2f18f25290e1998bcd855a19e0 100644 (file)
--- a/virtual/jdk/jdk-1.4.2.ebuild
+++ b/virtual/jdk/jdk-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/jdk/jdk-1.4.2.ebuild,v 1.2 2006/08/23 21:20:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.4.2.ebuild,v 1.3 2006/10/11 03:24:07 nichoj Exp $
 
 DESCRIPTION="Virtual for JDK"
 HOMEPAGE="http://java.sun.com/"
@@ -13,9 +13,9 @@ IUSE=""
 
 RDEPEND="|| (
                =dev-java/blackdown-jdk-1.4.2*
-               =dev-java/kaffe-1.1*
                =dev-java/sun-jdk-1.4.2*
                =dev-java/ibm-jdk-bin-1.4.2*
                =dev-java/jrockit-jdk-bin-1.4.2*
+               =dev-java/kaffe-1.1*
        )"
 DEPEND=""