Security version bumps to 1.7.0.55 and 1.8.0.5; fixes bug #507776 and bug #507798, removed unstable versions from 1.7.0.51-r1, pending stabilization of 1.7.0.55.

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

5 files changed, 362 insertions, 29 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index cfe25521e16b..750dbc8d6e8d 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,16 @@
 # 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.54 2014/03/28 14:55:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.55 2014/04/16 08:57:26 tomwij Exp $
+
+*oracle-jdk-bin-1.8.0.5 (16 Apr 2014)
+*oracle-jdk-bin-1.7.0.55 (16 Apr 2014)
+
+  16 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +oracle-jdk-bin-1.7.0.55.ebuild,
+  +oracle-jdk-bin-1.8.0.5.ebuild, -oracle-jdk-bin-1.8.0.0.ebuild,
+  oracle-jdk-bin-1.7.0.51-r1.ebuild:
+  Security version bumps to 1.7.0.55 and 1.8.0.5; fixes bug #507776 and bug
+  #507798, removed unstable versions from 1.7.0.51-r1, pending stabilization of
+  1.7.0.55.
 
 *oracle-jdk-bin-1.8.0.0 (28 Mar 2014)
 
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 61bd5c169b77..fb292063331a 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -6,6 +6,7 @@ AUX oracle-jdk-bin-1.7.env 1000 SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818
 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_51-linux.zip 21220987 SHA256 4e827ef3008a60f685f95a3b60c6f84a889583061c4b289c3b296ad5891d1c22 SHA512 a15c6e1163780090f17b417090fe53897bf5a1cad511acd98b5f66701923f67668ad1cf0e4f2a6577d26a6c5451ba45b02ac39127a39b5d4a345f76e166e0eb7 WHIRLPOOL 1ef56cc938d30d46dfee4499b67790080d88457b31db3accb177cf0a5973a50d6c0fe8ac2a229ac51140bdc4b7e491182d44956ca69509f2a4f7c5369ac0a311
+DIST javafx_samples-2_2_55-linux.zip 21220786 SHA256 4e46b3c7e2cebc31fe5127f384fa2377a79db9b2a02322252bcd2a6bf9da833a SHA512 55ec3f5a86658c1e81aac29041461c053093a327599c754b95a42c64af0401370acd1d9199557eac99797852bc248b0552c8d3ceb9bb20567cefceb45d1f768d WHIRLPOOL 07e99ecf46d7145d96da5894b18855afe0566373717922b4071108df8112f8ffc70482e423eae687d8ba482f252702db9a063e137be87153245f169921c8d06e
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
 DIST jdk-7u51-linux-arm-vfp-hflt-demos.tar.gz 10375117 SHA256 863e28e4265378c70411e77af092ad6d5f2ba30dbcd7998cc43ae653cebb8e29 SHA512 53e293e49c0b6d5fe5bb391e3ae0d6b8c59690ba53fb82aac58a9f671243a2ceee2b8f75cce19d6adb68d7561a6dca29dd1f393ca1d230105f92abab98c276df WHIRLPOOL 1177e37eda2c14fb24e11c456c23714613b911d7832ec1d86d519c6791ad1b797db3055327e878f9f13bc111057e6cab046952c52c16a8ef4c98895f224ea937
 DIST jdk-7u51-linux-arm-vfp-hflt.tar.gz 70986384 SHA256 47273843454755d1bdd3b91ec97c42b1bcdae01af6e42c38413c3d0ff630557a SHA512 e9a94e434c3da105b61337490e79b30cf6e59d13eb3409ab12b10b85ecbf23b122f453d7aea84472ff54cb0b97856c1eb6d298da71655533e0199f55f51bb669 WHIRLPOOL 1f5431deb15f32b60997a4cc1074bf63bb4cce2f74f43eed47050342956fa51c4045801c5326e8f460b9c86954826f7ad72bd832f99ebfb2b13eb218c0708b18
@@ -25,30 +26,47 @@ DIST jdk-7u51-solaris-sparcv9-demos.tar.gz 906072 SHA256 ea7974b1527fdc77a988068
 DIST jdk-7u51-solaris-sparcv9.tar.gz 19225586 SHA256 7df20ac03b4f95ccd907f6a54af8ea97f47d4b774f9516128af3d89202497c52 SHA512 cacc3869ebb11b128f74ab7080aa5a44a7a91b16d56bedd75040556973b41a3216d8489ab9139d8f3d0eb13b2cb09ec51d301e8eca3ec437af141b26d1235d31 WHIRLPOOL 7442c8d2daa10cd3724a7167b333545e5342db79993e0b88c7033300e50bd09d6b0aff19df1b8c99464e541693c004e6e4bec73ba3a03078e56fae33f10a12af
 DIST jdk-7u51-solaris-x64-demos.tar.gz 866244 SHA256 38513732f386a7227e6a8125a33d090ffb045f9deed686bb46e385fce3eb92e7 SHA512 04760813679f22469088f5be5d2e49532e8a3eed311967e753bc2fd9d1ec85f5cf691072df949b80f0b796528c7e32db282e44cf5dc38fd0b61e553a6786fb17 WHIRLPOOL 1697ec2ee1993f15ce3a916e075c2e3811cf734150c4247e7c7d3a18039e55b4c1199405b516f5eada9c72cd1b0b6b0520c874e657ec8b5d048ff0684ca60372
 DIST jdk-7u51-solaris-x64.tar.gz 17070697 SHA256 5ec2ea2015d9668395255af55c1366f66c5408c5841a0ed92d7a5435d3dfca9e SHA512 0bf87374b42475fce257bacddf1652088dac527f4594b77f9c072826ab5f0d6ce180756954144bd634eae306bc58ab0545bba84ebb1d3d3d06fed3b00ddb674c WHIRLPOOL 7b5907d33efc3e063ece7c618cb8a0b96e711270db38da49a5873cded03d25e720b0df28a8527d4d8c86328f9a7ddef34f0606df00ccda3d50560f23978f4de8
-DIST jdk-8-linux-arm-vfp-hflt-demos.tar.gz 9326732 SHA256 ebf1158edc43d1d9a9be3833e490420a33c4dab9b26aaf55e21ee72308aaa4d4 SHA512 dd16cc935606ae3a14ea1aad0d93514386b7d898a104cd4ddf7cd6d371f44b435dfa489a20a33a431fbbee969b650922c19604525c09492a5870cb408646b7dd WHIRLPOOL 1ba74d6c9712e9d2118e74e3a21feb980ca4ed0b61d2ac68fdfb687c6a77c10f810bed5c9bb7bbf29121615d11ef097b6ac1c4e54fdba7e46222853549bcf5d4
-DIST jdk-8-linux-arm-vfp-hflt.tar.gz 87570241 SHA256 eafc11f87dc6eaba10ac999a5ba5d30d232f472c8e4b397d7a9dfcbb4b54cada SHA512 de8d590191d169c8f5fb7b7ffa81f90059872b0a3fb736396e916173e7cc44ce0b3ddc991f99e68ee767494503d61c99121fed2c493fffe0d69a7d143e05fac1 WHIRLPOOL c6e15e1d460462d90515a3236caa06092bca1cad816992928d63b0df5b044b852dec86267fcda868f87c8d00514e9d63ed862280ab039733ab65b3d4ab9d32d5
-DIST jdk-8-linux-i586-demos.tar.gz 55204261 SHA256 3de60de9d3c81ab687b178d86c8ec2bfd5f82a29f7ce912dfffa1bbeab4dcb4f SHA512 fb9ab89e05ad5bd9eb7126a6f8d7688881d62c6158b2b3e01bdb8692c9a8e41a80d1f45ebef4f86224859e9eec4c58bf240f3925bbd0c09d6bc9e5d487e5894a WHIRLPOOL ba5b2bd00e9d49b5a5abadb5b4ec6625e10854df9665c8c203242315f88b2a57d9fd9454895a31fa45a7b3e637a03e8a2ab9dcd379afc0ed512ebdca52fba127
-DIST jdk-8-linux-i586.tar.gz 159875026 SHA256 01c1f2f7bf619b613066f191fe201d41def3b3d1b639592626c6c410f7f818d5 SHA512 949869815bb06e4aaf938274e2c0812bd23d6419f991b57156622278baab7ad658ddfd76fe7be72dd3e07c00b070001bc47fd24ac2ba3080dc4b377de100aded WHIRLPOOL 6469beed58b9c9360bbdca84469614df68defc7341b2700e1e44f7bffdb4950d7b1955519a90f2947125cc5e32116ba100658c70db051bcf2544a5602aca2f82
-DIST jdk-8-linux-x64-demos.tar.gz 55249287 SHA256 06d0a7e8258b2e60d6eed2d4cc4a14e4b8e2b0120293e26757cc284b42a83571 SHA512 e3a062e8c2a8b4c7e580ded96233015115afa62803eb70f6728aec347777c63581542f76159b4d7f91d24a840a0f1342232e9dc7aeec49b525adaada825666cf WHIRLPOOL ff4c7cd47581dfae2600243514cd8166854bd6119aff05510056199e8b8e95e837c680b963831d1e0c1f2c672790f557e3e7636304f0e6f0000fd0a94631967c
-DIST jdk-8-linux-x64.tar.gz 158974157 SHA256 724a880ddb40570a7066a851a621e397151e425dea19593c0ccecc49e38f1d22 SHA512 73c87725f130ad473f5e827d98b64700b4f5f16f2fe59c8cb41fbbf215a9f5e57c95732fabf7a9a57afd21c4816c78ead9465771b5ea127eb37a2f96ec7948c3 WHIRLPOOL 4a255fdd2c7cbad2f5d3d3b3e8d65a88889162cc793b6ba23eaea120641a3eb2292ec7a3273fda0c21dddb6c92721f7a440e39845d68ed4194e43ef5e1217625
-DIST jdk-8-macosx-x64.dmg 217815063 SHA256 60db4220632adb017cd8315a7a0bf0002a2ee49008c651ffc67ef38eafa46717 SHA512 908ffba1107ad5c5ff667729d1250ecd062cff7ece110e1da7c4b6f4c78eafe81ec13473cc29ab17d4d6d9b9b7332e0cc99c4d0168e6594de98dc3fd89441fd4 WHIRLPOOL 17c5e2c7b3e888dbd5e0367d2b2d155560b7a43edf5d5a6a2cfd4dca86e2f87e29a1936b4b4dab27dcfa56bd09b5e474c019d8ba7e67e6779f1fbc5dae07cfd5
-DIST jdk-8-macosx-x86_64-demos.zip 56000134 SHA256 25b10cd48f8f465ceaeb898f00604695db4a8110dfb2abe9683703acf6fff478 SHA512 0539e9a8b7155a6180313d7a770e9c59148186154aadefda8a4445a33b18c6d9cd9b7919a838253a26e61f2dd21c8c2116c3c5bb1e85bd963f19876c3f44a41c WHIRLPOOL 8db3a966a999745b22d67614b1e7e9058cf58de9ca5ef6a42d41d638f861d91af2f66fd641438fa0db4fde2323797b1a764d7330c45f062044a28c9c8034da78
-DIST jdk-8-solaris-sparcv9-demos.tar.gz 8688420 SHA256 b512710ae4c6442a6d33f109c10f7cc46826a3cd7115c506a78e4e49c40b1466 SHA512 9a566ef4d874413997d3f45f8a17934e5d6f94bc9eae2e8b28f270c7f203fca78fe34b3c00f1d50c3590468978e00c2c5029018577a3238a28b1f9f537ec0fb6 WHIRLPOOL 8357bcc0c3c3432357e245ef30af10685b52f42d4c2ab72858cba6335fecd8aee7229a760ff136eca6e3883cf81134ff883914a5cf054e7d898fffe2c3cb73b1
-DIST jdk-8-solaris-sparcv9.tar.gz 100175393 SHA256 3937aa72284745b7a39c160162896c57b82ddeb3c96202c4f1b14788b05e4c31 SHA512 cbb76748a7bf74b1271fc565aaeb0ab9cc45e6e270c2479849a7fefa5e4cd35219ca64edf45569406d4648ef852c38f91a215df943d0ceb49505d428d77d49eb WHIRLPOOL 22b0ca09a886dbdb7df897bce7f0709e6406bf5b928ddc129adfadcd1864658a230160b67328d5a7543d9d8bf6e93a0d09ea163999a1a52b749ef3de15e27b6a
-DIST jdk-8-solaris-x64-demos.tar.gz 8638872 SHA256 5805839d85a943222d4cd853e23e5e166bb20c78aca04df52e4122f49e1ea058 SHA512 d6bb6d75c4ad3fb508290d8dc21dcf73600f112c9e131f0205abb3b5878c1b5da23924a63c9a69ecc9189cd6ad28e5819b31bf642fbd0f7b41d473586e1c928a WHIRLPOOL 8734d108fd05aeaf7a52b1d48a7d5050f5959fdecef624a9f12c029f37deba5c4f0b50aee18bde7e13acf938b74139af13f23a40249e5b48a467671ba028aeed
-DIST jdk-8-solaris-x64.tar.gz 97679847 SHA256 5cb83821b8ddf5f6baf0f5d7f6910a977db2f3a98ee3d9eb77cb6a38d16d139b SHA512 9d21cf2a41f911f8dad4304b5fe32bc599fe6edc49fb47ed247c31b40f503c99afb26f8f1a175fd6538e0e3f47b2593d6acb6ae44ad8cd1954d0016a804d6990 WHIRLPOOL bf7dd458db4a24d34536dddb8c978564d92648dcd6a2687b1d6dfeee9d1fe024c85b6b6b683731d0d99fae460a71db51212f52f8845a2413d12cfe753a6a98a8
-EBUILD oracle-jdk-bin-1.7.0.51-r1.ebuild 10006 SHA256 63d1276e673ab3f0a41f0e98ac73c55c329ae3c2d70a3c3597699320b9462a75 SHA512 ed37835302f60592e41ebb97e22e65226efeb7f95d0235012ba568c3abb62372f764c637bf95749d5d7188f44a43af7c0446d689085400316b7e4b85a5bd548a WHIRLPOOL 6d0e1e256c86c332f474de9d80416c2c20285b0b8d6f55f3d00fe6d70045f7f2aae921e4e09dbd2b879cdeaf8fca4db6d3ed401313bcb40b3bbf362b283c28da
-EBUILD oracle-jdk-bin-1.8.0.0.ebuild 9507 SHA256 aa198876b2d08b4260f1cafa96964b597342fe9a2aa485d43fe3c1655ab969c5 SHA512 382c7635b384493981d9ccb30808e3384c872d24d40372d7225a23ddd106b0e50532eb42b1f26cd750fad9226186e3c8acd8a935b3808b5e34b6ac24eda7e140 WHIRLPOOL 5bbf879a6143b04287140535f861d5fea0b32e4e78cb2d55087fa3658280bdce905cd6b20f8554a22271932177976efa086071a580159648f6e828be045b7e91
-MISC ChangeLog 9815 SHA256 7bb4f7d92c210eae3b0f395e8f3cfee9a4e38afb40a19df523fe4cb20d98ba36 SHA512 0d418335f7349061be28c1a8e1fe386d5fb3ef0ae20777d0a512db2cf2e116bbe24e4190df719c33f914952b8ef596d77eb501dad059471929a2b32126d5c28b WHIRLPOOL 5d54026f2078cb1c8fc736febfc072c9134cf36e343b81e90a3f90b635fc829357625e2cded41256f8804b34e3d28d5cf97dc4b8dd3f2cccbca3f13881ba3de4
+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-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.51-r1.ebuild 9905 SHA256 d4814e6556c7a418d49be46e152d3ef10a34e14ee0e5635c1bdad5dd765913ec SHA512 4d9999356f90642c3348d7a613e3e49233d0e01055454ba5e1cd1231870ef22bc8f55f306a970470c762e41b4c7202be0ad830324ad23fbda435fa030223d396 WHIRLPOOL 61a73da904bc167f23de8003bc02673000846c5c7f8f377a1a8b0fc8484ab85fb7e5778290c1c7583636cafabc8ae089747a18b509acf87ef2488b60dda7d208
+EBUILD oracle-jdk-bin-1.7.0.55.ebuild 10008 SHA256 c0a38c2d0bb3b3219bcb32b7fd45e6b3fbcebd0362adf543156f8272aa9bbcc5 SHA512 d6a43ed7a20ce92de40146e8713bc04e844a32e54b2be6f0766f1e4ac236c9853d1bebb6046709df0e3324fdfee78ff499a785d13dcf8371a348cac0c6ddacf7 WHIRLPOOL b770c34f97d8fc1c8f8d6f287fc78e1a3aebc1c477b5520b489f487a680c5c1dfd65d13fe6a0470f4a203a2a07a75cd8f4906bd871e0edf00306dbe706f4469a
+EBUILD oracle-jdk-bin-1.8.0.5.ebuild 9759 SHA256 f570f08a3388b65b4a4fcfe00ad1a5aac488e945129c3b5686781e401a641031 SHA512 4b196b758ccb82ffb0e084f4a5317e1a762997262268df3a50d4ce0410208e13692e1eb5938a60962571b71699d5333438afabd061a43bdc45182f8b87169e29 WHIRLPOOL ac14bf7cbaf8a2c0fae8804c3f746b62e467d29a66f32a8c3f17d8f9f199f5d0e19543981497adf9b650fa3bce7eddcca59abc5621c2bae8b8f87a100e57b7ac
+MISC ChangeLog 10245 SHA256 42939c95d4538160b2e3ebdf868192cccd2de6d36fa4c94e47170f45912ee795 SHA512 7394d28b59d12715558553d8707a54795b3b03b7369d20357c0feec4b2163eb13559c462d30eba3edd8adfcd5a938925fcd08a9a94bcd565d5f6bd82078d5e5e WHIRLPOOL 6319839517bcf22ea82cbe16fcd93fc7f9a8c0a85ec0800b74c3560653d78aa9531b080dac240a42501f7d3a2e708b2ab9e2f1281d37e660cbce47bd4e51555c
 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTNY1mAAoJEJWyH81tNOV9+VoH/0u+/6+X765fh+UgCMDvxFf0
-v5BjMyHVKEaPZII4yWdCk3t5xZ2J0WoHh5TunhSy4wenc0F4DnLHTvoD5erDWGiW
-FS7DrCgtHGdBZkrhzl1xCuvTE/vk6sTtj+cKqZw3/W1KByb201GnofEzdivOCi7f
-mXVQGmIJfgR3X4Zeb2eS57rZtsIaOap8nxMCMyHhcGSfXzUXBVVgW/JzyD0GCe4n
-7m81J33FEXCBfua/ofrRyOhaNQOhcKSkmxJX077luL81byqdkf052LBQQmCK/lnl
-sykWBcDbI2yPGkqpwTp/jA5KktFoaz1uFQh0lzbgNGP9sqm19lMR3kVLoUUXOug=
-=W71J
+iQEcBAEBCAAGBQJTTkXQAAoJEJWyH81tNOV9+FcH/Rdn5pTrv0LHYlx81Sjb2Jzj
+lH4eFWQFyOu9RcCInkwhDfIx+Dt1e6XVx0odz0GAIHjS0nBJaZOjkBvHEfU8oHgY
+X9ljzeAXC0v2JTRknPdU/JChwr8929LL49VM2fvwm5wGlQhTtoP2bPCnv/rSL6Y8
+tig/YUhoNJxU1QVH6kqduzfkq/A5eJbT+SdNgqbrlo7qMMWGnu8cam1bJWRoLZ1h
+nHH6e+t5D6gcQqlSzrBI5O3EvEaq1iAH9yxDIEAMRFP1AEredR/PeEaY+85NReRE
+4o3DL4hqBldNe6/IVEgXeNAnZZowv7PMF8AgMw+JCGF+Jf+rAMigOfvwt1dwRO8=
+=vTMf
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.51-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.51-r1.ebuild
index 1a958d0a954a..d0ac65475990 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.51-r1.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.51-r1.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.51-r1.ebuild,v 1.3 2014/01/25 12:21:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.51-r1.ebuild,v 1.4 2014/04/16 08:57:26 tomwij Exp $
 
 EAPI="5"
 
@@ -60,7 +60,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )"
 
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.7"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 x86"
 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.7.0.55.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.55.ebuild
new file mode 100644
index 000000000000..c1794e4e41de
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.55.ebuild
@@ -0,0 +1,300 @@
+# 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.1 2014/04/16 08:57:26 tomwij 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 ~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 !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.8.0.0.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild
index 678ed48d823c..bb4a193cfe5a 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.0.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.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.8.0.0.ebuild,v 1.1 2014/03/28 14:55:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild,v 1.1 2014/04/16 08:57:26 tomwij Exp $
 
 EAPI="5"
 
@@ -12,11 +12,11 @@ JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2
 
 # This is a list of archs supported by this update.
 # Currently arm comes and goes.
-AT_AVAILABLE=( amd64 arm x86 x64-solaris sparc64-solaris x86-macos x64-macos )
+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 arm x86 x64-solaris sparc64-solaris x86-macos x64-macos )
+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)"
@@ -88,7 +88,7 @@ DEPEND="
 DEPEND="${DEPEND}
 	pax_kernel? ( sys-apps/paxctl:0 )"
 
-S="${WORKDIR}/jdk${S_PV}"
+S="${WORKDIR}/jdk"
 
 check_tarballs_available() {
 	local uri=$1; shift
@@ -149,6 +149,11 @@ src_unpack() {
 	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() {