Version bump to 1.7.0.40, fixes bug #484568; ARM now has soft and hard float support.

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

3 files changed, 291 insertions, 10 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 73c9dca910ee..25e6d36a8e6e 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.39 2013/06/29 16:39:22 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.40 2013/09/11 15:27:36 tomwij Exp $
+
+*oracle-jdk-bin-1.7.0.40 (11 Sep 2013)
+
+  11 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +oracle-jdk-bin-1.7.0.40.ebuild:
+  Version bump to 1.7.0.40, fixes bug #484568; ARM now has soft and hard float
+  support.
 
   29 Jun 2013; Tom Wijsman <TomWij@gentoo.org> -oracle-jdk-bin-1.7.0.17.ebuild,
   -oracle-jdk-bin-1.7.0.21.ebuild, oracle-jdk-bin-1.7.0.25.ebuild:
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 135d37d03982..df4c6a966a6a 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -5,6 +5,7 @@ AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212
 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_25-linux.zip 20405501 SHA256 952c4c7d016d429319801871095e2d1918604b70076a6766ce5b87bfd8e672e6 SHA512 01eeea9c5c924a2e7bb16e3388584f86d749b1bf4c8fc2a22ec6fef2236108e2255dac145a0554a9d7f7156b900ba6b171dd1871865bbc34f3a480822a2dd10a WHIRLPOOL 248145b1e28018fc59f2d08a79cd773d1a178365874d2fc4a4801ca7e6b8f8c1daeb95f90b7d926e5ab2931c89a0fadea7aaec495e19351911b3e4ab101615fd
+DIST javafx_samples-2_2_40-linux.zip 21220898 SHA256 95a35da4036d39ffbc1c97ee8c1f5823ad84bcf58cc08ca147935158973d0773 SHA512 52fd60df51e8b882ac1aa62cd9e2339146512e2b2483d56fdcc25de1f1adbd35f3e2f6054c3380826698f78a7c4ea69e38f8747507a1b174ef5fd909c97521a9 WHIRLPOOL a9fea00a50114c14226dde2347c03435f4a0b8e458576a9c6fc5fc26af87252b281208dcb697a97d511508ac89b7891628e2042b8433c17c956503f8739cde72
 DIST jdk-7u25-linux-arm-sfp-demos.tar.gz 8493192 SHA256 f1bc88d1e4330770893428e33e96c37229313d2e39c400337e157db785f4d48e SHA512 48c4e27dd065873d6e19efa32108da14414e706615dec29317e8fefad2c7d0d93af1bb107260ba25a1745d615b1006af3843c247cf76d2746eef551dd0856749 WHIRLPOOL 97be631ee9483da1ea4a2166b529a7de12d7bbf6a825faa095070be7bd0d54ec3cbd389bc32166f1b85f6c0e7b5dd6b79d5d37a34a95550d9d53c640eac42e4a
 DIST jdk-7u25-linux-arm-sfp.tar.gz 68284011 SHA256 94509d4106012ae2445c496a3449952e636a48a4729f149e9c182756597d1c00 SHA512 4bb5f281c6eafaac08053128401e3c64f9b084c44a9d5b8389e294b9a3141f76b1ab353e5a38b292f2c5f8269242eba3283151f92ba6c2015db6fb1985f8bba5 WHIRLPOOL 72ece2e4c4204d3709693ba46b771cde2643392950019a2634e7ad8585177d1633cb74b4f7f46c87492b81bc9f265d339a7356a7c66dc3772211fa4e85a46158
 DIST jdk-7u25-linux-i586-demos.tar.gz 14762641 SHA256 b6d9a86acb272a32c68c03f885e6b2cc4cc43e7be36d709e0adc4c5856ad835a SHA512 d3eef7dd3de2f348fb6808694f718ba75b2b80a22a491ca9c3cffa722c43e83383ee2e15188c1a7a8d9a2cab4defbfdc761be877eab642c308896254eaf12959 WHIRLPOOL f1b9b42fa616d4d082af339b98a4e0d9810e64def44878438a1c5366a10c3a628739a08f80aba2b685eeecf915511739242d0d5c3dfc3b1f429197afc0eafb74
@@ -19,17 +20,34 @@ DIST jdk-7u25-solaris-sparcv9-demos.tar.gz 903835 SHA256 81a474d06d2f1e638d037c3
 DIST jdk-7u25-solaris-sparcv9.tar.gz 18529544 SHA256 4a6a761ec6d21ee5891f7b34cf1b6450c97b1e6c489473785caa3e54b11face3 SHA512 c9772c616ae74a7f521612f68dffdb0e91d8b1901958d66e1191713f20bbd5c874f8c9e1e250546c82ac3dc196c9ecfd1ee6a254724886ca4018571acacb1fb7 WHIRLPOOL 03d51604429d0aa1a4294284cb30c315d3ad37aaba8552a979102487410fcabbad5498e10c58979e681d24612dec29922b8d19b6056f8618aeae1b2a6c5a5c6d
 DIST jdk-7u25-solaris-x64-demos.tar.gz 864208 SHA256 7d892aab6c3b790487823501752c163b3daec52a2306bd82ce6021b68b034eda SHA512 45e87988852f26113ebcb9cd814f159a502621196b143e22f60dc6e48d5499d62f3232f0c470644037efd31a5713667757e5a56fcf6c477e14edc1f7471a81c5 WHIRLPOOL f568e9d7d49239019e55a089af7496872a55a80faefe173cd431dfc427fdc9a7a76c3a94f0ed666aa154ade3334589cf35dae574a949bc8a0015be8e3b1b04cd
 DIST jdk-7u25-solaris-x64.tar.gz 15822924 SHA256 2644c8c3662bacadc68978f18faa5b35295ae4aaeaf56a89e90133cc4da61d1c SHA512 86f8a1ab556f5b09daabec7788bba67014433e2b187ac2f97ab1147c6f0aa0635d5b4ef8cdd1e8f8dcaaf7d0b7284425242c161f38defd21883c2ae5def70daf WHIRLPOOL bbb3fe95333e8e1af530cd8e1c7a1343127f77ac347777b8fb46a3fdbdceed6a32879a2ce1c3024193fe0f7dedf95fd997b3e67d1bcc11f4c71dff2b392eb54f
+DIST jdk-7u40-linux-arm-vfp-hflt-demos.tar.gz 10373057 SHA256 ef9378fd190a937a871becd4d885cf899fb8e8b3856a67c335238a817a4078a1 SHA512 c2d2489beb0ecc9837b83cc315c6f99f772f7aa1d1e8b7dd624f04881d53d63dbb5276c1f92c3b630ad940dc94fc8121d3d6a823d8c31011453050d6facf9902 WHIRLPOOL 1bf475acc29f1fa131ffa01939b045368e62329f672b01bc5fcf6ad8eb880522feecb0486376db70b3e1621e95f349792265d9083242d64af2764028f4b15191
+DIST jdk-7u40-linux-arm-vfp-hflt.tar.gz 70909108 SHA256 d19d8a3e60768ff51c4b0e9c9427093233562ed6e86d3148673b79553efda4d2 SHA512 ba4fb6360fbfbb5bb0a2e89137a33792f2a36ebb17ae662f8ac984669a3ffcdb4f2305a748339b8810fd89b008033262132c14b86e540fc068b8a44e6e6da25f WHIRLPOOL 60ac320341cb9df278930e44fb9350279f0e28542686400cddd5793bfb103ee8bb24f59d550e66f64a0a5ec986a5a75fc4686f7fe8994a157944cae48fd10d8b
+DIST jdk-7u40-linux-arm-vfp-sflt-demos.tar.gz 10203198 SHA256 51e32ec094b8a7925533be63b95cf1fa7b6adccbc627c6bfce459643fb3b77a0 SHA512 dcfe64c52201eb4829284bbfada02fc8ef0a16a25f1f32f818e978014afb90d98fcc26fd696a0050ef689596a349cd0e80674f706093ac90e5edb4ee8f22531e WHIRLPOOL 4bf34b43e365478e11c5cacbfdb7b7d3a5a8482dec851c555ea9ddb41bfdd6480d67146fe2866002dae5a7e8b6cb4d36e21861eeeac77c673b1ba6c6ecee9913
+DIST jdk-7u40-linux-arm-vfp-sflt.tar.gz 70907994 SHA256 bcc618f995bf4d1c34a9621158adbf5e92b43e2c4b83ed9d61617ca0526942e9 SHA512 5159627c696222368979e12d2a1cf294d012831923ae371969d4eb752fcc697e5c1e2891b5bb665ccc77805ff64aa7543f78a29e94236aa495fd79766398fdd6 WHIRLPOOL b690cedb796c214a9eb4d3f37ee971d48bad1007450c6ba4b4d3357ac57f26e9de021ea593d1b5f89554eba456ae3608795d9c5dd6e86101f42f5c7bc5919f24
+DIST jdk-7u40-linux-i586-demos.tar.gz 17364351 SHA256 1d5a844159b57855fa6855ce8c5cfa0ff517697fe4cbe4a9db9ec0074397608a SHA512 adcac9078050217fd79f89bf75f2c64f45a9d613730a37e79ad04497fc95dbe391c9da952b5b317c6757425d0a14d84d11f153147673cee451ba2823c53a33e4 WHIRLPOOL 852f08868c0cb799d6227a127a1c89f5f4afd245c157395bc5688e1f7acf27477d3fde6d895f7a31f06a8cb65617b115f073c6e880608c5b6abc178e65feb6cb
+DIST jdk-7u40-linux-i586.tar.gz 139278165 SHA256 3a70b0c41cdf089d423c28336495c3e205f4fcb34f538dd82b80044eba670e8b SHA512 9737ef588d3fc99c70074eb760d0a8e545f4d9069860f3b14c192dd3f07b7c5bd36367f00138fdd8d59d31c8a6e914284aa77f1fe924f3d676ad6148b8b2bbe8 WHIRLPOOL fb484e9e338e4cc94a68615eabbc842cf2301ca6733bd44dd12df30048566d6614f036ddf0e86050425960da0a912d57437496a876d271b227f2f046a8ccd408
+DIST jdk-7u40-linux-x64-demos.tar.gz 17433351 SHA256 c07057339325b76ec5f449492c7f9cd0bb7a7283ad7f9c2fdafff6b3d2938f19 SHA512 cd492bc56536aab8c80c3c4e79db53d028082d7638227b5141f407f2c4633b0645b929f63f321491e194b15395cb8a12ee10ac6a9ed3e3d54fdd19d92abf02de WHIRLPOOL 842e6e06fb9c0f8482e67ce1b152bab94e6350987fe775a3acc5118f7ff88696ff84c164e60ed130726fb2a1e46475c10408c3771ac2b745e885e964ea68ed29
+DIST jdk-7u40-linux-x64.tar.gz 138021223 SHA256 72f6e010592cad5e994276eee7db5f0b0d7c15c06949bd81f0e14811048bcf2c SHA512 4d6144892a542f1ec8e60341195771eb9a5c9153e5ea7cd1f3281479349db54fe48d8e5fc0931f4a4489d4c049dd7edc93204bcf775f62eae27c6da1c5fc0db4 WHIRLPOOL 008e427748e0fdfc498a4714f1e80996d59d5ec694132a56fe6e42e9b1c324e5ec5c1cbdd32bcafff53f136ed95e9101d3c5d487c193b2348253a03ae0bcf234
+DIST jdk-7u40-solaris-i586-demos.tar.gz 16775447 SHA256 ca776da248987143bbf39617c724a5cc73c6ee07e565f411a29a73bf7d825926 SHA512 9d553fd5008e7eb8c1cf3283084b08d97772a69a34daa2377b06e9e6f28bec71dc9825ff6e3ba4b47e61e8739dfc7489f8568d660590648919d0906b1901b627 WHIRLPOOL 8ea4cca2b75b85366b9fd0b29e558638d4ef5d4f0884e95c46e35c09f2b439ff46807ab7a826f3710d2d53c3f94dffc1bcb8e313118a19a8b4db5de95a5dff00
+DIST jdk-7u40-solaris-i586.tar.gz 99916137 SHA256 24ef9d2b7cfad3ff38c68211c7d8bbfe106bdc41bdb26ae3a74d1b65197ee041 SHA512 dfd78dc541462399e240e6efb5a7e1482d1b159f62ff7c1394fafc9ea56ce1c63ec51bb10bdfd8cec46c43080b6ee8c302fc3e40f2fb29ef660811a4722eb279 WHIRLPOOL d003314bc8254c19d75b8ab4fa4d4abe4367d9d564371063987935585818f51583c518fd258b93a61cfd8d5f13f4f13d27ee0ca745a84acd97b0c49993c63191
+DIST jdk-7u40-solaris-sparc-demos.tar.gz 16774323 SHA256 4ef78890ea632e81a449017166fcc8253b63debb7d0bbcece2d7e2dac5785c94 SHA512 3b3a2ae6048e5b74bba293638a1282474fa594bd1357671e00b5e8e270b9f5234ab63975c2ea3c0303f1aa37b1cf06d9589c76e1fa73c29789cf9bd37f471b49 WHIRLPOOL 693ec37b0fcfa2e361d3d24e9c5f6cee562566e471c48874bde56707e239ea2440ef37b51ed2836b7740eafde749ffa2a8633faf287da8aae971e6c445afc71b
+DIST jdk-7u40-solaris-sparc.tar.gz 102831956 SHA256 ada77dc4e42bd1ac71db8d9d0122798690dab39ceff8b5b9abc763a1cb745a48 SHA512 0c7f8bc7e760806e14c41f6b7af42a2504950f0952b5947d228f83da8fc58709de7a04285ae0cdfa73ee879d37046321e5a2cb79bb234a1fc901928ff436b175 WHIRLPOOL b0b9437d99e632aa5801db4d2436658dfba5760bacb7feacd783ed635c5f3b19b1570183edc7fded10b21d658e7d6674d989dd1747c0d1506d4fd750d4887bcc
+DIST jdk-7u40-solaris-sparcv9-demos.tar.gz 904618 SHA256 993ccd95b07ca0bb06a138fb41f1a087b7b284ab0f644439d0e882bbd854b927 SHA512 636ab0e55ed61ff2da844f8d076b00ce9cd97204645a7a3ddda13bf47a972e377031b182d9352e063417323bfa26c6f99c4877628fc8a06a3b016863fe198c1e WHIRLPOOL 9d6a710554e04b184002c11461dfce13bd2fcf46dc6dc915056aa954034432c7dd149bb215b41e3842ff0bd2c58b005fb95b84cfeda5a92e7840700b23d222e0
+DIST jdk-7u40-solaris-sparcv9.tar.gz 19066335 SHA256 147d1dfc2b8283cff491741e4cfbb5e31e874c52fb7b798e777f79a2a5ad529d SHA512 03dffef82ac30b71e513774632cad2ffd8f45b977c049bf36eb5773d71d045f03d2808bd2fc8a7e0ff1e840635511f4ce35b09288e98795d816c7693dc4585e4 WHIRLPOOL 2e3364c04fdb1154e931a0456cd87a649a6a45c54116f465935059e6f477231210ef722a0d6a1256fbce36e727b5917eeeb3aa307d8f19cb774e12a30a118666
+DIST jdk-7u40-solaris-x64-demos.tar.gz 864605 SHA256 e6c054908d3f635debc4b359bdd0562e44f480f8b5d25f56dd1f942d1c5af390 SHA512 25b0d2274db299b5c13293c57827407f82ce1c19f2ca1539d037308b10f426269c957e1e00eca4c4385922ba3b1c8af44db4637d039a3f1a2487304d36a9a221 WHIRLPOOL 1f5930a331e2bb0c3d5d4e1285fc3f03c0af6cb154d97fa49d3a7ef1d69eef245fbed3ce1f870e04c8afd0f7fd02f9db28dd8753fb190872ee7d39ee4f4dc0c1
+DIST jdk-7u40-solaris-x64.tar.gz 16952414 SHA256 70d058c2e80a428d2c869cdfe3ffab868c187d7f3798754f180cce38dd852eb4 SHA512 62e9f469ae3c6c06847e4f56a5c3b0675ce103aaca07417e88fb5bbd54c63f3bc3b9c68f2ceb609c45719ef27d477efb4cb5edf0bf713d3559e574d3645a2d9c WHIRLPOOL 7952c069b1c6d2868aa8a5d4ce84aa2cdf69aaecc7dab23b19fa2d97c7d3438df8bee5a9d5e73855bfba85b36fec3121843e5ec7ed4872c2c2c2b686f914c15c
 EBUILD oracle-jdk-bin-1.7.0.25.ebuild 7742 SHA256 1b43adf6bf288965745a93f4da000bf6179e025c1e0d8813cf6c64adb9026177 SHA512 8dff44ec3b14f8201b08c33070961ec3da5035e311a76bb78f1178a2ca481aa34417beaa4faabbcf6d1817ef0a06ec677f29f27185ee57f7f9bcd51d19e8cd04 WHIRLPOOL d49a91e14822068b46fb4ac24a2474f195531ae93bab2f570b6c974aca26ec965b04a638f8515452e4b6deb9f773096b6a47d0c1cae12efe0781d95dc47e8d32
-MISC ChangeLog 7520 SHA256 2a1e1821f89bbba80d5ec78007cbecd6a06b11302bc2abab7e96cf9910620a98 SHA512 6a4be71bd0337ab8406d59e2f79a967edd4a45c1791e19a30f48d4e05ef46b93ee7f822dd8a29e6fc046732b0d26b91c1010e9f5d9d9e0e1ce5a8afce70b3fbd WHIRLPOOL a9d79646c24140cbe992f248edec4ef99a333935e36517a5a17db4a8d7849c9a84621f6f4ade1b6243d8a558e41e0fa9c2e6fccc57ec6b696e2d471deb85570f
+EBUILD oracle-jdk-bin-1.7.0.40.ebuild 8331 SHA256 5c00fbf33f9f9572be88c98899a043cfe7189b31ae67760232dcef9aab0690d5 SHA512 5fc414ac4d2a6136543c71f603fb4644a41502152fc98d5b88e42470d34364deaac6026455068331da8d99900c5e74e18ed8fecc395556f0d5206116ac96ce69 WHIRLPOOL c58af873306f75a65ef85d8219cff998d858ff12ef28ef21f3cb9ad42652c5f3cb8aa362b84dded124a02be9cb395e3c915997f8c6d8bb9ec734232373ff7dc7
+MISC ChangeLog 7731 SHA256 e3b94687579e45969f2737574cd8d73b2c4507d501946b1f70c9bf929aec0b6c SHA512 1b27712880417876f5a42b9312d8b4a4c22d4a8aa5a703ca332fed9e60284a4dc3d95868be2f180f2cb8c316b6ec7f56278206b3a4b6f6e5c1c449633c5a87e3 WHIRLPOOL 4ba7ec69c5c55921648ea7f57379e881647eb46f2e24e198273984c454026658163c24a535121c65bb2d7b18e7fdce571ccc831598f654f3c7dec8fd26a49d69
 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRzw0QAAoJEJWyH81tNOV9X0MH/0TANC9W5N8ftCV94SE38+7L
-QNAeTUWC7V8EtTKqtiElxDeBucEE0yRNWesqxRaXAjicdIteVJUJl+Okmcz0y/6O
-cTfX9qcdCEoAsS/sREHUP2yFHoKsMI20uX0w+KiQ7sUfXrPkFRjNLF/y+hjzAKLQ
-nGWX0C/035oCxhAyLK5Kzd0BL+ZFiz/gdUe+Akw48aTsfG3yBBlrMQICDuElC2Ng
-Q4wf9JARZxWhx7Eu0LA/JD3ae+UO9DhZ3s1OfT+/c0jzCE6shLghbsCW2p/eWtKV
-tkz+a+diKUPIw9/RxpfCjZFHfGpoR3p5FEy5CL9PjKW+10CfSG7KOle/3JLpAlE=
-=4VAm
+iQEcBAEBCAAGBQJSMIrIAAoJEJWyH81tNOV9B+AH/0NK6VGhkURWUbqpuepjvlpW
+1EMBUCXRB4+qJYjR/KfKvCIet9oJCMsoO1zYM6+UN94SJHKyW+rdL399oEA1RIww
+s9z1ZMV5UbjrbXm65M2LBg94fqwmuVDES9Q8P5gbkInp386rD+MjMTv31FqqIVyx
+vNoJpOQhgHrd1zAEej75Mqp0rfdE6v04pTpklV/UrfnJ8tAKhij+SnstUizqz2k+
+5ImFRyMufUAHl683YGTTVwZlsVshpvTc9XjhIxkLCYrKfEO7+EdCbAHgdj98nU6J
+ev1aNTVlcOLLM9QD2vWOsX+XxRZmkloea4iCXLo8PhfnrehivdRiECNrLp5QkVU=
+=V+HE
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.40.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.40.ebuild
new file mode 100644
index 000000000000..587e85d07636
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.40.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2013 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.40.ebuild,v 1.1 2013/09/11 15:27:36 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 )
+# 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 )
+FX_VERSION="2_2_40"
+
+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"
+
+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"
+
+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 ~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/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}
+	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
+
+	# 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 -v {} + || die
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}