Move lcms dep behind USE=X. Remove old.

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

8 files changed, 18 insertions, 629 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index f570b1f32df6..1582d02e0871 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.76 2014/11/17 12:07:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.77 2014/12/05 14:20:35 caster Exp $
+
+  05 Dec 2014; Vlastimil Babka <caster@gentoo.org>
+  -icedtea-bin-6.1.13.3-r3.ebuild, -icedtea-bin-6.1.13.3-r4.ebuild,
+  icedtea-bin-6.1.13.5.ebuild, -icedtea-bin-7.2.4.7.ebuild,
+  -icedtea-bin-7.2.4.7-r1.ebuild, icedtea-bin-7.2.5.3.ebuild:
+  Move lcms dep behind USE=X. Remove old.
 
   17 Nov 2014; Agostino Sarubbo <ago@gentoo.org> icedtea-bin-6.1.13.5.ebuild:
   Stable for x86, wrt bug #524560
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 695c8be77829..e6e54695195b 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,55 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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.13.3-amd64.tar.bz2 52302259 SHA256 71001e89b1ad4808108e533f3c089f6357569e7e9401b8588483a1cd71bf5a6f SHA512 5dbd92b6322bb8fe6131e01062ab9b0fa955093c11138a5107f89fd715e9010c41591893d0ba59f91b08e087644d54be40c893e29a47ccd7ea4b4c321821508f WHIRLPOOL c63085bd06047402268ed0a58f5df9ab382efb0eb0539734a18b18eb8acd9743514fd9d8bae68ab1444c2e94dca6ebffe226c55bbba82fde9527a815c11e88ea
-DIST icedtea-bin-core-6.1.13.3-x86.tar.bz2 53179290 SHA256 d76614481985dd35818bd269157e08d8eb1e2e7749048005b8cd3cbcb5f63474 SHA512 f93e63421f3d2e61629df4f15d0bc9dc972fa60d5607d764a1e9fa7ba2826dfbdd05e25b8ee04d49b21721fc7333c2a37270ffaba12417a94cbf14cc7fdbc73f WHIRLPOOL 92520d35af88f0f9ba1f758abf9f25893912e8982bfe2791b623b22a1037625ffb834ed637771dd642291ccc81b130fa02d21d5d101aecee0c4d971b3bdcb19d
 DIST icedtea-bin-core-6.1.13.5-amd64.tar.bz2 52278418 SHA256 42b57b3fc20d893d18928a47637356414f568f3b731cd1cfc1530c501d057af4 SHA512 79d0f4debac147804fd9e0ed24a97ad91f4ee0fe4b2cc05dbe5981d7411b40f73df96c9208332f5520bb2620208bbc2300255d26218b5177f9a2b4099d17d3e3 WHIRLPOOL 206a749c932db75f85c8ebe3c023b9d2ce3a977161d548e7907026ae5c6eeff0fd31fecb133da3d171ffa76578f11e6da5a1bcbddbc82715efa7536cb1df9a15
 DIST icedtea-bin-core-6.1.13.5-x86.tar.bz2 53213698 SHA256 42fd83b69738d35bb314d180927cb35c70786148d1288d6dbbaa105c20189f6d SHA512 1e4424fc4ccd7cfc19c698615eca1fdc56adab16c781deba7de3b79d4ba9db1ecd72daa53f4d38712845846c7ffecebc1fec8a2405cb7d7f6672fc5230e212ce WHIRLPOOL ca7d542e53a02f37e8dffa641e45e8573e927eee3ebaf6333713afc5f28509d85b8d8aab2bdb523a565cf5fc6de58502f70c3a11c2e9afbb9daa0068c62dcd0f
-DIST icedtea-bin-core-7.2.4.7-amd64.tar.bz2 55515951 SHA256 e5320cec74ebf570e1d1adeb4b2f122208448a96b5cedbd7521579e42c8cac3c SHA512 b9a4960497b41529162ab85da59c4179e381ace39ec2b4b21393e2d88008b97de32d92ecc3290af0407e3286dd472fb4e63c0624d660e04ab594ac579ce227b7 WHIRLPOOL e688e8e3633c2f526269b00b6661b4e1a250c454ea4eb94aac0e78d1d7d4b607643c219fdeda05804f3fa38aa2e5a03109343819218bc953b02da29970ac13f8
-DIST icedtea-bin-core-7.2.4.7-x86.tar.bz2 56434087 SHA256 50ee385f8f697ed0e69bf31fb87c30c601b024fbc335afacef147130188d9b56 SHA512 77eb04cfc2182a040e12e68e32de3c9c9e75bbaa4946586a501275d367d8d8f9a850e42c1bd28a7271b3223ca8798b85bd2a09602050f9b6951415cbaa9e756d WHIRLPOOL 7cd7ac10a08ce1bcc627e24b1de62dbab3749c6579e153ec3be54e157d90f7035f90aeef5852bc97e48c919d85f9c74552b9e11cd30d78cd766fc26ea85e6a71
 DIST icedtea-bin-core-7.2.5.3-amd64.tar.bz2 55719739 SHA256 b777b90c92ec7939ad037b10a5b11e9405f6e6d7a6565b32b4eeebdf9410033c SHA512 6d990aef564e0a6c64949bd8b8a41d3acb146a143ca5fb8b7ba2aa32c0c0a06161888114e424e65e6e0c6610731b97b6a57dce9ee6b08e5c5026baef7a9b53ac WHIRLPOOL 4a64440b0ef1ca1f3e0c45e3196583ce0f0bdc5d2bea201b6e780be9aac18fce20d3215abafe83136d0c3ebaf6fc4326e979fddc197d49249723fd13ea0abe76
 DIST icedtea-bin-core-7.2.5.3-x86.tar.bz2 56635165 SHA256 89b9d724689b8c4ecfa20ddf514296b440f789852386417e392f64d8281169a1 SHA512 ca30891112c0bf8eed54d40bb351bce43433d725f07ce999aeec59ce7c08e5aa66b0b0eeb261b9944aeabf79ffa60ca680d7c8dc3ff8871d4caf11ce333f79ec WHIRLPOOL 6f41e6ad10bf976837e6e51f2d73bd1f83d2a50c51329f26ff4a65c779dab19b7f8e23d6f6d2024aeeb2230de6e362dbac9cdee2aeb848fcfc222041b710afe7
-DIST icedtea-bin-doc-6.1.13.3.tar.bz2 11511333 SHA256 3d84a2e524844ff894d69c652e4a5514c001c8a2542c2bd54c7f26bc8bbedcd3 SHA512 f690220ab69938528df9dde37375a4ad86ba2cef01220137b6f146f2d19ad9490e08387c001738e2c371b0e09cea1f32f184fa59e6e230daf4edfe9883fb2181 WHIRLPOOL 674f6e9f575bddeb1a1a679e69f06cc593d467881e882ee0bae9403b51ef26ed0010a46c5e22f38246cf617b2c05e5b69c54efff6f532941edf8621ca9eb593d
 DIST icedtea-bin-doc-6.1.13.5.tar.bz2 11511128 SHA256 17b51c45f432056b809db6f586c2217f115a0aec1aa8431f4ce3c02526d6a6e3 SHA512 65d5dd0acfc9dbf67b76fdb120f639fbbffc3b18555cac5ba9f0deed5a8503fae843e6600810f2c01f98cb24ad67e7eb58ce6ecf7b67f2e694bbe3e775b8ef24 WHIRLPOOL 3fee74e6921dc3cc92275fb2577c115535d1bb7932034559c391800e5d20621e6f4471ff0d93fff5fcfe142682270e8fbf221067b8b484ad21b7309fb9d289d1
-DIST icedtea-bin-doc-7.2.4.7.tar.bz2 12540099 SHA256 88699d28a24066afe6d0e6cd376ae771c417367d16bb8f04ee515dcdc9d0dd14 SHA512 2b54a70f824e2a1fa575a7b162695c22732eb55d33f68d113a5cc0b90d4c99bc8341c9ec272f26f43d20a065eaba16b7401aa5d54e8f37024685ccde439a0283 WHIRLPOOL 5fdc0d5d400a662d46e9c74444860991583530a8483861305c2348eb4bbb597102e20ad6ed61fca4f975219af59c8222a1b306e03de2c8cea930ddd57cdc8c58
 DIST icedtea-bin-doc-7.2.5.3.tar.bz2 12511315 SHA256 fa3b7b96fcf9534e724fb16c244b0e58ec526d32ce64d40cad19433675f63848 SHA512 32e82f48eeed2199bd24b4dbb3ce16b84e05b683f33ac00e6b1a90c52279f79fd0351300581f0db2e27a0357d34cdfc085af010fe79738ab1d5a6229bd511b5b WHIRLPOOL 2c2520aa91b5831fa2306e23f8eb87c3f39ebd81f4e9569a7c84a523f094094f688cb89cebbaac6561cdadcbaf54c77adf457df90752dd9e96461d3158eb4ca8
-DIST icedtea-bin-examples-6.1.13.3-amd64.tar.bz2 2168205 SHA256 6756045cb018acf3af506b06a48934857daafcc1d01799bc25a6d9609eadf628 SHA512 a2f72a508946a0b8afbc11d6d06600a3548c0f1f6bf46b6e3518fae429b5b7f2dc8d3484af522057b1d2eb8841db97cbfb5123563fd7f930ff8a931849dea586 WHIRLPOOL 9ec5aa3a89529a6e4ed818370447a3993f5026e416c8313fa1203c4dd1472cf028d6206dcf4ba0420c6767fdccac722b29c538b4296ac04551e130d1270e5a5f
-DIST icedtea-bin-examples-6.1.13.3-x86.tar.bz2 2134637 SHA256 82ebbc95be9a5648682282d76ebac2dd16bf51812c42baf48ef162b2da091461 SHA512 09c507c9359e28e5fa9fa03ab5759d86fcae26f3516a27cefc391cbc28338bf5fb6270f4cbef06cb3c9225618bc9d5c8fcdef7302d7cca1ec29787767036c44c WHIRLPOOL fd50454ad4a0f9a2e453a34dc1871cc1cdbdc569d1044fe0187327379da7b0f7230442a74dbbb6505ad58970a56955ab53b839f96dbf1fd4aade737a2a5df797
 DIST icedtea-bin-examples-6.1.13.5-amd64.tar.bz2 2164162 SHA256 2a4e668855f4819fa76adc482b8ff589866110f3a60158d60b9e07fa6ace5c27 SHA512 e99d4a4b59bdaba2bd7b5d9874180f18378533819dc52588e1432b1f9919cd018f1210d8733cb3048d4cdda49b9b5e6554c6e85df7f96f66190c7e459eac7674 WHIRLPOOL 865350c5932274513c2f30c10143bd89b9c5b3603e94ab84f1f29ba6ee9bb122867ecbd7593babe48e3cdd28e9625b206dbda4648526f0a1b68109d97ab2dc9d
 DIST icedtea-bin-examples-6.1.13.5-x86.tar.bz2 2131563 SHA256 0360e11f0470080887b8b43b50b785a2b1fcaf6cc085ab30b24f32020a1295a8 SHA512 028461d4364788bc3142e0649f705d78d8f5bf76ba08533b157458ab44281fb0e248a96ea01debf48843a260323198477eac9fb860fd77ed56a25a3fc8524043 WHIRLPOOL 25970a17e67d0d89e72c8297664594891b8819c588c148c8278ed3a8a924fc72ebf7a3be4936ddc034e9f700f285d51a58d0a6bc3dfc2ce5a1e1d2588ccff726
-DIST icedtea-bin-examples-7.2.4.7-amd64.tar.bz2 2339136 SHA256 35e8ff176bc68b616f2bf264fdc3b7689e85f27d4bd6eaaefb00f75aed955632 SHA512 ac32ff46161f5f3ad00cd8d680a54672bd9cbfc39ce75ba502a68fc9cad90f0328dd0aac15710fbfc112a66b54efd5a2a00f9ab937b0bfa0b964cf5d659c08b5 WHIRLPOOL 46f1febfd9a7928218d113161f9a637928b608fe01d165e6fc1fc816e6add4fd54846a70a1c32b941cf5f3e20877dd91cdeb67bdf1243542ecf796a55c6000c2
-DIST icedtea-bin-examples-7.2.4.7-x86.tar.bz2 2316379 SHA256 805c8b786c5f6bbdba0122f91ee2ecb103aeb5abd6ca98d9e915a14703b18b45 SHA512 9bf8339c70a033c84762032ea6bb694a810f7318105c6159c0b8bef7f335dba79b25c600313426328fe50625a46bcd11266dd8087650ad86d22b18665d4e207b WHIRLPOOL 25aabed258575ed67f1c2d241cb72db102f9bcd75b7352fa8af3175a822e7b913335f734b4a78c91e6833d1afc2b23bdcd6b968a9f1ff024f09993fc1bb24d5f
 DIST icedtea-bin-examples-7.2.5.3-amd64.tar.bz2 2338390 SHA256 f7bbc108c79348b89d74c23dadba514e7bfca3a4be43b5de25ee15a696503d6d SHA512 9b4a5c5d27a006bd6b3d60416423b2c6d10a5e5845f937bfe1f4a6ee36af3dfaf4eb5fe9b99e5ac5e80a953ffb6d9d0802acecc8125224d87636fe15acdcbdce WHIRLPOOL bc4e42e3c5d7e31fecddc37745a08d1eebfedae4f626f392cb4968d9b5072727728149f39355c644878d1ff4dd9105fa88201ae3a0c4e0555d934ec382497575
 DIST icedtea-bin-examples-7.2.5.3-x86.tar.bz2 2314054 SHA256 f990c36540d7ea70fd9005ae2b33708fd27d780d3f5c640543d2cfb25c2c8f9d SHA512 7a6870a7ec861bcd5cc1e4408c2bda435de98f8d80d48af9c5b2b5bc93816643e06b9881f8dc45ea342b1988956285e3232e408cc66538a8d202cbc332ca4080 WHIRLPOOL f3172cab34d85010ad2f96736db3ed0be36b02313c9b4b48eb34fb2bf4943ea1a8b25a07e58c688de109027735aa1777ab5dca8b9db54960099453a72f0d6f76
-DIST icedtea-bin-src-6.1.13.3.tar.bz2 41192099 SHA256 801380a78185d0b2b4035d876e9e73f4d6c073732c8b369f191638a55df563bb SHA512 d368bdeace6cf364db6394bc5dfe5b0081f9209ad98c057a5fe2096d227b82baca2317b2b5cc885cd210b1d1b4ee8fe44aa25678ee875340a94e11de76643c71 WHIRLPOOL 71003e4f84311260da1c814ee07e7a531ae98c287c77936b3f35379b3e49fc50782d9f8c2f6ac57dd92bb66374d7f6b58ae4088d2cea570bd7ccacdb330feb38
 DIST icedtea-bin-src-6.1.13.5.tar.bz2 41211055 SHA256 e948d327be0bc538f59d7a66a58558ec29917184e885ab26a1fe7821378e0131 SHA512 b687f14c801acc1295514f3ae7b760ffd88501d925e231286c86fc074fae37b908fd5880c73a55da94b5b49192151355529441f54f369947198a08e58349d955 WHIRLPOOL fd81de2dabda2d39028cbc08492754876b7e3a6c8a1b5ec6465089a6cd79eff8b70b920e029eabe8f4068606f9386e48bda4f515ab7fcdad9f0542c024308d94
-DIST icedtea-bin-src-7.2.4.7.tar.bz2 41388334 SHA256 4e6c1320d2c63727b521355018e024ad1f60c96e3ef7ca6f57faaf34aed83c47 SHA512 44a284b857a100b44ef5e7cbce50304f7f11bfeaf3149f85a89e8ae2f83c5e7e571b6bf4504581c55afcc6a5be272714638175b9884c785f3e909d4e567c01d1 WHIRLPOOL 6d0a41c00e52a4a3fe07f8ebf1630c6e007c2f7cc7b3b68c7130aecc951cc010abfab06cfb21d56867ff4260e52ee4b60525c8525d4ba9345580aaf2f0510e24
 DIST icedtea-bin-src-7.2.5.3.tar.bz2 41460889 SHA256 73038713cda893b8f8e423b799c00930f724b8a775cb7314d6d995f02d6c9781 SHA512 d4706131b79ed465ec529a8189b181646b438ade1c101c6fe881bbcca31596bc380c726b8bfda89db574365824fb2eed29bd7564310c7284c5935a7f3e2453e7 WHIRLPOOL f091515eb68539a049fb3bee69f5d1d20fa9af40f15f6f547f408551a79296e108be2815f30576a91c51b06f5754fb2337ce71f47d1138ad97245b090a96b1af
-EBUILD icedtea-bin-6.1.13.3-r3.ebuild 4608 SHA256 584b12dca3758089b42ae18d043cb2678c2ba8f9c4b5aa95295aacf0f7525d4f SHA512 51ca3f47b9e9fddae999bdd974bf3c2efe77faed992e7f12779575c66240d8fdf90441da3dae602a4e191c79f6b99273aaa6674b678787e06e39385300395f30 WHIRLPOOL 01008fd1372bea252833f19122c099e9c0238f40fccf153b63b31ae16f3aa08d6916539088373bbe8aacaa0bba9ac9b10a67da4e401a7594caa2b6fa53619177
-EBUILD icedtea-bin-6.1.13.3-r4.ebuild 4541 SHA256 ac7455f55e81bf14e544a743b6f25e970d2d3866bee12d53a5f83aa7e29f21b0 SHA512 46c8919be9e03d7a982db4bc6f6ee31ab90b0ec7fb948d152ac3701cfe1cc5ca16ccb9b2a150ce7b574a3b0e39b9df63b096efb7cd31603d1a63797eae3b309c WHIRLPOOL c50dddbadb0cb0300e1b1182a88b37c50f21da6e93f470604a4cf9bdd76c84a4828df0b640d3b099e872a8815d74e81ebd185d213b4ed9e9581579c920fed358
-EBUILD icedtea-bin-6.1.13.5.ebuild 4590 SHA256 42e290eed35c4b4bd6abaaa3d6c2ffd8125e8f0e84dda52246f08fbb6b29c07d SHA512 b46c6ae3b88703b69087c358cc5c67d356ebebb210b3ae9d9efd6fad2ce56d6399edc138d3033318258e9ab62d0d700eaa8e9b6777bd8c12cd2b572eaf01c6f8 WHIRLPOOL 6a60b2b0d7e356a1f97e1fd4ca00ee5bf11f31656fb9af695c3f81a5d1e9dd85a78c24716d5e28b8eca7fdb7e268a6052c96af6174d8c41ecc52cc3df0336405
-EBUILD icedtea-bin-7.2.4.7-r1.ebuild 4179 SHA256 fe564aa18f609d48f760fd73d9e7f310565c78e628f640a073d73b4c516c7d1b SHA512 29216f141cbcaeeec8e289931296e446a7ccf56d61aa6227f3d79a03a81edbadde8b986d4a1a4bec424a031f6af3d5e629103127effd348d65dbd587c4bb713c WHIRLPOOL c7bc2d3408692a6422df9a91a84902cadd2dc5bd699301867877054f0de7fa24c7683d83b610240e550d7e12449edfb51a25b1d9c3277b26148a38785c88af21
-EBUILD icedtea-bin-7.2.4.7.ebuild 4268 SHA256 c6259f2725cab76684f0fee7f6e67d802f2cf8fdcc0c5bf6a577fce2b88fb0d7 SHA512 bf8a3850629d30bff49d1c0b16314a30d5bd71eefb99fb6bca520e6b40c6f8b2c1b4db294fd4c025459a73bf20f10dd01966c66d45e52aabef5eb0e276e6eea8 WHIRLPOOL 6479abe5c845cdf3e9742489a378093995b3c64a3fddf41535a2f47abc33c59ec0447928bcb0090d73864a156a781169a85063cab8b951649d681f36dd7e27d2
-EBUILD icedtea-bin-7.2.5.3.ebuild 4177 SHA256 20875b0625ec75f60f7905c3a0e2df58f87a316f6a9fc8a87f26da6cbfab11c2 SHA512 f9122de93d6924735bd225685b4d042c76289b8be332e66476f435b2f4304e363c8bb140f1129f1811fe05e4e4bcb3a6276ffb1c7c9498b1daa687b55e924ea5 WHIRLPOOL e46362ab5cc765209acbb89d0a5315798741ea12e028440be23d3e30ed548e5840dd88b7c2cc7a3606aba689a0de1818484718569419547a8b2ef8c275ce5dc1
-MISC ChangeLog 26432 SHA256 31a03fd7aa1b3f739613df301de655095e7d1e2a3fe04895df6a6eab0a587a69 SHA512 54531c8f33d26df78b6ac50ba9f98298773abb1ebf62afaa98abb3a57686d35b12420f2f0ca542cb8d4527e505700c5ba62db6f536b733d9d78bb6c87917e788 WHIRLPOOL 2c536c6bf6bbe92d167e2b138962beb7a82d7b142b2f58f962a717ae35ae480b0b35dd8592ad1ab0ee654ff8893fc8dbe2d4b46b3e9768c984bb7d42109fed57
+EBUILD icedtea-bin-6.1.13.5.ebuild 4593 SHA256 e5a5d19fcba405792b9eef6a8095d3e42a35e77ad7ce545178e4fe994c44404a SHA512 b61f01a6edc0910cf700fc65e32d0cd3129ef64d86bf2a250372f03cfc4fa946c926ea26f535249b65cf856c9d3fbb6dbc4834b897faa8315754b2095260b1e3 WHIRLPOOL 8400b2c5fbd2a427016049fed3243260db3a28860d4f4e574ebcd8440a5a1d5f7139abdd2860fb33b83d484ace0df3b5ef23dc377870f2219886cb7ba6127642
+EBUILD icedtea-bin-7.2.5.3.ebuild 4178 SHA256 e30842f19ce6f8979a4568cdabb0399e2d8e2122e198e9ecd08b567b366459f9 SHA512 766e18996200044f59fbcdecb9481ad9a989ebc823c8a7adb5ce4b2c51468757fa6c7ed87c93e9e4a531e2b87bb4568d9ac6d2916c70b0f00c8225834397e5f0 WHIRLPOOL 7cfdef264b9cf4afeeee2db16ee8392a0d02684d614cd972da5958788c7be4fb6365077bbb330a9ce7a1edbecfb04e471fc79b4efd379501a5f4afffcd5c92e8
+MISC ChangeLog 26719 SHA256 1d17a3e9969b7d6823375226f1cad69ca83753f04162b9957a27c52d0016e590 SHA512 5c200c0ff6c08f658da2a3857419e83bf6a15cc825625604215753fad1bcfcade0cb2d465bbdcb74cb997cab5a45afa07c3b41fa39a710708e8a0ca4b7861f1a WHIRLPOOL 5066c3fbd60517b9368fc9c55a69a5d7578b19ebee23f9c0b491fbd6b48eeeebd61bc0d3be25d6c17a3b2cb3f4b24e0ddee95f8c08018dc9cca11da0562ea825
 MISC metadata.xml 257 SHA256 37f9ed73f859488e9c2867d732418cb2085c859c37cff96e08c0ff27bf5e5681 SHA512 5379f4a96e1e75fe55ce5a09b065eb6776cdee3c8ace023465c9b45c10e53f3be937a163f0e6a087f0b5a4e9f47399084600da73d4ea19039a40a4ba93585420 WHIRLPOOL 5a24444176940118d01866d9db3a46efbc421bd230941563d2a4157aac018268b422c1eaddde7f9950e6bc13c9b4189b23a2798a2a1ee694d9b386f6a1da5615
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUaeT6AAoJELp701BxlEWfUD8P/33utNpplJgBjpgSqOebiCh8
-YiuXuVW2PJtMN0/GPSu2KRExY2ux9ILrXCxxJXxCjXVrxMvdqYMwa2NhFAoI5OdJ
-MnoZZGEGj+vDbaYqE5ZtWbtTTB2rfGYbgfnRu8+vOZLkEFbLHHEytbTSA1JuIV/L
-jDVYbD1VpFNeSJcTr3mJF4wHpTHIEZQ8xWd9sPctgk5gDG4SPfnLqXZSZ9Et5BXd
-H9f6TfTfUh8UP/Y0aI8uZl1AzZqWiqsv6ttaK1rnb+jqcx3lT3OQNBw+VWJXxX5e
-Akoa6fLe8vjNTOAXQwqZfQmBJl5xNnTMYKOG+q9vnk+/6g4+5o6SYcPC/AJCr1eJ
-0VWEmasT8JxERAZFhuJOxWtNa66v8sHnOandKA7KmQtSYQ+Y24Vvr2tbPfWTf/TB
-iVnLMfu8nO76l9valaOmhdIp/PZDORQeTwHuOX5P/hryOWwktjMCXNews8ZsvuoJ
-UAiUmRYOCInnORUT/KVHawP+Enat+llmRNmuNVYFEPXCIStiZCL3szx5+YclLnQu
-Irk94BfnEgPy8MZJ2aukrvHj6ZtJtkLyxBFWzLVQ6QUrVTK8ROtpaueTCKLewfzP
-omXci161cla2fjRFDz/Y0Z8QFO2rLV1GzxZKNoKDL5mcolLD6RjgFdD3CmGZFlZ6
-lwgXZJw3kERPBL0NejVs
-=ICMe
+iEYEAREKAAYFAlSBvzgACgkQtbrAj05h3oQnPACeJFREyESJnO6ShvmfqUR4Gian
+pasAn32GlV1IfgZMRVF/g3me8EHZeQMR
+=sCZD
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild
deleted file mode 100644
index 23cafa2d1ed9..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2014 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.13.3-r3.ebuild,v 1.5 2014/07/06 15:32:09 sera Exp $
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix versionator
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-
-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 )
-	)
-	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 selinux source webstart"
-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.6: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 )
-	selinux? ( sec-policy/selinux-java )"
-
-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} )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0 )
-	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
-
-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
-
-	# 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
-
-	if use webstart || use nsplugin; then
-		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/bin/itweb-settings
-		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/jre/bin/itweb-settings
-	fi
-	if use webstart; then
-		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/bin/javaws
-		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/jre/bin/javaws
-	fi
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-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() {
-	if use nsplugin; then
-		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
-			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
-			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
-			elog "The switch should complete properly during the subsequent installation of icedtea-web"
-			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
-		fi
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r4.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r4.ebuild
deleted file mode 100644
index aaebca5836ea..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r4.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2014 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.13.3-r4.ebuild,v 1.2 2014/11/02 08:22:25 swift Exp $
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix versionator
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-
-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 )
-	)
-	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 selinux source webstart"
-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.6: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 )"
-
-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} )
-	selinux? ( sec-policy/selinux-java )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0 )
-	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
-
-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
-
-	# 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
-
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-	fi
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-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() {
-	if use nsplugin; then
-		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
-			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
-			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
-			elog "The switch should complete properly during the subsequent installation of icedtea-web"
-			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
-		fi
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.5.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.5.ebuild
index bbb71c16811c..b1400f0f4c82 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.5.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.13.5.ebuild,v 1.3 2014/11/17 12:07:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.5.ebuild,v 1.4 2014/12/05 14:20:35 caster Exp $
 
 EAPI="5"
 
@@ -39,6 +39,7 @@ CUPS_COMMON_DEP="
 X_COMMON_DEP="
 	>=dev-libs/glib-2.32:2
 	>=media-libs/freetype-2.4.9:2
+	>=media-libs/lcms-2.5:2
 	>=x11-libs/gtk+-2.24:2
 	>=x11-libs/libX11-1.4
 	>=x11-libs/libXext-1.3
@@ -49,7 +50,6 @@ X_COMMON_DEP="
 COMMON_DEP="
 	>=media-libs/giflib-4.1.6-r1
 	>=media-libs/libpng-1.6:0=
-	>=media-libs/lcms-2.5:2
 	>=sys-devel/gcc-4.5.4
 	>=sys-libs/glibc-2.15
 	>=sys-libs/zlib-1.2.3-r1
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.4.7-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.4.7-r1.ebuild
deleted file mode 100644
index ff74702a9b23..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.4.7-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2014 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.4.7-r1.ebuild,v 1.2 2014/11/02 08:22:25 swift Exp $
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix versionator
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-
-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 )
-	)
-	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 selinux source webstart"
-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.4.9:2
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/libX11-1.4
-		>=x11-libs/libXext-1.3
-		>=x11-libs/libXi-1.6
-		x11-libs/libXrender
-		>=x11-libs/libXtst-1.2
-		>=x11-libs/pango-1.24.5"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
-	media-libs/lcms:2
-	>=media-libs/libpng-1.6: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 )"
-
-# 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} )
-	selinux? ( sec-policy/selinux-java )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
-	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )"
-
-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
-
-	# 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
-
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-	fi
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	if use nsplugin; then
-		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
-			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
-			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
-			elog "The switch should complete properly during the subsequent installation of icedtea-web"
-			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
-		fi
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.4.7.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.4.7.ebuild
deleted file mode 100644
index 93e2cc28bf73..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.4.7.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2014 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.4.7.ebuild,v 1.2 2014/11/02 08:22:25 swift Exp $
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix versionator
-
-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 )
-	)
-	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 selinux source webstart"
-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.4.9:2
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/libX11-1.4
-		>=x11-libs/libXext-1.3
-		>=x11-libs/libXi-1.6
-		x11-libs/libXrender
-		>=x11-libs/libXtst-1.2
-		>=x11-libs/pango-1.24.5"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
-	media-libs/lcms:2
-	>=media-libs/libpng-1.6: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 )"
-
-# 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} )
-	selinux? ( sec-policy/selinux-java )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
-	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )"
-
-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
-
-	# 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
-
-	if use webstart || use nsplugin; then
-		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/bin/itweb-settings
-		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/jre/bin/itweb-settings
-	fi
-	if use webstart; then
-		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/bin/javaws
-		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/jre/bin/javaws
-	fi
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	if use nsplugin; then
-		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
-			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
-			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
-			elog "The switch should complete properly during the subsequent installation of icedtea-web"
-			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
-		fi
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.5.3.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.5.3.ebuild
index 3f74a458fab0..251f5f9a0a8b 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.5.3.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.5.3.ebuild,v 1.1 2014/11/16 22:01:06 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.3.ebuild,v 1.2 2014/12/05 14:20:35 caster Exp $
 
 EAPI="5"
 
@@ -44,6 +44,7 @@ X_COMMON_DEP="
 		>=x11-libs/cairo-1.8.8
 		x11-libs/gdk-pixbuf:2
 		>=x11-libs/gtk+-2.24:2
+		media-libs/lcms:2
 		>=x11-libs/libX11-1.4
 		>=x11-libs/libXext-1.3
 		>=x11-libs/libXi-1.6
@@ -53,7 +54,6 @@ X_COMMON_DEP="
 
 COMMON_DEP="
 	>=media-libs/giflib-4.1.6-r1
-	media-libs/lcms:2
 	>=media-libs/libpng-1.6:0=
 	>=sys-devel/gcc-4.5.4
 	>=sys-libs/glibc-2.15