Version bump (ia64 not available).

Remove vulnerable.

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

4 files changed, 138 insertions, 534 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 4b6fccd6de06..830a2ba11175 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.341 2012/10/23 05:03:16 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.342 2012/12/19 14:48:59 sera Exp $
+
+*sun-jdk-1.6.0.38 (19 Dec 2012)
+
+  19 Dec 2012; Ralph Sennhauser <sera@gentoo.org> -sun-jdk-1.6.0.35.ebuild,
+  -sun-jdk-1.6.0.35-r1.ebuild, +sun-jdk-1.6.0.38.ebuild:
+  Version bump (ia64 not available).
+  Remove vulnerable.
 
   23 Oct 2012; Andreas Schuerch <nativemad@gentoo.org> sun-jdk-1.6.0.37.ebuild:
   x86 stable, see bug 438706
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index c83ab72cfa37..5180a9f2d5da 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -5,25 +5,7 @@ AUX fontconfig.Gentoo.properties 10932 SHA256 893b469c87ba547122fe158941c00512bf
 AUX fontconfig.Gentoo.properties-r1 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX sun-jdk-1.6.env 940 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8 SHA512 43b598c7f3758c882a192c1e92b98dd659fc32c58ed24dad408b7a936ebeda44407e9a26f6042844ae8f6c5cebc1065b902e0d34df375f92c44f016f167705fd WHIRLPOOL cc5cd50a6bb3fedd944d7e04463258616bf1f2e06c533708e2a28098f4df30abcea1fc95948cd90715cfebba45238ee02d992c4ef65719b32bed0dd69cf7ae2b
 AUX sun-jdk-1.6.env-r1 1015 SHA256 31302b5ed417a294ecc9c475a08aca331a07c59d2c095978a574a7347aa12f6a SHA512 958c7d0ef04f30b07e8ee1ec36c3637ae2d2abc0d9f6da08b75b9bf81845caf1a7ac8e805e04ad39625cea4e8397174739cc72c33c13c57a8aa0886df3e95d3d WHIRLPOOL dbb7cbc7cc44c32011703ea9f9413a8798d922cc69f3ab67fb8af55a6914cacfad2b91a48f6a58428f1b71301f8287db07759d4d64ffaeb9c639b9a4a6debbcd
-DIST jdk-6u34-linux-i586-demos.tar.gz 12074821 SHA256 4da9460638afb9cb6ae1e48417b36a297feb455a01b9baf839cd815bca6fc2e6 SHA512 001a3b3f2cfbb963979505f4842f7796d4a1f09e6b3b9fd637f449b8b959f0ffa14a95b42a1a879c573b825e3c2d8e4e62a13b8db8c6879d1eb51f6eafdb0dad WHIRLPOOL 24e460a863a0b599deef0e0e65fd9f4ce100e7a35df614521ea4e85cf2fdda04517571a119e0687fd3a04105e07361044a0ae925a89dbd20f276294cabed5afe
-DIST jdk-6u34-solaris-i586-demos.tar.Z 17940319 SHA256 41901e3a9e47a3f5539dea121d22f9b8282a469b90ed719c0e989adfe2cffac2 SHA512 5d6740899d341655bccf4846ec2be63b782ceef005b263ae7d05ba82b7905c167a66e26aefce500a14d73b33ffaba80277c2b69390cc2f42a16ea01e246d2ca1 WHIRLPOOL 03f974eda73ea6359b6b044356e67cb4230fcab66d7d2a33e534e889e923a4233ec3fee8b285cbe20656ec39fb5d668098bd881c87d0b8eaa7f052f5b4e46863
-DIST jdk-6u34-solaris-sparc-demos.tar.Z 17941087 SHA256 67eeed36136e9bb238c17136dffcd221275144d468b450e0264e2ca09e90e0cf SHA512 994291ab5133f53384d7bffcdfab9da52d0dc2d7989f1d6c76902d550a8935a1ee1c8952f8ee40420dbb069e0f3fd4962710346082bb4d26b8ab8e4085f44749 WHIRLPOOL 5a1991299405aa37c8cbe2afe1a05a6e094e98feafd6b2e4b8d585f76e734a6cb388b702a368ec05e81099b0e5c0fb59be0d3282ddec69ceeb8fe8b8234c0069
-DIST jdk-6u34-solaris-sparcv9-demos.tar.Z 66549 SHA256 efdb5e27bae008a9f587b557c5a341f8746d24298cf1775c9f086565832fe331 SHA512 9177d54f45452a0a1c509b55c2bd4a2cf5c2d40d354982f679019d7cf162ceb0ece219e72216d622df0d99d8d636fc7da40cc497393039eb93a63189db235689 WHIRLPOOL 394b5986797bef82d148afe412a4decb3297d5c9f9479870f3f48d0bf3b9f153ade2bd784ff1e9c1bef54140247b7a83620a37ee8ca3cb86bf60ac6b94ee6e06
-DIST jdk-6u34-solaris-x64-demos.tar.Z 71869 SHA256 7f930f5694d9fd2cb98e9578abf6a2cbd4179ba819ea9eeb2b0ea50bcf382fd9 SHA512 ed0039170c4852fe43d81b36c53118866e27ffec72ddefc825274505403306b03194c1e13e529cfb2e5027d524ac521083918cbd82b78e7508077745353cb8ca WHIRLPOOL e7ec5ff1ff5b166f2cace26b43a3b51295c3259faca1c55d65447d36970531cbbb7b2d443435d56264c12f6c42ef0f42a8ba4030c51763d1f0e425402ed1dca2
-DIST jdk-6u35-linux-i586-demos.tar.gz 12073677 SHA256 d2889e744b5dcf4b1d482fbd66a982ec188d2e59a5c0fe1f20c688e5c9c68088 SHA512 8d77094f85196b7d0c14f0f234a7d16371f1424a26ba476ff5c47ef226d31636929169ac53133c73a9878bc50452083dfdc126648110798ebe589fa25316963c WHIRLPOOL 00823609891669e8768fac1035552e7efbdce70c4432c131567e35243104f579844133412e92f486d44bb9591a28dac0b043bf08656c90a60722b440a106ddd4
-DIST jdk-6u35-linux-i586.bin 71758261 SHA256 72814cf0e87dd1e6ea65f5f2827515dc43ea97256f5c7af3cca9d86555403fbb SHA512 b53115c5422dc63ebdd9a9dda06ce0f03105777a4f7bd1c184e8a07b1f7e8d9a791e56408018e12314f0ba29bc45068ac1581342af4ce62487e8a15be9a12489 WHIRLPOOL a05d419eefdf1af5241379c7769e34de8e8ba2640148c4b9433abb4cab305d082b407c25cb13f1e49df7d7675140cc18d83504094fdb65c2192a2264f0be6fbe
-DIST jdk-6u35-linux-ia64-demos.tar.gz 6858569 SHA256 478416f73273181539d5863071237a4d3b6331dafbe83a1b3d3d77fd72908969 SHA512 308f7a35509b370e15083ed39157196ca7b25584944ca7effe0a504961ea3e828d08d6ea7ef3999d823a581e4dd9a9484efbb000f3ea2fda5b1246213ad3267a WHIRLPOOL 8bb4b68e7e4b15f36e3c1d5e3a28b57c69b0fe7b59a090a95ffd81b4ffa399180c57aacf6f31e2c7e43fa5a18dbb17daf6775ce79d06a3e7115372d30accf5c9
-DIST jdk-6u35-linux-ia64.bin 63594259 SHA256 62b53a97b76cf14b0ce669889dd7f4b6094447116ad3fbafd1685e767ab5cc30 SHA512 71bc1b5826b5c1e3b4e92e63d6107f163b8f8fd3b473441f9d36bc6823853ea5d9617dbc1477b59dec33f199a0add51df3591520b14b9a6f4347cc3c550b5592 WHIRLPOOL ac36df7fd7028b2f43436cd07d93006708339b7432ed906c4726061a3d790bb8f1251fe2dc59cfeadb7c12d906ec9b6c9304e02c56327709a0f0e35c30bdc956
-DIST jdk-6u35-linux-x64-demos.tar.gz 12104450 SHA256 5144d91f589af03e20085fa3f801654a27a2e9555b01f1ccb3594c86402ef56f SHA512 516aa2fa887cffca497ea1f75b88a01e8f48aca3711f799a2bc74b8090b7720580cce9d07d4a92677180df15a313990266c5bac54411187f8ff57948ac0f9303 WHIRLPOOL ef8427a3381450788340d5b79edf939c659a421c17eb859ddd81197862b33bf29430f39e535271826f8ecb36fb06241f6757e35b83c05734c0448a1f924080fb
-DIST jdk-6u35-linux-x64.bin 72039455 SHA256 01dd8c70866ffd6351987bf7cb2331f077539f84d24a9c4581f230be5422a6bb SHA512 9476916a89c8e48b40933b30c345168d090697b999e505477d00d193ff1349b6c4307264bbab8d77ba4e3d13bcbf2b8d132d6800856eeb943e2b4ff7df090ef9 WHIRLPOOL 5378be4bbabb7aff118ecdb09933e84c11ae00236d9acda98d4a31c463de42536f26a61ea2f0d6f215ea5db03e314a17f17c9217eae7964d750c253dbcddfd62
-DIST jdk-6u35-solaris-i586-demos.tar.Z 17939571 SHA256 f7d512fe76b54ef2b231a92f9a859ecc29bc916ce290e6e30ef95290a36f1265 SHA512 ca79f0be6fc8886a21701808e4be6552aa78fae943598d47554bc12748735ac4750ad0400034418fab62481fd56e1225c0e1c352a1a0fe6ec059c36d1b241948 WHIRLPOOL 14089ff8bc7ec5f1a8ce49889e6c1c53e38408dc799486bf0988aa0730c5129bddb5b675f29401d1b2c9ee2769f872804924e09a3b5efe2efffdeabf6fa37ea4
-DIST jdk-6u35-solaris-i586.sh 71663533 SHA256 0db7d3bd48ae3707a94cefd1fbd3324f79c49ed9beeca21abfd40c8f0959fd69 SHA512 6f696ea49fd249e2999a9b5d0edb88838a0b5a452f96aa30a89cc0b03cf0209c1fd368c60753b606c7c2dedcd8b97e468b690e5df50002e31982c0dca9539744 WHIRLPOOL 28617d6c460e21a3f30313522b8fc645fb7dee5fc41ce1f4efcd13270b21271007f9823f60fed1ce6c47204be025c831f48d4acbdd0b1549c647d14fbf5dcc11
-DIST jdk-6u35-solaris-sparc-demos.tar.Z 17944919 SHA256 9450d576d0db56276877516bf2af49cde398bb26632750d3703066d9af780832 SHA512 6ac7e05e164210e8684b310c50a63ab35878ff387423a0d8ecc36c755707b241745e9ca202ce931638621a3194df2d2bd49215b10fb8797bf5fb40836c760dd3 WHIRLPOOL 7fcb0c890fc2055463ae115aa11ee85c4de172b439296d98f0c0fbb47944fb1156f2af641e059bbf2a300d895f5283f92c3d213a39bbb5251edb7f6608572e2c
-DIST jdk-6u35-solaris-sparc.sh 76895525 SHA256 6caeb062473e57ecfac83245e73706286285b8d5224dfda0bdef66dbd3314bab SHA512 e71a2a22b3316bb39538f130a3393cac4ad664b91ab50633028d1f9c1c610e02c6111c57cca7413f6c4fb6611986f00ec2a4d7f74589bea20f3e17a9ae063daf WHIRLPOOL b3f22d67f4719a18c1c02a7b3ebe786b39eb5201e6dcf261ac8b207bce2d85db0a0f5b95f37236881decdec04b6e52354c432b0f947dfdbd6df14c7ad39ae36f
-DIST jdk-6u35-solaris-sparcv9-demos.tar.Z 66629 SHA256 566ca5ee4d4215823cc11fdcc0ce19be1d42f0bfb8577083c7b138ad3942231a SHA512 62dd99ca2003391d1610fe86d4d34f90a8c130bb27a25001d34dee3569b0e8939e7dc6340691a64869c478a1baac5187dd0a974172bdfcc347df358f17c965ab WHIRLPOOL b78625d150f2f1d46683d0a2ca34ff26ead14d86e1bdbf31a9f01b99f839b2d2759e8ff98e4ec15ea18f0774601d1ee5d9ad01a104b2052aa64c3a483bac8597
-DIST jdk-6u35-solaris-sparcv9.sh 12708189 SHA256 1458b517adf62221f4b53af96e2cc703cb182d8f91c3df087f4f820c6a963ee9 SHA512 a7ff22acf25d263bec075a68dfa7983f1c31bb9ba36a5c31529e3d4fa4e2f0b69ab4b90d23a8b007efd29b0c54e56ee0162ab4ed3abcfe8b6bdbdd5491eb1563 WHIRLPOOL ca22e19e6818d72f037cfa194972c4e40538056afe29843a89bffde351fba8739c89f7980850d0724e065d3f35a7b57b4634d8f76514fd2794abfd45ddaad2bb
-DIST jdk-6u35-solaris-x64-demos.tar.Z 71889 SHA256 37aa09f8f31f2f5c6136581de90e79c1e71d887b9ec3563249d5b9064842b479 SHA512 9a936aea72d8f50881581a4208845365d6da4cec73cd7c784b22d098315b6e124aef517efdd645bbecb8c6794cf37fdd797515cc9fd4b26337b9afaab91ba0a4 WHIRLPOOL d0c6615b2a82b6d91c55bff665e211975f6829207bb25152d970a9f355b477a294ad3b1adafd35407b27f83017a77501c0a5f1a58b6f605be2a7a696b9bbfab9
-DIST jdk-6u35-solaris-x64.sh 8853512 SHA256 4a2285fe277821b90eb00f7079787938b653c77e2d3a6de116a6bd765aaaf6f5 SHA512 8e217250399bfa292737d3be3472b6f5741351e4e230d82820f6dd7e9455848d7a4e90e6d131c36e736615069d9bd27ccca800882daa180a6c6494898323bb40 WHIRLPOOL 074c3f952efa12d5a1ca9bf36161b4f7e43d4abef110b018258a7c8e7f0c6c8d8a11037134bb2f33bb8840a17e90bfeeb3a9685fbe6cca40b69fa1fbc6d48cd9
+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
@@ -38,15 +20,30 @@ DIST jdk-6u37-solaris-sparcv9-demos.tar.Z 66837 SHA256 e40fa3a6147b85e4467a63f58
 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
-EBUILD sun-jdk-1.6.0.35-r1.ebuild 7856 SHA256 2905cdc4940c7def8f0ef80240fdacefe4e53e54d5241cf6c669f3004121e338 SHA512 9478bc820127b5875ff252e260132792d2472336892b2a3312364b0c143ddc9259b5be867afe5c98241798209555da3d93adb802559a688324fa35d0426d0db4 WHIRLPOOL 06ac4d423fbfebe9f915d4075ef6e8202c7d80bc43335e1e322e7c0be39a4fb8acc8cb3539b6a5b845c57f63bd2eceaf8306cd41559c4709b579006e4d93427d
-EBUILD sun-jdk-1.6.0.35.ebuild 12387 SHA256 4d1ec1b6936615ba1b4b3d580ad5002fd8014ab1403558e9897afe4bc21607a8 SHA512 cb1eca5d89ef6155a99e01f89553b29541895824e65231504664441167566aacdcd3062d80321ea9abb113e9526df5572f3a7d5eca2a6d821bfbc2dd3fa85bfd WHIRLPOOL 71509f900c95be099882a764afad6bb0ed262422d8e464e198df1ec8e0815894a0c2ac20f47239b06fb2e913610331d33bd4e563d25384af5eef994661df5917
+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
+DIST jdk-6u38-linux-x64.bin 72058033 SHA256 0a14ef5e60a90cf6de38e0b7744045b4c5eaf9513a7174c8e6d93f21358fd799 SHA512 81eb9768aa78df0981721c9bf69dae73f45d8e529f62f5c960a495fff362931cda5abcd6a0f0e097c8ee154163f91c90a6c73f5bbe65acd0f43139fb820aa195 WHIRLPOOL c82b9cfe2bf2a9bc8b48849cd745c1cdaebccda6e844fd1c7b8436fdbbdbcfa8abfb5fa3f9814a467257378b3b0c1dd6e019fbddc311225dde33634f226b71bd
+DIST jdk-6u38-solaris-i586-demos.tar.Z 17928469 SHA256 0d4b433e0f74649137e484ff87f5306cf1cb75afec1f3b18c04c7d25404ded6b SHA512 a3a75baca65bdfdd2a2680dd00df6b77e0b6c7f09101b249c9d148089019a23147f302ac1bd915bac82b396201f0c30ae275bcd91161b01859731864164f0274 WHIRLPOOL 66ecbfe3676306022b384db479b2829ecc671e12fe4877432f9bdf2374a991c0a71f9b45f9477b785ccf481a49303cdbcd5f9c1a7e9e15b01960d2c370256885
+DIST jdk-6u38-solaris-i586.sh 71682398 SHA256 942720c56c175c21fdeecd5a7bfa0aae9d57bc0693e094674077e4a40a64fa5c SHA512 d50212b04a791ed3e0340378dea9bd937d4d69697c72b7079d5f5af49f2138afe2d57d9540dd9dca0cee68ac8b7765653cf71f1183d5aba3edbca4c161e9c9da WHIRLPOOL 341b079b40dc95a980f8066e5b0ce6ae8864b5aeb28bd77e0dd8c009918ee152488fc580a042c4941f59309bee66f6d2ebef08d5c6e4580b67576627714103fa
+DIST jdk-6u38-solaris-sparc-demos.tar.Z 17888763 SHA256 65b31b07e522204b20d89cf7e901fdbcf5c0392cd6dbe7e4bd36af3c201f9cb4 SHA512 01637f56edf7aef64c60391212c7043e3f520f645ba426a4ea7512f1f556b4a88beb39647bbbe78038201ad0c5083f571048ab8ce4d12df558a54a481b0ce2ac WHIRLPOOL 4b019920c0519f25e667584ca64f32340b9a81da55e6a748947033b0e0372097b0c31554445e544c51680d2f511ae28bc080ee2310a9cbc31b572f715737971e
+DIST jdk-6u38-solaris-sparc.sh 76916503 SHA256 8ee327fe04b310be48db9bcc1712c2abd8405c38516bcf0d96f325b477063c89 SHA512 07549c17190f97677790e9854d74079b61aac86d0632dad15e2a5e96aad3c6b985b4876a2eed3c54fa64a146f2b365ae7be71719b7438059855c6b91ad677490 WHIRLPOOL 00121a3946c2da2bb8207abeced5095ba43dd011b7dea5f29b6bf3ce091a8f5934de17c66fa0402e528f1b4fe1269d5f9aef7a61d8644b654c056d9d71ce9919
+DIST jdk-6u38-solaris-sparcv9-demos.tar.Z 66913 SHA256 4dc24d49cc2dcd4e1f4afc96ccf7e7113dbb545c08104f88050f1e17d119b164 SHA512 935a5a45fb794ec639f6c41ef32cbaaf4c94dad648e973b0b48932910a9c5a8e3884d04181fd6b2a92b3c7836cffea7de01429454610988e6ab1e139c8111ad3 WHIRLPOOL a706460b678b60f4bc59b76c92e159447abbe1fdae79f4334d400bd0f77a7d0eba9354867401ac0894df3294fdbfb455deb2180616226255046d25dcf3bc1b1c
+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
-MISC ChangeLog 62443 SHA256 fe9a8be21b4e0787a1fc393ee7c77ee2f253db9176d9e83f70cc20bf825ccc97 SHA512 ab9624b339dc24fa2f054f3a49e747c40e2efb5c7a628e85c55928f34eaf3f7721b86526a5ef7dbdbf4990aebbe38ea708f842f0fa2eaf76fbaa32c40504cbd0 WHIRLPOOL 0310b323c5ec037e0f9784e190ea10530f88ce466517b521f2442232a4402e3cb3c529b467eba6a4b2bd48840effa15a787395ece8a3f54fbc5feead8c9c3422
+EBUILD sun-jdk-1.6.0.38.ebuild 7938 SHA256 1cd1dd24946dafc603f247000011c90fecd5b936548f529ac9888dc32bb09bc1 SHA512 f447bfebe1b63c1d027e910e08102c7bab297d1d8b90a072196ed74bb28f72496e4971b508dd1646a73483e2b21865dbed34d63ee3b5ddeca714054007462f09 WHIRLPOOL d893a92836f8265cf4dcb62a53a7709f2e7e63e27bc3e0ffaba18691fcafdc01af488a4f0520838502a826c933218c9e524c5d3d16baff0b4de2070c3a4f4739
+MISC ChangeLog 62663 SHA256 1b8cfe6a000a0fd2a3d6ae40f0c9b95f67d5aac1434af9bf6f7d71248deb9592 SHA512 a72751906e366cdefe7edc836ae2865a789e37e3a585d9c07aaeea0dcf3654c7b15240d83386fe857181910d6201823b525a9d3808a35deadd642c30174f918d WHIRLPOOL 5b922c48e046ecf938eb9996555272d38799cde2a11983d7f0d6fc0beee11fe38087b5758c7f7790c1ee8e0db87301ba887df8be351200bc58b856c49559f214
 MISC metadata.xml 501 SHA256 08a1a9de353c1d04f91b559372baa885fba76dc04654d2543f6c723e013b12c4 SHA512 06b541c8c2e66e1237edc1b3885416aa6ab4531b9fa3f90e258718fd654837d019fa48bcd5a1220597f2fe8a2dac5c9d48d68a2076c04e423eeaaea0638fe420 WHIRLPOOL 361a32717dee2310fb2d07522428ae6fab422a34e2e97fa1fdfb8c20210946c1611a28029de663dbc39825fcc409839a2fd3a4adb977a12c1606d54b6026ca8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCGI4UACgkQakKUmsHeVLKvqgCfepVdcsZcSLJZVY5lpTkv1Cga
-gfwAn3dCogj47SGH/jhsDxoeaXd7hgD5
-=npkb
+iQEcBAEBCAAGBQJQ0dRXAAoJELjwI6Q8XPda4EEH/juKia73XeyJTdw5B3qyNWdJ
+QXj1D01hiYvIlnGD5K1afhDVJ162OS9ymePzsysmd8elb2uX/Y3MzgO0Q/RsFGqG
+gfpX6If4tV+2DIJA2UyuSm2SP5tgiTelW6IxCQNM/tso7ErHjpaIaHKiSNZ+Nb7T
+HQn8t3Dtee8Vd9CnoYSN3Xx7+7nNjx/MRdKEP18a0IGfc3lNh8WQ9J6rYZFTafaI
+Kn3WC6xxQAMe3mHeuf+gKw2ZsbuGKTaMv5db32KqWVZg+3+6HOzt+GnakdZIpDfF
+b2weTvENlmZZhbOzqPn0V/7q0h2tFK9HBvkDQcLGahZOv3nhxs1FmvjH3AZTeD0=
+=u9/l
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild
deleted file mode 100644
index 26a48eaa9ce1..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild
+++ /dev/null
@@ -1,380 +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.35.ebuild,v 1.4 2012/09/13 07:16:16 phajdan.jr 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/jdk6u35-downloads-1836443.html"
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-DEMOS_PV="6u34"
-DEMOS_S_PV="1.6.0_34"
-
-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} )
-	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} ) )"
-#		examples? ( ${AMD64_DEMOS} ) )
-#	ia64? ( ${IA64_AT}
-#		examples? ( ${IA64_DEMOS} ) )
-
-LICENSE="Oracle-BCLA-JavaSE"
-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"
-
-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 && ! use amd64; 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() {
-	[[ ${PV} != 1.6.0.35 ]] && die "Check if amd64 examples distfile is available again before bumping. Change SRC_URI and 'use examples' in src_{unpack,install},pkg_nofetch. Also check DEMOS_PV"
-	_set_at
-	_set_demos
-	if use kernel_SunOS; then
-		_sol_src_unpack
-	else
-		sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
-		use examples && ! use amd64 && 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
-		if use amd64; then
-			ewarn "examples are not available in this version for amd64 due to upstream error (zero-byte distfile)"
-		else
-			cp -pPR "${WORKDIR}/${DEMOS_S_PV}"/{demo,sample} "${ddest}" || die
-		fi
-	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}.png#" \
-		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
-}
-
-QA_TEXTRELS_x86="
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/motif21/libmawt.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/appletviewer
-	/opt/${P}/bin/apt
-	/opt/${P}/bin/extcheck
-	/opt/${P}/bin/idlj
-	/opt/${P}/bin/jar
-	/opt/${P}/bin/jarsigner
-	/opt/${P}/bin/java
-	/opt/${P}/bin/javac
-	/opt/${P}/bin/javadoc
-	/opt/${P}/bin/javah
-	/opt/${P}/bin/javap
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/jconsole
-	/opt/${P}/bin/jdb
-	/opt/${P}/bin/jhat
-	/opt/${P}/bin/jinfo
-	/opt/${P}/bin/jmap
-	/opt/${P}/bin/jps
-	/opt/${P}/bin/jrunscript
-	/opt/${P}/bin/jsadebugd
-	/opt/${P}/bin/jstack
-	/opt/${P}/bin/jstat
-	/opt/${P}/bin/jstatd
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/native2ascii
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmic
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/schemagen
-	/opt/${P}/bin/serialver
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/bin/wsgen
-	/opt/${P}/bin/wsimport
-	/opt/${P}/bin/xjc
-	/opt/${P}/demo/jvmti/gctest/lib/libgctest.so
-	/opt/${P}/demo/jvmti/heapTracker/lib/libheapTracker.so
-	/opt/${P}/demo/jvmti/heapViewer/lib/libheapViewer.so
-	/opt/${P}/demo/jvmti/minst/lib/libminst.so
-	/opt/${P}/demo/jvmti/mtrace/lib/libmtrace.so
-	/opt/${P}/demo/jvmti/versionCheck/lib/libversionCheck.so
-	/opt/${P}/demo/jvmti/waiters/lib/libwaiters.so
-	/opt/${P}/jre/bin/java
-	/opt/${P}/jre/bin/java_vm
-	/opt/${P}/jre/bin/javaws
-	/opt/${P}/jre/bin/keytool
-	/opt/${P}/jre/bin/orbd
-	/opt/${P}/jre/bin/pack200
-	/opt/${P}/jre/bin/policytool
-	/opt/${P}/jre/bin/rmid
-	/opt/${P}/jre/bin/rmiregistry
-	/opt/${P}/jre/bin/servertool
-	/opt/${P}/jre/bin/tnameserv
-	/opt/${P}/jre/bin/unpack200
-	/opt/${P}/jre/lib/jexec
-	/opt/${P}/lib/jexec
-	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
-	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so"
-for java_system_arch in amd64 i386; do
-	QA_FLAGS_IGNORED+="
-		/opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so
-		/opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so
-		/opt/${P}/jre/lib/${java_system_arch}/libattach.so
-		/opt/${P}/jre/lib/${java_system_arch}/libawt.so
-		/opt/${P}/jre/lib/${java_system_arch}/libcmm.so
-		/opt/${P}/jre/lib/${java_system_arch}/libdcpr.so
-		/opt/${P}/jre/lib/${java_system_arch}/libdeploy.so
-		/opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so
-		/opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so
-		/opt/${P}/jre/lib/${java_system_arch}/libhprof.so
-		/opt/${P}/jre/lib/${java_system_arch}/libinstrument.so
-		/opt/${P}/jre/lib/${java_system_arch}/libioser12.so
-		/opt/${P}/jre/lib/${java_system_arch}/libj2gss.so
-		/opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so
-		/opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjavaplugin_jni.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjava.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjawt.so
-		/opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjdwp.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjpeg.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjsig.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjsound.so
-		/opt/${P}/jre/lib/${java_system_arch}/libmanagement.so
-		/opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnet.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnio.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnpjp2.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnpt.so
-		/opt/${P}/jre/lib/${java_system_arch}/librmi.so
-		/opt/${P}/jre/lib/${java_system_arch}/libsaproc.so
-		/opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so
-		/opt/${P}/jre/lib/${java_system_arch}/libunpack.so
-		/opt/${P}/jre/lib/${java_system_arch}/libverify.so
-		/opt/${P}/jre/lib/${java_system_arch}/libzip.so
-		/opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so
-		/opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so
-		/opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so
-		/opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so"
-done
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.35-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.38.ebuild
index cc014ce0e81c..03121186f638 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.35-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.38.ebuild
@@ -1,59 +1,57 @@
 # 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.35-r1.ebuild,v 1.1 2012/10/15 15:51:00 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.38.ebuild,v 1.1 2012/12/19 14:48:59 sera Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit java-vm-2 eutils prefix versionator
+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/jdk6u35-downloads-1836443.html"
+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 )
 
 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"
+
+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/"
-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} ) )"
+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="~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"
+IUSE="+X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel source"
 
 RESTRICT="fetch strip"
 QA_PREBUILT="*"
@@ -68,101 +66,83 @@ RDEPEND="
 	)
 	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="
+	jce? ( app-arch/unzip )
+	kernel_SunOS? ( app-arch/unzip )
 	pax_kernel? ( sys-apps/paxctl )"
 
-S="${WORKDIR}/jdk${S_PV}"
+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
-}
+check_tarballs_available() {
+	local uri=$1; shift
+	local dl= unavailable=
+	for dl in "${@}"; do
+		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+	done
 
-_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}"
+	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 "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() {
-	_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 && ! use amd64; then
-		einfo ""
-		einfo "Also download ${DEMOS} from:"
-		einfo "${JDK_URI}"
-		einfo "and move it to ${DISTDIR}"
+	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[@]}"
 
-_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
+	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
 }
 
 src_unpack() {
-	_set_at
-	_set_demos
+	AT=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	DEMOS=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+
 	if use kernel_SunOS; then
-		_sol_src_unpack
+		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"
-		use examples && unpack ${DEMOS}
+	fi
+
+	if 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
 }
 
@@ -199,6 +179,9 @@ src_install() {
 			{,jre/}lib/${arch}/libjavaplugin_jni.so
 	fi
 
+	dodoc COPYRIGHT
+	dohtml README.html
+
 	dodir "${dest}"
 	cp -pPR bin include jre lib man "${ddest}" || die
 
@@ -206,25 +189,19 @@ src_install() {
 		cp -pPR db "${ddest}" || die
 	fi
 
-	if use examples; then
-		cp -pPR "${WORKDIR}/jdk${DEMOS_S_PV}"/{demo,sample} "${ddest}" || die
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		cp -pPR 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 \
+		dosym "${dest}"/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 \
+		dosym "${dest}"/jre/lib/security/unlimited-jce/local_policy.jar \
 			"${dest}"/jre/lib/security/local_policy.jar
 	fi
 
@@ -246,8 +223,8 @@ src_install() {
 		-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
+		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
@@ -257,6 +234,9 @@ src_install() {
 	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
@@ -265,5 +245,5 @@ src_install() {
 pkg_postinst() {
 	java-vm-2_pkg_postinst
 
-	elog "If you want Oracles JDK7 emerge oracle-jdk-bin instead."
+	elog "If you want Oracles JDK 7 'emerge oracle-jdk-bin' instead."
 }