Version bump requested by Andrew, fix bug #500176 readding dev-java/ant-core as DEPEND

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

5 files changed, 434 insertions, 16 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 82e58f68cfc9..845c2d277c14 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.117 2014/04/06 12:50:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.118 2014/04/06 13:30:21 ago Exp $
+
+*icedtea-7.2.4.6 (06 Apr 2014)
+
+  06 Apr 2014; Agostino Sarubbo <ago@gentoo.org> +files/icedtea-7-ecj_jar.patch,
+  +icedtea-7.2.4.6.ebuild, metadata.xml:
+  Version bump requested by Andrew, fix bug #500176 readding dev-java/ant-core
+  as DEPEND
 
 *icedtea-6.1.13.2 (06 Apr 2014)
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index cb958047861d..2f9ddba3d98a 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -3,27 +3,36 @@ Hash: SHA256
 
 AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19
 AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619
+AUX icedtea-7-ecj_jar.patch 718 SHA256 e01eef0e5b99a3ab9dd596c0f347d9ac93877bffcc4b37899c543e115bc2a841 SHA512 79bad0e1e518482d1b5faeb30dfa7fdc60f1ebd306773afdfdc8ebc98c1cf3770a4bd2b70628f20e822ad23c1e9fdf4bbdb66db9c29e26c431df93eb8d712663 WHIRLPOOL 505d999e31d2f0b79df9b30bf20fe0d5c2fd4e5602f0a1231e9a4afddd112e6613980c1ef1ff773d30c1b0b07ba21e3b20d645149a16d9ec1120650959dd9383
 AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258
 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-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-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-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-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-jdk-7958751eb9ef.tar.gz 45252720 SHA256 4df06346d197180bbb9d182e3ebc9ab6386562199d9898d057d0df75566349fe SHA512 6c54d69e4afe65ce4738d30254a71bed1ac6c028a752d8be2310cb9d06b6d5a77db357c838b6df5246624f7f0168c5224c9ce260de4f49c6b92ae8b4e9413f84 WHIRLPOOL eefdcf720bcdccdecb4166bcfdbb3d81d28c2b2a2def00f01813cf9c9d314f75bef8b32eba66252f31bdb1396f320af0b5004c63e5cf70dd8bcbde0350d79d52
 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-dabd37b7e295.tar.gz 2299222 SHA256 86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f SHA512 f6b650431f20758b0f17bc2760e1426e622def620fff80874146e865e2d87d2ce265926c20282489a245df575a87618265dd83a3eb3d8443938f175a89f2c302 WHIRLPOOL 6680ee66f26a85c7aeaa68fc86f9f071a4b77316ddac28c04408be094365b9ad41d61f1867db4f538ea20e596b7905e98323eb0ff7d80a9171529b836d6e396b
 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-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
@@ -36,22 +45,23 @@ EBUILD icedtea-6.1.13.1.ebuild 9759 SHA256 4b7b6b4692842a4b92c32b112783e074ad3dc
 EBUILD icedtea-6.1.13.2.ebuild 9826 SHA256 c73d4c4367c142b014717548aa03439393222ebc31baac00203e0ac2364f48be SHA512 103c1c2dd77a314d62e853880ce407c004d476bda613b06d95b27432c2c51b976ea816e727131087c1dbe8cecfe697dd85f54a4bf545ed86e028afa284176a2f WHIRLPOOL 27f3dc4a7ee392b4666bb59844c577a64192a6e27a8b339747b5d881f1d448aaa87187fa36590ba2df2fce537d9e8886f24903e06f6578a758c9f3d709b944b5
 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
-MISC ChangeLog 25915 SHA256 7b2936115d19e2303481e378ff9ea959d928af2604878304907a887314591fc8 SHA512 90914656a4d9d7fd81662bcc751b7d596ac951ad51358b7136dab661c7e56c4da362c9e85909bd205d9faaff846cee21916f964710c1510d3f4009462915f3aa WHIRLPOOL 513eefabd880a9b89c8ba036b9a5af91224eedd38807224e0fb1d23c6dec0c00e6038391c9ca79e9847b64f2fa51b5fbb8f864a1441e2582c514076ef463c3b7
-MISC metadata.xml 1524 SHA256 bbf85ab93611dba9d16ddb6f9889af231a9420a857b4c2b7360320a53b3dde1b SHA512 e1ab2d668de0086a5bda71a8323da63ae90e233a10df0af3eda9a2f2162a92a65e8a93ab8d752599b12e9b1dbad3776fbd86a01b38c59b9d60ad221c6779ba60 WHIRLPOOL 0ddd7461553ae3612ee53f1403dc66e17ab03428bd6eff7de5e3ad2db3d971cadc8be62b6fa0426733bd7ef5e4da9d2f0a9c04b0a97ede7bb908e14ec5141c01
+EBUILD icedtea-7.2.4.6.ebuild 12079 SHA256 20353d26b568e7d909d96a1a0650944682e708de8dcc35cd3efb6ebacad5d936 SHA512 63cc2c432dfa8c95e0ba44f5ea6000423de1d4f51d8645f27989101bca229f8aedb5b2a36def41e14b9b3a130c89076cf9527652fe04dbe688a4b6c7b752022b WHIRLPOOL 7db7dad6b5e8ff042c5b3444557e3500601456ce92449864389ea842c9f657d2f2226a366e09006b79bb6f975bca129e8b43142f8cc5c29772604b14a4df35a4
+MISC ChangeLog 26161 SHA256 360be40f1f855405d6f064434d380beb5ea64ce3363304c5c22c45b596aa68be SHA512 430e7bf96e8e620156c11ead704549659358cbd19b278247cdf510a6e47e235df5cef4be527bde3e39211a462163b34cd039018127be0b4185bd3b5faf8d4e36 WHIRLPOOL aa2f67af53c0289e32ff576f7230831931021a997fdd3fbd6407c697487270935c5fe7fdb2059ee30b3332283d22b5d04d40adb52c430ec9501ffba2e2804a27
+MISC metadata.xml 1697 SHA256 072ba241df325444a11bffa9a6df4982f5c8f1a18b5a1e872cf87ccfc74c4f1a SHA512 378474e1c7a443e3f0b4d027c117fd2a3d4f12085cfa0b2fc86ff67009f0e40eac8cefe6400db5b8e99abc2d23a0e8a78b93ef4689e5164bfa6396d7b5548cce WHIRLPOOL ea6ce7ac6f716c613c692c10726c4a9b96a982a4e7cf422c8e9aefc6c0f0a14ba8194d9c4ca0a74b55794f517633e2ce795d10d7139304e03117ec4393cc5ad3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTQU2OAAoJELp701BxlEWf3FsP/1CTx3m81m770f8H/lgW998E
-8p4wTKpnsRvJWkpromrv4upQ9UDjjg3J8NSgnYubnPw9D3tXjElq5d7KCx/6X+VA
-NQF+Ic8xspXOUCCGgL/oeuhnhw1tf2x9H6IE2+uWAgbCUVrKO/Ykpn0qz96qYaM9
-xH9jtRL21/v4NXMtucL9f9rOxh2IirbuXr4u/QXQs45hWj5NlR4eICYRtSV2S4dH
-65MA+fjVYCc7iloSXP/XorhvBHHs4eHIBOlVXCLgH54DzE32eF4MobstsmD2ogfl
-+Eyaai/jbY3GC8uWWilSN8gfriSgJsbmmV6+dazj5HUfEHmdFNeGKKnMpLnBhYZU
-W78Koa/mU9Ers4pJIPoCIGSleQZNI861mazRv7D6WHLKJqNCUbv2d6f3mKGlVJC6
-JEmrnKqev3ttha9qlJ4RRnjFQxHp9nMiNt7YNgJ9opeOLCQEonas5B8TDjasSsJl
-6qqMZu1hi0A4Lw2sU/oKVAsfzlu2MJ0w/gGHghl9MSlgWcAfNrrJWNC/M8lGMICX
-yUPy8V9f39PbCOLOF0gCGPn8/XtygXf3AsrqCZB7+e8ghgXGb09hgJ1B8WRjxyCL
-YKIqT3dDEi4U2uH3talbsnGb3VVaYJR4qnAFYY/BWqM2nAA+WK9LciA40fv3RKy4
-f+j5nSOAwWpKjVlrYlIl
-=aLen
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/icedtea-7-ecj_jar.patch b/dev-java/icedtea/files/icedtea-7-ecj_jar.patch
new file mode 100644
index 000000000000..0ca1dc195c22
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7-ecj_jar.patch
@@ -0,0 +1,28 @@
+diff -r d2bc83a8ce09 acinclude.m4
+--- a/acinclude.m4	Fri Mar 28 12:27:42 2014 +0000
++++ b/acinclude.m4	Fri Mar 28 15:34:35 2014 +0000
+@@ -134,6 +134,12 @@
+   IT_USING_ECJ
+   IT_WITH_GCJ
+   
++  if test "x${ECJ_JAR}" = "xno"; then
++    if test "x${JAVAC}" = "x"; then
++      AC_MSG_ERROR("No compiler or ecj JAR file was found.")
++    fi
++  fi
++
+   if test x"${GCJ}" != xno ; then
+     JAVAC="${JAVA} -classpath ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main"
+   fi
+@@ -350,11 +356,6 @@
+       fi
+   fi
+   AC_MSG_RESULT(${ECJ_JAR})
+-  if test "x${ECJ_JAR}" = "xno"; then
+-    if test "x${JAVAC}" = "x"; then
+-      AC_MSG_ERROR("No compiler or ecj JAR file was found.")
+-    fi
+-  fi
+   AC_SUBST(ECJ_JAR)
+ ])
+ 
diff --git a/dev-java/icedtea/icedtea-7.2.4.6.ebuild b/dev-java/icedtea/icedtea-7.2.4.6.ebuild
new file mode 100644
index 000000000000..8e88db91cd92
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.4.6.ebuild
@@ -0,0 +1,371 @@
+# 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.6.ebuild,v 1.1 2014/04/06 13:30:21 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 autotools 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="48ef1bb6d120.tar.gz"
+JAXP_TARBALL="e0ba4b9a8b91.tar.gz"
+JAXWS_TARBALL="4bd947cd146b.tar.gz"
+JDK_TARBALL="b5282042aae0.tar.gz"
+LANGTOOLS_TARBALL="06eeb77dac24.tar.gz"
+OPENJDK_TARBALL="b028e58c1b77.tar.gz"
+HOTSPOT_TARBALL="172674e0ab65.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-1.9.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: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"
+
+	epatch "${FILESDIR}/${PN}-${SLOT}-ecj_jar.patch"
+	eautoreconf
+}
+
+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
+}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 03d394010d4b..f328a1d62ae2 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -19,11 +19,13 @@
   <flag name="alsa">Make alsa buildtime-only dependency.</flag>
   <flag name="cacao">Build CACAO virtual machine on platforms supporting HotSpot. (experimental)</flag>
   <flag name="cups">Make CUPS build-only dependency.</flag>
+  <flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
   <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
   <flag name="nss">Enable NSS security provider support.</flag>
   <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
   <flag name="pax_kernel">For building when running a PaX enabled kernel.</flag>
   <flag name="systemtap">Enable SystemTap probes in HotSpot.</flag>
+  <flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
   <flag name="webstart">Enable Web Start support (via NetX).</flag>
 </use>
 </pkgmetadata>