Remove vulnarable, keeping 7u60 for arm #517220

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

5 files changed, 17 insertions, 662 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 3753fcf7ce95..97ad94127210 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.69 2014/07/21 12:32:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.70 2014/07/21 19:17:10 sera Exp $
+
+  21 Jul 2014; Ralph Sennhauser <sera@gentoo.org>
+  -oracle-jdk-bin-1.7.0.55.ebuild, oracle-jdk-bin-1.7.0.60.ebuild,
+  -oracle-jdk-bin-1.8.0.5.ebuild:
+  Remove vulnarable, keeping 7u60 for arm #517220
 
   21 Jul 2014; Agostino Sarubbo <ago@gentoo.org> oracle-jdk-bin-1.7.0.65.ebuild:
   Stable for x86, wrt bug #517220
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index f0d4213fe96f..9d7b7934ab55 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -5,28 +5,9 @@ AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212
 AUX oracle-jdk-bin-1.7.env 1000 SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f SHA512 3bab31d62740b959fcf028b94d5db31f682eadff2497dafbd945aed3464a6e5dd6a6ac8b5bb62cb41c901aadefc5314f9b7fb451a46449f5c2fc818d8c88fa6f WHIRLPOOL 74dccbc5c880721d4347b631b3af9368440f20112ac1e70764ff732289c1cef24e6fb4a4a7eb3ca2f5afedab83d6db4dc324c508922de47f8f435048c4884b2a
 AUX oracle-jdk-bin-1.8.env 1000 SHA256 1cc01fea09be2b333bac21b753a46458cfcaf92f08f13a685507d8331ff23027 SHA512 79ea850df8bd655b03ade0f1b068cdfa48425b58bb16f8f34013076754af19e2058a1800f17c96de51d2713b84ed326aaaacd806766d611d32edf9f7a9a9d942 WHIRLPOOL 2cdcb4c926ca342dcdcfa7765491f88f1681c0f3a4592fbe74e4c9a332faccadd20db0fbb8dcb0782bd767400515a2c5b156455358fe0c65ee58e94a9f72e3d2
 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
-DIST javafx_samples-2_2_55-linux.zip 21220786 SHA256 4e46b3c7e2cebc31fe5127f384fa2377a79db9b2a02322252bcd2a6bf9da833a SHA512 55ec3f5a86658c1e81aac29041461c053093a327599c754b95a42c64af0401370acd1d9199557eac99797852bc248b0552c8d3ceb9bb20567cefceb45d1f768d WHIRLPOOL 07e99ecf46d7145d96da5894b18855afe0566373717922b4071108df8112f8ffc70482e423eae687d8ba482f252702db9a063e137be87153245f169921c8d06e
 DIST javafx_samples-2_2_60-linux.zip 21220772 SHA256 4963394cfdc7bc47b693353a5957a1d3b86dfff800d8d2a725a596090d7c9def SHA512 8347a7b20c8260379eceb2950d384ebfdf542df595eda18ec0e57e92b35393df37815340858a8c64d9422741331c443c5bc096b03f067a4d0cb50ec0c0d70760 WHIRLPOOL 2d84ceda852567cbfbff617181603ef8e162effaa15afeafeb756d05b831a97963817a8594a2551b0c465a756fbd9234864f79371b824fc2634f1f7bf50f6ae9
 DIST javafx_samples-2_2_65-linux.zip 21218124 SHA256 d70c0f1b910f166f69f005488bef6c1c55e46c557e0f6dc9c2b1da397cf0df23 SHA512 73e7c89a14072d7385f5c77d80ae9c8fd67eee17dcd33b0b464ab30d824666bdbbcc2a228987e225f41900eaabd41faa4d813ba0d2a0659d05b6a928bc05ecb6 WHIRLPOOL 1bc5339fa1e8747617949dbb5ec9b10a232fe020361be49fc10713f5b25f4724889b33d23f09af62e8857e29d7f6e32e2410054ea8f78fb9f846de5e956544ca
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-DIST jdk-7u55-linux-arm-vfp-hflt-demos.tar.gz 10395595 SHA256 5ee84c53c926c4d689ee586ca458a56079d1a5684294ba0bef5848532faac173 SHA512 bb675f7de5b3c76918fe361eeb500bd8376da5ad2e9e0055df0a4d3ccadfc63685eaec3f43a9fd5eb63a0017c4f24a391154eb88fdd4043508e0da2e0de49fd9 WHIRLPOOL 726a11c169b5c5cbfff2433bafafb4800f1350b1f108538f55278b627148540d24c2608533a42b03173fe70e953016d2bb6f1e766482b007d438507c8f5af8db
-DIST jdk-7u55-linux-arm-vfp-hflt.tar.gz 71041220 SHA256 519c99395ba08f0e1e6085a00a46c6866493d7292f90f07a5e289b7f2d41ca7d SHA512 749c5321ef97858c61158d8d0701a476ec7833a3e0035cb285fb2eceb3835df54424b59b94caea81204ead33f27d55f6fbabcab42be3ef4fcff2fe76f32eb110 WHIRLPOOL ffe75067b6cd6fa3a9cccf703c05853fe9d1f6084f40b80a1384c9116dacc01fad1faa788d6f02c79ff9749a122fc8e11b86ad63b7cdd243f47c142d401b6a76
-DIST jdk-7u55-linux-arm-vfp-sflt-demos.tar.gz 10263405 SHA256 55ae720c62419ff1f23628c278469d53bbab5cc53f11d9ba38f698218d131069 SHA512 0fd40f63274a8c37ca4cd300f989d90c8ff054c9e84f1f328785553af207733ab29e3dc374cfb2d07bc3898509ed1e53e17fedadf7df0801e3479783299f1468 WHIRLPOOL ca5dc17022057c6aa74858356c4690b718c3ed323d8e6ed3a2b162d1a4386bde7f89a9b82e523e1e4f811c22e43e1547bed63c5448b8312339d9fb002163baf2
-DIST jdk-7u55-linux-arm-vfp-sflt.tar.gz 71030436 SHA256 686ea8851dde7d197cf083d4cfd66f8803675d701e02965d50125836a0ce3676 SHA512 cdf473b280a1ae8bd8c55b8fcd66b1aa74554e763300c4ea1760e114113dca34b3cce6da8d04a6587eda3befc9da8d68de8601183cca8e775b750cf025bdb001 WHIRLPOOL b844541a7be0b55c3a4c5879a2f1f06a1fc57aca2700faa2cc7542c103bea292c35819e2a2cbd74a6bfdd4739a279723598aa820584da906c077d577ed361a9e
-DIST jdk-7u55-linux-i586-demos.tar.gz 17377858 SHA256 b60806b64caaaab15202fbff6c038fb5a83b5123183e5bcb1bf574d3b5ff76e1 SHA512 8dd10b612b0e815ca18aae6fa21f2eaa664747f9a3faa5e406399a6e67553253ac3f489c6682dce8f878af1b940c9ebf0c626fd98289e31ea5c9b4a9bd9ba8de WHIRLPOOL 303d9de828c557c47047a6bc80af25c9f4111b7d21a25855efcc4a833104613697cd8690d779f9c3ca554d48a6557f0cad3dc80dd502c931fa606b3db04ad81a
-DIST jdk-7u55-linux-i586.tar.gz 139463702 SHA256 81792b39f19124420186c793282548bcb91c521f42f19d2509aeb6b9682c1b78 SHA512 1bf18af677c63b1476e1c937bb9c031e195d73e6a166909d36a888f218151cdf4bc878eba06b58828cc6d714d62d9d1b0efc2a6a65b8ac93bd0f271510b36125 WHIRLPOOL 1658bda79d8148ac19c696de83fd33225a71e3d9ec430f7ad2d56e38d7ae3da237c37c742f809309d2c878d887e5b801e81f35ebb257e4764e7caf5e4c256b79
-DIST jdk-7u55-linux-x64-demos.tar.gz 17449610 SHA256 f6ee03e151f41b251ff352b602bde027308bc766fd10c465fc15b11fde63b7fc SHA512 2dfe615baf4edbd55a35e7a924b3f2199cb952368b377e94f637b50b64cb398197c9eb018bf1f7c6d0babc94a47da22e7a07a707d1ee3b10e1c54463c6430732 WHIRLPOOL ab24198c41817fa2371f3ee058102f3e49b091e72ba9403a5a07d272f95a92e262028da8a97b0e139c9c7ccc674d91f935b4aac4e90b80f07a043789968c79c5
-DIST jdk-7u55-linux-x64.tar.gz 138220064 SHA256 86f8c25718801672b7289544119e7909de82bb48393b78ae89656b2561675697 SHA512 b1368d152160bf2b25284dca7cdac1c64fa6f443e7f5c3581179fe5e0349f21c47b7c5e70a147a2e9b30bd3f6d2335991088b76fa12bcc6dac30e10a82ca06d8 WHIRLPOOL 779f183c990b32f1d4f16dfcf60e70a0f247347289b7f6e84207ffc73638f1ef5c1662461ca8ea55a15da79c2ed3a470452c1bbf2dd712628007a12d3d09ec57
-DIST jdk-7u55-macosx-x64.dmg 188286095 SHA256 0ec909208a75ec8c49b5eccf4c5b6314ef68a8131653c5097aba3e4f9199e03c SHA512 5421bb33ae297c2a47e9b974162974d8466faf220d9c03e7c16f4a51fe26e0521e1c3c38944488243af6e8dbb9d0b0c1ca685f35c2c4c398b212f0d115fb29be WHIRLPOOL d0bd65e980a339088876f17017a580b824e21b3569799cbaeecc53ffd717ae86014e143034c3790add42c5e9b98347c8cd3f3abe112f6ba23fc1b817385afb8e
-DIST jdk-7u55-macosx-x86_64-demos.tar.gz 16040331 SHA256 bb4411322eda74ef42128527b7c167cece072d9917333340cde7994cce8ab4b7 SHA512 76bf1e23c6167bada0f35bfd03350fb4724b1a762955016c1fa5697c1ef4a8903154256442f4eb47607e3c1308dd98ed80185bd70c86cf47977d8869d4e50e4b WHIRLPOOL 229baf8ac92e098927453456fa2950a54d20edaf41db46d5a21e7c7c64075ee099d69e980f01ec81bdd6885946be519dcc3623ae752200de51049ba8f035f2ce
-DIST jdk-7u55-solaris-i586-demos.tar.gz 16764236 SHA256 c1d82e24766cb57f8647b283db4e84b415db8e9dba1b6ab0f6f2cab22c78fa34 SHA512 ff5202ed40a9474ed2df3068ead7692f520be764362bd83891b6f2c2bae0bb593d4c0c99c3c8d2780ca76a10f11a81cd265dc0ab457a6791e25325d8c4486449 WHIRLPOOL 0efa7fec436992210214cbd099ec9d607724359795f864ad74a9116d37cc59e430c3568b4889a1df77387bc6d900cdd629bed3d294aa8ed03f434f90243f4f33
-DIST jdk-7u55-solaris-i586.tar.gz 99759970 SHA256 76671ff2e02275d61bf49c35c2b82dbea92ac8b0acbdb1b09610095f15d4bc49 SHA512 c43bddf53434479108aaf3dcf2113fb2c6669265f70f3709c618649178ba75db1849eb14c148c7dcf01d9fe1fc64e10b507ad26dfe5780c1f7c3098e1146d3c1 WHIRLPOOL 2384a83187ebe075ebc56132e843d1b8eacae2b022952a8fd340cab55dc74c903def6c37828a517d3a2ca71a73f164c6da1541c7276c977f080f22c1cc281592
-DIST jdk-7u55-solaris-sparc-demos.tar.gz 16766757 SHA256 851c60acb746ebd0e99207927958905e0f66e2bd8993e7bf36f2467a4a731918 SHA512 d0c2c17aaf960004f2c88966720ad1b9f56e8a440a5cf0e58dee1398b703b3725c724e4f2b7f799533077e5cf6c56935b1af9e5def0cf36aac308b6cff266519 WHIRLPOOL 18e4a087bee3895dec0c658944e3491804777ff5a4dba9b69dae3de0c2ffbb2cacd6106e809a74c69690b957791e2ad6f11ae37962b5011fa208304cc1b5c289
-DIST jdk-7u55-solaris-sparc.tar.gz 102947964 SHA256 8bc6ff9a9d997ff56395ec980ea059283e76b10fbe6d84f1b542f424c994a092 SHA512 6df4774296fe630b2e1e486f13c1eb5b8d4d702805ecf6aab48e63aa688762493ab24b480e065ac80f34856b9352170304ffe1fb0f9d5e4e3683500978a503cc WHIRLPOOL 192e9fe7fdc79cd2f30f9c584dd89a64131099987b6894cf8bd03e066cbb5e8c5ce70ae747f958c0f2c07efcc6ccae778102152886c79f71c2d1cb15df603e11
-DIST jdk-7u55-solaris-sparcv9-demos.tar.gz 906509 SHA256 86baaf4ea805b520cf7795085ef3f426641c36044b3c5a9fa8989781d74fb147 SHA512 36f377609f993df4cc73411cec0330f6d35091297e38ba5544f4775ef8de85d80ed4f62e82e3738bf0681aa1d297890b9967d1d47c3b23a4c07d2160d2e9cdb3 WHIRLPOOL f506bbf42f112440c4d3ce2bec84b740b487b06844aa375cea6f078b0247a75f17fef00d64d0507cf0cb449112ddb7c0058b5f24dcb5fbc5e0e0ace18b95ee76
-DIST jdk-7u55-solaris-sparcv9.tar.gz 19231896 SHA256 82d07fe5a7578268049d5908e880b75b17100e1ee1a5bea4f4a4b355c2f4a64e SHA512 4c999f6b5a50fc838565fd8cc18057c88bb589bcd3f5724bb4c4574d96df1d99a5e2918d2b5b37905a38567b1eddf06270a7d4ecc69ac64b2623f9ef86952e0e WHIRLPOOL 56049985fca0bf934451264897621f5a300d8b804daf0a869a7dd3e290306b168e4428cca7c0f74a9631f635161b86d1ac75dc626e691922bdd23eb572065d78
-DIST jdk-7u55-solaris-x64-demos.tar.gz 864990 SHA256 0e2539c2bbdc04f3990ead9f115e7375779c44d5d82deb559f738be7b39988a5 SHA512 04f95d2664af961253696e33d64a9f24eb3332d9f3d44b0f68ce57c9eac7e49ec3913a5a704810101ada45185a07a0ea424be0d4c7b9314c37ef11c70507799d WHIRLPOOL 7ee0bc46abf7201d501368fc31892751a7444b6017df735cbbc5247dfa6352a5377d320dc420224c18aafcba3db03be7a04c645d6f017c60c26e0babd9a7f752
-DIST jdk-7u55-solaris-x64.tar.gz 17039750 SHA256 42b46af5767803c60038063c534a346fcf7bfe756c6a867dcf55c36f89b1be5d SHA512 116d284561a3dfe0b0e5aebbd7d999467cf64c6a96de60f2654aa595dcbe4bd3e234f9c5806bfc7a71f67ac6bca37fb6d1b0bf2d551e0299ccd06c8346294c10 WHIRLPOOL ab642a352667d63b8a0bc227affc282a23c7796d94fe149d11818fca73a9316da92c606c4ad8dc537463aa6dc71eac16f83ae2dcd560c857069ee89bd4384db1
 DIST jdk-7u60-linux-arm-vfp-hflt-demos.tar.gz 10420147 SHA256 1090408eee69749b3dd796038e954b09a06db1da4c739fd7eb5d070247b158cd SHA512 47948e964036ccd7622b4810477f75950800b6d2799761e26acd76f3897375370bd98166754bf75e4582219e40ed5d9e9336ad763fe3429b2e94ac9c71e38fa4 WHIRLPOOL a55987fcdaf865ff08bf603ca98352b7097efad3693485c4fdfcc439a61fbbc8d5e9ac05368630cf8e1344058826735b72542c6c50bf87678a51c64b8d8d6deb
 DIST jdk-7u60-linux-arm-vfp-hflt.tar.gz 71085745 SHA256 71968c9893310a9338f4434257c1a188d41080335105bcb9b64051336d3c5fcd SHA512 b2d7a1394e3074840c64394b6224e78c84830d141110550cb6201a935b93942176286170098347fdab7e7625828c993b4bfed87dfd1970fbbd3cca0130c05f45 WHIRLPOOL e7e52a969348612314e16130fcafdf0210b49369e91ff6c2710050a116da072955646989ddf173aab6ddbd245fe22e5880fc796bdc25b55a686fce7537e30028
 DIST jdk-7u60-linux-arm-vfp-sflt-demos.tar.gz 10207536 SHA256 4ee04c62137194d0b358dd06ff64d4e31afa995b4ce2dd66fbac72b67dc7c47f SHA512 350aca113da260e7fa6c59d4821e801a0bfb397011d1d90d04dd2ca9c8f8ee60be8a0b9cad6a4e31301c134ad97ee36a1e8814a2c84c46f9981ffd47b01b3eb6 WHIRLPOOL 43023ee011c1a239511278920f753b33e26761e9d278a20e7fee6d35375f69ce2c5715577ccaf0070f42553a375c6559e81944266bb3e441d3b488411a5bb9e4
@@ -69,37 +50,19 @@ DIST jdk-8u11-solaris-sparcv9-demos.tar.gz 8699596 SHA256 e0e18a42efc333475ce4bb
 DIST jdk-8u11-solaris-sparcv9.tar.gz 100806349 SHA256 306d8dc6156a804d1a36e95703ff603d6b41b0b038acab2406468d77f568387f SHA512 9c14e83adec0337b7ae008c41cd2e70c010a2c7296b006514129d28f3703ca0982562a1c4af587fea8dec4f16dba192f7c9a492ca869af010f360d609ee45252 WHIRLPOOL dc0e5f5dcd7b1c0d4b779eb624411a8d6b8b54e6a217eb16d1a1b219cb2092b2d77eaf1c184ae60a1f025177c7a0049ca3285119d4c973059617837c0fb34254
 DIST jdk-8u11-solaris-x64-demos.tar.gz 8648420 SHA256 ff8064ed37409d29bc2370423ec2c0eb6691bf78dc1a2a8a5cbe548d6df6011a SHA512 b645fb4dc2e302f1787e6b93393bac8eb5bb91e59c819760f007d13032e262daba2ced8f692f5f0317b7423f9a69fd0a78361db5b0c704e399a7a68600c6d04a WHIRLPOOL a1d9cb308cff107500600b7cea2e128b0610253b4ce2b4f2287ff8fe1507d66d9461390270e5b79a780b364d555fc132f96f23789eb1b51e2fa64419c50a43b2
 DIST jdk-8u11-solaris-x64.tar.gz 97704171 SHA256 e07f57ec624b350cddcea7a7240defd7c04688931d04e65512f085cb58df4eb9 SHA512 a57262a7a877db8933c265b3d87a64f4e553529150988bcfd031272b259392193945557557c9b964d859294c663068989a1685cf79e0e10a3dd9da5ed83bfa70 WHIRLPOOL 1666809cdabcb28453af4e6947aa974fe554424ab923a17d100e574ec60a516f6b806ff0069fd97a275625480e6e695514ff3b06984d09b27c0c4659581b9320
-DIST jdk-8u5-linux-i586-demos.tar.gz 55210712 SHA256 9e7bce701b6f9f3ed07ffba9f3208141c794bd81c6f28e62f3faadf68944b3af SHA512 63e24f21cabdf47895ba56ffc7b1c6b67689af72d5e1c1e3af5cc9c4a63f4f4ddd67fa6f2ec92709010621b90c0fc2a7dda60feab4579a19c19f28ac2c9f7e74 WHIRLPOOL edd7d8ad0ceda1a77722569b7ff671235522c8d44366fc470c760f76539f570fc311704f1d724e885eed06814431f4dcbaea9bd23257bc1b2c3b8a17683e99f6
-DIST jdk-8u5-linux-i586.tar.gz 159910666 SHA256 779f83efb8dc9ce7c1143ba9bbd38fa2d8a1c49dcb61f7d36972d37d109c5fc9 SHA512 fa120875284539c0f593012cecf984dd7e7eb9745f78fc2c3d83b87d189fd258747b219d14b38bde0575fbb6e58088a882dc3e0e5427e77e74655aab0495726f WHIRLPOOL 02a99cd993cab6a46d80e3e2a9115d9ed0a83c1b7243182f4363305ccd847c4f450427a1a415721a190ca22de6b7a58f41bee06d8608699fff31cc8d486a1f8a
-DIST jdk-8u5-linux-x64-demos.tar.gz 55258871 SHA256 129cb22f0a931bec3904dc1927d96aa8f486c4adf009d533eda8aaf3fe703bcb SHA512 2d03b948cca7d5815d627fa0b3afa24724071adff0b59b1c4f3e3c1d54a5576b435c05378384ac4e8c8553935522da446997375799aa7ae9f880d98ebbb78ca3 WHIRLPOOL 8802fd0ce34c9e8d2884a039d3e92567bd17ea8902f51ee0974e120bf0359640e497a7f05f929f63623f2065769aed58fc32bb37a3f5a724084ff8fc992931b0
-DIST jdk-8u5-linux-x64.tar.gz 159008252 SHA256 44901389e9fb118971534ad0f58558ba8c43f315b369117135bd6617ae631edc SHA512 9a5e779519ac9e9d81d1001b4989c58d9e17ea7a5d23b8184756eeed860e4633d0fbb480d16aea466fd41bac5938ab558ac4ae6ac37680c9f4f42582904e9db3 WHIRLPOOL 91b3458e7bfa790000c797de875a9454c63478343ea27ac37cc89590522380d576431799083b7651ed9048456734b0bc6288a568a7983d2e919b58afb75d9915
-DIST jdk-8u5-macosx-x64.dmg 217882269 SHA256 3dd1047340c2487f7c32c4ae633ba9a9a9e1dee49f6084d7df3846091faece48 SHA512 bc8713aec6d9d68a3227afe82e80526b2c1fbbf24a98d1a5764e0169429a86d8934e15c577abd8f62988cabf7324e0bd00830148d5fbdfae9c2ef77431f98be7 WHIRLPOOL 359ecb55c72d03d05a4fa2134096898325810cf9c3bc960e74d64f452cb7e206c530285dbeebf94642d009749dd3a3b834eeea25e5d16b7606a8c831e528aa31
-DIST jdk-8u5-macosx-x86_64-demos.zip 56019174 SHA256 4c3f2494b4fc72cdc9f695c2e21716f71bee187a63e64c4954337e9a6ddba19f SHA512 ed93fbf8b07918dfa25fd26242ea3a3a0ed8b67c425a82c73c923df125d0db9335ab82a07ab85342edfc2470e3e7d24e2a9611d3305ec5c77c85a77d5e887001 WHIRLPOOL 24b6e54edd4f3b7063707d8f0330cb6ff68abfdefd0951b6bad4dab8a1825edeea6e3cdbd76d3a6337a24fc5d1224d4e78fe912aad5876b938077f03453959d4
-DIST jdk-8u5-solaris-sparcv9-demos.tar.gz 8688867 SHA256 4860e31d1f907a3e07054a35d13a7f4bce2561923a449c8a758257a91dc9d44e SHA512 84cf7c64f1e926f949a0665a61169eb7f3070bce4e54f0a6583079cf4be484d89734208a965ffd8552320ce5c46f168ec2224647a021d155585668ad8d4aa9b9 WHIRLPOOL 87ce924a7101cb336084de967467a211bc3ee1a37cd7efb29dfad2cfa16f3d57d3ca2af30428d232c27c5afbaca7d74a93745e283c4cb6ec42ba582f5a41e41f
-DIST jdk-8u5-solaris-sparcv9.tar.gz 100180279 SHA256 22b5f8e476376229a29f376e2debff9272a62bfac56512981f5a6196e292c37f SHA512 4a408e460dfdf1345dc094d65c79475a32dc5c4057ef3e59513e96451584fd6fbdf0ca56abadc890b2890501f9c18d81c104c8caff296bef12ed648c516048b9 WHIRLPOOL fa77af38fe97ae90f492d2fd420e6bfbe64b95b9650346eb35267b5774564bb8f570578edb59bf535e01abec145be7bb7fc2e9fc5186f9dbd2d8af3d01424eb5
-DIST jdk-8u5-solaris-x64-demos.tar.gz 8643049 SHA256 c9355b5ff54a0c84213d2ca524dcf6c163b176c099ddd0b3658709d863b14ff5 SHA512 30463fb317152b2239ca75a0c840deaeee6600a72753817a8d0f613b2845a5bd7912ce4d47df0f9ff746ecb64a20eac39b4470b7721df65ca612c61873777320 WHIRLPOOL a041e73f6e41e7f6c5a59fb1dd55c45cabc10d98b0ebbdf2635f78d2c747dea87cfb903234f1333b8248e4ee1f4d5a1e5fb3240e6ab6d7e97f8ea2d2b7854bcd
-DIST jdk-8u5-solaris-x64.tar.gz 97716860 SHA256 fa8138a46d82b2dad2b17a57ecf30fe59eb15a1482a07852a2a60a9f63da7538 SHA512 5e05a59f0a205c9f6ff0d0ab507d930e45f15418018ef1bad7d3d0d7626a0f12bdc8f5c83d80a4b0f1f755c32d92b81e69552cbfdb869d05ab82bda9fdfd9971 WHIRLPOOL a3741c2684780876e44fcdd9c977062db34137f4708aa9b0a7c23e3b07297455ece69d96564de29ad44d1a5440599b07107f05008c6841f302a9605ae4944400
-EBUILD oracle-jdk-bin-1.7.0.55.ebuild 10022 SHA256 8fcc58b67d2452b5ba1c616ade70aab0bb2d84cd3b8378d3d28d72b367279f1b SHA512 c803bd5a3ddeb2412493cc1b29ced3853c7b727b22c4e76ecf1e310ef745b760bb987d31be1be81dd559bfe2c79c63df44166ad09537f9be2a1631cf26a3e813 WHIRLPOOL 4fbce385b15d6b7b5a9bbe9c28f1833ba34fa8cf65e2dfb731a9d86f7fecdcd481aa51efd8849f23f1b4a39deb96dad9199d030325c4a8e54e71396953513cbc
-EBUILD oracle-jdk-bin-1.7.0.60.ebuild 10020 SHA256 93ff8dd74bbd9beb6ebbfa2a262448a04dc993ce11101cd9ae643ca9263d0bac SHA512 239f6faec14720f6c906f7dfd756336eb939961fdc9a712fecacaa6297a283e189b9fc63cf4a15672e13ec48097f1caaba352a68b3ee9a0a4b51b9c929832a47 WHIRLPOOL 72e58bba4c3b3860c56d393c4fe8ebf84fd5c4457f14e7c78d4d83fb7e02711c7ce6154edaa5ac53f803077cf53d0c20b9f0d8fd8eebd27c5bb618865692d3bb
+EBUILD oracle-jdk-bin-1.7.0.60.ebuild 9910 SHA256 ba9f626a5e86a9860fa995debef6c60b5a0842d6bee5384f7bf64112026fa232 SHA512 1261a52e8dfb9112dab4e5f03b47cdb5552a99fa8929db6f527f937110320da535fc97914d4be655b78b64f82c0c477ab6bd5bb273c34e1aa27a0e289d8bcda8 WHIRLPOOL 0a3424b4d9cc3e10c5649bd3e45774b63b9acaec6cf03bf5dfabd49324487d9a3fba9dd6bb572167ccbf5495a391aeff14feb629fc448880e0315ddd91478cf8
 EBUILD oracle-jdk-bin-1.7.0.65.ebuild 10238 SHA256 2afe688118cc875bef74ea53328bf358f83b88b6091d8ef328825d3ef760d90a SHA512 d53382bb21240ccab94f9bb88aabd49f370d50c548c1ec8c2d5c8b37559e581030286f0cd3ffda6e2e7770200e7dfa307e65a725441ccb66071ebffa2c677f56 WHIRLPOOL 17c1c728d405b17fd3981120bd4fb9d2cd5734def072c4b2ea95bcdebafa47d90fabf11695c990af7d870243284f965ddac15ac609dea58e1e4b86425cda5fc1
 EBUILD oracle-jdk-bin-1.8.0.11.ebuild 10063 SHA256 7857e914a1d0dba0628c1e6ac62a8e20a8600b2d076d29f467aca98d6a8230f0 SHA512 45a6b7859c7ad74b9cac0d48579cc1d7d3cfb90b90b7e54adf3443799b5ceddd475c5910bd016bfd843c92ee13bee6e8a80f1bb7d1444de7aad17aed6945d4f8 WHIRLPOOL 56562f96eafb3b2a3c1b9f830ed9502fce81d82fa9ac665d749c4cc272e50645eae34dd55fe61e9c70f97dda6c1f705acfb0a5e53a97230589a1b67b1c27adc7
-EBUILD oracle-jdk-bin-1.8.0.5.ebuild 10127 SHA256 adfbfb93381f5595a3030b673eb9dd84c0b2861433e16a4508470da918f662fa SHA512 7de7e6bb4f29988d376130124a1a78ee1ea3d22265808ca973a7f3d3dba9b5e73f892eabb88dd7cd07a56093d6e5336cd175e09f496f6b94f65ef5858ac4ecd6 WHIRLPOOL 6b86eec3a5e9a5defe1cb5fe73e3351bef3f955759f3408841ad754c3eb28dde3be02661c783ce7b239c4eff9240c0ee4e266c459ef55a87c49a0088acbf56fd
-MISC ChangeLog 12258 SHA256 15101c42ed552e7f4a0b0bf2c09781db9ac2e34dfb0723ba685b76c9833b34e4 SHA512 bfded37508522a0787b6714b175b00d326bdc72088bdf6d15cb25649052469ae2c0da3c6791c100b3aa5fe83fca46c7001d2eb19b616992116baa64843ae43d7 WHIRLPOOL 211afdfaac1b1e873dbf68a28947c5fbfe5fb79b207cfa4b6242239f01ca6951361b754c82daa8deda99477f741168ea2f3e6b7120226632aa5463f835545074
+MISC ChangeLog 12461 SHA256 57a1d88a5bde73986c2bd61678e06a4c746b8668f14e07f912dcb9c834ce34a6 SHA512 97fe76c4758bff597f3abe88ec29aa720bba86fa6592752aabcf790b33525be9476ad9bae8c9c61c14051e33bfc8d286f505b3c2dc47deee290fedbe4dd1662c WHIRLPOOL dad5752abba808784d07f0a1b5c23a7153d80013fd9745bc999fd5ffd89822670a819aa65c1c6b84dd2edd232685baba668aebfe98f7b435570a24529ed99fd7
 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTzQhDAAoJELp701BxlEWflj0P/3m6J+H5uOIWOzhJizhfb5jx
-/J0Rak9j7d6a7OEH7lpYUzLwoqsqVYTO+fN2MgY2Q3Ed6LeALrP+x32IFhI0F2ei
-h2mM5Rq9XeFK+/y001gwnne0eVQKQjV8+nH4eqOnsPHhwcGLFum88LKGIftrN2dR
-Ymr2xu0g/S9EuWidghm2cbbqg6C77qi0QZbUXbw/fyrRcQHAnp+I8Y+H/sTGo6OP
-cw9KdNXaGrVR4ndoG6v4IqKcLbkYnsaJ1kCaS8tOkmFPW1hbW0emHgoK9Up9N57Q
-6UYePfBbUsjPWaoNwC6rBwHEgT3TDk5AiKAT9xNekbAdTjQH9yJUT1pgBDVkTCwU
-ECVAxsHE3ifQkIIL9URWo3YvDXaLOV4teLwM9+JuFWn34jCColqr1DW+/iA8sXtQ
-6BpXMlwSwKrAwrlmzTFsXr58KlKS/8VBWKm8iH7ESu3A+ee4/NZsgn6QKpg0qFe2
-EtRuuCwl/QiH7AfOn3SpBtoNJzZJT9ZvoU366S81Ry9/dntu8muw7O3sy/Rh4XBs
-KjZFqS3qcjByvwu7fi7JVETuCIJlgxhjfyapgGWLCQdrlnE7eaf1+oX8TIFeQjHJ
-feVhjRLaIlM52t7KSzZgHcSAoyyH/ctNPvwwaPA+hjoCt4Dx7PjuDva1YNi21kX1
-DUMALmv55pCYQ0IYJsBV
-=riZf
+iQEcBAEBCAAGBQJTzWc+AAoJELjwI6Q8XPdaLd8H+wWI4z3jwOa591hmgvaaPtYI
+ct0S/8JKQFB7r761IzjoAz29zzwDLhkzzMr+IbITesAm/7ax/XDf2vAN8AHp0RLb
+gPOLR7DHu653/J14sRBkVaGFnLUiifyZhlwI12thz5tQbXruolIHT6CkgFPiet99
+XLXiN/Tf+4jJdI8EV90rGMyM+i/pye9i950W8wrUNh4Xzb20tYsBd3k5b84xMfPX
+xD+s+3KWSdddhwbGA2fU8KsS/lzWvRLyVMpNDMO+mkiERorfP0WYWB85L5/D8QR4
+2pwwP3hGwFUY4jTc4SG5Fp/+edDIbtbd9WQeqpFOawKEWq55NzP/GggI74ruulE=
+=UJNi
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.55.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.55.ebuild
deleted file mode 100644
index e494e765726c..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.55.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.55.ebuild,v 1.4 2014/05/23 13:26:51 mrueg Exp $
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
-# This is a list of archs supported by this update.
-# Currently arm comes and goes.
-AT_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
-# Sometimes some or all of the demos are missing, this is to not have to rewrite half
-# the ebuild when it happens.
-DEMOS_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
-FX_VERSION="2_2_55"
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
-AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
-AT_arm="jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
-AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
-AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
-AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
-AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg"
-AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
-
-FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
-
-DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz"
-DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
-DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
-DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
-DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz"
-DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
-DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
-DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
-DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
-
-JCE_DIR="UnlimitedJCEPolicy"
-JCE_FILE="${JCE_DIR}JDK7.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-for d in "${AT_AVAILABLE[@]}"; do
-	SRC_URI+=" ${d}? ("
-	SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
-	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
-		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
-	fi
-	SRC_URI+=" )"
-done
-unset d
-SRC_URI+=" jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.7"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	X? ( !aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	) )
-	alsa? ( media-libs/alsa-lib )
-	doc? ( dev-java/java-sdk-docs:1.7 )
-	fontconfig? ( media-libs/fontconfig )
-	!prefix? ( sys-libs/glibc )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="
-	jce? ( app-arch/unzip )
-	examples? ( kernel_linux? ( app-arch/unzip ) )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}"/jdk${S_PV}
-
-check_tarballs_available() {
-	local uri=$1; shift
-	local dl= unavailable=
-	for dl in "${@}"; do
-		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
-	done
-
-	if [[ -n "${unavailable}" ]]; then
-		if [[ -z ${_check_tarballs_available_once} ]]; then
-			einfo
-			einfo "Oracle requires you to download the needed files manually after"
-			einfo "accepting their license through a javascript capable web browser."
-			einfo
-			_check_tarballs_available_once=1
-		fi
-		einfo "Download the following files:"
-		for dl in ${unavailable}; do
-			einfo "  ${dl}"
-		done
-		einfo "at '${uri}'"
-		einfo "and move them to '${DISTDIR}'"
-		einfo
-	fi
-}
-
-pkg_nofetch() {
-	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
-	fi
-	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
-
-	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
-}
-
-src_unpack() {
-	# Special case for ARM soft VS hard float.
-	if use arm ; then
-		if [[ ${CHOST} == *-hardfloat-* ]] ; then
-			unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
-			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
-		else
-			unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
-			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
-		fi
-		use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
-		use jce && unpack ${JCE_FILE}
-	elif use x86-macos || use x64-macos ; then
-		pushd "${T}" > /dev/null
-		mkdir dmgmount
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount
-		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg
-		hdiutil detach "${T}"/dmgmount
-		zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv
-		mv Contents/Home "${S}"
-		popd > /dev/null
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	if use jce; then
-		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
-	fi
-}
-
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			bin/java -client -Xshare:dump || die
-			bin/java -server -Xshare:dump || die
-			;;
-		*)
-			bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
-			{,jre/}lib/i386/libjavaplugin_nscp*.so
-		rm -vrf jre/plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
-			{,jre/}lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodoc COPYRIGHT
-	dohtml README.html
-
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use derby; then
-		cp -pPR db "${ddest}" || die
-	fi
-
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		cp -pPR demo sample "${ddest}" || die
-		if use kernel_linux; then
-			cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
-				"${ddest}"/javafx-samples || die
-		fi
-	fi
-
-	if use jce; then
-		dodir "${dest}"/jre/lib/security/strong-jce
-		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		mv "${ddest}"/jre/lib/security/local_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/jre/lib/security/US_export_policy.jar
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use !arm && use !x86-macos && use !x64-macos ; then
-		# Install desktop file for the Java Control Panel.
-		# Using ${PN}-${SLOT} to prevent file collision with jre and or
-		# other slots.  make_desktop_entry can't be used as ${P} would
-		# end up in filename.
-		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-			sun-jcontrol-${PN}-${SLOT}.png || die
-		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-			-e "s#Application;##" \
-			-e "/Encoding/d" \
-			jre/lib/desktop/applications/sun_java.desktop \
-			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-	fi
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/jre/lib/fontconfig.*
-	if ! use fontconfig; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/jre/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x86-macos || use x64-macos ; then
-		# fix misc install_name issues
-		pushd "${ddest}"/jre/lib > /dev/null || die
-		local lib needed nlib npath
-		for lib in \
-				libJObjC libdecora-sse libglass libjavafx-{font,iio} \
-				libjfxmedia libjfxwebkit libprism-es2 ;
-		do
-			lib=${lib}.dylib
-			einfo "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
-				"${lib}"
-		done
-		popd > /dev/null
-		for nlib in jdk1{5,6} ; do
-			install_name_tool -change \
-				/usr/lib/libgcc_s_ppc64.1.dylib \
-				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-			install_name_tool -id \
-				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-		done
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild
index 41d1cf5290e0..742f3552507b 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild,v 1.4 2014/07/13 14:10:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild,v 1.5 2014/07/21 19:17:10 sera Exp $
 
 EAPI="5"
 
@@ -60,7 +60,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )"
 
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.7"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="-* ~arm"
 IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source"
 
 RESTRICT="fetch strip"
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild
deleted file mode 100644
index b6cddf755534..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild,v 1.3 2014/07/20 19:53:16 sera Exp $
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-# This is a list of archs supported by this update.
-# Currently arm comes and goes.
-AT_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x86-macos x64-macos )
-
-# Sometimes some or all of the demos are missing, this is to not have to rewrite half
-# the ebuild when it happens.
-DEMOS_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x86-macos x64-macos )
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
-AT_arm="jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
-AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
-AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
-AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg"
-AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
-
-DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
-DEMOS_arm="jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
-DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
-DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
-DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
-DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
-DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-for d in "${AT_AVAILABLE[@]}"; do
-	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
-	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
-		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
-	fi
-	SRC_URI+=" )"
-done
-unset d
-SRC_URI+=" jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
-IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	X? ( !aqua? (
-		x11-libs/libX11:0
-		x11-libs/libXext:0
-		x11-libs/libXi:0
-		x11-libs/libXrender:0
-		x11-libs/libXtst:0
-	) )
-	alsa? ( media-libs/alsa-lib:0 )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )"
-
-DEPEND="
-	jce? ( app-arch/unzip:0 )
-	examples? ( kernel_linux? ( app-arch/unzip:0 ) )"
-
-# A PaX header isn't created by scanelf, so depend on paxctl to avoid fallback
-# marking. See bug #427642.
-DEPEND="${DEPEND}
-	pax_kernel? ( sys-apps/paxctl:0 )"
-
-S="${WORKDIR}/jdk"
-
-check_tarballs_available() {
-	local uri=$1; shift
-	local dl= unavailable=
-	for dl in "${@}" ; do
-		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
-	done
-
-	if [[ -n "${unavailable}" ]] ; then
-		if [[ -z ${_check_tarballs_available_once} ]] ; then
-			einfo
-			einfo "Oracle requires you to download the needed files manually after"
-			einfo "accepting their license through a javascript capable web browser."
-			einfo
-			_check_tarballs_available_once=1
-		fi
-		einfo "Download the following files:"
-		for dl in ${unavailable}; do
-			einfo "  ${dl}"
-		done
-		einfo "at '${uri}'"
-		einfo "and move them to '${DISTDIR}'"
-		einfo
-	fi
-}
-
-pkg_nofetch() {
-	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
-	fi
-	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
-
-	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
-}
-
-src_unpack() {
-	if use arm ; then
-		# Special case for ARM soft VS hard float.
-		#if [[ ${CHOST} == *-hardfloat-* ]] ; then
-			unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
-			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
-		#else
-		#	unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
-		#	use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
-		#fi
-		use jce && unpack ${JCE_FILE}
-	elif use x86-macos || use x64-macos ; then
-		pushd "${T}" > /dev/null
-		mkdir dmgmount
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount
-		local update=$(get_version_component_range 4)
-		[[ ${#update} == 1 ]] && update="0${update}"
-		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
-		hdiutil detach "${T}"/dmgmount
-		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
-		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
-		popd > /dev/null
-	else
-		default
-	fi
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
-	mv "${WORKDIR}"/jdk* "${S}" || die
-}
-
-src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
-	fi
-}
-
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86 ; then
-		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
-			{,jre/}lib/i386/libjavaplugin_nscp*.so
-		rm -vrf jre/plugin/i386
-	fi
-
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && arch=i386;
-	if ! use nsplugin ; then
-		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
-			{,jre/}lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodoc COPYRIGHT
-	dohtml README.html
-
-	dodir "${dest}"
-	cp -R --preserve=links,mode,ownership,timestamps,xattr \
-		bin include jre lib man "${ddest}" || die
-
-	if use derby ; then
-		cp -R --preserve=links,mode,ownership,timestamps,xattr \
-			db "${ddest}" || die
-	fi
-
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
-		cp -R --preserve=links,mode,ownership,timestamps,xattr \
-			demo sample "${ddest}" || die
-	fi
-
-	if use jce ; then
-		dodir "${dest}"/jre/lib/security/strong-jce
-		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		mv "${ddest}"/jre/lib/security/local_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/jre/lib/security/US_export_policy.jar
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin ; then
-		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
-	fi
-
-	if use source ; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use !x86-macos && use !x64-macos ; then
-		# Install desktop file for the Java Control Panel.
-		# Using ${PN}-${SLOT} to prevent file collision with jre and or
-		# other slots.  make_desktop_entry can't be used as ${P} would
-		# end up in filename.
-		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-			sun-jcontrol-${PN}-${SLOT}.png || die
-		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-			-e "s#Application;##" \
-			-e "/Encoding/d" \
-			jre/lib/desktop/applications/sun_java.desktop \
-			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-	fi
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/jre/lib/fontconfig.*
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/jre/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x86-macos || use x64-macos ; then
-		# Fix miscellaneous install_name issues.
-		pushd "${ddest}"/jre/lib > /dev/null || die
-		local lib needed nlib npath
-		for lib in \
-			decora_sse glass jfx{media,webkit} \
-			javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
-		; do
-			lib=lib${lib}.dylib
-			einfo "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
-				"${lib}"
-		done
-		popd > /dev/null
-
-		# TODO: This reads "jdk1{5,6}", what about "jdk1{7,8}"?
-		for nlib in jdk1{5,6} ; do
-			install_name_tool -change \
-				/usr/lib/libgcc_s_ppc64.1.dylib \
-				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-			install_name_tool -id \
-				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-		done
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}