Security bump. Imported from java-overlay. #421031

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

12 files changed, 1857 insertions, 10 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index a88b4e2149c5..974d00eebcd6 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.74 2012/06/10 13:56:19 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.75 2012/06/19 20:30:04 sera Exp $
+
+*icedtea-7.2.2.1 (19 Jun 2012)
+*icedtea-7.2.1.1 (19 Jun 2012)
+*icedtea-6.1.11.3 (19 Jun 2012)
+
+  19 Jun 2012; Ralph Sennhauser <sera@gentoo.org> +icedtea-6.1.11.3.ebuild,
+  +files/icedtea-6-pass_javac_memory_args_to_vm.patch,
+  +files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch,
+  +files/icedtea-7-compile_for_7_cacao_mem.patch, +icedtea-7.2.1.1.ebuild,
+  +files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch, +icedtea-7.2.2.1.ebuild,
+  +files/icedtea-7-compiler_detection_cleanup.patch,
+  +files/icedtea-7-no_suffix.patch, metadata.xml:
+  Security bump. Imported from java-overlay. #421031
 
 *icedtea-7.2.2 (10 Jun 2012)
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 007be3f5d225..ee1724fb923a 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -3,42 +3,63 @@ Hash: SHA1
 
 AUX fontconfig.Gentoo.properties.src 15602 RMD160 d5ae1cb403072b630c126a908d14b5b462e1514f SHA1 04af30bfae3decf6fdb51187a07bf75fb04a83f0 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647
 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
+AUX icedtea-6-pass_javac_memory_args_to_vm.patch 2953 RMD160 1a7d83594b05c9e3560aaf634db46cea0ab1115a SHA1 6c2f07d14d1a2f48b10e1c2403f5438b2ef2c2c1 SHA256 39f2b68fea43923f88a6e1e4b8fe51735441e783da9cf2bbc9c95f4dea483763
 AUX icedtea-6.1.11.1-cacao_jvm.cfg.patch 5157 RMD160 37035f173e95b407896379f466d13b4edf74f822 SHA1 0e2e89f97a338cb62f6cff0c68f6a703253ce26e SHA256 2e62441cd0e19adc515cda23e726a5b533ef1b7efbf860490e55d535f0de34a8
 AUX icedtea-6_pax_kernel_support.patch 4152 RMD160 a1800e5985d90db6e4827b0bea784cb034962c69 SHA1 625177d004e57cad81d522d1436aaa33dba45a6a SHA256 4a6f3462e9dd47dcc5941dd67a56bbd9ea874dca2a94566f0f38c2d241efeb74
+AUX icedtea-7-compile_for_7_cacao_mem.patch 3414 RMD160 f2557792a3a39be8288626d6ca73a2a1bd45f9e4 SHA1 de71d3d77a6ab4b8b9aca9638db18260af3879ab SHA256 0ace12a18f471ddec1412e4eea999a5b38dca0dd653b2a8f0bc80449380c77eb
+AUX icedtea-7-compiler_detection_cleanup.patch 6833 RMD160 c9f0a6f50f22472fc7feb423da7ef432436d3c37 SHA1 ff0356d043cfe0c5c5ed1b27bd6bfd41548b00d5 SHA256 406fccc762d84cb73bb2ef7f934e770a88d82ead45eed860135b4571a6b3a91a
+AUX icedtea-7-no_suffix.patch 833 RMD160 d3d7b659c9b4de33d8b90cfd82d291d489b2feea SHA1 0b0aa2755d4aaf350d33a5a405974a1e5763dbe8 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8
 AUX icedtea-7.2.0-explicit-gthread.patch 696 RMD160 cda560809998da7925be2da896b34ba60f46b835 SHA1 8764b20bd736ac6c8ca7a061d48b1faac57ee26e SHA256 78e55b212004127726c8f0ab02b8a0a1c01677443237505a21fb803b38e08c55
 AUX icedtea-7.2.0_pax_kernel_support.patch 6511 RMD160 ca6ff5d7f8c1157558af28ef631ed4fd5f67f901 SHA1 538bb29bc10978ae14114cfed525c3905e808984 SHA256 4771937bbb89a92fd77dc5e5945231ae511f284fa368648bb7aa34e0fb48ba9e
+AUX icedtea-7.2.1.1-pr986-cacao_memory_fix.patch 6342 RMD160 cb7a6be3aab4727f97cf3acc0cc0f91f35e481af SHA1 925f723081083c087739f0c3a2dea6a513eb2362 SHA256 5ad35a62ceb49215631d7d91b8e610598110d4b935140c5498b76f9a697cab3f
 AUX icedtea-7.2.2-no_suffix.patch 833 RMD160 d3d7b659c9b4de33d8b90cfd82d291d489b2feea SHA1 0b0aa2755d4aaf350d33a5a405974a1e5763dbe8 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8
+AUX icedtea-7.2.2.1-pr986-cacao_memory_fix.patch 7401 RMD160 d05f499299056f939fd97e34fc01ef8b8becb707 SHA1 5673e1f53ce9cbc1a5fe2649dbce007d41ed870d SHA256 e2060ed9acf9ae9da8943ffec470b09745d758c6c6de8ac06737ea26eef21795
 AUX icedtea.env 1074 RMD160 6806fd80d619c54f6ab50255c12ee2a9920ad72f SHA1 4ddbddd4464fcf11fad45426ba0430818747249d SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8
 DIST 0036fe6fe7dc.tar.gz 3971078 RMD160 d7a3e888cf52fa028c52d503eb6e23637b5ca50c SHA1 bebb3c056e314e650838f1a221782eb8ace8f850 SHA256 245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2
+DIST 0b776ef59474.tar.gz 128861 RMD160 1bdb8e2138e49000a2a25ef7dd2736415493b2a6 SHA1 b0cfb5c99d83db637285bc3c4736612b91488bc5 SHA256 15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe
 DIST 0e651e004747.tar.gz 8994812 RMD160 5101219f10cd0e1f61a37169472f0662876420af SHA1 fe21eabdcb334456907df772a269a21fee8f3c19 SHA256 d68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1
 DIST 1107cfa36f53.tar.gz 2760046 RMD160 d683e012495187b44190f2f3018f2ea9aad3d26e SHA1 341d29940978d27fc0e79741b165844e02fc952f SHA256 f3f00583484532634b400fd49b544da19426f476311cb4338389e0b669dbe18b
 DIST 1cf75c0e2c96.tar.gz 3985855 RMD160 6f6744e49ba87e4d6f1fe3e1533fa2e6122ed74f SHA1 813a9980e74c24395c20b33c14624ffc4f517b35 SHA256 8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e
 DIST 22cc03983e20.tar.gz 129111 RMD160 d4635d4dcf6396b702fcb994c32da57dff1abb6d SHA1 72934269193ca7506b56ff5918d5b39436d883ce SHA256 ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7
 DIST 3231f3e9c517.tar.gz 1449514 RMD160 67c3a7d6b2a6cc3c817ea99c034faaa94231c156 SHA1 32460bc09f7eaad3705fad5550eec0e855a9d07f SHA256 9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274
+DIST 335fb0b059b7.tar.gz 3971488 RMD160 7d718c1ae5ea710f182816a746e7750faffc58cc SHA1 0d77c1564a065f27787ad2920a64ceb628d749ae SHA256 ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd
+DIST 338c21646c76.tar.gz 1447906 RMD160 8bd29c0e1fa229818bb7716d819dda8a3c36823b SHA1 b5c0248e5cc332c7218d9953f529ea9ea74a5ab3 SHA256 10425cbbb439551293a7a96a128f25ce408c38826bef8562f4c2d65d3134a1d3
+DIST 38deb372c569.tar.gz 1450094 RMD160 339e4e6fdf259934f2b173ffcdcd4a4e679eafee SHA1 840ba3a9a17a91c0eec4a7b940c51dfd3711c7d2 SHA256 b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93
 DIST 49a6fc8f712f.tar.gz 128837 RMD160 a34f192a80fec9cd4bca28032617c1c65c7e1eb7 SHA1 ad51a998b2c0dba82c147081911a9e637fc5d73b SHA256 26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54
 DIST 4b063ca7483f.tar.gz 128605 RMD160 e33275719b7bbe814775d3308ad708ba051aaf24 SHA1 e3edd429731ea8506aacf2be02c0f403a4b0cfdd SHA256 095e1d10bc3733f2ff9c7268690395f86f27203bedf7b1ad5e7c9462e9c56027
 DIST 50f6f276a06c.tar.gz 43434230 RMD160 6e6794f2138659f2aff7997a98c7a6e84f80285e SHA1 37cacde8b1028c38e041218b2c39ce83224c9e5f SHA256 5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d
+DIST 5471e01ef43b.tar.gz 2761767 RMD160 a6352e39fdad4d7347287b332eaba4a138560090 SHA1 7c06ae6a6072e644107606254e07292b0582636d SHA256 1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d
 DIST 5617f6c5cc94.tar.gz 1447230 RMD160 2c387ab1711a3d43d2ed04415229fe9f82af366d SHA1 7a068200bada7e30ed9540bb835f8928800a3b28 SHA256 963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3
+DIST 6c3b742b735d.tar.gz 44788667 RMD160 bc12ca529a667c5a4dab7b4484a43e62e1a87313 SHA1 c39f40ebf5fc7f5c5d0afbbe875258cd48041847 SHA256 48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e
+DIST 7a8825b15df6.tar.gz 3986524 RMD160 dcba56052cf5b2142847703e6abf3ab4aac8421e SHA1 7a5150bef5e0d851ba65ed470184354766b3aa8b SHA256 297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2
 DIST 7edfbfe974f2.tar.gz 2760671 RMD160 538c758fedb47e790367311d04cff6d03e549e8a SHA1 02f18a80d6940a8203b361ba848dabf97685266f SHA256 823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa
 DIST 839d0155f7cc.tar.gz 44793871 RMD160 8a96e72b419fd7f1e6e9ea05502beb051210c4a6 SHA1 65f59bbdbc2be4c1683291e0ebd8f494713172a0 SHA256 19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7
+DIST 889dffcf4a54.tar.gz 9363922 RMD160 af216e5931c289bf3140f016aa562c9c6dc6e898 SHA1 54c1cb5b988c39e7290d0f0e91b75176e8094864 SHA256 b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41
 DIST 891fb0050add.tar.gz 43376045 RMD160 5d5515401cb19d02f3b626ddbd1fdcd021dd10a1 SHA1 939e5e06e97e9219f3ea67777f2b889d8150a489 SHA256 0126669a71600514b7a2af5235e43dbebb33dc76090ec5e3c59ed62e52c05e51
+DIST 8b7c4c5f6ba9.tar.gz 9101747 RMD160 1c376d06115e0bf7168a0d44d27db31c68ca668e SHA1 fda8998722cad0e4b31621acd8de1a2ded8ac9fd SHA256 22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2
 DIST 9dfaed4a95e2.tar.gz 8999539 RMD160 ee349541c0af68f0650daf7a170e483ce157a1ca SHA1 ff33c860252c5812451beb9010e48f838e784815 SHA256 0c7a8fde149ab146bd349045d20b6e615c8e811b5c0ab9b3b7a82ce621c91c8b
+DIST a567bcb7f589.tar.gz 4263355 RMD160 4e59c631f551e44c72c157896cd16d6e99085ebf SHA1 f6effe809f51db972efb9ccb1b4a6500afa83f39 SHA256 d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
 DIST abfb890c262a.tar.gz 2761760 RMD160 a6841865af69849feac6df27a486daeaa92b9e91 SHA1 8029e6672f60650d869c0c9c01d1e1a06aa5ca3f SHA256 e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a
 DIST ae891cd6ba73.tar.gz 3985868 RMD160 b71a4a16747544dffcfce2c2858ad22b042562c4 SHA1 888a39202099528925ca81b70474a18ca838ccea SHA256 826fee2432a4e3ad45f348501f1d001f34d004ac36b5e010b5d13433b80d282f
 DIST b534c4c6cd9b.tar.gz 2291346 RMD160 579be2a657a41e26db4371170b52cfbb1f8f3980 SHA1 4d35855d261417bb3ef1363ad7e86621f4a22529 SHA256 c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c
+DIST beea46c7086b.tar.gz 2304058 RMD160 5e5f32d94df980f9fe02054c510e51aced690544 SHA1 ffe6a7943662dba4a1cdc92f41d0d67ec64e4c54 SHA256 17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb
 DIST bfe5efd70bce.tar.gz 9363244 RMD160 8f975424f04952baa6581581945a55951e6e3cb1 SHA1 aacf9af40d5eb4fbbb599988a9caf912ae66f648 SHA256 86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514
 DIST c7bf150bfa46.tar.gz 4210056 RMD160 f0afca5b073dba922eebbbbd6a9be1725ccaf86e SHA1 d192a1f7ba73346c86e71a295587381f8a4b2bce SHA256 73629f5ac9514afbcf63b6cdf58556e889a5f6a22d4bd70de1dd2816c6500aee
 DIST cff92704c4e0.tar.gz 4261719 RMD160 cf01828a98a6e3139ce33761b2b0f87b0ee6ad48 SHA1 043845bfc67f58e30ee68d9a47f33385ab67702b SHA256 dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f
 DIST d37539e7e838.tar.gz 1446780 RMD160 7db6d74d37482428695b342b145eb3997adaf96c SHA1 235bc423864566f12cca85fed0bd436c4588d67b SHA256 6eee28912eea59f64ae05d56303e1027a1684c082d025635b8b3aef01b5c7b0a
+DIST d5ddeffc4651.tar.gz 43435299 RMD160 4d8b1d59619202df606e79d7c0bd781c0dae3b90 SHA1 81f507b0fe4f1f7a8d1850994e20beac1dbd2fd2 SHA256 e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98
 DIST f0f676c5a2c6.tar.gz 8506038 RMD160 e00e7b602758eaa6cfdd04b109d99694ce2ae94c SHA1 bdc450f5a1b75b2445c960f43dbc7f605042a3c8 SHA256 aaa322239c181e50a61ec71869843eee7a0a82a9b80f113d32faf2a59d7ba5c4
 DIST f0faea84413f.tar.gz 2276373 RMD160 8a617a58d9e47ab6f5d239449dbbe3666718e29c SHA1 24fc201a2373d8d4443a0e00d811abd64cdbaa31 SHA256 82cf48bd87dd4da3c1c1dc383605aef0121106880a6d3dcb923572661117087c
 DIST f855bdb37537.tar.gz 2303970 RMD160 365e7ff25e433fdd01b255b2fbcf192a0a516e40 SHA1 f9b758cbb6a45b2cec47379391f765a01af7ae8f SHA256 d46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19
 DIST icedtea-2.0.1.tar.gz 4516686 RMD160 1689c4a1106db57514804a67d3dbc2fbcf19efda SHA1 b81e07b1eefe58e88b9e67b1b36de1750e156144 SHA256 9d3c4d3676c2286003cf9beb9fc3ee442d2c04b3f8b229be140fe636c9e70101
+DIST icedtea-2.1.1.tar.gz 4658834 RMD160 a1c95717e0aa3abed3a6ff987e36ba57253cb4ce SHA1 36b7b3619532dc0512c82af5120c2c1cf9c39cb8 SHA256 4a015cf3fb8fb9aa6b3ce4a41fd9bc5dcb417a1885a10a01e92d0cc7a5ffdc65
 DIST icedtea-2.1.tar.gz 4687722 RMD160 94de5eb942e3ee68dbfcb6d9f6b7992f462e473f SHA1 707fc67bb404e38d36f877bf59055950f3e26066 SHA256 8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6
+DIST icedtea-2.2.1.tar.gz 4715301 RMD160 d8f594baae540bc04409f3f9bed31f20efcdd989 SHA1 eed5822f85b23a6c2dfa36d0b4c7ee03062c71e7 SHA256 0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6
 DIST icedtea-2.2.tar.gz 4749395 RMD160 a5f35fb52302ca2730fc73c9e9debd3a3529fd8c SHA1 996ee8f80675eabdb67533b220eddc0b523a7d78 SHA256 98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5
 DIST icedtea6-1.10.6.tar.gz 6844249 RMD160 4d2c3943071e5e444afcc9e833b42fd3f17d5a07 SHA1 4833760551c8eac347df96676996834c918e1554 SHA256 4bdd8ff2e6a93455425eeabd6c073137bf3816ad16ce6e89979ec1521e03c7f1
 DIST icedtea6-1.11.1.tar.gz 6344427 RMD160 fdcaba8fced7ecd30b17ca351424610e254ff735 SHA1 24c8a6e3f641b626349b8d199880b0a79213a814 SHA256 bafb0e21e1edf5ee22871b13dbc0a8a0d3efd894551fb91d5f59783069b6912c
 DIST icedtea6-1.11.2.tar.gz 6387625 RMD160 299ce2b420e5e6a4e3fd4d59b06b7e0ecf414c26 SHA1 ba3f48aa1569babde049220b3b23bfc49b7f8e71 SHA256 078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5
+DIST icedtea6-1.11.3.tar.gz 6340923 RMD160 b4e16bbb72b8450cc4cfce3d365150854f372ab7 SHA1 29169d9e9a5403ae55dc40fd336859205f01d817 SHA256 7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4
 DIST jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz 293833 RMD160 b34f4684e0c918c36d9fb9316a4ae7737b712296 SHA1 60d5782ccb9707699f9dfbfcf647a5c862ef4691 SHA256 b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a
 DIST jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 RMD160 42b79f51a4f7210436f8dc381e8cc7a8fc356822 SHA1 58965961cf1b928c675fc47599a548c084e39063 SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d
 DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1 4f11f9525a83e7842cbd14cc47d967abde093c27 SHA256 d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
@@ -51,19 +72,22 @@ DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 RMD160 d0e21619c3f287b821da11
 EBUILD icedtea-6.1.10.6.ebuild 10469 RMD160 c8efc9d2bae44803d626862beb7150876817a869 SHA1 7a0054cc305a2dd5301ca18326b8998aa193e8d6 SHA256 7fe885605ca43891b18c572feaf481566c3c947151b1f4b12ccf279c402e7abe
 EBUILD icedtea-6.1.11.1.ebuild 10081 RMD160 5147993a3fc1e6041db2fe2b47e703ddb743affa SHA1 a3129b32fff2d1f1d31a123f7932d2ad8baaa82d SHA256 56d3b2e3865fec52bc8dea63a9352e6d99baea5e7bce3f724db0fd5d92fbc20b
 EBUILD icedtea-6.1.11.2.ebuild 9965 RMD160 7f6708399f88ef3f466771b51d3b5f2fdcfa4416 SHA1 24c82e8fb2e0466a61df24629f63d63bd3afe50f SHA256 33c05dcaa376bcd598eccd3d942f98b854d2c1e8d95c56629b8f282387729366
+EBUILD icedtea-6.1.11.3.ebuild 10603 RMD160 241ded5896f9f0c3ec06ddda0509d59dd21ab9e0 SHA1 b17bda0d51530e2028a2caa48b35d6b1e5bf5d65 SHA256 1eedd898a827d4bc4620718c666d45211155f471c4569bdf0f10236947e87600
 EBUILD icedtea-7.2.0.1.ebuild 10626 RMD160 614163a25b86e1c8db0c884a9da722aced12d9f4 SHA1 bf08d1cfe78746a6937414a0418fb3f7ec7c2d43 SHA256 54de77141237937f30d6d89d28ad8c538ae4a93b7559669e8db27ea1f11d6ca7
+EBUILD icedtea-7.2.1.1.ebuild 11070 RMD160 d53c23730a30796e7f52c633f5972433041ba285 SHA1 28564e432a09708830816dfa24ac5519d0b52742 SHA256 ce5790b41c5218941c29b5a00b368b13856c8caa3b4d84afcbba92f367154248
 EBUILD icedtea-7.2.1.ebuild 10768 RMD160 fb68994569b8beae51acf3bf9c71a86ca3ddac17 SHA1 d3006641de4f5fc7371322d6b5cc28ef23667ea7 SHA256 8dce1934db92cf728673fcfb12462e1e2852c9e5209d286b3bb80d32f551c364
+EBUILD icedtea-7.2.2.1.ebuild 11038 RMD160 6cd9e205ea14f83cb1df95ba56e263951359102c SHA1 f58b6b9367b17f739d79337dc452b8aae77fc929 SHA256 9f38554316bb574f7f4d48020278b01aa8df15c0d62e2a9f63e3485f6946cb12
 EBUILD icedtea-7.2.2.ebuild 10670 RMD160 75b0c1de22c40de033fc9c9f36d4347c0819d3bf SHA1 76346be838c487595a21bb59ba0791f53c563397 SHA256 c05c67f616b5354f09d9aa43a254c15fd56db22dde9a7661d9d86e0a1eee7127
-MISC ChangeLog 16040 RMD160 2d70b54123231b4dd490a25f05efb4f81b2a17da SHA1 d60d8cbe66776b2eb0757f04e3ff6e8771b6874f SHA256 f9df64cbc7ce752f13aee366a9db1acc330209aced08edf964fc49d7cf5c1e9b
-MISC metadata.xml 1453 RMD160 bb30b34303c3e053daa495840f1934b48c5a0013 SHA1 4f37b16a61ba1a6561ae8cfbda83ccd7f7f9444f SHA256 a4ef5cb3d610bb00db36e324edbc1df3b7f4f2794c80c9cfb4304239497622fe
+MISC ChangeLog 16633 RMD160 46d943e8615ab491ad88b3f227e7338202445552 SHA1 80282e3f6a3ec3bf3108f9cb3286448d412c90ed SHA256 07c0533c67b73ee0620f01ab534032cd21e323820f26245cfbf29e50f6653d64
+MISC metadata.xml 1557 RMD160 820502baf13b40426834c1bc9cf899fadf8c5b2f SHA1 d8f31984b988e9b5db7ddd7092c7461185ec071b SHA256 f746720d9dcbafc3b1a7e6dc7eadbee68b4e725ef67c8ed1bf8b07af352ca1f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP1KeTAAoJEIUJ+svaV163IDMH/jEAZBJ7P4pKrziw176z7J7Y
-G2/ruQjgATqHuh06diXHQ1Y4CvW4ro+hWUpTw0k3Xpu1AWqsrr+KcBf4YoXWCWup
-OfvfU6q/u2yA7iQFQO2/9Gd0mU4dJ765Wz6F5GOjK5kwpJgKXTkCjfw8YyhE4cr6
-8qqb3/3Nb3YRpyekgtUcZq086PxnhCdZKIQX2mTEmwOW1JNxWuUKRLGu8oZ5yWiD
-9q1dwU+tDZ6aMtfvZTqOOZVLu0p1BIsbwotT9NnEbGkN/r24SsrYg1W9eM1CCy6K
-IwsyoWMzP1IBbh4CN7vv5YzflHFuhRHSbz8nSINSYjMnqWJ7syFivoW20t3gIMo=
-=Lzmf
+iQEcBAEBAgAGBQJP4OFbAAoJEIUJ+svaV163yGIH/AjZ/vo0bd4v9srltLQrmqaZ
+dOPAueJwAfZ0p726+zgF5ElG1uvioxJETiLWSGmA9KBTV97N0bg6FvAiKI3gI3Wy
+W+LsGsvK2DaItpEofhye1ESBdmDFPfcvFR8bP0Q4+rV2WPo5N3PjzGFAeWxNC+wJ
+FVAo0x4/dwd0jrT9cJccXdJMPBLj41DHhRRdCJU0WAp93jiyw35lctErH02caboH
+c63XJ9wafUYBvz3eKtR9eS0YdAy3yK4dRgZxHBHXEJN/LYfAyXT1hETY/YZirkL7
+Cxl2I6CntDRRuumD88mIYbLLRw0UBW2CquPTlALZOV3r2k90tiEHos46NBke0wA=
+=cJ+M
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/icedtea-6-pass_javac_memory_args_to_vm.patch b/dev-java/icedtea/files/icedtea-6-pass_javac_memory_args_to_vm.patch
new file mode 100644
index 000000000000..25cf27af3401
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-6-pass_javac_memory_args_to_vm.patch
@@ -0,0 +1,99 @@
+# HG changeset patch
+# User Andrew John Hughes <ahughes@redhat.com>
+# Date 1336602703 -3600
+# Node ID fe14de44c8a8961a9ebc7f9d6a896dea26fa8afb
+# Parent  643fb6254e8086111966e01877d19a0deff6dceb
+Allow builds where the memory limit of the VM needs to be increased to run javac.
+
+2012-05-09  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(MEMORY_LIMIT): Always set this.
+	* javac.in:
+	Split out '-J' prefixed options and pass them
+	to the VM rather than ecj.  Filter out
+	'-J-Xbootclasspath/p:', which makes no sense
+	as there's nothing to prepend, and confuses
+	the VM.
+
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -89,6 +89,7 @@
+ 	$(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
+ 
+ # Flags
++MEMORY_LIMIT = -J-Xmx1024m
+ IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
+ IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
+ IT_LANGUAGE_SOURCE_VERSION=6
+@@ -120,15 +121,6 @@
+ PULSE_JAVA_CLEAN_TARGET = clean-pulse-java
+ endif
+ 
+-# FIXME: This should not depend on bootstrapping
+-# but on whether MEMORY_LIMIT is accepted
+-# as an argument to javac
+-if BOOTSTRAPPING
+-  MEMORY_LIMIT =
+-else
+-  MEMORY_LIMIT = -J-Xmx1024m
+-endif
+-
+ if ENABLE_CACAO
+   ICEDTEA_BUILD_TARGET=jdk_only
+   ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
+diff --git a/javac.in b/javac.in
+--- a/javac.in
++++ b/javac.in
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ use strict;
+ use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
+-use constant STRIP_ARGS => qw(-Werror -implicit:none);
++use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
+ 
+ my $ECJ_WARNINGS="-nowarn";
+ 
+@@ -31,24 +31,34 @@
+ 	splice @new_args, $_, 1 for @indices;
+     }
+ 
+-    return @new_args;
++    return \@new_args;
++}
++
++sub split_vm_args
++{
++    my @new_args = @{$_[0]};
++
++    my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
++    my @javac_args = grep $_ !~ /^-J/, @new_args;
++
++    return (\@vm_args, \@javac_args);
+ }
+ 
+ if ( -e "@abs_top_builddir@/native-ecj" )
+ {
+-    my @ecj_args = gen_ecj_opts( \@ARGV );
+-    exec '@abs_top_builddir@/native-ecj', @ecj_parms, @ecj_args ;
++    my $ecj_args = gen_ecj_opts( \@ARGV );
++    exec '@abs_top_builddir@/native-ecj', @ecj_parms, @$ecj_args ;
+ }
+ elsif ( -e "@ECJ_JAR@" )
+ {
+-    my @ecj_args = gen_ecj_opts( \@ARGV );
++    my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
+     my @CLASSPATH = ('@ECJ_JAR@');
+     push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
+     $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
+-    exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
++    exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
+ }
+ else
+ {
+-    my @ecj_args = gen_ecj_opts( \@ARGV );
+-    exec '@ECJ@', @ecj_parms, @ecj_args ;
++    my $ecj_args = gen_ecj_opts( \@ARGV );
++    exec '@ECJ@', @ecj_parms, @$ecj_args ;
+ }
diff --git a/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch b/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch
new file mode 100644
index 000000000000..497a67fb17a3
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch
@@ -0,0 +1,85 @@
+# HG changeset patch
+# User Andrew John Hughes <gnu_andrew@member.fsf.org>
+# Date 1339588177 -3600
+# Node ID df0999b55509faf1504b3ff55152a61a7cff57fc
+# Parent  e6d81fc2c9439652f903664d51a13732c73485ea
+Make compile-for-7.patch apply after cacao/memory.patch
+
+2012-06-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	Apply compile-for-7-cacao-mem.patch instead of
+	compile-for-7.patch when using a compiler that
+	supports diamond and either USING_CACAO or BUILD_CACAO
+	are set.
+	* patches/boot/compile-for-7-cacao-mem.patch:
+	Version of compile-for-7.patch post applying
+	cacao/memory.patch.
+
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -364,8 +364,16 @@
+ if JAVAC_LACKS_DIAMOND
+ ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch
+ else
++if USING_CACAO
++ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
++else
++if BUILD_CACAO
++ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
++else
+ ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7.patch
+ endif
++endif
++endif
+ 
+ if DTDTYPE_QNAME
+ ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch
+diff --git a/patches/boot/compile-for-7-cacao-mem.patch b/patches/boot/compile-for-7-cacao-mem.patch
+new file mode 100644
+--- /dev/null
++++ b/patches/boot/compile-for-7-cacao-mem.patch
+@@ -0,0 +1,42 @@
++diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make openjdk-boot/hotspot/make/linux/makefiles/rules.make
++--- openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
+++++ openjdk-boot/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:48:41.838257784 +0100
++@@ -139,8 +139,8 @@
++ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
++ 
++ # Settings for javac
++-BOOT_SOURCE_LANGUAGE_VERSION = 6
++-BOOT_TARGET_CLASS_VERSION = 6
+++BOOT_SOURCE_LANGUAGE_VERSION = 7
+++BOOT_TARGET_CLASS_VERSION = 7
++ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++ 
++diff -Nru openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make openjdk-boot/hotspot/make/solaris/makefiles/rules.make
++--- openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
+++++ openjdk-boot/hotspot/make/solaris/makefiles/rules.make	2012-06-13 11:36:03.057522188 +0100
++@@ -131,8 +131,8 @@
++ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
++ 
++ # Settings for javac
++-BOOT_SOURCE_LANGUAGE_VERSION = 6
++-BOOT_TARGET_CLASS_VERSION = 6
+++BOOT_SOURCE_LANGUAGE_VERSION = 7
+++BOOT_TARGET_CLASS_VERSION = 7
++ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++ 
++diff -Nru openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make openjdk-boot/hotspot/make/windows/makefiles/rules.make
++--- openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
+++++ openjdk-boot/hotspot/make/windows/makefiles/rules.make	2012-06-13 11:36:19.537797380 +0100
++@@ -43,8 +43,8 @@
++ !endif
++ 
++ # Settings for javac
++-BOOT_SOURCE_LANGUAGE_VERSION=6
++-BOOT_TARGET_CLASS_VERSION=6
+++BOOT_SOURCE_LANGUAGE_VERSION=7
+++BOOT_TARGET_CLASS_VERSION=7
++ JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
++ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++ 
diff --git a/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch b/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch
new file mode 100644
index 000000000000..af13d4250196
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch
@@ -0,0 +1,257 @@
+# HG changeset patch
+# User Andrew John Hughes <gnu_andrew@member.fsf.org>
+# Date 1339484856 -3600
+# Node ID 1a9e619bc32e81697bf4200a607935ee00c8d388
+# Parent  7ceb431c104f1da9cbabebdcc223b008e0177a71
+Bring compiler detection into line with other jdk tools and check java/javac work before running other macros.
+
+2012-03-20  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(IT_FIND_COMPILER): Define only once and
+	rename from IT_FIND_JAVA_COMPILER.
+	(IT_FIND_ECJ): Use same form as detection
+	for java, javah, jar and rmic.
+	(IT_FIND_JAVAC): Likewise.
+	(IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
+	java and javac actually work together to compile code
+	before running other tests such as the dtdtype one.
+	(IT_CHECK_FOR_CLASS): Depend on java/javac working.
+	(IT_GETDTDTYPE_CHECK): Likewise.  Add -target 5.
+	(IT_JAVAH): Depend on java/javac working.
+	* configure.ac: Invoke IT_FIND_COMPILER rather than
+	IT_FIND_JAVA_COMPILER.
+
+diff --git a/acinclude.m4 b/acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -117,50 +117,41 @@
+   AC_SUBST(OS_PATH)
+ ])
+ 
+-AC_DEFUN([IT_FIND_JAVA_COMPILER],
++AC_DEFUN([IT_FIND_COMPILER],
+ [
+-  JAVAC=${SYSTEM_JDK_DIR}/bin/javac
+   IT_FIND_JAVAC
+   IT_FIND_ECJ
+   IT_USING_ECJ
+ 
++  AC_SUBST(ECJ)
+   AC_SUBST(JAVAC)
+ ])
+ 
+-AC_DEFUN([IT_FIND_ECJ],
++AC_DEFUN_ONCE([IT_FIND_ECJ],
+ [
++  ECJ_DEFAULT=/usr/bin/ecj
++  AC_MSG_CHECKING([if an ecj binary was specified])
+   AC_ARG_WITH([ecj],
+-	      [AS_HELP_STRING([--with-ecj[[=PATH]]],the path to an ecj binary)],
++	      [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
+   [
+-    if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
+-      IT_CHECK_ECJ(${withval})
++    if test "x${withval}" = "xyes"; then
++      ECJ=no
+     else
+-      if test "x${withval}" != xno; then
+-        IT_CHECK_ECJ
+-      fi
++      ECJ="${withval}"
+     fi
+   ],
+   [ 
+-    IT_CHECK_ECJ
++    ECJ=no
+   ])
+-  if test "x${JAVAC}" = "x"; then
+-    if test "x{ECJ}" != "x"; then
+-      JAVAC="${ECJ}"
+-    fi
++  AC_MSG_RESULT(${ECJ})
++  if test "x${ECJ}" = "xno"; then
++    ECJ=${ECJ_DEFAULT}
+   fi
+-])
+-
+-AC_DEFUN([IT_CHECK_ECJ],
+-[
+-  if test "x$1" != x; then
+-    if test -f "$1"; then
+-      AC_MSG_CHECKING(for ecj)
+-      ECJ="$1"
+-      AC_MSG_RESULT(${ECJ})
+-    else
+-      AC_PATH_PROG(ECJ, "$1")
+-    fi
++  AC_MSG_CHECKING([if $ECJ is a valid executable file])
++  if test -x "${ECJ}" && test -f "${ECJ}"; then
++    AC_MSG_RESULT([yes])
+   else
++    ECJ=""
+     AC_PATH_PROG(ECJ, "ecj")
+     if test -z "${ECJ}"; then
+       AC_PATH_PROG(ECJ, "ecj-3.1")
+@@ -171,43 +162,45 @@
+     if test -z "${ECJ}"; then
+       AC_PATH_PROG(ECJ, "ecj-3.3")
+     fi
++    if test -z "${ECJ}"; then
++      AC_PATH_PROG(ECJ, "ecj-3.4")
++    fi
+   fi
+ ])
+ 
+-AC_DEFUN([IT_FIND_JAVAC],
++AC_DEFUN_ONCE([IT_FIND_JAVAC],
+ [
++  JAVAC_DEFAULT=${SYSTEM_JDK_DIR}/bin/javac
++  AC_MSG_CHECKING([if a javac binary was specified])
+   AC_ARG_WITH([javac],
+ 	      [AS_HELP_STRING([--with-javac[[=PATH]]],the path to a javac binary)],
+   [
+-    if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
+-      IT_CHECK_JAVAC(${withval})
++    if test "x${withval}" = "xyes"; then
++      JAVAC=no
+     else
+-      if test "x${withval}" != xno; then
+-        IT_CHECK_JAVAC(${JAVAC})
+-      fi
++      JAVAC="${withval}"
+     fi
+   ],
+-  [ 
+-    IT_CHECK_JAVAC(${JAVAC})
++  [
++    JAVAC=no
++  ])
++  AC_MSG_RESULT(${JAVAC})
++  if test "x${JAVAC}" = "xno"; then
++    JAVAC=${JAVAC_DEFAULT}
++  fi
++  AC_MSG_CHECKING([if $JAVAC is a valid executable file])
++  if test -x "${JAVAC}" && test -f "${JAVAC}"; then
++    AC_MSG_RESULT([yes])
++  else
++    AC_MSG_RESULT([no])
++    JAVAC=""
++    AC_PATH_PROG(JAVAC, "javac")
++  fi
++  AC_SUBST(JAVAC)
+   ])
+ ])
+ 
+-AC_DEFUN([IT_CHECK_JAVAC],
+-[
+-  if test "x$1" != x; then
+-    if test -f "$1"; then
+-      AC_MSG_CHECKING(for javac)
+-      JAVAC="$1"
+-      AC_MSG_RESULT(${JAVAC})
+-    else
+-      AC_PATH_PROG(JAVAC, "$1")
+-    fi
+-  else
+-    AC_PATH_PROG(JAVAC, "javac")
+-  fi
+-])
+-
+-AC_DEFUN([IT_FIND_JAVA],
++AC_DEFUN_ONCE([IT_FIND_JAVA],
+ [
+   JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
+   AC_MSG_CHECKING([if a java binary was specified])
+@@ -1158,6 +1151,7 @@
+ ])
+ 
+ AC_DEFUN([IT_JAVAH],[
++AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
+ AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [
+ SUPERCLASS=Test.java
+ SUBCLASS=TestImpl.java
+@@ -1452,6 +1446,44 @@
+   AC_CONFIG_FILES([tz.properties])
+ ])
+ 
++dnl check that javac and java work
++AC_DEFUN_ONCE([IT_CHECK_JAVA_AND_JAVAC_WORK],[
++  AC_REQUIRE([IT_FIND_JAVA])
++  AC_REQUIRE([IT_FIND_COMPILER])
++  AC_CACHE_CHECK([if the VM and compiler work together], it_cv_jdk_works, [
++  CLASS=Test.java
++  BYTECODE=$(echo $CLASS|sed 's#\.java##')
++  mkdir tmp.$$
++  cd tmp.$$
++  cat << \EOF > $CLASS
++[/* [#]line __oline__ "configure" */
++
++public class Test
++{
++    public static void main(String[] args)
++    {
++      System.out.println("Hello World!");
++    }
++}]
++EOF
++  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
++    if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
++      it_cv_jdk_works=yes;
++    else
++      it_cv_jdk_works=no;
++      AC_MSG_ERROR([VM failed to run compiled class.])
++    fi
++  else
++    it_cv_jdk_works=no;
++    AC_MSG_ERROR([Compiler failed to compile Java code.])
++  fi
++  rm -f $CLASS *.class
++  cd ..
++  rmdir tmp.$$
++  ])
++AC_PROVIDE([$0])dnl
++])
++
+ dnl Generic macro to check for a Java class
+ dnl Takes two arguments: the name of the macro
+ dnl and the name of the class.  The macro name
+@@ -1459,6 +1491,7 @@
+ dnl replaced by '_' and all letters capitalised.
+ dnl e.g. IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER],[java.util.Scanner])
+ AC_DEFUN([IT_CHECK_FOR_CLASS],[
++AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
+ AC_CACHE_CHECK([if $2 is missing], it_cv_$1, [
+ CLASS=Test.java
+ BYTECODE=$(echo $CLASS|sed 's#\.java##')
+@@ -1504,7 +1537,8 @@
+   AC_PROVIDE([$0])dnl
+ ])
+ 
+-AC_DEFUN([IT_GETDTDTYPE_CHECK],[
++AC_DEFUN_ONCE([IT_GETDTDTYPE_CHECK],[
++  AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
+   AC_CACHE_CHECK([if javax.xml.stream.events.Attribute.getDTDType() wrongly returns a QName], it_cv_dtdtype, [
+   CLASS=Test.java
+   BYTECODE=$(echo $CLASS|sed 's#\.java##')
+@@ -1561,7 +1595,7 @@
+     }
+ }]
+ EOF
+-  if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
++  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+     if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+       it_cv_dtdtype=no;
+     else
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,7 +97,7 @@
+ IT_CHECK_IF_DOWNLOADING
+ IT_CHECK_FOR_JDK
+ IT_FIND_JAVA
+-IT_FIND_JAVA_COMPILER
++IT_FIND_COMPILER
+ IT_FIND_JAVAH
+ IT_FIND_JAR
+ IT_FIND_RMIC
diff --git a/dev-java/icedtea/files/icedtea-7-no_suffix.patch b/dev-java/icedtea/files/icedtea-7-no_suffix.patch
new file mode 100644
index 000000000000..61bbd09d84ee
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7-no_suffix.patch
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User Andrew John Hughes <ahughes@redhat.com>
+# Date 1338297380 -3600
+# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb
+# Parent  2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d
+Don't add a suffix for building the default, IcedTea.
+
+2012-05-25  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(versioning): Don't add a suffix if building
+	the default project, 'icedtea'.
+
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1435,7 +1435,7 @@
+ 	  echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
+ 	    >>openjdk/jdk/make/common/shared/Defs.gmk ;
+ endif
+-	if test x"$(PROJECT_NAME)" != "xjdk7"; then \
++	if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
+ 	  proj_suffix="-$(PROJECT_NAME)"; \
+ 	fi ; \
+ 	if test x"$(VERSION_SUFFIX)" != "x"; then \
diff --git a/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch b/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch
new file mode 100644
index 000000000000..17e5f2aa9d45
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch
@@ -0,0 +1,143 @@
+diff -Nru icedtea-2.1.1.orig/acinclude.m4 icedtea-2.1.1/acinclude.m4
+--- icedtea-2.1.1.orig/acinclude.m4	2012-06-13 02:56:54.455836680 +0100
++++ icedtea-2.1.1/acinclude.m4	2012-06-13 02:57:31.660476528 +0100
+@@ -2258,3 +2258,18 @@
+   AC_SUBST(PAX_COMMAND)
+   AC_SUBST(PAX_COMMAND_ARGS)
+ ])
++
++AC_DEFUN([IT_USING_CACAO],[
++  AC_REQUIRE([IT_FIND_JAVA])
++  AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
++  if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
++    it_cv_cacao=yes;
++  else
++    it_cv_cacao=no;
++  fi
++  ])
++  USING_CACAO=$it_cv_cacao
++  AC_SUBST(USING_CACAO)
++  AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
++  AC_PROVIDE([$0])dnl
++])
+diff -Nru icedtea-2.1.1.orig/configure.ac icedtea-2.1.1/configure.ac
+--- icedtea-2.1.1.orig/configure.ac	2012-06-13 02:56:54.459836748 +0100
++++ icedtea-2.1.1/configure.ac	2012-06-13 02:57:31.660476528 +0100
+@@ -101,6 +101,7 @@
+ IT_FIND_JAR
+ IT_FIND_RMIC
+ IT_FIND_NATIVE2ASCII
++IT_USING_CACAO
+ if test "x$enable_bootstrap" = "xyes"; then
+   IT_FIND_ECJ_JAR
+   IT_FIND_TOOL([XSLTPROC], [xsltproc])
+diff -Nru icedtea-2.1.1.orig/Makefile.am icedtea-2.1.1/Makefile.am
+--- icedtea-2.1.1.orig/Makefile.am	2012-06-13 02:56:54.403835785 +0100
++++ icedtea-2.1.1/Makefile.am	2012-06-13 02:57:31.648476322 +0100
+@@ -249,6 +249,11 @@
+ 	patches/cacao/launcher.patch \
+ 	patches/cacao/jsig.patch \
+ 	patches/cacao/memory.patch
++else
++if USING_CACAO
++ICEDTEA_PATCHES += \
++	patches/cacao/memory.patch
++endif
+ endif
+ 
+ if ENABLE_CACAO
+diff -Nru icedtea-2.1.1.orig/patches/cacao/launcher.patch icedtea-2.1.1/patches/cacao/launcher.patch
+--- icedtea-2.1.1.orig/patches/cacao/launcher.patch	2012-06-13 02:28:23.950879620 +0100
++++ icedtea-2.1.1/patches/cacao/launcher.patch	2012-06-13 02:59:50.858865063 +0100
+@@ -1,14 +1,3 @@
+---- openjdk/jdk/make/docs/Makefile.orig	2010-08-27 20:01:53.000000000 +0200
+-+++ openjdk/jdk/make/docs/Makefile	2010-09-07 12:56:00.309691118 +0200
+-@@ -70,7 +70,7 @@
+- ifeq ($(ARCH_DATA_MODEL),64)
+-   MAX_VM_MEMORY = 1024
+- else
+--  MAX_VM_MEMORY = 512
+-+  MAX_VM_MEMORY = 768
+- endif
+- 
+- # List of all possible directories for javadoc to look for sources
+ --- openjdk/jdk/src/share/bin/java.c.orig	2010-09-07 05:24:49.307192201 +0200
+ +++ openjdk/jdk/src/share/bin/java.c	2010-09-07 12:56:00.309691118 +0200
+ @@ -174,6 +174,8 @@
+diff -Nru icedtea-2.1.1.orig/patches/cacao/memory.patch icedtea-2.1.1/patches/cacao/memory.patch
+--- icedtea-2.1.1.orig/patches/cacao/memory.patch	2012-06-13 02:28:23.954879676 +0100
++++ icedtea-2.1.1/patches/cacao/memory.patch	2012-06-13 03:01:11.156239098 +0100
+@@ -1,6 +1,70 @@
+---- openjdk.orig/langtools/make/build.xml	2010-06-01 11:25:40.145287816 +0100
+-+++ openjdk/langtools/make/build.xml	2010-06-21 21:48:41.000000000 +0100
+-@@ -554,6 +554,7 @@
++diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
++--- openjdk.orig/hotspot/make/linux/makefiles/rules.make	2012-06-07 19:21:17.000000000 +0100
+++++ openjdk/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:36:26.364575315 +0100
++@@ -141,7 +141,7 @@
++ # Settings for javac
++ BOOT_SOURCE_LANGUAGE_VERSION = 6
++ BOOT_TARGET_CLASS_VERSION = 6
++-JAVAC_FLAGS = -g -encoding ascii
+++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++ 
++ # With parallel makes, print a message at the end of compilation.
++diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
++--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-07 19:21:17.000000000 +0100
+++++ openjdk/hotspot/make/solaris/makefiles/rules.make	2012-06-13 03:36:26.364575315 +0100
++@@ -133,7 +133,7 @@
++ # Settings for javac
++ BOOT_SOURCE_LANGUAGE_VERSION = 6
++ BOOT_TARGET_CLASS_VERSION = 6
++-JAVAC_FLAGS = -g -encoding ascii
+++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++ 
++ # With parallel makes, print a message at the end of compilation.
++diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
++--- openjdk.orig/hotspot/make/windows/makefiles/rules.make	2012-06-07 19:21:17.000000000 +0100
+++++ openjdk/hotspot/make/windows/makefiles/rules.make	2012-06-13 03:36:26.364575315 +0100
++@@ -45,7 +45,7 @@
++ # Settings for javac
++ BOOT_SOURCE_LANGUAGE_VERSION=6
++ BOOT_TARGET_CLASS_VERSION=6
++-JAVAC_FLAGS=-g -encoding ascii
+++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
++ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++ 
++ ProjectFile=jvm.vcproj
++diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
++--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2012-06-08 14:12:38.000000000 +0100
+++++ openjdk/jdk/make/common/shared/Platform.gmk	2012-06-13 03:36:26.380575614 +0100
++@@ -447,7 +447,7 @@
++       else \
++         echo "false"; \
++       fi)
++-    MAX_VM_MEMORY := 512
+++    MAX_VM_MEMORY := 1536
++     MIN_VM_MEMORY := $(MAX_VM_MEMORY)
++   else
++     MB_OF_MEMORY       := unknown
++diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
++--- openjdk.orig/jdk/make/docs/Makefile	2012-06-08 14:12:38.000000000 +0100
+++++ openjdk/jdk/make/docs/Makefile	2012-06-13 03:36:26.380575614 +0100
++@@ -69,9 +69,9 @@
++ #    NOTE: javadoc will not complete without these larger settings.
++ #    WARNING: This could cause thrashing on low memory machines.
++ ifeq ($(ARCH_DATA_MODEL),64)
++-  MAX_VM_MEMORY = 1024
+++  MAX_VM_MEMORY = 1792
++ else
++-  MAX_VM_MEMORY = 512
+++  MAX_VM_MEMORY = 768
++ endif
++ 
++ # List of all possible directories for javadoc to look for sources
++diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
++--- openjdk.orig/langtools/make/build.xml	2012-02-15 08:26:56.000000000 +0000
+++++ openjdk/langtools/make/build.xml	2012-06-13 03:36:26.380575614 +0100
++@@ -796,6 +796,7 @@
+                      <compilerarg value="-implicit:none"/>
+                      <compilerarg value="-Xprefer:source"/>
+                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
diff --git a/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch
new file mode 100644
index 000000000000..c76c9f3620ec
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch
@@ -0,0 +1,184 @@
+# HG changeset patch
+# User Andrew John Hughes <gnu_andrew@member.fsf.org>
+# Date 1339542060 -3600
+# Node ID e6d81fc2c9439652f903664d51a13732c73485ea
+# Parent  1a9e619bc32e81697bf4200a607935ee00c8d388
+PR986: Allow CACAO builds of IcedTea to be able to build IcedTea without bootstrap.
+
+2012-06-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR986
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add memory patch when
+	building using CACAO as well, even if the
+	result is not a CACAO build.
+	* acinclude.m4:
+	(IT_USING_CACAO): New macro; detects use of
+	CACAO as the build VM so memory limits can
+	be raised accordingly.
+	* configure.ac: Call IT_USING_CACAO.
+	* patches/cacao/launcher.patch:
+	Move memory increase to memory.patch.
+	* patches/cacao/memory.patch:
+	Extend with additional cases in HotSpot and
+	the JDK.
+
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -249,6 +249,11 @@
+ 	patches/cacao/launcher.patch \
+ 	patches/cacao/jsig.patch \
+ 	patches/cacao/memory.patch
++else
++if USING_CACAO
++ICEDTEA_PATCHES += \
++	patches/cacao/memory.patch
++endif
+ endif
+ 
+ if ENABLE_CACAO
+diff --git a/acinclude.m4 b/acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2278,3 +2278,18 @@
+   AC_SUBST(PAX_COMMAND)
+   AC_SUBST(PAX_COMMAND_ARGS)
+ ])
++
++AC_DEFUN([IT_USING_CACAO],[
++  AC_REQUIRE([IT_FIND_JAVA])
++  AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
++  if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
++    it_cv_cacao=yes;
++  else
++    it_cv_cacao=no;
++  fi
++  ])
++  USING_CACAO=$it_cv_cacao
++  AC_SUBST(USING_CACAO)
++  AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
++  AC_PROVIDE([$0])dnl
++])
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -102,6 +102,7 @@
+ IT_FIND_JAR
+ IT_FIND_RMIC
+ IT_FIND_NATIVE2ASCII
++IT_USING_CACAO
+ if test "x$enable_bootstrap" = "xyes"; then
+   IT_FIND_ECJ_JAR
+   IT_FIND_TOOL([XSLTPROC], [xsltproc])
+diff --git a/patches/cacao/launcher.patch b/patches/cacao/launcher.patch
+--- a/patches/cacao/launcher.patch
++++ b/patches/cacao/launcher.patch
+@@ -1,15 +1,3 @@
+-diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
+---- openjdk.orig/jdk/make/docs/Makefile	2012-03-21 17:09:55.000000000 +0000
+-+++ openjdk/jdk/make/docs/Makefile	2012-03-23 00:46:49.461847958 +0000
+-@@ -73,7 +73,7 @@
+- else ifeq ($(ARCH),universal)
+-   MAX_VM_MEMORY = 1024
+- else
+--  MAX_VM_MEMORY = 512
+-+  MAX_VM_MEMORY = 768
+- endif
+- 
+- # List of all possible directories for javadoc to look for sources
+ diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c
+ --- openjdk.orig/jdk/src/share/bin/java.c	2012-03-21 17:09:55.000000000 +0000
+ +++ openjdk/jdk/src/share/bin/java.c	2012-03-23 00:46:49.461847958 +0000
+diff --git a/patches/cacao/memory.patch b/patches/cacao/memory.patch
+--- a/patches/cacao/memory.patch
++++ b/patches/cacao/memory.patch
+@@ -1,6 +1,85 @@
+---- openjdk.orig/langtools/make/build.xml	2010-06-01 11:25:40.145287816 +0100
+-+++ openjdk/langtools/make/build.xml	2010-06-21 21:48:41.000000000 +0100
+-@@ -554,6 +554,7 @@
++diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/rules.make openjdk/hotspot/make/bsd/makefiles/rules.make
++--- openjdk.orig/hotspot/make/bsd/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
+++++ openjdk/hotspot/make/bsd/makefiles/rules.make	2012-06-12 10:50:20.974290246 +0100
++@@ -128,7 +128,7 @@
++ # Settings for javac
++ BOOT_SOURCE_LANGUAGE_VERSION = 6
++ BOOT_TARGET_CLASS_VERSION = 6
++-JAVAC_FLAGS = -g -encoding ascii
+++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++ 
++ # With parallel makes, print a message at the end of compilation.
++diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
++--- openjdk.orig/hotspot/make/linux/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
+++++ openjdk/hotspot/make/linux/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
++@@ -128,7 +128,7 @@
++ # Settings for javac
++ BOOT_SOURCE_LANGUAGE_VERSION = 6
++ BOOT_TARGET_CLASS_VERSION = 6
++-JAVAC_FLAGS = -g -encoding ascii
+++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++ 
++ # With parallel makes, print a message at the end of compilation.
++diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
++--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
+++++ openjdk/hotspot/make/solaris/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
++@@ -120,7 +120,7 @@
++ # Settings for javac
++ BOOT_SOURCE_LANGUAGE_VERSION = 6
++ BOOT_TARGET_CLASS_VERSION = 6
++-JAVAC_FLAGS = -g -encoding ascii
+++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++ 
++ # With parallel makes, print a message at the end of compilation.
++diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
++--- openjdk.orig/hotspot/make/windows/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
+++++ openjdk/hotspot/make/windows/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
++@@ -45,7 +45,7 @@
++ # Settings for javac
++ BOOT_SOURCE_LANGUAGE_VERSION=6
++ BOOT_TARGET_CLASS_VERSION=6
++-JAVAC_FLAGS=-g -encoding ascii
+++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
++ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
++ 
++ ProjectFile=jvm.vcproj
++diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
++--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2012-06-08 17:12:17.000000000 +0100
+++++ openjdk/jdk/make/common/shared/Platform.gmk	2012-06-12 10:50:20.982290377 +0100
++@@ -537,7 +537,7 @@
++       else \
++         echo "false"; \
++       fi)
++-    MAX_VM_MEMORY := 512
+++    MAX_VM_MEMORY := 1536
++     MIN_VM_MEMORY := $(MAX_VM_MEMORY)
++   else
++     MB_OF_MEMORY       := unknown
++diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
++--- openjdk.orig/jdk/make/docs/Makefile	2012-06-08 17:12:17.000000000 +0100
+++++ openjdk/jdk/make/docs/Makefile	2012-06-12 11:09:31.616702981 +0100
++@@ -69,11 +69,11 @@
++ #    NOTE: javadoc will not complete without these larger settings.
++ #    WARNING: This could cause thrashing on low memory machines.
++ ifeq ($(ARCH_DATA_MODEL),64)
++-  MAX_VM_MEMORY = 1024
+++  MAX_VM_MEMORY = 1792
++ else ifeq ($(ARCH),universal)
++-  MAX_VM_MEMORY = 1024
+++  MAX_VM_MEMORY = 1792
++ else
++-  MAX_VM_MEMORY = 512
+++  MAX_VM_MEMORY = 768
++ endif
++ 
++ # List of all possible directories for javadoc to look for sources
++diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
++--- openjdk.orig/langtools/make/build.xml	2012-06-08 17:12:36.000000000 +0100
+++++ openjdk/langtools/make/build.xml	2012-06-12 10:50:20.974290246 +0100
++@@ -796,6 +796,7 @@
+                      <compilerarg value="-implicit:none"/>
+                      <compilerarg value="-Xprefer:source"/>
+                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
diff --git a/dev-java/icedtea/icedtea-6.1.11.3.ebuild b/dev-java/icedtea/icedtea-6.1.11.3.ebuild
new file mode 100644
index 000000000000..30526f5da59f
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.11.3.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.3.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="4"
+
+inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+OPENJDK_BUILD="24"
+OPENJDK_DATE="14_nov_2011"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+JAXP_TARBALL="jaxp144_03.zip"
+JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
+JAF_TARBALL="jdk6-jaf-b20.zip"
+CACAO_TARBALL="cff92704c4e0.tar.gz"
+JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+	http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="6"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin
+	+nss pax_kernel pulseaudio +source systemtap test +webstart"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	dev-libs/glib
+	>=media-libs/freetype-2.3.5
+	>=x11-libs/gtk+-2.8:2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	>=x11-libs/libXp-1.0.0
+	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
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# media-fonts/lklug needs ppc ppc64 keywords
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea6
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			!ppc? ( !ppc64? ( media-fonts/lklug ) )
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# !eclipse-ecj-3.7 - bug #392587
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.1
+	dev-java/ant-nodeps
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	virtual/pkgconfig
+	sys-apps/lsb-release
+	${X_DEPEND}
+	jbootstrap? (
+		|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
+	)
+	pax_kernel? ( sys-apps/paxctl )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:6 )
+	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+java_prepare() {
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751
+	epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch
+	eautoreconf
+}
+
+bootstrap_impossible() {
+	# Fill this according to testing what works and what not
+	has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
+}
+
+src_configure() {
+	local config bootstrap enable_cacao
+	local vm=$(java-pkg_get-current-vm)
+
+	# IcedTea6 can't be built using IcedTea7; its class files are too new
+	# Whether to bootstrap
+	bootstrap="disable"
+	if use jbootstrap; then
+		if bootstrap_impossible "${vm}"; then
+			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
+		else
+			bootstrap="enable"
+		fi
+	fi
+
+	if has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		bootstrap="enable"
+	fi
+
+	config="${config} --${bootstrap}-bootstrap"
+
+	if [[ ${bootstrap} == enable ]]; then
+		# icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337
+		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+		# Don't use eclipse-ecj-3.7 #392587
+		local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
+		ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
+		if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
+			ecj_jar="${ecj_jar%/lib/ecj.jar}"
+			ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
+			ewarn "Found usable: ${ecj_all[@]##*/}"
+			ewarn "using ${ecj_all##*/} instead"
+			ecj_jar="${ecj_all}"/lib/ecj.jar
+		fi
+		config="${config} --with-ecj-jar=${ecj_jar}"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO
+	if ! has "${ARCH}" amd64 sparc x86; then
+		enable_cacao=yes
+	elif use cacao; then
+		ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+		ewarn 'If so, please rebuild with USE="-cacao"'
+		enable_cacao=yes
+	fi
+
+	if [[ ${enable_cacao} ]]; then
+		config="${config} --enable-cacao"
+	fi
+
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
+
+	if use javascript ; then
+		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
+	else
+		config="${config} --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax paxctl)
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# Load the least that's needed to avoid possible classpath collisions.
+	export ANT_TASKS="ant-nodeps"
+
+	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 THANKYOU
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+	docompress -x /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
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die
+	fi
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	# Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	if ! use X || ! use alsa || ! use cups; then
+		java-vm_revdep-mask "${dest}"
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
+		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
+		elog "If you had icedtea6 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
diff --git a/dev-java/icedtea/icedtea-7.2.1.1.ebuild b/dev-java/icedtea/icedtea-7.2.1.1.ebuild
new file mode 100644
index 000000000000..ee8c645b3f32
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.1.1.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.1.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="4"
+
+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}
+OPENJDK_TARBALL="22cc03983e20.tar.gz"
+CORBA_TARBALL="338c21646c76.tar.gz"
+HOTSPOT_TARBALL="8b7c4c5f6ba9.tar.gz"
+JAXP_TARBALL="7a8825b15df6.tar.gz"
+JAXWS_TARBALL="7edfbfe974f2.tar.gz"
+JDK_TARBALL="d5ddeffc4651.tar.gz"
+LANGTOOLS_TARBALL="b534c4c6cd9b.tar.gz"
+CACAO_TARBALL="a567bcb7f589.tar.gz"
+JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="7"
+KEYWORDS="~amd64 ~ia64 ~x86"
+
+IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
+	+nss pax_kernel pulseaudio +source systemtap test +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
+	>=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-libs/libXp-1.0.0
+	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
+	>=media-libs/libpng-1.2
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# cups is needed for X. #390945 #390975
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:7
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:7
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.1
+	dev-java/ant-nodeps
+	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/paxctl )"
+
+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 ${ICEDTEA_PKG}.tar.gz
+}
+
+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}-7.2.0_pax_kernel_support.patch #389751
+	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
+	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
+	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
+
+	eautoreconf
+}
+
+bootstrap_impossible() {
+	# Fill this according to testing what works and what not
+	has "${1}" icedtea7 icedtea-7 icedtea-bin-7 icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
+}
+
+src_configure() {
+	local config bootstrap
+	local vm=$(java-pkg_get-current-vm)
+
+	# Whether to bootstrap
+	bootstrap="disable"
+	if use jbootstrap; then
+		if bootstrap_impossible "${vm}"; then
+			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
+		else
+			bootstrap="enable"
+		fi
+	fi
+
+	if has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		bootstrap="enable"
+		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+		config="${config} --with-ecj-jar=${ecj_jar}"
+	fi
+
+	config="${config} --${bootstrap}-bootstrap"
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use JamVM as it's the only possibility right now
+	if ! has "${ARCH}" amd64 sparc x86; then
+		config="${config} --enable-jamvm"
+	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-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
+		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax paxctl)
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# Load the least that's needed to avoid possible classpath collisions.
+	export ANT_TASKS="ant-nodeps"
+
+	emake -j 1
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake -j1 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}
+	docompress -x /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/icedtea-7.2.2.1.ebuild b/dev-java/icedtea/icedtea-7.2.2.1.ebuild
new file mode 100644
index 000000000000..f9f0aa35bee5
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.2.1.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.2.1.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="4"
+
+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}
+OPENJDK_TARBALL="0b776ef59474.tar.gz"
+CORBA_TARBALL="38deb372c569.tar.gz"
+HOTSPOT_TARBALL="889dffcf4a54.tar.gz"
+JAXP_TARBALL="335fb0b059b7.tar.gz"
+JAXWS_TARBALL="5471e01ef43b.tar.gz"
+JDK_TARBALL="6c3b742b735d.tar.gz"
+LANGTOOLS_TARBALL="beea46c7086b.tar.gz"
+CACAO_TARBALL="a567bcb7f589.tar.gz"
+JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="7"
+KEYWORDS="~amd64 ~ia64 ~x86"
+
+IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
+	+nss pax_kernel pulseaudio +source systemtap test +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
+	>=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-libs/libXp-1.0.0
+	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
+	>=media-libs/libpng-1.2
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# cups is needed for X. #390945 #390975
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:7
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:7
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.1
+	dev-java/ant-nodeps
+	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/paxctl )"
+
+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 ${ICEDTEA_PKG}.tar.gz
+}
+
+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}-no_suffix.patch
+	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
+	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
+	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
+	eautoreconf
+}
+
+bootstrap_impossible() {
+	# Fill this according to testing what works and what not
+	has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
+}
+
+src_configure() {
+	local config bootstrap
+	local vm=$(java-pkg_get-current-vm)
+
+	# Whether to bootstrap
+	bootstrap="disable"
+	if use jbootstrap; then
+		if bootstrap_impossible "${vm}"; then
+			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
+		else
+			bootstrap="enable"
+		fi
+	fi
+
+	if has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		bootstrap="enable"
+		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+		config="${config} --with-ecj-jar=${ecj_jar}"
+	fi
+
+	config="${config} --${bootstrap}-bootstrap"
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use JamVM as it's the only possibility right now
+	if ! has "${ARCH}" amd64 sparc x86; then
+		config="${config} --enable-jamvm"
+	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-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
+		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		--disable-downloading \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax paxctl)
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# Load the least that's needed to avoid possible classpath collisions.
+	export ANT_TASKS="ant-nodeps"
+
+	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}
+	docompress -x /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 5cc4329887d0..913fe391e410 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -16,6 +16,7 @@
 <use>
   <flag name="X">Make X buildtime-only depenency.</flag>
   <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="hs20">Use the new version of HotSpot (20).</flag>
   <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>