Version bump, address security bug #554886. Also addresses bugs #460468, #475550, #553960. Drop x86-macos keyword because only 64-bit Intel is supported on Mac OS. Drop the older vulnerable ARM version because this new release supports ARM.

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

4 files changed, 215 insertions, 172 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 8d307c345a2b..fd3b5606e9de 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.97 2015/04/19 12:08:16 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.98 2015/07/29 12:48:30 chewi Exp $
+
+*oracle-jdk-bin-1.8.0.51 (29 Jul 2015)
+
+  29 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  +oracle-jdk-bin-1.8.0.51.ebuild, -oracle-jdk-bin-1.7.0.60.ebuild,
+  metadata.xml:
+  Version bump, address security bug #554886. Also addresses bugs #460468,
+  #475550, #553960. Drop x86-macos keyword because only 64-bit Intel is
+  supported on Mac OS. Drop the older vulnerable ARM version because this new
+  release supports ARM.
 
   19 Apr 2015; James Le Cuirot <chewi@gentoo.org>
   -oracle-jdk-bin-1.7.0.76.ebuild, -oracle-jdk-bin-1.8.0.40-r1.ebuild:
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index fd68263d3455..521c04b155f5 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -5,27 +5,8 @@ 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_60-linux.zip 21220772 SHA256 4963394cfdc7bc47b693353a5957a1d3b86dfff800d8d2a725a596090d7c9def SHA512 8347a7b20c8260379eceb2950d384ebfdf542df595eda18ec0e57e92b35393df37815340858a8c64d9422741331c443c5bc096b03f067a4d0cb50ec0c0d70760 WHIRLPOOL 2d84ceda852567cbfbff617181603ef8e162effaa15afeafeb756d05b831a97963817a8594a2551b0c465a756fbd9234864f79371b824fc2634f1f7bf50f6ae9
 DIST javafx_samples-2_2_80-linux.zip 21218149 SHA256 bd632d2c0f36be8bfc798ee6b78b328ff12d9b6ccea5e077dffc7a06f7933819 SHA512 00ec77bfbc7c9a9b1a61acb360b8278febd07bd16fc407a0b52ca0b694d35c79c0fb92d11caf131a8ee16238275962f6bc2e1f8471740ee0045b96bd14e957ba WHIRLPOOL b3f5032b1496b1bb8776e79566ed6a3da1dec3ab2b6d66d3cf67901bbaab5e746a1f3967af271c7b5a90b4522b6763ad7a5f172dfcf588184c5392a1a8a5a785
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-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
-DIST jdk-7u60-linux-arm-vfp-sflt.tar.gz 71112719 SHA256 e9586d8605954a10c028a260fddd91e6ec09395cd797d7b0a307d4a668d7b0cf SHA512 cc160bd4c4bc4e4a79131c3df98ef52f40a82e19361b68372f0f8a68e913598d2950a5c72ef077c67b29fdd5a0883100d8c63b2ac8785f71086f1df157a24ed7 WHIRLPOOL 4e5a1cf4f5341ba20af8966df1eaeb82f7dc7325e768fe82d6f8cba62208d5d9fb5dc7c6c58ca3a50a3a446e0b1375850828e6d89eae3f0e3ffc0c03d74b649d
-DIST jdk-7u60-linux-i586-demos.tar.gz 21177426 SHA256 b06ed999dd4e2b414127b9379b90582718be0cb4f3d69f1e802aa3fcc4620f47 SHA512 40d71dc4be97a24c464674dbcb72c01a2440431d380bd46935e879ea1d0670d717a5d33be072b0228d33a56d9ea4b5f1cbf42e01e3fb45a45db5ba7e2e24c1d3 WHIRLPOOL 4592956a1a0fcebfe2e6fe804c710781ff12a93386585561a85f5895414b2f8703d80fca48fa7dc3a12d521d0ac941450aa6551ccc3106a0441540d539e504b8
-DIST jdk-7u60-linux-i586.tar.gz 143607445 SHA256 d736fb4fd7c8ef50b76411daa640c6feeb48a5c275d29a90ffeb916a78d47a48 SHA512 18eb2360c20b27ed125d3ec67258e944b6ea92e7768d1b71c265a4c09a99e1ce32f66ffd044491cd84edc8ecd67da63bc24c4bdfaf40df3fc70d87c8dcf67ffe WHIRLPOOL e1d493c35c1ce9e0990a66045ac96c35fc6e2acd4d9b3c38280edbe1ba0c8eb374d590bb63e1a811743c7d0982ff2aaf36e3d3f72dbcdf2a6fac73497041b138
-DIST jdk-7u60-linux-x64-demos.tar.gz 21231506 SHA256 4d85fd581083c19d8805ce28b90856e43242ba92d9573ad43dffeb4725fab794 SHA512 ac3b3ee3ded1bcb5d3989f54903c6979e4aa3ec386cabb30fcb52cc1a1774f11dc68f027fdcd9231835145983c084d858aedca580009c3a985604821cde474b7 WHIRLPOOL 11934ca1c327a4ade533b0479b800da6ac33b37605596c57c14eb8293635380a8a32835bbbeaf0d2654b1775cbbfab375579922926ccdaed406151e5734c1671
-DIST jdk-7u60-linux-x64.tar.gz 142362384 SHA256 c7232b717573b057dbe828d937ee406b7a75fbc6aba7f1de98a049cbd42c6ae8 SHA512 1a1398fd1da78237fd4728793e54545949d510e3b5a273f33d17ac6cedf29ae56edd22eb80c1696b4622519be7eec45a28949493ba924c555c0e6d34aa67a5c2 WHIRLPOOL 096ea206cdbc74c50eb1175ed12e0476f187c29df76c0ba896a10b441a931810acc31940093e7b0bd2c7624556ea0c9a2fec98e226542c92326851dfdd60b883
-DIST jdk-7u60-macosx-x64.dmg 194971949 SHA256 a868aab818cd114f652252ded5b159b5c47beb1a0a074cdb0e475ed79826c9df SHA512 6a5a2c92b31ccd5fe36337718fce332d97e176ae603392971421329f798418880a950d59c19c0cb1e16c16382f4dac645dcd78fe56241c80cd15799d6f0ee5e2 WHIRLPOOL c30d6f8c50b96faf582c060659017d694a208099c0462bd49e2de4ba306d36079ecc3180df581d0b268da5f0cd91490b2a6613632ccefe754aa0bf4eefce7a30
-DIST jdk-7u60-macosx-x86_64-demos.tar.gz 19833379 SHA256 a8730528c32d3fe63f70ecae5112720842a1ce8e6af886899a52ded40aed8195 SHA512 23ea3b1e34877e8ac60d5da49981a4f68fd0db20c5e1738d6c12466d823c0dcdcb2da7ac29d8ac8ebc5d9202d8673eec8d388e4d453548df5ad77cd135162f55 WHIRLPOOL 9006e619990bb269effed8d7e206dfcd2cf73a85e1707ae45c25f0b72631b3d95e137838045d7df3daa590067fc489c66564590e64b4e61c394f26a490528d45
-DIST jdk-7u60-solaris-i586-demos.tar.gz 16769581 SHA256 59c9b617e4bff0efe5e536a308b1e9b6a972000f389149aecc5e8726b3beec74 SHA512 daa8e21ae82cd8e8149d07246495691a4b5ea54a1709657eacb25485d9961abfe0a357a7097a83ab756e39b96fdcce8f3642a8f7c4408455f83f4fac07acde01 WHIRLPOOL 42d3211d428ecfd41a14a0a90989ee389f1c6a18b96f0a7db465f3dd7b459a88cfd906b7190e11de7fbc69e5e293a786618a781d0815ba4065f229206af715b4
-DIST jdk-7u60-solaris-i586.tar.gz 100143980 SHA256 0681fc539965f0d9e35c8aa29f7c04a1583e48f073b5c264632a5f013aab3510 SHA512 fe75df42557eef1da551908f435475ff0ce5a83a0eff68f27cceb0d5c070ef6963a40c94ad53aa714a8fb1b982fd874aa34ad62acf2ac13df547b9b9190846d1 WHIRLPOOL 0d9ab14f6dc9d21d4bb19f5ea842de4322c8a85773a4b94f4798459077e91c551503149bae3870a3fd5d71b9c9d5d720ff505972cb851df9c6ac8820685b7217
-DIST jdk-7u60-solaris-sparc-demos.tar.gz 16758671 SHA256 afb973eeeff5cec5d742dbf52908413d31df5c4aebf3c4e0772dd672449afef0 SHA512 282bdcee11bdd37db94def6a74e86fd6e29c6df17b6df2b73b431d8bd74806a5bdd07d59f2474c81ab0d9cc6a84db86031689f9c94b3b07d4ea2ed256dde0c30 WHIRLPOOL b1abb7d21676c4427cf48af697eb27270d1ea8211b5b3ab0398556d41c7280d3f9828378d2405314fda08c9a17e26e3038f83d540261311f4654f9fcd4d79f68
-DIST jdk-7u60-solaris-sparc.tar.gz 103353391 SHA256 ecb7376d17313aaf2f3682a24585664f3262fb3ef059004355f92c338c21d656 SHA512 e8c65d4df6d636317021bef2195f074341291e33be34624149b8a13322f404f9bec805fddb73cbc65f4d10d3b8bd1410a5dabe07c4c1b06d889a92afb18a6a60 WHIRLPOOL 5372d5f2c71e4a227940985534e6efad615b90b5ab5231332ec9f5f65a742b3c81f98b05d63063f646689ffc97cd0809c62fdf1130fadbc96ae922b5e4681846
-DIST jdk-7u60-solaris-sparcv9-demos.tar.gz 905717 SHA256 4b3a6bc11b198186061523293cfb438cff70fa2a76186a6a44063cd01e4dd730 SHA512 ccf2cec9a2cc89d20cd3f0e9cdf1e8ae80e1a1919a26284509d58a5cb458e22d04b9b56ed92ea4cf54fa4ea144b77d66726abc52a4e76809eec5c12d060772ef WHIRLPOOL 0b54e62600086310066b0abde3d7fdc2396648d1a77248e29f77a083fb0f111ac4bba2583c8b47b5e88a041c06002d5e360c6d41cc5896ddff4d72a6f8f38e98
-DIST jdk-7u60-solaris-sparcv9.tar.gz 19291928 SHA256 709d2cf1ce7d9aad674561182bbf8aee6a8f53040d90e582b04333389c5d1fc3 SHA512 3f46b056e55cd7adafa3585c1aa8ccb90dca9b16377c08ae207c9c7f3ac63621477f372515819b300b6ee785b2f73d38c673c3c0d82d16969f8089f1d0c53c2f WHIRLPOOL bfdcdbcf9d1da435aa97ad4630395e1780b1957c52d4df6c86f168e9a903c514ab380615ab46ec86e07b6a00c0f94f6e1783815ab8da3d108da4b0f8f7bea409
-DIST jdk-7u60-solaris-x64-demos.tar.gz 865227 SHA256 ae6e627b381615ae117f756117bf535ab6298bb04d181c597bc6566e19b4c7bf SHA512 27125b66f0d55cafbac1b02384dce2491dcd8a8f3eb24bc3eaec3612bf237d6c4b3d814d9d98de1e0c3a123e586029a81ef3058c577ad61785baa9120a69ea17 WHIRLPOOL 15a02786a8e12f1f5e761f784fc3693d86387848569057d248fb37403e05edd43941f1f50025a03feb0b454ef2f8bf5c8ddf5133081910b8bd673d601e03fb2f
-DIST jdk-7u60-solaris-x64.tar.gz 17140189 SHA256 8c75a6ba14bf446a9707619c364ea544e983a91fdce9b41e75ca5f33f75c9278 SHA512 db6d9dde2e73a8348e667bfc666cc2c1a052d307440b3c4b5f7b0c0c0568212376d92d57ea8432bd2f4b8e0d82550e9b8b18632685f7b8c8c0eb702543b06cae WHIRLPOOL 810fc3eca4f6ae9f81812d8b26864096be8d7c5f78f88708dbba03de0b0b5199eefd9d15a90bcc3aac1338094804eed3205ef28a8847912c34c4710152aa5093
 DIST jdk-7u80-linux-i586-demos.tar.gz 20827120 SHA256 27b7c4955d989c9c34a6eed9e08f1955e01546146ed6fb1223f04ef33d143900 SHA512 25fc9ff9ee993ccf8d4caf0701b1e8e5ffdc78c68b0e94a93eb49f3cbc54f739a1699090e675439df9b63338974f5b9a04f6e33df59f6193b42a87a9a437ff47 WHIRLPOOL 25d8ef0b3205ede51eb2ba306d98d7eac91e06d0ca13b771593f343ac27df1d085cfd65a98346c63e76498eb19c106302407615218a907c8f6ea2e743eae09bc
 DIST jdk-7u80-linux-i586.tar.gz 154850445 SHA256 9ded1318a7223cf6e09ac4b6ee4db1f4c5d1aef1d3d291f6db8491a32eaa57ba SHA512 69e2ee7964b18e9e8b57db917b303eb9ea629c432300fe4749177118d2f5c365e72b976649e21354643fe4957120a2b23de025bab4dc45977837d4847a61ffb6 WHIRLPOOL 2d549c7971935f79e536de8bb0a5fc2547a8bdf039d1617a73fbc0ae222a80422fb336105c3362521efb376aa2ea6fa8c3a0521044785bfc9dc061ebe694628c
 DIST jdk-7u80-linux-x64-demos.tar.gz 20882163 SHA256 09c55d37508ff6c4b9ebac34e8d5fb65d7ace5cf45d5074726b413e8aa30dfa1 SHA512 2c24799ca0f14d74053e504cee0a9160472fd7e26e1d86d4eb72b190ec934b041bd72b5ce77f44bdca4b7fe8d8104515572491145f2f14e6d295be0bb010b2ef WHIRLPOOL e9f0312261049a5610ffbc64417f41025f36fc0ffec0f40dbcdfd391a3152f1c05ef80d584671d46fe26f86846825ea66e91090159e79a5192f11c695396e8ef
@@ -50,27 +31,39 @@ DIST jdk-8u45-solaris-sparcv9-demos.tar.gz 9763046 SHA256 d1956f094a56198f0fa20c
 DIST jdk-8u45-solaris-sparcv9.tar.gz 97416052 SHA256 594cc2f3c00e783e7bac6ce2cc292f8fffd7d3508b521d156bc620a6cdb93f9d SHA512 551c8ae4efa24b837ee01ccd15156248cc7d4891ec0b95847a78b6969dfb84e44c068caf6ba6eb1130677c8ed14abd81b9dd82517f00d855c2cceb33e22045c0 WHIRLPOOL 56a44913b447b123232e09becd21d83c95f02d4020af582ed20a9c1a7fbed7f9c3a564b74e700d3449efe2a19c5bf3d7995fad3534ae5d59c24c25154c2443bc
 DIST jdk-8u45-solaris-x64-demos.tar.gz 9716106 SHA256 736bcb3ec38cff5977c4bd58794d6b846e57903826a0404d3615ac3ed0e813f2 SHA512 2b0ba65017fa888dcaf237bb29876164e7b939ae70fe7a5081995b4f38e228fe31fd349360f8f8c25d61d6fce8cacfa54fb725265f045b43a20c8fb5366860c7 WHIRLPOOL 0162e96e28246e38a8e2e9dd5b250439a4f7d863e87d984e9091181171ac5914435852c3373add1d181d0dd49aa79945a391a14356ceb2c60192dc20b1e7ddfd
 DIST jdk-8u45-solaris-x64.tar.gz 100537403 SHA256 2b66ac9b7eef7087077add605a1b94364c954b007587b44641c4b6725669fe43 SHA512 cf6a9303e81a1c11a5994d91f21bd05e0f9057587339c5d2366f19f67f90f08c2afc92bb6872428f916498c95fdf4ef27da8f182754c1994044b7981c2990a80 WHIRLPOOL 5c0b003d872e2e0e9524a38181cb38ce974643942c4759a639d2a8aae97bba62dc2c432708368de81722dba7593bd920ec4841905dfbe458f1dc5d46e3a0c51d
-EBUILD oracle-jdk-bin-1.7.0.60.ebuild 9910 SHA256 ba9f626a5e86a9860fa995debef6c60b5a0842d6bee5384f7bf64112026fa232 SHA512 1261a52e8dfb9112dab4e5f03b47cdb5552a99fa8929db6f527f937110320da535fc97914d4be655b78b64f82c0c477ab6bd5bb273c34e1aa27a0e289d8bcda8 WHIRLPOOL 0a3424b4d9cc3e10c5649bd3e45774b63b9acaec6cf03bf5dfabd49324487d9a3fba9dd6bb572167ccbf5495a391aeff14feb629fc448880e0315ddd91478cf8
+DIST jdk-8u51-linux-arm-vfp-hflt-demos.tar.gz 10401432 SHA256 3260a78ac9bfa216443087d516998270716a6167612ba57759c7e8616aaba945 SHA512 b3177c31efbb4fa5171fb89bc1488cf7cb954919e129b70afbb7f374479f3cace69e9968767353a89002581493460e44c251df12174d3f3e20aa3ebc807dddf0 WHIRLPOOL 47fe7a61be0d85661cb9d8418ca5d20542acb9563fdf6837e0a25132824ed8c891ad0a7beb4061acd671217768a9223518874fbe599581bca0a0e6bf1f6dcbf1
+DIST jdk-8u51-linux-arm-vfp-hflt.tar.gz 81593057 SHA256 2a6644a4540c8f47784daf8afcbb405a03e686720e4c9eac6584253a55def0c7 SHA512 9fd811ab3af7144436fbbc14e914f9313933e0dd1aae2eb35369ae5b291e12a1b9d9236bd6921e7e8e59f8a24bc65ebea4624079bbaf179ea821ba0908a5a975 WHIRLPOOL dbb4674237da39f0d86ea261bb48d78faa9ad4e0a3b1a8cd8a1ffd493202cb28c54294d7a82343b88727640cbbc31f123b67eb4926a094191dcc3653a575baf6
+DIST jdk-8u51-linux-i586-demos.tar.gz 54797997 SHA256 08014bd53b4519890e7b82cb3d1b69c959e8bef08cd43cfd80b3043e6263d136 SHA512 3aebe35501937658ecc78b4d4e4268de8dda8e37b817f4f22e2b0ff3667da3dd29aa95bec241ad9b300e4db61d2329b4ae5c498f34a00efaf1d62164a6b92785 WHIRLPOOL dfded6fd17f18560cae1ea6d08d08ff8508c0ac8f07740b96d6747cca0f60a6db04dce934dce3d0cb3650c2d34069569805c892d41da4a95b7d5f3b8b7875c31
+DIST jdk-8u51-linux-i586.tar.gz 175056840 SHA256 3fd43a5d88ea759bf12502980aa956c683d9df058ad25a94914c5890807e9f2b SHA512 79e405d07dd8a0556f336807fae951608665a33d4a461ea0c103831cac2914b7654db6c6dee479542155c379e9fcaaafa763dfe469dcf5ae48a1dd5544b9a1e9 WHIRLPOOL f1a03c11f694cc29199ee1ee9a72d7e617195b8e0f6500841023a447e8fb4e1df3321099dbae2b51df9fd2e72924758499d6bc7b1c9fe40a05ddd11ff6329e67
+DIST jdk-8u51-linux-x64-demos.tar.gz 54852711 SHA256 7de5f948bca36967a85fb8831bbe3a389634064c7f3cfdd476cd62dd268b3591 SHA512 33adc18b239f9a7973efa892e7d61d54ced1dc271a2dd27f6ab7e1e89626f061040639d953523b10070137a66bcc85ea48289be15f9e82ef6500416cb2f2dec1 WHIRLPOOL e3fd9e12a9ef832f4a2595bacb578821b56878b93bb50790c28c4c9d78e35ec00b1a9e95a32af3e1e2338b0839564749cd1c4d89e8ae1c4457ab22c9118db094
+DIST jdk-8u51-linux-x64.tar.gz 173281904 SHA256 d7149012cc51c2cdb8d3a1767825e0dfc36ca0419c3dae56d993cb2732cbeff1 SHA512 ab4559fdfe7150a2e3e06128b2e8c2621c078e8a13290cf015bc0dce3514e8881feb178672d9bf46ec9e0f6ca0ab23f712278db39796515ed55594af552a1f9b WHIRLPOOL 49920b8a9b04ab6c1e9d40f332e4079e3df5868dfacbcb575ff9844897a48f836693ff928a56119fbb249c0e09e9aa3e81c1d8c998d3c18ebe2de26464931449
+DIST jdk-8u51-macosx-x64.dmg 232874868 SHA256 85ee66d1fdce5244afcbfbfce8dc90582b8c7e3ec8ab4c21e0f4eb390af97832 SHA512 15fba10d1fe0eede89eae3a5e184ff9c1048fe48538046b527f4e78bd0a6285bdbf858edeb4613707d9ccbb7ffde5c197a9e80920cabac149488646965890199 WHIRLPOOL 86ad3c0ea8ab9a16c17084070dde8e66dc348a17997e6ce31d25a65dbce7c1dd935ecd91ffad6e57780be9cebda128427b413594c8f58e61a5bf2f4e57529cb4
+DIST jdk-8u51-macosx-x86_64-demos.zip 55361655 SHA256 e4c6ffe2c188b25e615fe5abc953ea3bd7cf7dc9cb53c5b7c636f509bf84d429 SHA512 f72e84f1cf14a3cc2f817599d5984385dca928e1384a7eab9d9d55900d6fcfcc6d77752def13bf0a3c9033955672f9ec82d632cf4aea6e64329fc2399ca3b101 WHIRLPOOL 75bdeac4264aa404b6c27353893bcd5112ba2cc96abec64bc97e80f55a0c5e2b919ef25f2571f8b87879d0a1e6ea0ae6d64e51d5a54fca06394059d2fd42693f
+DIST jdk-8u51-solaris-sparcv9-demos.tar.gz 9787771 SHA256 5c4d765478be6b9ede7932b25f734ce41d4dfaae76cd3b71604c7bb047a56ad8 SHA512 8d8785b118cac13448b7832a556a081f0aca7fc19122e702c721b2a3be57c6b2b27e52c1d2270910bb853de9d53262bdb91fba43a40a6a8481bfe5c26099240e WHIRLPOOL 82a72e0ef11aff33d75fcf54d9fae3a7e417b16077f9fb104ef23b45a4018b2edd3c7d77fb8888e3e4c7d787db14db29354886dd209aa9b7427e899413bec71e
+DIST jdk-8u51-solaris-sparcv9.tar.gz 103599046 SHA256 4bdfdae59ec62248ed893feff2fb4be8a8639330599f53f5b03208349ae91513 SHA512 68a95f498aabff65489bd6f6756af7737f408cc0b7253ad9bcd9f57ab5f7a130b35c251426f7dc256e1797a70f5152ceea86a4ea46749375fb8acd51e4309601 WHIRLPOOL 2a690757a673ab5958057631fef7efd748c2c456ed978922220322a5e390aa6e7016a2d2438053f12bc6054c45288ff4722955fb9a1722798409085152d004c7
+DIST jdk-8u51-solaris-x64-demos.tar.gz 9759566 SHA256 3376f1083841bd376da78fd6f3eb4127da4e9493d6af8f7c32e1eabfd8cab67e SHA512 a3c5efa70f75aff606ddcd1f52260e71828ba5ad8848fbf6f1c5d3cbd44f4f0a0a9e3e5576a1d68735a4339ad6e43124049a06ac62c6718c5a2a8dd56a1af766 WHIRLPOOL ae710e2cf1e328647124b385d7b96ffcc5d9bfaf159976163c1ab5075637eccbdfff8b9cecff322ac40d5c717403f4f3508b3574d91a761b2122674bb2cd0cbd
+DIST jdk-8u51-solaris-x64.tar.gz 101131923 SHA256 7afdda5f4310fce88e68f9c383bcc57451416471bb3af00cd1dfe323f2440932 SHA512 d08b8f4499f448f4e495b226bd88f44d9a4fcff69788e893a40d1de5e7e16970a655955c6b52d94e1604027d7fc025b8b99ef7687bd3de1419937b00813f023c WHIRLPOOL 21bb40348963034a59ca25004ecfaa4daeed4a96c45f1060314062cbccdfa48c2615c54677c8a28cec492e7ad2b7b8e91c9e1e212ff239cd3d995c7d84596e35
 EBUILD oracle-jdk-bin-1.7.0.80.ebuild 10594 SHA256 fa213d4bc994ce89cf65d167bbebd1f90c7fb442df0ee8e1d30302b452384fab SHA512 1d84b11f15df444d888352408a63e46ead42322453207d1635392219e1bb9441db424856f9ff25374f7c5521672da60f11f7b65939241058cc934f6023c5f96a WHIRLPOOL 265b5fffb6b17e60402d7d0b5d04d1b14a0e6d898fc4c5207a05cd418447b4a0c08e912179faa48ef6af9be866e814e30143e386e63217bb05458a02d6676666
 EBUILD oracle-jdk-bin-1.8.0.45.ebuild 10469 SHA256 d2e3e37babb45f5455c889072bcbef43bf77b4264afab5746c06115239adee82 SHA512 00a3765c24de23b6f48d465695c294d2cf7d0f1d98c41a3389d14121b32e46189c74dd80c21013831004d3d97bcaeaafa97e94228f9f9e15a1f7777c5a3cee28 WHIRLPOOL eef576b9812fe9e244180b70bc965b5fd69c37f34cf71b76143efd2157aa870c7415ecf0cd6acee5e686d606e4d1135ff7990743d4a62881c614181394585725
-MISC ChangeLog 16995 SHA256 d7a46601a4ed1995d6e58dac8cdc18d474bc75cb695e45c661ea666bdea067c5 SHA512 1b006b0b03ac686fce9cf1e48cabfa8642f7db159352f78e76eba95b986e4d0b07a0a5e18613867c6563cd397eee3a90ccc8beb14c7cb08453381201502a772f WHIRLPOOL 310bacbc20cd4aca0cc07688059c9fa406daf48bb98fbc2f955486c5ed430d90615f44ec5e6720f64891a5133d5e8f950de2ec12a60ff3498169b6f589154200
-MISC metadata.xml 582 SHA256 2115f948949343a0508b93b9664bed54d6cf051f70f26b33dd5a759b556b03a7 SHA512 4afb2242de1f65646e1fce1e46f64b4ba34c507f9eeba967127d55fd192f104633e3f126c1ce99834e7d154eabcbf6db8c1442649001734c58156d55c572c9cd WHIRLPOOL e6ea5237dd342d2acc868eda5a564c3d48f1114359763cb1037e408ff98555213bdb2c555cedc6d0ec5de3f02cf6caaf17c8f1562ccd6cb4f8b4cca562db5316
+EBUILD oracle-jdk-bin-1.8.0.51.ebuild 10639 SHA256 142de8d213ac27275f233cd93ab2f796923318781585c7dc79f0b19f022f0002 SHA512 6f0d47ea9bbb004a76a348023c42998ac740840c602a012535cdb3d947b80d97be31ae399b0826b3ddda3e002dc5ffc629a75a88855023eaae1bbc788bbee6e9 WHIRLPOOL cd6f19f97601a8d9f131c5ef9598553b1248af936a124290526fd8e48e72cd957f1dd901193b1f7ee0e5bac19e48a466fb7e0992a33929f1cdc125a2c1765c18
+MISC ChangeLog 17419 SHA256 45a32d657649ea9eba7601913dfd7c64151a808d29eee6540f95d0fb61d68f0a SHA512 4cf2e40424176cdd8761c142242f5e3d4eb108a62a0cfc0ad8dd54c5aef175896899f23d5fda57525f925d0d5e731fb9fcad8054d1c8d7562efba16100b0bf16 WHIRLPOOL 026c7c4f91ffae0d5ef9a73c177c3a76c1a703191e641c1189e9fc30410c641908af649ca9427b453cda6c7fc8b4f20b785f1520c2ba890a2ac294992861c513
+MISC metadata.xml 758 SHA256 c6602d5a4aee33aa6c7a1860a4e20529d608bd7a684e6a160968db50d42c36a0 SHA512 8635e77032919ee39267ecb9954f191960af41af22ec80d69184879b34c7dfc298394f83dd64ed5f5765aba55122f55f7c5b42b217451b09fcc5faba7ecf1e85 WHIRLPOOL e215264868fca9e68e967b6d7c62b8d262411737c65df06e3497c123c59ecf84d2757c951e3816046bf199c9bf8ffd2f002477ca75a5e45b7cd4cc596fe9d04e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVM5q4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVuMufXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k9fAP/ikllq0OJDn3tR9GX0vcqth5
-EoHqRzDjneDdeM5PP0tHgTdwsux/Il0sLU5Cbxx7368scaqZvkg5xa3bd9TbiJHm
-HLAcDdaVxqgLeLWqVZgXjGGWPAx8SnnTPU4siMZgn3y55fT5ugZpxufzpxxWnN6v
-vNETPV2Cx5Mw3MfDgk/8ZaVyLIttRzFPs6O4FQeq5AK2FxtuRxpxxP2jUruKVaOl
-IC7tCAay/s1zeT8Ef7pmaWffiu/KLEXzxN5H4bzVTpxOXwPY7juYGc2oBj+N6D8f
-yojE+UP141TamdL2WLYUUXR+NvGLjju0YVy3FJT50Z427Ah+iDjI0hQyHSoSfIjR
-1jj7U6dE6j63i07Qp57Buw5kIFFHo1HP5FUWtV7SU5TXoKCVRqPtP33NOCFqFbzC
-50lBCqJID2I+oaEIsUOPXuuA/VPZmDK+YIrb1b75qUI4LQM9cOEehmNFdgMgIqcs
-L1fjBvOpbBRfWlzjPOaXzq7mEzm56sBzfYDpoPSTcU91zBbeGUgK4bi+QdlCgmRN
-tYyVzaQiLNjr/UH7/xFFWNptDMXUicsHjvoWVTHAhl2iFPGYuc3YHgG8EXJUkhjI
-NPPpHwKxuDV7yYXktd/ErNFLEdrutdlwx56qP+Ss1UbosD14B2Py5P141z8cpcvj
-uix0ABETUCMVQiiz06To
-=N2TT
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kN7IP/0UThraifW+vdODbUS9FDvZr
+DBxG0qfWRVar5gX7XHyUDl08kdT38ZcnR/PjqvMqPzCENy5A2wwMhSXb5kd1iZrI
+XCBBFv+6QdgqvTMlDyHx0cHC20B8LyBJjaJkdVkY9KXLWhEf4MeAAyv+/4emJawo
+A1YZ8rIR4xzIFeo8WCbs75H5e3JnzvuBYZfh6jR0tVKHthvNCYhzuMxXTgJ1HsI5
+z/MkQDt/BCJyPZnY/U0FWUga4mVDsSknEGP5KhEa5fGS5qGcSo7/OgSjA3fsLo2T
+pFKWr6UUXCta0IcYEAqy3QwOjqh11ReBbQyUcBX5HJdK250yCeORquJz9SZZni3G
+0xVFZy0/TUaJ6go+NNsru/IXvRAGOjU0quNs4ymXDId7F6pvcZjcDI364dXNcUYJ
+ZRP6hGrb2L7jftdgyF34Pz4fy4VEJEo02eebcoBpgIlA7XE2mnvIFtUifW6c4hgY
+Q1JXbX0cgjvQvro3JYOv/R1mz9dHdERNwm3Ct7Hus17y33TglmrVD32Bvu9RK37u
+tb+f4Vf1HjYogv/0OAPjOcSKM3JW3r0WKg62asR+ZJxcVPlVFAZ8p1h1SoTjJToF
+dJsHTznd8b5xnxJbnz1BSaVEMmEhNNm3JONpqEHFKwU03Ao4vICS4auANlaEWv6T
+A3tph8dE1QZ6bRjB+nmd
+=vTGW
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index 01f0a3e330dc..d95caa103826 100644
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -4,9 +4,11 @@
   <herd>java</herd>
   <longdescription>Oracle Java SE Development Kit, Official Binary Distribution</longdescription>
   <use>
-    <flag name="derby">Enable Installation of Bundled Derby (Java DB)</flag>
-    <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag>
-    <flag name="pax_kernel">Use paxctl to mark the JVM binaries.</flag>
-    <flag name="source">Install JVM and JavaFX sources.</flag>
+    <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
+    <flag name="derby">Install bundled Derby (Java database)</flag>
+    <flag name="javafx">Install JavaFX libraries</flag>
+    <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
+    <flag name="pax_kernel">Use paxctl to mark the JVM binaries</flag>
+    <flag name="source">Install JVM (and optionally JavaFX) sources</flag>
   </use>
 </pkgmetadata>
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.8.0.51.ebuild
index 742f3552507b..c58873efcbd5 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.8.0.51.ebuild
@@ -1,55 +1,53 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild,v 1.5 2014/07/21 19:17:10 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.51.ebuild,v 1.1 2015/07/29 12:48:30 chewi 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"
+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 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
+AT_AVAILABLE=( amd64 arm x86 x64-solaris sparc64-solaris 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_60"
+DEMOS_AVAILABLE=( amd64 arm x86 x64-solaris sparc64-solaris x64-macos )
 
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
+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_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_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"
 
-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"
+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_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
 
-JCE_DIR="UnlimitedJCEPolicy"
-JCE_FILE="${JCE_DIR}JDK7.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}? ("
-	SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
+	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
 	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
 		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
 	fi
@@ -59,43 +57,70 @@ unset d
 SRC_URI+=" jce? ( ${JCE_FILE} )"
 
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.7"
-KEYWORDS="-* ~arm"
-IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source"
+SLOT="1.8"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
 
-RESTRICT="fetch strip"
+RESTRICT="fetch preserve-libs strip"
 QA_PREBUILT="*"
 
-RDEPEND="
-	X? ( !aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	) )
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
 	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 ) )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="jce? ( app-arch/unzip )
+	examples? ( x64-macos? ( app-arch/unzip ) )
 	pax_kernel? ( sys-apps/paxctl )"
 
-S="${WORKDIR}"/jdk${S_PV}
+S="${WORKDIR}/jdk"
 
 check_tarballs_available() {
 	local uri=$1; shift
 	local dl= unavailable=
-	for dl in "${@}"; do
+	for dl in "${@}" ; do
 		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
 	done
 
-	if [[ -n "${unavailable}" ]]; then
-		if [[ -z ${_check_tarballs_available_once} ]]; then
+	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."
@@ -109,6 +134,11 @@ check_tarballs_available() {
 		einfo "at '${uri}'"
 		einfo "and move them to '${DISTDIR}'"
 		einfo
+		einfo "If the above mentioned urls do not point to the correct version anymore,"
+		einfo "please download the files from Oracle's java download archive:"
+		einfo
+		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
+		einfo
 	fi
 }
 
@@ -123,101 +153,82 @@ pkg_nofetch() {
 }
 
 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
+	if 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
+		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}.pkg/Payload | cpio -idv
-		mv Contents/Home "${S}"
+		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
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} 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
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
 
 	# 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
+	if ! use alsa ; then
+		rm -vf jre/lib/*/libjsoundalsa.* || die
 	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
+
+	if ! use awt ; then
+		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+		   {,jre/}bin/{javaws,policytool} \
+		   bin/appletviewer || die
 	fi
 
-	dodoc COPYRIGHT
-	dohtml README.html
+	if ! use javafx ; then
+		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+		   bin/*javafx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf jre/lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf jre/lib/*/libavplugin* || die
 
+	dodoc COPYRIGHT
 	dodir "${dest}"
 	cp -pPR bin include jre lib man "${ddest}" || die
 
-	if use derby; then
-		cp -pPR db "${ddest}" || die
+	if use derby ; then
+		cp -pPR	db "${ddest}" || die
 	fi
 
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+	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
+	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
@@ -229,15 +240,19 @@ src_install() {
 			"${dest}"/jre/lib/security/local_policy.jar
 	fi
 
-	if use nsplugin; then
-		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
+	if use nsplugin ; then
+		install_mozilla_plugin "${dest}/${nsplugin}"
 	fi
 
-	if use source; then
-		cp src.zip "${ddest}" || die
+	if use source ; then
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
 	fi
 
-	if use !arm && use !x86-macos && use !x64-macos ; then
+	if [[ -d jre/lib/desktop ]] ; 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
@@ -256,33 +271,56 @@ src_install() {
 
 	# 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
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
 	rm "${ddest}"/jre/lib/fontconfig.*
-	if ! use fontconfig; then
+	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
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# 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
+	if use x64-macos ; then
+		# Fix miscellaneous 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
+			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
+
+		# This is still jdk1{5,6}, even on Java 8, so don't change it
+		# until you know different.
 		for nlib in jdk1{5,6} ; do
 			install_name_tool -change \
 				/usr/lib/libgcc_s_ppc64.1.dylib \