diablo-jdk is about to be last-rited. Also remove ye olde

apple-jdk-bin versions.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

3 files changed, 28 insertions, 18 deletions

diff --git a/java-virtuals/jdk-with-com-sun/ChangeLog b/java-virtuals/jdk-with-com-sun/ChangeLog
index 1b64958ba455..c0a351070657 100644
--- a/java-virtuals/jdk-with-com-sun/ChangeLog
+++ b/java-virtuals/jdk-with-com-sun/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for java-virtuals/jdk-with-com-sun
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.22 2014/08/02 18:49:02 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/ChangeLog,v 1.23 2015/04/14 21:40:53 chewi Exp $
+
+  14 Apr 2015; James Le Cuirot <chewi@gentoo.org>
+  jdk-with-com-sun-20111111-r2.ebuild:
+  diablo-jdk is about to be last-rited. Also remove ye olde apple-jdk-bin
+  versions.
 
   02 Aug 2014; Ralph Sennhauser <sera@gentoo.org>
   -jdk-with-com-sun-20111111-r1.ebuild:
diff --git a/java-virtuals/jdk-with-com-sun/Manifest b/java-virtuals/jdk-with-com-sun/Manifest
index e521d399e4f6..003a766fd61b 100644
--- a/java-virtuals/jdk-with-com-sun/Manifest
+++ b/java-virtuals/jdk-with-com-sun/Manifest
@@ -1,17 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD jdk-with-com-sun-20111111-r2.ebuild 1028 SHA256 7572c4fe46be2dc872ec72154e2a4f77c60d034088fe0e7a11439ed697bbf831 SHA512 8843df683b4fc9f6d0359e086f25ee307ce262e179e0644494a0a5810c1cb3d08f4fc4dd879d0934ce54b06ae238ff71d4a8b158e5b825c87ac8b7e139862780 WHIRLPOOL 4cbe8e9527b8eee4ea84ba4f6cf019ebdc79bc132b27222ba27b92b6f32bed6f0fd5afcbc74bcfe9751e08a7c42333b8cf8c15f4a7242482dee8568a1a460170
-MISC ChangeLog 3940 SHA256 e9ffbf2ff506af3ab7e069377821c652548527fbe1a0153a11b5fa920358913a SHA512 3966481061b909de9b0af4dabba4f2f4fdde6aa4196fe079763b84a85c29b330b8d8209dc98a8a3f18d30823cd0ed59a03d44fbaaa11c9087e94ea549f820b92 WHIRLPOOL 1ac9b37fc1576bfbddfe4efbd1a134ca07765f54067873bdec2944b27cbb189db0dd465c7d2edebcd5fff17eb2a90a84546bdec73096c8a349918f6cfe3629a2
+EBUILD jdk-with-com-sun-20111111-r2.ebuild 889 SHA256 cd9bd048a7f588646d7406fb114f240fab3509af80d084aa02e2bcab8268e365 SHA512 6445c6f134ab514bd5bf35a6cf405f67f18645f5e69e9540e80355e633c086f4f6fcf60a0a28cdaac423c08fda8bb344da53682e215ea9cbeacf5c58f2b3a907 WHIRLPOOL 25926be9211708371a1c343c59d59b0fb32a8db443449e802c799838b75327aadb5d284798586adb33b6df85227142776ae4d5debe409b53d2e7d01c226e9ae9
+MISC ChangeLog 4117 SHA256 6dcdc9f93d3b927d2c0fc87c207efc503dd4021eeb8fa487645da8da612f46c3 SHA512 ecfec4df61cc447dbbc8c456769b1147d0a80c690129fd306edcf7e351da4084b6f3e52fd9499b0b944dbc99e32778c5b4672ab538dada9e7c73654e3093c9fd WHIRLPOOL cbc5da1f7c3c281d850880b50efa508b7d1dc2f80956a7d316d595a3cfc2655cf1138d88e8cda52e496fe3b74b409eeb6705e255ddc8cbf9929fdc809c883865
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJT3TKqAAoJELjwI6Q8XPdalUIH/0HEpEtbJf7Goak8RXNgFIKI
-qSdNacBHEjnVikcZU8riPKP6WMzWSUpKwGGzC6iJnLlBs7i9tCtItiLMM6XMs90e
-3vkeUncaNH52+XO5aKz0Z+2wau50cr6uKX4+CZ7D01tVk7kX7y/JnWXTGaGLoo5+
-S4nqh7ByPU/SLNS1a8yM6CiJIvZ4QmOO/oRGGiHZw8zDLHnX+25H462mxhsRQj1x
-G6T1gdfsqE7HUgoML5HW7Lc4wjeTwQNTCnBD72vjd7WjfVE7k5LjBin0MVZkX8fK
-2RHrZ37uPvXMOgfiABdWHp5yxXDdk6nURBUNRxJ63eSSEiwRg7WkOLUEOAdJuiI=
-=GZXw
+iQJ8BAEBCABmBQJVLYlmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kuVIP/1bEVVUb0d1V5d+sMmUIjuML
+2r1iAZCSMru+ImLgQtwNXheiq/lXvwQg+w3VOlHWxDfFBTlP8T4Q0CU1VK+ULTfA
+chKqfnht0fmmMWB1JAZtcNj2omdl48rsTWpskAl3iA6JI8s1kdozFJUsEE0U0iig
+Uo1oDWuK/zL9TjcyjGuD5Wm69ALubJturC1dtw4BJnijVpXZ4B0xyWnTh3kNuCSt
+rYfaUhI2U7huO3FJgJquj1YZiAFjZm2Ke5IrXZ+ryo1itff844he/ahW+jbyrema
+j2v1ZnOetMLBL6Rmc2uMiXvQR4/I4LbrpXwq9CJM4T5AhfdxVA24pVru/kiqjS12
+bG0sHF4Ie0ziBd2OFGMWhUnnhLjiEvDSSbPINCs10DIuNgapB7LwTQd/iB+elG2L
+E0h9sas+AW4m/uZImY+lcOMb3WNirrmTF8SRg6P6zGOQVnE4a84I+rdp1iO+msJq
+ihrr+JeDPKjgkn6dAqwBUhl78NQy5UiE5Cj7mYsgAUuVomflV6xxChMQTFIcIhcm
+UM31hx2xl1GZxOPoylI/ng5MUR71Mw9/Yz90a2QGax48Jah6w7ITrkZB6eLD+NYF
+lYHz2XJYjU0xeVEdw/IZNFdneSJwowGMUBQQCepUibq9I5ncZ3mg/JauwC3BQ1H+
+9JUsZWRd8tTlzYRmRekV
+=80Zn
 -----END PGP SIGNATURE-----
diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild
index 2284ff5fe99d..7ff9844bd889 100644
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild
+++ b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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-r2.ebuild,v 1.1 2014/05/03 18:53:36 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r2.ebuild,v 1.2 2015/04/14 21:40:53 chewi Exp $
 
 EAPI="5"
 
@@ -23,10 +23,7 @@ RDEPEND="|| (
 			dev-java/icedtea:7
 			dev-java/oracle-jdk-bin:1.7
 			dev-java/oracle-jdk-bin:1.8
-			dev-java/diablo-jdk:1.6
 			dev-java/apple-jdk-bin:1.6
-			dev-java/apple-jdk-bin:1.5
-			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 oracle-jdk-bin-1.7 oracle-jdk-bin-1.8 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 oracle-jdk-bin-1.8 apple-jdk-bin-1.6"