summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--virtual/jre/ChangeLog5
-rw-r--r--virtual/jre/jre-1.6.0-r1.ebuild5
2 files changed, 6 insertions, 4 deletions
diff --git a/virtual/jre/ChangeLog b/virtual/jre/ChangeLog
index 7a7dffc7eb20..903e30d7888a 100644
--- a/virtual/jre/ChangeLog
+++ b/virtual/jre/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/jre
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/ChangeLog,v 1.50 2015/02/11 08:51:06 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/ChangeLog,v 1.51 2015/04/14 21:35:32 chewi Exp $
+
+ 14 Apr 2015; James Le Cuirot <chewi@gentoo.org> jre-1.6.0-r1.ebuild:
+ diablo-jre-bin is about to be last-rited.
11 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org> -jre-1.5.0-r2.ebuild:
removed slot 1.5 per bug #292001
diff --git a/virtual/jre/jre-1.6.0-r1.ebuild b/virtual/jre/jre-1.6.0-r1.ebuild
index bec437676a3f..59a7d71565a6 100644
--- a/virtual/jre/jre-1.6.0-r1.ebuild
+++ b/virtual/jre/jre-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.6.0-r1.ebuild,v 1.2 2014/05/30 11:20:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.6.0-r1.ebuild,v 1.3 2015/04/14 21:35:32 chewi Exp $
EAPI="5"
@@ -11,6 +11,5 @@ KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-fre
RDEPEND="|| (
=virtual/jdk-1.6.0*
=dev-java/ibm-jre-bin-1.6.0*
- =dev-java/diablo-jre-bin-1.6.0*
)"
DEPEND=""