Security bump. #438706

Make ebuild more resistent against Oracles whims.
Use QA_PREBUILT instead of individual variables.
Fix desktop files for newer standard.

Package-Manager: portage-2.1.11.27/cvs/Linux x86_64
Manifest-Sign-Key: 0xDA575EB7

3 files changed, 270 insertions, 5 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index ca8d2d316b76..04084b17a0dc 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.24 2012/09/13 07:17:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.25 2012/10/17 15:56:09 sera Exp $
+
+*oracle-jdk-bin-1.7.0.9 (17 Oct 2012)
+
+  17 Oct 2012; Ralph Sennhauser <sera@gentoo.org>
+  +oracle-jdk-bin-1.7.0.9.ebuild:
+  Security bump. #438706
+  Make ebuild more resistent against Oracles whims.
+  Use QA_PREBUILT instead of individual variables.
+  Fix desktop files for newer standard.
 
   13 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   oracle-jdk-bin-1.7.0.7.ebuild:
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 50aeada8dbd2..c739e381db5f 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jdk-bin-1.7.env 1000 SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f SHA512 3bab31d62740b959fcf028b94d5db31f682eadff2497dafbd945aed3464a6e5dd6a6ac8b5bb62cb41c901aadefc5314f9b7fb451a46449f5c2fc818d8c88fa6f WHIRLPOOL 74dccbc5c880721d4347b631b3af9368440f20112ac1e70764ff732289c1cef24e6fb4a4a7eb3ca2f5afedab83d6db4dc324c508922de47f8f435048c4884b2a
 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
+DIST javafx_samples-2_2_3-linux.zip 20499741 SHA256 d0330435f3556ef7bf3a9abc26b17a4f98df572454e4472283c02e2676371da0 SHA512 6ccc0091da969a55e550ca475882470e52b8bd8f10c7f450a46672193550c0fc3df1b0e09f62215ace2358b4135b485af55d8d15d229a92120cabcbe82cb9495 WHIRLPOOL 74d7b6aaef1907a8833fc410b72fca8a272da1e31a6d0d03a7d6f68213e6fa402627b6a65fe2b87bb7eea7138e183efbf758183282daada5a41db44f575d6b59
 DIST jdk-7u5-linux-i586-demos.tar.gz 14027554 SHA256 cd3d76ba4b7e8c293b11810b55c70a31b97cc2ebe87e3963c0e7657e3ac52a41 SHA512 9fbefda6a29d78f294ce6aa26d34adf8eda98bf9354106222c4f432be33032d5711323e2fef81b601d63d22da28cc248a8ac4e592cc1d2c5c5218e517af8bd4a WHIRLPOOL 6e940875a44093ca067e00313ef0df8a8ffffaa936053b70444261c213a88dc382443348d2dc0085dfcf957e690b355b5b5e6be2ecc7ee4fbd70ac12788a670c
 DIST jdk-7u5-linux-i586.tar.gz 82947286 SHA256 422dfe67a4885d47c0053b97f4a56fb4dced60799a1bb82f8266b0745a7149f7 SHA512 5839a8815359383b256acfa9cb93bc1585256e761bb723aebd7545e065d737849fb75bb761061b4e6117de09a1f08ad6d90309602a4bab3dc953ef2f3f733ddf WHIRLPOOL 106dd2a13ab99e702787163366583d4a0b151bebb4915228d3fc4d8c14d806317976ab6a2ae27f973b08e77d9c64e93bd0aeb74e2eec19f5ed5777b406c9f0c2
 DIST jdk-7u5-linux-x64-demos.tar.gz 14027736 SHA256 3446c8f802f0f9cc23c688b04cc6d78ae95bdf3b9f43f2ea8bb2b6939119ac4f SHA512 75e511d69a3c618e4c8c4912e74b1b3f51318ae9aa10a056db566ba3c2e0c6e2974319ac238fd16ac290293411d283add360bffe98656d49dbde5fc8bb472232 WHIRLPOOL 51dfb73359be13b478b77c938d846e9e8adae3191c34c672fc0c249f7f2a5fad44e4bf7d724b72e33435e00d5b713f3c51166f9eefa0e1445ee6ac8be5aa5650
@@ -34,16 +35,33 @@ DIST jdk-7u7-solaris-i586.tar.gz 96321190 SHA256 b9a980dd35847df0b7870e1223774d1
 DIST jdk-7u7-solaris-sparc.tar.gz 99771717 SHA256 6788e55fbd085aca0209b794300df472f0e77c85a7ae630bdf28847581537467 SHA512 ed979551f040d70258d2af3fef96d89c364d6c5fb1c758888f5b5663e8839cb3def26e462442c5298c218feb04917e5da25ac404cebe18f9b70f9e6ed70bccc3 WHIRLPOOL ef97e8d0ad245a90c772a48666c1c9586241cf0688dd16bcd67a99700fde12321555a6d64ab8e1b2dea3df21dd3e087da371af161704bdf0f95ab8d714815798
 DIST jdk-7u7-solaris-sparcv9.tar.gz 18322398 SHA256 472bb21b323cfdb0c0eee20472d674818e6a4d2986c786c30be4a89c7190a0cd SHA512 e55968302ee2ae5a17a4264a5428ad2f4cb2b37f420d02c8a5e615b21eb26028cc702e2214ef809f953523c177a59883957213fc8862490a1a032899f5ed8079 WHIRLPOOL ee8170eaadb338c57de4dffd5d8e6a2432bfcf10292d093a12e24b3df3c1426a92f2267722622bb301eca8195151fdc2a40afabc10e8d1db5731eadc6bc08641
 DIST jdk-7u7-solaris-x64.tar.gz 15674358 SHA256 025aa994dde8781adbc64a13866ba070b73eb4651c39b2d3a9e539cb38b4fc91 SHA512 fd8ffc22bca3f25d85bfa5a52c5a0a7251edf9dfc720f009e9ff6894f4dde965f6cd01d5e1937b0095af01c1dc8efaa91dfcceab7160fbac948cb6834dff40ae WHIRLPOOL 7058937d977f0eb3b5cad70556baa752998f8b6d4e51df191513b352c04d7fa9dec86c1b8f1bb7044f6791cfb4df32ac80333f18e4e7968d459707d6bc8b9d40
+DIST jdk-7u9-linux-i586-demos.tar.gz 14751397 SHA256 5aa1098fde7b22d0b8b5c8e436c39a11fa52eb37cc52a63ead3732040f3ae2c6 SHA512 1f03b8194109baa64490d840f7ef39f47f7c74c026b01a8a0f2f89cb562577ff3dbdd70ee180ee4694c4e706990ea3dc9b81d0038a7d59f895c1b8f1d1b563f0 WHIRLPOOL 69d314418ca249a23a211de5062939ec7853f187a919250a5cc5d71f3b17723920076ebc56c59e1f9883ebe0c7feb1da4a51e30bc84c1a537678b9f1447bf61c
+DIST jdk-7u9-linux-i586.tar.gz 97361259 SHA256 47e86ceb7f59c821a8d0c54f34530bca84e10c1849ed46da7f4fdb5f621bc8d6 SHA512 7353984417b91482fc4d0c1c8597c49f431d4b63502b446d0bea6f5d1080a7504ce0b8801debe75b38eb18551abc3f81264901f3df159b8f6af5e17668603122 WHIRLPOOL defb1480299e37009a95dda609e2efebf8c3a73f48c88f491983daea070459e1fd33f947fdb9ef73c96a1c832fdd6e38eac5f76627ab219e87c8ee3c16780f47
+DIST jdk-7u9-linux-x64-demos.tar.gz 14762315 SHA256 76b07b6cca4c251b344abc09cf23788621e21bab963979478d77d76cfdde604b SHA512 376a5ab162aad26e85d802295515fae2b1b8d9e85acff0dc9e4695cdecbfabdf25391f3f180f4d7c8793cfe40d48fc9ab27e7c04da5617c1b30e7bf9372b9217 WHIRLPOOL 72782a69856db15712a45ab58caf168a25d0c46feb06711e43c6ff8cb23ae48cc9ccba9a68a66ba66440c01fa80735c842dc7bb4ef81e9a679cb00fb664c61fe
+DIST jdk-7u9-linux-x64.tar.gz 96043498 SHA256 1b39fe2a3a45b29ce89e10e59be9fbb671fb86c13402e29593ed83e0b419c8d7 SHA512 3932a20e3dc25d94b3b07510f9e1ad0767325712c3622d8297c1d0e6cb0ae1959eb29fc22d4ab71216c2f20ff66fa04822bdb30b8d145c66490ef48dcc46a2a3 WHIRLPOOL 2887b3dfae7c56f2eda5ee65c3272b0a0b8b1d4bf114e7b2097f6b194c4e4ab04c9507e216a84dcdcca02d991fb9e133a993102731b05454103473347fcd5ecc
+DIST jdk-7u9-solaris-i586-demos.tar.gz 14693972 SHA256 488b0ba2cf6cf516a6311026694fb872010bf25b9c3f140f435a8f69fb6ec72d SHA512 6a4569e635320c66e436636d67f496a2b4573e70cc05eeccc4111dbc194ec1b933451e89fb2948ec331c7212bde995fda1b487901bc5ed7b518c272b677051cb WHIRLPOOL 3cb500b1791bbc81a32301786f71e9f566ef87c8566f4f9ad8386a5241b858bdfdf3cc02ae59bf3e2c12a851c20401b8a2b0c48cb134e560b534e372a0adff0a
+DIST jdk-7u9-solaris-i586.tar.gz 95959536 SHA256 eeb21f43dadb0e5958206363683759952b5857c5709be9be1fabd14744d5b660 SHA512 945c304ba9a9f34cf88bd2ea16a505b6ae167ced36d4f16a251d0c67e43cd3176165dc610354ea2a5e180f750d5a970b022eebb044c9dd5f388dcefff8bea1f1 WHIRLPOOL 1b34dc7881e3493bd217e1650ed95ac829832993ac1b0d5629dac8abe4636afa266b2684f82f1a487ddbf6fd51261010764248e90bcb139868064203ef487ce4
+DIST jdk-7u9-solaris-sparc-demos.tar.gz 14710749 SHA256 381cdf1edcb84bd38cc1c3229ae5e02466a837f9067bead5884d6e8f6b0cd74a SHA512 147d3ff3cc84670784f1de513d3d741cec7647ab3d9b26c28ee18b24ff770897b0c9b61e3be6ecb502c8d2f3f009addafab2d4c44919ce6b2f2afb457f57b283 WHIRLPOOL 4ba0ad8e38156f4eb47941a9af2ac3456bc9bbd4f78160ef81c96a7462d07d75fa5f6f3a121674ac7454f1bfba7d39f042c8f056ec5f563035aaf6c9fe3c9415
+DIST jdk-7u9-solaris-sparc.tar.gz 99767557 SHA256 0c1f81d2fe8a80528326c2c453c668fbcb8c78c51bab3ada36e230ceca0540fe SHA512 5323cb9b3330505fc2a95560fec8fe9d97ea8516e2ca4c26642f2246040d6a604fd053428bd9f13c674735316702819980557378f57048c624d0d7327e14c168 WHIRLPOOL d87dca8c7af7b0960e47cb9a2980189fd1b5a51f6a85445fa73ed0960a7c56d120974cf0985fb071103c913a03e20f3e172cbc1da11c55beb58bfbe3db90abf7
+DIST jdk-7u9-solaris-sparcv9-demos.tar.gz 901096 SHA256 31de0f4cea4a900a54aa49d860b0ceb481185fb24a0f785b1b90d6c01eda3b66 SHA512 14b24d2f99b8ad7a779477efab88f0037eae4cf4fac33b2ca208b56bf01b7efdcad047f0068ca71028634742cfbfbba81052ab3777897adca0e5a5d37c4e120d WHIRLPOOL d022293e1dbf08bfdbdd0ccfd2e8128fe4d881e596f341b02e6fe1b43dea6ff5ec62965cb9bf084a4d4b61ffb0dac3fe912e73124afc868645f8be5d986823fb
+DIST jdk-7u9-solaris-sparcv9.tar.gz 18356772 SHA256 d6ed5006123e35e8d9ad4d73e228ca661e97846876096c6d2fb50836fd44ba4c SHA512 0e4bf11893c69ed24201f47d343585fc3796d83b78fc8792ef0053dcd9cdaf045efea33e138b470e310ae4400c4c1164ba5d9f4c72a368fdbb70e30070f61cf1 WHIRLPOOL 2ca9bd192b062affcfd2f09288d94941f1463b10f849a1df92a2bd5f522488eee9b8ca2f2b0e51a01932d85faaf9f387568067f80abc95bb62912bd81f2089c2
+DIST jdk-7u9-solaris-x64-demos.tar.gz 864414 SHA256 b6d9f63f3e26d04bbfe05052526989ce872f51093212d8e7faeaf6dc243ad10d SHA512 d275b7bbe870c3efdb390a30282fb8ff5a6455c7e0cf4a3b241bdf6bd32c2721062e3a23e852255ad46f6d93ef276c69099b26964184b2e3faf6758a6e41df2e WHIRLPOOL 3daee99643d61f76c42e3cf022ba8e6f6ea42786b17e249185fae493acb6ad9f71bca6bcb31398c54f2396c207411a24b53a1e9127b6e85f2d8bbe11d433fc82
+DIST jdk-7u9-solaris-x64.tar.gz 15665771 SHA256 91e0b69b10660d9003a89798ea21d39fb974478332949f0c6ecfbeb8d722cee1 SHA512 b6984b758e285a82ee291d396c52a4556f7cb59c74c05b3ec7b700f712a706be32e62f941623ab2ad911382953f27df8e8feb7e5e7e4e09ed7104050da258a4e WHIRLPOOL befcdb6c762d1dd1e83534edcd7d1dca3a056531ec41ede9b1dde1ee50dd5eb9f73df225623812965d452c4a642024efcf7fdde1b98eef072694fe80ce148867
 EBUILD oracle-jdk-bin-1.7.0.5-r1.ebuild 11265 SHA256 3067b5b7d3cb2f194653af50d9d344b19ea144aefab7c6c61ecf9c16ab90d6ff SHA512 70dca7cb27f6913c50ae39931eb0d49c7f06323e86f6a91365223dbedd65f93a9468363a8fbecee058e47fff086111fc7e5e69712c1053010dcb7d643c33afd1 WHIRLPOOL 0db3408302a56ffd8207c2084697572fe0cbb2e5f3117227ecb7e1ce7306527a104dab8b19ba52f8a87b5f8abd0c54421e3975cc2c30e3183bc60395f6e1390c
 EBUILD oracle-jdk-bin-1.7.0.5-r2.ebuild 11741 SHA256 47073de3586a561960ed21863728678a22805be3599a22e606d7f30d7d4d568c SHA512 aa13b547f875e2fb12ec97da4f3b1ec61c8acd4fce6b2bbdf0fe78712fb10543ba85e99c9be8d15c1c4b7c399ff4325d6f356e8d9535bc449c46ef6b082a323f WHIRLPOOL c07711e31be69ab64814c53f65c182b5b0e1dd710d7237ad422a66ef0d15b8384a1023e349993e5ece793544b3358987e2d174c6b962a71ac1d7f93df9aaa598
 EBUILD oracle-jdk-bin-1.7.0.6.ebuild 11740 SHA256 4669467080604d3dde76f2c9ab724f6b91d25b620d976a066f7dde9ebf5edcc4 SHA512 f4fe116f54d9ac7f00ef3e05cb99334f6c08322c327be6e9c678c551f52b460a54f81b9b1ebb60492d12b07ebefdfd2a8bb0449ee1e8dfe5f0051d2ceb5ca689 WHIRLPOOL ca2b035453688eb4958acdb0bc6dd6f4581060f603c47c064e3fd825b49b03e468898206dce3cf1c789a147f1f75c3e447ee9a6288a22c001bf4441ca9d11f6a
 EBUILD oracle-jdk-bin-1.7.0.7.ebuild 11948 SHA256 637a1849bbe0ac2191d232311de98dd52ad0234a4eafc058d2764fbe528b6c5c SHA512 fbf9c1e15581796d95f3daba529eb1522c0064956f748b66723180e7d6f0635208f45ed6dbfd0a4ffc1a280b15c7a06bfbf389a249f20a76367d783291f9c5ea WHIRLPOOL 334100015a2af2db1fec09ebb8c2ee122d4ebe995ee445e646bf63e7e2e63d6a691f9ac1106ab343123e85f72cfc572c8b088250507f12dccaebf856de8f938f
-MISC ChangeLog 4684 SHA256 8ee937c9a82f1bc89a90084c981cf71e7c81fe53e7c7ba1436054c79642a4624 SHA512 5a39b1259b74fbac84bb6b6412ef04db233b1219da24828478b8d1831038c13e3e3e486265496e63235d97b5b3c215858e0f2126420e73299d4091438e244118 WHIRLPOOL d4bb0798719de66dd04133321b0da526511479a9c5813f97696cd8c345dc2a1ecc729f501f02c7893d7a8ad256bc7edb3231e84040510636277c97ec08ff5dd1
+EBUILD oracle-jdk-bin-1.7.0.9.ebuild 7878 SHA256 f7c966a299c01d1af122c3d22997cd0a5943e6ff38d10d3aff6268ed1965acc5 SHA512 9dad5f1cb548d0421812210010427ed12a9622b6e772fe5f9fe5fe2c062e76064cc10a338a7981e68df6589eaf70657ef515dac087a6feaaa86de47b5e59d222 WHIRLPOOL 67b1476f64c860d4c0d8ccd2dac958bd7f920a5ca23811056e1045513c75037ff7e640f858f6841381e5fbb427d7db8cce3a11836f6dc14d5c05ce80e29c61ea
+MISC ChangeLog 4970 SHA256 f9bc313ce310ac89da47895ae6c27ae434034357d80bc87bcb61876c688ab496 SHA512 40b1dbb6541b2338c6911644e7fd1ee85b7d16218933cc8b77c6fbc8b2d9f389df3295fea2d19251bc6eadd51859f2e6f04fa761e04034f37722c61ce7559a6d WHIRLPOOL 97795e943a902cb9b0c97aa67e9039b379947e222425500d1fc32a50980f16cb7c071683d41d2f0e8803ccac0ebc7b53e755b669547126ceecf8d4f77aeb1008
 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBRiIQACgkQuUQtlDBCeQICQACfYbl42gD2pkGiF/sMNOP1Mz8d
-uuQAnRYV2SD7Osp1DTT6j57UFod737bO
-=sd2H
+iQEcBAEBCAAGBQJQftUkAAoJEIUJ+svaV163MhYIAKf9WTNRj9CMLkkheXv2vr3F
+KYBzFpZtsatvtQnYTSFIo9rxtVA+O0Ah9EPj5pblVZY1LcIoWm0VGGxstyDvL68T
+zLxn7/x3B1N6tTG/FROiywPxPNzbDtO0s5EtkCvRuEr1pQ0uHJrBqdNFxb4kdPw6
+6GIfLuJ0YnQrQw9Lcdg9m3LxH9obx+zgubro9Mk1wtuOunli16YAmg7I3aXGA6De
+xZps8VIhqbMREXuqyPpq3sz7GgVp9KqWOMHbsT3Bs0lAwAfsQ92VH3vDDW8YzTT7
+pDup9qqGIixkbtlLZRXKMf19baShblEjcFHYlL07HKC/GodYRH14jaWazb0/ta8=
+=L0pQ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.9.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.9.ebuild
new file mode 100644
index 000000000000..94e781336390
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.9.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2012 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.9.ebuild,v 1.1 2012/10/17 15:56:09 sera Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7u9-downloads-1859576.html"
+# api and fx docs for 7u6
+#DOCS_URI=http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.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
+# arm currently missing
+JDK_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
+DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
+
+FX_VERSION="2_2_3"
+UPDATE="$(get_version_component_range 4)"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+S="${WORKDIR}/jdk$(get_version_component_range 1-3)_0${UPDATE}"
+# for when oracle messes with us again.
+DEMOS_PV="${MY_PV}"
+DEMOS_S="${S}"
+
+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-sfp.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"
+
+fx_demos_linux="javafx_samples-${FX_VERSION}-linux.zip"
+demos_x86="${fx_demos_linux} jdk-${DEMOS_PV}-linux-i586-demos.tar.gz"
+demos_amd64="${fx_demos_linux} jdk-${DEMOS_PV}-linux-x64-demos.tar.gz"
+demos_arm="${fx_demos_linux} jdk-${DEMOS_PV}-linux-arm-sfp-demos.tar.gz"
+demos_x86_solaris="jdk-${DEMOS_PV}-solaris-i586-demos.tar.gz"
+demos_x64_solaris="${demos_x86_solaris} jdk-${DEMOS_PV}-solaris-x64-demos.tar.gz"
+demos_sparc_solaris="jdk-${DEMOS_PV}-solaris-sparc-demos.tar.gz"
+demos_sparc64_solaris="${demos_sparc_solaris} jdk-${DEMOS_PV}-solaris-sparcv9-demos.tar.gz"
+
+# docs #67266
+#JDK_API_DOCS="jdk-${MY_PV}-apidocs.zip"
+#FX_API_DOCS="javafx-${FX_VERSION}-apidocs.zip"
+
+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 "${JDK_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 )" # doc? ( Oracle-DLA-JavaSE )
+SLOT="1.7"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel +source"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)
+	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 )"
+
+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=done
+		fi
+		einfo "Downlod 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_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"
+	if use x86; then
+		bin/java -client -Xshare:dump || die
+	fi
+	bin/java -server -Xshare:dump || die
+
+	# 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}"
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	# 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
+
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby; then
+		cp -pPR db "${ddest}" || die
+	fi
+
+	if use examples; then
+		cp -pPR "${DEMOS_S}"/{demo,sample} "${ddest}" || die
+		if use kernel_linux && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; 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
+
+	# 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
+
+	# 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 {} + || die
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}