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

Package-Manager: portage-2.1.12.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 24 insertions, 96 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/Manifest b/virtual/jdk/Manifest
index 54ecf2ddd247..7cf482cb1105 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD jdk-1.5.0.ebuild 1274 SHA256 61b65acd10dc18762a4bd2bb3b03f476620df2661f1459515ce68c66cc816d21 SHA512 b1cef8d8321eb902778a8ba15ac3082f145d32cac2816823d25730287e3e2674773cb2cffcb91630b2212f7a7886ba88c03bb00dd9622731226fb8a7ab7f0249 WHIRLPOOL 285f66eb426d20a6378da5fc41cf1d387534b9679e10b3d1d2f2fa6af39334f5d390d2dfc5498a9dcede93e6f91d905332a9d8cdf7708010ee3d0fc28236db1d
-EBUILD jdk-1.6.0-r1.ebuild 1589 SHA256 89cb64a9a3d9285953c471692bca46d8c607e87bec3c0411d2614fab9d84c0ab SHA512 56b9c95012cefbba1435b760474995df35a2b51f3b0af6f5d3ede09a2bb4b75e0c3ab2273f0c442ce8adfd92d293dfbc245d5b6154225f7416c33dc9f77a6aa9 WHIRLPOOL 5295615e01016802daf13ade408948e0e977823698076551cabe1acd01f1992958a397e63b38ba6fe2099ca03e01ca883b4e684ab0260a3506878216a5d7fa83
-EBUILD jdk-1.6.0.ebuild 1990 SHA256 97a00209588c9dca59e3478168d406e50bdf562f5e35957b2bf1d76b18e35be4 SHA512 ec9af50c23b57ffa10ca5112cb97fb326bc9d9be7768c65f4580651c51a62a0d63175d761c1182e507481ce143f3d12b145dda92a6696bb4582144d683a58045 WHIRLPOOL 02001988079e26ebb69755353c0b7a9cfa9bf37238b290ff0509de4781d2d8d971b5661825ae865d4a2c7db49c4e8bd8224a7150c67a4bacc2f278c2d92fba92
+EBUILD jdk-1.5.0-r1.ebuild 936 SHA256 e0bd972306cf50f9da9311ea23f78ae237a358a8c4ceb6a3e2fb1412b4472132 SHA512 d1cf648dab4f9aab73a9097316e34fb851cfdd6794a0adfdb24f6afc493ba054b8d888052b17dab7cc65ac60c3593553c0f3646a19a9daef9618b9add4aaab1f WHIRLPOOL b9f16a4a6a155a783f1d9210c518ca63806ca7888ea58054687163d34cf48441e292e6d870131fc8ce1b9d2c6c7ce4df29877a7a0a5dead2c2388c9563f9dff0
+EBUILD jdk-1.6.0-r2.ebuild 1539 SHA256 9927208cad0845c90aec4a01800c833b986230301fc32eaea018a425ce22086e SHA512 03ecb50995603b873bc66e165562425ea40431a41ddec6478092865259e13793f0958e8c9d63cb0381e0e85223f3860d6aa8740e2b896ed1d9a96700309f5f52 WHIRLPOOL 1b9cc6cc518431a71a88f4c19f692ffa4f0c95418e805a8d5eed74b2294a8577ab0c3a85f05ffd92231f8340d799646c192734bd153c48ebfa4280298804f63d
 EBUILD jdk-1.7.0.ebuild 584 SHA256 d252eaeae0d6a957faa16bb0fed38772b2c662c53ef5a667871f1d6ff549e0da SHA512 1db1f1ef5c6aa1eb218cef6abbd4e774f63b5b49daafae9bed0e8254f6eff922ef04f2390f26b6cfa43e423ea6cc771676bdab9c7a064c611a07c28d614fce60 WHIRLPOOL 082dff5a152b12af99f2802a7fa5ea992e2865a5904919359644665a139edd57cff7a4509dc8f1910cf8d121f92c52643d22edc024eae23df1b6582e5d4d2cf5
-MISC ChangeLog 7608 SHA256 9a23d78465418738c0df498c4238a52dbcaf122dbf7625a4c57a7b8b755800b9 SHA512 fd2a082262f6f20bd59abe52ba36e2142974f8e20beb28e6a7bd125363eab23059f517193f722b8ec359dca507451e60a6e9ab1bf6d5388a0088a698fe475e36 WHIRLPOOL db24c4b2a33a9905e4e96847f11bd4d7943efcf41508f925887e7cfcbf0a4f3cb3998b65ef0aa1bd2f232457189ab208a020cd3848551da305d644dba5c79fe4
+MISC ChangeLog 7949 SHA256 4a6245926f7fe4f5d7a48491ec8f92f95fff2ca02ab76fc221b3a15d2588a659 SHA512 f9db0af01c9993a4ae0e77ff0d847c9d390faa2c8d040f4916a7c1fe5e1627b302165e1997a2634efbaf7ede5a8e85bca541864c79fab860c5502070581ad604 WHIRLPOOL d1d4273d73fad5be3ea889d52b07c5f5070d2c6bd3f1928b59e3261fc3b3822c86fbcd30b4303bb87ab6c16a79cfd272b241726e5bcb8d73d1fce8474b8e14bf
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRPGf+AAoJELjwI6Q8XPdat4AH/0pUIFjJhaQCv9XNLAX6uwB+
-mqjUutQbkyA9ni6R9Df7BdPX19Edn2wrjDt9Co16SQ9SdkcPfACbnZoZ2BIZCIKs
-DS2zwHQaMAHTfepheToyPQ9FWmWBeT/HsmKPOzxrnyJ3t9IT3NhPk/RqdAqpPqTS
-UT2CRm5XuepTg8r3JJLRxNgJTOxgplRQyVM4Hcigp90SoSVXSwiwBQsnRgwteL2Q
-vjOdQPC2f50aBrdlTcHaEYjFp7OnKxiJez1K7gAESEoiXcriDV8jb5b7IjTk7Su4
-eJJYn5/SqntaVxvZoCpvrOxgkQR/GocSTLleIpbl3vwsqdlMbhcDY/KParPyo+4=
-=jNKP
+iQEcBAEBCAAGBQJRzr1DAAoJEJWyH81tNOV9JFYIAMfzP/0zFXFQbqZ5xTvz2gKB
+cGH3ZCw61ME2UVVOKiC+HOmByKu80quKQGMp/jk3WdF4lamGwzYikz2lkvpQbt+y
+gtm8En8m+7ZU/cu4Y03jjgesezwPsk75OXgniA5LsimcrU06S22OY6g9OOm8t6SQ
+1lA/lrpnwRyRyMviCuP/OmxUpocTkFw77jE/kBVBXIR219HfxsA2V2vpY4MfyA3+
+uSRQEpr3n+vCFTF/Z9xo7VEDKwuL7ZG4rePATZbPxLSmsolJbYuMrbcwfAVcVm92
+xuzCKws3wWgbrcpZ+X3uQFbbI1dwijqIWWnj89fMZKcChwuuEPYv0YYNoGoL4rM=
+=aF1N
 -----END PGP SIGNATURE-----
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=""