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, 23 insertions, 35 deletions

diff --git a/virtual/jre/ChangeLog b/virtual/jre/ChangeLog
index a0bb6d7d0147..e09a16fd894a 100644
--- a/virtual/jre/ChangeLog
+++ b/virtual/jre/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for virtual/jre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/ChangeLog,v 1.44 2013/03/10 10:56:07 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/ChangeLog,v 1.45 2013/06/29 10:58:57 tomwij Exp $
+
+*jre-1.5.0-r2 (29 Jun 2013)
+*jre-1.6.0-r1 (29 Jun 2013)
+
+  29 Jun 2013; Tom Wijsman <TomWij@gentoo.org> +jre-1.5.0-r2.ebuild,
+  +jre-1.6.0-r1.ebuild, -jre-1.5.0-r1.ebuild, -jre-1.5.0.ebuild,
+  -jre-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> jre-1.5.0.ebuild,
   jre-1.5.0-r1.ebuild, jre-1.6.0.ebuild, jre-1.7.0.ebuild:
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index e9db7a32ea02..82857ca2e52d 100644
--- a/virtual/jre/Manifest
+++ b/virtual/jre/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD jre-1.5.0-r1.ebuild 561 SHA256 3325dd7ba3af9485453420f742d338dd8c30d050ea360956ab53a9f13263d0dc SHA512 d00463fd2d9a2ccb12ebce1d23db72c8063aed7ab747cbfcf103b6bf313b1bd335479e3dba2afb1fbc01fd5ddd979ee783ad39d869fc04cdbaa5f8ef0440e277 WHIRLPOOL f0f0af81d1c61c70c7822733a139a387fe2a6af3d0dfe335a92ced195da8b0e62cb3eb8beba38e3793a4000fdf50590501f18d23d8a843d6858131925f024ce6
-EBUILD jre-1.5.0.ebuild 545 SHA256 80f1539ce9f658518bc82c36e551475c8a94e1780e46190e57c1a314534a3775 SHA512 836ae326ee6dc75de4cb83a3fd1cd54048e7e5d3df58a88e7bcb76674dba27c95c7c8d63f7db54729d39cacba02bbfa968bc4927cc3e75836058febd1c643252 WHIRLPOOL 9e037cb27fe985e0a070ea450dceb847906fb2bcd9f345a45611716eafdac84d3c1d658194a949b58ba53c34c1b9f0df493b47559f2b816765fd32c04e6fd01b
-EBUILD jre-1.6.0.ebuild 691 SHA256 1b5f62252eedbe5236c61f08805306febbfcf26ad305ae8691fe8ab335ecac79 SHA512 18f82ce45796499295ae1fa2b1ed9880382f13461ed1f011f2e3ed63198efdbba54f4cddb7463f5ed04ad9565032cc17edc594233cb48748aa83276fc779f255 WHIRLPOOL d158b5b5ed29547e1585a364c2f198e0f51eb260e95c6b6a60d2f9f2a401a19e1d52e03959c69485c0ae876b1ba955b33235176142e6c6311189a400702e66d8
+EBUILD jre-1.5.0-r2.ebuild 536 SHA256 32e3ce8fa124d439bd5a12d6f4aec1c24536df6de9944193c1e272674c9381e3 SHA512 9a1d500f0cfcc0c6cb334654d7b0266975345c1bd43b807b97e08b3e5fc2ef8adf8409099786f9061daa2a994f7b854cd01e7092fa0b8f04181a70424d794b36 WHIRLPOOL b2827a5d4b7929eba2069ab63e66427e0980e17365a9ad5ba1bb119268fc5bbbf3b43534e5679a29ff16676bc66034e718bba191201fb64ba690f0c363013e4a
+EBUILD jre-1.6.0-r1.ebuild 664 SHA256 31674d42df0b0e40da4695373345bdd2b8745782faea2623082654b784873b90 SHA512 8276979129a8ba4683c6c77adea606bdaa4223d2d1c5693bb41378d1ff080e2d2810ad902f2feb7d5a014d093d5bad965ac0e6493384531f87b7fac942ad41ba WHIRLPOOL 8263129175bea3ee5162ab9ecb2b84cf1f2ca7470db690df8f44e2adc0518323874c76a946a455d8cb642bbf774befaabfe488aa3482225d951e2d012afca440
 EBUILD jre-1.7.0.ebuild 527 SHA256 a084eefbf2673d6e7db24325ee00c0b2edb24834309c6b5ef100732549567d5d SHA512 3b9de637d996e93970148860d3580977455e45a96cd09c059cd8f8173149eeefc977a34e33eadee1f2bcc70bc33a27d7588cb90e94eaf41369db4aa91cfb01a3 WHIRLPOOL 345770cbea733a1c23f8fc267521aef2cce842d510d3c62056fb3406f3b7c92eb2d6011bcdb6f58d6c736edd2f45eff6e7f13d8173f23e4f43acba4ed8a9be45
-MISC ChangeLog 5703 SHA256 b42fa31bca5283599ffbf78acb0a8cca800be564a91124a63d277ce10100dbd3 SHA512 5bf415de9e4c6da14f3bfd95ba159a90eae749f969ccd4b4ece802fdc7a68bb5e97f35d9a9f18c6412ce154b586d26809dcc6adf09505f6fee795de5b810f2c4 WHIRLPOOL b896fae8fcb9b7c22a01ac9727c17c57409bd5f8e2c879201d16cc5cd3e4f9321f6b78fcb9d5d1b4dbf7002b02457c0849e507b27ac29c718557611c4f915f7b
+MISC ChangeLog 6044 SHA256 f9ecf7baf0ffbf40eba2e895023ea64f80e0b9faee811b38e0e9f8c4493cf3c0 SHA512 1cec0dbf336917c08130474934c713e6abbd7726fe195f9501d5e01bbfcc765e8b9167a2432f15b595c8fc2df40fa58c426545b5d6ec84fb01a34795d9b4d454 WHIRLPOOL b1cbae899c86eb633b796568278b3878fa9dd94910ecf4030998e32be9ad6814488c874c5afcdd458e12ee802756ea745702a0fe93edb1ac9057a05ee3d80ac4
 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)
 
-iQEcBAEBCAAGBQJRPGbTAAoJELjwI6Q8XPda+QoH/00y/hxhgy4CWVITNSJc+LvK
-uOxDDTAutAq2zaWtp7cWOEQJyLoV4XbouwPw0UvwZWkPtGAAzoSoYevFilDkzrLp
-LL7l9k0WcmwQ0K4WbUTidDTAzZ3pL0+bDGNUyLfOkzoKIFOmu1KunOq0Krp76f9U
-KfdkoeOfueDnQbO33vWWX9DaqYKLWVjp1F+Bx1mvRrkU2mQtY1ZAwE6TYtPWpFyE
-fQ//wF7Bb4fm0Fmqu9hX8IjXPVV9s4aWEIXtj9nz5Bd6FJBnNiUOpNAevDyIB/EQ
-0QANA91is5d90W1E828tvs7d26sdauxzNaPFIr4tMy69Iwk7krsrNi1C7Mge5j0=
-=2rMa
+iQEcBAEBCAAGBQJRzr1HAAoJEJWyH81tNOV9RY8H/1slYsTnZrryMjPoqUeLQKYj
+5B2OhesQ2BVz3n0ENsw/y32WV1id8KjAnwzx1Bro2haSOQXzKR/K+kGg4KwWteXA
+yNQQygKYVGVrY+QmIKtHnrTOuXoCh5+CKSnxTiOBZQYMKvBu4e6KSrNjxxyDSEgC
+ZS5fEc7hacHKSDMfP+6/lGeZl4S2iQMaWIb0GoSLwAB5Mh5teNBBvABfWM6HzDeZ
+IAlZwCO6V7OzUYMsI1LPmYgipnI+Tf7ZVY+KjqDAKD95HM8KVx6fs8SbnX8w1HmW
+Hl5WdbRfimhFpUtlEm8dRQH/CGLTukuLxw9Hvvr6jnJUlskceuAIEcvbK2N/EYg=
+=LlEN
 -----END PGP SIGNATURE-----
diff --git a/virtual/jre/jre-1.5.0-r1.ebuild b/virtual/jre/jre-1.5.0-r2.ebuild
index 6814d087ee67..612b61fd6aad 100644
--- a/virtual/jre/jre-1.5.0-r1.ebuild
+++ b/virtual/jre/jre-1.5.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/jre/jre-1.5.0-r1.ebuild,v 1.7 2013/03/10 10:56:07 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.5.0-r2.ebuild,v 1.1 2013/06/29 10:58:57 tomwij Exp $
 
 EAPI=4
 
@@ -15,6 +15,5 @@ IUSE=""
 
 RDEPEND="|| (
 		virtual/jdk:1.5
-		dev-java/sun-jre-bin:1.5
 		dev-java/jamvm:0
 	)"
diff --git a/virtual/jre/jre-1.5.0.ebuild b/virtual/jre/jre-1.5.0.ebuild
deleted file mode 100644
index 5834846175ac..000000000000
--- a/virtual/jre/jre-1.5.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.5.0.ebuild,v 1.15 2013/03/10 10:56:07 sera Exp $
-
-DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="1.5"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="|| (
-		=virtual/jdk-1.5.0*
-		=dev-java/sun-jre-bin-1.5.0*
-	)"
-DEPEND=""
diff --git a/virtual/jre/jre-1.6.0.ebuild b/virtual/jre/jre-1.6.0-r1.ebuild
index 21a1ed1d1260..2c2fb63ef2ed 100644
--- a/virtual/jre/jre-1.6.0.ebuild
+++ b/virtual/jre/jre-1.6.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/jre/jre-1.6.0.ebuild,v 1.17 2013/03/10 10:56:07 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.6.0-r1.ebuild,v 1.1 2013/06/29 10:58:57 tomwij Exp $
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 HOMEPAGE=""
@@ -13,7 +13,6 @@ IUSE=""
 
 RDEPEND="|| (
 		=virtual/jdk-1.6.0*
-		=dev-java/sun-jre-bin-1.6.0*
 		=dev-java/ibm-jre-bin-1.6.0*
 		=dev-java/diablo-jre-bin-1.6.0*
 	)"