From f3c7954bc1ead2884a609ee6e2e9147645b9ef6e Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 24 Jan 2016 20:21:09 +0000
Subject: [PATCH] virtual/jre: 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/jre/jre-1.7.0-r1.ebuild                    | 14 ++++++++++++++
 .../jre/{jre-1.8.0.ebuild => jre-1.8.0-r1.ebuild}  | 11 ++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 virtual/jre/jre-1.7.0-r1.ebuild
 rename virtual/jre/{jre-1.8.0.ebuild => jre-1.8.0-r1.ebuild} (51%)

diff --git a/virtual/jre/jre-1.7.0-r1.ebuild b/virtual/jre/jre-1.7.0-r1.ebuild
new file mode 100644
index 0000000000000..2d9cf3ea47288
--- /dev/null
+++ b/virtual/jre/jre-1.7.0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
+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="|| (
+		virtual/jdk:1.7
+		dev-java/oracle-jre-bin:1.7
+	)"
diff --git a/virtual/jre/jre-1.8.0.ebuild b/virtual/jre/jre-1.8.0-r1.ebuild
similarity index 51%
rename from virtual/jre/jre-1.8.0.ebuild
rename to virtual/jre/jre-1.8.0-r1.ebuild
index 79271225d7d23..ae9a4efc446ea 100644
--- a/virtual/jre/jre-1.8.0.ebuild
+++ b/virtual/jre/jre-1.8.0-r1.ebuild
@@ -1,17 +1,14 @@
-# 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 Runtime Environment (JRE)"
 SLOT="1.8"
-# TODO: Temporarily dropped ~sparc-solaris and ~x86-solaris as oracle-jre-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="|| (
-		=virtual/jdk-1.8.0*
-		=dev-java/oracle-jre-bin-1.8.0*
+		virtual/jdk:1.8
+		dev-java/oracle-jre-bin:1.8
 	)"
-DEPEND=""