Version bump, security bug #489570.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4E61DE84

6 files changed, 524 insertions, 15 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index d395e0b3a2da..db741e941d98 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/icedtea-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.53 2013/11/11 07:08:10 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.54 2013/12/09 22:30:28 caster Exp $
+
+*icedtea-bin-6.1.12.7 (09 Dec 2013)
+
+  09 Dec 2013; Vlastimil Babka <caster@gentoo.org>
+  +icedtea-bin-6.1.12.7.ebuild:
+  Version bump, security bug #489570.
 
 *icedtea-bin-7.2.4.3 (11 Nov 2013)
 
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 822854ec12f9..6713a465c628 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -10,6 +10,8 @@ DIST icedtea-bin-core-6.1.12.6-amd64.tar.bz2 38473056 SHA256 5281b5f5743d8d7d3ad
 DIST icedtea-bin-core-6.1.12.6-r1-amd64.tar.bz2 38730911 SHA256 5f0ee321b9a85d1c948a63a85a22a4b375dd286b6cf0fc0700e72becbd01855b SHA512 329d6f1351ce339e1cfde2c4e6720269cf431ed17ef2bb4ee7c8386b3aaa467d0ef63ce07e3e5d886df99295a2d52d5649e51dddbcb591edddcf3425fb6429cc WHIRLPOOL 80e0f7e0c7f8a948c26d44d91b514eba52ecaecc4e49d84c48bdbb886e48d046c4bdd2f0a431d0b0740a7119ac56694824c7a41c6369acbb8c8d7167ba82d77e
 DIST icedtea-bin-core-6.1.12.6-r1-x86.tar.bz2 39444070 SHA256 652977098902acde6b8d5f012e642c403fc6a806cd1b0f09efb0a6fc949c275a SHA512 b9a6f45f95b1c56e5efb33bebdc65eb8abd4eb654e34b1e4f53f20b5c354eed2bd8e67804a2cedfd185aae715fffb6c0a2c4b880445b6feea08c4b88ce5d49ec WHIRLPOOL 36a7a108c64c6179f9d168786cb187871a85c3091a8e39fd12bb3192df268cf5802d47b9c70e0b4c2fdb2b6f5a016ee912e7618dc95c710bd36f4e5507ce1d1a
 DIST icedtea-bin-core-6.1.12.6-x86.tar.bz2 39338497 SHA256 b87a044b142d36eb25bbfa9c0d6a61166d7fab30f591a9c4ef5066247a5b7733 SHA512 fe89875f54e99ab73e5ebc8f5653ede352322187bfe255c5e869a83c91be498a8b12856554bfe0362a4a414f608a55b4320967acab9bab860d0ae8c21cdf4702 WHIRLPOOL 5dd938a29a6307eec3e14369046bbfd18fac5be4544b0aec8986da6228004e5a47effdc03cbe80876f0bd3d5cdb8fd070b8eedd0f912ea29aa14d630252507a5
+DIST icedtea-bin-core-6.1.12.7-amd64.tar.bz2 38971833 SHA256 1e8f88a34db9ca9966fb38e60216d8609a02fcad07948f7bc950308ea3e6291d SHA512 9fe3ff1e52d7532e9bc28ea50e43e03fff8e5415819ad3d0eaf0396e459a3cb98049e922611a498d8f1e77a2c048412b1f85e3c8e400bec74c138bf2ec1aa1fb WHIRLPOOL d92df55444e8f5dcda61dcc457712f878babd417baa92adb260c37a61f2172374fa4856d0693423840621d312b32fc9fb0b23813b62e718a2caad5e0d0fbd7a4
+DIST icedtea-bin-core-6.1.12.7-x86.tar.bz2 39666989 SHA256 53dc7bc4cf615dcd8d9e5048c870c10ff9111b909cb37d3240fab20746c54241 SHA512 ee38b3616f6a6c3ef601818275193253ff7ccb6bd6a041fd1c131529486cb3af81e9f679911d76a4a5f09bc23050ae115a3a5bf567e09dec8444b873470f1a81 WHIRLPOOL 9c07981bbcc18563d69ef70c4151a261a46ba0a6e1f009f3f0829c45a05eff05aab6a2ddad340aebfd4d360a8a534183de99dbba0dd3baa37b82f865d7850f25
 DIST icedtea-bin-core-7.2.3.9-amd64.tar.bz2 48908349 SHA256 c68cbee3c975dcbf6c59cb441b86dd4146f23eb29f62cd8c2bab8a11269ed4ac SHA512 fdb39fc8b2794ed69b3d40cb503ea85e82814a862ed124e511725121adceb562c8a9e8280cdc33c0e8094d9a6d7a205d9d790d16ce75956680d356f574b3d55f WHIRLPOOL fa8433e91724b6b4a93770164966e8353c46844a4a782b4bc9442f37fa667027792641fb3cb7f7df65266ab3269684c2b098c40ae412a553648b287cb441cf2a
 DIST icedtea-bin-core-7.2.3.9-x86.tar.bz2 49961411 SHA256 1d29372e92d2b8c30ecfb095d02aa137483870445c173554d805c6903a19a51d SHA512 62dc6f5bbc682186698b7323d1250dc68c8981fb813641ce0f98d13a1ae2227b0664ce88104c0dccc6d325e7b7a8b000a0de5248c392ebc91e7b77aba9c3ccf3 WHIRLPOOL c03267892e27eff774444b87df9b2857ec7ceb9346d849ce498e4221b45d2fb0a9e2c2f8fc261db745ed9e3f6b9f27e5e9465b7ad7bd8489a300802b0fbf2660
 DIST icedtea-bin-core-7.2.4.1-amd64.tar.bz2 55285444 SHA256 73474d584b4887cd7bc0d3432ccfae03fc7508bcfa957434ea471c056243a8f3 SHA512 3c53f7eadc7a10fbd34a15cbad202335b83ad64d6b8a373f7bfa6bc855c615c534f2891d464e8ee80492ec5bf121c9674958d885b3a9cc8a3d3397649fe59796 WHIRLPOOL 5ce33c5598c44163cca8ae95b72b1614482237f92e73ce27aab43428f789fa0bd5dbc702532948385a27dc96ff9dfe88c33792c36c553398b8b22060b9f3dd60
@@ -19,6 +21,7 @@ DIST icedtea-bin-core-7.2.4.3-x86.tar.bz2 56381315 SHA256 ca1534b55d0116ddd1d67a
 DIST icedtea-bin-doc-6.1.12.5.tar.bz2 11636972 SHA256 386bdb4ff2018335b18336f5353c78b14f0bbd5efe03e1faee64e32dfed07545 SHA512 baaf51c3b11572453e1e372c947773310c6861564e29e86f237fb8fbcb084612e2f66ba742ef593d2199b9d20f2a9cc34f010a364d5df67eff28feeaec7b1dc0 WHIRLPOOL 490a3531b13e30f81d7ba4a5da61ce84b366e3e5e1e45dba0b596833fc23b58a3493e1bd6070723997a6c9ea0bed8ac7a4028895aee8acf4bc87e39e34965b12
 DIST icedtea-bin-doc-6.1.12.6-r1.tar.bz2 11508624 SHA256 b6281fe03e026d24737cd2d13012abe0acdbf06a8b77932eb6e39e35a593bb02 SHA512 60fc78546fe87ea87685029b3cd7fc7b690c421e585b01cd264e62ce03b9a259d13db2ed57a49cd6ae315656001f1ded69832dc358a99263a96b579d8db59eaa WHIRLPOOL 0952b3db223865eedcdd5d7d569572108d5513ae2c21be8afab509d794c93d557fee56c87ca034cb6a9e9da15f1694549776a5bda8c092673ef88b70bdf94c58
 DIST icedtea-bin-doc-6.1.12.6.tar.bz2 11508707 SHA256 61a4ba5c97d628536d06f0e6c888307851a933ed39e3e46fda2b548f9ec34dda SHA512 35bea98900a9edf539471760914e6d1b3a3b01748d916176004c4f10bf712b5630070acd62f3c079d2470f3edae05508279fe7b72e41b4931852cd2150f7bbe0 WHIRLPOOL fead05c0b1cda5ec63c47b44a6eb8645088ce79690dc03e04ce66ed30a7026fdac020bf03f20d1892e5c1be207fb1b0fd7fd8f6293f74e7eca3be6a9e8a06030
+DIST icedtea-bin-doc-6.1.12.7.tar.bz2 11508419 SHA256 34d0691a6c1012988c86c2704f7df9641d2dc6daadbbbc1f8bc100c043798127 SHA512 607349a9f533f51434ad9d54c6e9bcf17edc2eb05a593f627164067430d4dba3e8bfd7f983e39e2132a264a66cc200eb393edce3f19516d1a286c9988176617e WHIRLPOOL 2a67b4fc41822a9895c1325c7fe8208a3e71d90e76ca074238bb608f6cdf60d7afc65c4611fe7b44226ce78f61d76c299f9822ede446fc8b9df71bd9d6fcd76d
 DIST icedtea-bin-doc-7.2.3.9.tar.bz2 12531939 SHA256 0c19ead603888b8f83f7b5f72048f83d18d3cb6f31391dcda02e2e74380e7164 SHA512 4965b6f7e0cd59dc26681933b89a302e5b9384ba26126873c9dc1f97c98a96c34caceeff2682a17fd60ef36a75f44dcf7f5ffbad9c17d98bee95cd59fb19fc0e WHIRLPOOL 03500cc4bc64bf5fef13380b6a957844c739ab1093710e0fc3c1a1313e74527a6efc6970968621d69c268e838637bbbc3cba8dc9edccb2915ad5432eb3e1ea3b
 DIST icedtea-bin-doc-7.2.4.1.tar.bz2 12539926 SHA256 2003a7e4a26d09cb0737f5b03ebc647d4c250b18a441d90cb07c294e7b5c5330 SHA512 56968c730dddb081b76c94a384320ac82d6d91fd477783d1caf2c2d5f096ab536c68f89255247451a560e10976d42bad3e33ed179199264c1717aecbb5911c67 WHIRLPOOL 2a173dc70eb71704d7dd0be611b60f7cef05ec42799f7744d1b7434a6a1186fae9966e4823bba93b7cf342ff4ee15197b106a3058f9fa5f8c1440d28827b74f6
 DIST icedtea-bin-doc-7.2.4.3.tar.bz2 12537197 SHA256 0224d2c77cb7e7c4ad6c347e2fec45f33c1f5284292e049f8ba5c4997e653feb SHA512 7f89c5b505fdf2b9660b07f75a1cb78c9f65800fedf5cd82871da48cd2c581ee9a01c3b11da226211571f51d9f00e73a9c97157305c3c757255eb28b7fc9abbd WHIRLPOOL 174ac81168c3bbafce848f6fe013dae2ea4716f43f5cceec8145b2905eb054cd619999722920d1d1c98850badf7b2c38c22c21f1b238bccbfeb6d1f426f52309
@@ -28,6 +31,8 @@ DIST icedtea-bin-examples-6.1.12.6-amd64.tar.bz2 2164759 SHA256 13a579c606233ba7
 DIST icedtea-bin-examples-6.1.12.6-r1-amd64.tar.bz2 2167973 SHA256 d08c62d850ed2cb2b0e21a6b490929e8c777b39d4a165e65a66132db69ce47aa SHA512 705afc343edf695685e80de8b0ab3c84a61a5e6bfe5b2516906db606b2c8e7eb60badb3396ec74381b72552888d9eb30d895d879f4fb7a92d113f4e36beedc94 WHIRLPOOL c03686aa8e2b19ee2f74afcfc51ffd6fef62071b1155688b9bfb0f10181f6016d075f1f8c86b2c51a2634df95f29d58e4270be8fd0b89e4c5090fb63083e0ed0
 DIST icedtea-bin-examples-6.1.12.6-r1-x86.tar.bz2 2135257 SHA256 744dc2bb5c7ccf56a10c666019a2cb3b3a8bd4a28b39d6e33c71fd9a3755ae53 SHA512 ec7defe5e4b28204aa6064ab1ad13b54bfffc0786d85f2c0ec2de9b3ec0ddfbecc9812c224cae4fa34338a98bfba977e78e16766e62cd99f432b4de49238f8bc WHIRLPOOL 4a9b8ab0b1daa558b62a4441698b2670b9a416bcccc27877d7bcf01376a721d1d1ea2f29668ee41d1c272d794e07619aae245cf2725c5028154fb7efea539e7e
 DIST icedtea-bin-examples-6.1.12.6-x86.tar.bz2 2133753 SHA256 719e55eb2bbd26dbe69ad4cc52b40a901fc9be70b28c2e55c3c58d5febe0d32d SHA512 08a7ea0be915574827156fe6bafad5878a443c50d305ac3ffd67ebac98a53552d70a08f4a56be958fd6e1180e45e8178284b0908d772d949495f6d78f81778c4 WHIRLPOOL 8a152a9c64754dba474fdc31fbe02a9db769abf86a89bf30e1e3bab8cbe0c4e64a0fc7ea1b689c226fe631953af97e94a930b1477a33027d59663bbe5fc482bb
+DIST icedtea-bin-examples-6.1.12.7-amd64.tar.bz2 2168381 SHA256 c205526e52628af3337786ba0f6e168069a319636e9861a7edbe0e72070c0515 SHA512 9c4a84951df5412bfb62e80dc48c838fcf45afc1f57cb831bb1fd7937609b67e2455496fcb6dd3e330d43f04d155f158a067a69c75285cec03314aa1e6d2b8ee WHIRLPOOL 87f4b104ac741e75c3034f718842dac586cb4858de2cd460e24ee3747a4e615183d6561e7eccdf5c65396a393e4391425d83e9b2827fed9293462391a4edc001
+DIST icedtea-bin-examples-6.1.12.7-x86.tar.bz2 2134521 SHA256 fb5a51910b04f25c37e71f02e9af35ca81e597b3de68d78c91bcdb16fdf1f1ac SHA512 e64419a06bbd185e9fc66242b97b002c8f60457b6270a1f529ba93548c0bd416f312c55e48b3e2445696c40c7bfe18d9b2b917f96b50bcf9551bc1cecc637435 WHIRLPOOL d82c9ff67bc14e796da7add3e67c7f1de18cd6faa4f77f6def46ef689048fa218ad5ee633268698aa4ee36445b566c981d242f03623254edaa9d136f09ad1199
 DIST icedtea-bin-examples-7.2.3.9-amd64.tar.bz2 2334505 SHA256 eff5c9f48ebeef91d1029291daab23483be91c436e17932d6dfb9b7bec0a37e1 SHA512 929a6fb595fef4f78829bdbdf303bf76c742d0a644277479e753828ffbc1a0074828703e7b8d82ae66654cf6c04309e05443e9d364a225c8fa5ea1e1e9768c36 WHIRLPOOL b13ced4c0b10dfed3d536faa9dd38bf16eb38f1c130572ede83f7bece34d26b2f6e56f9845c3668bc727e867a3c91dae8e1195efec72303f344488063fb77051
 DIST icedtea-bin-examples-7.2.3.9-x86.tar.bz2 2313247 SHA256 834c9d0fd4851a27e0c9a7a83ceb144e0414a8f49e15c2ffb11fef7f83da4f13 SHA512 cba7698fae6879c2ad0ea008b3cc069663e79faf93fb64b3f84a4ed1d97b6938ee8cf470b31f2f57e068e683000defcff89d2de95f347b2f6436ce35d757be6b WHIRLPOOL 120e6167895b70efd88aaf7146eaa58e77d868c7860ecf6e535c2db32ff3caff63e693c631c3a6cb52db6c50c3c31ef87fc3f0bb222cc992d6917b5d591f8e0d
 DIST icedtea-bin-examples-7.2.4.1-amd64.tar.bz2 2338604 SHA256 bc33efc83b64e5e84941dfd5a6e5f59392d1279c787f6df861973295fbb8e349 SHA512 8d78e465be5d8118f23176eeab5605ab7957f807224454e41ac57f9941d0ac911f576251a0025ee5886917227a2c0cbc6f2b14eef6f24959f85fae2f775e3151 WHIRLPOOL 8cd2bdc5676d0007e2f29600d59a571f9eeedf1e604b08a36d2f4a8bc4ef5b7c7df88b473ff4d433eb16fe4c325114512cf803933f547c970cdf4cdbe39dbd0c
@@ -40,6 +45,8 @@ DIST icedtea-bin-libpng15-6.1.12.6-amd64.tar.bz2 18742 SHA256 f2657ef130e7b6bac8
 DIST icedtea-bin-libpng15-6.1.12.6-r1-amd64.tar.bz2 19169 SHA256 4a35e5e959d62a5c2c7083a11aaa579e3b87fb42033a17f3efdde59f80d0f8f2 SHA512 720035fc13a2fb7da622882fdeb4929c8f162a688a0bec95790d7f74210f67bc9722090c406b058e86d4ba1965bdf0c9b223355a7f487bf1ac0ea43e40974102 WHIRLPOOL 1a4c5cfb3b7d854b4cbe2f5ae22f26d298a63f05404baa2d9908ece7d4f0607c77f044a5babccb3f4ec6ea5d2c6c98677bc34329aded5325ca678bedb0201e44
 DIST icedtea-bin-libpng15-6.1.12.6-r1-x86.tar.bz2 17518 SHA256 3be1e207f48b3d8a980d91b1ed2f3d99826c3b98b588954d83281fb39bb1c159 SHA512 1586d413cf184fa201dc7e3d07bfdc16ff3234fba99450caa845d06259341add9230bcbb2086d47ac2a0c8215d7a36abdd1555976fa606eeb68e694f020727de WHIRLPOOL 8193e13641db031b13f77c7f907546dd2e5a1f4034a017c354f2240120f2a8b652064e8cc7c714133653e807fee302a5871efcd53cd3289aaf0b2f842fb88c9a
 DIST icedtea-bin-libpng15-6.1.12.6-x86.tar.bz2 17368 SHA256 1eaa9161e5e7016c1419b354a63bb264c31afcdd5bc6f514a3b78f05396cb379 SHA512 a2d360a905c1b28f8071278be7c7609b9b84ff4c3e55ab76ea8f0db4227fbfc64c6644eb4873c0628b08d88570d660ea5eacb5821f089bb28de88c41133bdb5b WHIRLPOOL cca3a19c4975408343313b197be3fc151bdbed2d4bd5cd049e61d0f8bf9440c946313dfa3a422275dbc02c85bf30321fcf358ed19714e52f00e26dabbef227ca
+DIST icedtea-bin-libpng15-6.1.12.7-amd64.tar.bz2 19179 SHA256 7a817004abe0c79f2dffbf71fedddda217a195da97dd29ee50f5a22b1bb93004 SHA512 72e101e562965febc8f4b79c9f2ca8b550b6a44cd3213efbe9f869b11aa8113638de164edeeda0f3370beb9c0d7e4407a8430527cdd36b2dc5bce7d93830da22 WHIRLPOOL 25b2fc5c02491c5638b0446a64a03fe4ed95c4d385244cba10183e566060a8bf2e4ebda59b05902305e3d94e972ec048bd7daf2e314d17d5e2d7d1737a2ea03c
+DIST icedtea-bin-libpng15-6.1.12.7-x86.tar.bz2 17545 SHA256 9fa08796b0720a30b3e3c7a5389cb4f9fbf5f526c71ef9fa00d3e74c474b0ad6 SHA512 566f942a8cc1448e10dbbd07e7fb160476b0aa7c216c6b16bad279472213261b6e63bbb5a093451cca59171c4717ab6ed3408f303a8fe5668693cccb3a2eb598 WHIRLPOOL a05cbddf26bb4f537db2caf8f76ecdbddcd258e4484b229e1bb9fcc17357fe19b7e98ba741596d5a1da20f1903207336e06541d65ab90c3a255f8ed70cd926bc
 DIST icedtea-bin-libpng15-7.2.3.9-amd64.tar.bz2 18791 SHA256 5e121b3f5c7ef2d549ee23b8da8817d6aab2e61bf5c8c126499a4806d767f860 SHA512 3cde8a6a138b138365e9c5d981523767532f5ae99d0ea85056f17521ba030c826b9b0b1fd60b51f41a5ab04fced5bbd8c1de1371381e9616036c38376b694e77 WHIRLPOOL b0a1ffbfa88163ab74c0c15fd7377a8a8ce07e3c12b9c8ec168a90ce62b14ebd9b0cc23b58240893874c5620d7a417f57d0e7bd6e05afbb3561df4a4dbec9f06
 DIST icedtea-bin-libpng15-7.2.3.9-x86.tar.bz2 17313 SHA256 32fcd8f960d7ea8f39e33e52a1ffc2bed1552ddbe6475d5d0d81450a40c6ba87 SHA512 bc8781cd5c14150e83de9a784233ef3554764a121ce36903d342cceecdd689f2a93ec354c2891787a56fbd54b96cfb8b4d279acecebb303dc92c95eec6068bff WHIRLPOOL a14b1986857fbfa429d98cdba14408d06e2e8c6d5ea0338f31425b4ec1f804385f25c0f3b6b36cb9a06a291f9065643a8d798dcc0f8f20b8ef51ccf63af564c8
 DIST icedtea-bin-libpng15-7.2.4.1-amd64.tar.bz2 19287 SHA256 292179fe1b2b1c41c9ad52e068a32dae470c1deada73cc99f3fb29ae97d75183 SHA512 c42b05737f5f6b2fd52ad5f21edf3c2022ab2480cebc77284be668e3e92342e0ce53f18d1adecabc95468549a70170bdacb97cc3ee2df341bff5a294d9045e08 WHIRLPOOL 682f3696372e0603ea70f070b593c91fd0ba1d08760122636f8c0db2026dcb309e58c0965fb337a26644736e0dee2150f2d38812ae78a2cb726119ba65f822f5
@@ -52,6 +59,8 @@ DIST icedtea-bin-nsplugin-6.1.12.6-amd64.tar.bz2 1020025 SHA256 e2dc553bede3d11a
 DIST icedtea-bin-nsplugin-6.1.12.6-r1-amd64.tar.bz2 1022111 SHA256 d4b6d6b9a27a8b10c1db30cd5375ab37137d3e58da0d043327acd3f67921aec5 SHA512 ec272ea8eea4ff1a12bd0c5673680fd122bfa6ec2e4ddd9757325ff23ab02f1756ef25a17cbd92202fa9bef5e1e93d4f44cc1dc0bd8c2619746ce7ebcdcc4d2b WHIRLPOOL 8786fa3aa02cd8707100f17ae6d6c2f5219a1f388eb52803170153feb7ad345749a76c62f60d94fe290021051fc9db506f50c2c28f02611f0711e121d6ce53aa
 DIST icedtea-bin-nsplugin-6.1.12.6-r1-x86.tar.bz2 1017885 SHA256 c40776eab3c61039e8187030cdec1f12431612a88574177d3cd825a90f963bf4 SHA512 01965ba7265473c5d9bc101cb44c33fe06b93407195469fdd00226f1d34ac19b4102f7efbfb86f8f9069296a31a3851808f545cf8653ffe320646601480d30ca WHIRLPOOL c9325eca41a1a91c2f69ae7ea6777c826f5a25195dc8294d3f238eb474830611a77b9fb6b355738c266c9d35ecaeac386909a6edbdd776e5c2448e388594ca7c
 DIST icedtea-bin-nsplugin-6.1.12.6-x86.tar.bz2 1014033 SHA256 e9978ef0836ec14fdc0541c1705d92672c27b31be91df3ee1283644cc0cf0fcc SHA512 37b121218c4b091927598bdd221d296c2261e9ce6a2a5e02e61773398ca111055a166d09c3ca86ba34320c1b9607b8a5d26bd58941385f95ad79496fb3f3a687 WHIRLPOOL b652bc28562bba88cb307fa12ecb75521523484fd5fbcd940196cc94edd51e718b6352043cbf21ce201f54204c2f102b3c53af7ee15361de6c682fb50327a0c3
+DIST icedtea-bin-nsplugin-6.1.12.7-amd64.tar.bz2 1021916 SHA256 9393839b33b5fd432640ed24b7bd5c2705915405c90e255baed2f5585e11c479 SHA512 4f87a509709991e26a26c9e66bba4b603a9742afc7d38bf7bc6c7c926e513a66c6a73eb51dd2ced419808364f2a080741a8bf1767ac1145c355d70f14d2b166f WHIRLPOOL ab7df3e9a48cfa1494f5a7c3970f614bfc4ad1f513ebd440eaea3804b422fd9f524ff2ef473d315fb6d385279dedc6f7179b421b743195168d2df5ea5a005339
+DIST icedtea-bin-nsplugin-6.1.12.7-x86.tar.bz2 1017578 SHA256 b6816b7e7d896a00d33c5d23c86ff5ab0719d2b88a047d9fbebe2058a5a1c993 SHA512 ebb458d32ad04a8093cb7a6f8adb55355cf9ae6871ded869d4bdecb95e04ee610603009f7cf14d3c3e5e28d08611a69d0f052f1043ef9c82bd174870dd748c1f WHIRLPOOL 935af01db7ea1454af94d6aae3cd2ae271df861b75e64d777f2c1c57342aee2bd7bdebc385dcb0594575d720056127edc4530b368c80dd3b451be3d095157912
 DIST icedtea-bin-nsplugin-7.2.3.9-amd64.tar.bz2 1048041 SHA256 dfd810f63c699e58f3f8ae439e787b5d2dd8e9c825e998345e81d1032d0780b6 SHA512 e5e918d27c383eeced52b9e09d51eb29b0c314e4879503e61d8124c2ddb803877f0fb1ed8ffb1a4e3dff131e7be66713be2a1212c2b2e979ed3b3406b4881b6d WHIRLPOOL 664ca17a5a78a33d54a53fbee7c86db4699312e733d265c8a1e189dd5622e3b5d14e79cbb5dece70bccc18aea4fec665f96ec2926e6c8b60b8bb5e7f0ffbd5e7
 DIST icedtea-bin-nsplugin-7.2.3.9-x86.tar.bz2 1041466 SHA256 6d3a4b56fc549f1810b3f2e04996bdebaf900226e76cf290bf5fecef334b4397 SHA512 1ce630e545088a9c44b47f9539b5e4638a85d7698e9092702384e65a0c413940103d08415d6815a7fe4f309eaabb0c792e74cf87df48f8cd704f79ccf40980aa WHIRLPOOL 754aa25da149ddcb07c4c438aed718ba562ac99cd53dfaea0af650eb8156d06aaae373912c4384d7af306417c687a30b7ce1968b2dc2d638ac288d5451b16873
 DIST icedtea-bin-nsplugin-7.2.4.1-amd64.tar.bz2 1055430 SHA256 aa8aba5f3d247e2e45ee80027ed397969a9c690b67ff7aad81e8872ef04a19fb SHA512 af5c1991bb0871d35f0c061df2f6e6f1a36335eeaedb0cdf8c3a4d9d393633cca3bbb810a80effb1eebfb81479a50cb0fa8acbc07a6caa21bfaf0d7c368d97ee WHIRLPOOL eeac5111f3f313c5caa74b58f924bad688c85121c142bd6691497cbf10c688569ea0ea8da4bf69a109a77b7ee23f22b3666e870a6b2fceef07f41d02d8fce57c
@@ -59,21 +68,23 @@ DIST icedtea-bin-nsplugin-7.2.4.1-x86.tar.bz2 1050628 SHA256 b59518902ba610b8db9
 DIST icedtea-bin-src-6.1.12.5.tar.bz2 40881998 SHA256 030ec461fd6ac1fda36c21c3d4223217d95255956a0169f2c38ddb37574755ce SHA512 1354c12b3e194ad3e42f7b8ff0e29f0908ca316a699a2a5878128e9c59b5d14e504bf20aee15eff4758c99a5ca6b95cbfb9a711ae926ece056e12641d1cf9a1c WHIRLPOOL 882473ae360de810032ca134e45ade71193df8fc0cfb4eb6b3117969e6bc0815d2097febeb05129f7a4db630b86ebc990d4ae7abeb06c88dfbaeb7dd93465d00
 DIST icedtea-bin-src-6.1.12.6-r1.tar.bz2 40954502 SHA256 99f162075d5164197a4ad1dc3e05784c757ec842ef78575fe9a84088cb161349 SHA512 38e806d747fb29da3eccff7f53e0f6b368dc68c1b6c9a03e9703e430840332451d196f4a22a3c1a352b61ac58f015febe74bba0ee28a7be44518554debf4f60e WHIRLPOOL a87eae48683fff3e15996d00fcbe3e1230e0395893ebf237168dfcf66bdd40eebd49abd8aeceafc38ba4fb7043b845ef0160b8a8a70d791d2ab33bba54bedcaa
 DIST icedtea-bin-src-6.1.12.6.tar.bz2 40956483 SHA256 883288b50cb3548341986b59d859fb2575a293499e83a6b26a5493bb3f719d8a SHA512 613635c29fde0b9dfc105f561de460de69b5c635562950e74795ce37efc4ac51ed865b816df0db8c32713cdeda5a0e974a68628009e2001ab7f42a10f9abd9b6 WHIRLPOOL 0ea4e4462ed0634c5fc06784cb4ab4f2f565237a3acd5f4ea6986a63ee9c0390c2fcfbd6ebf9f8a6c21f6c82f72c215b63700a6c77bffcd0021bd09b7854d54f
+DIST icedtea-bin-src-6.1.12.7.tar.bz2 41151777 SHA256 6559da164ed557aab7b5952932f58e3d948d9a298361f40955d401b950d09f0c SHA512 e8b0a4b756f38e249f4dbc27f12676f6714b86a018d014e777d1f5c7b5ef50cb42bec396822b70db6483bc988e9afecdbbbf20ae42acddc37e95ab19ea2f2f97 WHIRLPOOL 36a5617a83ebaca4711d04ce87a9a72b85f0a3d6b2dcdb4acb926b41054ef6b548c809f87a5b1e4677c3d8358c10b40b235c22262581ce02c574e1844cc23482
 DIST icedtea-bin-src-7.2.3.9.tar.bz2 41269870 SHA256 4d5699da20189244312f618bdc0039b816cfaaed777bf1971084d55942880ad0 SHA512 52bb50083e997d73ab2f7bba5e097f5cbfbcc114c0c8eb20fcf81b8b24662ab3e12da3bbacdac3d92f24d0ef8a8cdcf761a6e4a191f975f43aeb8c0e391784af WHIRLPOOL b4c4f1aa5d3c2fafcbed6fa2936e6b9dfcb5a743488188c63079dc406744a260b9668a649f8bf78da04060da981d86123f575a7512c36f875674dcf93284d797
 DIST icedtea-bin-src-7.2.4.1.tar.bz2 41280241 SHA256 62cd85c7a25eff445200767ca850e02155ed86c1640a1afe81568368782f8f44 SHA512 b614b1beaf1bdda5274e078739cf340178878ed25d624fc1e2b61db01cc19b942d63bf69562266a6c913f5d70db3fef109e8aec30ebe36c10aebc221018f19c1 WHIRLPOOL 122968ee108ea9d3c946776411cb9c5ea0d49fcff2c816bfe7300ed2dcae1176265853d42753ee52a236ca3a1610750d6806448cec4aa8319253aa61044d8271
 DIST icedtea-bin-src-7.2.4.3.tar.bz2 41348380 SHA256 e9944fac46c7333c4c5065f346f0e181591c5f38031cae50cc4668118721f823 SHA512 ca7e7e07c8f942de9129e9c8cb613bb634cee95ff6a490bdd12d953aeb7fea1096b3cf827cceff345194f7059f777c38e39c9d2a4ab72391f1c938391fd39058 WHIRLPOOL 142ff86fcdbc3c3a0d3ed6b8d74956e774390bf424c24b0a150e3ee167351b017338802e6a45713156799e341821c65b2bbefeaf19a73c04d860594c4facf7c2
 EBUILD icedtea-bin-6.1.12.5.ebuild 4837 SHA256 44dddabc24f81cff0207136c4667219c4001318aa04420e6370e87e97bace613 SHA512 6898bdd64120532e7b3584271a07d854beb3ce805ce4dfd5b24844a3e690425ae3d756fa87e768c0c35d7a878fbf34bf50b42b99111b9b937ef78aa0f5aaa23b WHIRLPOOL 26adcc044b16454ae1557939287fa50edcc4f50c377553bbd800be7a18723c936b357ec50539607bb1572d20e504866a2a35e63cdfc561c2b1a5343a4b822ba2
 EBUILD icedtea-bin-6.1.12.6-r1.ebuild 4697 SHA256 08cf6b3133055eba62cec7a5a6dddc9074596f2178491437aa24d017f1ea700f SHA512 46fe31c0f135088916d315f73b402f74f549a4878e8e3d5759d448162f37be2688f0535be4422113cb789828a6a67a73cd510796c939c37844a38df53d6901f5 WHIRLPOOL 8df7a9c7dbd2097e57b25a529fefcc978b74e1ca879d9548b4ad0e95f8c3e7821d05326f23c7faf70eb6823e10724e06ade8c535beea8d5f0a6d5718fe453e24
 EBUILD icedtea-bin-6.1.12.6.ebuild 4679 SHA256 9eab85052b6e8f9e83d7863a1f654828fe5e680d24695a20775c63cf9366b1f3 SHA512 8e220b487035e4f1963f7abebddb7094f5dea5539449f3eb0c77b5de670128d6c8b228fc7c5d877ea7a619064a0ad1f60e0b52c8cc7008033091895ce568978f WHIRLPOOL 3f806ae3da82dc521169985454a5ee23cdf417c0dc044d7dd3d12f868e5566317d216cc89c7824373da8e63668c979480c222fd1d61dd574186697327d140ce3
+EBUILD icedtea-bin-6.1.12.7.ebuild 4694 SHA256 c6e9432c5ac5f352caec0f20b1a80c64ac957e7c35a68b7f7c1a39d5b78f7b0e SHA512 3145b6b6e146df42cbc3bb1bcccd9e55e7be74eebcd2da5cb69ab13b5fe0774f65e17e0e506d85936dc7ed83a24e4988264172042ef28e3415bf6b45db19ccec WHIRLPOOL 99a0087eeba5cd9f7eea23a924cf1a56d49b0d5b13b5ebba2005317e4f336a043dfe8ea8be955af0a0125935169ab4725c0858c5ebfd58e32f4c272ca661f559
 EBUILD icedtea-bin-7.2.3.9.ebuild 4384 SHA256 49da2d23c041a330f24edbc3c1f1910a0f492fdc063c4fcc41623bde451bc8a3 SHA512 2fe9b4ed5463900df49d43f6271066d7e1cdccd31009cff0d104e33d677bf4d4b332e6c5f8cf0df7f50226d3c3e19a4ea565e61edbbf92ea88a2248877452340 WHIRLPOOL 9dfc06eec017022d703e9f882a020868fb15dbbcd57fd3dc4f63815a582d2d999ed5753bb56fbbc9e8f8ccf891c8361b29ea50647e7ed060f4be25a70a816393
 EBUILD icedtea-bin-7.2.4.1.ebuild 4253 SHA256 12e5792e53bc7436d24a99428956b365ea341f087d3b572563ae0f4d5a4cd0f3 SHA512 038be0254cf77f06216ae9e73da9793d3e32029ef495c2a0d6e0b744799bb483414d86c4bcbf17c0759175522a0328d1398a3fa1d3e8ed4bf73316524d3712dd WHIRLPOOL db62b990988ca659226f00494bf9e248eb467c3a2ccac2a05cf6b9afb62bbd16e72706a024cb43ed39cc18caff7b21bb9f848b0a6dd61ee9808b1c6943d8dd93
 EBUILD icedtea-bin-7.2.4.3.ebuild 4169 SHA256 d993b3ed6dfa943c07756691a163cf57914e027ad06fd0b6929ce0d76590c7b6 SHA512 238826a3de486aea09858240f585aea9366cab109ac08662e499becf11515859c1bd9ee71b7160c7274db8f5b839dfd0ae1f6d6ff7e0de4a96c1da1bd81fb9ca WHIRLPOOL 6095f91f6b0d71baa43e3ee9e208d236daa0c1ad5c21b30e3421209f26ddb57a25ac3a49bfa42356d19088b6474e989249cf46f8555bc717c2e2605d9db05b4e
-MISC ChangeLog 22303 SHA256 7cc2d796f21596c435e95605593ffdbc7ea81fd1d64391a425019e22814cf63e SHA512 1315a70acd6a6a35c66a1bd375176e422b9a26c43cb24f80a140b115ac53f5a142736ed25a738ede9ca2e4aebeddcf797331146cfbafc35447dcae0f39cfc879 WHIRLPOOL 16350819760cf0232d5f07e8d1eff9016dc5f44f31bb184853b32e258207a48d3e51fcdc827ad7c726f6d50fb66ddcfe9f20ac6b9099224ae26b76a5ac74d627
+MISC ChangeLog 22462 SHA256 20f0663c3703474400c03070c1bcf4e084fbdd7b036ea72fe416961f47ccfe44 SHA512 6643ce55c90d1d38ec5ab850eaf3d07c317c5ed775735e7554da79a46b2e1591c0490f8d230977360f7116b3c4f97086636284970914727348959f84d047101d WHIRLPOOL 9ea62a29e1f6d5edb52a55245ed0cddc3137d2d15a9a2375910504f48013ac80ac937673c32f791cd1cd60442712aa4b2feda2dcff61c5108285588b3312ab23
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREKAAYFAlKAglsACgkQtbrAj05h3oRrFQCcDzAI5Pi1KjyhG/KXtXWb4WYW
-YhoAn3DQc5F9Y22TZwkMt3UCDS7Frac/
-=WPXp
+iEYEAREKAAYFAlKmRIoACgkQtbrAj05h3oSmngCfXfDlfpUuOSyBSp7EyGSEY6V6
+N7kAmwcIz4M01wgQ08iId1iJcumxqt1H
+=f01V
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.12.7.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.12.7.ebuild
new file mode 100644
index 000000000000..6d1096c2a292
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.12.7.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.7.ebuild,v 1.1 2013/12/09 22:30:28 caster Exp $
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PVR}"
+PLUGIN_VERSION="${PVR}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2
+			${dist}/${PN}-libpng15-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2
+			${dist}/${PN}-libpng15-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin source"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
+	>=dev-libs/glib-2.32:2
+	>=media-libs/freetype-2.4.9:2
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/libX11-1.4
+	>=x11-libs/libXext-1.3
+	>=x11-libs/libXi-1.6
+	>=x11-libs/libXtst-1.2"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/libpng-1.5:0=
+	>=sys-devel/gcc-4.5.4
+	>=sys-libs/glibc-2.15
+	>=sys-libs/zlib-1.2.3-r1
+	|| ( virtual/jpeg:62 media-libs/jpeg:62 )
+	nsplugin? (
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/nspr-4.8
+		>=x11-libs/cairo-1.8.8
+		>=x11-libs/pango-1.24.5
+
+	)"
+
+RDEPEND="${COMMON_DEP}
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+src_unpack() {
+	unpack ${A}
+
+	if has_version '=media-libs/libpng-1.5*:0'; then
+		einfo "Installing libpng-1.5 ABI version"
+		local arch=${ARCH}
+		use x86 && arch=i386
+		mv -v ${PN}-libpng15-${PV}/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
+	else
+		einfo "Installing libpng-1.6 ABI version"
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	java-vm_set-pax-markings "${ddest}"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
+
+	if use doc; then
+		dohtml -r ../doc/html/*
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use nsplugin; then
+		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
+		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc ../doc/icedtea-web/*
+	fi
+
+	# Remove after next bump, handled by icedtea ebuild. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
+		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
+		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+		elog "such as Firefox 3.5+ and recent Chromium versions."
+	fi
+}
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index f861b011a945..e4d8cd88f56c 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.110 2013/11/21 13:33:03 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.111 2013/12/09 22:31:36 caster Exp $
+
+  09 Dec 2013; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.12.7.ebuild:
+  Version bump, security bug #489570.
+
+*icedtea-6.1.12.7 (08 Dec 2013)
+
+  08 Dec 2013; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.12.7.ebuild:
+  Version bump, security bug #489570. USE=jbootstrap no longer default, leads
+  to faster builds. Allow new icedtea-web:0 to satisfy nsplugin dep.
 
   21 Nov 2013; Michael Palimaka <kensington@gentoo.org> icedtea-7.2.3.12.ebuild,
   icedtea-7.2.4.3.ebuild:
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 4fa63490d466..205335d8f621 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19
 AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619
@@ -39,6 +39,7 @@ DIST icedtea-2.4.3.tar.xz 3417116 SHA256 9289d25867b39756d62ba16eda5834655609a69
 DIST icedtea6-1.12.4.tar.gz 6689142 SHA256 eb326c6ae0147ca4abe4bd79e52c1edc2ef08e5e008230e24bee3abb39e14dda SHA512 f7d2834edd051b2080acd596d230f16604eb616eb1a6a0813dd274a92c7ad9711a25b65dacea06a12591c6121beedac44f9bdeb2e6cb60fb612bdeea63957a55 WHIRLPOOL 6109ed8cc94ee4e14882f0b787ac1a8a4859c542b7f92b896e46a33bbef5ef1cac532bb54616dcee66deff4d6fc50296f533f0979d7efe31f98ddd42a3d8c60c
 DIST icedtea6-1.12.5.tar.gz 13044886 SHA256 c61d6eb2f98d5c4059bb6eb6d808dd0954cf7d35c14290e5c77c3d7db75d2b35 SHA512 c8356216b4ed03630ebe338b790d6cb594dc24da5fe2df2740f4fb0e2034d19fd3b25025b1abf2ceb0cd656e8a08fec1f1455caeb450bd75fc29ebdddf9ab766 WHIRLPOOL 64e225c255c3645e6a126a3a6729b42ddda7f84a1e38397be801966203eb2c13903cc170f1b6c807c4ce0c15234f0ff8b857913bc0cf4231b0ebe5ac0f4db06c
 DIST icedtea6-1.12.6.tar.gz 13721847 SHA256 18d98fd05ef8d5088b09c444e0b025a8295181c6ae2efb6ebefe0a0397062865 SHA512 a6e35936e8542f86ec41f1171f6ac1bf504313c6f163f0de400a8f8fd587d0758b9c73cb391fff77da2c26bcd3150d911f3e529e48dc7e2db964482c4adcbce0 WHIRLPOOL 8c710e29c12191f9b17313dcefeaec7afce1eedc831dcaa8cec20baf94eabfe57190206733401875f0672fdad6fe94e978ef4154813b14b2fe9b22d2bb80ddac
+DIST icedtea6-1.12.7.tar.xz 9219124 SHA256 56e180666f9c6a38aa725033b60bbdf5bf4f652ad9f6876eedc56a27497158a8 SHA512 32b5af24e48c5265efac53fd44312433a0014325a1f74eb62fdde1562e8cfc8508dcf08c29fcbde1a14ae54213459b826772dfbf12d1460ecd3435cb1e89213d WHIRLPOOL 4b497017a1e7712c25aa035168e93e5dcf4be93d6605954efeceacf1bfcb73738726bb955f0db46bc8a12f6ccdbb8ebcde335e2b648685e4291d13dfad68f38f
 DIST jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz 298435 SHA256 bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 SHA512 fa3428d8997f9696cce4fa32c9de677ef193bc12236ef8b431af647b57d26725f4a3019abc87ade0cf10c7d6a745c18eb78e8e126d6842e788c8cefcbd2b006d WHIRLPOOL d1ca7dc677b7abbd600262f30c2c3774f502ef661f3dca60d4664c87b50b9a90c808e106f607a1dde7b3f4cf44a7a4a9e647877a2cc3332866b6b2bd34eb2a2a
 DIST jaxp144_04.zip 5976385 SHA256 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c SHA512 9090d37f62f57d3dd8fb5981e3ce4a1ae87f1ef19abdb9df4775df1a48419cd16016c025a65516cfe3329885ac164cc45e4204dbc8d03239d368ebc962c824a4 WHIRLPOOL 6646fc6cfc83fbc26aef79cc219e008ee28fe4cf649ec4fc0e5bff045dd76b737c1036631acc9439137a50c2ee33dc7534b2de914877d1b695a3741ca3e6b1c8
 DIST jdk6-jaf-b20.zip 71243 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 SHA512 22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a WHIRLPOOL 2b02e883c7a2341ce927f402a9abc5a632a6718f713fbaa5c65133a0ac81a1a58a317b7e2028c309196805dc43146c591852c05144c64f2428938cb3ec4972d2
@@ -47,19 +48,16 @@ DIST openjdk-6-src-b27-26_oct_2012.tar.gz 45789350 SHA256 044c3877b15940ff04f8aa
 EBUILD icedtea-6.1.12.4.ebuild 9785 SHA256 ca80351cf69245760384b1cb9c9cf96f033c8a2ecdaa04a49662b30bdad2a8b4 SHA512 5e0548630c21f7d16127655e544d3e3719aa35e3cefe7a5808a001bec15d981e69d0619bad99122a585252157583e38fba34913f16027504b1564b53982744e6 WHIRLPOOL d887b2f529b3c154c9ae9d2e782a483fc43b179ed268fedf48b683e3e9268efd19bb15d3f414577b9873ce06dc945bf073f710c044b6e85523032e0cdeeb6769
 EBUILD icedtea-6.1.12.5.ebuild 9556 SHA256 8fb99e471917048a3827ad49dcf4f4c6e759b5a86cd6aee67523d5537531f709 SHA512 95d18636f903214e0b2f6f8d9140ab6589c7fb6c81b789473df8afea5fa9e002bc86b4a3b187b248b6a4164d69b7c1ff7603b62ac77908fc38d6ede1436d080b WHIRLPOOL 30e133456a28f3b1ecb9ef56b6b9e67e6ce27ca0947f594bdd88b1c78d011144ddec086a24b455277c6b2c1b41b0bb65521e63a9d7e9c7a7007572ebaa00af89
 EBUILD icedtea-6.1.12.6.ebuild 9575 SHA256 280e497062b28d149d017b0983c3581f0829861497bacc70f83ae4d214996157 SHA512 a362f993fa4680be11c23886b2bb5351aeee5546f177a03052e77367477a35aadcb050a93730e27db3e0b2c6146dbad6f55edf1b9c0998ad6793ecf536f53b05 WHIRLPOOL e226f1b1c9b308a627bebb23d299cd77c38f838d6cb3829c8f9daa0a1f0fee29777bced14fab2fc393ddb8eaf1c6cb98c572774031c5f69ddb4115f9d00a5dd0
+EBUILD icedtea-6.1.12.7.ebuild 9665 SHA256 2b2dc06c548a27c13771699763cce4b644b1f857f14f5a220298cf622083c70f SHA512 561a16c7ef41696efe059f482c99006ff2dff7bc8518c9829a62f400ba005ce96c23c5e4b0865edb8bf2e5a39d2f481ae2831055f98e07c36ed3f302167ffdcd WHIRLPOOL c6578dac3ee66491e7d7415a75f6d1d62f3eae2671b5473de1113fc9cd6c79ef1865bd1fd72a63c11f89efad3212b32bd3cf9f142899b9a8cecd94d844963077
 EBUILD icedtea-7.2.3.12.ebuild 12037 SHA256 9d40307586292e8bcfe63e9abb9b7e56f004123ba3e1cbc50e804a26b491ce73 SHA512 9e12a27a6be70db961f7173cfb93b903b285f50781b532441c54fde5ff083cc59bffbf9abf7e46e18b55c23100edc960c3a3cbdd91f0a20fd331c7e1c7fbc2a4 WHIRLPOOL 96fabdc11aa407554954cadb95ed7a5834ec47093561797721f10c9c8d00c30e3ee750f3fd8e1ea06f2c1b5f100c43236e1ce69533d1c90b85337eea40cb5309
 EBUILD icedtea-7.2.4.1.ebuild 11950 SHA256 193b5f8a4d5b505ea9c88e8c2246b26b3bd88896c7c17ac1a0e2b18c63c4f142 SHA512 8d1c288f5d059105579386fa78889500c5f0c7553e424dadf7719946264719a00b266123a2c4ace8ec4eee27d855017495e4fbac21248671c7b3f681664af79b WHIRLPOOL 027666a57e75e80aef922bd82e2a00d513d17502f95325f1c1f69f519dc7e7ab578d6788dbe46cbf60158b603946ee817a8bc1cd16231919dcb9024326fa7150
 EBUILD icedtea-7.2.4.3.ebuild 12225 SHA256 456cb3c62ce2bf07aa5335f306c8e0e02c7324f53938931b6b3e9d5656d2da8a SHA512 328c378160a81313f552051a9e4e3a405a7b6a064722d238ed0887dd46ded512b37edecc1ebc4d611dfe627148115177ff427154d5b763e1f55f3b24e567b3d4 WHIRLPOOL d675c21a6fbcee44d61f1765d32b5a41af36f90aa49bea78ee058ffd5e339aa4eb9094998f3781db0c0fbec806323f0baf0a7fd6610203507bda301d0e7e684f
-MISC ChangeLog 24601 SHA256 3abc8af7d486601cdffe521f8a2ae58fab3039f392c8912cf8ee11a67cd49a34 SHA512 edaba521cafcaa77d5e9be70d9543301d1a7a64498b8a13ee8578ceb86fd9e9ad988e943554bb41cbdf571dd59d320e079e96253281e1e0bfeecd2bd25ac30e2 WHIRLPOOL 3b76ef3ac078fcc3b0f752396e6ad453b57fae309204064d6d3c400282d0fa25c981edba3194fbba147e96c80dfc5f4efbf869a88871608984d031944f6dfcb0
+MISC ChangeLog 24971 SHA256 70f8f1799805425dca323c5fa1921b4223c1fc99f81dd2befc48b2ae8d90cb8a SHA512 5f333f4b2a2c989b2dceb7792db18c81370662e5339cc37cc583587bb57ff83c8a71c4eb55cd1d0e803e2711c1497df49d84290ae59d07257f748829502eca75 WHIRLPOOL 15a444a6a6c2ceab12718f1b96b273bddf23e424409a371e6a7edbd4e654fa8a78622ba3633a2d3c5fcdbd7d9e188340a757167c074f99cefc15bca5a0a90a35
 MISC metadata.xml 1625 SHA256 af543836956dfb8bb72b853eeb35ccac283110b000ef60bc8df1319938cfb347 SHA512 2d7bf08168dcbd24f5ae9420f0151274def1c5ec248e73e5e3f51cd9fe0273c44feca33eca7976fa1c7aa22f6046a938e77cdc3178b3e58d771949b61ee4fb20 WHIRLPOOL 6d4cd813a615f880efe0918b7bf4c87aeff76ccfd7b6e0b63379c176c7443d3067f99cac922ab98cf4bc980036f0f7f447ee9face14402b099c89f981ac059be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSjgq6AAoJEMbwO6tnXQ0sDp0H/iUWSF7VbbaDapojiwADKQ2M
-SgRLPGl9qbTf/uHQgNYRuQypRr0DJcmyHvTgpCtR0atKIoNOB5EDdKWNgSPUXu8m
-IVvzW/gyPm1plA6b0KgEJDn/AHZOcVp0/rlYze+45/g+fw5yD/UPgRKp4WTu5qqz
-EvzVTsX5S3MbuJnYI74Qd4vl3CQMEGSHZQaFsRIrjoB9aNnMCCfh5oPQE253kWmd
-9taKMD/m3dW19knyd176oGzmxqJy5kIZevv+avATSozYcHrS525dt7+mvjpjkbBY
-7068IPKa66cB015tncgYk1ILk3pqXz+IELkuL8ourBIlaNJ7H1MyVwl1wzLblVA=
-=30QV
+iEYEAREKAAYFAlKmRMkACgkQtbrAj05h3oQvtQCeIdpqGpR8mAX/v6rTPWIy907v
+i6UAn1yA0nMQUXz54utgqN/I8qSKM4SC
+=X+/C
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-6.1.12.7.ebuild b/dev-java/icedtea/icedtea-6.1.12.7.ebuild
new file mode 100644
index 000000000000..b8828a7af49f
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.12.7.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.7.ebuild,v 1.1 2013/12/09 22:31:36 caster Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+
+inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+OPENJDK_BUILD="27"
+OPENJDK_DATE="26_oct_2012"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+# Download cacao and jamvm regardless for use with EXTRA_ECONF
+CACAO_TARBALL="68fe50ac34ec.tar.gz"
+JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
+
+CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="6"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="+X +alsa cacao cjk +cups debug doc examples javascript jbootstrap +nsplugin
+	+nss pax_kernel pulseaudio +source systemtap test +webstart"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	dev-libs/glib
+	>=media-libs/freetype-2.3.5
+	>=x11-libs/gtk+-2.8:2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6
+	>=media-libs/libpng-1.2
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:0
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# media-fonts/lklug needs ppc ppc64 keywords
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea6
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			!ppc? ( !ppc64? ( media-fonts/lklug ) )
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# !eclipse-ecj-3.7 - bug #392587
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.1
+	dev-java/ant-nodeps
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	virtual/pkgconfig
+	sys-apps/lsb-release
+	${X_DEPEND}
+	pax_kernel? ( sys-apps/paxctl )"
+
+PDEPEND="webstart? ( || (
+			dev-java/icedtea-web:0
+			>=dev-java/icedtea-web-1.3.2:6
+		) )
+		nsplugin? ( || (
+			dev-java/icedtea-web:0[nsplugin]
+			>=dev-java/icedtea-web-1.3.2:6[nsplugin]
+		) )"
+
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+java_prepare() {
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+}
+
+bootstrap_impossible() {
+	# Fill this according to testing what works and what not
+	has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
+}
+
+src_configure() {
+	local config bootstrap enable_cacao
+	local vm=$(java-pkg_get-current-vm)
+
+	# IcedTea6 can't be built using IcedTea7; its class files are too new
+	# Whether to bootstrap
+	bootstrap="disable"
+	if use jbootstrap; then
+		if bootstrap_impossible "${vm}"; then
+			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
+		else
+			bootstrap="enable"
+		fi
+	fi
+
+	if has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		bootstrap="enable"
+	fi
+
+	config="${config} --${bootstrap}-bootstrap"
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO
+	if ! has "${ARCH}" amd64 sparc x86; then
+		enable_cacao=yes
+	elif use cacao; then
+		ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+		ewarn 'If so, please rebuild with USE="-cacao"'
+		enable_cacao=yes
+	fi
+
+	if [[ ${enable_cacao} ]]; then
+		config="${config} --enable-cacao"
+	fi
+
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
+
+	if use javascript ; then
+		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config="${config} --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		--disable-downloading \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax paxctl)
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# Load the least that's needed to avoid possible classpath collisions.
+	export ANT_TASKS="ant-nodeps"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die
+	fi
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	# Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	if ! use X || ! use alsa || ! use cups; then
+		java-vm_revdep-mask "${dest}"
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
+		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
+		elog "If you had icedtea6 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}