summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'virtual')
-rw-r--r--virtual/jdk/ChangeLog7
-rw-r--r--virtual/jdk/jdk-1.6.0.ebuild7
2 files changed, 9 insertions, 5 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 2c42c2bc72af..d85d705ea626 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/jdk
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.22 2008/12/24 22:28:21 caster Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.23 2009/07/05 05:10:29 ali_bush Exp $
+
+ 05 Jul 2009; Alistair Bush <ali_bush@gentoo.org> jdk-1.6.0.ebuild:
+ Keyword ~x86-fbsd and add diablo-jdk
24 Dec 2008; Vlastimil Babka <caster@gentoo.org> jdk-1.6.0.ebuild:
Add icedtea6-bin as an alternative.
diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild
index 055f98112538..22d5d408f8b6 100644
--- a/virtual/jdk/jdk-1.6.0.ebuild
+++ b/virtual/jdk/jdk-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.10 2008/12/24 22:28:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.11 2009/07/05 05:10:29 ali_bush Exp $
DESCRIPTION="Virtual for JDK"
HOMEPAGE="http://java.sun.com/"
@@ -8,7 +8,7 @@ SRC_URI=""
LICENSE="as-is"
SLOT="1.6"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
IUSE=""
# Keeps this and java-virtuals/jaf in sync
@@ -16,5 +16,6 @@ RDEPEND="|| (
dev-java/icedtea6-bin
=dev-java/sun-jdk-1.6.0*
=dev-java/ibm-jdk-bin-1.6.0*
+ =dev-java/diablo-jdk-1.6.0*
)"
DEPEND=""