Remove CVE-2012-1721 vulnerable IBM JDK binaries dependency, as well as lastrited jrockit JDK binaries dependency; dropped KEYWORDS; EAPI 5; removed empty variables.

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

6 files changed, 37 insertions, 45 deletions

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 212afc64a2c9..92986e3caf9e 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for virtual/jdk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.61 2014/05/23 23:49:25 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.62 2014/05/30 11:20:17 tomwij Exp $
+
+  30 May 2014; Tom Wijsman <TomWij@gentoo.org> jdk-1.5.0-r1.ebuild,
+  jdk-1.6.0-r2.ebuild, jdk-1.7.0.ebuild, jdk-1.8.0.ebuild:
+  Remove CVE-2012-1721 vulnerable IBM JDK binaries dependency, as well as
+  lastrited jrockit JDK binaries dependency; dropped KEYWORDS; EAPI 5; removed
+  empty variables.
 
   23 May 2014; Manuel Rüger <mrueg@gentoo.org> jdk-1.7.0.ebuild:
   Add ~arm keyword.
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 5c6bc81eaa45..9a161fc95d68 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,6 +1,20 @@
-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 612 SHA256 8126bab6cedaaa00065f5a891634cb5c8af7b075dc9bf62e3d844d808e50bbbc SHA512 36fca7e89bc5935964b9d85f2d38045f5e6154c65500744f8a687bc5bc7cf2241a17f093e839c2fe8d9b8eec93ae1fed94ccd27369f625203f1e59dc0d0ae168 WHIRLPOOL f9b53ed56c32c207a2ac4be87c5917e89ae8f70da6bb4625eca8303ab5598a4498c75bb6ac119d76228bdf05dfb881ea9ca040a699251aa0a40d0ff7d470ccaf
-EBUILD jdk-1.8.0.ebuild 636 SHA256 bc0ed45d84b0cb84ad6aabf04a499c3c38f69f7b6df49b8698d5f311cd9f2db8 SHA512 2cbea37f09cfb9f988f5300bcef8d94202c78e312bc16f513fe22947be20f713531243740e7e3f2531bea8cacc0da19db72f2cb7991edaf26dd02da05db8b4a4 WHIRLPOOL 77f12590212cdd927f3147fe1e6eb50e639846cccfab03a086fa4e4da354ba577195356f739ccf5fe9bfe074c3bcdef2af2cd8dffea4bd3ff18e6cb482fbebf9
-MISC ChangeLog 8374 SHA256 ecc252f7f40a30d445dbc8fdf9b021f7f28422488ba7f6b218a12c0ddbb5b273 SHA512 9aa2191b1d8284f9c7febef0a461354d19b1029a4be995b8f7594d76c2c5415cf6ad9945b7182820f3327c6872d85edc2e0d8daa4b62972d0eed041951b6e44f WHIRLPOOL eacf89ddd7df90bb773c8ab591ebc09710eaec75caa8f56d1c7f1b9e6b64f1ac8d93f4064f57b07bc170879ebb3de6e03d75157981f0e1e49558ad7863a64836
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD jdk-1.5.0-r1.ebuild 449 SHA256 512f394030f89f4619bdfcf593243dd8691d862fd8f8629b08ce7abf76015045 SHA512 0b3478a731bae60c7bf75f2b108c43e8a300c5b0ab3dba8c8a2715c870da5778bf8626db95d32273a820006db492074884629493914026125b3011abf68db37f WHIRLPOOL b74115af59f8eae7c9f0f15ee7958d8099c86454f2bfbdf333212f22f920d052970ef12de54dc21cad9831395eb9f08b0ee3c2f72a9e431bef7054c9f4ef108a
+EBUILD jdk-1.6.0-r2.ebuild 1496 SHA256 616fa14207e32875d08e0e911d02cec465519a1aafd6313c483f6dad93122ea4 SHA512 22c49cb2b7b17a9055931ad64b0a9f7ff77dbdff32459ca57d4f03cb969d6c04fc858e443480f19a536910489634b7627aff9e4c10ae875eb1807e3bd9d58850 WHIRLPOOL f63e48ee31e2f09eabca7832787d83069be8040b5ce1a38674d66147ac7680eb90fb5f661c8df347b808f3fb55570cc49489dcacf4c8563dd8bcecc97c6a0929
+EBUILD jdk-1.7.0.ebuild 570 SHA256 e6916abd40962591719a7243c24e9f3da2d79d98b0ad31c0d343fcbd8f85ede8 SHA512 4ec2120b0e1adb58d6d3d64a937faf91ebcc7bc9d626ba37d8773cee4f427059965ef394ea44701dec3b1d6bb83fa4a4386e0aa709d244205ea80b161351cf8a WHIRLPOOL b308585ea0a70d3dc9f6ae891d8c9abdfa46b93c6e8fd675adb136ae8fe8a7565753561ba71bae4b5ff54c3d6e675077433b45a74da5ae8c5a3744c0912200f6
+EBUILD jdk-1.8.0.ebuild 582 SHA256 c7af7afecc013c667c55af59bf63ec14908c797a5da56b03dfc7bbb5e35eb7d9 SHA512 d95cb421c96eee85973707adf51b64beca0d8e71b3a3a624def7acc1b3f75bfab915ebb4ddaed72e8373b78fe6c69e6575c1d3d9e56154078e83175765759294 WHIRLPOOL 0302e856a0d2d04e297eac1012248a25e727bcea54a0504187d35d2721626e595415af43eab56e28e71b1ab2bb19f5b0d31211e0b84c32d64441fbb2729332b8
+MISC ChangeLog 8675 SHA256 f65e60c90a53ebb96712c4fc4e7d99717c29ff5922a908474602e11a74ac587a SHA512 5187fc1a1857ec3e9b61bff2f289598dec93f70953aad258f9f4680410a674e20833c6c56780fe2589aef75f8c51450998baaa3c34ec20ecef0ca138da38e33b WHIRLPOOL 4895ead408bba415756b3a878eeac0483d0cbb58471ba9f3bdc17938f39c33052f327ee3d6fd43e23d5a1da84bf878a81f43da45f9ba3f139850e0d70a825a04
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTiGlLAAoJEJWyH81tNOV9E48IALAllKwN2LkrFWwrCDhVqfRw
+kYWJWHaCd0OBX1YWt1OPq3x21P3ugdTtLfTwIVdCz3u/rMQf+0GGjrM6eRngF0Ul
+CjQlfJ7KAB3C4Ih5dS+01h9suOcF9JgNFvbibuTE/kfCSA9aKD21uUHbEq8NsWa3
+rf/dBWM579+IZk7CJa/QP9KH24Npo1qgps32zN46Amrlh9rCu37EIaiNJKvhTVfz
+VB7gxNjtHih91Iwp/JDVs/7Ti66Px1zbEcktEj2n1iPM3IyJwKmGYV12YZdstZHC
+9N5+nx972vnneF0CLs97l48w3YymYP05Eze6uxuNWie1w4gn4XIrad6N8pB+tlU=
+=I9R2
+-----END PGP SIGNATURE-----
diff --git a/virtual/jdk/jdk-1.5.0-r1.ebuild b/virtual/jdk/jdk-1.5.0-r1.ebuild
index fc732426b917..727d0789fcc9 100644
--- a/virtual/jdk/jdk-1.5.0-r1.ebuild
+++ b/virtual/jdk/jdk-1.5.0-r1.ebuild
@@ -1,26 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild,v 1.1 2013/06/29 10:58:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0-r1.ebuild,v 1.2 2014/05/30 11:20:17 tomwij Exp $
 
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-HOMEPAGE=""
-SRC_URI=""
+EAPI="5"
 
-LICENSE=""
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.5"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
-# 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!
 RDEPEND="|| (
-		=dev-java/ibm-jdk-bin-1.5.0*
-		=dev-java/jrockit-jdk-bin-1.5.0*
 		=dev-java/apple-jdk-bin-1.5.0*
 		dev-java/gcj-jdk
 	)"
-DEPEND=""
diff --git a/virtual/jdk/jdk-1.6.0-r2.ebuild b/virtual/jdk/jdk-1.6.0-r2.ebuild
index 79a88a298fc8..62fb01511b6d 100644
--- a/virtual/jdk/jdk-1.6.0-r2.ebuild
+++ b/virtual/jdk/jdk-1.6.0-r2.ebuild
@@ -1,17 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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 $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.2 2014/05/30 11:20:17 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.
diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild
index 716a503b04b3..a87d2c30715e 100644
--- a/virtual/jdk/jdk-1.7.0.ebuild
+++ b/virtual/jdk/jdk-1.7.0.ebuild
@@ -1,15 +1,12 @@
 # Copyright 1999-2014 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.12 2014/05/23 23:49:25 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.13 2014/05/30 11:20:17 tomwij Exp $
 
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-HOMEPAGE=""
-SRC_URI=""
+EAPI="5"
 
-LICENSE=""
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.7"
 KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
 RDEPEND="|| (
 		=dev-java/icedtea-bin-7*
@@ -17,4 +14,3 @@ RDEPEND="|| (
 		=dev-java/oracle-jdk-bin-1.7.0*
 		=dev-java/soylatte-jdk-bin-7*
 	)"
-DEPEND=""
diff --git a/virtual/jdk/jdk-1.8.0.ebuild b/virtual/jdk/jdk-1.8.0.ebuild
index 9878d5efd09f..492d36747bb6 100644
--- a/virtual/jdk/jdk-1.8.0.ebuild
+++ b/virtual/jdk/jdk-1.8.0.ebuild
@@ -1,20 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild,v 1.1 2014/03/28 15:11:23 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild,v 1.2 2014/05/30 11:20:17 tomwij Exp $
 
 EAPI="5"
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
 SLOT="1.8"
-
 # TODO: Temporarily dropped ~sparc-solaris and ~x86-solaris as oracle-jdk-bin
 #       no longer provides them. Also temporarily dropped ~ia64.
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris "
-IUSE=""
 
 RDEPEND="=dev-java/oracle-jdk-bin-1.8.0*"
-DEPEND=""