summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2010-01-26 22:39:42 +0000
committerVlastimil Babka <caster@gentoo.org>2010-01-26 22:39:42 +0000
commita96b6a7bcbad61ceb8ae3517b8da0c7820e343c8 (patch)
tree866e4b89a20f11d187b29a425f3a5a9bfbf4176b /virtual/jdk/jdk-1.5.0.ebuild
parentAdd ~x86-macos as tested in bug 302078 (diff)
downloadgentoo-2-a96b6a7bcbad61ceb8ae3517b8da0c7820e343c8.tar.gz
gentoo-2-a96b6a7bcbad61ceb8ae3517b8da0c7820e343c8.tar.bz2
gentoo-2-a96b6a7bcbad61ceb8ae3517b8da0c7820e343c8.zip
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.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'virtual/jdk/jdk-1.5.0.ebuild')
-rw-r--r--virtual/jdk/jdk-1.5.0.ebuild9
1 files changed, 7 insertions, 2 deletions
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*