commit:     8e67d189ba02e8474ae39b97b88941a248cc8447
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Tue Apr 15 23:38:00 2014 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Tue Apr 15 23:38:00 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=8e67d189

IcedTea 1.13.3 security update: http://bitly.com/1p8b9hn

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 248BDC07

---
 dev-java/icedtea/ChangeLog                         |   7 +
 dev-java/icedtea/Manifest                          |  53 +--
 dev-java/icedtea/icedtea-6.1.11.15.ebuild          | 327 -------------------
 dev-java/icedtea/icedtea-6.1.12.8.ebuild           | 310 ------------------
 ...tea-6.1.13.2.ebuild => icedtea-6.1.13.3.ebuild} |   4 +-
 dev-java/icedtea/icedtea-7.2.3.14.ebuild           | 362 ---------------------
 6 files changed, 26 insertions(+), 1037 deletions(-)

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 8a74cdb..3832cfd 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*icedtea-6.1.13.3 (15 Apr 2014)
+
+  15 Apr 2014; Andrew John Hughes <gnu_and...@member.fsf.org>
+  +icedtea-6.1.13.3.ebuild, -icedtea-6.1.11.15.ebuild, 
-icedtea-6.1.12.8.ebuild,
+  -icedtea-6.1.13.2.ebuild, -icedtea-7.2.3.14.ebuild:
+  IcedTea 1.13.3 security update: http://bitly.com/1p8b9hn
+
 *icedtea-6.1.13.2 (28 Mar 2014)
 
   28 Mar 2014; Andrew John Hughes <gnu_and...@member.fsf.org>

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index bb4de93..170224f 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -15,19 +15,6 @@ AUX icedtea-7.2.1-pax_mark_rmic_java.patch 963 SHA256 
52f8c2cc9848b5e63dd70c8ee9
 AUX icedtea-7.2.1-pr986-cacao_memory_fix.patch 6342 SHA256 
5ad35a62ceb49215631d7d91b8e610598110d4b935140c5498b76f9a697cab3f SHA512 
40a5e55691fe2430fe2c449788e1f61bd701d687e4c6ceab026baa8eebfc36ee1e22ff3aab2d1da80c8914abb423f220963a44949678165cb5416e7b43d4629b
 WHIRLPOOL 
4543bb42ae9c6eff0e1e0d4ec0726106c3a55b996daa30bb7bea68174e37f14d231207e24722bb3fe0164a34182db1359fd5c9da8af2376dc9729eceac81880c
 AUX icedtea-7.2.2-pr986-cacao_memory_fix_v2.patch 7401 SHA256 
e2060ed9acf9ae9da8943ffec470b09745d758c6c6de8ac06737ea26eef21795 SHA512 
023578a2243672503e78a159d1774bcbe9d8cf4fc514166a9bf040e25cc7d28422b3a9469d804909e8a8fecfadd9fd31e8f34f85ae688a58620272ae620135f7
 WHIRLPOOL 
79fade6ca0c0d42f004e0a88f31159b4cabf5b4391ef30c78d74cf01bcf44f78bbf970ac070e8e8f320eb0dfd7fa17e335412156c2e004a47c2d47faba5bc309
 AUX icedtea.env 1074 SHA256 
b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 
933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a
 WHIRLPOOL 
57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258
-DIST icedtea-1.11-cacao-cff92704c4e0.tar.gz 4261719 SHA256 
dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f SHA512 
d03f04a13e271a57b8a704ef1684cbf64da0519d579c4bd1aafa0d8e0bc241939018d8425f1b65f6999a7f0dc4b58eb5ba6ea8ed76b3ed5ce3299dd7cd094861
 WHIRLPOOL 
efaabbca72b4471fa72679f071ed0a64184e3281ff7c1a301bcee1a131f3c7f91f93c9f42fc87d4c79e802074da158cdde96578a5eb40f7605c6fbc5b6880959
-DIST icedtea-1.12-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 
b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 
bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f
 WHIRLPOOL 
539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
-DIST icedtea-1.12-jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz 298435 
SHA256 bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 SHA512 
fa3428d8997f9696cce4fa32c9de677ef193bc12236ef8b431af647b57d26725f4a3019abc87ade0cf10c7d6a745c18eb78e8e126d6842e788c8cefcbd2b006d
 WHIRLPOOL 
d1ca7dc677b7abbd600262f30c2c3774f502ef661f3dca60d4664c87b50b9a90c808e106f607a1dde7b3f4cf44a7a4a9e647877a2cc3332866b6b2bd34eb2a2a
-DIST icedtea-2.3-cacao-a567bcb7f589.tar.gz 4263355 SHA256 
d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 SHA512 
2abbd6ad72a5811963610b81ad3f59882fa0109bbffb69316f7bcadd218982abbb7b94ea41ddd379a0dad8586301e1d317226153d2f592876c56e7d338afadf5
 WHIRLPOOL 
e712ee17b9e4e23a1fe54823218a79a45ab1ca11e23de2896b576a2034650bf8b151f01022e0d3f12421008fc1e8d8f9aa0bfc4cc6bce812dcfbbbab1c66af7c
-DIST icedtea-2.3-corba-c7d0b72f704f.tar.gz 1439583 SHA256 
5d3811e2994d2d5f96d2ae8693e81354a3abede5dc5b75bfad15444136d77b13 SHA512 
0d37ac71bf6942a7e0d8a9ee637f8affb6c0247759e933efe67f7b4799f340d3feb39feec7b46f5cef21a24e3eefae709fdca0cd792d8f9509128a1fd5fa98c2
 WHIRLPOOL 
cb360f27ae595dba19e8f172eb5131eba8e1333ba357f78070c64768117cf9fe8c442416e1d5b8c9112c9b5650385ae719932c80687ce4bb56e7c246216f8549
-DIST icedtea-2.3-hotspot-72a544aeb892.tar.gz 9509322 SHA256 
f3985b6d39d6c516ccc78d45105818fc7f22d5646da047ac39116cebc7e9467f SHA512 
066c5198416d21ac94b104ba5191ee45dd97464a7f49bd05ee50f39327b3e98e9940c7b775991b325cc51d687c0ea13c9c57df099b9ade10fa7cc064931a6a68
 WHIRLPOOL 
446a479e002f130ca05b5ef52f8e30739ac1577ea1988d85fffd9ae89767a46aa5127108004267ffb3d31c5047ae751e6cd3aa92ae69a31358eac2a206ac064e
-DIST icedtea-2.3-jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz 298435 
SHA256 bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 SHA512 
fa3428d8997f9696cce4fa32c9de677ef193bc12236ef8b431af647b57d26725f4a3019abc87ade0cf10c7d6a745c18eb78e8e126d6842e788c8cefcbd2b006d
 WHIRLPOOL 
d1ca7dc677b7abbd600262f30c2c3774f502ef661f3dca60d4664c87b50b9a90c808e106f607a1dde7b3f4cf44a7a4a9e647877a2cc3332866b6b2bd34eb2a2a
-DIST icedtea-2.3-jaxp-0eb202593710.tar.gz 3872637 SHA256 
686022ea83f721dfdadc2dc835237fbca81383e7b1346191a8ef254ccfe3b565 SHA512 
d6212c7935d54bf9866114c21fd285f5aa2fb8fc3995bad320d58cb1d7237e8ebb74cd94a8ada389ec69702853b591cd4ae3d5bd7c53d5724042dd6c28984548
 WHIRLPOOL 
a1f6c8def637e0ff15a9eef5e5b6edb6f876459648f8d2d006ca198c66422bff89082bbb97ce57839989bdb25f896fcc28fb93a2c3514c3fcbccf4fd2ac2d8ef
-DIST icedtea-2.3-jaxws-482a3f64a8ea.tar.gz 2766828 SHA256 
f8b8d787041c708809655e0f903bd4a86ffe1683c07890c58f39ea0b8c302eab SHA512 
1a3a899f533aabd0d92daf3185cef80dbace3861a7e18f39fe16559edaaaebbfad4b8870ae4062455f55ee984aae62e2eb8aeb688c06ba326dff833d3d9f11b0
 WHIRLPOOL 
7b0268071242c7030f27d69c4a82a62f5be68fff00282bb85e712e73877af0b2bdbd0c7cb12fc81cf03177863adbbeb0023825bc32b7c57369314c796dac4a7d
-DIST icedtea-2.3-jdk-3428bff8a33a.tar.gz 39869418 SHA256 
b4ae9750bfec39285cce9cbb3b8589689137d3155165e7960c954311b95b567e SHA512 
3967507b610e231c89742d092cc398b5ef36e8f533c182cb8ebcb9eeba8db397640a285a45c2d64563aa9ddccc55323b96ff993d0ef0d13d02abc8265b615ad1
 WHIRLPOOL 
899d4e6ef75544c0afd0b7cc4a47388c48bc8b21539d76292f6cfd7e55ddccc276e001e6b3646bfc4ced46eda93bc072529d50143621b48ead0d21665b9d2b91
-DIST icedtea-2.3-langtools-d50a9c5cd291.tar.gz 2293984 SHA256 
1ea31d21beb88f2512630523f24f3a35498deed1356c4c0bf8b901086dd2c13a SHA512 
767fab9fc1f7ea2872a0e22e9d16ae61167bc6e237b99ba6ba57ce214e4aec2901fdff14232a21dd79e04faa337f8154136a314e3d7cf34289af1db8e2b21393
 WHIRLPOOL 
662803f308f75b124907cfe9e92aeea9bd302efe56425aa8f5a915e5d0d4bf87a328f57d75e4f51a63a2d68c81c4b641e61832b80a7f3b261dd00cd008749dd9
-DIST icedtea-2.3-openjdk-14181eb6c00d.tar.gz 133245 SHA256 
d883a9a04f11ae1616b3f162671d6926283cdd27233332c787350f76ba960ac5 SHA512 
887c60e6c3a7d64e177ea99c2e902a2454a05071e5a71ca5b1ac9118e090c6d65dac215210d260a135f0dfcfc9484e2d8909ca0b27da7c415c9efb02822feaf5
 WHIRLPOOL 
123c79e5b2eea8d336938d9a54f7fc4f2a0924d5145aae540e5b2cc1294688f07262d55e37ec45933ee5e407e196c316c58b1642ef2c9df26aa14b3d3d4f838e
-DIST icedtea-2.3.14.tar.xz 3579592 SHA256 
9743fbe6cad015b725eee1f6fdb0f476298c0469da7bd685d4f47b342f85c7a7 SHA512 
ca40b7c913626fcf583919fe5a3fda358476d9b13a25706152e7b79871d07af256267b729f5e53c87a92314e21e48633567228f8b4a386b954a89220a7cf63b0
 WHIRLPOOL 
8f794e715452cf9e774207a256a8d49e076814c0ada8ef3dd65caae21bfa0a645c6699d77a254aa9ec3aab10685bc99476d9bef75c13f1781c8e2e1b0870bfca
 DIST icedtea-2.4-cacao-e215e36be9fc.tar.gz 4263463 SHA256 
4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 
2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f
 WHIRLPOOL 
7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
 DIST icedtea-2.4-corba-48ef1bb6d120.tar.gz 1442170 SHA256 
2fcfe699797154da8b4ba5242e32468b2f3f42a0cb17039915bfb1f84887a5b6 SHA512 
8035aef58fae33994c5e05b4337b4726a534b2bf6b5b11705b1015ef10abf3ba536f40e79ad55878cf3ec00a5181cccf3c36e8074e7108599df809f01daa7a30
 WHIRLPOOL 
a148570e274139f41a1b138498a0c04fdb3ab446b9054a41d483032f288c5c7257d8982271eaa2ef83433eec7522436fa83d46f5c0966c84d673bd5aeda032a1
 DIST icedtea-2.4-hotspot-172674e0ab65.tar.gz 9735722 SHA256 
2aadfe9b1848a619bd2d35f802b3e71ef5286e7822f9e7b02ce2539ca817d9b0 SHA512 
5b9c991cad8f0e16880d89aad7d39207020aab541a485f89e398888129e309b96a840d7fe5b28dcf4678f358f05a144aee7a42b44073d5759710ba94902a19bb
 WHIRLPOOL 
bedb192261a1a58347186fc9321c828226b878e4088ff84fb4f8865f44d397c9f90cea1a2e79364c6f4912bf2b8ea8f25b02c732f23afafcaa70db9c4a5022c1
@@ -51,9 +38,7 @@ DIST icedtea-6.1.13-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 
b8230f20d7022f9230b
 DIST icedtea-6.1.13-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 
317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc 
SHA512 
a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
 WHIRLPOOL 
2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
 DIST icedtea-6.9999-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 
b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 
bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f
 WHIRLPOOL 
539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
 DIST icedtea-6.9999-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 
317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc 
SHA512 
a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
 WHIRLPOOL 
2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
-DIST icedtea6-1.11.15.tar.xz 9250216 SHA256 
4bd083ceb51da976b6f135780067cee8c84908db0143482ab743101bd0a2458a SHA512 
1b30c206748f81d57c2aababd038d91051ccad2491ec7ad11f4fe770a158c31267e97bd70809453a47f12db723b7e33dc204dc9d6e5b0bc94bde665baf3c4ba3
 WHIRLPOOL 
d3b21646dda6a4b6ca6c0d3eca31392829c62fe90ecba9e9106ca18fd3b586e1535814ec9ac0629c2f2f82a48bacec69be9edf3f98c51068895973d81561de21
-DIST icedtea6-1.12.8.tar.xz 9249200 SHA256 
cb584a3983e146b91f64c31594f8c599604fbc91fd3560503fdd65b04c6bfb7c SHA512 
f7292eca9f36eef220fe92e011d3a6136005ff160922dc8adbb6e7714f2cd25a104ea33434f4a8f509ae508346b1c2c6ba21a6e4e9c32bc5f6bfb844bd3b45dc
 WHIRLPOOL 
5310f150634257cbdc21df3b2d97d539222ef0a8c49ab75afd194ac0a638445bc7ce8749ff4929bcb3c766f4866250000b5c84d75dc00c2cea49363e9903b427
-DIST icedtea6-1.13.2.tar.xz 4969948 SHA256 
b7614cf5f90d10a3ad379c65bc7d9c5f64ca38beafe50282e131612d62b1a1f9 SHA512 
26d4a327c4b2eb8a989d1df4d919a48365164617f06ed5a8963e060a96223d1812eb2886fcf30b4c869064085ead22338340cdae4ba7bf4715aa318b3ef5b67a
 WHIRLPOOL 
c637776234b34ee68c803f1495f76cd9051889781e05274017fd2c85e30df01eb75bc45d753073c8c36ff495be3fa474d05a709ab924446d8615a356d7bc2557
+DIST icedtea6-1.13.3.tar.xz 4595140 SHA256 
0149ffffcfb55739357a2c720421cbc311e4ccb248c0c185ed67671d2c45f748 SHA512 
75d5899e1ec47e05f7826c338fce9f52aa625f47b88b55de581df49e0a353e3a0c7655827ca65b517638264b63d4edfd42b6e364f231ab8f06fc8a2b2837d23f
 WHIRLPOOL 
2c970370efead3a8630fa448408d83329bda4b2bddaa2ddc703cf23f3a5b893d2cd78a11078f3ac9c1daef4fdb64735b2aab9d6a6dc211feba0454d987f276d2
 DIST icedtea7-cacao-e215e36be9fc.tar.gz 4263463 SHA256 
4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 
2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f
 WHIRLPOOL 
7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
 DIST icedtea7-corba-16906c5a09da.tar.gz 1423305 SHA256 
29dec824dd068c8ba89e9d079bc63e5c408ccc915118098381734495a0ef6610 SHA512 
e9042652d275d497aed8263c8e4b5532862a0b8912d450dd7fd6bc588914efcb5d74e01c9c6df0bb41c62db0156edd4d7f2f739995f4b44656e70099c23c5396
 WHIRLPOOL 
4e5036e665bebff03da99d94a66baf93ec0dd2b9a37bb0bcdfd8669ee3672aa5a2946d2772a7b8de196a060d606eba715aaceeb5e1bd3f87ca8616b4dffff4c0
 DIST icedtea7-hotspot-f30e87f16d90.tar.gz 10191891 SHA256 
871fa08b8e9d7a2958cee844f940752c39b1946146dc382c005269e86b687a49 SHA512 
6ce7ba45494cdf99126830d2f7f53ed3d93cfa545371e34b64218e4a59e51a1fa4b022cfdcfcbee2a0ac91b806071968062805225320b0b746f5bf20a9a45acd
 WHIRLPOOL 
7bb5d2122d8ef560af2060890c3867811e0d3d6e9da1cf743c492f1fe22571c6c4e46c18b16822178c21b2dcd642d05f17e1c5336c117f974e5693e2969b8f99
@@ -63,33 +48,29 @@ DIST icedtea7-jaxws-4aeccc3040fa.tar.gz 2769480 SHA256 
773022f057151aefb8c632670
 DIST icedtea7-jdk-3162252ff26b.tar.gz 40060121 SHA256 
8680fd2a56dc388abaa9c3350d79f38f6638099406e81bc665d8f1a1f09273e5 SHA512 
b9810eca6630c90960f8fd43ea784711c2c836f18fb571c17426663026e39f64d032c98f2864cb90328d5aa98fc52b8d283227c91e355dd62d2de1d33b568087
 WHIRLPOOL 
bd225c8a8c9b73772e2f2319ed5aadad19406853504a69085e59558c20e3f7b7d7f149e7a3e98db3ca413ab564b8b371d04b2572ea5c46f3df3075ae3054c2e5
 DIST icedtea7-langtools-f75a642c2913.tar.gz 2299700 SHA256 
61363d33c482ead26951ba60eef75a2f8410178b2bed1eea012365cbf6f26ad4 SHA512 
35ed2ae7bed0a1c88edc831b6eb00a6142db7798179000e3ed6a78ba2229bda8d3f939d43085ea26c8ee6c4c98fadd9297365f9213771c8ead68c487bb7ba0d4
 WHIRLPOOL 
672b076641dfeb58a5a6b71c2afc1e4b961309e66e6333ee0c67b1c4fc1f5a94533f90622282cde7d677ef162a07612fbcfe5cdb7c7797f2676cdb950b0d347f
 DIST icedtea7-openjdk-fc5d15cc35b4.tar.gz 145246 SHA256 
5f1548010cce513537e232609557d12ab854ff17d4fbaa83a830e1b3216fc0ee SHA512 
64d97f178c82b709745013ecc03c407e9da458c1df50fa131554ea2a13cccd9d95bd80bfa728213e438bcb8b070dfa4aef641aceaa2abd1ee41641a17118a7b9
 WHIRLPOOL 
9837de3e42cf1efd1f7f23abfb57040def56727928ddd8123071c348b840bee35d91848dea45f8b681b13a54b748b0115f523492d4172ea09a96a6b8a0834c61
-DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 SHA256 
f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227 SHA512 
a965efa2fbe95a32988f78f1e51c42321ff42c1e631d5062aff204ba42839d6e05455f1ae039540e38ec947b50a635984cd3302eb09e81962575510309374e05
 WHIRLPOOL 
2dd759c4d8a23f0eb66bb28e1b48842fa3984d9796833bbbb6a3305a49d9cb1f2ce19b59c93b9f2a33d679559bf893fd62b4f831aa76bb053351e219639d9286
-DIST openjdk-6-src-b27-26_oct_2012.tar.gz 45789350 SHA256 
044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 SHA512 
4198f11b2f49c9bc5ffbeadf2d0d87dfa413a918d49faff3a043266bf4a2fa99579fba3c6d75164d87e88b8fc5c97c3c1527560eb25c55cdd42ad813c8e175e8
 WHIRLPOOL 
5038258710f2c0eac1a5a1957629998d931d49a6145450485b84e21988d8fdfa5127dc0852067319fb2ac054f621ec511c0d8e01961943c7e4a223049317b894
 DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256 
ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 SHA512 
3d040f9dc99b38babda3dce3a0dbc0de0dd91c5a2a0bb4bad7caa5acbb42923d0b26926aca836157d50124811f6c4c743f48ae996481d216c6158c21686e1c55
 WHIRLPOOL 
4a07dca91ad6bbf004fe40f12225a836c8cb634ce05b5974c51c389d235a6aca6a2532b3818fd975b1dd83ee117e08e17e22fcbb1bedff4caaabf50f941afd6f
+DIST openjdk-6-src-b31-15_apr_2014.tar.xz 33245892 SHA256 
362d9bf20e91393b52dd0513896d39831cf320c49bd4bf1e28124f21569b72eb SHA512 
30156721f0dd111e2f70193ce093c64fb8c4e6ace966163067a77276143bc205a878d91cf60464b3203276ff2b5349b3c5542e86b35e4d61f23a785b1910e951
 WHIRLPOOL 
bb4a6eb700aa06233cc753394afb750b597d65f6a83ce902d37bd72e8455d689f0a5551f2cb0c2b72b29eb04f68ef2aae4aabf7cf04cc2d339bf3111c2bae8ba
 EBUILD icedtea-3.9999.ebuild 10726 SHA256 
f1deeffdef35c0e28abb4d39fdde2d6fdd394e17db564ee161edfff0bbf52f77 SHA512 
3a0eb9273a9bf2f1deb950bbc298c064f9cb02c1e80c64bdb3c6f7f5d61f67d12b18fb6d573f3b40cbd68c6ad1ca402001bbf3e0c733365cf33a063b439c6e23
 WHIRLPOOL 
74d29695d3e6bb529c3447c87cd2b0339e2ce65173070ac8ccc778fba7e6df73360d9b3c9317556f46a41f97726481803fd4491e1e1b37cb29791e6ce5a1c7fb
-EBUILD icedtea-6.1.11.15.ebuild 10040 SHA256 
ac62790f1ba463dca60afde7f89aeb4e987eb1d9123f3ad44b04dea692dd8691 SHA512 
0e36d645059c1a904dde5f3c84c054bb684889756cd4e6416cae36294d030e799c1a241855e9b9650ba55d1c9f0135f28e15b02132522fd9848359f9ec6cb187
 WHIRLPOOL 
6edecf5db05474d89adad93bcb613deaf392b73e16570ad2ed21192f47251daa2371bb9ce7534814a356620f196564ff2581322a976ac6a8ca4c8ed651ebe952
-EBUILD icedtea-6.1.12.8.ebuild 9492 SHA256 
8b97bdef92ecfb9122b1f8374bff68f17552e45cf17f9dbb986a2824b10e8115 SHA512 
a14c37fba3565f729350bbb67f6b06f6ca1eca79014840ae5284645905d840af1149f2f4991ecbd862e4f2df29cac007194ac001b6d48f589dc96cebc650fd45
 WHIRLPOOL 
91a26676ddef39939958a560742ed9385f5c0136bc017a64267e8a8288b2efabd10757795d8b16e156eacf04032ad1e34ec1c73f0dd21875de057834e36bf738
-EBUILD icedtea-6.1.13.2.ebuild 9803 SHA256 
fef0b0dc3ea85e6141e8b03d58b497eeb4ea22d44c55d8db165475550eb4aba5 SHA512 
287bb8ba237d2b1474d0a302e6db7d301c715fa844772e83ca1f828e429652fcbdf68b90b8d823fc3d56798c11f1ddaf171ccac413967cdb01da09378baebde5
 WHIRLPOOL 
a33a800ab5b9e7e7c57a52d5c709a19d7b846e3ff6b2e938c4ee027a36b61908b250a04c51ee4111e9a945b3c1f6409c48369fa6a1ccbf41fb9d9df418d5f9f4
+EBUILD icedtea-6.1.13.3.ebuild 9803 SHA256 
1ec39a4a05b15b91dc1aad9edfc0ad7dc1e9a41a11ae3989be065699058a9b9e SHA512 
7a6a8bbdbaf614543a54a8958477ac5827dc896cb368afb08cc16c110fc42f1e727eadc05bae24d321ce3cb056a76eaf4dbe4edafd6c7ab2619ff6badac79c4b
 WHIRLPOOL 
59f3d078c6ec7f8c1d470217ee93e3f150adb3db8be850784839e5cfbe8b68b889ce42a4fc364578257f10e43addddf381f0814147c81478aaf9aad825c79b0d
 EBUILD icedtea-6.9999.ebuild 9520 SHA256 
961454b9a5dfc61ed5fa2930703e9231ad4abc9e101f1baf671ea8df43918093 SHA512 
54c12e0cfe78f60290c9c01d6862711be56af3e52d44cb27a7f882385573d1a053da6b73156ee2907cf91ce1fcc5e08cd824c90878b2201fed126fa83cea1694
 WHIRLPOOL 
61bdcd6e8bfa9fcd99cd34c7ef57fb811c89be277c5502c8135f262a44d0c155a62ec6cc56e50de8652a9272259f2cdedde34cae18fed808792fdff2cc60c5e1
-EBUILD icedtea-7.2.3.14.ebuild 11992 SHA256 
72d5278634a54ebaec90cb9f931a6f8208020507daecce647cd5d45dfe9fc64d SHA512 
6325ab084010f1a38cd3ec1bae85316a7b8e020c34940d5a3ab6aa6e3d0a2edf95f60877ccdbd59552240a46664958781dbb77a27235ae28e55b5e226fabaa01
 WHIRLPOOL 
23cf80fa22e9f05569ef10f4af38122a2b5c310000d42ee782ddb9f1659983bbea86a4be4b1f8bff1b0fb5b64ff79234501194363edd7d2bb296e4d6104296b9
 EBUILD icedtea-7.2.4.6.ebuild 12054 SHA256 
16e5affb85134b25a050838fb8b2abb95e172be1f7c31480b74eb63ff59a1ebb SHA512 
613c8aa5aa851fc2856ba91248985f8fdb4fbbec326c8c7bd3fe59ccf158fbab7b63c7853de848850fab0c7168d9440f2fb61ffdd389adad7c87b93b30c69345
 WHIRLPOOL 
f5a6a4006d95a9d827be7df55600b204bf2670d14dd96617393d6b487c5e40e2947d6c059cd2bba7e6dc3621025977f2544d6af424c6d7e09591bf45484d630d
 EBUILD icedtea-7.9999.ebuild 11789 SHA256 
992830a01e167b153053e852836ed0dc14127cbd075dd0cfe8a20561d6500a78 SHA512 
7704c2c6fa9246745c84a789b6de5899392e36dba9e972f644f41f7df49e5ac5f2ce9a699c96946f0bc5b1d3c0464e2e01777a6a5f84b2ea9a6df6065fa98c6e
 WHIRLPOOL 
47c798c0b6d9b51512bcf0da3984c9179e9c6c8f7124f883ed27e5d94861838f40e0440c97905b8844049e753b93eeae8d47b70aeacf3f62a32209268e5295b3
-MISC ChangeLog 80270 SHA256 
87e3102a463efbc45cf57c0a861d228657ccbce9cd251ea0ebc59a725d4565d2 SHA512 
e89128eb5c53379a8305e20e89598ff1d70b80dba7bb2109afd4a1a9b259b8355ac157422393269fc4cca5bfbb1911370f05149c780131d8db4512515dec3a75
 WHIRLPOOL 
7f57305093a872a73d9373d88e6a8c37b2b0827b2d67c43a62003f4cb6e27a2e4add031382cc140373ebc165a410df0d9a84b3ac66214dad659b371d36f710af
+MISC ChangeLog 80560 SHA256 
3545af4b1abaf2a26c01ca18ab4128895c2faa15eafd2a193b7d0ca66bdb771a SHA512 
3ae14bc035046174df12542f6195dc4036d019f6862fd97eefb0087116e4c7e035ddb9b02861d638c4c2c1c52b4e8c6ff5f90b3c0661ad3fb823e6bee2983b6d
 WHIRLPOOL 
fcfe1195feffd9bb9a9f267c4d110f0fd17af0fda785134aeb4d8b0694efbb2352b89aec09796f505f40eab2c014cc6466959ba35cd58a901e7e76dd56c39088
 MISC metadata.xml 1528 SHA256 
dfa77e191787243660217bd236197611b76c2a4cbc4e5a63ad128d1a62905356 SHA512 
3c4d436c7607814b7442d3b84480efacd0db79323c4954d88c0086292534d8bfd8a02af512e72225ec8adc269a03679709a984bc63dff48311a9bdaf3b991d76
 WHIRLPOOL 
ff9090ec45c7c857db175a7c820f8eb9173372acca9c82b2a09ba08cbc0fac2f74f3e4f3c092f6acb7781592ccb26589ef29b7fd5528bd6d11c414c4d697d94c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTNamuAAoJEDuWpXgki9wHw1AP/j6YR5rjGu4mD3m158uj1WKu
-lOMVM0nXmRkPF0n+2GkxGQZ8F4ybIO0NfDIb1QclwqPWzDpghM7lPg1uiz0OEyxk
-m2Q1InDQpJmulNgruSJSnn9Co8qDnlrnhKtyqoNRnPuHLLSccLdGkMxHuPxAcgm9
-pvDedzpvzWYUWwJYsXyzXWMD+LyimqzfWyYVDtmtn6wHQeV3U4hpNPIwNlmEwT/0
-5Lf4isOL489aAKUZY0ClfCJta0wngCIav3VYrkRY5vT1lweJmsphlawvcC7Gisbs
-6e6Ey+iGAuNw6hWvGJAS44bfzLNOD7gGAtNRV+kqG3Iq3GVyWGqbOixLqDZjUdvf
-SKI05oYI9udVbKV1o5yJpNrFpkYOe0d9qeRqI6pO4lpJn/JfKko4NXNFmmYbGFJE
-Wuc9sMSjRM4LPvwoN4FztkkPCA1PIZQZDnNjpeDRLHOwN5kWefTuNgOpJ+doLjLq
-m8jCASobdb8kPpptTl223xm3qNPbpXhgUV8sRdP0RWXf4xj0PJ3qhnvZrkgz+Gyv
-wj9ucjai8o9MbZkmrJCWpbBx4uAAFh3Ck9xLN0wbj5l+vlSP+tJt6+XEhxUT3a6K
-H6AyQPqHxADgUonzCrf80WoEGdKkjAs1hKtznXtLrNLUNVgIiH6R7wX6DGDrXIIP
-2yxfbPWdTy3rCoFqEcPX
-=qE4F
+iQIcBAEBCAAGBQJTTcLYAAoJEDuWpXgki9wHIRUP/07OWN1B+gl0JYX9ZZSBleOL
+M5reWeslgImAXIbtQA2dymdcEJSnWfN9MtNkoxSew1e4IVRDdr0q+oluhQpozCYl
+y4Qw/jCfyA1bmOwcPRR+09XigFHbR6b3hZLAFolj8Hs90DVfOzgkYzMh/P5Bh4eL
+UoqlVh+Z3w6JAFNjY3Fe2RdQNYFX+PN3htVmYs6fcJ5JLdPb7kWNEmb4/jQAybiQ
+LC+ZJpilhD+Kwi1cvh/Ytx+l6PnGtzNAFeQEL68OpGoCYzIQXQcUiRHFeof9Zw0n
+Rr1YPcsw+g4R+OwR1SI0ANw8uMUE1Cv9wEAl5/p/g4+XJfiK+3anDuc1VHLBQc8s
+bs969sZvEvioByBB0fhfBYH3acUbznWDJzaqkyO6imoKkCXi3Y2z4MLHFbO0chFZ
+At0zI7xo2URno8Cyj33QkjqboaaoXHoRWXpajemDZHG+vi5B2HXUMcVvVADj76O1
+SzoG/QPt5+wUnlXc2aOqWceNLk66KrH3aIjrl1uma1UZnPcjF7yBFlTIQf3e4nU9
+PmTA5x55PJ6FQxk2lq4271vP0DKHaxzBvRjJ8aN5w/W52TIiJRYRidTSiXxtvqLH
+8YGPo4MDWcqO/2rXAqkhu7vWbMggwiXMuKJMtclHhDZ+jbUiTTq4zVYJqxy4uGj0
+nwsnXkzB1DgfFIDL1vfy
+=eQxy
 -----END PGP SIGNATURE-----

diff --git a/dev-java/icedtea/icedtea-6.1.11.15.ebuild 
b/dev-java/icedtea/icedtea-6.1.11.15.ebuild
deleted file mode 100644
index b6d44d5..0000000
--- a/dev-java/icedtea/icedtea-6.1.11.15.ebuild
+++ /dev/null
@@ -1,327 +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/icedtea-6.1.10.4-r3.ebuild,v 1.1 
2011/12/02 12:27:17 sera Exp $
-# Build written by Andrew John Hughes (gnu_and...@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="4"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-OPENJDK_BUILD="24"
-OPENJDK_DATE="14_nov_2011"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-CACAO_TARBALL="cff92704c4e0.tar.gz"
-
-CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and 
dependencies"
-HOMEPAGE="http://icedtea.classpath.org";
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-       http://icedtea.classpath.org/download/source/${SRC_PKG}
-       
http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
-       http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> 
${CACAO_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 
MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap 
+nsplugin
-       +nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-       >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-       >=net-print/cups-1.2.12"
-X_COMMON_DEP="
-       dev-libs/glib
-       >=media-libs/freetype-2.3.5
-       >=x11-libs/gtk+-2.8:2
-       >=x11-libs/libX11-1.1.3
-       >=x11-libs/libXext-1.1.1
-       >=x11-libs/libXi-1.1.3
-       >=x11-libs/libXrender-0.9.4
-       >=x11-libs/libXtst-1.0.3"
-X_DEPEND="
-       >=x11-libs/libXau-1.0.3
-       >=x11-libs/libXdmcp-1.0.2
-       >=x11-libs/libXinerama-1.0.2
-       x11-proto/inputproto
-       >=x11-proto/xextproto-7.1.1
-       x11-proto/xineramaproto
-       x11-proto/xproto"
-
-COMMON_DEP="
-       >=media-libs/giflib-4.1.6
-       >=media-libs/libpng-1.2
-       >=sys-libs/zlib-1.2.3
-       virtual/jpeg:0
-       javascript? ( dev-java/rhino:1.6 )
-       nss? ( >=dev-libs/nss-3.12.5-r1 )
-       pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-       systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-       !dev-java/icedtea6
-       X? (
-               ${X_COMMON_DEP}
-               media-fonts/dejavu
-               cjk? (
-                       media-fonts/arphicfonts
-                       media-fonts/baekmuk-fonts
-                       !ppc? ( !ppc64? ( media-fonts/lklug ) )
-                       media-fonts/lohit-fonts
-                       media-fonts/sazanami
-               )
-       )
-       alsa? ( ${ALSA_COMMON_DEP} )
-       cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not 
present.
-# ca-certificates, perl and openssl are used for the cacerts keystore 
generation
-# xext headers have two variants depending on version - bug #288855
-# !eclipse-ecj-3.7 - bug #392587
-# autoconf - as long as we use eautoreconf, version restrictions for bug 
#294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-       || (
-               >=dev-java/gcj-jdk-4.3
-               dev-java/icedtea-bin:6
-               dev-java/icedtea:6
-       )
-       app-arch/cpio
-       app-arch/unzip
-       app-arch/zip
-       app-misc/ca-certificates
-       dev-lang/perl
-       >=dev-libs/libxslt-1.1.26
-       dev-libs/openssl
-       virtual/pkgconfig
-       sys-apps/lsb-release
-       ${X_DEPEND}
-       jbootstrap? (
-               || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
-       )
-       pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
-       nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-       JAVA_PKG_WANT_BUILD_VM="
-               icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-               gcj-jdk"
-       JAVA_PKG_WANT_SOURCE="1.5"
-       JAVA_PKG_WANT_TARGET="1.5"
-
-       java-vm-2_pkg_setup
-       java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-       unpack ${SRC_PKG}
-}
-
-java_prepare() {
-       # icedtea doesn't like some locales. #330433 #389717
-       export LANG="C" LC_ALL="C"
-
-       epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751 
#422525
-       epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch
-       eautoreconf
-}
-
-bootstrap_impossible() {
-       # Fill this according to testing what works and what not
-       has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-       local config bootstrap enable_cacao
-       local vm=$(java-pkg_get-current-vm)
-
-       # IcedTea6 can't be built using IcedTea7; its class files are too new
-       # Whether to bootstrap
-       bootstrap="disable"
-       if use jbootstrap; then
-               if bootstrap_impossible "${vm}"; then
-                       einfo "Bootstrap with ${vm} is currently not possible 
and thus disabled, ignoring USE=jbootstrap"
-               else
-                       bootstrap="enable"
-               fi
-       fi
-
-       if has "${vm}" gcj-jdk; then
-               # gcj-jdk ensures ecj is present.
-               use jbootstrap || einfo "bootstrap is necessary when building 
with ${vm}, ignoring USE=\"-jbootstrap\""
-               bootstrap="enable"
-       fi
-
-       config="${config} --${bootstrap}-bootstrap"
-
-       if [[ ${bootstrap} == enable ]]; then
-               # icedtea-6 javac wrapper requires to always have ecj if 
bootstrapping #392337
-               local ecj_jar="$(readlink 
"${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-               # Don't use eclipse-ecj-3.7 #392587
-               local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
-               ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
-               if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
-                       ecj_jar="${ecj_jar%/lib/ecj.jar}"
-                       ewarn "${ecj_jar##*/} set as system ecj, can't use for 
bootstrap"
-                       ewarn "Found usable: ${ecj_all[@]##*/}"
-                       ewarn "using ${ecj_all##*/} instead"
-                       ecj_jar="${ecj_all}"/lib/ecj.jar
-               fi
-               config="${config} --with-ecj-jar=${ecj_jar}"
-       fi
-
-       # Always use HotSpot as the primary VM if available. #389521 #368669 
#357633 ...
-       # Otherwise use CACAO
-       if ! has "${ARCH}" amd64 sparc x86; then
-               enable_cacao=yes
-       elif use cacao; then
-               ewarn 'Enabling CACAO on an architecture with HotSpot support; 
issues may result.'
-               ewarn 'If so, please rebuild with USE="-cacao"'
-               enable_cacao=yes
-       fi
-
-       if [[ ${enable_cacao} ]]; then
-               config="${config} --enable-cacao"
-       fi
-
-       # OpenJDK-specific parallelism support. Bug #389791, #337827
-       # Implementation modified from waf-utils.eclass
-       # Note that "-j" is converted to "-j1" as the system doesn't support 
--load-average
-       local procs=$(echo -j1 ${MAKEOPTS} | sed -r 
"s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-       config="${config} --with-parallel-jobs=${procs}";
-       einfo "Configuring using --with-parallel-jobs=${procs}"
-
-       if use javascript ; then
-               config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 
js.jar)"
-       else
-               config="${config} --without-rhino"
-       fi
-
-       unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-       econf ${config} \
-               --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-               --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-               --with-jdk-home="$(java-config -O)" \
-               --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-               $(use_enable !debug optimizations) \
-               $(use_enable doc docs) \
-               $(use_enable nss) \
-               $(use_enable pulseaudio pulse-java) \
-               $(use_enable systemtap) \
-               $(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-       # Would use GENTOO_VM otherwise.
-       export ANT_RESPECT_JAVA_HOME=TRUE
-
-       # With ant >=1.8.2 all required tasks are part of ant-core
-       export ANT_TASKS="none"
-
-       emake
-}
-
-src_test() {
-       # Use Xvfb for tests
-       unset DISPLAY
-
-       Xemake check
-}
-
-src_install() {
-       local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-       local ddest="${ED}/${dest}"
-       dodir "${dest}"
-
-       dodoc README NEWS AUTHORS
-       dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-       cd openjdk.build/j2sdk-image || die
-
-       # Ensures HeadlessGraphicsEnvironment is used.
-       if ! use X; then
-               rm -r jre/lib/$(get_system_arch)/xawt || die
-       fi
-
-       # Don't hide classes
-       rm lib/ct.sym || die
-
-       #402507
-       mkdir jre/.systemPrefs || die
-       touch jre/.systemPrefs/.system.lock || die
-       touch jre/.systemPrefs/.systemRootModFile || die
-
-       # doins can't handle symlinks.
-       cp -vRP bin include jre lib man "${ddest}" || die
-
-       dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-       if use doc; then
-               # java-pkg_dohtml needed for package-list #302654
-               java-pkg_dohtml -r ../docs/* || die
-       fi
-
-       if use examples; then
-               dodir "${dest}/share";
-               cp -vRP demo sample "${ddest}/share/" || die
-       fi
-
-       if use source; then
-               cp src.zip "${ddest}" || die
-       fi
-
-       # Fix the permissions.
-       find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec 
chmod 644 {} \; \) || die
-
-       # Needs to be done before generating cacerts
-       java-vm_set-pax-markings "${ddest}"
-
-       # We need to generate keystore - bug #273306
-       einfo "Generating cacerts file from certificates in 
${EPREFIX}/usr/share/ca-certificates/"
-       mkdir "${T}/certgen" && cd "${T}/certgen" || die
-       cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl 
|| die
-       for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-               openssl x509 -text -in "${c}" >> all.crt || die
-       done
-       ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-       cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-       chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-       # Bug 390663
-       cp "${FILESDIR}"/fontconfig.Gentoo.properties.src 
"${T}"/fontconfig.Gentoo.properties || die
-       eprefixify "${T}"/fontconfig.Gentoo.properties
-       insinto "${dest}"/jre/lib
-       doins "${T}"/fontconfig.Gentoo.properties
-
-       set_java_env "${FILESDIR}/icedtea.env"
-       if ! use X || ! use alsa || ! use cups; then
-               java-vm_revdep-mask "${dest}"
-       fi
-}
-
-pkg_preinst() {
-       if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-               # portage would preserve the symlink otherwise, related to bug 
#384397
-               rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-               elog "To unify the layout and simplify scripts, the identifier 
of Icedtea-6*"
-               elog "has changed from 'icedtea6' to 'icedtea-6' starting from 
version 6.1.10.4-r1"
-               elog "If you had icedtea6 as system VM, the change should be 
automatic, however"
-               elog "build VM settings in /etc/java-config-2/build/jdk.conf 
are not changed"
-               elog "and the same holds for any user VM settings. Sorry for 
the inconvenience."
-       fi
-}

diff --git a/dev-java/icedtea/icedtea-6.1.12.8.ebuild 
b/dev-java/icedtea/icedtea-6.1.12.8.ebuild
deleted file mode 100644
index bbf0e97..0000000
--- a/dev-java/icedtea/icedtea-6.1.12.8.ebuild
+++ /dev/null
@@ -1,310 +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/icedtea-6.1.10.4-r3.ebuild,v 1.1 
2011/12/02 12:27:17 sera Exp $
-# Build written by Andrew John Hughes (gnu_and...@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="4"
-
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-OPENJDK_BUILD="27"
-OPENJDK_DATE="26_oct_2012"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-# Download cacao and jamvm regardless for use with EXTRA_ECONF
-CACAO_TARBALL="68fe50ac34ec.tar.gz"
-JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
-
-CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and 
dependencies"
-HOMEPAGE="http://icedtea.classpath.org";
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-       http://icedtea.classpath.org/download/source/${SRC_PKG}
-       
http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
-       http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> 
${CACAO_GENTOO_TARBALL}
-       http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> 
${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 
MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap 
+nsplugin
-       +nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-       >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-       >=net-print/cups-1.2.12"
-X_COMMON_DEP="
-       dev-libs/glib
-       >=media-libs/freetype-2.3.5
-       >=x11-libs/gtk+-2.8:2
-       >=x11-libs/libX11-1.1.3
-       >=x11-libs/libXext-1.1.1
-       >=x11-libs/libXi-1.1.3
-       >=x11-libs/libXrender-0.9.4
-       >=x11-libs/libXtst-1.0.3"
-X_DEPEND="
-       >=x11-libs/libXau-1.0.3
-       >=x11-libs/libXdmcp-1.0.2
-       >=x11-libs/libXinerama-1.0.2
-       x11-proto/inputproto
-       >=x11-proto/xextproto-7.1.1
-       x11-proto/xineramaproto
-       x11-proto/xproto"
-
-COMMON_DEP="
-       >=media-libs/giflib-4.1.6
-       >=media-libs/libpng-1.2
-       >=sys-libs/zlib-1.2.3
-       virtual/jpeg:0
-       javascript? ( dev-java/rhino:1.6 )
-       nss? ( >=dev-libs/nss-3.12.5-r1 )
-       pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-       systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-       !dev-java/icedtea6
-       X? (
-               ${X_COMMON_DEP}
-               media-fonts/dejavu
-               cjk? (
-                       media-fonts/arphicfonts
-                       media-fonts/baekmuk-fonts
-                       !ppc? ( !ppc64? ( media-fonts/lklug ) )
-                       media-fonts/lohit-fonts
-                       media-fonts/sazanami
-               )
-       )
-       alsa? ( ${ALSA_COMMON_DEP} )
-       cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not 
present.
-# ca-certificates, perl and openssl are used for the cacerts keystore 
generation
-# xext headers have two variants depending on version - bug #288855
-# !eclipse-ecj-3.7 - bug #392587
-# autoconf - as long as we use eautoreconf, version restrictions for bug 
#294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-       || (
-               >=dev-java/gcj-jdk-4.3
-               dev-java/icedtea-bin:6
-               dev-java/icedtea:6
-       )
-       app-arch/cpio
-       app-arch/unzip
-       app-arch/zip
-       app-misc/ca-certificates
-       dev-lang/perl
-       >=dev-libs/libxslt-1.1.26
-       dev-libs/openssl
-       virtual/pkgconfig
-       sys-apps/lsb-release
-       ${X_DEPEND}
-       pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
-       nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-       JAVA_PKG_WANT_BUILD_VM="
-               icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-               gcj-jdk"
-       JAVA_PKG_WANT_SOURCE="1.5"
-       JAVA_PKG_WANT_TARGET="1.5"
-
-       java-vm-2_pkg_setup
-       java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-       unpack ${SRC_PKG}
-}
-
-java_prepare() {
-       # icedtea doesn't like some locales. #330433 #389717
-       export LANG="C" LC_ALL="C"
-}
-
-bootstrap_impossible() {
-       # Fill this according to testing what works and what not
-       has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-       local config bootstrap enable_cacao
-       local vm=$(java-pkg_get-current-vm)
-
-       # IcedTea6 can't be built using IcedTea7; its class files are too new
-       # Whether to bootstrap
-       bootstrap="disable"
-       if use jbootstrap; then
-               if bootstrap_impossible "${vm}"; then
-                       einfo "Bootstrap with ${vm} is currently not possible 
and thus disabled, ignoring USE=jbootstrap"
-               else
-                       bootstrap="enable"
-               fi
-       fi
-
-       if has "${vm}" gcj-jdk; then
-               # gcj-jdk ensures ecj is present.
-               use jbootstrap || einfo "bootstrap is necessary when building 
with ${vm}, ignoring USE=\"-jbootstrap\""
-               bootstrap="enable"
-       fi
-
-       config="${config} --${bootstrap}-bootstrap"
-
-       # Always use HotSpot as the primary VM if available. #389521 #368669 
#357633 ...
-       # Otherwise use CACAO
-       if ! has "${ARCH}" amd64 sparc x86; then
-               enable_cacao=yes
-       elif use cacao; then
-               ewarn 'Enabling CACAO on an architecture with HotSpot support; 
issues may result.'
-               ewarn 'If so, please rebuild with USE="-cacao"'
-               enable_cacao=yes
-       fi
-
-       if [[ ${enable_cacao} ]]; then
-               config="${config} --enable-cacao"
-       fi
-
-       # OpenJDK-specific parallelism support. Bug #389791, #337827
-       # Implementation modified from waf-utils.eclass
-       # Note that "-j" is converted to "-j1" as the system doesn't support 
--load-average
-       local procs=$(echo -j1 ${MAKEOPTS} | sed -r 
"s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-       config="${config} --with-parallel-jobs=${procs}";
-       einfo "Configuring using --with-parallel-jobs=${procs}"
-
-       if use javascript ; then
-               config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 
js.jar)"
-       else
-               config="${config} --without-rhino"
-       fi
-
-       unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-       econf ${config} \
-               --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-               --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-               --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-               --with-jdk-home="$(java-config -O)" \
-               --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-               --disable-downloading \
-               $(use_enable !debug optimizations) \
-               $(use_enable doc docs) \
-               $(use_enable nss) \
-               $(use_enable pulseaudio pulse-java) \
-               $(use_enable systemtap) \
-               $(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-       # Would use GENTOO_VM otherwise.
-       export ANT_RESPECT_JAVA_HOME=TRUE
-
-       # With ant >=1.8.2 all required tasks are part of ant-core
-       export ANT_TASKS="none"
-
-       emake
-}
-
-src_test() {
-       # Use Xvfb for tests
-       unset DISPLAY
-
-       Xemake check
-}
-
-src_install() {
-       local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-       local ddest="${ED}/${dest}"
-       dodir "${dest}"
-
-       dodoc README NEWS AUTHORS
-       dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-       cd openjdk.build/j2sdk-image || die
-
-       # Ensures HeadlessGraphicsEnvironment is used.
-       if ! use X; then
-               rm -r jre/lib/$(get_system_arch)/xawt || die
-       fi
-
-       # Don't hide classes
-       rm lib/ct.sym || die
-
-       #402507
-       mkdir jre/.systemPrefs || die
-       touch jre/.systemPrefs/.system.lock || die
-       touch jre/.systemPrefs/.systemRootModFile || die
-
-       # doins can't handle symlinks.
-       cp -vRP bin include jre lib man "${ddest}" || die
-
-       dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-       if use doc; then
-               # java-pkg_dohtml needed for package-list #302654
-               java-pkg_dohtml -r ../docs/* || die
-       fi
-
-       if use examples; then
-               dodir "${dest}/share";
-               cp -vRP demo sample "${ddest}/share/" || die
-       fi
-
-       if use source; then
-               cp src.zip "${ddest}" || die
-       fi
-
-       # Fix the permissions.
-       find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec 
chmod 644 {} \; \) || die
-
-       # Needs to be done before generating cacerts
-       java-vm_set-pax-markings "${ddest}"
-
-       # We need to generate keystore - bug #273306
-       einfo "Generating cacerts file from certificates in 
${EPREFIX}/usr/share/ca-certificates/"
-       mkdir "${T}/certgen" && cd "${T}/certgen" || die
-       cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl 
|| die
-       for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-               openssl x509 -text -in "${c}" >> all.crt || die
-       done
-       ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-       cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-       chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-       # Bug 390663
-       cp "${FILESDIR}"/fontconfig.Gentoo.properties.src 
"${T}"/fontconfig.Gentoo.properties || die
-       eprefixify "${T}"/fontconfig.Gentoo.properties
-       insinto "${dest}"/jre/lib
-       doins "${T}"/fontconfig.Gentoo.properties
-
-       set_java_env "${FILESDIR}/icedtea.env"
-       if ! use X || ! use alsa || ! use cups; then
-               java-vm_revdep-mask "${dest}"
-       fi
-}
-
-pkg_preinst() {
-       if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-               # portage would preserve the symlink otherwise, related to bug 
#384397
-               rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-               elog "To unify the layout and simplify scripts, the identifier 
of Icedtea-6*"
-               elog "has changed from 'icedtea6' to 'icedtea-6' starting from 
version 6.1.10.4-r1"
-               elog "If you had icedtea6 as system VM, the change should be 
automatic, however"
-               elog "build VM settings in /etc/java-config-2/build/jdk.conf 
are not changed"
-               elog "and the same holds for any user VM settings. Sorry for 
the inconvenience."
-       fi
-}

diff --git a/dev-java/icedtea/icedtea-6.1.13.2.ebuild 
b/dev-java/icedtea/icedtea-6.1.13.3.ebuild
similarity index 99%
rename from dev-java/icedtea/icedtea-6.1.13.2.ebuild
rename to dev-java/icedtea/icedtea-6.1.13.3.ebuild
index 5e906ad..82a71ed 100644
--- a/dev-java/icedtea/icedtea-6.1.13.2.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.3.ebuild
@@ -13,8 +13,8 @@ inherit java-pkg-2 java-vm-2 pax-utils prefix versionator 
virtualx
 
 ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
 ICEDTEA_BRANCH=$(get_version_component_range 1-3)
-OPENJDK_BUILD="30"
-OPENJDK_DATE="21_jan_2014"
+OPENJDK_BUILD="31"
+OPENJDK_DATE="15_apr_2014"
 OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
 # Download cacao and jamvm regardless for use with EXTRA_ECONF
 CACAO_TARBALL="68fe50ac34ec.tar.gz"

diff --git a/dev-java/icedtea/icedtea-7.2.3.14.ebuild 
b/dev-java/icedtea/icedtea-7.2.3.14.ebuild
deleted file mode 100644
index bf25811..0000000
--- a/dev-java/icedtea/icedtea-7.2.3.14.ebuild
+++ /dev/null
@@ -1,362 +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/icedtea-7.2.0-r3.ebuild,v 
1.1 2011/12/02 12:27:17 sera Exp $
-# Build written by Andrew John Hughes (gnu_and...@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-CORBA_TARBALL="c7d0b72f704f.tar.gz"
-JAXP_TARBALL="0eb202593710.tar.gz"
-JAXWS_TARBALL="482a3f64a8ea.tar.gz"
-JDK_TARBALL="3428bff8a33a.tar.gz"
-LANGTOOLS_TARBALL="d50a9c5cd291.tar.gz"
-OPENJDK_TARBALL="14181eb6c00d.tar.gz"
-HOTSPOT_TARBALL="72a544aeb892.tar.gz"
-CACAO_TARBALL="a567bcb7f589.tar.gz"
-JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and 
dependencies"
-HOMEPAGE="http://icedtea.classpath.org";
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-       http://icedtea.classpath.org/download/source/${SRC_PKG}
-       
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
-        -> ${OPENJDK_GENTOO_TARBALL}
-       
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
-        -> ${CORBA_GENTOO_TARBALL}
-       
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
-        -> ${JAXP_GENTOO_TARBALL}
-       
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
-        -> ${JAXWS_GENTOO_TARBALL}
-       
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
-        -> ${JDK_GENTOO_TARBALL}
-       
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
-        -> ${HOTSPOT_GENTOO_TARBALL}
-       
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
-        -> ${LANGTOOLS_GENTOO_TARBALL}
-       http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> 
${CACAO_GENTOO_TARBALL}
-       http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> 
${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 
MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="7"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-       +nss pax_kernel pulseaudio +source systemtap test zero +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-       >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-       >=net-print/cups-1.2.12"
-X_COMMON_DEP="
-       >=dev-libs/atk-1.30.0
-       >=dev-libs/glib-2.26
-       media-libs/fontconfig
-       >=media-libs/freetype-2.3.5:2=
-       >=x11-libs/cairo-1.8.8:=
-       x11-libs/gdk-pixbuf:2
-       >=x11-libs/gtk+-2.8:2=
-       >=x11-libs/libX11-1.1.3
-       >=x11-libs/libXext-1.1.1
-       >=x11-libs/libXi-1.1.3
-       >=x11-libs/libXrender-0.9.4
-       >=x11-libs/libXtst-1.0.3
-       >=x11-libs/pango-1.24.5"
-X_DEPEND="
-       >=x11-libs/libXau-1.0.3
-       >=x11-libs/libXdmcp-1.0.2
-       >=x11-libs/libXinerama-1.0.2
-       x11-proto/inputproto
-       >=x11-proto/xextproto-7.1.1
-       x11-proto/xineramaproto
-       x11-proto/xproto"
-
-COMMON_DEP="
-       >=media-libs/giflib-4.1.6:=
-       >=media-libs/lcms-2.5
-       >=media-libs/libpng-1.2:=
-       >=sys-libs/zlib-1.2.3:=
-       virtual/jpeg:0=
-       javascript? ( dev-java/rhino:1.6 )
-       nss? ( >=dev-libs/nss-3.12.5-r1 )
-       pulseaudio?  ( >=media-sound/pulseaudio-0.9.11:= )
-       systemtap? ( >=dev-util/systemtap-1 )"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-       !dev-java/icedtea:0
-       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} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not 
present.
-# ca-certificates, perl and openssl are used for the cacerts keystore 
generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug 
#294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-       || (
-               >=dev-java/gcj-jdk-4.3
-               dev-java/icedtea-bin:7
-               dev-java/icedtea-bin:6
-               dev-java/icedtea:7
-               dev-java/icedtea:6
-       )
-       app-arch/cpio
-       app-arch/unzip
-       app-arch/zip
-       app-misc/ca-certificates
-       dev-lang/perl
-       >=dev-libs/libxslt-1.1.26
-       dev-libs/openssl
-       virtual/pkgconfig
-       sys-apps/attr
-       sys-apps/lsb-release
-       ${X_DEPEND}
-       pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
-       nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-       JAVA_PKG_WANT_BUILD_VM="
-               icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-               gcj-jdk"
-       JAVA_PKG_WANT_SOURCE="1.5"
-       JAVA_PKG_WANT_TARGET="1.5"
-
-       java-vm-2_pkg_setup
-       java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-       unpack ${SRC_PKG}
-}
-
-java_prepare() {
-       # For bootstrap builds as the sandbox control file might not yet exist.
-       addpredict /proc/self/coredump_filter
-
-       # icedtea doesn't like some locales. #330433 #389717
-       export LANG="C" LC_ALL="C"
-}
-
-bootstrap_impossible() {
-       # Fill this according to testing what works and what not
-       has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-       local config bootstrap use_zero zero_config
-       local vm=$(java-pkg_get-current-vm)
-
-       # Whether to bootstrap
-       bootstrap="disable"
-       if use jbootstrap; then
-               if bootstrap_impossible "${vm}"; then
-                       einfo "Bootstrap with ${vm} is currently not possible 
and thus disabled, ignoring USE=jbootstrap"
-               else
-                       bootstrap="enable"
-               fi
-       fi
-
-       if has "${vm}" gcj-jdk; then
-               # gcj-jdk ensures ecj is present.
-               use jbootstrap || einfo "bootstrap is necessary when building 
with ${vm}, ignoring USE=\"-jbootstrap\""
-               bootstrap="enable"
-               local ecj_jar="$(readlink 
"${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-               config="${config} --with-ecj-jar=${ecj_jar}"
-       fi
-
-       config="${config} --${bootstrap}-bootstrap"
-
-       # Use Zero if requested
-       if use zero; then
-               use_zero="yes";
-       fi
-
-       # Always use HotSpot as the primary VM if available. #389521 #368669 
#357633 ...
-       # Otherwise use JamVM as it's the only possibility right now
-       if ! has "${ARCH}" amd64 sparc x86 ; then
-               if has "${ARCH}" ppc ppc64 arm ; then
-                       config="${config} --enable-jamvm"
-               else
-                       use_zero="yes";
-               fi
-       fi
-
-       # Turn on Zero if needed (non-HS/JamVM archs) or requested
-       if test "x${use_zero}" = "xyes"; then
-               zero_config="--enable-zero";
-       fi
-
-       # OpenJDK-specific parallelism support. Bug #389791, #337827
-       # Implementation modified from waf-utils.eclass
-       # Note that "-j" is converted to "-j1" as the system doesn't support 
--load-average
-       local procs=$(echo -j1 ${MAKEOPTS} | sed -r 
"s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-       config="${config} --with-parallel-jobs=${procs}";
-       einfo "Configuring using --with-parallel-jobs=${procs}"
-
-       if use javascript ; then
-               config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 
js.jar)"
-       else
-               config="${config} --without-rhino"
-       fi
-
-       unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-       econf ${config} \
-               --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-               --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-               --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-               --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-               --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-               --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
-               
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-               --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-               --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-               --with-jdk-home="$(java-config -O)" \
-               
--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-               --disable-downloading --disable-Werror \
-               $(use_enable !debug optimizations) \
-               $(use_enable doc docs) \
-               $(use_enable nss) \
-               $(use_enable pulseaudio pulse-java) \
-               $(use_enable systemtap) \
-               $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-               ${zero_config}
-}
-
-src_compile() {
-       # Would use GENTOO_VM otherwise.
-       export ANT_RESPECT_JAVA_HOME=TRUE
-
-       # With ant >=1.8.2 all required tasks are part of ant-core
-       export ANT_TASKS="none"
-
-       emake
-}
-
-src_test() {
-       # Use Xvfb for tests
-       unset DISPLAY
-
-       Xemake check
-}
-
-src_install() {
-       local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-       local ddest="${ED}/${dest}"
-       dodir "${dest}"
-
-       dodoc README NEWS AUTHORS
-       dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-       cd openjdk.build/j2sdk-image || die
-
-       # Ensures HeadlessGraphicsEnvironment is used.
-       if ! use X; then
-               rm -r jre/lib/$(get_system_arch)/xawt || die
-       fi
-
-       # Don't hide classes
-       rm lib/ct.sym || die
-
-       #402507
-       mkdir jre/.systemPrefs || die
-       touch jre/.systemPrefs/.system.lock || die
-       touch jre/.systemPrefs/.systemRootModFile || die
-
-       # doins can't handle symlinks.
-       cp -vRP bin include jre lib man "${ddest}" || die
-
-       dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-       if use doc; then
-               # java-pkg_dohtml needed for package-list #302654
-               java-pkg_dohtml -r ../docs/* || die
-       fi
-
-       if use examples; then
-               dodir "${dest}/share";
-               cp -vRP demo sample "${ddest}/share/" || die
-       fi
-
-       if use source; then
-               cp src.zip "${ddest}" || die
-       fi
-
-       # Fix the permissions.
-       find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec 
chmod 644 {} \; \) || die
-
-       # Needs to be done before generating cacerts
-       java-vm_set-pax-markings "${ddest}"
-
-       # We need to generate keystore - bug #273306
-       einfo "Generating cacerts file from certificates in 
${EPREFIX}/usr/share/ca-certificates/"
-       mkdir "${T}/certgen" && cd "${T}/certgen" || die
-       cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl 
|| die
-       for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-               openssl x509 -text -in "${c}" >> all.crt || die
-       done
-       ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-       cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-       chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-       # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-       # install it anyway. Bug 390663
-       cp "${FILESDIR}"/fontconfig.Gentoo.properties.src 
"${T}"/fontconfig.Gentoo.properties || die
-       eprefixify "${T}"/fontconfig.Gentoo.properties
-       insinto "${dest}"/jre/lib
-       doins "${T}"/fontconfig.Gentoo.properties
-
-       set_java_env "${FILESDIR}/icedtea.env"
-       if ! use X || ! use alsa || ! use cups; then
-               java-vm_revdep-mask "${dest}"
-       fi
-       java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-       if has_version "<=dev-java/icedtea-7.2.0:7"; then
-               # portage would preserve the symlink otherwise, related to bug 
#384397
-               rm -f "${EROOT}/usr/lib/jvm/icedtea7"
-               elog "To unify the layout and simplify scripts, the identifier 
of Icedtea-7*"
-               elog "has changed from 'icedtea7' to 'icedtea-7' starting from 
version 7.2.0-r1"
-               elog "If you had icedtea7 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
-}

Reply via email to