Remove sun-jdk and sun-jre-bin from the virtuals, acked by Caster. For security bug #473830 reported by Agostino Sarubbo.

(Portage version: 2.1.12.10/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

4 files changed, 13 insertions, 84 deletions

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 9aff7848e754..6d0a56230dfe 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for virtual/jdk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.57 2013/03/10 11:01:08 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.58 2013/06/29 10:58:51 tomwij Exp $
+
+*jdk-1.5.0-r1 (29 Jun 2013)
+*jdk-1.6.0-r2 (29 Jun 2013)
+
+  29 Jun 2013; Tom Wijsman <TomWij@gentoo.org> +jdk-1.5.0-r1.ebuild,
+  +jdk-1.6.0-r2.ebuild, -jdk-1.5.0.ebuild, -jdk-1.6.0-r1.ebuild,
+  -jdk-1.6.0.ebuild:
+  Remove sun-jdk and sun-jre-bin from the virtuals, acked by Caster. For
+  security bug #473830 reported by Agostino Sarubbo.
 
   10 Mar 2013; Ralph Sennhauser <sera@gentoo.org> jdk-1.5.0.ebuild,
   jdk-1.6.0.ebuild, jdk-1.6.0-r1.ebuild, jdk-1.7.0.ebuild:
diff --git a/virtual/jdk/jdk-1.5.0.ebuild b/virtual/jdk/jdk-1.5.0-r1.ebuild
index 4cc639a23d9d..fc732426b917 100644
--- a/virtual/jdk/jdk-1.5.0.ebuild
+++ b/virtual/jdk/jdk-1.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.5.0.ebuild,v 1.22 2013/03/10 11:01:08 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild,v 1.1 2013/06/29 10:58:51 tomwij Exp $
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 HOMEPAGE=""
@@ -18,14 +18,6 @@ IUSE=""
 # note that this "voodoo" is pretty annoying for Prefix, and that we didn't
 # invent it in the first place!
 RDEPEND="|| (
-		amd64? ( =dev-java/sun-jdk-1.5.0* )
-		x86? ( =dev-java/sun-jdk-1.5.0* )
-		amd64-linux? ( =dev-java/sun-jdk-1.5.0* )
-		x86-linux? ( =dev-java/sun-jdk-1.5.0* )
-		x64-solaris? ( =dev-java/sun-jdk-1.5.0* )
-		x86-solaris? ( =dev-java/sun-jdk-1.5.0* )
-		sparc-solaris? ( =dev-java/sun-jdk-1.5.0* )
-		sparc64-solaris? ( =dev-java/sun-jdk-1.5.0* )
 		=dev-java/ibm-jdk-bin-1.5.0*
 		=dev-java/jrockit-jdk-bin-1.5.0*
 		=dev-java/apple-jdk-bin-1.5.0*
diff --git a/virtual/jdk/jdk-1.6.0-r1.ebuild b/virtual/jdk/jdk-1.6.0-r2.ebuild
index 1cf4bacd4ace..79a88a298fc8 100644
--- a/virtual/jdk/jdk-1.6.0-r1.ebuild
+++ b/virtual/jdk/jdk-1.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.9 2013/03/10 11:01:08 sera Exp $
+# $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"
 
@@ -27,8 +27,7 @@ PPC_OPTS="|| (
 # Prefix defaults - prefer sun-jdk over icedtea
 PREFIX_OPTS="|| (
 	=dev-java/icedtea-bin-6*
-	=dev-java/icedtea-bin-1*
-	=dev-java/sun-jdk-1.6.0* )"
+	=dev-java/icedtea-bin-1* )"
 
 # icedtea-bin-1* is old versioning scheme of icedtea-bin-6*
 RDEPEND="|| (
@@ -38,7 +37,6 @@ RDEPEND="|| (
 	=dev-java/icedtea-bin-6*
 	=dev-java/icedtea-bin-1*
 	=dev-java/icedtea-6*
-	=dev-java/sun-jdk-1.6.0*
 	=dev-java/ibm-jdk-bin-1.6.0*
 	=dev-java/hp-jdk-bin-1.6.0*
 	=dev-java/diablo-jdk-1.6.0*
diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild
deleted file mode 100644
index 0af48f66368a..000000000000
--- a/virtual/jdk/jdk-1.6.0.ebuild
+++ /dev/null
@@ -1,70 +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.ebuild,v 1.24 2013/03/10 11:01:08 sera Exp $
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="1.6"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-aix ~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 so that ppc(64) users will
-# get a masked license warning for ibm-jdk-bin
-# instead of (not useful) missing keyword warning for sun-jdk
-# see #287615
-# note that this "voodoo" is pretty annoying for Prefix, and that we didn't
-# invent it in the first place!
-
-COMMON_INC="
-		=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*
-"
-
-# icedtea-bin-1* is old versioning scheme of icedtea-bin-6*
-X86_OPTS="|| (
-		=dev-java/icedtea-bin-6*
-		=dev-java/icedtea-bin-1*
-		=dev-java/icedtea-6*
-		=dev-java/sun-jdk-1.6.0*
-		${COMMON_INC}
-	)"
-
-X86_PREFIX_OPTS="|| (
-		=dev-java/icedtea-bin-6*
-		=dev-java/icedtea-bin-1*
-		=dev-java/sun-jdk-1.6.0*
-		${COMMON_INC}
-	)"
-
-PPC_OPTS="|| (
-		=dev-java/ibm-jdk-bin-1.6.0*
-		=dev-java/icedtea-6*
-	)"
-
-COMMON_OPTS="|| (
-		${COMMON_INC}
-		)"
-
-RDEPEND="|| (
-		amd64? ( ${X86_OPTS} )
-		x86? ( ${X86_OPTS} )
-		ppc? ( ${PPC_OPTS} )
-		ppc64? ( ${PPC_OPTS} )
-		amd64-linux? ( ${X86_PREFIX_OPTS} )
-		x86-linux? ( ${X86_PREFIX_OPTS} )
-		x64-solaris? ( ${X86_PREFIX_OPTS} )
-		x86-solaris? ( ${X86_PREFIX_OPTS} )
-		sparc-solaris? ( ${X86_PREFIX_OPTS} )
-		sparc64-solaris? ( ${X86_PREFIX_OPTS} )
-		!amd64? ( !x86? ( !ppc? ( !ppc64? ( !amd64-linux? ( !x86-linux? ( !x64-solaris? ( !x86-solaris? ( !sparc-solaris? ( !sparc64-solaris? (
-			${COMMON_OPTS}
-		) ) ) ) ) ) ) ) ) )
-	)"
-DEPEND=""