From 4c38b89e478058b6f69bf784af45ee22a9c9a41c Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Tue, 17 May 2016 09:54:58 +0800
Subject: [PATCH] virtual/jdk: sync with gentoo

---
 virtual/jdk/jdk-1.7.0-r2.ebuild | 15 +++++++++++++++
 virtual/jdk/jdk-1.7.0.ebuild    | 16 ----------------
 virtual/jdk/jdk-1.8.0-r4.ebuild | 15 +++++++++++++++
 3 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 virtual/jdk/jdk-1.7.0-r2.ebuild
 delete mode 100644 virtual/jdk/jdk-1.7.0.ebuild
 create mode 100644 virtual/jdk/jdk-1.8.0-r4.ebuild

diff --git a/virtual/jdk/jdk-1.7.0-r2.ebuild b/virtual/jdk/jdk-1.7.0-r2.ebuild
new file mode 100644
index 000000000..699a0220a
--- /dev/null
+++ b/virtual/jdk/jdk-1.7.0-r2.ebuild
@@ -0,0 +1,15 @@
+# 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 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="|| (
+		dev-java/icedtea:7
+		dev-java/icedtea-bin:7
+		dev-java/oracle-jdk-bin:1.7
+	)"
diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild
deleted file mode 100644
index 2ffb7ea75..000000000
--- a/virtual/jdk/jdk-1.7.0.ebuild
+++ /dev/null
@@ -1,16 +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.7"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="|| (
-		=dev-java/icedtea-7*
-		=dev-java/icedtea-bin-7*
-		=dev-java/oracle-jdk-bin-1.7.0*
-		=dev-java/soylatte-jdk-bin-7*
-	)"
diff --git a/virtual/jdk/jdk-1.8.0-r4.ebuild b/virtual/jdk/jdk-1.8.0-r4.ebuild
new file mode 100644
index 000000000..0b4192df3
--- /dev/null
+++ b/virtual/jdk/jdk-1.8.0-r4.ebuild
@@ -0,0 +1,15 @@
+# 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 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+
+RDEPEND="|| (
+		dev-java/icedtea:8
+		dev-java/icedtea-bin:8
+		dev-java/oracle-jdk-bin:1.8
+	)"