diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2015-04-14 21:34:15 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2015-04-14 21:34:15 +0000 |
| commit | 04da445cef1002583db961de81ca3fc829691b56 (patch) | |
| tree | 8b54202edc64654252f023a77b8f7c6961155945 /virtual | |
| parent | Remove old. (diff) | |
| download | gentoo-2-04da445cef1002583db961de81ca3fc829691b56.tar.gz gentoo-2-04da445cef1002583db961de81ca3fc829691b56.tar.bz2 gentoo-2-04da445cef1002583db961de81ca3fc829691b56.zip | |
Remove dead icedtea-bin-1* and winjdk-bin options as well as
diablo-jdk, which is about to be last-rited. Also remove PREFIX_OPTS
because it no longer makes sense.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/jdk/ChangeLog | 7 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.6.0-r2.ebuild | 16 |
2 files changed, 9 insertions, 14 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog index a234a8d58c1b..efa4d9e9c253 100644 --- a/virtual/jdk/ChangeLog +++ b/virtual/jdk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for virtual/jdk # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.63 2015/02/11 08:49:39 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.64 2015/04/14 21:34:15 chewi Exp $ + + 14 Apr 2015; James Le Cuirot <chewi@gentoo.org> jdk-1.6.0-r2.ebuild: + Remove dead icedtea-bin-1* and winjdk-bin options as well as diablo-jdk, which + is about to be last-rited. Also remove PREFIX_OPTS because it no longer makes + sense. 11 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org> -jdk-1.5.0-r1.ebuild: removed slot 1.5 per bug #292001 diff --git a/virtual/jdk/jdk-1.6.0-r2.ebuild b/virtual/jdk/jdk-1.6.0-r2.ebuild index 62fb01511b6d..1246dab8b330 100644 --- a/virtual/jdk/jdk-1.6.0-r2.ebuild +++ b/virtual/jdk/jdk-1.6.0-r2.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/jdk/jdk-1.6.0-r2.ebuild,v 1.2 2014/05/30 11:20:17 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.3 2015/04/14 21:34:15 chewi Exp $ EAPI="4" @@ -19,22 +19,12 @@ PPC_OPTS="|| ( =dev-java/ibm-jdk-bin-1.6.0* =dev-java/icedtea-6* )" -# Prefix defaults - prefer sun-jdk over icedtea -PREFIX_OPTS="|| ( - =dev-java/icedtea-bin-6* - =dev-java/icedtea-bin-1* )" - -# icedtea-bin-1* is old versioning scheme of icedtea-bin-6* RDEPEND="|| ( ppc? ( ${PPC_OPTS} ) ppc64? ( ${PPC_OPTS} ) - prefix? ( ${PREFIX_OPTS} ) =dev-java/icedtea-bin-6* - =dev-java/icedtea-bin-1* =dev-java/icedtea-6* =dev-java/ibm-jdk-bin-1.6.0* =dev-java/hp-jdk-bin-1.6.0* - =dev-java/diablo-jdk-1.6.0* =dev-java/soylatte-jdk-bin-1.0* - =dev-java/apple-jdk-bin-1.6.0* - =dev-java/winjdk-bin-1.6.0* )" + =dev-java/apple-jdk-bin-1.6.0* )" |