Security bump. #455174

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

4 files changed, 279 insertions, 286 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 6b8ad028a6f2..90f213713343 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.345 2013/01/27 16:41:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.346 2013/02/03 09:09:37 sera Exp $
+
+*sun-jdk-1.6.0.39 (03 Feb 2013)
+
+  03 Feb 2013; Ralph Sennhauser <sera@gentoo.org> -sun-jdk-1.6.0.37.ebuild,
+  +sun-jdk-1.6.0.39.ebuild:
+  Security bump. #455174
 
   27 Jan 2013; Agostino Sarubbo <ago@gentoo.org> sun-jdk-1.6.0.38.ebuild:
   Stable for x86, wrt bug #451422
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index b5bede1f9054..46adb9c5b0c9 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,20 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fontconfig.Gentoo.properties-r1 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX sun-jdk-1.6.env-r1 1015 SHA256 31302b5ed417a294ecc9c475a08aca331a07c59d2c095978a574a7347aa12f6a SHA512 958c7d0ef04f30b07e8ee1ec36c3637ae2d2abc0d9f6da08b75b9bf81845caf1a7ac8e805e04ad39625cea4e8397174739cc72c33c13c57a8aa0886df3e95d3d WHIRLPOOL dbb7cbc7cc44c32011703ea9f9413a8798d922cc69f3ab67fb8af55a6914cacfad2b91a48f6a58428f1b71301f8287db07759d4d64ffaeb9c639b9a4a6debbcd
 DIST jce_policy-6.zip 9101 SHA256 d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262 SHA512 a1aa55f2ad919efcf63452aaa96303328b7449626efb342a7f8d9e7a4fe9c06ce22ce33fb89e768602b172b7d9538c432e82523addb0bbd4d1be22f934576b56 WHIRLPOOL 144a4891ca3f5f88f72c1a13283823845bd7e46b5fe941b4c192705e20e9fcbbf27819ee926577218dd3b222e41f7ee149cab6f9eea5a46febebea00ad2ed3bc
-DIST jdk-6u37-linux-i586-demos.tar.gz 12073474 SHA256 5667e0143eed0cabe8d42070ada07f3b66b2dcbdb491e4f48208004c833fc322 SHA512 1a895c5e3fec2890cac77d03789def0aada9d158761595b4ec98ba5a72bb1598a245ec699c5a65b8b1e20651b597327c9eea7804a75e2f1c2a76b1840d8f02e8 WHIRLPOOL fe1170435557f540c2ca44ea112f2ac85f89fd3369ea3fd2f5b495735b75f20e3f7ce851c2bd72bfc6e5f73206b0add25bdd7ec62d07a54c73d420bfb9bde3ba
-DIST jdk-6u37-linux-i586.bin 71764073 SHA256 44cc51ed452a08a3e0b4e397922832607161642e5a6e206f256af86f8fbaae90 SHA512 d2474c57b7b282f739b96c2330ad35b28cd1130c7b04b3e672d4eea55311a74d0ddc26a602f1732864c70af3ad4e051449e400df663540b18a40c8f6141f43e2 WHIRLPOOL 15bed43c4a6d7829c17575805f47cb9f204d86a2ff6150f4305564438715b63d08125aad77c91730d41313cee0b9dbb6ad790b0c5024c4f694593040e7abca5d
-DIST jdk-6u37-linux-ia64-demos.tar.gz 6858701 SHA256 37ea27a3684e8ba0073224720c99ac4a6cf6cc91b6099417af8b7c09969fac9d SHA512 efb87048d0e21167a05644ce694af68bb597bbfd36613f87c9ea82a729c1c45a77105136501847ba18b7f39f5c87b9e062ec6bdf8a67e6c221939ea4d3f86e2e WHIRLPOOL be393e60dc6a9140b78662806eb720e0cd8270466442f740e420533f546345cdd4fcd217e8b9593dcc936f9869a145c69f79d54196a6c06cf93d1cf5d656d79f
-DIST jdk-6u37-linux-ia64.bin 63612204 SHA256 2ba64c3fc5c41f37f738ee44a14ee3a8f4d8b3a87ce255188a4934c8d8dca6d6 SHA512 bf0217317179e03815ec6cb9675ddfd2102de37883ef6b72c855a74bc58a62ef6a763f241a85e71765fc5c46191d3bbb213ab62b1961051cda8d2d5f6e3708ca WHIRLPOOL a9e6d7d9dea1800d5180f8eb407e0acfac84ab030088b8753e85a606a042e5453d150b7332fc2f138653d30a18bb91e5fae21c42b78795de3331ebc152631e97
-DIST jdk-6u37-linux-x64-demos.tar.gz 12105736 SHA256 1126ff9abd7e9177fafd4ac6c3750c8925b3e68d925a0f89f4b42a4a6a3c0aab SHA512 a38c880a995fe6a93c924ce3d1e920d9e6e7dbd9f28605d97d558d474ac2380e27a90ca0619cec65f4835c557bc2abb859f6493d0bf8321edfe79106004cb9a9 WHIRLPOOL ad673213ac247b7c1c39d4fa0e961e4c6ecdcb406328a898d0bc45ccf67d2f668a4949aaf044cd4869c2a1d3fc21b59cba848671c7aa308c4b0e53b945f98698
-DIST jdk-6u37-linux-x64.bin 72048548 SHA256 51d594cec29948bdf58918ba802a872826bc7caae3f0aada42b65eacdc14a7f4 SHA512 93780e2b29e700b7546014b066e156c94ae31056cf3a030df368d1d109021d6c949b4c0b6980d905ab70888cea612e7726b1f29f581fe3a96e50e144c9471951 WHIRLPOOL a574729d2d5b2385c0ebed2160461ffa8e48bef5edf253c7a49ba0d36c275646c8e623119af3fa823a643003b008fa37ad417db013a0f1764e221bb5e9cd3002
-DIST jdk-6u37-solaris-i586-demos.tar.Z 17939213 SHA256 78af707100eaa720d8ddb547ffbb4df71c55fcea95f354619806b97e304cf1ef SHA512 6fbd9e2accdcd87e76dab6f38e9fe63d07ac8bfadbc5d5f7180c6c7f38baa56589bd4c76aa4265cec97ea7de413704f9827747340426aea096e5d52388dc7682 WHIRLPOOL 65607dcfd54e5dc4c9104cac33fb59b78b237c58a88bc15af6e75ea08c86bbe7f02e8f2ff7bf233646d97e3f66cdc2645ca559d97512c2f3c471b8e163ad5876
-DIST jdk-6u37-solaris-i586.sh 71675046 SHA256 fce348288c2ef99d951b5bc8debb9c7acfae332681d48436809e60b0b2478810 SHA512 d4e70cca24728a9081576883b0e55d5dbfa03b330c5395209566924c2180afa35ea159f14f18824338f5f57411fcf1a2153c62d58a933fe2cf26695d401c98c2 WHIRLPOOL e7c338de1c2b66c86cf6616734803e0aa56d80b5309391a05d7fbef962d9f74da23f7eaa8ecefee35040fa00b4039a6f98a2f10716d561e5637f9bce2ea4a100
-DIST jdk-6u37-solaris-sparc-demos.tar.Z 17914591 SHA256 730271e5a9e33576ff5df3bc0f84c4550f241cd61582f8169247f15c55db5bc5 SHA512 c5e9595fbb418e4bc3f2e08e6c4d9ed0350aa4d9b86338d7e872760cc3fea37f967950c274ff4632ccbdc238ef30b5ee92f487b8ee43cf48c28d0085af563f57 WHIRLPOOL 2dd6fc51a563550b5f694a7dcddfe84882fee9b00b98d065c97183f856132fba6b5b1515ef5e1342921d5069405369e9cb15059666cad962c4c05eed1ad39db7
-DIST jdk-6u37-solaris-sparc.sh 76926483 SHA256 060ecb4ea5d88287ef3e9423650c0010ac40673169fc3b2f8b32fcf2056bcc90 SHA512 b14a0738337fd6d626c7ccce4fe000d5f9965594a5e72cdfe60e8610014d256485eb915580964869c8bf4f6d923dce0d26d5fcd28490fdda6642a09a6d333f6d WHIRLPOOL 56dffb8ba72e1301a213fbeed2a25649b16b6174621bafefa0efeb0e0cd2c040d6baac0ae3c7e65f473a7b1c8360ebfcc7f054b3ef6699d73317e1c72b1b7ea5
-DIST jdk-6u37-solaris-sparcv9-demos.tar.Z 66837 SHA256 e40fa3a6147b85e4467a63f58d9542c16fca8131bee6cfb3a1421c16bfe4c64a SHA512 316ee418edfa82b9e9e9af4953e650abc41758114504841b632b94d60a0dbf42398adb2bc560b20b3571b50cf2cdb09e241298e2a722cd07f642a4366db3de21 WHIRLPOOL 754f6ffb2d035358c32ffd386398f81f18ac7d1664bb85d155e18759527a61a6261dd37e5373685d1daa27e105ae04111b537b4f900747af80bdb7fa273baa29
-DIST jdk-6u37-solaris-sparcv9.sh 12721088 SHA256 876360d8134676600f24b13421500944453331f970164bd74d5e172300a607da SHA512 78f83d39891b4cd20911e9be27deb83d63916f7b7fd8b1254a40b97f423420a92976015c1f797b504ffcc169cd083ae15ad768fac87a1bd819e69a78e50c41b8 WHIRLPOOL 64bc97017a1243cca70f29b48549648b630d4f59ee69f4f8b2ecb18ebcb9442ad7ab3d5d25b87a1d700dc9def669da60a876c5c42f5f8274cebec4cebf29e90d
-DIST jdk-6u37-solaris-x64-demos.tar.Z 71859 SHA256 2e9bb066c52de60ca3512d5f88572a0d6b5a1756d81ce824e8ddbdc6f5bd9a76 SHA512 a98ad8f8688fa7dd7b769904a781940dfb6f39f10fc05bf6315cc8da36cc27331f95b6299fdaecf80b1a4df4f421043a009a6c9b83dcb53a190bec6af16f90d1 WHIRLPOOL 75559b69685e1cb887eb51f71dfc76fc108851f71010692ef092c3da0cb2793148d387e75deed9dca963197f8f6f326bf5311d00b8e0973681b2053e99bb728e
-DIST jdk-6u37-solaris-x64.sh 8860012 SHA256 91fd4850ca3c1dca3f2f6a9528138540f2b0ae73c70ca2077afc056403fc3d62 SHA512 d1d58db111a1023da660291b00db70934c3e1de2db42e1dc56e6f173a3f486d2dd49044598eccfbe5e4bdc247955b5b23c4305bc81a183a085ed5b70b0819330 WHIRLPOOL 7f3d0b0d035135aeda88064747fc95f1bb168a8ac726a841a4b667bd2fdb2d4e2256b9295bfa565bfd4b9ca54783014fbbcd709fcdf841cdb510c7cd019a836f
 DIST jdk-6u38-linux-i586-demos.tar.gz 12073550 SHA256 cb69d792495c554db2de171893cf5eac936a4ffb11491d30e4a282ba4c64e08a SHA512 b35c7cb59272162431bfff9b4aa32956017ec7465a28010612bd9e214e80c3a9927151d1a025a2365d55b6171c2ab3e5dec3876e66b6d0ccd38df32d2df70d7d WHIRLPOOL 7ef4ad0131e5aa07522ce4471b87351a5075405f6d5d600ce5a27c74b1a3637ff3772b4dd1e2369e8267a8af680f100d379a3b6c141093e86146085d73bdb20a
 DIST jdk-6u38-linux-i586.bin 71771782 SHA256 34b698c3f27f961c092cd982843a890fccf1ce1f9928c7e53333527dd60a63b0 SHA512 4b1a93b5d669181aef961a017efb50f1370ceeaee2a1cbeb16fbbf51c15ec9efda2a3744d7d4e4601b3357187232f9a35e4e01e095b582bed5934cb9201a2567 WHIRLPOOL 1a1311f242391e96f30ebf88027504385aca0b64ab3a79cddb688bedc0efba229f43a3603f81861e033f11fb82be4281ca3a3afd1082998307be19bc78ab09fb
 DIST jdk-6u38-linux-x64-demos.tar.gz 12106066 SHA256 59801687ef42dc8a0022c036bad738f430285e57dfcc073c51390171f0047fcc SHA512 d574d48e1c2eda1a16b8d6bd649252dc76fc8d71bd953829875af7fae8c18de3bf6ee574f6a0b0d7e481f9e83ee64981f263a15c3d753ab9b0c20091b9d1b6de WHIRLPOOL 98faad9323bd0ea41c1c02e8e4e77feed12e73d80ec03d20d2a60a8852081ab4cd08b8d06db2e7c7e3714092ad272490c650e9f99ae7dedf936ee3c580cce7dd
@@ -27,7 +16,24 @@ DIST jdk-6u38-solaris-sparcv9-demos.tar.Z 66913 SHA256 4dc24d49cc2dcd4e1f4afc96c
 DIST jdk-6u38-solaris-sparcv9.sh 12721403 SHA256 1caa5b1a2e901872c3fec1446aa8df1b48413b4265b9fe6a06d121782800c3da SHA512 668d99a30d5743a04dff8a3a56635332702ec18417c700948bf814c9486d672a0653bb6ea6d173a5e1216e103593350594e4b3864e8e5dfb4ff3283aa3a3b94c WHIRLPOOL 1bcc2522c312eaddbef5ca9058b05cc6934915efa5f19fcf5bf2d3875f71f47ff565531a7df797234cfdcea7a902cc782c92b001eca20e5abd5e3fb5a6334493
 DIST jdk-6u38-solaris-x64-demos.tar.Z 71907 SHA256 71fcc7b04108b8f12bdc2570d5ac2b14ea8828ac2a24b20037932d496fbb91d1 SHA512 1fc4a0e2167855373d10d66178741dc7259d02b672cd58b2bb49e954c2a1e74f26147415f5eccec9028d33d9b3643be778fd85d2460ab048259d10f51ee2f8f0 WHIRLPOOL 87f03c2e628e4a65625bdaeb22b77ec4f91c9409d56cbb537b211dc50fed1f9f72d484b5934bb1713d31fd63d119031d87bfa03f2df7c98549e8b3f4bbdf647f
 DIST jdk-6u38-solaris-x64.sh 8859356 SHA256 e7b4f09dc6c66e7aac45d155cfa8cefde15ed5b0c23e5fa6c03a45d5bbb75248 SHA512 45bd7cd382ca82bb3f84c3fdfee4ed092c90d079f2cd67627539b4ccddc833583fde3280aa50e5102a04a8e9a1e8e7274263b2b910911fd6c81742aa50221f25 WHIRLPOOL 5644176454ac8c8e1254724b73e321e959da0855326d2bdeb3fd5252c67ad86c8cb53d95627e720eb563ca1fdd2d8463e60fb5a7ba5524ead42780f9c7bb615e
-EBUILD sun-jdk-1.6.0.37.ebuild 7844 SHA256 0209fed12ef55bc11926e6fb94f5e2abe01bfe50cc1a904cf2196048ee146ae4 SHA512 063dbba982b93f023a45ba3d92a4664eaf78163b3699249fd433b6aca87053eb13612f83189fd9fe8efbaf1e237301e7e7367c6a848222dfafd817787af7d2c3 WHIRLPOOL 648d49ca9f61ff0607c1a0d396bc15521b73e230da404b2ee81c9239a3cc8d719e57455c50bdca5fbe02c3abbca8614eaad98a34f463d49d5b7e024e2e71a92b
+DIST jdk-6u39-linux-i586.bin 71756435 SHA256 98211a71eef47f9e73a57b32995ca4b698d12b4282c90ffff8c533fa8b96d103 SHA512 22a001deec16c800fc9ab5efda474463a95c0b41055b181ea02a5310b39457fb6dfbb99353be5ff7572699371d613a02d81f3d129de0a94221b25a79a321052b WHIRLPOOL 21ba8f4d51fe1a544c18f4f1de666e65e8ac7d6c141fcda97fceb171173ac2af505317797f7839acd90e37e66f2bb73a3f49d72bd22042dbe263418ba8d12a0d
+DIST jdk-6u39-linux-x64.bin 72037515 SHA256 3d7ff1130d1200c087c54749f1c72856b8d384033cbff6343abb953e4c152b59 SHA512 c35dfb7968d2435dfe1262184143c482c9a49a4e65ccbde8160ea08ea146c104b0fb4cd1e5eb0bb2eeb9e750ef39a2ba057291c94bc355c268af30768970bb40 WHIRLPOOL 4e56fb814604d6146b8b7a603d43a460af4c55ee4b4fe2cde244ece31797a036350b6fee645f1a6c23b2ab2bdca8ea167854b7f4dc69f80e349c20638ae836f2
+DIST jdk-6u39-solaris-i586.sh 71664523 SHA256 7119cbea5ee877319ac5b6cab928d32db8b1ffecc809fd74d74b81f8a3e97338 SHA512 7f1977c5f846f69e8d243d618cb179e3b199ca4e46660894805b38ec015c98c4eb5017eb2f137d720801625ded73b713d4020275a552ec80192a66274e708135 WHIRLPOOL cbe3866070226ba07a2f3e60d96e6e19c23ae2a0bd216788967b064dbebcc9fcb62003fb2738629d5ec06cd11f0abc2989a43701fa722c6c5faab5601235f547
+DIST jdk-6u39-solaris-sparc.sh 76915886 SHA256 d3432bb364fed257f593297d6752128fe728ba9b1f965d2ea99cc0a8753a22a3 SHA512 1837823f9b54336ccc1f4269beddfea6c61bb025c0ce44fe5caf8fb7f027186284ed7cfea914d0d5297187623d6d1c71c433ea0dde758cf42ffbccbf8075b52b WHIRLPOOL 547bc12721ccfd0fcc149f684b96b57b6f40f177a7bfec83126075338245ca746bdea1ebfc653966968b69baa692ba320146aeb5522aa550da17e92a95c98535
+DIST jdk-6u39-solaris-sparcv9.sh 12725295 SHA256 435a9565edb36580d7cfa9a06f86b9aec91fdd434432748896eba807dbfeb2af SHA512 f4f26fe1655cc8b1273dd3cb6b8f80a40d6e0008cfddaed6b2ccfabc5548c58183175c038b7fb4929018ba637cb4b560046fa45de1e4c21c97b264b2d0ee66d6 WHIRLPOOL c10ed6684cc6c4cd8c6c38523dd20af2bcae6ece67a0256bf85a56240c095e5fd33b9ef93de2aa7e6854b49adf3c131966cb0bf507d737aae494406c77e26225
+DIST jdk-6u39-solaris-x64.sh 8861523 SHA256 161e859d2fadb045df7f69d88a72402bc04835caf646482a7e13bc04a3912a01 SHA512 8e5e886e897b6247f7347baf55a30ce8962fc117328376dc8c0e23d63d9528a8c3fb005d4eee1094cc90bb9b3c36efefa4261774bca67fa33ff52ec8cd1bc714 WHIRLPOOL ce92211ab1b0cd34fab7beb0fd82daf9a6c413207e043bc19bbeceaf8334f37cd5bc60dad5af4b64c7a013e8261fad64e72d178ef40d6d0f8c7b786918e9d904
 EBUILD sun-jdk-1.6.0.38.ebuild 7935 SHA256 20ee47d28740099db73fcd18ebf7a87eb88f2a35d47e92c6666333320bf5a3bf SHA512 6e3e3d9b9d4d1a00f26001324d98dbb77d18fcc549f9df3138f82352e48e32a3ed8328d5525df0e6d5c1edda0942e7e5a2c026d4d6b77657cc48d92e6e80511c WHIRLPOOL e09a812e05526df2021387051319008cfbb1abf7f907b86dd317f67417cbeb5442159ce06c025041b35c4cd038a5aaab652c46279d4a1acc7096e0a8eaaf6402
-MISC ChangeLog 63029 SHA256 91dc04d20584f4ea44a6be43d3880ba7532040ad875ad7d9942cb11fc03d0a79 SHA512 098bc27276c875f0d537aaddb34678ae1c1e292c7e77bff37c3d3c3eaf5a675d3bff6ba0f945c7fd55e761bfaa6ddce59845df4c52d5e2f86da6f7e7ed5edb95 WHIRLPOOL 7d7c9b2726332447fa381bfd81253d25af3a5fe3b2f3b041585ec770ce5b933123551247e01f7ecc3b4094bf90bb2434d53ed4966c787cdb3f01b4aab3ba446b
+EBUILD sun-jdk-1.6.0.39.ebuild 8007 SHA256 258849d097626d22bd28cffa3009e5ff705f4b978e4729e89b061da8d854610e SHA512 1da7ceb9db077784459c77ab49e2e7e4a55abc4825652c0d15175e354b99d92a7913ccc9c63c18bba4ed25547cef40b549851c57893b42a5c2037256382b7a12 WHIRLPOOL fd3db702ad0de43fe941ef99fa13b88f394ebeecad47eec40d1c83f348b851dfeabad71eb379e19882033b43d58cfd58eaccdd6ff02ed880835b6a281bc00681
+MISC ChangeLog 63193 SHA256 02b71609b6f501a59a4f579c65d481a858729d15fed752029098601cf9f1eb1b SHA512 e24508436f5c719345905d443b80bdfa15c6fa2108020586c5f373a1f97002fe93e18bd809134c80fc7a4cb8412913df3b56963d456d7fad195c8c66ac607ca1 WHIRLPOOL cbb0ae048253bad3de25c2bf31c5125985122ffa128da1e11b07fe80c7b1a1b6a008c13cbeea51ea92ba60060bf7082d97218670aebb0d9d87e0a0b641361e3c
 MISC metadata.xml 501 SHA256 08a1a9de353c1d04f91b559372baa885fba76dc04654d2543f6c723e013b12c4 SHA512 06b541c8c2e66e1237edc1b3885416aa6ab4531b9fa3f90e258718fd654837d019fa48bcd5a1220597f2fe8a2dac5c9d48d68a2076c04e423eeaaea0638fe420 WHIRLPOOL 361a32717dee2310fb2d07522428ae6fab422a34e2e97fa1fdfb8c20210946c1611a28029de663dbc39825fcc409839a2fd3a4adb977a12c1606d54b6026ca8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRDiqMAAoJELjwI6Q8XPdaPckIAKVDGHe/0w0EISRiNuvmaLpI
+jhE8tSgqGxJN1g4/YHv5SPiQXw7YF9014UdddMhQ4iSKG7b1UqEw6sUA/f5hkzDh
+NHj/xYRIn4PUoDP/fuple1kxabuxnFv5ibR35zLhI7RwuTwdo2fU9pe3M/0hOGab
+xyuY7QCQbQ/VH+NvjysuJg174/dtbEQYoMY/YlrkPadyIMR1Ywf+iylJiGOOVr78
+Lw5VDop/Bjnax42O9aDUZ46smM4+U6Qd9kqn1kFPC4bOZLbd1AjyEYmQotG3E4Zp
+f+KsvqJL1HiG1nveFnmJykZgqonyFROSOHC/FlPjijOdRKhUQzLsqiAz5fhnaco=
+=njGV
+-----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild
deleted file mode 100644
index 9ef6c0e67ccf..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild,v 1.3 2012/10/23 05:03:16 nativemad 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/jdk6u37-downloads-1859587.html"
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-# for when oracle messes with us again.
-DEMOS_PV="${MY_PV}"
-DEMOS_S_PV="${S_PV}"
-
-X86_AT="jdk-${MY_PV}-linux-i586.bin"
-AMD64_AT="jdk-${MY_PV}-linux-x64.bin"
-IA64_AT="jdk-${MY_PV}-linux-ia64.bin"
-SOL_X86_AT="jdk-${MY_PV}-solaris-i586.sh"
-SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.sh"
-SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.sh"
-SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.sh"
-
-X86_DEMOS="jdk-${DEMOS_PV}-linux-i586-demos.tar.gz"
-AMD64_DEMOS="jdk-${DEMOS_PV}-linux-x64-demos.tar.gz"
-IA64_DEMOS="jdk-${DEMOS_PV}-linux-ia64-demos.tar.gz"
-SOL_X86_DEMOS="jdk-${DEMOS_PV}-solaris-i586-demos.tar.Z"
-SOL_AMD64_DEMOS="jdk-${DEMOS_PV}-solaris-x64-demos.tar.Z"
-SOL_SPARC_DEMOS="jdk-${DEMOS_PV}-solaris-sparc-demos.tar.Z"
-SOL_SPARCv9_DEMOS="jdk-${DEMOS_PV}-solaris-sparcv9-demos.tar.Z"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	x86? ( ${X86_AT}
-		examples? ( ${X86_DEMOS} ) )
-	amd64? ( ${AMD64_AT}
-		examples? ( ${AMD64_DEMOS} ) )
-	ia64? ( ${IA64_AT}
-		examples? ( ${IA64_DEMOS} ) )
-	x86-solaris? ( ${SOL_X86_AT}
-		examples? ( ${SOL_X86_DEMOS} ) )
-	x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT}
-		examples? ( ${SOL_X86_DEMOS} ${SOL_AMD64_DEMOS} ) )
-	sparc-solaris? ( ${SOL_SPARC_AT}
-		examples? ( ${SOL_SPARC_DEMOS} ) )
-	sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT}
-		examples? ( ${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS} ) )"
-
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.6"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel +source"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	doc? ( dev-java/java-sdk-docs:1.6.0 )
-	jce? ( dev-java/sun-jce-bin:1.6 )
-	kernel_SunOS? ( app-arch/unzip )
-	!prefix? ( sys-libs/glibc )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jdk${S_PV}"
-
-_set_at() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	elif use ia64; then
-		AT=${IA64_AT}
-	elif use x86-solaris; then
-		AT=${SOL_X86_AT}
-	elif use x64-solaris; then
-		AT="${SOL_X86_AT} and ${SOL_AMD64_AT}"
-	elif use sparc-solaris; then
-		AT=${SOL_SPARC_AT}
-	elif use sparc64-solaris; then
-		AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
-	fi
-}
-
-_set_demos() {
-	if use x86; then
-		DEMOS=${X86_DEMOS}
-	elif use amd64; then
-		DEMOS=${AMD64_DEMOS}
-	elif use ia64; then
-		DEMOS=${IA64_DEMOS}
-	elif use x86-solaris; then
-		DEMOS=${SOL_X86_DEMOS}
-	elif use x64-solaris; then
-		DEMOS="${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}"
-	elif use sparc-solaris; then
-		DEMOS=${SOL_SPARC_AT}
-	elif use sparc64-solaris; then
-		DEMOS="${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}"
-	fi
-}
-
-pkg_nofetch() {
-	_set_at
-	_set_demos
-
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
-	einfo "has become fetch restricted again. Alternatives are switching to"
-	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
-	einfo ""
-	einfo "Please download ${AT} from:"
-	einfo "${JDK_URI}"
-	einfo "and move it to ${DISTDIR}"
-
-	if use examples; then
-		einfo ""
-		einfo "Also download ${DEMOS} from:"
-		einfo "${JDK_URI}"
-		einfo "and move it to ${DISTDIR}"
-	fi
-}
-
-_sol_src_unpack() {
-	for i in ${AT}; do
-		[[ ${i} == "and" ]] && continue
-		rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE
-		# don't die on unzip, it always "fails"
-		unzip "${DISTDIR}"/${i}
-	done
-	for f in $(find "${S}" -name "*.pack") ; do
-		"${S}"/bin/unpack200 ${f} ${f%.pack}.jar
-		rm ${f}
-	done
-	if use examples ; then
-		for i in ${DEMOS}; do
-			[[ ${i} == "and" ]] && continue
-			use examples && unpack ${i}
-		done
-		mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} \
-			"${S}"/ || die
-	fi
-}
-
-src_unpack() {
-	_set_at
-	_set_demos
-	if use kernel_SunOS; then
-		_sol_src_unpack
-	else
-		sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
-		use examples && unpack ${DEMOS}
-	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
-	# limit heap size for large memory on x86 #405239
-	# this is a workaround and shouldn't be needed.
-	bin/java -server -Xmx64m -Xshare:dump || 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
-
-	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 "${WORKDIR}/jdk${DEMOS_S_PV}"/{demo,sample} "${ddest}" || die
-	fi
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	dodoc COPYRIGHT
-	dohtml README.html
-
-	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 /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
-			"${dest}"/jre/lib/security/US_export_policy.jar
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/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} (sun-jdk)#" \
-		-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
-
-	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/jre/lib/fontconfig.* || die
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto "${dest}"/jre/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	elog "If you want Oracles JDK 7 'emerge oracle-jdk-bin' instead."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.39.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.39.ebuild
new file mode 100644
index 000000000000..bdf71ed3e90f
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.39.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.39.ebuild,v 1.1 2013/02/03 09:09:37 sera 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/jdk6u38-downloads-1877406.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html"
+# This is a list of archs supported by this update. Currently ia64 comes and goes ...
+AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
+# somtimes the demos are missing
+#DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
+DEMOS_AVAILABLE=()
+
+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.bin"
+AT_amd64="jdk-${MY_PV}-linux-x64.bin"
+AT_ia64="jdk-${MY_PV}-linux-ia64.bin"
+AT_x86_solaris="jdk-${MY_PV}-solaris-i586.sh"
+AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.sh"
+AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.sh"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.sh"
+
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_ia64="jdk-${MY_PV}-linux-ia64-demos.tar.gz"
+DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.Z"
+DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.Z"
+DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.Z"
+DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.Z"
+
+JCE_FILE="jce_policy-6.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.6"
+KEYWORDS="-ia64 ~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel source"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-java/java-sdk-docs:1.6.0 )
+	!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 )
+	kernel_SunOS? ( 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 "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
+			einfo "has become fetch restricted again. Alternatives are switching to"
+			einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
+			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() {
+	AT=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	DEMOS=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+
+	if use kernel_SunOS; then
+		for i in ${AT}; do
+			rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE
+			# don't die on unzip, it always "fails"
+			unzip "${DISTDIR}"/${i}
+		done
+		for f in $(find "${S}" -name "*.pack") ; do
+			"${S}"/bin/unpack200 ${f} ${f%.pack}.jar
+			rm ${f}
+		done
+	else
+		sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
+	fi
+
+	if has "${ARCH}" "${DEMOS_AVAILABLE[@]}" &&  use examples ; then
+		unpack ${DEMOS}
+		if use kernel_SunOS; then
+			mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} "${S}"/ || die
+		fi
+	fi
+
+	if use jce; then
+		unpack ${JCE_FILE}
+		mv jce "${S}"/jre/lib/security/unlimited-jce || 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
+	# limit heap size for large memory on x86 #405239
+	# this is a workaround and shouldn't be needed.
+	bin/java -server -Xmx64m -Xshare:dump || 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
+	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/unlimited-jce/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/unlimited-jce/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} (sun-jdk)#" \
+		-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
+
+	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.* || die
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto "${dest}"/jre/lib/
+	doins "${T}"/fontconfig.properties
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	elog "If you want Oracles JDK 7 'emerge oracle-jdk-bin' instead."
+}