From 317b6668b829f623fe4cc2deccba7dbbaedf6627 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sun, 24 Jan 2016 20:26:12 +0000 Subject: virtual/jdk: It's 2016, let's use EAPI 6 and SLOT dependencies Ignoring 1.6 because it's about to die. Package-Manager: portage-2.2.27 --- virtual/jdk/jdk-1.7.0-r1.ebuild | 16 ++++++++++++++++ virtual/jdk/jdk-1.8.0-r1.ebuild | 11 +++++++++++ virtual/jdk/jdk-1.8.0.ebuild | 13 ------------- 3 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 virtual/jdk/jdk-1.7.0-r1.ebuild create mode 100644 virtual/jdk/jdk-1.8.0-r1.ebuild delete mode 100644 virtual/jdk/jdk-1.8.0.ebuild diff --git a/virtual/jdk/jdk-1.7.0-r1.ebuild b/virtual/jdk/jdk-1.7.0-r1.ebuild new file mode 100644 index 000000000000..2ab126fd721b --- /dev/null +++ b/virtual/jdk/jdk-1.7.0-r1.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +DESCRIPTION="Virtual for Java Development Kit (JDK)" +SLOT="1.7" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="|| ( + dev-java/icedtea-bin:7 + dev-java/icedtea:7 + dev-java/oracle-jdk-bin:1.7 + dev-java/soylatte-jdk-bin:1.7 + )" diff --git a/virtual/jdk/jdk-1.8.0-r1.ebuild b/virtual/jdk/jdk-1.8.0-r1.ebuild new file mode 100644 index 000000000000..03f73aec9c12 --- /dev/null +++ b/virtual/jdk/jdk-1.8.0-r1.ebuild @@ -0,0 +1,11 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +DESCRIPTION="Virtual for Java Development Kit (JDK)" +SLOT="1.8" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" + +RDEPEND="dev-java/oracle-jdk-bin:1.8" diff --git a/virtual/jdk/jdk-1.8.0.ebuild b/virtual/jdk/jdk-1.8.0.ebuild deleted file mode 100644 index 73c1d4139080..000000000000 --- a/virtual/jdk/jdk-1.8.0.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -DESCRIPTION="Virtual for Java Development Kit (JDK)" -SLOT="1.8" -# TODO: Temporarily dropped ~sparc-solaris and ~x86-solaris as oracle-jdk-bin -# no longer provides them. Also temporarily dropped ~ia64. -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" - -RDEPEND="=dev-java/oracle-jdk-bin-1.8.0*" -- cgit v1.2.3-18-g5258