diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-02-09 17:23:19 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-02-09 17:23:19 +0000 |
| commit | a90f7e70545e0e6b7e8e2d2bcc137fa1e40108b7 (patch) | |
| tree | 0cd34862e51ddce1d8a0cde66f352071006f090e /virtual/jdk | |
| parent | Remove old version. (diff) | |
| download | gentoo-2-a90f7e70545e0e6b7e8e2d2bcc137fa1e40108b7.tar.gz gentoo-2-a90f7e70545e0e6b7e8e2d2bcc137fa1e40108b7.tar.bz2 gentoo-2-a90f7e70545e0e6b7e8e2d2bcc137fa1e40108b7.zip | |
Extend 'meaningful error message voodoo' to unbreak Prefix Linux and Solaris arches
(Portage version: 2.2.00.15320-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'virtual/jdk')
| -rw-r--r-- | virtual/jdk/ChangeLog | 7 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.5.0.ebuild | 10 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.6.0.ebuild | 12 |
3 files changed, 26 insertions, 3 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/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* |