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
RepoMan-Options: --force
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 23 insertions, 20 deletions

diff --git a/java-virtuals/jdk-with-com-sun/ChangeLog b/java-virtuals/jdk-with-com-sun/ChangeLog
index e5d149335bf3..f09e809bbcf7 100644
--- a/java-virtuals/jdk-with-com-sun/ChangeLog
+++ b/java-virtuals/jdk-with-com-sun/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for java-virtuals/jdk-with-com-sun
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.19 2012/10/04 17:36:29 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.20 2013/06/30 09:09:12 tomwij Exp $
+
+*jdk-with-com-sun-20111111-r1 (30 Jun 2013)
+
+  30 Jun 2013; Tom Wijsman <TomWij@gentoo.org>
+  +jdk-with-com-sun-20111111-r1.ebuild, -jdk-with-com-sun-20111111.ebuild:
+  Remove sun-jdk and sun-jre-bin from the virtuals, acked by Caster. For
+  security bug #473830 reported by Agostino Sarubbo.
 
   04 Oct 2012; Ralph Sennhauser <sera@gentoo.org>
   jdk-with-com-sun-20111111.ebuild:
@@ -97,4 +104,3 @@
   +jdk-with-com-sun-20080505.ebuild:
   Rename sun-jdk virtual to jdk-with-com-sun to avoid having to specify
   category with sun-jdk.
-
diff --git a/java-virtuals/jdk-with-com-sun/Manifest b/java-virtuals/jdk-with-com-sun/Manifest
index baa648bcbc39..e77e1a2e2fc1 100644
--- a/java-virtuals/jdk-with-com-sun/Manifest
+++ b/java-virtuals/jdk-with-com-sun/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD jdk-with-com-sun-20111111.ebuild 1079 SHA256 86dea508c09b6dfbcaa23edd3cfeac821aaf2a1782540ffd01b3be50f65f789d SHA512 ff909d30f32d4051e3a3df1661b527f1825ba5d674a040b8dcd9549020d5853b250dbcf90955a1b0e03e8ddfa263a6caeba9ecd6ea93f9116abe72dd73434dc2 WHIRLPOOL e0a0919eee0b21ce40f6ea2ad6bbc728409188611f1cbba856c132cf81a38a1f6615cac71efc1026b4e3bc3b425af36ac4e97c7baffcd927d3ce397ffa6cc6bb
-MISC ChangeLog 3380 SHA256 2ed67fc5f018ad720af04b6ef9d29e86a45956cd5eb745a81a2aa3008dcad996 SHA512 a528c6835c0dc721c25d14842b16d0ef1612df4ad20108f9dabd1de16b24ca051f83179bc2a23c7ba1369bc4a24114933363e5a5d48d5146c1981542d0436937 WHIRLPOOL 4d54eb1660fbff9da4f66555aeac52b3ca73d3cc52bbeb192278b005480978958e26c3d50708fd20aa5582370552cda2969205cd0c076f3cefbc989ecc1e0ffc
+EBUILD jdk-with-com-sun-20111111-r1.ebuild 978 SHA256 13b14e50bc798fcd4f9862c166f4dffbf2defa2207f3da6d84e272535d59482f SHA512 f1c821a9fe38a4f8aa9459d25d28ddb75c119e29f92f7c21e33b9387cc31bb64120da559da3293d5f31339dc67c721a40e45011dea6f0c662946f77a1966f052 WHIRLPOOL a6882dd20356c1000e4af8ce969095a486fd9b8a2f3de50a590646b258f1e3865197efa15cf31a2e363136510904bb2174a9641cec65829c4436b33f49fc1fdc
+MISC ChangeLog 3675 SHA256 302b7c93e6e3bb4f075fad1ed35339842b5bac94510498fbf6023ece5105311b SHA512 df44ff54dd0ccf813f3253fa458e898684ab9a20736e1dc99758c6dde14766185cbe0c665f53604855236ce855260155f6346921595fd89de754c2634ceafb51 WHIRLPOOL 0cf07b76c3fced6d030e4904c9af0ed5cd7c1ca71c047a5e72d7542db4c14df9a99d21791ba39e08046bf8c434cff849fd7f50eb271e4249c0946abbf05ae004
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQbcknAAoJEIUJ+svaV163kWkIAKW/uHxsPelntc8pHACiVlVP
-NuI6ut+2J1rf/Pj1nchv4K8t3+jQVVlAKC1ImYg3MlOMNAz5CdLV7hvhbNUKnQ67
-CB6E6hKw3f6/QdHmoKvbN+tet0i2fts5GsdsRiT66DOvTtBJqNkGNyc2M0W7LSET
-cOY7W20+ZnwEsQuyufa6hE23oBCtLlJoTH5lVL6ATgWffpU+OJK1GD3FS5pLo/vS
-4nXjxkHap/cgsvIyN0LJZsJVK4mBM3rr7b8MGEoPoyoPTJIB7JGC8B8DINq2mpkT
-dcdkQYU1ykVY2HzbYbusuC79zmcdoyVBf+C40gHAAIBNWRwquzqZFB87/0FcehE=
-=jKsF
+iQEcBAEBCAAGBQJRz/ULAAoJEJWyH81tNOV9ZMMIAIdxXxu2YWiHTyWnIJWtwlNK
+Mt1ODxLjw7opIAF4WMsqrN0k7O1ZALOPYZsWrF0oWDHQpQB9HKCzHYmYdS3BMPoV
+IZoAv7IBUegcQCjE1nI5zp4tQ+kUzyCHCkZ+/gk5lAemamOEaqoC9W7gDiSIbCvB
+JYR9EgReDqga1omk3NRl71uXI4N15dn2dDLmjV07U/L24a9DUG7BdA5NnB/X5giH
+smKtvDsbdiyB+hsUE+det2i7z4hmaqNy5f6GPz1N2uzXblEqmfRmdaYj0koegNZZ
+u0qmjuC906iwNKiCXDZ/OStcRY8/97vQ/5sl8q+Q+V2Rm3lPo0Uvyhid5wmjhiM=
+=aq/G
 -----END PGP SIGNATURE-----
diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r1.ebuild
index 755bfc0d3388..0e992cf92e1b 100644
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111.ebuild
+++ b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111.ebuild,v 1.3 2012/10/04 17:36:29 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r1.ebuild,v 1.1 2013/06/30 09:09:12 tomwij Exp $
 
-EAPI=1
+EAPI="5"
 
 inherit java-virtuals-2
 
@@ -21,9 +21,6 @@ RDEPEND="|| (
 			dev-java/icedtea:6
 			dev-java/icedtea-bin:7
 			dev-java/icedtea:7
-			dev-java/sun-jdk:1.6
-			dev-java/sun-jdk:1.5
-			dev-java/sun-jdk:1.4
 			dev-java/oracle-jdk-bin:1.7
 			dev-java/diablo-jdk:1.6
 			dev-java/apple-jdk-bin:1.6
@@ -31,4 +28,4 @@ RDEPEND="|| (
 			dev-java/apple-jdk-bin:1.4
 		)"
 
-JAVA_VIRTUAL_VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 icedtea-bin-7 icedtea-7 sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 oracle-jdk-bin-1.7 diablo-jdk-1.6 apple-jdk-bin-1.6 apple-jdk-bin-1.5 apple-jdk-bin-1.4"
+JAVA_VIRTUAL_VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 icedtea-bin-7 icedtea-7 oracle-jdk-bin-1.7 diablo-jdk-1.6 apple-jdk-bin-1.6 apple-jdk-bin-1.5 apple-jdk-bin-1.4"