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

diff --git a/virtual/jdk/jdk-1.7.0-r1.ebuild b/virtual/jdk/jdk-1.7.0-r1.ebuild
new file mode 100644 (file)
index 0000000..2ab126f
--- /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.ebuild b/virtual/jdk/jdk-1.8.0-r1.ebuild
similarity index 52%
rename from virtual/jdk/jdk-1.8.0.ebuild
rename to virtual/jdk/jdk-1.8.0-r1.ebuild
index 73c1d4139080dfdd7f80ca36ccde64d4199458c6..03f73aec9c1219611500572dd8d45c0bda56e4bb 100644 (file)
--- a/virtual/jdk/jdk-1.8.0.ebuild
+++ b/virtual/jdk/jdk-1.8.0-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 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*"
+RDEPEND="dev-java/oracle-jdk-bin:1.8"