Make dependencies on icedtea6-bin and sun-jdk apply only on x86/amd64 so that ppc(64) users get more meaningful error for masked licenses of ibm-jdk-bin, as pointed out in #287615.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 26 insertions, 9 deletions

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index c7cbde8b9d5e..9f9f301a57d0 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for virtual/jdk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.27 2010/01/25 16:09:09 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.28 2010/01/26 22:39:42 caster Exp $
+
+  26 Jan 2010; Vlastimil Babka <caster@gentoo.org> jdk-1.5.0.ebuild,
+  jdk-1.6.0.ebuild:
+  Make dependencies on icedtea6-bin and sun-jdk apply only on x86/amd64 so
+  that ppc(64) users get more meaningful error for masked licenses of
+  ibm-jdk-bin, as pointed out in #287615.
 
   25 Jan 2010; Vlastimil Babka <caster@gentoo.org> jdk-1.4.2.ebuild,
   jdk-1.5.0.ebuild:
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 4a5ea374434b..bc62e3309eb9 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,6 +1,6 @@
 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 695 RMD160 16595d7494be8446503053763b69814869935d17 SHA1 d5ce487f3301c964a8bb82187e8c0d9ba5c69d5a SHA256 afc9b182d918aae2d29f21c20529ee3eebb9902a39fc8df3040835107c94a9c8
-EBUILD jdk-1.6.0.ebuild 793 RMD160 e9406a86fb3fe0c10f9cf5ba265a35c4674248d8 SHA1 81046d3bec05fdf6254e148501b4a1e1d5844054 SHA256 9d4ff7f6758edc86f96333e4fbf60e6bb67cb644c62f36a0c01a8f89034f2bd3
-MISC ChangeLog 3724 RMD160 e0f3ec8862dc1bfa0ea530f1a138747550d7a4f3 SHA1 b86a0e116bd8f03238e3b548696ec6d01c430772 SHA256 1e7594a1316db7a56456281c12104a47b677c34960b27c4d1d888cb0ec01350d
+EBUILD jdk-1.5.0.ebuild 929 RMD160 b7af46e0531b69d4fd88b68d820aeb08f6e9ec19 SHA1 cba3ab5f969d9930921dbae2731ea5afe4a8872f SHA256 96202c4e2f92b279e9d4472d886415c6056d354bd60360a5c78f186b25c74bf2
+EBUILD jdk-1.6.0.ebuild 1072 RMD160 66119bec8714489de334847aec155c7fb2f0788b SHA1 65a37d8192832f1d99f10044e351a58c50a3a788 SHA256 6a16a6fd9a77d2ba22621b609d3ae4463adad537126a0f0355a5ee8a93e93420
+MISC ChangeLog 4001 RMD160 48180dd0ec6e8ffb13612e4cdee14dc6018d07ba SHA1 8067c188c1e54f1089e1c2838b0550d19d85d886 SHA256 a2e20d81c04d6e3161789bdaced95a61387788bf87a7c000b5358d7773660d8c
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/virtual/jdk/jdk-1.5.0.ebuild b/virtual/jdk/jdk-1.5.0.ebuild
index 62f5ca4ee275..0724c2fbfc02 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.13 2010/01/25 16:09:09 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild,v 1.14 2010/01/26 22:39:42 caster Exp $
 
 DESCRIPTION="Virtual for JDK"
 HOMEPAGE=""
@@ -12,8 +12,13 @@ KEYWORDS="amd64 ia64 ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux
 IUSE=""
 
 # Keep this list in sync with java-virtuals/jmx
+# The keyword voodoo below is needed so that ppc(64) users will
+# get a masked license warning for ibm-jdk-bin
+# instead of (not useful) missing keyword warning for sun-jdk
+# see #287615
 RDEPEND="|| (
-		=dev-java/sun-jdk-1.5.0*
+		amd64? ( =dev-java/sun-jdk-1.5.0* )
+		x86? ( =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/diablo-jdk-1.5.0*
diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild
index 7fe55c0370ac..92bb0930f924 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.15 2010/01/13 14:08:58 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.16 2010/01/26 22:39:42 caster Exp $
 
 DESCRIPTION="Virtual for JDK"
 HOMEPAGE=""
@@ -12,9 +12,15 @@ KEYWORDS="amd64 ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~amd64-li
 IUSE=""
 
 # Keeps this and java-virtuals/jaf in sync
+# The keyword voodoo below is needed so that ppc(64) users will
+# get a masked license warning for ibm-jdk-bin
+# instead of (not useful) missing keyword warning for sun-jdk
+# see #287615
 RDEPEND="|| (
-		dev-java/icedtea6-bin
-		=dev-java/sun-jdk-1.6.0*
+		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* )
 		=dev-java/ibm-jdk-bin-1.6.0*
 		=dev-java/hp-jdk-bin-1.6.0*
 		=dev-java/diablo-jdk-1.6.0*