Drop 1.6 on arm as newer versions with HotSpot are preferable.

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

6 files changed, 44 insertions, 38 deletions

diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 0fdea9133d97..b511f750d390 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/jdk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.67 2015/07/11 09:24:18 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.68 2015/07/21 22:02:36 chewi Exp $
+
+  21 Jul 2015; James Le Cuirot <chewi@gentoo.org> jdk-1.6.0-r2.ebuild:
+  Drop 1.6 on arm as newer versions with HotSpot are preferable.
 
   11 Jul 2015; James Le Cuirot <chewi@gentoo.org> jdk-1.6.0-r2.ebuild,
   jdk-1.7.0.ebuild, jdk-1.8.0.ebuild:
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 1e0b55674aaf..22ad6b9e004d 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD jdk-1.6.0-r2.ebuild 1195 SHA256 5df86dcc048d8bc9505d8458048fe11624be3e2b0c80be9b74d9e93a2da82428 SHA512 fa41555e37163966d1c5d7333061fd87f15a71a6b69be5b7cf4d58c2e59bd28d285035de765598135e3b8047c91c7ca2bc73568eb001b79968425bb14e738753 WHIRLPOOL 75c7c6baaeb02a7b40424575ff4069cc5a7f791f6eb21d1843f9418d3dbb34ade879121edffa868f251ae99726b295ef288e84e9729c9121307729c76fdf0b33
+EBUILD jdk-1.6.0-r2.ebuild 1190 SHA256 85db10e054f9bc333d0ec0710df5f3b98243c57f9beab25062d1f375bcb47a37 SHA512 3ae15b77ec908c09f3cc4c7c0d5ab3fca109bd9ddd1de2a9bbdf4d71659859187c4e3481fc4915ffdeed6d48969eab8b64d6ddfdcfdcc1ed72c1ebd1641ce371 WHIRLPOOL 51bcc0b8daeabb9fb73f18190c06e256405515f22a8ef06750d16e7ffdc0dab8fa8e4288d899a633dd69d70634482703b30212461d489fda1364475183ac3f97
 EBUILD jdk-1.7.0.ebuild 561 SHA256 724a3f6258096a01c94295cb70d6ce1fd201241329e488a63f50f6aea3c21672 SHA512 f1e1070a6031b85ba8f08542dd178a6273dabf90d1778362bc5c246b8417fa7bf46e68f46e090758607ec4e9a019848f857880dfd05791d327d19456bdd0c9b8 WHIRLPOOL 3f6f904873bc0bab16356c857d962d48f3d20c4d33c69c38f3e64cf974c531212ac6921ca004a3c5d9bb9e894235d561208c58eb24ab37b87d9e0cc2978a5539
 EBUILD jdk-1.8.0.ebuild 580 SHA256 05ef73d59644d74444b15f3b53e2b7619d7642e78674719cdd7f338a0daf6b7b SHA512 ea990586e70b4d20114ffac7cb898ded4cd50e78b7829aa92a857b87e1da7b9e66a48f5a8c3b7e1802a0025580d0847cd06fdabdd12d46197b7f124dccf15d83 WHIRLPOOL e3d9f080c935ad66ec849865201b897d02a7268a5806f0072c715532dc804f8d165359eac8578a6e7e67e6c95b04d130a16eeba12f2999b8dfed08c9fbfb1910
-MISC ChangeLog 9363 SHA256 2188f6f8558809201a9b8983960fce66503964dbdf587286cfde8faa46c9229e SHA512 d3c7dbe54e249c15157ad7c74583ec0f182ec6ce9b34b4e8d544fce1a23a85645e474fa079d1bc989dd174b10ecfbb8d44d0d89a99877e15aa31e54968d193b9 WHIRLPOOL 9954709a281a907e63bb2d9406a122dc05120ac03f941b3816932ce164e9d4446854343b0aeb62a4ff1016b4e0d788d52524e509a51bb4b768f85d3451227589
+MISC ChangeLog 9500 SHA256 a30c2975c8ccaf0da34fe7d084eb3cb34ec83adb11415057c8ff7b5ac131fa26 SHA512 b8cfe9d0136ca0a5684573d9c1988aa7c3938b3403777b590d0098f3a7af6b80c6c21d565bc39a861fde3c400571775720a0cd512bd4bdd15b5b8b98c6e22c02 WHIRLPOOL 896f46f49d404dd1d8268061843ce57fad8d37b6345d6d4f31d364828aa31831ff33c196ff19b3d683d38464802c3cc572fa5552c151c1d56a4578c05928d5eb
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVoODDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVrsF9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kfvkP/3re97okRLyaPTdkv73AIPRK
-3r/qGzzXiEalykb0FYZuVKd3uIDFKrSe7TGhm9B6oqh/BCbvFWduNl2CWAESJxc8
-pjrky6E4E2EdISyNndxsPjm8AkllQfufis8haCyqZccG/HcSrr0Iuym++kiW8Vof
-zDcMnTeUfVp5Si9QSDF3RxtyJ2ej4NT9HCPFaMshY+aSWJuHlTLRI8mLUJMiwdIc
-T79p60rHQjDaLss5M/+B0iEyTUnUFooIoddvfFO+sBD5jGpGeWI3r2ezczfquDkB
-z7QmOM+0HB2NqAh+Twb2xoGlyeR6/Tt6gLncXZLupKb2rvFTtlVMIfd8Lg9PU56C
-lG8sbMjAZtMhOf+pbmsOMd600Aa3TDzxdBjMTorUKaTY9U1ubcKVY3KYvjs4ucpc
-46GKP4Nhkg+X/+wAc8ajO5BSwRfYyd0E+9Mk25laPCgOdbXwmJYafwIWQZ3T3eJf
-/c8y0H/taiqvVTTC3XS7yDu8pp6r3OyEnHScKJzTTed8ay/AHZXi2rFXkH3DzuoB
-zDjckV92/ijzy4sTqyO1B/e366SNUCWAGcLJBdOD9y5dyWbx/LsjCzNGA+AI5/gq
-o2OFmHrphponPKTBs9KqVYIPgKfmBA8V3ReHEppLnj+GuQhIOVh92pni5zNfv547
-tt0cqM5npbmrKRa3B8/m
-=moah
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kiPkP/1cBcvo9ae0x3IXvW42RP/Y5
+Jp3L7YggBTzPxqvRVRR24z/GxqP9idaIJF6+JHd0MbIkFlgvrNZHi6ZO57h0vjgx
+MHSPVqBrxN2ym0QhusTOnVmfZDnZSUo8U4mECqsLmE3/X8tUOl1TqJW/WH8h1TB8
+M+deH5PCF7BXOOARlyWimMH7njTXbeJz0COk6YaHp9NIPqk8TM9HsE9EYwJ1Ja6v
+JuepZXHCaJX37z2rY5Hw68XsDLSMW85o9WY/zEq83cGMYvIUQFKgqBmNsssbhoQ2
+c1x57NEECglswz3AAzun8lZgsTNMi1a5SLAdVNkCqk+Hdwn06A8k6771Ex1FpS7g
+MmLwX4RzqrJ1FfYNbL6WGwuvGw3lQJL0DC4toMb6TQSiLZGR/chYMvNMfQXB0heg
+XXuT+aN/KJqhPyyuez+jmoQKlqgUaYfaTRvqq3foaNNmXJ9lRrCWnUZPVvyJZmSJ
+Gc/nQ+hMJq19HMr7wa7JgUBEZCLAWwVsDbx9rQ8MngmxsUYHODdCXO3ZXb1chsfh
+1IBvsCJ+XnLh0BgAWUFTvTIfuOJOaGBM5mHYOPM1XYZ2es3nkPrFot/anCkyHnH1
+5SPq48BNWXqpA9rQ188cT7f2taJIpTEc06THIbWVTpRqBF/VyJUIRAjgAYBnwvIO
+J98ZI+012sury2tSid0n
+=tRvV
 -----END PGP SIGNATURE-----
diff --git a/virtual/jdk/jdk-1.6.0-r2.ebuild b/virtual/jdk/jdk-1.6.0-r2.ebuild
index 05322fac22d2..e466d657bb36 100644
--- a/virtual/jdk/jdk-1.6.0-r2.ebuild
+++ b/virtual/jdk/jdk-1.6.0-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 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.4 2015/07/11 09:24:18 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.5 2015/07/21 22:02:36 chewi Exp $
 
 EAPI="4"
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.6"
-KEYWORDS="amd64 ~arm 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"
+KEYWORDS="amd64 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"
 
 # The keyword voodoo below is needed to work around confilcting masking types
 # and for having arch specific preferences.
diff --git a/virtual/jre/ChangeLog b/virtual/jre/ChangeLog
index 399b0fb63c53..1fa77feaeae3 100644
--- a/virtual/jre/ChangeLog
+++ b/virtual/jre/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/jre
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/ChangeLog,v 1.54 2015/07/11 09:24:33 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/ChangeLog,v 1.55 2015/07/21 22:01:28 chewi Exp $
+
+  21 Jul 2015; James Le Cuirot <chewi@gentoo.org> jre-1.6.0-r1.ebuild:
+  Drop 1.6 on arm as newer versions with HotSpot are preferable.
 
   11 Jul 2015; James Le Cuirot <chewi@gentoo.org> jre-1.6.0-r1.ebuild,
   jre-1.7.0.ebuild, jre-1.8.0.ebuild:
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index 286c58dd07f5..d56ce19700f0 100644
--- a/virtual/jre/Manifest
+++ b/virtual/jre/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD jre-1.6.0-r1.ebuild 590 SHA256 70ce421e9b171e07fc8297d9dab40c368e1a79d013b9929f88a0668e20168d51 SHA512 76c0687bee8735896c6e761b765718c1beed274f89d0fb5b8256b1f352e24a310f41bfabd37ea7809d0224b582674acc5aba9b335611c57f03c434cd4f447667 WHIRLPOOL bfadc41d0cdefed0521272f9a057187e681bf997edd6c8f97230b66cf8f67b4b5a17013cf0307e8e361aa8e47f4c88427cabc017789c0b6d545ad816d034046a
+EBUILD jre-1.6.0-r1.ebuild 585 SHA256 ff43d2b0102c3bc427a7a7ba825108c5ad9590996da5d9dd2ba8a447d14d6b1e SHA512 2e8cfa81d9f1f57439628ff999157850bda92af64294aa01770dab42db90feee9e8099b34b090cedcec784f718bb1391d0a7b87831a36adacc854b7cf06ffd39 WHIRLPOOL b8634c802ab2e0e6ebcbf4565d41739b0191ce291a24c4ddc017de65678faf85efb3f8ecc9428a0b1ba61d737bd8d12f10088f375141f74992e03e0b603744ee
 EBUILD jre-1.7.0.ebuild 515 SHA256 b7d792af903742b929b2321d5e655e0b547f89b6b59029b64667c2958c2deae3 SHA512 205e3f9d36368f2a90a8a257f8ebb94eac3d09d2b3f5cce4337130838cee0a8c698363c2420a08903eb8935c9e33f50e41b04e5e719d619090f99694daefa92e WHIRLPOOL f8934ea7d99fd39eb6ce7e08089dea511c3369056ea6356e68f95cea7d6d956eb822116b784d1e3ceef5565fbf336d82e5c8e2ffbef8277e52b8ca0a665ac813
 EBUILD jre-1.8.0.ebuild 626 SHA256 e4ae26147b0aec85c57bce2b7217d1e2309b8b54306ed286a1169aad4dd3b2dd SHA512 0b27317c4e3900d18a1d286cb32026d912b06bc5df8fe944bc5842e9cd0041c13c47f52efc231c47479dbec560adc0eefae7c2b2a847be2326b1d38c701fd040 WHIRLPOOL 667bf812654d9df073eada2878b0aa68efc04aec0ad53fd4fcfadfc3dd88957aac9378cc9a46e269e71cb78628bf51deccc470210a3d5a0de07dfa13bdfb7f06
-MISC ChangeLog 7213 SHA256 a478602c9e741981003059d06f3ae90a404ff226780788f92a2f0093ed451b9d SHA512 cc6e4aed50f21b58e13368df657014c4043e5da7c01e1da841adfa959691acc575b143d2fc5af60857c037d3c556d8e430dc8d77bbe6c2346385276d46fe7359 WHIRLPOOL bb03304fbc08e284a032ce32f4ecb01359952bb7a69d2404674274bd03944d41e78996e8ab8e6c81eb4598ddf914ec3ab270206a4902d6056573ae70a85d102f
+MISC ChangeLog 7350 SHA256 cba236d4daab138d567933fa83e84e70457c04f1d40fa1011cdc4d8ad477c845 SHA512 2d96918ab295f2c2a6d4f493f6622acbee6599234f96893913eeea2175f753256e22a94efffde6d49ed69fc0ed84b1a025a38e94605601a69ad34a763eb22d7d WHIRLPOOL 6e96b71fd3545e5fce12d604c906a194ddf4533efa93cc93bc4528df5de1452dfe8cefeb47cd21a2181947b74f91bec354e725a40e7bc0da9cd33f5b1bd32bd0
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVoODSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVrsE5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kKKAQAIak/NMGcAQxH6jd5PabblJb
-SUxCl6MG+HRpwPcXERU7V6z+Yl6I8TGKarHgqiSJJmC10Cl/ynijBNXvsWnQGjQW
-45IP+kUiTsU27bH17LM9bYicPXByCOxrzoLovzfxiw3yuGDl4gyb1brmsDWHiRTn
-rQ35RcMRiG0JUE+QDqcjoDmp3IKAoALPHgAOK5LFPUV4876GUq2pAyTUZQQ7ZFFS
-WGtrdXgu5Ici9RDnyxaJNV/D0VzXreI0mcNm1IkLDmuYZrsgcfHGZXgE7W9oRCko
-SIQ9+kgnZXcodIbK0zcrnPtw/oDKaxF900AILjVWVDDlyee2oEar4zO9OWHT28Tz
-nkClt6dEY32qChTiwzRZT66/lSt76JBlOOZIchQXUAhcNH+gRDwkovecLoWLT94H
-Xlzy8gPcpOwTClx7ds/V2WaFr+nFKWyDW2+XrMnsvlE97VHOLS3a15pX3hUhKg2A
-Dcn4a0azyrRDOXYh4MZEe++GPUGtu22caCIDDLmsusmPUb7q/slAlFGESW36DJJL
-5uOT5TTHI5p1nP7QIuVpEbZsDRDTSNQvt5FWf8TsamZj57HNZsCt9PWCLo6x7vRs
-n7Ic2niMvrG7HuVbB3I06DddA6mSqHiCroyS5KNauLKCP6YNntsBz37GD+OevDVW
-wnkEoaK6xNUcGTK+FA6u
-=Clnx
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kZJ4P/31A0u1x6DAmydQRaX2oStZe
+iD9yOhhzxjhtHIo5D4ZFKuZFyP9aVZZ4BJ/eEGut+HzPRpQ+xGAqVARjSdjMpk8Z
+lAc0QB+aixr+h5xyIYF2AA4dcjpNpSA7Sq/dAlO64LjHGhGzWBHC9JmQfqPxRue0
+uysUEtauoeaWSpmFYBYtpprCpS2yAlJKRwnHkAaBuzk6RzayDiomSIZo1MwYyTDr
+Qy76Dkr5n2AV3+I/Kl7/tE3/JfvLh1jKiRUv5UIH3ypZFvhgZ/zofh3Ch7R+dRNf
+cSD7qEBbz/S81HQT5KUnP1OSGiD81NL7klC3alJBc5sHMM+Rf9hz/kRAbUf/5rns
+VCtTz0IUZngSQjxwAMIwoi2RUf3sFkcyPISsHUGGa10MfTQLCMAq2rPLfLvqDnxI
++lzrpYq+5UHKY7cUebljTT0w4Gt2W0jomlOD4msRK+wcDrADt6s2iHbFERxMzJja
+eQkFBePcuqq9Iguvkua39wHoauqCoqT1E0AQ0b8pfURN53CPElG7Zi6uX2a6lQEd
+dya+7qbyWfPdL5dJCqjvChynBDbgrTbQfTU9dR0brOZ0x3ahHkb5eRWcP16Eb/iA
+d16syxx79uLOExXXgXKRLhsJ6+Yoy8+mpzVgTztG3y09bGB9yg3ZjC2eK3ZvcW7I
+BX5dWucHNwo6AWGIrGUb
+=sObO
 -----END PGP SIGNATURE-----
diff --git a/virtual/jre/jre-1.6.0-r1.ebuild b/virtual/jre/jre-1.6.0-r1.ebuild
index 1aad5c282985..d8dae001820a 100644
--- a/virtual/jre/jre-1.6.0-r1.ebuild
+++ b/virtual/jre/jre-1.6.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.6.0-r1.ebuild,v 1.4 2015/07/11 09:24:33 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.6.0-r1.ebuild,v 1.5 2015/07/21 22:01:28 chewi Exp $
 
 EAPI="5"
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="1.6"
-KEYWORDS="amd64 ~arm 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"
+KEYWORDS="amd64 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"
 
 RDEPEND="|| (
 		=virtual/jdk-1.6.0*