Extend 'meaningful error message voodoo' to unbreak Prefix Linux and Solaris arches

Package-Manager: portage-2.2.00.15320-prefix/cvs/Darwin powerpc

4 files changed, 29 insertions, 16 deletions

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 46996a28a703..456bfc4c60be 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for virtual/jdk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.29 2010/02/05 09:43:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.30 2010/02/09 17:23:19 grobian Exp $
+
+  09 Feb 2010; Fabian Groffen <grobian@gentoo.org> jdk-1.5.0.ebuild,
+  jdk-1.6.0.ebuild:
+  Extend 'meaningful error message voodoo' to unbreak Prefix Linux and
+  Solaris arches
 
   05 Feb 2010; Alexis Ballier <aballier@gentoo.org> jdk-1.5.0.ebuild:
   remove diablo-jdk-1.5 support as it is for freebsd6 only
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 0bf71c781074..452668cd9baf 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 EBUILD jdk-1.4.1.ebuild 365 RMD160 9af58e88047dc6d264986e28d6cdef61d62e9d36 SHA1 d66a75479fbac912b8f32234a53e5650f0489182 SHA256 754bb0d12331c7c45a02530869478d82fab474e69a17d84521469444001873be
 EBUILD jdk-1.4.2.ebuild 599 RMD160 84170e8ed0cf4565cbc760492e26d0cc646f02f8 SHA1 7ca60eb0a960e862b9275e9d3c2badd29ab7b0f7 SHA256 8f884c06b7ce752516ddd099c1e2e0a2ce10b3a52b0fc4ab809c46ca0ca6b2eb
-EBUILD jdk-1.5.0.ebuild 891 RMD160 79b85737972b093b62b4c3d18aeb0ce418a78b4b SHA1 c34628c9476929d9a8e780320f87e56087b4b51c SHA256 9d663e549f8aacbf578e1f911454b41d0d70b72464a9e8f399fcf6cf89845a9b
-EBUILD jdk-1.6.0.ebuild 1072 RMD160 66119bec8714489de334847aec155c7fb2f0788b SHA1 65a37d8192832f1d99f10044e351a58c50a3a788 SHA256 6a16a6fd9a77d2ba22621b609d3ae4463adad537126a0f0355a5ee8a93e93420
-MISC ChangeLog 4133 RMD160 997388ea88d7f395471cdc8b55318317a26a6025 SHA1 1a1263582d9aff55b12b5e14781d8d652b152246 SHA256 df4c9a7d7146b6fa975238aa91e049741910b2ad721cda42f76f5ac608595b5e
+EBUILD jdk-1.5.0.ebuild 1266 RMD160 fe1be192997dbe3d1b813912f01737c003539a94 SHA1 8d5e3acaac8f56b9ed76c5135cdc20c8a4ed34db SHA256 9579ab6e127d2ef6d8f8a454c78886c28d0376f3c98a9cc8c89a046f6cf99aa5
+EBUILD jdk-1.6.0.ebuild 1529 RMD160 69448f02ea5955c9dea17333bc6b8b33cb26be56 SHA1 ef927cd1f9d2766b67272d2f74d00dbc290cba7f SHA256 cf4b992358162434cc73957851a2aa26529d52b49129e2616e44fc90d875c5c0
+MISC ChangeLog 4310 RMD160 1c08c626b00d9424f081449f61a32830e325530e SHA1 acd1802b727ecf6cae9f49058164535bc6141b43 SHA256 b1cdbc99cb1a306a7bd5ae2b891fd816a3ed45d6697d8e9af9295549b13b85e5
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktr6DgACgkQvFcC4BYPU0qDxwCdG/NG3PElPiNBSwB+u5Wc37ye
-gWIAn3zLggi6fPlpARKPNoLf4L5VD0mr
-=1FqW
------END PGP SIGNATURE-----
diff --git a/virtual/jdk/jdk-1.5.0.ebuild b/virtual/jdk/jdk-1.5.0.ebuild
index 51204b6b0844..23e0f43a9e7c 100644
--- a/virtual/jdk/jdk-1.5.0.ebuild
+++ b/virtual/jdk/jdk-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild,v 1.15 2010/02/05 09:43:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild,v 1.16 2010/02/09 17:23:19 grobian Exp $
 
 DESCRIPTION="Virtual for JDK"
 HOMEPAGE=""
@@ -16,9 +16,17 @@ IUSE=""
 # get a masked license warning for ibm-jdk-bin
 # instead of (not useful) missing keyword warning for sun-jdk
 # see #287615
+# note that this "voodoo" is pretty annoying for Prefix, and that we didn't
+# invent it in the first place!
 RDEPEND="|| (
 		amd64? ( =dev-java/sun-jdk-1.5.0* )
 		x86? ( =dev-java/sun-jdk-1.5.0* )
+		amd64-linux? ( =dev-java/sun-jdk-1.5.0* )
+		x86-linux? ( =dev-java/sun-jdk-1.5.0* )
+		x64-solaris? ( =dev-java/sun-jdk-1.5.0* )
+		x86-solaris? ( =dev-java/sun-jdk-1.5.0* )
+		sparc-solaris? ( =dev-java/sun-jdk-1.5.0* )
+		sparc64-solaris? ( =dev-java/sun-jdk-1.5.0* )
 		=dev-java/ibm-jdk-bin-1.5.0*
 		=dev-java/jrockit-jdk-bin-1.5.0*
 		=dev-java/apple-jdk-bin-1.5.0*
diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild
index 92bb0930f924..7cf2f4c888fa 100644
--- a/virtual/jdk/jdk-1.6.0.ebuild
+++ b/virtual/jdk/jdk-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.16 2010/01/26 22:39:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.17 2010/02/09 17:23:19 grobian Exp $
 
 DESCRIPTION="Virtual for JDK"
 HOMEPAGE=""
@@ -16,11 +16,21 @@ IUSE=""
 # get a masked license warning for ibm-jdk-bin
 # instead of (not useful) missing keyword warning for sun-jdk
 # see #287615
+# note that this "voodoo" is pretty annoying for Prefix, and that we didn't
+# invent it in the first place!
 RDEPEND="|| (
 		amd64? ( dev-java/icedtea6-bin )
 		x86? ( dev-java/icedtea6-bin )
 		amd64? ( =dev-java/sun-jdk-1.6.0* )
 		x86? ( =dev-java/sun-jdk-1.6.0* )
+		amd64-linux? ( dev-java/icedtea6-bin )
+		x86-linux? ( dev-java/icedtea6-bin )
+		amd64-linux? ( =dev-java/sun-jdk-1.6.0* )
+		x86-linux? ( =dev-java/sun-jdk-1.6.0* )
+		x64-solaris? ( =dev-java/sun-jdk-1.6.0* )
+		x86-solaris? ( =dev-java/sun-jdk-1.6.0* )
+		sparc-solaris? ( =dev-java/sun-jdk-1.6.0* )
+		sparc64-solaris? ( =dev-java/sun-jdk-1.6.0* )
 		=dev-java/ibm-jdk-bin-1.6.0*
 		=dev-java/hp-jdk-bin-1.6.0*
 		=dev-java/diablo-jdk-1.6.0*