summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2010-01-25 16:09:09 +0000
committerVlastimil Babka <caster@gentoo.org>2010-01-25 16:09:09 +0000
commit5b6edbf44a514f4869a0945b414f0678a2ce3fdd (patch)
tree51d7e533ae3d75b74a35c0041a38ea47cda11673 /virtual/jdk
parentVersion bump KDE 4.3.5 (diff)
downloadgentoo-2-5b6edbf44a514f4869a0945b414f0678a2ce3fdd.tar.gz
gentoo-2-5b6edbf44a514f4869a0945b414f0678a2ce3fdd.tar.bz2
gentoo-2-5b6edbf44a514f4869a0945b414f0678a2ce3fdd.zip
Move apple-jdk-bin down in the list of variants so that the useful missing license error for sun-jdk is displayed instead of not-useful missing package error for apple-jdk-bin (which is in prefix overlay) - bug #302032.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'virtual/jdk')
-rw-r--r--virtual/jdk/ChangeLog9
-rw-r--r--virtual/jdk/jdk-1.4.2.ebuild4
-rw-r--r--virtual/jdk/jdk-1.5.0.ebuild4
3 files changed, 12 insertions, 5 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 5c58d9a1f02e..c7cbde8b9d5e 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for virtual/jdk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.26 2010/01/13 14:08:58 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.27 2010/01/25 16:09:09 caster Exp $
+
+ 25 Jan 2010; Vlastimil Babka <caster@gentoo.org> jdk-1.4.2.ebuild,
+ jdk-1.5.0.ebuild:
+ Move apple-jdk-bin down in the list of variants so that the useful missing
+ license error for sun-jdk is displayed instead of not-useful missing
+ package error for apple-jdk-bin (which is in prefix overlay) - bug
+ #302032.
13 Jan 2010; Michael Haubenwallner <haubi@gentoo.org> jdk-1.6.0.ebuild:
add hp-jdk-bin as alternative
diff --git a/virtual/jdk/jdk-1.4.2.ebuild b/virtual/jdk/jdk-1.4.2.ebuild
index 2305e36fe885..15e210f9dd44 100644
--- a/virtual/jdk/jdk-1.4.2.ebuild
+++ b/virtual/jdk/jdk-1.4.2.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.4.2.ebuild,v 1.6 2010/01/11 11:03:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.4.2.ebuild,v 1.7 2010/01/25 16:09:09 caster Exp $
DESCRIPTION="Virtual for JDK"
HOMEPAGE=""
@@ -12,11 +12,11 @@ KEYWORDS="amd64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
IUSE=""
RDEPEND="|| (
- =dev-java/apple-jdk-bin-1.4.2*
=dev-java/blackdown-jdk-1.4.2*
=dev-java/sun-jdk-1.4.2*
=dev-java/ibm-jdk-bin-1.4.2*
=dev-java/jrockit-jdk-bin-1.4.2*
+ =dev-java/apple-jdk-bin-1.4.2*
=dev-java/kaffe-1.1*
)"
DEPEND=""
diff --git a/virtual/jdk/jdk-1.5.0.ebuild b/virtual/jdk/jdk-1.5.0.ebuild
index d0c006f586fd..62f5ca4ee275 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.12 2010/01/11 11:03:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild,v 1.13 2010/01/25 16:09:09 caster Exp $
DESCRIPTION="Virtual for JDK"
HOMEPAGE=""
@@ -13,10 +13,10 @@ IUSE=""
# Keep this list in sync with java-virtuals/jmx
RDEPEND="|| (
- =dev-java/apple-jdk-bin-1.5.0*
=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*
+ =dev-java/apple-jdk-bin-1.5.0*
)"
DEPEND=""