summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'virtual/jdk')
-rw-r--r--virtual/jdk/ChangeLog5
-rw-r--r--virtual/jdk/jdk-1.7.0.ebuild3
2 files changed, 6 insertions, 2 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index bcda89c6296c..51fffef79eb7 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/jdk
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.38 2011/10/30 14:08:48 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.39 2011/11/04 15:07:54 caster Exp $
+
+ 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.7.0.ebuild:
+ Add icedtea-7 alternative.
30 Oct 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.6.0.ebuild:
Package move icedtea6-bin to icedtea-bin.
diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild
index fe886ef2ffc2..15a7d4f3a4a5 100644
--- a/virtual/jdk/jdk-1.7.0.ebuild
+++ b/virtual/jdk/jdk-1.7.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.1 2011/09/08 07:33:39 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.2 2011/11/04 15:07:54 caster Exp $
DESCRIPTION="Virtual for JDK"
HOMEPAGE=""
@@ -13,6 +13,7 @@ IUSE=""
# Keeps this and java-virtuals/jaf in sync
RDEPEND="|| (
+ =dev-java/icedtea-7*
=dev-java/oracle-jdk-bin-1.7.0*
)"
DEPEND=""