diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-01-26 22:39:42 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-01-26 22:39:42 +0000 |
| commit | a96b6a7bcbad61ceb8ae3517b8da0c7820e343c8 (patch) | |
| tree | 866e4b89a20f11d187b29a425f3a5a9bfbf4176b /virtual | |
| parent | Add ~x86-macos as tested in bug 302078 (diff) | |
| download | gentoo-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')
| -rw-r--r-- | virtual/jdk/ChangeLog | 8 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.5.0.ebuild | 9 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.6.0.ebuild | 12 |
3 files changed, 23 insertions, 6 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/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* |