Version bump, security bug #477210.

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

5 files changed, 45 insertions, 333 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index 08a037f07776..7653b27a20b3 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.47 2013/06/10 20:36:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.48 2013/07/24 05:26:57 caster Exp $
+
+*icedtea-bin-6.1.12.6 (24 Jul 2013)
+
+  24 Jul 2013; Vlastimil Babka <caster@gentoo.org>
+  -icedtea-bin-6.1.12.4.ebuild, +icedtea-bin-6.1.12.6.ebuild,
+  -icedtea-bin-7.2.3.6.ebuild, -icedtea-bin-7.2.3.8.ebuild:
+  Version bump, security bug #477210.
 
   10 Jun 2013; Agostino Sarubbo <ago@gentoo.org> icedtea-bin-6.1.12.5.ebuild:
   Stable for x86, wrt bug #466822
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 23ac8e16cc08..a80a7f8d00af 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -4,71 +4,45 @@ Hash: SHA512
 AUX fontconfig.Gentoo.properties.src 15624 SHA256 06dc1c588fdf939f3942d435a9a695679b9d6b44591f6efb7bef3a5e38972b59 SHA512 beaf931cee245eddb8d595dd2c74eff5eb2617ab1332cad0c0c70c1bd382ef35d702707549a552f27dc8fd56c7605957361fddf6e2420bb5d0a1f1cbea2a5a55 WHIRLPOOL 8a1819e3acf1c1e5fa0b6ddf37b2339361c818a72788a65cc1349af437239b4561276866af766162b697cb3d81b3aaee04bef4271afbd98eb286e84559fd43ab
 AUX icedtea-bin-6.env 1061 SHA256 a6aedf9a1a5eaa3bc5c26b0bd0ef5b79b12f7384e705a1f202929aee76399d92 SHA512 4a50072c1f4719dc2fcb70b3c3acd217359027968fbf585beaeede2c8fa8e9da97d8e2247c2c028e0456aed59c438abeab03b6e17d0c4d1fadf3a705db5446b0 WHIRLPOOL 61eb22e04523a20d4edc2f82a6d0d24823c326f40b6af4baff0bfc483956232e636c73080b68cdc4206d0b19f5161001af8d4da9d9a116107c5d26be1f06609d
 AUX icedtea-bin-7.env 1061 SHA256 4715904865c9794e0abfe69ae1bceb634c1e0182ba80046a0e086f84cb81087b SHA512 a82f576eed3bed9d7282194619e475fb98959d9f76c7292cce782e38c7fbc74a4211f61153d465542f20fe31bc48794d01e18663e08ca7b57ede9470e9ea5049 WHIRLPOOL f7f1cfdadf9b752ca91aae360675c384fb90ac70a962b501ab9e0e3f9a33acbea2217a556e23d59f09bc19745fdab54951adc4921b5749bc440788eabbc76585
-DIST icedtea-bin-core-6.1.12.4-amd64.tar.bz2 38328989 SHA256 734e076ae38e3b8d6f33fb52b6a97a50046bc28407e85c99c6c257e2c1a6a455 SHA512 1146e5386e328ab91c352b6027f0d5e3347eab6b3975a98b218f965a656aaebf0156b66a6e1c0a220e05c2305c6fd656e00d2949365801948772ae2f3412c087 WHIRLPOOL a316e6696a141edf0a9b1a248383087b25f299702a80ce084994e23ff30ae3c83ac84220635861b1c9ce4cfcd15976d307eb1fac0a52dc3237408e0369431143
-DIST icedtea-bin-core-6.1.12.4-x86.tar.bz2 39119517 SHA256 52ea87b0d5a4d3922cd84ba2cf5b44eb95afb7943af4943b6d038f8f4a923714 SHA512 f3063cd01e521acc22ef134e318f35d7e26dafd186b0d588c5bc678650f04d92a518143ca11ca4db032dc5e99954f415070b4171781fe2c7bae1a1f811b9a810 WHIRLPOOL 9e537a72266c50abce69739cd1fcde0215ee040cb3ddc06373eebfc4df5fb7bf07bb0cffb51517a57c686a07c86869180053148a18c34af57a7ff805a015d536
 DIST icedtea-bin-core-6.1.12.5-amd64.tar.bz2 38373807 SHA256 f1d0eae8370da49db18174a5a2c84d12275f0fcab35f557d50a98d5db9353ea1 SHA512 0dc0462809a99b8b680c3370a79518eb5ef8b3e7b6f1bc1d21668b0fc8737943849fba9829b5783c181a5f94b957c8710e61e729978e077ac11af0bfb6034f85 WHIRLPOOL e76affd5fa8956a379413edf3b2003c3531497146daa426a83a7a3c38e04f2778efb8d47aa85158d2ec6220455c92e89502764d2fe5e5e02da61ae3fd7e6c527
 DIST icedtea-bin-core-6.1.12.5-x86.tar.bz2 39215854 SHA256 cc21358aecd9c9a9129d6d02d1043394a0ef8387a26cc6c52f2c7e2f64dc762b SHA512 2c273ae3b368ef508c48e1232ccc788c76fc17d3a9af7dd504c5353966f987951496c311cf9bc74dade4d8921645d2a7b89296b9ecd24f88ce646b477f714eb3 WHIRLPOOL 9658cd2244c9d6150ea257e430a13c0749445fe1e430e9d9dc2342ffe795f5ebd27ebf7e76225c4a7054e135d6e591700c166d0e393aa70a3e037ae5a42e290e
-DIST icedtea-bin-core-7.2.3.6-amd64.tar.bz2 48864185 SHA256 4eef39a8240f483bdbddd3d4b7b81af55c6d4f526336beb486526b2d5b0566a5 SHA512 ef720079aef99f547d857b986915236f0b0d35bd9812223b79892bbda953bdc185e12f8974959eda617e61d91f41ec374e174643c6764543db27075ab1e58289 WHIRLPOOL 6d2ed5ca5e3822e55baa5ac4a792c7a212fe8703e340161514bcde6c54e5dc613ae3ff959ecb3a975c54fb8541f9bc0926006f432c19a120db9e61ce8b07c7d3
-DIST icedtea-bin-core-7.2.3.6-x86.tar.bz2 49977550 SHA256 c4186639f5e295c3126e4bf8812a17d84fa4a76ab86cb8f0032066e1031a4f7f SHA512 ec9b8c9685ee3673d333dd82645e90ed29dd5417f2d2c12da27a47032ad2c5fde21afffb3399889e49a604bc54a65c4a1c2f4336539bee510dd1ce2f9b424507 WHIRLPOOL 5b78b0a69f5032c185409391b0a983b30fafe9fd5e231282193c2349dcb69437e4ea2f4aedee35e60a0d41c4905d815f379492c9c958db181adf59d5f89e05bd
-DIST icedtea-bin-core-7.2.3.8-amd64.tar.bz2 48875986 SHA256 049aad03f7ebabbc5bcec8f7048fa1bcbfff2aa03b2f08cc3ee6bf583c3c31b9 SHA512 7b31cb80c44501541b33d307ed579c81eb0551eeeb2c18956fd741ef44f97479ac91bf1c6fdb5a26dbf0f4f19d7b95dc1a6fc98e5e1941377c1d3a5cee6afc63 WHIRLPOOL b4f0b60a0385333fd9ce7114c91469a58297bffb77ed418f2a10375b1cb062a031190b6ba9bc176644a12a3dfd7d71dae492c331effe98e4510944a4573993be
-DIST icedtea-bin-core-7.2.3.8-x86.tar.bz2 49985284 SHA256 810893988cf93e6235cf47a55bc09c62bc095c9433a20b44f8454ee35816f2df SHA512 b83be108e60a6b2ff2db6a7a8137c3832e32b9833e170d9704bd3cee53236d93a463522f28bf3b0f0e9248403cdd06b1c0f8ef5a5326f79a6f0dd9b11c561b50 WHIRLPOOL 65b632603748cfd44f61ef807fc0236fbdc60a3c99177752be79dd65684d11d292e92287c201d5303907783f426e4bd09f2c3e2155e2c82cb5f4cc39e39357a3
+DIST icedtea-bin-core-6.1.12.6-amd64.tar.bz2 38473056 SHA256 5281b5f5743d8d7d3ada0e8a43ea258acbc9d5f6b124570a92edd74595c2ba94 SHA512 6b7931038ac31085bdc9e54782432935a542a03087ab1bbb840bdfd18dd815e1cf34e89462112ff8b4e2a5bbbc9d06304335ded66a265f8dcb4e081e05952b74 WHIRLPOOL 6074546a26b1e1f47ada925736284e817f6d5d5f7bb020020c84822a62dd6236a561b1729718abbaaaca526df9bd42785eaf61f67fbd76f5b33db0cd869ac6e7
+DIST icedtea-bin-core-6.1.12.6-x86.tar.bz2 39338497 SHA256 b87a044b142d36eb25bbfa9c0d6a61166d7fab30f591a9c4ef5066247a5b7733 SHA512 fe89875f54e99ab73e5ebc8f5653ede352322187bfe255c5e869a83c91be498a8b12856554bfe0362a4a414f608a55b4320967acab9bab860d0ae8c21cdf4702 WHIRLPOOL 5dd938a29a6307eec3e14369046bbfd18fac5be4544b0aec8986da6228004e5a47effdc03cbe80876f0bd3d5cdb8fd070b8eedd0f912ea29aa14d630252507a5
 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-doc-6.1.12.4.tar.bz2 11638477 SHA256 ff5ce6246d638907ec2fab4140aae69e849e8981696271a1d478b874c7a63675 SHA512 ef208db32e07bb43e11e2e3ddbfdb707959d4b41c0419611925ed3cc037f07045a2c15d3c013f2b54335d3bea37a9a62a2d9007ade660d7b9420dad51c7a79f8 WHIRLPOOL 8e2d854b94b64c74fed587d51518a0db4d50c0e565c33db5e8b77cc0f692fbe2332e014f0b14b562f9706a84ab7cd5eceaedbcc50f497b4cf753c9c874c5ef44
 DIST icedtea-bin-doc-6.1.12.5.tar.bz2 11636972 SHA256 386bdb4ff2018335b18336f5353c78b14f0bbd5efe03e1faee64e32dfed07545 SHA512 baaf51c3b11572453e1e372c947773310c6861564e29e86f237fb8fbcb084612e2f66ba742ef593d2199b9d20f2a9cc34f010a364d5df67eff28feeaec7b1dc0 WHIRLPOOL 490a3531b13e30f81d7ba4a5da61ce84b366e3e5e1e45dba0b596833fc23b58a3493e1bd6070723997a6c9ea0bed8ac7a4028895aee8acf4bc87e39e34965b12
-DIST icedtea-bin-doc-7.2.3.6.tar.bz2 12536331 SHA256 2768a8e3d051caa91804773d6efe21e95a344f8105ca672d6572e586b9c113ac SHA512 91087a1631157ef945ddb88d3f3f1fb878b507902010b358384b608040ba21a629c7769bead67301240f260043ca79c59feddbadc1f8aaba7d83afce2fd0f805 WHIRLPOOL a73261bac84e007b0b7eb0d6f420b9c5bb8ff7a3c7c0681ce0616ce335552e7a4e7b17a7021a6eff11c0a4abd8df9416dd92ef1dc9bf3f95b5c1a415c55a541f
-DIST icedtea-bin-doc-7.2.3.8.tar.bz2 12533719 SHA256 451468c54141ddc498d938d0bb0da20b3ebc53084219c2458537d5a22cbd3261 SHA512 62c6ff06d65d1585693f3e7fa01d1dfc3ff61056ace745c650bec0fabc50e80db01c352bd53b3f838ce633bb2450d994f103eb1244faf027be6c6cda38ab0bc6 WHIRLPOOL 5c2330beb1091992f4fb40501b7da0ad4877b78bcba59bfd70e7a640a75221746d951c6001483858085bc7a704f4546b9d03b8d4a5ecf6627f7144f00a207faf
+DIST icedtea-bin-doc-6.1.12.6.tar.bz2 11508707 SHA256 61a4ba5c97d628536d06f0e6c888307851a933ed39e3e46fda2b548f9ec34dda SHA512 35bea98900a9edf539471760914e6d1b3a3b01748d916176004c4f10bf712b5630070acd62f3c079d2470f3edae05508279fe7b72e41b4931852cd2150f7bbe0 WHIRLPOOL fead05c0b1cda5ec63c47b44a6eb8645088ce79690dc03e04ce66ed30a7026fdac020bf03f20d1892e5c1be207fb1b0fd7fd8f6293f74e7eca3be6a9e8a06030
 DIST icedtea-bin-doc-7.2.3.9.tar.bz2 12531939 SHA256 0c19ead603888b8f83f7b5f72048f83d18d3cb6f31391dcda02e2e74380e7164 SHA512 4965b6f7e0cd59dc26681933b89a302e5b9384ba26126873c9dc1f97c98a96c34caceeff2682a17fd60ef36a75f44dcf7f5ffbad9c17d98bee95cd59fb19fc0e WHIRLPOOL 03500cc4bc64bf5fef13380b6a957844c739ab1093710e0fc3c1a1313e74527a6efc6970968621d69c268e838637bbbc3cba8dc9edccb2915ad5432eb3e1ea3b
-DIST icedtea-bin-examples-6.1.12.4-amd64.tar.bz2 2164702 SHA256 c6961168cf00e8c8b56c5aa3de373099d8bceea1b91b482d5a36e28593947917 SHA512 c03c86acf0e3976e814a0a31adcfc3806dbf3ffb35b9a2d037a0bef98223f5e75c142e1baf80029ae7c5b9c41224c2b91893e0cf109d0b4f990d75afcb97249e WHIRLPOOL adff3d880e57856bcccb48f85df0eadea2d9173f025c6cb9d743695f0e6060780821b54ab0ad0b7e557e45d5de36c0174e1cd10eba112aa0c14a8474f04e2e11
-DIST icedtea-bin-examples-6.1.12.4-x86.tar.bz2 2133737 SHA256 9e6b5098e0b05e006a71927a56ea9813235d0e5698c45fc03239b70724136735 SHA512 fb9f6d583683def59f6cc63746184345f50a51ae6c5567c014f925216cf7619571d11041e863461f36932b3c7f612bda5517749af1a09174ce39a26a9d4fc31e WHIRLPOOL 21595487e055844f21022ea803e9f6192976e1670b99019c1d2b6d7377bec479b785b755e3ea528e4984a8ad6fe340733a4b87e81f60d6048d6f16f0a0702b1a
 DIST icedtea-bin-examples-6.1.12.5-amd64.tar.bz2 2164585 SHA256 1b4f33e45e20f4a3bf1d1a45fe260940fa0c0ff17627e462ee5bdf85e5438fe3 SHA512 2dc3db0e9e98c5eeb4436dcb75b52039228a0f57ed6303e1fd3116503c13083c1653c07039ac7fd24d7f95d572ac4237871080a7b70804484dc1c7222827f722 WHIRLPOOL 6070c4df104df9262758b9e7ff7108a5e32163b310cd1f3b59867de95f5b2c7dc498b4538a9e973ec396b8869d31c421b802e57efc90bd11e145321077728ea8
 DIST icedtea-bin-examples-6.1.12.5-x86.tar.bz2 2133457 SHA256 dbaef31b47cc854970481a8b7cb6411d252cc4d010763c8dcb1505a7ea1f9918 SHA512 1f71fb03df90d8e15e29a5b79a31c319d364e60b29c472bc893d14e52f87b89f28bab97011c1ccc5360c16009f22f2f4d7a6c81b4c8116beb124b87d8f064606 WHIRLPOOL 108b42ee95f4e1d470a2060c0e4fb701643b5ee62bd673375d05cd903fe53d404ef72a6cc9d8b03c1a9b3b697aa0b1e94faaf82d49a9451cef3b636f0d3864b5
-DIST icedtea-bin-examples-7.2.3.6-amd64.tar.bz2 2334184 SHA256 37f73707bea574e0e5623bb3ea2c796729460b4b4fb4ad3f1620a2d9d6e4cf18 SHA512 3275a1d295c516b367df6b766e93df95348afe8b3d8f18f7da9ca1cdd83fa7326f0afc8b57e1514c9ace55052de3772b392efc3938a72c39e0d8a9b6f35226ce WHIRLPOOL 503b59c4423f352c7f4a860f0da1f70dee0cd8198dd499c72f4d815fc26df96f1ac1851ac6e7b670cdace92f8b25c0b8c3bc2ef30e1d2e4aa7f5b71255b5e346
-DIST icedtea-bin-examples-7.2.3.6-x86.tar.bz2 2313989 SHA256 c97b482337e05a31ac79845f15c84c338da9f17d343d0d7904560e14c5138796 SHA512 4b0043f42f9f3ee7cf884160e90c12963cafcc9f064401f8ee8687576f57dd9512b9595af58abb10ec1501dd0001ebc36827e7126c5e6361a22d547deb0af7dc WHIRLPOOL 64d0285741428787aade56e70b5afd9832b866bae15a55dcad423ae4b6ca457f5e959d70cd96f22495a39a9fb43d50dff93664fcd8c2f6e112aaf228aa664a0e
-DIST icedtea-bin-examples-7.2.3.8-amd64.tar.bz2 2334168 SHA256 f67f8ca7ee887d962df8251ba715f576cdbc07d035b79778b7d610580c194256 SHA512 2d539f9c5ddd8b47d9632fd0a108cf820ba8a2e42afe2228379b7b9bb236aaa40bb151884d7674b0753e86746ce9c2484b3272a4e8a549edc9ffcc8b1c609664 WHIRLPOOL 1476fbe954ff4a3660603f4b4358d3bbdbc866464fb79be22628f982c8ec9c46a2e18ca339ad0486fd44e255c72d2edf268d115d194764bebad52b2aa2d863ec
-DIST icedtea-bin-examples-7.2.3.8-x86.tar.bz2 2313715 SHA256 73b8cfe118a1bc1fbbabe1c4eecf3d2fe8c7895ca42be53f0db6597c00650e7c SHA512 10800a350f9469ae495ad6a27002230c09675eda46809048f9da090ef7cce34af62b98f668c0127057e07bbf7ed8f31632f2a9ba00c98f509f3b77dbfd27675b WHIRLPOOL 72d12aaf5fe0e8aa5c9a9977225668c9421fe2aa155f10ac81d947290ad2556e67a1f14ce993b290e8d55d5a216363a339933fc5b85398ffb8707a8997ec310f
+DIST icedtea-bin-examples-6.1.12.6-amd64.tar.bz2 2164759 SHA256 13a579c606233ba7a696acc3baeb8b4eecc954103c7b9cb70c141b13f00805ac SHA512 2d9ae2f6cb64548553d66f4766e0aa15f61b22667700e031445221b07f5d8bea8ad59178528e2bf93185d34638bf354898280e261b00a855b292b4bef7a5da89 WHIRLPOOL d8ca6872687cf8b1279abad0ad810773dbdb49b4bcee550cbae0f1d7a8933f67022b9f5e77b7052ff40023a302e1fe11263ba1b666e7064abb2e9c2f3caed748
+DIST icedtea-bin-examples-6.1.12.6-x86.tar.bz2 2133753 SHA256 719e55eb2bbd26dbe69ad4cc52b40a901fc9be70b28c2e55c3c58d5febe0d32d SHA512 08a7ea0be915574827156fe6bafad5878a443c50d305ac3ffd67ebac98a53552d70a08f4a56be958fd6e1180e45e8178284b0908d772d949495f6d78f81778c4 WHIRLPOOL 8a152a9c64754dba474fdc31fbe02a9db769abf86a89bf30e1e3bab8cbe0c4e64a0fc7ea1b689c226fe631953af97e94a930b1477a33027d59663bbe5fc482bb
 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-libpng15-6.1.12.5-amd64.tar.bz2 18653 SHA256 5e53f6f2909572fa344978c1e7d1bc607d13d27ce77f80de20363b505fb2e39e SHA512 3e1f3fe42bae2394681161978a16835292437749f0f8e9c0256077536fa77c39350fb1fe08c6dfdb42c2c34ca505677e5dcfb1972aba7a220c18250d7bf386f9 WHIRLPOOL 391caceb3ff017b437f2e746a2d399d29e47f88f2af6d7332ca43d11e871798e5bf1da513961bacbd34b0acbefe312649f91fc5fa44ce0bf5f1ad8b046a3e413
 DIST icedtea-bin-libpng15-6.1.12.5-x86.tar.bz2 17216 SHA256 69d6efc0da4625bf89aecd9e5fcbf92ab2e5c49f38c4c035a7ea45b6be4927fd SHA512 372ce6b24a121d5f7d075ae3832eb9ae928699aba254660025a70293edc962790f02d8003ad9367adcae8190163892ba29e02a213a7497d23834af2e938c9c70 WHIRLPOOL ea08f0b69249df06362a0b24f4d156537fd1ffe12491bc190f4988ca107f94d6d35a01d43f300ec2e44405897badbe6afad1a1a9f745888b9a0145beeb16681b
+DIST icedtea-bin-libpng15-6.1.12.6-amd64.tar.bz2 18742 SHA256 f2657ef130e7b6bac86231d43f635a9d4bf9f6ce2bb2ebe55b7cb34b9ac5fb3c SHA512 971f7cc84710cc589b27e694f989627b38cbf37d2a526601cdd773c0a0052b58ffc4249b2b0aeac2d2036d8fcf08eb209c0b9bca754a8426c3f40a1f71ba41bc WHIRLPOOL 334bfe13da72a83dd5c127c9247e7784aae8964858fa65b2495f0ff1729e403f3fc51628de662c6977fa4a9d6eaffa040ce3a46ee8ca430178b6308af258b058
+DIST icedtea-bin-libpng15-6.1.12.6-x86.tar.bz2 17368 SHA256 1eaa9161e5e7016c1419b354a63bb264c31afcdd5bc6f514a3b78f05396cb379 SHA512 a2d360a905c1b28f8071278be7c7609b9b84ff4c3e55ab76ea8f0db4227fbfc64c6644eb4873c0628b08d88570d660ea5eacb5821f089bb28de88c41133bdb5b WHIRLPOOL cca3a19c4975408343313b197be3fc151bdbed2d4bd5cd049e61d0f8bf9440c946313dfa3a422275dbc02c85bf30321fcf358ed19714e52f00e26dabbef227ca
 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-nsplugin-6.1.12.4-amd64.tar.bz2 1013413 SHA256 c1ea8e5368c6ad235253c925c46b25d1f57a9b4ee11d6446ceb2d28b65f60e38 SHA512 23885c6fc7b62bb0ce49065ebfa91140c1f0ae2e0359e8d486df366496150584ac1cd589a83f563df230d70ed69e01219cf08acd8cc224927c8634184d2e5e8a WHIRLPOOL 52bdec4a22fc979668adbc25313d1ec550588755b89979203d779d83b4a536b95c33f7e54522c9fc32960ec2fc9084da74a754e1f7e28caaeded9a6357fab0d9
-DIST icedtea-bin-nsplugin-6.1.12.4-x86.tar.bz2 1007668 SHA256 7846482795eeb3d0e27e28d0cc455cccaf1c1c00073c505dc43356d34ee1174d SHA512 11559b00b5cfcc46c69abebaeafd369b0af6b972354313c9d0becc184d9215cdad548ab8d0843bd375714ebb97405568db1659cd5824d967109987f326ff1728 WHIRLPOOL 6ba0d909f348a3aafd54f1036d2aaf88dd6cb4bc1324ac80958222d135fcbe7e69288acfbee8c51269690c85207fdc4d634240b35d710787ca89bfb5c19661e1
 DIST icedtea-bin-nsplugin-6.1.12.5-amd64.tar.bz2 1013357 SHA256 38094f24078fd09d460fc317a990eb81ba20c24d18dbf3fea7f2d97448d1dbb0 SHA512 6f1f3e7abca8dff0d6722d39a6019a8e336b0b9611fce0a35085c89b79a86f1d4d63f5e58505b99e24c167296f316c335daea1d77cca4f5ec0bdf41a2055a67a WHIRLPOOL 4a2df3bf4362cde0ca21d5f388f252214cadf06ccafc31f2f04d9af1deef4b915181d8d12b6ce4ba9163a361b2a941a456591baa9af9ebf94d09abd708c8c19b
 DIST icedtea-bin-nsplugin-6.1.12.5-x86.tar.bz2 1007318 SHA256 53acefe757e2c1983a3e9828f611331afa79de89d5ae99cd38bcda30f5a67a4f SHA512 6b2413fa0afa41525aa9d5dda44512f673f6035f82b65e78f64072cda0553f809185dd3c019e6252ab39bc532674b85a7f5094fb18409d64111e687a290a3f74 WHIRLPOOL f892a5adda33708ba350968b7910e2dc6e7cee4665fa2460157823526c588769da82c5c5ff06ef9a0f3866dd727b8d1ea94c52234db14035375dab4d8429a17e
-DIST icedtea-bin-nsplugin-7.2.3.6-amd64.tar.bz2 1047827 SHA256 4f276591ddd39977719f9e6e9039b5d78c46c0ec17e62d1efe0424667721ec84 SHA512 ec0f4fb365226aaea78bffde7f7f3275c9f1466d38cf8a884142f994ae6f7eaf819f5640faff371876787599324d4ad54374790ab0787c438425c1c86bfdd43d WHIRLPOOL 653641b88c257f435d26990880159feca24ffd5c57ad88012064651562addfde05ff4d3a5e4d109edc4dd607af4d121fc6b7599cd43a415db7efaf56de20b3c6
-DIST icedtea-bin-nsplugin-7.2.3.6-x86.tar.bz2 1041670 SHA256 6c2664d1e71121b8bb9fbe04d1ccd248562dec69222621ce2dafe5faaf8877ff SHA512 5ddcabb3b72771d849feb59e583167134be0432ffab9bf1ac52ab27c4bf74716fa6b8e5f6af0706b9cfe853a3953d2a710f1aaf3a609af843659d98c3fdbf257 WHIRLPOOL 51239e47da164b5d73822e851f1d8a739167a54caf226c7e2e519e2ee8906c0ef82dfff873773b2f17b361801646f9c7b38bbfd162ece3c8ad35da268589d00f
-DIST icedtea-bin-nsplugin-7.2.3.8-amd64.tar.bz2 1047634 SHA256 197fe27b0a3b7d453d1d09c2b014b2754e591685f82c766270c773c7fe0a0b4c SHA512 f3a97142042ee5262a63268fdd9f5dec8c1f77c5463b5b95df79bd60375cabfa8f8c85ce49936df10727784907ed13453b017af7bc9d5197931772611470e919 WHIRLPOOL 48e05a1d5e1a7705582c51f19b71657b9bc9938b8d334a83db448a084a61807884b6611056b1adeb9985c0eede5fcef0215fd54df2e5486b3a03dd883e8b9f9d
-DIST icedtea-bin-nsplugin-7.2.3.8-x86.tar.bz2 1041825 SHA256 6b67af11145c4634ef883f2ad812bc8edc1b3c08ed3e425ac4f10ed322753aad SHA512 384db30ff64f39408ae2db08a41097136067af2d256a6b1f31fd803009bf66d61644298db6c713797bcf7fe1265023aebded746eb9f40276ab8c043867015707 WHIRLPOOL 4f02fe40865f06c989b915c3c63b48128e1a4ad080a0b5f451c14a4ee6e4df3fa0cf8b19302fcd64291923d88f11fb5dd386bda4604339c52fcbfe9a776f1587
+DIST icedtea-bin-nsplugin-6.1.12.6-amd64.tar.bz2 1020025 SHA256 e2dc553bede3d11a2ff1a2b6090f74090edfef8b82e4990c7d22d2719844afb6 SHA512 d70bda0c067b857aaf93c17ce79365f2bc612fdad1615fcedf02e43b714a735d17f5304645804b73158eec09b41e6bd92a467e1073bee6d43f4610eef6bef1ef WHIRLPOOL 95aa6307efe8f6e5a21d802d1b0017d5e54665623ea3ca47b8bd06d0ad5034acf31e031306f327e5ed9c33f6a5756c6a03167ce1d8004d5fa193aa578821b79e
+DIST icedtea-bin-nsplugin-6.1.12.6-x86.tar.bz2 1014033 SHA256 e9978ef0836ec14fdc0541c1705d92672c27b31be91df3ee1283644cc0cf0fcc SHA512 37b121218c4b091927598bdd221d296c2261e9ce6a2a5e02e61773398ca111055a166d09c3ca86ba34320c1b9607b8a5d26bd58941385f95ad79496fb3f3a687 WHIRLPOOL b652bc28562bba88cb307fa12ecb75521523484fd5fbcd940196cc94edd51e718b6352043cbf21ce201f54204c2f102b3c53af7ee15361de6c682fb50327a0c3
 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-src-6.1.12.4.tar.bz2 40882869 SHA256 162e4415be269073a38d85ce9894ff38b2bfdf1e1c4955f6d8155e09ec2e73ea SHA512 8c2b2a8d4ce3407d8dde4ad03614ad3f00dc29b6614e4ea2379e5ebdbdac92af8aa1e18b39c80f4acb63295950f18d9df13134510571710b8de7628923dc7f62 WHIRLPOOL c871041f4226ab888095abf3f5f7a9653e8a197defec98b70eb03a4e77d00bc9bab13f2b6bf331cc598ede62c059a6c412a928bc83d6b3670e562e9380ef95d6
 DIST icedtea-bin-src-6.1.12.5.tar.bz2 40881998 SHA256 030ec461fd6ac1fda36c21c3d4223217d95255956a0169f2c38ddb37574755ce SHA512 1354c12b3e194ad3e42f7b8ff0e29f0908ca316a699a2a5878128e9c59b5d14e504bf20aee15eff4758c99a5ca6b95cbfb9a711ae926ece056e12641d1cf9a1c WHIRLPOOL 882473ae360de810032ca134e45ade71193df8fc0cfb4eb6b3117969e6bc0815d2097febeb05129f7a4db630b86ebc990d4ae7abeb06c88dfbaeb7dd93465d00
-DIST icedtea-bin-src-7.2.3.6.tar.bz2 41274032 SHA256 b5b2b602e288fd87a83021216d29bdd7f5b72d07034c37836c1c24c2e2ddafd7 SHA512 76d97100d3294512439c681f65c04fc1f6813f6bfd91410f846a56ec76ac2f1b4dc5bf8d2a14ca02c98f8fd29d466ff22aeff9878d7a1a2d528f9ef3d90eeb41 WHIRLPOOL dea51019a5c7326b546805bf4f8712410e5d170cdd299ce900cb4e679bfa99e846743480a43ba78d84ad6462c117543d6ce0d9c312688626d7f30aa1c6928a43
-DIST icedtea-bin-src-7.2.3.8.tar.bz2 41281043 SHA256 8c4de067c5b37157442c8596e41bd5e2ecbe1f1063e1ad17fdcafd3176508ba2 SHA512 c2d2d4db98c99cc6c14aab1cfe82bf44579e9dd73e06a3ea5e395e86c2434b00414760cc4daadd537465b7b9152b78972d2c6aa3e281b365492e3d289ed60995 WHIRLPOOL cb6d31c89ed2dd5f93a363b05a6877ee17bfd309e3e8e78966f6d62b95460ee63053099554c01e59663571eb8f25cec6d8cf2b428126e8223c89341810be40d5
+DIST icedtea-bin-src-6.1.12.6.tar.bz2 40956483 SHA256 883288b50cb3548341986b59d859fb2575a293499e83a6b26a5493bb3f719d8a SHA512 613635c29fde0b9dfc105f561de460de69b5c635562950e74795ce37efc4ac51ed865b816df0db8c32713cdeda5a0e974a68628009e2001ab7f42a10f9abd9b6 WHIRLPOOL 0ea4e4462ed0634c5fc06784cb4ab4f2f565237a3acd5f4ea6986a63ee9c0390c2fcfbd6ebf9f8a6c21f6c82f72c215b63700a6c77bffcd0021bd09b7854d54f
 DIST icedtea-bin-src-7.2.3.9.tar.bz2 41269870 SHA256 4d5699da20189244312f618bdc0039b816cfaaed777bf1971084d55942880ad0 SHA512 52bb50083e997d73ab2f7bba5e097f5cbfbcc114c0c8eb20fcf81b8b24662ab3e12da3bbacdac3d92f24d0ef8a8cdcf761a6e4a191f975f43aeb8c0e391784af WHIRLPOOL b4c4f1aa5d3c2fafcbed6fa2936e6b9dfcb5a743488188c63079dc406744a260b9668a649f8bf78da04060da981d86123f575a7512c36f875674dcf93284d797
-EBUILD icedtea-bin-6.1.12.4.ebuild 4264 SHA256 ec8b71096d2b0df51e9d95fc47a897cd211de9679da1ea979e6f64e0c26fb053 SHA512 af05342fe76d04f92d8a3915730c5a3d22365f5462740c24f859ac768f4af1eb9052d2ed78c4386ad8ff9c9adb8dfe9cfff99f72b9482fe794c29b43d488a451 WHIRLPOOL 6c91fff1e9bcaa0ce6108f34bd32fa7e4dc963831f94c624207fc4f5b41753023748167c0697852b4d97e727a96702f406af333754478a0ddd68459bfba22ff0
 EBUILD icedtea-bin-6.1.12.5.ebuild 4837 SHA256 44dddabc24f81cff0207136c4667219c4001318aa04420e6370e87e97bace613 SHA512 6898bdd64120532e7b3584271a07d854beb3ce805ce4dfd5b24844a3e690425ae3d756fa87e768c0c35d7a878fbf34bf50b42b99111b9b937ef78aa0f5aaa23b WHIRLPOOL 26adcc044b16454ae1557939287fa50edcc4f50c377553bbd800be7a18723c936b357ec50539607bb1572d20e504866a2a35e63cdfc561c2b1a5343a4b822ba2
-EBUILD icedtea-bin-7.2.3.6.ebuild 3806 SHA256 63d6082f497b8f99d7f5efd1d56c42e58c9f6992c8b8405bd433c6359180b8a3 SHA512 9985212f7a4765c7866c4d0e3df28de6f44a6ab937ccce9e3369e5669e3b5e2e5e51ef6c6ba1eb8e91262c14e0fd4a57a744e50b3a1e33d9274a837918568ec6 WHIRLPOOL e428d6b96b73f9ccaef72eb66674896f81153c7cfdf2fdff752011ac774ccdd10ee36b982ac34abfa0748a9112c08e667012b231347af3c01691418fa8351d9e
-EBUILD icedtea-bin-7.2.3.8.ebuild 3806 SHA256 dff72293f06839eda31c0a374d86b431f0969e2ad499b5990463b74cebad689b SHA512 3e0fe34042d00782da10557d21611a17d62b99085fc9a7a1cee8242396f97086481cab9db454ad182075c6399cccc5b6c00f2df33e3703388e3c3675200f4884 WHIRLPOOL c86eedcdc34a6be4c52d377402cb0fb268b16d6030617a46b2a083131a16e4ebc3e3563b6ffb52c10efbb42cfe8bc11bed5de24ed9c3dd4869a6215d822f552e
+EBUILD icedtea-bin-6.1.12.6.ebuild 4684 SHA256 08f30710738e928f70d3d5291024623c3b109c67da02d1c871ff93b431b102c0 SHA512 574e3a6cf7f4e04b69e0e23479caae0ef800451fc62eb1b51d94c4b6409e4d7f8ea77afa56b54a671a5545609543cee83479c39a4c99c33a33029fee0869c76a WHIRLPOOL c46e9e3675e024dbf68cd2f6d4084d74eaf71a37ded1d1b2e3ea2436252d7802ea7a8ca324afc3cda015dbd0c006bc204ff88c3d0612e1a1ada7fda750d03f55
 EBUILD icedtea-bin-7.2.3.9.ebuild 4384 SHA256 26e79e1a25aca1ce0e6489e019fc87ed381d1346f488f667c378762823f0a3c3 SHA512 154bdbc40e426564c40bab78b65eeca6663673306c037f5afda04ff8b76d943805451afec4c7a5b2c5be1ec300e585658ff6e99705de29d9a8d1a5ca24b96189 WHIRLPOOL 7edaa4d3511afa35c2a591629021c6286ce77d3eb4c89e473c1a04d449ac5562ebef6e7c3407ef4dfc3f4f7bf02a3c0030721617460cee33f1115980c9760c34
-MISC ChangeLog 21092 SHA256 119f5b63caba8999d9a3b19fb46af9a63ce019da7ffdfbd504cbb453ddbbfb42 SHA512 9811c1f531eb98ea5fc2e055db4e55ae6cc214410386f7e4384a140fe6c3038506f49d5266922b581994956cdd6915000a9f564ac75685dd7a36135e5c2f44f0 WHIRLPOOL 3930a59fb8341b715d254bd067887d181fee529626fbf84d651259a7b77119a6051628001e384f6730203e19d457006e3a4d5d7f87af007138b7912b8308f8c7
+MISC ChangeLog 21344 SHA256 fe1df0b9f52525918e47f8ada1cffe733ec816979a4897624f2c314d36d78aeb SHA512 7ac4b8ee5f0f59766a5240c39ee5f1c6f126c82b814db507019dfe4bd42c47076272e199a8938423c69d2c6f6d199e1ddd0b9920c557c71101b4746cdf269121 WHIRLPOOL 593eb4faabe6d3680c31f753874e66f46de7b7b8027bf238e1cbb5c99345300cd38d9dba3d3b1a69d14b114086c9f3a6cfc6c75f9ab574ab745851bfba5936da
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRtji5AAoJELp701BxlEWf1u0QAMCOYp4oqCYjFBEfiJWjuVUL
-Qy3x/ZkYkpZ3C6ys4TdGreLaIteyIjqbXWpeU7sJ0ErCawyCQx9Op9x6Yiq415ok
-fANUQQG9iOsH5/CU1R4XclnSa6zER0m9XSpMEDgzxTHT9eUXwGXx5NmrbDCgqnee
-8BN/mxa9D0mjUul1l6Nie7x9rZnY1XzzDAfo+g7PrUmSsCYQnaK61ogi94S6+98r
-e65LuD6wIPQ6sxx0N5NG2GtqomkKzvr30y8MA/5hhJ0N8awWSulV6ow79rsdndfy
-0m3k69X2di3bSeegJBsZamB3Y347fLmqmGA2tSioUo/wajKZe1deGe33Lhmlio3e
-jUzHAX76zuAN67nulmlqFCE6r0jZvgnI7ZevgJO3gUQ6McaUTEBkWNr6YD1aX/FW
-DBVGcSRksZeZHRNwQ9GnbrLfl7G3PtkVq/u3l7AbkiNdQ9fI8YmTIChn1BqCdAwN
-Z3x31w3ig+8fLKpxoA1q1lWQh46B7uAWZCqtH5CO9uaKGqwmbVui5SDJoEx/g8b0
-XpFIMJGUPPTiMDKkLxXesxsY8z6PwO13ztYecNCZcinV5GReduE52wH8vjeqIQ2l
-/qpNKbImuxq92sjZ1mc7X5l0wXpHMrEE2bBicNLaa11WyrfAPnVhlHPTioRye1gB
-nHbAVbYHgarP5X8rff31
-=JYQh
+iEYEAREKAAYFAlHvZacACgkQtbrAj05h3oT0FwCfR9JXIHvolLufoUQTgdg6P+BG
+pbsAn2dTnhrK0diictnUUItA6ing6FWm
+=rUXa
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.12.6.ebuild
index 3ebd02cca620..fde98655c924 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.12.6.ebuild
@@ -1,8 +1,8 @@
 # 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.4.ebuild,v 1.4 2013/04/09 20:26:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.6.ebuild,v 1.1 2013/07/24 05:26:57 caster Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit java-vm-2 multilib prefix
 
@@ -13,8 +13,10 @@ 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 )
-	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	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 )
@@ -28,7 +30,7 @@ SRC_URI="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="6"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 
 IUSE="+X +alsa cjk +cups doc examples nsplugin source"
 REQUIRED_USE="nsplugin? ( X )"
@@ -52,7 +54,7 @@ X_COMMON_DEP="
 
 COMMON_DEP="
 	>=media-libs/giflib-4.1.6-r1
-	=media-libs/libpng-1.5*
+	>=media-libs/libpng-1.5:0=
 	>=sys-devel/gcc-4.3
 	>=sys-libs/glibc-2.11.2
 	>=sys-libs/zlib-1.2.3-r1
@@ -81,6 +83,19 @@ RDEPEND="${COMMON_DEP}
 	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}"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild
deleted file mode 100644
index 2fd89ccb1edf..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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-7.2.3.6.ebuild,v 1.2 2013/04/09 20:26:41 ssuominen Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-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 )
-	x86? ( ${dist}/${PN}-core-${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="7"
-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/atk-1.30.0
-		>=dev-libs/glib-2.20.5:2
-		>=media-libs/fontconfig-2.6.0-r2:1.0
-		>=media-libs/freetype-2.3.9:2
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.20.1:2
-		>=x11-libs/libX11-1.3
-		>=x11-libs/libXext-1.1
-		>=x11-libs/libXi-1.3
-		x11-libs/libXrender
-		>=x11-libs/libXtst-1.1
-	>=x11-libs/pango-1.24.5"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
-	media-libs/lcms:2
-	=media-libs/libpng-1.5*
-	>=sys-devel/gcc-4.3
-	>=sys-libs/glibc-2.11.2
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-	X? (
-		${CUPS_COMMON_DEP}
-		${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_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}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-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-bin/icedtea-bin-7.2.3.8.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild
deleted file mode 100644
index ed8ca9c3fe5b..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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-7.2.3.8.ebuild,v 1.2 2013/04/09 20:26:41 ssuominen Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-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 )
-	x86? ( ${dist}/${PN}-core-${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="7"
-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/atk-1.30.0
-		>=dev-libs/glib-2.20.5:2
-		>=media-libs/fontconfig-2.6.0-r2:1.0
-		>=media-libs/freetype-2.3.9:2
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.20.1:2
-		>=x11-libs/libX11-1.3
-		>=x11-libs/libXext-1.1
-		>=x11-libs/libXi-1.3
-		x11-libs/libXrender
-		>=x11-libs/libXtst-1.1
-	>=x11-libs/pango-1.24.5"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
-	media-libs/lcms:2
-	=media-libs/libpng-1.5*
-	>=sys-devel/gcc-4.3
-	>=sys-libs/glibc-2.11.2
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-	X? (
-		${CUPS_COMMON_DEP}
-		${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_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}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-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
-}