Version bump, bug #524560.

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

4 files changed, 726 insertions, 5 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 39ac83b342fa..5a63b728d684 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.124 2014/10/05 22:45:16 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.125 2014/10/06 06:44:54 caster Exp $
+
+*icedtea-7.2.4.8 (06 Oct 2014)
+*icedtea-6.1.13.4 (06 Oct 2014)
+
+  06 Oct 2014; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.13.4.ebuild,
+  +icedtea-7.2.4.8.ebuild:
+  Version bump, bug #524560.
 
   05 Oct 2014; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.4.3.ebuild,
   icedtea-7.2.4.7.ebuild:
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 4680ee16ec48..150ca03d9709 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -8,39 +8,51 @@ AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14d
 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.4-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
+DIST icedtea-2.4-corba-58b31c5bf14e.tar.gz 1442392 SHA256 d42baf4a2d8529e0c7bafd9e0cce4a8f7463e06f4ab0736fb2c97411a5933560 SHA512 57f4339e483952b294c2f4100a7e3daf91b0a1e021515160ac88b92ed6175ae2e26b37560ab16055a3af3bb4d8fc6f16641daea9416daba7460a3bafdbbadca9 WHIRLPOOL c5e1f4f1cf730b60da5340e75ab5bbc486c8dd04f38c6803139956d1c8429bab89713f7bbaf34d83dc1a25e4863633deb0ecde066a1d5cccee24dde864cb139b
 DIST icedtea-2.4-corba-8ed5df839fbc.tar.gz 1440538 SHA256 7fab9af64ffcdf635a6fed5abf78cffd1f64be1f3827a1aaf3a0e5e1fdbc599c SHA512 3fff60fc85dc4b27991363c067637b81557d6ca65131296e44c77172736007a3c6221d48f803168677937d3941e7bad585c229d833f67de53b51f256ae2b3e6c WHIRLPOOL 35c223c1821fe01a28d3a9463521b1fd2cb7a946517451e2a42191b038de0ade0632086c9dfeabcd9d6ab9398d3ab229db8ad96244440d5158493d8f74747cc9
 DIST icedtea-2.4-corba-e6ad5b912691.tar.gz 1441793 SHA256 cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674 SHA512 ab787baa78e9494fc7a9d12351121a64392b5490409fabb6d343fcf78191e0a7f838d14e2251b35d6b8ac15df950e259bb6ae7a191934cf391a0c00774c4ce4c WHIRLPOOL 1b1c7a401cb6a5f62fd5393bca806f25ca7b093ebcdc09600fac3114d6aa9a5dbd0317ce934a34992fb75fe017e638ed879d661e7854459d2416f80d5c021da1
 DIST icedtea-2.4-hotspot-69b542696e5b.tar.gz 9735746 SHA256 e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65 SHA512 6480f7df5f139d5ade06fd949e7daaa258d7a8db972ac36690092fbedb3702b8a92e51d9504d445c6c4ed07fb47e088ccf6efc01b96e292e602eaf8f246b98ed WHIRLPOOL 1343acc29f546fc12a665031a9b9af7c4fa6210c40c08ea2050dbe66c56dfe2624178037ba3d8bf52deb7461aeb12bd1565ab48c7fcefa450c995b0468820487
+DIST icedtea-2.4-hotspot-6f93cec20d27.tar.gz 9738397 SHA256 4b62772cbd751d6a060e05caee842ec510fc5e210ac23b9a1c0a1418979ab655 SHA512 3d237d786d9a4f8ff21d6ce072207bb21d07b57025051b52574fcaefcef9eebf32569f26330cf1be48225ed3860d19896d17f2ba94535aeaf10c408dee508a4a WHIRLPOOL f4af2c91edb61f66258dba24c4ed4eae25bf6a62c54f364910894c9e5ca12fc02e612c4af7b98d203ff589e11c5f6ff2d04a99c5cc26000da5b634cbbd9b1236
 DIST icedtea-2.4-hotspot-b59e02d9e72b.tar.gz 9626517 SHA256 b7d7e01d7ab9e49b68aa29b55355a019d71f9ae5cabb4ea7378b55855a07df57 SHA512 275d5c67499dcf553f3c74e84f173947ce103c20b8a18a19c20860829e3d1fa6afa1a45e986c6fc1658d73ccb6f4b0210dd46853541901de06f036cc137d2fdd WHIRLPOOL 7feb88c00e10baf205c33afe9aceb5452974fe1e7985895405e1021ce59140600830404565f7fa98fae4c0ec2ac70cd3368460ccf1d0b6c1cbe3d51c921f9d0c
 DIST icedtea-2.4-jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz 316422 SHA256 4662da1fe3e0e11d8fa685c7f2fc748576b9f3d3e37dc56b798dd6a5bd6b61e7 SHA512 a8132ce0f97f5ba090b12aad847072861f8913fe1fdc3a540e9e353b0d9ddc564a96ab2bcbfa27a7068bba606428d7dc9de4f7ad668e546151657f9ddcfc28ad WHIRLPOOL 8e274825bec5c47787eda0e25a0bc4a586a8938c1fa3c4f0c4f7c04e679d28458a61f45bfa62b255a630a4ca3a5c5d1aa3436086cba92ee7a43d3a2b8684e330
 DIST icedtea-2.4-jaxp-8f220f7b51c7.tar.gz 3889719 SHA256 cec41aebd42f4c8caba9c24c306ba78e8cf5da3d23da1604b98753340a2719ca SHA512 6f961a1af3aa5ada703371c24089c91161bd6d7345603bf61bcf8eb72983ce7a38f07266ef98148f438bf7a1520c4bdcfd7e5bf026191e1a431e54c4392f571e WHIRLPOOL 8ba2b52ae10af20f2da91fa8df0af7c6d3757e29b579759c9bc5217354647995b57514bbfaa9e5a2ea17ecd6d9425bf37f8017b0c29ef6bb7e53e363e3b3d8cf
 DIST icedtea-2.4-jaxp-94b7e8e0d96f.tar.gz 3889649 SHA256 3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea SHA512 b604b7e52453680a20bd303ffa389f937d9f31bb50016b9b359d39b7f4af6deca6cd1e5b3e13f2d40f0d0c46ae9c0370a31afd30b8cc64c5854020804dd38855 WHIRLPOOL abf4f10153f82f0c6201c60d0eb29445ae908e3881be671fbe733e15e49d42d59a704583d2db53e9b08ebdb5f0fb20a8007df21836772c6039c9097a7841bc9b
+DIST icedtea-2.4-jaxp-95d394340fda.tar.gz 3884205 SHA256 5b52e6c45bcf439d77e207f188c55a0b906c7d10078551bb606d278822dbdc5d SHA512 e04235a3cce9ee6e0630e3310d1bfb67a1b6ed2458c1255ae687a04c2cf1a5622a28e9c812aa11a9b7f993b04e251fb1cd688ab160838165cedcc717c5683752 WHIRLPOOL 65a21bb2c357ebad6e029b0d271451f98fe0efd8fbbbcf882293fc4215e1cbd4a8b5f049199430cf039e5959d6fead120c9fe43f5babdd4d16cf1d02fd953fc1
 DIST icedtea-2.4-jaxws-652eb396f959.tar.gz 2763848 SHA256 fb9c22e92c2a056917b7b5dce6905a01ab2e904cbc3c1c6badcc470d22136518 SHA512 83c2cc366bf8a96b1174b42ce4048a5f603e672c8dfe9150c8e70d4d590a702c12365ffc07185d0dcbca918a2e21238211fb42724dabd37dc7db2004a23f0a1d WHIRLPOOL bda9dc09d95ce8604169e263a2cd3dd353791267e0e4540a016b5f78a3cf6274cafc1aaa2a6dee10a89405690c987f9b6a2ed7d8fec5a10a226f7a1535848af4
+DIST icedtea-2.4-jaxws-bce4362b2996.tar.gz 2780021 SHA256 f612dbff32c60afff28d4d75b90246b355b13521020bdb6ea2020c78d08cefba SHA512 a82aed28e24b5f4f2563c6024493cee5dca4a9a94709d6f3186b9bcbbc88e025f208d53af2d90c079f797ccf92625054d3e10a31994fe841682f950e17d409a0 WHIRLPOOL fbc2b14d97814c3598ef756e1af471233fbf9988f73a3b5e5b509a402e8bd909f60f6f6bda91e02f40e7e7f037480d0225e996ec43b8db4b9fb0c4efd418cfc6
 DIST icedtea-2.4-jaxws-bd9a50a78d04.tar.gz 2779009 SHA256 3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d SHA512 2a1ccdcdf4f6058649514f98c718a542cbdb5e76e997ad77fbcc1a8a7efdf2f787d04909ef0434af07c97373626b5d439718161defe537eea8a2eb56b5405de5 WHIRLPOOL c6cea6a31e01d160a7490297b143beaa0b9f5e586ab1608a8a8fd9a3207660c4d39abda680154ff56f29b8a14477bdaf850b80e93d9dd354dca665c630a83a94
+DIST icedtea-2.4-jdk-22d79652f370.tar.gz 39990304 SHA256 6659f1b95120f88eec03beaabc7fe2df409522902b7a64689cfb82a959510e49 SHA512 0894dab1f8a5d72bfb02c224d9068b4fb49c095f99c8ca38cf4bc58ed1851bf07350109ba966c40ca45a2e3751f0c334f5084ebdd3a84e022a2edb77b0b31d11 WHIRLPOOL 855b651744bd3dd3e802398e9ff77ffe35575b05c3a7e2f0043618cf0521ae1f1730b87a5e1da639219c8f6c388e8ea0f7cd52b91a125966fc8928facde0a2d3
 DIST icedtea-2.4-jdk-7958751eb9ef.tar.gz 45252720 SHA256 4df06346d197180bbb9d182e3ebc9ab6386562199d9898d057d0df75566349fe SHA512 6c54d69e4afe65ce4738d30254a71bed1ac6c028a752d8be2310cb9d06b6d5a77db357c838b6df5246624f7f0168c5224c9ce260de4f49c6b92ae8b4e9413f84 WHIRLPOOL eefdcf720bcdccdecb4166bcfdbb3d81d28c2b2a2def00f01813cf9c9d314f75bef8b32eba66252f31bdb1396f320af0b5004c63e5cf70dd8bcbde0350d79d52
 DIST icedtea-2.4-jdk-9448fff93286.tar.gz 39963396 SHA256 9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be SHA512 498434ee55cd0ff0f9522b5e7ef6f69c7a54750ca24b336519e24822185e6311ad84ae84b40a470a34b870a19c0191433b49bfb195c5bc6f28f2d4f1f3ee4ac7 WHIRLPOOL 0c70f98bea74707744213b98ed9391890bd5f8afd7f33963c55cec95985969e0a9a08ac29e01ee211a6d211240f22c3596d21914b2f99cc90334cd29f0470393
 DIST icedtea-2.4-langtools-3c8eb52a32ea.tar.gz 2321300 SHA256 462ad61fd34708c90362f9e3d3c432b9246833ea8ff0d8a14955ae386bce4a91 SHA512 917e313dc897ea8548616ad766bc5b937eafe1219b9ff344c89bee02d3432f21559f6a02027031ff4f6b0957be4e8ea41b3f646f86a09d7f1ebe809639896b95 WHIRLPOOL 0d0b4a973d6e334176790190e467cfb8f9096119fcab8f63d4aa3689b3bd434db4de842dfe7ec4dfce819028e07df1491fc43c4825a75f33f46cd8d08de1b981
+DIST icedtea-2.4-langtools-43cdaf529543.tar.gz 2300798 SHA256 3f69ad8add8036854cf5846689410b99a44b2dbd0d2e625316bdd895c3e7f853 SHA512 be3d6d6f8b5e64ceaaefa731e00e7f217b5f972786a4f15eb0b4d25dc2c7feb15e0f183ef84dd7794fed71bfdabea86d6a8b0620992cd9af47dc945142cab60a WHIRLPOOL 04963c0b081b2467925cfe9eccd9faec6d173cb12cdd7439a0dca4219289af28dcfec63c9805f1df598a89518bab28210d1306eeee1759e8d729cf33df6621fe
 DIST icedtea-2.4-langtools-8c26a3c39128.tar.gz 2299228 SHA256 5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b SHA512 96a0d00bc7992d84bec61999e158f9a955233a1a15671a5496fed4fd270b40b6526bb11dc70e1e5c85f2fdbdf0df06efd3e805c910d2b7410d78c9c4fe78da8a WHIRLPOOL 0d03d1ecd2789e5b97500a7bcc3ed8ebca484c64b2d0b94989acf551314e3a3df3979f2aa57a78109b62f3ce47ce43aa23b8547395227fe979128b0f7fd5b3f2
 DIST icedtea-2.4-openjdk-13970e76b784.tar.gz 137938 SHA256 bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b SHA512 3898815c8c7b99e8b25d710f48ef25d9e0a5ac2c332ce3c1f870b30bfe1198492029767b75f0f8cb85f6b55e2432b14e8c71b0ceab0d25e6c047bfcde766a6f5 WHIRLPOOL d9f0250f3e527aa9898933911c5059fd7d4f0821184f8a216c02afeeb4179f770372631c344bb6ef9d814e07e21e024259355dc317126f1b23ee6e4fabbf3096
+DIST icedtea-2.4-openjdk-2b38d8f0e43f.tar.gz 138484 SHA256 0911ac258e606dbe20206d5e0d37e997b804f90e8269762242d333b07e7932b4 SHA512 e08c9592dec819b20633174cb0d6f955f4a32ad51d76b9754b6b0f79b8c989c64c332499328462d9a8394f81a65fee69adfd04b6bad22337bf9f894c75c75540 WHIRLPOOL f286bb36c69ace3e5a413f677519f17c3cf0c8c299938a4e98e9938c8f3933ed73b1ddae75070ce44baac6a07e8cec4a4f0f3ab0476be0a7845011124437b8b2
 DIST icedtea-2.4-openjdk-e2f5917da3c1.tar.gz 136580 SHA256 75a18abd117e3295c6de4d3450f0094a9abc08f2168e2911bce25d1e153107b9 SHA512 b1657f421ea64d076c3738533039b769de18c5ceec8c0e76cec5f12fe7c79c0bb585cc4bfeebe038dfae30f648287b79d8660e1decb907739ff213382504fe48 WHIRLPOOL 34e946d78d7c18d8ba91a7f7b996079fe98413268c33a8e0f29b7dc64843b6c0981ea33148981c8afa73fbfc69e51bfd09f0f5f2af876e54a54c18ac3eac9c17
 DIST icedtea-2.4.3.tar.xz 3417116 SHA256 9289d25867b39756d62ba16eda5834655609a6962e0eaf2edacc04e3b629c806 SHA512 700496b3e09fd0a72fd672e91b9fe4d7296db3bdd1f344582d72cad64ef4aa5fe12ee13150d9555ebce90024c9aa8e9cc630acc66b4bf9c43a264091a441df2c WHIRLPOOL 88986669a6f1d00d453f509874add60c60a6aff257808d24ac7fa625c8ca238ce8be0167019a6e472132c5a0c6eea07462714c2dffc8b6c72b9adc039342d91a
 DIST icedtea-2.4.7.tar.xz 3419144 SHA256 b66973bef7808f8fb03be64e44d312ea2d13590a68a6a4e6690dbcdd1947459d SHA512 d252c06271693d6a3524b0678e4f75bf1fa5970501bce181de3dca701582a7c178a17b569d10caf130262c7110e60ba3d874f405bbd458d861d24cfe73df465d WHIRLPOOL 5fd01d01d1d84763bbfb4ddb407c7eea4f9c832b54844576f56982adb4f7b29c6d703b38e878308cb6277468e47ab831d1bc9acb61adf513e3ef957ca1d0b355
+DIST icedtea-2.4.8.tar.xz 3428080 SHA256 3fa64e2e92b08fb69eaec72a85ee3322efb1cfacc65e15b5b7fdef4abbdd17a2 SHA512 ad2e153884b9bf5edb03e5c0bf5606923e51a6eb58648c93de3bbc9be2db1cc5589bd7800e2104161cd506d488db32b9995400f70dc0bee4f5942e4d948bfec1 WHIRLPOOL 8cec14d8cba26a808e986abc211841065036cdcfadb9da327b3191937e4f3fd2c94e98b1dab989f30a3d494eeb692a6fff24c756dfec2b2a6a2a4f5da7822ead
 DIST icedtea-6.1.13-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
 DIST icedtea-6.1.13-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
 DIST icedtea6-1.12.7.tar.xz 9219124 SHA256 56e180666f9c6a38aa725033b60bbdf5bf4f652ad9f6876eedc56a27497158a8 SHA512 32b5af24e48c5265efac53fd44312433a0014325a1f74eb62fdde1562e8cfc8508dcf08c29fcbde1a14ae54213459b826772dfbf12d1460ecd3435cb1e89213d WHIRLPOOL 4b497017a1e7712c25aa035168e93e5dcf4be93d6605954efeceacf1bfcb73738726bb955f0db46bc8a12f6ccdbb8ebcde335e2b648685e4291d13dfad68f38f
 DIST icedtea6-1.13.3.tar.xz 4595140 SHA256 0149ffffcfb55739357a2c720421cbc311e4ccb248c0c185ed67671d2c45f748 SHA512 75d5899e1ec47e05f7826c338fce9f52aa625f47b88b55de581df49e0a353e3a0c7655827ca65b517638264b63d4edfd42b6e364f231ab8f06fc8a2b2837d23f WHIRLPOOL 2c970370efead3a8630fa448408d83329bda4b2bddaa2ddc703cf23f3a5b893d2cd78a11078f3ac9c1daef4fdb64735b2aab9d6a6dc211feba0454d987f276d2
+DIST icedtea6-1.13.4.tar.xz 4587000 SHA256 7ca52ac37fe8bd9734ffe3630ef74ba2a22dadcd47cb8eba2b34d906bddb186f SHA512 f02584815b326507bd814f0004f914073854cd82cbc25fa12a287108609fa09f4e98e7692f5586234cf6210d2b5d7176681d0cee31913d6d45a81640c8f114b1 WHIRLPOOL e82eeca57e913609bc2fed5e8f6ad4013fa6856880ab2afad2938ae3d40ef063c4afdb7da261e50ae2e8adc6548f0d354d6acd48dbad1fdbb48ddd634777a816
 DIST openjdk-6-src-b27-26_oct_2012.tar.gz 45789350 SHA256 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 SHA512 4198f11b2f49c9bc5ffbeadf2d0d87dfa413a918d49faff3a043266bf4a2fa99579fba3c6d75164d87e88b8fc5c97c3c1527560eb25c55cdd42ad813c8e175e8 WHIRLPOOL 5038258710f2c0eac1a5a1957629998d931d49a6145450485b84e21988d8fdfa5127dc0852067319fb2ac054f621ec511c0d8e01961943c7e4a223049317b894
 DIST openjdk-6-src-b31-15_apr_2014.tar.xz 33245892 SHA256 362d9bf20e91393b52dd0513896d39831cf320c49bd4bf1e28124f21569b72eb SHA512 30156721f0dd111e2f70193ce093c64fb8c4e6ace966163067a77276143bc205a878d91cf60464b3203276ff2b5349b3c5542e86b35e4d61f23a785b1910e951 WHIRLPOOL bb4a6eb700aa06233cc753394afb750b597d65f6a83ce902d37bd72e8455d689f0a5551f2cb0c2b72b29eb04f68ef2aae4aabf7cf04cc2d339bf3111c2bae8ba
+DIST openjdk-6-src-b32-15_jul_2014.tar.xz 33267124 SHA256 9a5ad1b599953baac1b6b34189b9487ac5dcdb367aac5cc0aa5aa49700e73871 SHA512 dc565c31dd0320fc3fb9f051fe69ed078d2533311fb5d32d69b6cb081f872a08a704a88ce889382da1362c70db37ec90c1336ba901ae4a4461a0a13b560948f9 WHIRLPOOL 16feed91a6d629d1cf3c3adb07f1e384698e61dab9606846edee85a48a9fa93f8966b237fe9cb3267dd3ecec3a72ad3c57e756f368e40c3dd71be574e6fd7aad
 EBUILD icedtea-6.1.12.7.ebuild 9709 SHA256 a0b7ea8140dbc490ce4496c3c2c982c9f2b4e019ef066862a65546188a4f63c8 SHA512 8f371ab0215cbfc93e97e7a7eb89ba22f9369fc13817769cb0480acaf063475eca7d0642e674f64567f1f711fe1eea446172ff8a84689fbfcd47be298d136234 WHIRLPOOL 232803048d55304fc4055c580b81d5be253cb98f1231ddd941c9da5f4a9a660e8d4efcb71b2ca5d1689dd4b88dd89f0be80cdaefed0d88c9ba2724a3ced76853
 EBUILD icedtea-6.1.13.3.ebuild 9978 SHA256 b8790b544a3f1a7fa716ec812df50ce78df00b9d612780a733860001c2373c2c SHA512 0bf00c1f50cc2da0267fdfded3f677071da4776bbf6dab64e1129e86dea57eebda7e2e1020e97d1987a614ef96b13204f47da3e90996a98e9d924edb3f787b46 WHIRLPOOL 6939394fd0c5936da7b1986b485f464a77ea536d357e8e623e9ddea02b432d3ac231a2bf14be988de6bd6f1192f8066d8c0083668c03f6d481f186a898decc0b
+EBUILD icedtea-6.1.13.4.ebuild 9994 SHA256 99bb94144a9162be53f1ccc016c2aa23caac428ab48dcc490d0814fa4634e423 SHA512 dc19a895e26afcf855a69e073b4010eac3433b9503267a4780cfc3ff47327415970bac0f4565a01bc0aadd952aa14be73b050d5e21c464e071e8fb961732fd5a WHIRLPOOL 9da4f1ed329d44b01d221214e6fcc96345c97f67409911448c27dc3582fb87cd93893c3e464c076aad2633f51ae5a7497767fa4d6905ce53b7cd31119517fe7f
 EBUILD icedtea-7.2.4.3.ebuild 12277 SHA256 84f48b7f5c77cab4de6d21a3279f69827099a2415f3557f803752e510d6f5991 SHA512 dc0968885402fc5a2faa480e88cc4583b36ce1644d34242136bc127f4ac5d39bc10fba16054446ef6a78e6b6b898a2b83321de2f8f0cd92a9c782569556e00b3 WHIRLPOOL cdd697d0701e7863915d79ceabe794c11644e46fd62bfbab7faaa164f7a347bcedf0181f3852418bef832cd69280a3cec070b7b5c07c2fcb82b7e531e4cc7b3a
 EBUILD icedtea-7.2.4.7.ebuild 12176 SHA256 fbb3f853dd2cb0d23289fd4ffa0148ea924c383a5ecae594e7d7826f4afe6290 SHA512 2c71bf3549ad8a0807a9375e45755373775f07f676bf91c9592ec9228e6335e1a444202f0cce11fa5d1a29ffd04d9ade5e994b1286aa152bb347d92f5ea7deca WHIRLPOOL 52f436bf377aa4ad6cd918e7898c53e967935bccb99664c50e3fc8a2f90d43505d33a591c270fff921cfc6d1e5040587c6139ab2c7631c08309fbf100158d01b
-MISC ChangeLog 27368 SHA256 571e1c11600ffc7b6f01dce1a6ae286f6727e962e663c8b9adf692647df4fb23 SHA512 7dc75a813553f8ddf2989de054d8fdb0394528eaef9bd93052c65bf01a7c33a47794b0d3a65ded178392e96c1cf8b9c90e15b066300423f2117ec2a2ce180f93 WHIRLPOOL 2075114327147d561019379740342e798b162eeedf98b464a2c39dc136aa1a6b6036358adb4f3b55fe99e59cedc060fc55dcd97886af662d29ff42876caac379
+EBUILD icedtea-7.2.4.8.ebuild 12192 SHA256 de10da430a55842d06235e2d70d2abd794159c12572da91fdb151bf0a155eb84 SHA512 194583d26e39b4f43527c6930807de369e5435af8097ebade733ed9cde02ec3a6953bdf0ba449da52f650d0fab1da1b5a5b86871f7d4a85d99f3b5c0ee9de6cf WHIRLPOOL c1c667e43d0f5a0fc4def861231c17187e7b8fb5973b336c5ac9109245cd16d30e3fbe5f63af3126931234ae181f709ced6601e9ba138dc7982355a138f68a62
+MISC ChangeLog 27566 SHA256 571708676d2d4d7811dd4f79b4defb670dab6d311d27032453a24cf98a62c9d2 SHA512 7fd96eac8da04d46ff91c1df575801e5dc1fa2a2b239c7a8fae66435795592d6094de13e2cec00404ed9992d213d14c2ddb2abfb95de7f939971be3866180783 WHIRLPOOL 3427c8e4c4fa6387d95a1b34592eb2ddff9b182b0380368448cf2963aecc441ba5b561a8f55af2ee7d04b28d8c4936efc5d6fdc6d53be18b149983ce24c919f5
 MISC metadata.xml 1697 SHA256 072ba241df325444a11bffa9a6df4982f5c8f1a18b5a1e872cf87ccfc74c4f1a SHA512 378474e1c7a443e3f0b4d027c117fd2a3d4f12085cfa0b2fc86ff67009f0e40eac8cefe6400db5b8e99abc2d23a0e8a78b93ef4689e5164bfa6396d7b5548cce WHIRLPOOL ea6ce7ac6f716c613c692c10726c4a9b96a982a4e7cf422c8e9aefc6c0f0a14ba8194d9c4ca0a74b55794f517633e2ce795d10d7139304e03117ec4393cc5ad3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREKAAYFAlQxyf0ACgkQtbrAj05h3oRGSgCfU8qYxJP9XdAJ75vr+ube2D0w
-4n0Anj1NkEaVSDw0L2u08yMQ2OGMNPQZ
-=iNVl
+iEYEAREKAAYFAlQyOm8ACgkQtbrAj05h3oS7nQCfVwV084hQMRNBi8U28ifUKfQB
+n28An3owlmxrQvYG93iqPmtksXbz7r37
+=1/E8
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-6.1.13.4.ebuild b/dev-java/icedtea/icedtea-6.1.13.4.ebuild
new file mode 100644
index 000000000000..60f8406b9e30
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.13.4.ebuild
@@ -0,0 +1,326 @@
+# 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.13.4.ebuild,v 1.1 2014/10/06 06:44:54 caster Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+
+inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+ICEDTEA_BRANCH=$(get_version_component_range 1-3)
+OPENJDK_BUILD="32"
+OPENJDK_DATE="15_jul_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"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.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}
+	https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="6"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin
+	+nss pax_kernel pulseaudio selinux +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: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/libXt"
+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=
+	>=media-libs/lcms-2.5
+	javascript? ( dev-java/rhino:1.6 )
+	kerberos? ( virtual/krb5 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11:= )
+	selinux? ( sec-policy/selinux-java )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# media-fonts/lklug needs ppc ppc64 keywords
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea6
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			!ppc? ( !ppc64? ( media-fonts/lklug ) )
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# !eclipse-ecj-3.7 - bug #392587
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.2
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	virtual/pkgconfig
+	sys-apps/lsb-release
+	${X_DEPEND}
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( || (
+			dev-java/icedtea-web:0
+			>=dev-java/icedtea-web-1.3.2:6
+		) )
+		nsplugin? ( || (
+			dev-java/icedtea-web:0[nsplugin]
+			>=dev-java/icedtea-web-1.3.2:6[nsplugin]
+		) )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+java_prepare() {
+	# 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 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="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--disable-downloading --disable-Werror \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh")
+}
+
+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
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+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-7.2.4.8.ebuild b/dev-java/icedtea/icedtea-7.2.4.8.ebuild
new file mode 100644
index 000000000000..08ee784b3e71
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.4.8.ebuild
@@ -0,0 +1,376 @@
+# 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.4.8.ebuild,v 1.1 2014/10/06 06:44:54 caster Exp $
+# Build written by Andrew John Hughes (gnu_andrew@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="58b31c5bf14e.tar.gz"
+JAXP_TARBALL="95d394340fda.tar.gz"
+JAXWS_TARBALL="bce4362b2996.tar.gz"
+JDK_TARBALL="22d79652f370.tar.gz"
+LANGTOOLS_TARBALL="43cdaf529543.tar.gz"
+OPENJDK_TARBALL="2b38d8f0e43f.tar.gz"
+HOTSPOT_TARBALL="6f93cec20d27.tar.gz"
+CACAO_TARBALL="e215e36be9fc.tar.gz"
+JAMVM_TARBALL="jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.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 cacao cjk +cups debug doc examples jamvm javascript +jbootstrap kerberos +nsplugin
+	+nss pax_kernel pulseaudio selinux +source 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/libXt
+	>=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:= )
+	selinux? ( sec-policy/selinux-java )
+	kerberos? ( virtual/krb5 )
+	>=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-java/ant-core-1.8.2
+	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:0[icedtea7]
+			>=dev-java/icedtea-web-1.3.2:7
+		) )
+		nsplugin? ( || (
+			dev-java/icedtea-web:0[icedtea7,nsplugin]
+			>=dev-java/icedtea-web-1.3.2:7[nsplugin]
+		) )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-7 icedtea-bin-7 icedtea7
+		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"
+}
+
+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
+		bootstrap="enable"
+	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
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes";
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO
+	if ! has "${ARCH}" amd64 sparc x86 ; then
+		if has "${ARCH}" ppc ppc64 arm ; then
+			use_cacao="yes";
+		else
+			use_zero="yes";
+		fi
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		cacao_config="--enable-cacao";
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO 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 \
+		--enable-system-lcms \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable jamvm) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		${zero_config} ${cacao_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
+}