non-maintainer security bump due to slacking java herd (bug #498148)

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 342 insertions, 7 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 618a8cd1f705..0454dcb66162 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/oracle-jdk-bin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.48 2013/12/25 13:36:21 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.49 2014/01/17 15:10:38 polynomial-c Exp $
+
+*oracle-jdk-bin-1.7.0.51 (17 Jan 2014)
+
+  17 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
+  +oracle-jdk-bin-1.7.0.51.ebuild:
+  non-maintainer security bump due to slacking java herd (bug #498148).
 
   25 Dec 2013; Fabian Groffen <grobian@gentoo.org>
   oracle-jdk-bin-1.7.0.45.ebuild:
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index ee64ae7873e6..2745a222191a 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -23,13 +23,42 @@ DIST jdk-7u45-solaris-sparcv9-demos.tar.gz 905609 SHA256 81032b71f1ad80e87c82ffe
 DIST jdk-7u45-solaris-sparcv9.tar.gz 19145011 SHA256 db249eaa309e253b7f42966690a2c2489ffe7c56754931dec8e2f610d4e5e425 SHA512 3c54a98f92155b57bfdfaa2c8aa329e2f2f7085b9967d830f430983f61d6b774a3335619cf83a79f1a530388615661e70425f8d69f9f964e7b0e7593c4c1725e WHIRLPOOL 6fb7892047d4be97a4df9233019df83ffe67156a0c5b092841c315d5b66ad81eab0f66391c16634fc093f7756eda37df687dbe98283a11feadb49b9f1a8a8cfc
 DIST jdk-7u45-solaris-x64-demos.tar.gz 864994 SHA256 303da56d863604d989cef60ceb896e569484dcdae8cd41b443ef5ef74f1fe97c SHA512 642571d753952a4058d69b358a4ec156a37aebf5045242c7a7150fbf85ad4280b263b3caf8df21795f81c282384d0ab047dc7cac17d22145f40dc5682dc91974 WHIRLPOOL 031d47e4fb9b7a68cf5ea1eb7d3c346f6ff214fe728ce2aa44e58d89943545d9012ceaba5bd4cb29394eda4f80ad6c0b1d52f32a2b3f4ca60923f30887d31ebf
 DIST jdk-7u45-solaris-x64.tar.gz 17020495 SHA256 fc221d822ab835e94e2ac5749a46f4669971b4cce69df199044858da51ff202d SHA512 ad6ef58f5fbc6e9003812ca6e628c97796de9d7c97afb81d998a87eab7e86618f63d40cff2686eac4f305ec5e57326a53557c1853883b77ad7bbb10be5225b1e WHIRLPOOL c16d7a00c99e63f88a6d34fe29cc446a5383ca6eb91d376c14a42daa6a7f6b508726e2562dd3a875b2f7910652b5d192ee4b13045bb466d078609ea883ce250b
+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
+DIST jdk-7u51-linux-arm-vfp-sflt-demos.tar.gz 10253500 SHA256 8660fe46041c63f70c58c7b99830d69448926b9d1b3e42daa74b93e63363c52c SHA512 bd9d9912cfe144374acb7f92d451d313ccb32ef702238449ea430e7b1ba67ddda12c7047d6694c6c6a77a3b147faedef89fa4505ee79579a05984ec42c800043 WHIRLPOOL 70cfdab3fd5c44967da671ea969e1a5102383342fd22300f516506203dfa9d47d84038edb028ed6838dc3326c55e8a946ca163ed6913d4828f4a6681bdccb554
+DIST jdk-7u51-linux-arm-vfp-sflt.tar.gz 70962857 SHA256 75b776dc71e62e5440cf619bd7cf7022fa4e82888ca408bf496413e2bcfe0bbe SHA512 0c2ba5d7d61fcaee20f7b87d801015aabd4c371c66b78ec75f127b5a64e282eae0149cf08d58d23d829998766cbcbdb9f82f2c271de7edd521d93d2d8e02dc70 WHIRLPOOL 675a37e60ff793a715eb5006a778765540ad021b06cb7781508515a2386f0283351132dec8a6af9cfd90165128f7de9dcb566fb9be240397e02f75ad5cb3cf41
+DIST jdk-7u51-linux-i586-demos.tar.gz 17363334 SHA256 0cbb165347b5ea38c8d02d54a3176c7b793e84477f86f8816a428de437160227 SHA512 adb0ce5ccb4c332e80da356bf5f01af666b88c1f5cbb208a492450bf63bf9414d020c8afd24d90a45f91449b976671362b81dc86cbbeb8b282920adfd09dcf58 WHIRLPOOL e499b653dd4f8ab9e4e053b6fc32afa4e72562eb15c52cda75eefcc6fbebd29324fca33dede7ba7e2313942331f0817c25c4e209946e8b644f0a1978ec41c98e
+DIST jdk-7u51-linux-i586.tar.gz 139444114 SHA256 b3a2965e44446e476f4e27f7ea13a503a91403ac80bcd71693ad2f84baff42cf SHA512 d9f942740ec859d96982dadd9aaaa9d51a336d3f3dca73e43e3205ea048ac369a52291514aaa66caa492a3269476c05dcb50060d0531ddc9491edd479e36c505 WHIRLPOOL 462dc3194547ac6a0ce867147100500b705b8f27e3fed560c7515012afa3c1155b2bd0fef9888e2a04acc2c11a24bd0ccc66febe10da082bcc8f128b20d36c85
+DIST jdk-7u51-linux-x64-demos.tar.gz 17389654 SHA256 210ca6bce6a3bc527c1bbabcec93d816d9fb77eb09dc9e46caa2db225483a7d0 SHA512 b0a73c90067f7c71122bfd63700ea707b343162a8570e6ba3bdc3cceb8bd8e344effe27880eab2d0460297db8192319df0642fe1eb11bd382006e3f0cd7a4f8a WHIRLPOOL 3d020fb0a561ecf55dd68609990ee39b35274e7ba30f1be477044fb5430c5a917be0f973e7b6a4abefa6b36fd9b4863d1ca63b45ab9f480fc6311b1fe653c14c
+DIST jdk-7u51-linux-x64.tar.gz 138199690 SHA256 77367c3ef36e0930bf3089fb41824f4b8cf55dcc8f43cce0868f7687a474f55c SHA512 92ce3db4bb2116b7f144b2d710bb168178298c017f7f59c5191e116e66e2123f508ae6c84aed839615da3d8fa6fbc7892497df0fb0c1bcc6d030227fb55effe9 WHIRLPOOL 3b0046a3f3e7b70be8e18c2bfd52c3126941a0ec61d575dee1c4b97db2e976bb4b7d9a780e6b67d544b94474fc42bc2dd2ac7ccf0498af7861f3fa6585ccca05
+DIST jdk-7u51-macosx-x64.dmg 188212404 SHA256 1312b0553bd37a232114637f05b036a6fd5d444e653adef7230ba141328f7734 SHA512 76cbc741cf43fd317f9794887d4c51716cc2209326e40a98a1d0a3e5a7e9697a24beaf2df6916ad36cf5acab93b5708ae3f96f421e84f15933c6581bd642033a WHIRLPOOL 9f31d17bd6abda7b85ec4f8473625b7e2ec15fabe85e3664c980e8fed38c8c71c0d446577a1b2eae3e41b5db0cecd3f54c750ab0980bc2a1d3bb9f7a2aad4f9b
+DIST jdk-7u51-macosx-x86_64-demos.tar.gz 16042979 SHA256 7a511b25d7525fb2048e02ff0c9c709944328d162622e269403701cc6016c748 SHA512 c041321fa171a15789fa1b867c40477aec5f7995a7bf575c9248c9f2a64085ce54dd7284a58055c547e1de8e1dea0a125b746d70801c25543951c20d0b6a35a0 WHIRLPOOL 58e458a21d27a429a3777dc76bce3d658c59f05619bca0c9c5d9e99767187a9a9ba111ed2b4a2712363af03c8272bffa88297ab356ab5b8ceeddb1b16db52c03
+DIST jdk-7u51-solaris-i586-demos.tar.gz 16758927 SHA256 ec3a4bfe34ac97d40cab2c8dabc9598b3c9af227a8185c9ad2decdf87db3f54e SHA512 5e62118b92ddccf0de83cf29c3373c9bad80d53f587c17edc6d9e623c160f2f9224fdcc0358de44245f04567b3d52058c17096f9d9d1e003808aebd6fa21c456 WHIRLPOOL 241b11d46e16d0022372ab8eb998ca73e3958d43eb69b5edbe30d831e9d9c093bb4b52820f5170efca61b0d912b024f45d60ade8d3d775182e1fee3ccd1b661f
+DIST jdk-7u51-solaris-i586.tar.gz 99755627 SHA256 ca5b0c9daefe547d0be1f4d2138b939e2698069915f650e92fc4169c886b690a SHA512 bbd415875e895d97e9d9191ba54845581655dd60ffa66cebb72094ddd810b7f2b6f19f326eb06a9f605db5de13a717e019660ed0ba9f3279732dd96a6ab671e0 WHIRLPOOL 6508871e0af6719113fc5bb12d15984faf39c36d77186666bb247eb21304aefb4c4c48bf021dcd2e031a3d7c431b1aa08b262bd71852a15c902b1d21a872f9e0
+DIST jdk-7u51-solaris-sparc-demos.tar.gz 16804129 SHA256 64cbd4a988fc03cd3fe65058bcc712c92c9acd9692b9c9d7e17fb957ba3c0faa SHA512 55cf7fc2cf30635b604ce6afc80d692329dfb8facc2e7e192fd401209a45fa9101c41d0cca134e1925e7a3f911d82547803f2104f1bc47eec9c4064a13c5b0d6 WHIRLPOOL dc79813a8a17fcfbde498900eea180ccb9f6f59c3bdb189e340ee5f381af8c2ae1b0dfb5b3c7351c5dd2c3646d7cddb995e9328a99bf6ce0fe1d0e90e7c80a71
+DIST jdk-7u51-solaris-sparc.tar.gz 102958497 SHA256 70530c44b57a04682914008dab678edab8ef6f062791a338068a8cd274c49bf6 SHA512 48190aae0851e37445efbd69224eb6e41f0e6cf74276680cc16b8d74d9bf86a88ac8c433f3ce80786f4ff1355044529eb2d6f5db0751c371dce3eff7aa4be0a9 WHIRLPOOL e012159ec8d0566d3b2017e6e40722ccc3a1d41a459e361a617c14be01a58a124efddc3411e9531747c315a24217c1102d38e23c24914fd50adbd2947ea5f721
+DIST jdk-7u51-solaris-sparcv9-demos.tar.gz 906072 SHA256 ea7974b1527fdc77a98806803bf475578d21532380678faedb0f0ff90758d950 SHA512 7164b0444db5e7057937503b1cd7bd0a0507389aa2e4783c779f139c44a1d7fdb175365fa0be73904461a7ff49277903ec733be7aabcff24eb280d65994eb674 WHIRLPOOL 96dd27341f3b73c747270216e85854629b711c111bcbfc9aba1560ca4862e84517d3ca79f55bf423c342168a2c5db331025578192d1ff39fcf249143ffa3eba0
+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
 EBUILD oracle-jdk-bin-1.7.0.45.ebuild 10007 SHA256 e405c0bcf97d701ac7e467162b5add1fde3ef7d18ea35b91ea455e5a891c36ba SHA512 5687e33e044cba4e472e08a03be8b3199a00aeffdfa29e8f6b5efd2b69aaa62b0634270aedc63f278fc973385e9bca8908dd91c16469e548aac5399946060930 WHIRLPOOL 67e87e153e9130c3c26aa589c4a4edfd2bbd1c1302fd652103c8aff7cc86d0037d4ac3a22ed5807f2ef2b8f2126fc5b41c6f7e20ab07599af2ad819f12da1bf3
-MISC ChangeLog 8785 SHA256 e2fc16832ec4fc62c7796480576e6837101cafb1cdbcb19e7f22b64ef3a68da7 SHA512 20bdc53bb057c98b3c1e2dc7baabd152aedb706e7aeb6d6fdf25f5fc4ee4f10c7fc42c9bd4cb9ca5ce554b726828b79dfcef85dcdfca1378182249f521fff2de WHIRLPOOL c8fd05be51095d030d5e67a07c747b5775812c1bdec1bf144edd24c38ad0416e8c6181e42abb4b14f784f020d720ed8dd1e003714f4c55b602a739ca940f5e1b
+EBUILD oracle-jdk-bin-1.7.0.51.ebuild 10014 SHA256 29f17c6d1241d70fcdf5f33722c14aaa9bda2baf97842d574483c71e9a63ec60 SHA512 ef9f240c34886d2cbe801d53bf767ba5b760b21704a4feedf3f8422225b57198ca35d8a5ab44a32aff39240555a2663d8cf40950494c4c3ba0db2c8b488a9bdf WHIRLPOOL e49e86fedf604a9f116dd2e52a267d8cf05fbbe26e33c7264dbcb4b38b3a7e4b840f3def98cbc76779c7109b1a01dad18bae2f5f73c2ecd2e728a00cabe20b60
+MISC ChangeLog 8992 SHA256 f0a1a906abb0b346788f5d3f960c5de33b4f545004bbb8c860df29585d8cb5b1 SHA512 c539455a8e20f88a13bb1d8482b0e52b59e06100098694228983f06a167f12dfff28f12322ddf74f4b3508314ff17c05935cd747a2aedb4393a470b561a39c63 WHIRLPOOL 81f75c4cb33d68ca3063bb0afc2edc99a67d053d3dda5f682a1a6bd17e7e4490e93a5a66a12fc891234840578a724721034e39032d5fc0d9e1448deb3ddc75d5
 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (SunOS)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK631YACgkQX3X2B8XHTolqBACfdMa1fkOAiU5dcCJomNM5dHRj
-/gwAnRk7H/o5pXUH1XX9R9Ya95C75MJw
-=/Lf8
+iQIcBAEBCAAGBQJS2UfvAAoJEPiazRVxLXTFmicQAM3cGqnoVq8fhDK+clHK/Th4
+2gtRaBK8HdYaGLoD/1TdGboF3nqdYyaSMedF3QmcC+0MpghQM6GSxl/SuI1jBAuF
+DVAXiV9ZJrthb4cuhVGRCe110JJJHW+Y35wCC/2Q5Bv0coj15DDPaeKDoC6aVSEK
+FPDJR22tZ5vhDLdDPlwOx3lqnVs/rc+XZLyX+Af2ueydlm/rWBHIy0AEQTdqkiGp
+UT7PIrJKSlgxSpSj7eTz1/tHyBhfP2cEeQF1mlCl1LV5XwsVXjTEQ17tPwRV0q3/
+zThQUsiXpoLaFQueuhLHVWxwYukwGvSw4CxS7/5ApHNL+0AJWE2Ht9XC84tbCPba
+jUSUjjJ2RFyKkxZDGQzqyXcKy+Ls16JoAnuT1ppBMvMOHcDje+TnqW5wt8AKNzvL
+o3JOnJhiAd8duzBb7RfdXI+gNgo50ahcS3NdEVHReWOxCCIaocj5efdyQJ0rNWN7
+e1OpNebkTA9YcE84bZ10LpjrWq3RRbXMRBrtfC99/MXeW8Lh4WJCNf1ujFF2lRQw
+WOfKMx/6+uZe8qkVAZGksQP1EeQViw90wEE+aym7JLk5xiV0sRzK3fXz4UpeRIn+
+Rb8tXVWw+pZZjQqJPoYkAHvzG9/fPdGOhpFPHw2tEG2mqZKpR5U/UsOCQ3qnb02Z
+Sj9OFzoTA3xTnhaX0XXC
+=QIVg
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.51.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.51.ebuild
new file mode 100644
index 000000000000..a046ad40d2ee
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.51.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.51.ebuild,v 1.1 2014/01/17 15:10:38 polynomial-c 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_45"
+
+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
+}