From 120ff2d8be3b7b2d3d47d1c3db718c2cad4e8638 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Sun, 18 Oct 2015 09:24:47 +0800
Subject: [PATCH] virtual/jdk: sync with gentoo

---
 virtual/jdk/jdk-1.6.0-r2.ebuild | 45 ---------------------------------
 virtual/jdk/jdk-1.7.0.ebuild    | 14 ++++------
 2 files changed, 5 insertions(+), 54 deletions(-)
 delete mode 100644 virtual/jdk/jdk-1.6.0-r2.ebuild

diff --git a/virtual/jdk/jdk-1.6.0-r2.ebuild b/virtual/jdk/jdk-1.6.0-r2.ebuild
deleted file mode 100644
index f13428c17..000000000
--- a/virtual/jdk/jdk-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 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.1 2013/06/29 10:58:51 tomwij Exp $
-
-EAPI="4"
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="1.6"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-# The keyword voodoo below is needed to work around confilcting masking types
-# and for having arch specific preferences.
-# All VMs must be listed in the no use flag enabled case which reflects the
-# default order for amd64 and x86.
-
-# This is that ppc(64) users will get a masked license warning for ibm-jdk-bin
-# instead of (not useful) missing keyword warning for sun-jdk. #287615
-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-6*
-	=dev-java/icedtea-bin-6*
-	=dev-java/icedtea-bin-1*
-	=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* )"
diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild
index 1c99f80f3..2ffb7ea75 100644
--- a/virtual/jdk/jdk-1.7.0.ebuild
+++ b/virtual/jdk/jdk-1.7.0.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2013 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.7.0.ebuild,v 1.10 2013/03/10 11:01:08 sera Exp $
+# $Id$
+
+EAPI="5"
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
 SLOT="1.7"
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+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*
@@ -17,4 +14,3 @@ RDEPEND="|| (
 		=dev-java/oracle-jdk-bin-1.7.0*
 		=dev-java/soylatte-jdk-bin-7*
 	)"
-DEPEND=""