dev-java/icedtea-bin: Version bumps to address security vulnerabilities

6.1.13.8 to replace vulnerable 6.1.13.7, plus 7.2.5.6 and 7.2.6.1 to
replace vulnerable 7.2.5.5. 7.2.5.6 is needed for ppc because
non-HotSpot builds are broken under 7.2.6.1. See IcedTea #2058 [1].

Also fixes:

 * Removal of binaries depending on X (#441618)
 * Removal of hard dependency on CUPS (#486042)
 * Addition of missing FreeType dependency (#510566)

[1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2058

Package-Manager: portage-2.2.20.1

5 files changed, 293 insertions, 93 deletions

diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index a269bdcc4d74..2a5d20b21325 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,18 +1,38 @@
 DIST icedtea-bin-core-6.1.13.7-amd64.tar.xz 49242728 SHA256 146bc914aa9d2e19d1273f2e0f71888c4ea1130eacc63bd22075f9a79e255f63 SHA512 b9e6509fe3ac033d593863af05d7853b7d4cbaf7dca041035b662dbde7866d56418fd075e4592aaf6640894bb639673a683e9c8add5aaf3c502caabae67ad2ee WHIRLPOOL 05fcd580b9d678a3717692582393d00f8e0f0de621e9edfdd1ecd76269f9d5a0ac87b14416dd49f0df0c572bf99de2436b1b4a15944f771d60c568b51c298706
 DIST icedtea-bin-core-6.1.13.7-ppc.tar.xz 39570240 SHA256 74bee77719b7285c6d91665e572cece092c1f6cee137032c50b9aec35db641d0 SHA512 e13a31f3ee4b60d603019a519047ffea8d97f3c6ff69ed7930c38e85f9051541f5dbe2c526b61175d3bcd371703168ba74949e1c7b44b4c8a790285864466e33 WHIRLPOOL 15f9b33c0edda490b48524996c2f3be263a498d97d969156e41dfbc03e7b780e568db80397a1a4716899c3fa202091bbec1c3358ddd178bdb8c010481e7604a6
 DIST icedtea-bin-core-6.1.13.7-x86.tar.xz 50373836 SHA256 3cc3e7c1fc07370bc7009d0ce7cfc2270de47165c45b8352b429aa1ccca561f2 SHA512 eb3eff46f20ffc93b7babe90aa3b9283119cf369fca503e7bdd7905455b9ac0e2eb389cc77e2e9bb02d802dc846dff75bbd218a844b80fa475e4ff04c88e9cf2 WHIRLPOOL 7593fd10d4c2e95fc02c2a7c94276632b6d99a077ec095018d5003e0c694c63f3e6eb3aa1d872f32911ad5ec2a90eae5f7a40c2784ef1b460e4a24a451369fd2
+DIST icedtea-bin-core-6.1.13.8-amd64.tar.xz 49241032 SHA256 4712f3844d1a56ac545b01cdbc76c9e315480ace3120a99b22e5d904091c8b3e SHA512 5cfff7ff5a0d0b4eef382620e98849c318df342a23ea0bb5764b4032ca7a96a86e67991ad97ec95b35786be0e3ac7a39990104e12ea47cc50c1c7326e933feb2 WHIRLPOOL 2e992d99675095aad1b74492d02f3c1fb393bf9bb1d496ace2036c0a40dbe2b1605783a84131fc5c15aa06834605d1ae962e7fee45556b41176cde54f1357273
+DIST icedtea-bin-core-6.1.13.8-ppc.tar.xz 39585952 SHA256 51a9b4c4167b900467f6b1b614f5808af2fa8ef35f7101e1ddc7f5142b3a3ad3 SHA512 04d72e811852df169a20daad73ed56ec454b98a60dd8943286d9ff382283d6b15c6acb1e0a3bc03ccc1d14333dae3ffdf8060c2a7de30c09d6b9cfacf9d90339 WHIRLPOOL 406782e148b4864cb250686a311e34937324ec3442a821d6bb76a016e2a6f7f06fed4b46d9ab8ff5675c629103b2832828efb8f0017fb193cc01209869bfe4c6
+DIST icedtea-bin-core-6.1.13.8-x86.tar.xz 49676360 SHA256 495171e826414051670fade7ac7af2705b3ecc01ba2ef3e63790cd24ec4fe7b5 SHA512 56cd90d21e30f2451f7206b84d80ed0d227f750f7e9155f2401e12ea4b9bbcdd882abbb01cade21e0bfcc05318552bd1e6102cc78aa601654179058f595ca68a WHIRLPOOL 6eabeca6006f84d912686ecd5921466cc5a7f3308b192e3ad9d4cee7a54356923a0c720e8d3d083533ab7b4baea839ed8247db2d1ee43dcd989ed312ff139323
 DIST icedtea-bin-core-7.2.5.5-amd64.tar.xz 52642552 SHA256 cfa0399d93eab61004c6d3c23c7b2b46623c0fde1c8034adc09a6fdae9ba1a26 SHA512 427b134109bfd92a073f10467f030f2bccf7b3fdcc6ec66f63d0ab5a896dfb4cc4904a9b8f5b6833fe4ae73bffb54e97e75a363500ed897a153ea7a687c75e9a WHIRLPOOL 84fa1a480633d2f2459238c11fa58ba514a8eede37f54eebd19effd5e2dcf01bcf1f320c65f150018b52eea3c630c313ba85166ea9d8d44bb61b42c42738b9ad
 DIST icedtea-bin-core-7.2.5.5-arm.tar.xz 43744840 SHA256 5f508eebadbf51a01677f3dcac2678f5a09eb7e9fd8f224fd397961e56a95a73 SHA512 45524bd6e6c1f8f1ac69e2c8891c647e0dd3e4afe272561f17565f4e21b7104fdb9718f12023bfba308d311d661e00122a82c81e61a7bc6a744108495d343dc8 WHIRLPOOL 4e386a6cd5997a1d169550b3e6fcd29ccdb1bf0f7942e3c4ed02521c13afc7531de78c313ad6d50555e8781bb2566b7a10a6393db09e576bf5579ae8615fb4c4
 DIST icedtea-bin-core-7.2.5.5-ppc.tar.xz 42616472 SHA256 36cc4fd0bfef1c2ae0dcad7116dd2a3b6e7a5ff7fd25da1ae47560755415cf2f SHA512 a0f80ae0701b0f51bd165143b16aa9c9ae7314d1b1ccc5c4ef96f37012598bf1d1c7ace0742573562b642354b5f263e1dd97d026bb3d2addbe94b33c208c79b2 WHIRLPOOL 619901211cb099eb405a46bcf1bee5828c523b29ad8013fccaf77a82d3885b9517888c2461960e344aef8cb3c8b4807c909e0f693f3207c1c2dd35f74784ddac
 DIST icedtea-bin-core-7.2.5.5-x86.tar.xz 53895468 SHA256 f32ddce3e2435334aedc9bbda2319f88b4a0e92a9b7ada7afbc2724d8a1cee07 SHA512 e4e085a9e23f75e79f0172986e83bc5b03373826a11f4240c8331c0086521189a611b6a20b4f7f4c28d8e2436dcb046590a06487e14d1d79c454698ac0a5a9bc WHIRLPOOL 0785f0cac8655b6c9843b592bfe71a4c28ec4215e18d0257499ac5207458a159fb8d1c56defe6b3bedf07a0fa299531b51182f6c27abdf24bf801157b3b624a5
+DIST icedtea-bin-core-7.2.5.6-ppc.tar.xz 42626788 SHA256 e6b3d928264fba2fb526266751cba5b08e59d3a79620d4ec35fb40887ad5432d SHA512 f6c55d4d536066576a9dcb318ac3441235a00bb8fea93484bcca3715ba1ea191eeb66907982f48bb1ca4bf01c5733be65c12cd145402041c76f31f3acc4ef51a WHIRLPOOL 729bf0ffbb7e35ea68ed8f5a874f5798e33b7456ce6105244a1ce1f85dee2b747e079b7437613342e9b9e1b9b71e0d85b7c232d84c185c4466bf1e925460c02f
+DIST icedtea-bin-core-7.2.6.1-amd64.tar.xz 52856100 SHA256 48d596cf5f9ba52368c48d6cc94e12a3a5d6e8c2ed880e689f005eeeade7cc72 SHA512 4dd5709400033fcdf2948b418b9aa4bbb90a3903d40f6a22571b4b181eec2336b802f100bf1e524ea1d13bfd340e60bb00bcde24d4f80fe925585f1971c55f54 WHIRLPOOL dec45c96d8c1a35bd4d83724eff84aaffc73b5671bbcd8837a3030f2adee9716517f950a2e606d2a4b021a83d25e8feb7457b3b3d83e8da920cf95533c057095
+DIST icedtea-bin-core-7.2.6.1-arm.tar.xz 43914036 SHA256 215dbe4907da2038d0aed3e37149afce56fb837ad3ba0d521cd92b5ebb15c5d5 SHA512 df6179db20db3e12e9688816fee18f1782a3400c91d3bd691cd3fb88322f7855b08582d57ca8a9da3bda1d0c30106518d9d02b911f4f8cc24d95636be22807ee WHIRLPOOL d313aac6f33ff28e873976be055b879e3c8e559022f15c21401ccc5a5c35715a08a43feb60d0c52250161cdea815be2edddd51a6965695287c25627f2779f9d9
+DIST icedtea-bin-core-7.2.6.1-x86.tar.xz 53528524 SHA256 b7f24f28b70c2b0886b94f48daeebe0391cce2e57ad83bd876dd302b67c96d42 SHA512 bf4aac17ff754bacb35e5b597d9bc60d88a7fa40619cf8c9613fa2d2776097e4c781132b4d66a8ca32ed49a2a07556d2a839b818e613116cc2f2b5f9e257d6a1 WHIRLPOOL 0e033c6e819edaa52eab51267a71236aedb9648f3b63f62a35db329e0fda2dc1dddf370c3da115360ffb2bd1c97aac88f6400cea9fb29f6210d9385720489062
 DIST icedtea-bin-doc-6.1.13.7.tar.xz 9845104 SHA256 75e2d37caa2bbcca8d77f4b6b63be7337484f1a0cd35ba784f191ac433b4f8bc SHA512 0f78642a0a27cee3439aac44f2df4cb43dd167c1bdb84c337636357f63195a3dfc4d2157a2368fdc72eceaad73eea17d016ca4f39f4c09a62322abac72111999 WHIRLPOOL 66db5023cd88c241427731aa66f227cab917a389ad89140a9e9174d8da5aa9a83850edd42a9359121633305e542d74c9f9b73788c7683da733c1b407d71df8e0
+DIST icedtea-bin-doc-6.1.13.8.tar.xz 9844756 SHA256 71cffd016040d28366f8e50c983ca55a3af1d7b08a56c501838b78fc0d1837c1 SHA512 36a0691ad720869c2855345bd20dcccd60e7adfa90c511d829131997e9e995ab929a2f24955955b638b21672912a39774deacf72ee3390ae41e3d44e58eea5eb WHIRLPOOL 11892894ddae46a6f999e8e835a5d428fcb86643c20f44639d8b692090468ddecfdd7db4cebef0c422983950cfaf6d337b540effef64c6fb1f7d58ffd2e069e7
 DIST icedtea-bin-doc-7.2.5.5.tar.xz 10599388 SHA256 ced6f04aeb35bdcfbeffff1f631db4ad523e16705fcce3697145cb7af111f8bb SHA512 f55dc8bb5a3c5d0b1016b03605f38f0dcb25adb1b615cd185bce771959ebe079213efb9ad25b46d2a21edf6c4338111eed2efd2e16ef6f1ca8e9458a6de22196 WHIRLPOOL 4a32c77494f7c2dbab4f682f2747f88ace7bedc43f38ffe8ffef84d0b3dfcd3269b1fff91c7e221070fc5bf2057bda1d60168d6dc428242904d2842193a0ab49
+DIST icedtea-bin-doc-7.2.5.6.tar.xz 10420552 SHA256 97cafad29d26e1fba75fd848a3d35de0e84e83f36a9e345852f1d684a81e148b SHA512 53261dbbafad7af9b97cdc9b55430ebbbc7e4975acff7b73013f893eba5583c303abf32d77ab8fb641bac35ac5549c313bc1f4c94c27faed88ab23bc5c22aec4 WHIRLPOOL 6213996e1435acac287b2993814ae1f49c13ce58f9315731d2e327c3f9765b6119202e83735c504919b9487e04de23ee28ac2695f8a67a49652a4c01f19aa0c0
+DIST icedtea-bin-doc-7.2.6.1.tar.xz 10603004 SHA256 33175237a2d35709197a59f26b5ea8bc5f3d60679964b8f3e985714080ce7a0d SHA512 e79ef83cbc7c33defb10bcdf1f5e56e07e3f187d181444a92edbe6cdbf58323c3c009bbddbdca35d2065145290cf5641bb688971b6c1fee337827c3b06394ec6 WHIRLPOOL 15a101cdc4f5cf3426980893e864fe04807c7d552971f249e09bc9bae0fa5c93a7839652c2d4d4099ba07cc32d50bb1d339b6ae6a9b8757776e391d1b30c34d7
 DIST icedtea-bin-examples-6.1.13.7-amd64.tar.xz 1903880 SHA256 1bd0657d389cd046eb1d6dfab32edb66a3a18e97c8ea7d60e066cc5a48fddb3e SHA512 77892fc66c49f746d23a692bf9f6716be613111fc697cb92aef9ad12ba8cebdb32f1d434a6bcfa9237e7a382e613590dc06f8d9b6746cbf381ae8b8e9b47bda9 WHIRLPOOL 1f4d94314430ab12c0aa1cb6fd7d16ceda2a1a3e055982b590877c29d7f2c4ea94c2ebd0d8ce631b98522493a3326d68a2756a3eaa4e043c7a7e0558ae37fb15
 DIST icedtea-bin-examples-6.1.13.7-ppc.tar.xz 1889572 SHA256 c0a4d1f0cdf1bed63c62a7f261c3188bdf53dec288bb501c402325d51677297d SHA512 6c8da2362d25143cafe00c75231125a731b443bcf9325a9baf5807d56e073f551023b6b6a86bc860f615c5f28032f27dbaecf26de79d179a92dd642cc4adee3e WHIRLPOOL d87f7c9cc80481c16e68e31d13c023614b7fbc35e0b39e4adecef2e9a476253460448de935c0988ff349fda3537e900f24b6d38a4ec3805c8a331e3061b19c4f
 DIST icedtea-bin-examples-6.1.13.7-x86.tar.xz 1902248 SHA256 98efdac63222f1bffd65dc791a3bf752e10c8083d23f5d4d6a2b3c0784ba4bca SHA512 247dc6d80425af835c153bd6503e30725183a23b05f0108640040a05ca3f6d86467d174a7e92a64e4513b119040fdafc6ebcc6cffac1bc65aa778f9972f408d7 WHIRLPOOL 8eeabadbab0ad2426d6a191202991c023621f98982b87a1b62f40d2bde6282bf63d095b4c2edff27b950da846385b3cfa0917061f4ff5fab181c9b5d82d2cd0d
+DIST icedtea-bin-examples-6.1.13.8-amd64.tar.xz 1904080 SHA256 29c2933d4fc4c7e240c7406d403a2667a42c5a3faee82413d2255d7dccea6873 SHA512 84771c52b816f4d3f065871df83bdd05408b69941c807de0bdc7ea423cff436878aa58dd5d61cb1bfae35cb37e56e2b5d29be6f6073a744e6af2125d66578713 WHIRLPOOL a08c748dd757c5927abd65088b0961d2dfb716030cc07e64589e5394a434123cb018630766e0223c6578ceb7f67ee0a68f5b2a548b1c9f701a5cc13732b84ecc
+DIST icedtea-bin-examples-6.1.13.8-ppc.tar.xz 1889932 SHA256 62bc68f31b1118d890c2add87a4d14663b0595aeb5fdfd8d904a59a19c4ed7f4 SHA512 22d38c9efa794165e1ecdb8cabb1ecaf8b9c27027cf28562721789c33c1a714e3d226b95a8c5420ff48a769c869ef09c575e76e8995f089037263ddfd72d21c5 WHIRLPOOL 031a8ffb8609028d089d047f1324352db90ef72be951bcedc158f671f2930c4ae5087e65e53ec59e4457a9e09b40ad6848b980b63e3494e0d1dd70721e6e640e
+DIST icedtea-bin-examples-6.1.13.8-x86.tar.xz 1902616 SHA256 cd74d0b8056f7373f370ca62388c2e44786c3b68dccbf30cb9a3bc8ecc8353e4 SHA512 babcc73227115e19fe50b16f79f09e3a35d0c60de44823c3f6617c7276ff4b9efbfb5f03f1149948d4005524b3a136e74b0049a292d83ddf763626fc179d1883 WHIRLPOOL 6621c65b3f871cdc0769dd5361d7a4a17c56f5ca8eb2de1f4abc79ca6343784a5a43834e4906f4d371144615a3b3ed6db44370dc0950508d327587bf2e770ed2
 DIST icedtea-bin-examples-7.2.5.5-amd64.tar.xz 1795668 SHA256 373db6d3bc88e8572a81b03e2dc5b539acb2a48347f6bdc797bf59ad7330e108 SHA512 a34b979094dd337d365d089e49aa6363f201499db2eec3d46edbec2235a55e8d0f488e1329bc699ddbc32c3d11cece95c4678ef5f49d3b4e4fd8a4481739f561 WHIRLPOOL d1112d0ddac4bb329416655e5083e762cb674a5935f655dd0d7759f4950a979b441e6bf3e1be87b596bc0cdb1c226efb96fd0b78b941f53e45c8eec66355b176
 DIST icedtea-bin-examples-7.2.5.5-arm.tar.xz 1778824 SHA256 11b02d038f5d02286200a9d1e58342aef432f0b475d3555068c6ee988407acea SHA512 5e46c15df71684124cdeb6f9ce2978bd86dd795c6c2422d4e67abcee6c230ebee3de8e235b95203fec1e06830253a86ad724d36f843fc2e385d7c3b5cb0e69fb WHIRLPOOL e8930ff6714def3c4dfdf9f1b40d5538a66897d6e9bd397f6167c264f1434889bd15c13ee965ae9db254653c084d47dd6e032c2f8228a6bb2d2c66e8d820f828
 DIST icedtea-bin-examples-7.2.5.5-ppc.tar.xz 1785508 SHA256 0b50cd010ceee2d3c0804897f9934127c4cdfc8c91729df422748ed9a7043365 SHA512 1d7e27b5391ecfa408c5d5e0c1979e732ee43fd3f295311c82d6a9a6f5014136cdbc5f449bf5343b417a66691ff8667364050072d93c2be4b3d7009d6a50980f WHIRLPOOL 42501a028a975e00ebf5449dba0fb6f67c83efa2d8c7639c23b74d96a2d06f576094089432ea28d13eb63dee7c2531fb816d39811e11381cfe33bc8c0ada2f47
 DIST icedtea-bin-examples-7.2.5.5-x86.tar.xz 1794656 SHA256 3ff68a31470260231bbf9b8a9c242705bea4303158ea5b0a739548ce2fe9702b SHA512 59819a6bdc7f74aea90f2a1c1e5714518d28fdf23b508f10fd6ad52707aea9561a4afd12997742e21583fb15008e0fb1213bc677d3930a51f9786b4a54c74f14 WHIRLPOOL dc51882d96791f4a02ee5232efe759ba2f233779765f08c275635430c60f460119e7360a4bb15f676652125c1b6257c8825b909190b51bfcc610f10401362888
+DIST icedtea-bin-examples-7.2.5.6-ppc.tar.xz 1785152 SHA256 5e798c0172e20653df303d2ae334a416bf4c29afff76f425e94d9ef36e81992d SHA512 e3ba6ca13a1f0f76e0a9fc12979b571560bcf74f2c8ae3e23bfd693452f14d7a153ed4fe32058cb9ec8e2071c43cc57094e12a3345f9d36c7d3b8d1744259f05 WHIRLPOOL 05b7463c5d7b36aba805718dbf3c3d37bf30ca2ef61de3672784f20635283c1005443f265821ce52848a35ac656681a125ce31479736435f74db997c82ecae2e
+DIST icedtea-bin-examples-7.2.6.1-amd64.tar.xz 1794976 SHA256 712c0077274e89f601ccd89af5393b959879930d511d5de1b5b377963297fd61 SHA512 70ca271ea0c764fb53009fe4e5f6f3abac9db8e687615c9153a90390fce22fb4f9712fd4a431f7475d2857a7b053b3cd82a9e151f8688e0835cc45dd79a060a3 WHIRLPOOL 53e36eab616a41c70841e37a0be93a0a71dd62169028fc873a52373f8a02c30ae48f5e6b23cdaa9da34d1246029f1737ebc21d519c5763bb0a2aff4c1c6436e5
+DIST icedtea-bin-examples-7.2.6.1-arm.tar.xz 1778216 SHA256 3589b3bfefcfb13f3007852645c72760845014cde52c467a3ba627dfb27f7fc7 SHA512 1ae5b8316bdcf55275e436bfe8647c173be26a9a71ed3f79afa7b2e1d0e556aa7569f95f178c5b183376f6a8418021fcd79e73eae8775177ee1fe50647a23370 WHIRLPOOL d56c37d274b8227ffa2528a3ade58b38f154eade82fc33f545e8b6360a090ecbdf548501d5bf91f5c5a83005f6a42022e83456f02a576ef9bf79ccae2297c7a0
+DIST icedtea-bin-examples-7.2.6.1-x86.tar.xz 1794276 SHA256 21561ec74d5f416f9ce26b849107cd5ed2326d34ecc9fd1315891c3c61cfc13c SHA512 ccf468cf55256fbf2f005762558281f3605b02f7877782d84aaaf5e9cfe030e4d296bc04b21af1c4a98e8ded97e9fafeb33722c81f8a91e5b9b10e864cb5074d WHIRLPOOL 77e70bec0c555c6fa7cc7b8d220aed8d86139bc4f423b96b7fde6d68f1b6176466e53a65f329d0c156925e9f3d7d9e086dbacbc920291c9103a517250faaacb0
 DIST icedtea-bin-src-6.1.13.7.tar.xz 39750536 SHA256 4b778433141b0231da1615266566d1881bf9f1674f5f5721f669dc130710c38d SHA512 43a7baae4874681b438e477790479dbe339a88904deec6c91acf79d09fb25d562f83070e74a8691c51a28b4ebb1f3bd7c9befa52adc4785099e08b84fa8c5eb7 WHIRLPOOL 57d14e18a8365684f5d090f86709d0d3b110ad7fb506e0bae9ff796aebf110c396fa3707bddc85af32e23b004b09d9d107e99fc392a98b5046473b39068f2876
+DIST icedtea-bin-src-6.1.13.8.tar.xz 39773388 SHA256 c01deb2ef8ed9cf58284538e9f52651ff70b8349ec001f13314d69137f99ff4b SHA512 dba0cc027f3ed7589c7cb0ba7d9f1a401ef47a20a5ff502ad7e9b27d0f552a77f28ebbd9032d191ba3ac441955545b632d6fb242f67bc590a5f1a8d855b89ad8 WHIRLPOOL 6b835a7a6123a3843bd74506e52befafbc4792e792798660829d75ede09f6c283933d30d51ba01c87a16095b9faa1795bfec6539cb55709032e22d6395566d19
 DIST icedtea-bin-src-7.2.5.5.tar.xz 39995356 SHA256 c4f7843ffa9a401307d60b3eae192efb2792079d5d75d5954f4e03211b52f094 SHA512 7128e4255a7587d1167f6f2b1978cc0a8f6d079b2f189e5931c424c812c6c668a0afe0390cb492592c4cbf5f9375c11ed5d9ac9870161ad710ddddb7358ba60a WHIRLPOOL 607a4160d724ba38daebda75efe80aaf2ad87f534b3a9d089a43d172b7464fadee7b5e18b03eb1b84c3ec8ec14059023b75c9f16a93907a485c3af7a2cf38b2a
+DIST icedtea-bin-src-7.2.5.6.tar.xz 39999236 SHA256 dba9a16d6ed8ba6bcd1090e469d176c979395a4828ea8875cde271d8bfff4a43 SHA512 9f7c7377d90058fecdbe08259b8b1b0678ba3df1ebfd13b7664088fe3bae0823631b0b548a0b65981c79318b7a63d566c79a6c3b3b77df434d5b4e0b9b8095f6 WHIRLPOOL 214c9fd79be0ef3f650a64c15e02e889475ee27c9c2b975ade20689bd8d2799617b2ba0eae55cb1596b77e987f5b14cd4ccaa583ff5ef4dd83e4dcbedff869af
+DIST icedtea-bin-src-7.2.6.1.tar.xz 40026520 SHA256 60786fec57ebfa29297d03e3cded177fab8de09dbaebf74f82535d92fd3665ba SHA512 d045222dd06db827f0ceb62bb5fded08de66402803a978710d61005f9344d230450101b2fffcb3b8e05676682bd90ebe29e9e1ac57fdfd5197035f130ac483f0 WHIRLPOOL 793dd24fe432e54369490fcba7f8ed95f2e2b428c595570612cecd9a3194df9027fcec29a466f9c97b1c25c55d28eab7fe6565f21ae760cd8ea00f052f3b067d
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.7-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.8.ebuild
index 375f6e25d7a1..94f9ee2f2712 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.7-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.8.ebuild
@@ -26,63 +26,63 @@ LICENSE="GPL-2-with-linking-exception"
 SLOT="6"
 KEYWORDS="-* ~amd64 ~ppc ~x86"
 
-IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
+IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin selinux source webstart"
+REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
 
-# 423161
+RESTRICT="preserve-libs strip"
 QA_PREBUILT="opt/.*"
 
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-2.0"
-X_COMMON_DEP="
+RDEPEND="media-fonts/dejavu
 	>=media-libs/freetype-2.5:2
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/libX11-1.6
-	>=x11-libs/libXext-1.3
-	>=x11-libs/libXi-1.7
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.2"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
 	>=media-libs/lcms-2.6:2
-	media-libs/libpng:0/16
 	>=sys-devel/gcc-4.8.4
 	>=sys-libs/glibc-2.20
 	>=sys-libs/zlib-1.2.3-r1
-	virtual/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
-		)
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	awt? (
+		>=media-libs/giflib-4.1.6-r1
+		media-libs/libpng:0/16
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.4
+		>=x11-libs/libXtst-1.2
 	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? ( >=x11-libs/gtk+-2.24:2 )
 	selinux? ( sec-policy/selinux-java )"
 
 PDEPEND="webstart? ( dev-java/icedtea-web:0 )
 	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
 
 src_prepare() {
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
 	fi
 
-	# Reprefixify because prefix may be different.
-	sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
-	eprefixify jre/lib/fontconfig.Gentoo.properties
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system. The binary
+		# "bfc" fontconfig therefore must be replaced with a plain text
+		# "properties" fontconfig. The "src" file that accompanies the
+		# "bfc" file can be used as a template.
+		rm -v jre/lib/fontconfig.Gentoo.bfc || die
+		mv -v jre/lib/fontconfig.Gentoo.properties{.src,} || die
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
 }
 
 src_install() {
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.5.5-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.5.6.ebuild
index 64dc6b456962..21861cd84fbe 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.5.5-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.5.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://icedtea.classpath.org"
 SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
 	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
 
-for arch in amd64 arm ppc x86; do
+for arch in ppc; do
 	SRC_URI+="
 		${arch}? (
 			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
@@ -24,62 +24,51 @@ done
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="-* ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="-* ~ppc"
 
-IUSE="+X +alsa cjk +cups doc examples nsplugin pulseaudio selinux source webstart"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
+IUSE="+alsa +awt cjk +cups doc examples +gtk nsplugin pulseaudio selinux source webstart"
+REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
 
-# 423161
+RESTRICT="preserve-libs strip"
 QA_PREBUILT="opt/.*"
 
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-2.0"
-X_COMMON_DEP="
-		>=dev-libs/atk-2.12
-		>=dev-libs/glib-2.40:2
-		>=media-libs/fontconfig-2.11:1.0
-		>=media-libs/freetype-2.5.3:2
-		>=x11-libs/cairo-1.12
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.24:2
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=dev-libs/glib-2.40:2
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=media-libs/fontconfig-2.11:1.0
+	>=media-libs/freetype-2.5.3:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.8.4
+	>=sys-libs/glibc-2.20
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	awt? (
+		>=media-libs/giflib-4.1.6-r1
+		media-libs/libpng:0/16
 		>=x11-libs/libX11-1.6
 		>=x11-libs/libXext-1.3
 		>=x11-libs/libXi-1.7
 		>=x11-libs/libXrender-0.9.4
 		>=x11-libs/libXtst-1.2
-		>=x11-libs/pango-1.36"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
-	>=media-libs/lcms-2.6:2
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-4.8.4
-	>=sys-libs/glibc-2.20
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg:62"
-
-# cups is needed for X. #390945 #390975
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-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 )
-	>=gnome-base/gsettings-desktop-schemas-3.12.2"
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.12
+		>=x11-libs/cairo-1.12
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.36
+	)
+	selinux? ( sec-policy/selinux-java )"
 
 DEPEND="!arm? ( dev-util/patchelf )"
 
@@ -94,14 +83,25 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
 	fi
 
-	# Reprefixify because prefix may be different.
-	sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
-	eprefixify jre/lib/fontconfig.Gentoo.properties
+	if ! use gtk; then
+		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
+	fi
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system so the
+		# fontconfig needs to have prefixes inserted.
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
 
 	# Fix the RPATHs, except on arm.
 	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
new file mode 100644
index 000000000000..5dde0522f792
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
+
+dist="https://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 arm x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+
+IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin pulseaudio selinux source webstart"
+REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=dev-libs/glib-2.40:2
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=media-libs/fontconfig-2.11:1.0
+	>=media-libs/freetype-2.5.3:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.8.4
+	>=sys-libs/glibc-2.20
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	awt? (
+		>=media-libs/giflib-4.1.6-r1
+		media-libs/libpng:0/16
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.4
+		>=x11-libs/libXtst-1.2
+	)
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.12
+		>=x11-libs/cairo-1.12
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.36
+	)
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use gtk; then
+		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
+	fi
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system so the
+		# fontconfig needs to have prefixes inserted.
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
+
+	# Fix the RPATHs, except on arm.
+	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
+	# https://github.com/NixOS/patchelf/issues/8
+	if use arm; then
+		ewarn "The RPATHs on these binaries are normally modified to avoid"
+		ewarn "conflicts with an icedtea installation built from source. This"
+		ewarn "is currently not possible on ARM so please refrain from"
+		ewarn "installing dev-java/icedtea on the same system."
+	else
+		local old="/usr/$(get_libdir)/icedtea${SLOT}"
+		local new="${EPREFIX}/opt/${P}"
+		local elf rpath
+
+		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
+			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
+
+			if [[ -n "${rpath}" ]]; then
+				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
+			fi
+		done
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	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
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	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/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index df376342a775..d7730d654013 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <herd>java</herd>
 <use>
+  <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
   <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
 </use>
 </pkgmetadata>