Version bump to 6.1.13.3 and 7.2.4.7

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x7194459F

4 files changed, 719 insertions, 15 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 845c2d277c14..49b415a52f21 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.118 2014/04/06 13:30:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.119 2014/04/17 08:38:36 ago Exp $
+
+*icedtea-7.2.4.7 (17 Apr 2014)
+*icedtea-6.1.13.3 (17 Apr 2014)
+
+  17 Apr 2014; Agostino Sarubbo <ago@gentoo.org> +icedtea-6.1.13.3.ebuild,
+  +icedtea-7.2.4.7.ebuild:
+  Version bump to 6.1.13.3 and 7.2.4.7
 
 *icedtea-7.2.4.6 (06 Apr 2014)
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 2f9ddba3d98a..3e32c7f888f8 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -11,57 +11,69 @@ DIST icedtea-2.4-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882
 DIST icedtea-2.4-corba-3594dbde270d.tar.gz 1442141 SHA256 d1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d SHA512 06bfd82b188dbfeb2f05bc4fdc8585a9ce66762f835052a8bfe5f4ebc2d4eb90c966bd6766825b9d68b7425a2d7af27311da1f3c7c37ce4a36e81b85745cb447 WHIRLPOOL 4eccb70e42d3c5232aeea74681e4c0e91c160dabdc372b594a30a222326e18db18279ab8e3774fc0ac55a916b854312e578f1e1ef0c3bd4da2d55639b4ce83d8
 DIST icedtea-2.4-corba-48ef1bb6d120.tar.gz 1442170 SHA256 2fcfe699797154da8b4ba5242e32468b2f3f42a0cb17039915bfb1f84887a5b6 SHA512 8035aef58fae33994c5e05b4337b4726a534b2bf6b5b11705b1015ef10abf3ba536f40e79ad55878cf3ec00a5181cccf3c36e8074e7108599df809f01daa7a30 WHIRLPOOL a148570e274139f41a1b138498a0c04fdb3ab446b9054a41d483032f288c5c7257d8982271eaa2ef83433eec7522436fa83d46f5c0966c84d673bd5aeda032a1
 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-172674e0ab65.tar.gz 9735722 SHA256 2aadfe9b1848a619bd2d35f802b3e71ef5286e7822f9e7b02ce2539ca817d9b0 SHA512 5b9c991cad8f0e16880d89aad7d39207020aab541a485f89e398888129e309b96a840d7fe5b28dcf4678f358f05a144aee7a42b44073d5759710ba94902a19bb WHIRLPOOL bedb192261a1a58347186fc9321c828226b878e4088ff84fb4f8865f44d397c9f90cea1a2e79364c6f4912bf2b8ea8f25b02c732f23afafcaa70db9c4a5022c1
 DIST icedtea-2.4-hotspot-2cb58882dac3.tar.gz 9628431 SHA256 d8c1681ae76e660c1888065933cedbbc1309869c7a2fb98f07c424716d5ebaf9 SHA512 c27c90ab523a0cd438d4850e8762e7047478332fbbee0cf61b07214dafff5db9d6d41c95cc165993458c83ffd91458f1b2f0ff7578f34bfe74a1ff912a587127 WHIRLPOOL 5787bdb3e83a20a2e9296d0f4bacb172c89cf27775f8754fc2a2cdfc3e4a6adee4f7b1af9810c97e0e987cc65e557b5a1edc5238b7adf503ad5147896c6fc997
+DIST icedtea-2.4-hotspot-69b542696e5b.tar.gz 9735746 SHA256 e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65 SHA512 6480f7df5f139d5ade06fd949e7daaa258d7a8db972ac36690092fbedb3702b8a92e51d9504d445c6c4ed07fb47e088ccf6efc01b96e292e602eaf8f246b98ed WHIRLPOOL 1343acc29f546fc12a665031a9b9af7c4fa6210c40c08ea2050dbe66c56dfe2624178037ba3d8bf52deb7461aeb12bd1565ab48c7fcefa450c995b0468820487
 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-8fe156ad49e2.tar.gz 3889958 SHA256 0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3 SHA512 5bc6e75482976e014e191a4952b6598a979fb440643916f5de741be8662e6dcdb224ac7dcca848cb80f2181e9d175d7cfa6cc678c1472ec5bec1adf249324815 WHIRLPOOL 3c377bcb871b99b14a343d01644b914952265d9dc66cf6e5e8c2707301db5b0457c0c3041dc8a6856225ff1c7e500eb12dd3d3dae7aa7fa026f7c230dcef3155
+DIST icedtea-2.4-jaxp-94b7e8e0d96f.tar.gz 3889649 SHA256 3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea SHA512 b604b7e52453680a20bd303ffa389f937d9f31bb50016b9b359d39b7f4af6deca6cd1e5b3e13f2d40f0d0c46ae9c0370a31afd30b8cc64c5854020804dd38855 WHIRLPOOL abf4f10153f82f0c6201c60d0eb29445ae908e3881be671fbe733e15e49d42d59a704583d2db53e9b08ebdb5f0fb20a8007df21836772c6039c9097a7841bc9b
 DIST icedtea-2.4-jaxp-e0ba4b9a8b91.tar.gz 3890052 SHA256 e7014057721b8392676bd24760c3f7b3dd40548abb3c8dfbe8df2fa04d7c1fca SHA512 f98b2f8b74018759f0c0affa9b0f50445d9af80123a56388cbed2f6b09f6d347210f623fc34766f5c939518aef04a2fd78276edb6436b6c53df054bf52f31dee WHIRLPOOL 844264c51c87a2da35f94e56d3c7f98eebdd7e924c23b4f4d1aeffc7ac591e5c7814333d3ae22c17cc425c2bbd4814025c85bee37c616d6dc9f5e54810c9b161
 DIST icedtea-2.4-jaxws-32ea8b1ed91a.tar.gz 2769247 SHA256 08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0 SHA512 4eaf5af04e65033ad65b04e5d6dd4c91c007d314230990856abb9a551b54c03dc7c26cb8e2da070558b6d2ff5a1c6d5af53dbc966eda352d873771629aca51a6 WHIRLPOOL 791a500d4076c3c542f00ec41e772bbae53a36bc6043edb64ffe459096ba136a08aa4f7dd972a6f1861ef48c3ce3003c3934c6ff29c9a456e2b10a65690b10a6
 DIST icedtea-2.4-jaxws-4bd947cd146b.tar.gz 2769192 SHA256 17ed5278872ad0c9ec3a849caf1480e5942b714e35c9a4a949d09daac4b34c5a SHA512 b3895d253d5bf09b7fe15b7e030d31edf781c841ae6f897af97dfdff31be6e44d8942feb517ea2daa7a583332260b0076ae9e6578eb6b5ec66e2f2c4a5b5a033 WHIRLPOOL 905ba1118f028f9ca95ba4dec97d8f966bf7094b3e01294f3fe99872dbf2337a8d4ba87743cedfa67e3e903da9f35c60bd487b389b6cdbce3510beedf497e87f
 DIST icedtea-2.4-jaxws-652eb396f959.tar.gz 2763848 SHA256 fb9c22e92c2a056917b7b5dce6905a01ab2e904cbc3c1c6badcc470d22136518 SHA512 83c2cc366bf8a96b1174b42ce4048a5f603e672c8dfe9150c8e70d4d590a702c12365ffc07185d0dcbca918a2e21238211fb42724dabd37dc7db2004a23f0a1d WHIRLPOOL bda9dc09d95ce8604169e263a2cd3dd353791267e0e4540a016b5f78a3cf6274cafc1aaa2a6dee10a89405690c987f9b6a2ed7d8fec5a10a226f7a1535848af4
+DIST icedtea-2.4-jaxws-bd9a50a78d04.tar.gz 2779009 SHA256 3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d SHA512 2a1ccdcdf4f6058649514f98c718a542cbdb5e76e997ad77fbcc1a8a7efdf2f787d04909ef0434af07c97373626b5d439718161defe537eea8a2eb56b5405de5 WHIRLPOOL c6cea6a31e01d160a7490297b143beaa0b9f5e586ab1608a8a8fd9a3207660c4d39abda680154ff56f29b8a14477bdaf850b80e93d9dd354dca665c630a83a94
 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-jdk-9db88c18e114.tar.gz 39949000 SHA256 285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e SHA512 3aeacd02af8263b1168c238045973d57e33aea94a13e95527911f993ffd941423d0db667cd5dd786509c7625ceafdc021cb410573744a93b876a8717d47cfc50 WHIRLPOOL 075f632a800939dc804b850037e26f72428ee086145d81e122404c6c017edbe833fcc42f4bf6942e64be2106da20af40764acbd421f11832482404a773ba5546
 DIST icedtea-2.4-jdk-b5282042aae0.tar.gz 39944139 SHA256 ab9b0e973625604b12a2f027cb2a6f9bc5160ef7df55408da6ca8a9c3aaed2d5 SHA512 601fdbe5d0108892218aeca3e6a060e950accea0d25884301f778418e92b2b5556f43c83bb3fb7076eea6cddb52c39fcc441713a15b9b1ce2acd7ceb73a8dec3 WHIRLPOOL d21b6f0e2cd19afda989e609a19a1b80d337fa698c4819c2ea028d36e027397c54f52a1c45e5cdb13ef851fe71e401d15aeacffb706b6ad596e59aa42218c4f6
 DIST icedtea-2.4-langtools-06eeb77dac24.tar.gz 2299189 SHA256 a67e62618c70ef9190b2aef2b49be9d79624be9363bda258828b17494e092477 SHA512 765be36e2ba36cb448e88bb9c853e439c96ed8f09fd1b73c63b20254b94ba935db4aaef10415d63049b4d18c30dd48a6662f1153e0f21f40a05995df2b00c302 WHIRLPOOL a488dcb7c611ed3c618f410b1eb9b1a6763b70e941e0b645f797f8c0e3c80fed29261e5d4000ad15e53691b76a0fbb6122441e2b0608c3fdcdf5963f11120ae8
 DIST icedtea-2.4-langtools-3c8eb52a32ea.tar.gz 2321300 SHA256 462ad61fd34708c90362f9e3d3c432b9246833ea8ff0d8a14955ae386bce4a91 SHA512 917e313dc897ea8548616ad766bc5b937eafe1219b9ff344c89bee02d3432f21559f6a02027031ff4f6b0957be4e8ea41b3f646f86a09d7f1ebe809639896b95 WHIRLPOOL 0d0b4a973d6e334176790190e467cfb8f9096119fcab8f63d4aa3689b3bd434db4de842dfe7ec4dfce819028e07df1491fc43c4825a75f33f46cd8d08de1b981
+DIST icedtea-2.4-langtools-8c26a3c39128.tar.gz 2299228 SHA256 5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b SHA512 96a0d00bc7992d84bec61999e158f9a955233a1a15671a5496fed4fd270b40b6526bb11dc70e1e5c85f2fdbdf0df06efd3e805c910d2b7410d78c9c4fe78da8a WHIRLPOOL 0d03d1ecd2789e5b97500a7bcc3ed8ebca484c64b2d0b94989acf551314e3a3df3979f2aa57a78109b62f3ce47ce43aa23b8547395227fe979128b0f7fd5b3f2
 DIST icedtea-2.4-langtools-dabd37b7e295.tar.gz 2299222 SHA256 86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f SHA512 f6b650431f20758b0f17bc2760e1426e622def620fff80874146e865e2d87d2ce265926c20282489a245df575a87618265dd83a3eb3d8443938f175a89f2c302 WHIRLPOOL 6680ee66f26a85c7aeaa68fc86f9f071a4b77316ddac28c04408be094365b9ad41d61f1867db4f538ea20e596b7905e98323eb0ff7d80a9171529b836d6e396b
+DIST icedtea-2.4-openjdk-13970e76b784.tar.gz 137938 SHA256 bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b SHA512 3898815c8c7b99e8b25d710f48ef25d9e0a5ac2c332ce3c1f870b30bfe1198492029767b75f0f8cb85f6b55e2432b14e8c71b0ceab0d25e6c047bfcde766a6f5 WHIRLPOOL d9f0250f3e527aa9898933911c5059fd7d4f0821184f8a216c02afeeb4179f770372631c344bb6ef9d814e07e21e024259355dc317126f1b23ee6e4fabbf3096
 DIST icedtea-2.4-openjdk-410eb7fef869.tar.gz 137063 SHA256 2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707 SHA512 135a87d7831d5803b495d8908cab13d9f87134a3eb696684b27aea7fc1ef35677594d4037b44f19b317300555d42c05a569a3a3928458e9787f34cbcf8fce300 WHIRLPOOL c03bef503cf6ebd1eec165eb73d33cf9eb208487d52fe87921d503c6ee1be424afd6717efd9c0655409facc675f8056347d0f51db4561f2b188145051a501be6
 DIST icedtea-2.4-openjdk-b028e58c1b77.tar.gz 137171 SHA256 e6be030ac5934781d9682dc3108980fa7d2330c32da3cea4ae74df11fbaa92f2 SHA512 2993693d49c0694345407ed3f604ef2acb2ebced4dd4ba0f26a33b28fe169de820d0ba9124f88f7a8eaa98b1fbb714cc54be282293e93cb660e4bea77a400d83 WHIRLPOOL 3070cd39f64105ab5c0bab945b751c5dd0c46dd8917fa5b7716de3854e37129a58d6892d78be0f40ac9d77a34069cfd52626c7c002a0f5afc3bad51881c988e7
 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.5.tar.xz 3420624 SHA256 d3f96413c77efa400947d1c5e85bb55fdb0c36d0adb8802f0ca2b283855d305b SHA512 6a499bcffd68b2cf41aead93178057d23d89d554e89765e3041ce6cd494f7097e6cb5358b6718199b17cf86486b65868e86be6f0b3fc0d83f3ff8568a931a41f WHIRLPOOL c210fec92422ad98510d06e42ac3daca11cc8feef16a9671a4be929bb3c08ea114f2599f7aadce9d6c8d8cc3b82da30d19915359a1423cf1c5a1a6ad1c18b233
 DIST icedtea-2.4.6.tar.xz 3418828 SHA256 c333bcaba46d8684b5ac727486d8b935ac77b9ba3cc5da1aad9d8c7422cbfa19 SHA512 cb414d4386184a97caad4b56e5222461eda09172d7f316e92e9c8356ff5235821b75a37b9719322c4723fae3de4d35787b031aa00a4099b2824e13afceda0e06 WHIRLPOOL 3b5a26d5ecfe56ee1bb8250d494244dba75f6550c09409d84ea8911e3d69bab6971906a96172dedc57980605e87022afaf4e2dfcde55a43a49dd7fae5e5b71f1
+DIST icedtea-2.4.7.tar.xz 3419144 SHA256 b66973bef7808f8fb03be64e44d312ea2d13590a68a6a4e6690dbcdd1947459d SHA512 d252c06271693d6a3524b0678e4f75bf1fa5970501bce181de3dca701582a7c178a17b569d10caf130262c7110e60ba3d874f405bbd458d861d24cfe73df465d WHIRLPOOL 5fd01d01d1d84763bbfb4ddb407c7eea4f9c832b54844576f56982adb4f7b29c6d703b38e878308cb6277468e47ab831d1bc9acb61adf513e3ef957ca1d0b355
 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.1.tar.xz 4963036 SHA256 5b2fe75660282889217fe997e9c8f9e70982f2c72fc2ca59db80e7da7380d7c1 SHA512 0406eecfe0e22942a3b709826a6311f8efa9a1b80fbacfbb9cb700ce6870d1ce33bb005798631453b1e7012d802d9347c5a6c70e6b4f29770dd6e64a4fc08a68 WHIRLPOOL dc9bb11637f22d48db762b44f561ffa2eeb5cc12efbfeb3cf38fc23267d0a96dc0fd8f36173b5b90ac38c808301c7b34df7a0dcb539416f04103bd4ebe7dae0e
 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 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-6.1.12.7.ebuild 9661 SHA256 e87e067f9a12e2c01bf9eea1c33d27449631ded64178c2bf672e29c556b99ef7 SHA512 e0b6fbe1deb970097d2fd858b95c41eb3a22b328cb62c33c5ef19a73206463f0700c098c9ffafb0f88743aed2b6dd953a7ba3ee8b6e9959878048f1f1d90130e WHIRLPOOL 69d760b00d5c62deb44bf26b81e85ceb231f7d59d299087e2fd6b06ff4d965a11e3cf814d03578fe3afe103e700c5e6b8c0cf4f247e2101dc452f400ca72c4a9
 EBUILD icedtea-6.1.13.1.ebuild 9759 SHA256 4b7b6b4692842a4b92c32b112783e074ad3dcf168f8de22527ce574bac019f2f SHA512 3cf587386357144c7b1c4fafd90cc0732ae039b14a5115fa49a862b84cc65cdf8397b8163d87b9d8dde063e196c20879b51aa5ce7a6e7b21b7ba9a48c080c70a WHIRLPOOL 66d6097dc1ec6aa1e7667f97e71cce47beb6ef49b168826ded5b014a4ee89b714f37ac3cb62d43233ec82cee67448311195be585ec327bed82a2766af352dd22
 EBUILD icedtea-6.1.13.2.ebuild 9826 SHA256 c73d4c4367c142b014717548aa03439393222ebc31baac00203e0ac2364f48be SHA512 103c1c2dd77a314d62e853880ce407c004d476bda613b06d95b27432c2c51b976ea816e727131087c1dbe8cecfe697dd85f54a4bf545ed86e028afa284176a2f WHIRLPOOL 27f3dc4a7ee392b4666bb59844c577a64192a6e27a8b339747b5d881f1d448aaa87187fa36590ba2df2fce537d9e8886f24903e06f6578a758c9f3d709b944b5
+EBUILD icedtea-6.1.13.3.ebuild 9799 SHA256 db56cc6161f16e8e257fcef5f6a7852466a547908be9252fed0e02bacd16792b SHA512 6975f581fd211d1f1865ca00a1283cb86667261097a5cd92ab29162175bc0f1694b12d6cebd8a047adf98d7d95cd60bf5dd70e64d7ebfe8b768bd9002002b97d WHIRLPOOL 36f9b5971620992fc49bca9c441d4ff22d9a120964c131f93c1434b4678fde2b865d273a89a4822cfe95f9d1a769dbe0d7d51fdc26fb5b71eec3213e9566dff0
 EBUILD icedtea-7.2.4.3.ebuild 12225 SHA256 456cb3c62ce2bf07aa5335f306c8e0e02c7324f53938931b6b3e9d5656d2da8a SHA512 328c378160a81313f552051a9e4e3a405a7b6a064722d238ed0887dd46ded512b37edecc1ebc4d611dfe627148115177ff427154d5b763e1f55f3b24e567b3d4 WHIRLPOOL d675c21a6fbcee44d61f1765d32b5a41af36f90aa49bea78ee058ffd5e339aa4eb9094998f3781db0c0fbec806323f0baf0a7fd6610203507bda301d0e7e684f
 EBUILD icedtea-7.2.4.5.ebuild 11866 SHA256 ed084d2c0ee4395bcb6e6d886c79810f3d740cadc8073987e099d15ac82a8734 SHA512 ac4c0cd099f55acadfd70caa16ecc9eea9d1bb3604b154af8a6382ed0cf98bb6bb669dcb4d85c6c20af26add9a912d78d809716556e88205a9ff34bab1c178c4 WHIRLPOOL 53c2a36f13125bf086e92df3ce0e9fa7cef9131f1bf8834688106239b8f4286c761b87d58a993cd6103c7e056f8f9736ea76f9ef1e1f9097773ea540277b3b64
 EBUILD icedtea-7.2.4.6.ebuild 12079 SHA256 20353d26b568e7d909d96a1a0650944682e708de8dcc35cd3efb6ebacad5d936 SHA512 63cc2c432dfa8c95e0ba44f5ea6000423de1d4f51d8645f27989101bca229f8aedb5b2a36def41e14b9b3a130c89076cf9527652fe04dbe688a4b6c7b752022b WHIRLPOOL 7db7dad6b5e8ff042c5b3444557e3500601456ce92449864389ea842c9f657d2f2226a366e09006b79bb6f975bca129e8b43142f8cc5c29772604b14a4df35a4
-MISC ChangeLog 26161 SHA256 360be40f1f855405d6f064434d380beb5ea64ce3363304c5c22c45b596aa68be SHA512 430e7bf96e8e620156c11ead704549659358cbd19b278247cdf510a6e47e235df5cef4be527bde3e39211a462163b34cd039018127be0b4185bd3b5faf8d4e36 WHIRLPOOL aa2f67af53c0289e32ff576f7230831931021a997fdd3fbd6407c697487270935c5fe7fdb2059ee30b3332283d22b5d04d40adb52c430ec9501ffba2e2804a27
+EBUILD icedtea-7.2.4.7.ebuild 11997 SHA256 8b6b46eedbd63d44e8300bb3f33667907c78eaa59a5a7e34325e6dfe2821b994 SHA512 1cb17c651bccf31359a98e93a018fb1cec5fba3148b7f8265a7d2512d34ba5cd991a20cd37ff0b8066810cf509fc7e29024e9f4133d8834530b0f6ca69bfb9fd WHIRLPOOL 3fc37651b0856905a63af03ea46d801e25243855fe7cb54bb188b2fb6f438a7f2497eb2e2f0ec402e745345185a7ec277ca2e1787c4a558204d1c84c5ca0cc7b
+MISC ChangeLog 26367 SHA256 46b5bc2e3d1fbd98ea596347ffa22cf2ef0a08b117bc77dfdfaf0f88b5a74713 SHA512 ccf41cec281198082e588392530068e74592c5e77ea72311b48120f0571a1dde40df604f023be83370ead669ba99d746d17d6cc91cf30c297ad366fabbf2482c WHIRLPOOL 2559412ddcf69a6bf49bdb7f5271167764b00fb39e6cf063f01a8c0017fa1a2f2c477cf9aa5c213d762870f19f77b1152ca406cb12038a4920eb3e6aa0fffca1
 MISC metadata.xml 1697 SHA256 072ba241df325444a11bffa9a6df4982f5c8f1a18b5a1e872cf87ccfc74c4f1a SHA512 378474e1c7a443e3f0b4d027c117fd2a3d4f12085cfa0b2fc86ff67009f0e40eac8cefe6400db5b8e99abc2d23a0e8a78b93ef4689e5164bfa6396d7b5548cce WHIRLPOOL ea6ce7ac6f716c613c692c10726c4a9b96a982a4e7cf422c8e9aefc6c0f0a14ba8194d9c4ca0a74b55794f517633e2ce795d10d7139304e03117ec4393cc5ad3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTQVbuAAoJELp701BxlEWf5zYQAI0Oaj7+SZzk8HxTvgAkdkzv
-97Fmw14p696kBlJpAncsoUoQ8DrzsTzDEQMro/KU0FwnDwAG8CeqGP1VanKQCeda
-/3TRWqGwIwrd1i/hEEUVEi+uAt7L/ZMp+hWCM8iCUcSPJVePV5oGR/phRdFZ3kjc
-BKlTOoWLVrfiRJs+aiHeYrP4+cN2HY3jUlH0ilezv/NGqhIp5fNoRDqmF8XnDhtX
-qcT+yMy/JJnmuD/TnpYAjdA2kbgnMrO7ocEGYYS8RhZy+cP4z9Ts+ALD17L+PXSh
-TMia9Moj4/tDdGreUCRVa8L9m7s6uyK0HHKPfMRVf+A2Xib9DikYOYQJ3t9Z5Jcc
-tQ6ArAZt13tvu7/8WGfYhZtuWjfPQ+ndZSHYClf1Add2xBMAoX753SPoAX3iStAv
-pnelvGZPdCkLcgxU2ZbbTl+NnWFlVSM76WoUJaaYC1XM8ljI80UvDktv9gcNTDF8
-bjU860DY7mm7+3Jon0UAHfoIN7QLaIX5ZUFfnQSLa2PrNPL9A3kXrm5+YaxVx9d/
-9pzSZXfLQ0QfJli02RVeGNHyj1TmirmGJPar1f0E2FYShTMP0sXoVyB92Qm/KMXw
-TXwoDgI19svfCF7MCJ2nS/UJTEduukZ1l73MmA2ElyxFnUVZ+e5knZQyHh8InXAq
-1fl431nf7BrU+7HFKrrv
-=Ddvo
+iQIcBAEBCAAGBQJTT5MNAAoJELp701BxlEWfn2EP/2VUUQ4apq8bg9P+sTgQuao8
+lmA9XbPKrhYJj1du/2q3fngiNLsg3zaoOL6WnJQKbSHZa9uLnmw1AEIIu7pAVJZ3
+o1ESpVKBzBQq2j+URg67TEgllNzCPmEO1EmqHdp4CAJaVdCS/LyEnzTXE7ghr4No
+xCEn7HTiEg8Jxr2zTfs7+1+GViU3bGFFej/ARiKuoK9XTmxa+NF9ZsXzWDbGkTVz
+qobPRJYVd3ZsYyLT0PbRWrCy+mS4Mm3fjRhYeHir4fosSb2pqdGJYIynkxU8Zbvy
+yOrjQM/gtuwu4t3AfPwkCX5UwhWIm6WZEJ17cnALxwVaqSMSry5LxC+2cOzkOQIu
+twXy1XSSnCO1BVHa2hxIRjVXspCZZRPH3Qd8MY36qpWlfaTXvE6RSGVmScXqv9e8
+W6H1fkiQkVSIxwREihbvOjcaY4friLDJLJwLCfwQsTSLJ92pS6QMWWd10KpXvTck
+53i09zvpqLBSvXamEWr5MyrNd8XzvRg1kwLCgcAGSkRKn5XWo8LPId6R1jq7UIgD
++h+boXE/Db2iSB6YLzxE8OaTawT27EhCn7MdNmqmT4T8Qaioc9vQdC0Xdx5Mntqn
+wzzcenlFk9H8Iv/4hyXOMh4FHesvHEpdpd11s+RDnznVtYDA3pUAwCytRBQuCWJ3
+YC4WrAIvZVOZPzXczDiw
+=cGCu
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-6.1.13.3.ebuild b/dev-java/icedtea/icedtea-6.1.13.3.ebuild
new file mode 100644
index 000000000000..2631213ecd0e
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.13.3.ebuild
@@ -0,0 +1,317 @@
+# 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.3.ebuild,v 1.1 2014/04/17 08:38:36 ago 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="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"
+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 +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"
+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:= )
+	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/elfix )"
+
+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() {
+	# 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.7.ebuild b/dev-java/icedtea/icedtea-7.2.4.7.ebuild
new file mode 100644
index 000000000000..485eecfacd1e
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.4.7.ebuild
@@ -0,0 +1,368 @@
+# 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.7.ebuild,v 1.1 2014/04/17 08:38:36 ago 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="e6ad5b912691.tar.gz"
+JAXP_TARBALL="94b7e8e0d96f.tar.gz"
+JAXWS_TARBALL="bd9a50a78d04.tar.gz"
+JDK_TARBALL="9448fff93286.tar.gz"
+LANGTOOLS_TARBALL="8c26a3c39128.tar.gz"
+OPENJDK_TARBALL="13970e76b784.tar.gz"
+HOTSPOT_TARBALL="69b542696e5b.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 +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/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:= )
+	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
+	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-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
+}