Bump, security fixes for 7, regression fixes for 6

Remove vulnerable

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

12 files changed, 45 insertions, 1076 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 14b9a9c2ee9b..c263c0a4286b 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.90 2013/02/11 05:51:50 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.91 2013/02/13 18:56:54 sera Exp $
+
+*icedtea-7.2.3.6 (13 Feb 2013)
+*icedtea-6.1.12.2 (13 Feb 2013)
+
+  13 Feb 2013; Ralph Sennhauser <sera@gentoo.org> -icedtea-6.1.11.5.ebuild,
+  -icedtea-6.1.12.0.ebuild, -files/icedtea-6.1.12.0-parallel-unpack.patch,
+  -icedtea-6.1.12.1.ebuild, +icedtea-6.1.12.2.ebuild,
+  -files/icedtea-6-pass_javac_memory_args_to_vm.patch,
+  -files/icedtea-6_pax_kernel_support.patch,
+  -files/icedtea-7.2.3.2-pax_mark_rmic_java.patch,
+  -files/icedtea-7.2.3.3-pax_mark_rmic_java.patch, -icedtea-7.2.3.4.ebuild,
+  -files/icedtea-7.2.3.4-parallel-unpack.patch, +icedtea-7.2.3.6.ebuild:
+  Bump, security fixes for 7, regression fixes for 6
+  Remove vulnerable
 
 *icedtea-6.1.12.1 (11 Feb 2013)
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 114efc59ebf2..a263cbc20ccb 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -3,49 +3,35 @@ 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-6-pass_javac_memory_args_to_vm.patch 2953 SHA256 39f2b68fea43923f88a6e1e4b8fe51735441e783da9cf2bbc9c95f4dea483763 SHA512 0d9b3fec5a1edf1208e7a5a6ea5e3c75a0179697d1252ba4e430175a5055c78f906af03bb434c0810a89a5fb802757d337c30370fad56bbbca23b3f7c25ef805 WHIRLPOOL 784b5fd27698880c0d831e041e17132befc4fdd8eb94823105618662d16e8f1a5819680a7fcf0fd29f79b3f731c1f5c672b8e6d824c96d1687d56b5c027a228d
-AUX icedtea-6.1.12.0-parallel-unpack.patch 635 SHA256 6038c41c784e942f8b7a6a59d51f883399747767fc74f22cd247ec59f1dc90a2 SHA512 e573ce67c70863e1df8b48e8cd924d129f44aa23fa53807f8b332451591604b3a9618543163c8848a98f1b636cbef15edd1c986b61a6205683785dd26a2e5906 WHIRLPOOL ae5af27b34aa04e5d57ad8cb65a4a7d73ad66579bd4fc25ee5b68b8ba92c4be850400434debdaf5b5ffa90af36182df6fdeabe8256fe36477af5fb1e12f8fe6e
-AUX icedtea-6_pax_kernel_support.patch 4862 SHA256 7e9235d5f2b70b3e70c0940d35dc312fa59444e763eb5f521f2b71f86a24f70b SHA512 e9ec9df75925aa408ee78c4730be320231017f6a180f34b0406ef1393a142d14192cd3bc63c1929f9c6904c569f2a4150ceb7f286c69f3084053aab73b4ed253 WHIRLPOOL 3bef4746ed97e8e2f8a37cc337cf50b137afc985220e7804759331aa75c3c4a90b6f2266c3ec8449d6726ea4f45b4b1f55d653048039429013e08f57a50acdb1
-AUX icedtea-7.2.3.2-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45
-AUX icedtea-7.2.3.3-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45
-AUX icedtea-7.2.3.4-parallel-unpack.patch 420 SHA256 091c5e345eab10524b18dbc6523702ed213f130b6759c5f9e8dca458f9f169b0 SHA512 3c55b82784a013e609179b752b7192450a5deddb4a7b7dca10898c394f4c352cff96c097e5838946be54fe33f80268743ffc8e9ed0f1ca8b36a5f51093d5efac WHIRLPOOL 64f53b8d2e7ab5acd836085112966fedf19013948fac0c365565cb93b83d9d673139a812b66adbe7fc38314b1d4ff14090eeb8d54718e3c52710136ac6fe0701
 AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258
 DIST 68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
-DIST 7182233cc27e.tar.gz 2754301 SHA256 7e694d90969413972a51ad1202f3c042b1eca92591e43f1f94f4421a6be5c590 SHA512 03ae3c1732fb3dddebfe863aa05a4036fc1d871d63654cbd147d9a429d9feee61de7e0477fd9b66e2d644397c926b3d1f6750bae9e46da6c966dede697e0caf3 WHIRLPOOL d569b31065b6c0551ef5ea69622cf5a47b1d16afc8a6fff596832fcf2cb2bd2d7b61301cae3e583d1a0bafbc185dad724570303860fcb9a47a40ae586348f915
-DIST 8bd8e70d4a03.tar.gz 130507 SHA256 3ea7c4acd4c2f7b91588231427a8685010f8ce7eb0b9610457d6a35bf2afd6bd SHA512 a2a58d9e1aa4b23c05198fa9ce376e76c5cfbe6b687e9b91bb2461fb99f451ad7b4b23f2ca493506f6ba8e1ea3397deb88f9df9069fbd1ad9794153a86384816 WHIRLPOOL 51bb070a5cfbe1cc6d2deab3c5880ac291bc4202540200e6ca4a4bce8a16924ad079f51a60a6a3953f157f0c29026e4c4051cba996f16ff87e58558b638d2b6d
-DIST 946195011b30.tar.gz 2311091 SHA256 a9f56fbd58047adc9296800cd9c534375ef052074cd40ebc0da1f7db6ce09144 SHA512 fe7dd2191a2552c662393a6e320778449fa0b6659d2acd9e6af606952c90a61bfbe999c0c21e92b3848edbeb0c9aeea57b07a6e8aed80ce52430c46801416173 WHIRLPOOL 888a0fa2fa16420f18c46538bc106cfc5eb1b251d977c9ecf57478908dd36b4535886d2a9e31bf14d086f1520d7edc1f4e2357763f242d3479d350912cddea08
-DIST 96d4f04f2b7c.tar.gz 44950891 SHA256 afba9798a4f2407bdf2cd58d0a99d94bb76ae15aec6ad9cfa0375fb255b0032b SHA512 7cc4ccb8c62b7f3e54c464ae93de6b2a3cf850b149ed68b3e36b9bd1b0290a984453982230f1530975e87b145f82381a3d2e370758458babdf172a2afff19c89 WHIRLPOOL a679c7ddcf42b3857f4305af753f30aab6eb667c263142feb03d928a0e9b3310d4f982d8904981ce30a1fa496a372e8d334de80e027295c1bc2676940772d8dc
+DIST 6bb01322bb5a.tar.gz 44982865 SHA256 a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2 SHA512 2d52d37393921c297c8856b0b3e234f132f670e72da8d627cce19d87ddcec68f7bb402af3537f90e0ce044240948d4b9442ab7524c87f99652aeeaa5a757d43c WHIRLPOOL 8fbf8aca4b0612b691655ad63198f3d2af78fe19b9c3e5eaf2b61e472ac4d7d14add5643ffd710377d7a1c5c82aee9d1a6aa94a7fafc6381415d9ead79be5e7d
+DIST 97a8b625f6e9.tar.gz 1435633 SHA256 511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d SHA512 1bc57dcd36e9ebdff4be685936bb3c20d277358f112b7258ced6bcb57826b81df7bda5e7c6383831d26f496801daf6ef58bcb948e5debea76713ae1e43a599b3 WHIRLPOOL afd01b7cf293106dcead6768d1c67731927af2e37cf466925f0f7ac65ccded36b7c03c73949fd6ecdf10119f5052c1f3d34819ccd4570f2b80cc094d545d2e62
 DIST a567bcb7f589.tar.gz 4263355 SHA256 d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 SHA512 2abbd6ad72a5811963610b81ad3f59882fa0109bbffb69316f7bcadd218982abbb7b94ea41ddd379a0dad8586301e1d317226153d2f592876c56e7d338afadf5 WHIRLPOOL e712ee17b9e4e23a1fe54823218a79a45ab1ca11e23de2896b576a2034650bf8b151f01022e0d3f12421008fc1e8d8f9aa0bfc4cc6bce812dcfbbbab1c66af7c
-DIST aa3654afea12.tar.gz 3863916 SHA256 cc9a95c09be36753f9dd5aacd961400deddbdb757f8ea547cd7073f7ab7b87b7 SHA512 223951c2c9d659a0460711cfef332286b6790c7c2c4194d24d90cb41f36c4bba52dda1a533ee756f6bbed8bb7fc2a5775e2975122c238ea96eb0efc0975ab2b2 WHIRLPOOL f96a4c7f85825b63396bb657b0d64b1c5791bd7fd128b52fe7ee6efe583ca068158854634681c52be64df1ae3f23972a20d2ce9f12950c8a72ac7741fb0b594f
-DIST beecf0b9e760.tar.gz 9593942 SHA256 de7a5397a83bb7c7be2458809b576133e8a3b75dc62d62d2f2983b97c220dc4f SHA512 597f0d000240c6b19966008cf91afd3f0e6f5a074cc293717def0523feedb0251c166267e9d6c5c60aec46a8adaa8518e02e39c205e28bf248cc5b0bdb224fce WHIRLPOOL 6fa0b4f980dba08ae16143e722bb7bb130ebadb246e6bd76b1df71a35697ca799900640340976e89508ab132f05fcc056116771a1a816989a8d6e4fb60872a2e
-DIST cff92704c4e0.tar.gz 4261719 SHA256 dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f SHA512 d03f04a13e271a57b8a704ef1684cbf64da0519d579c4bd1aafa0d8e0bc241939018d8425f1b65f6999a7f0dc4b58eb5ba6ea8ed76b3ed5ce3299dd7cd094861 WHIRLPOOL efaabbca72b4471fa72679f071ed0a64184e3281ff7c1a301bcee1a131f3c7f91f93c9f42fc87d4c79e802074da158cdde96578a5eb40f7605c6fbc5b6880959
-DIST dc9234e25ab0.tar.gz 1453876 SHA256 911a049e735c1ab0dfa65426ada7a11494d51fec88126d34588b23f06ef7acf8 SHA512 86e600dc5f4f34b92d1bd92d8d2e8217749f06b1007a442ae1f1a5bc62d918cee1041f1a6e97dd8c880c15689abf71d6c4fe4b6875e4f5cdd6d6625a113c047b WHIRLPOOL 45981222063a22c12acb2caae578f4cbfd972d7b44c36ef100ca83cec0e8204c4970cdd065b2f91d256dedac661bdba21069a4e94b40a2c85d4b2f50a7909f37
-DIST icedtea-2.3.4.tar.gz 5043197 SHA256 ea859f37fb20904ffd40802a41396326f7e301fa6873d88d01bf4afef5a60ca8 SHA512 c236257579da2258571a995ba4180bcc2274cee6351a16503da51374fb39c60113064b6c125b81103f1ccc3ac4b609868771ee0647153ee6953d9b7a8763bdeb WHIRLPOOL 7b0f8db20f6818fe819644f8219ad13e2f6ca50b2e306f4784aeebc1fa4d0b798c29c8b9aeec7b4d08e5319e5a6739dcb2cb673969495b4b3c70084247703e8e
-DIST icedtea6-1.11.5.tar.gz 6411576 SHA256 258d81d957f8ab9322fbaf7c90647f27f6b4e675504fa279858e6dfe513f7574 SHA512 ba09bb5e6e9f1fc4781fbee69f72360ede4d22c560c3232c2316f240c61e3ef2919d9987ca6a9a74dd9ea3365ab03a54d7006cf8354054866267a7edee48346a WHIRLPOOL d1c5b02521da961dba08361a1a49841cf15e57df188347bad42976ed0627197185c6503834c392e69617a77861aa09d95f4a3bb8141031815bf8142e2efe21bc
-DIST icedtea6-1.12.0.tar.gz 6482285 SHA256 4f27f3f42b57836cfb11541736282ccfc22de3f4acc0e540560fcf5512d66ced SHA512 79a7b206438a5dcd6ad3a78a7a80f8d486325182ac1b9c1d22ae009147a22ab061684eba0bbf6498fc543b0b490f989170c71bc7f8175751c8f4a44071946c3c WHIRLPOOL a25d096865672fc1a0ffbcd9e03157a62d29e4c8cffaae05e714c44a4d43eacb6467b64193f8530a7b4bda56e63e6fbbf92df3d0dc0aca078c5b1fc5cac23671
-DIST icedtea6-1.12.1.tar.gz 6668139 SHA256 8e73a3939ba8c2cca888defc6c90811c959273a9bc7bd1352338a72cefcf1157 SHA512 db44d7674e51320984a12f684cf4c9d2392af4e671988359b7cd581b5a740a790eee710f28eff988ac0c666893311b8d0c7cf302c0e38b8b9d03f8683d07d08f WHIRLPOOL 40fc32696b807061b9d85a81beab8f1ef31a6da9a900075d50780fdf436230da46fa7af06d092048e8859455191135cc1ca5e6cc371f91469e7ae4ea653694c1
+DIST b900024eb4ba.tar.gz 2755366 SHA256 276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2 SHA512 b13b14420780e475f483ef0811b7903d73b8667c3d7ca881e89a386d485094172d269ce755df47caccf2527cc2928695b69884c674d1a9460070703d917b05fe WHIRLPOOL 6a17403196720a402eab9cd18aca5f5714710095a107e1617961efffecbb2b5345c104fa0fd3306cf702266e4eca4555c0a8773b725559c92c645e92ad7fb20a
+DIST bc0de5a0ece2.tar.gz 9393915 SHA256 4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068 SHA512 52a105b11916150f4c38158e53e5649a0185fa0e63ce055f1dc1dc961fec2921460216085971eefadc2a5f3aa468e78be7590a59f3c3ccdd9c91d23803f1d0ca WHIRLPOOL 8cc98d7b5ae839e75eb9ce0c88c99a71f867c1786a6d8698d4d14a5a0230b16cb26d17898e75355c91d240749c062223b3277a43f7ad2563da5c4faf4a79f9fe
+DIST d7feafb8427b.tar.gz 3864991 SHA256 81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941 SHA512 69a29126487707c9a84ffc8989915fc9d620d265683e264a490d89ebac5d27c2c2c3d044b821a476b8f76f2035fb41855022435cc90b66286451c65ad696bc03 WHIRLPOOL e8895f91e0845bdbb256c99f82eff8f830bb3774cecd8ad7540695740964e3ae32b6286891b2986a982c87fcc7d686cff5482734541020c866bfc8e73a8382be
+DIST dd8d1a8f222f.tar.gz 131459 SHA256 a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092 SHA512 ab827f6afc708b8a51ed523b2ea9ab42d57c926c9ffdfd22d4011c8209a89234855f861c72db04fdf3cbce71a6c175441fbba46e533e956bbc2e26521983d81d WHIRLPOOL 701ad8b553961f77ae4ed1725958572a0f8a2a94b92eade18dfad58848535a0f89ef2d0cf5b8b4bcc2f259fab02905750fc6789f1ef61d8c6a17a5c5ee9e6658
+DIST e0739a8783d1.tar.gz 2312385 SHA256 85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb SHA512 4d177b493b87cc5b2c92c85a4f035d7227743af2249c549f2dee2137b93a2f599d62e616e3a0a4f24f84abf26895e33fdbf6d3994118194f4a5f3cb1a002e157 WHIRLPOOL 72c61404b7d85142078020b42d20d4c5b0e0a77eb2fd8dcb49056f002706aba78e0da698db500eb88fa7a5ad5c57a223b2ea8422f5a04bd289e1a250503d2354
+DIST icedtea-2.3.6.tar.gz 5048411 SHA256 f55f2f2e5cdfa8b0429eaa56b4ecba7d63c701e867dbb636883c03cd8e64f4f9 SHA512 5484a79c80c3901f783a3a129e7a098d21ffed5a73bf8d3e300a7002d6a5c67e1d1b9ae1adc52de052dbde0757d7edbf9ebf101ac6f9dfcdb37378ceb5b23522 WHIRLPOOL 9c18db778810960fc5ed107e42f7d1236391e518a2ecfc6390693220c54950a04cf64f3faa41dfc28ab708cb87921cee7e873c71ffa2835b6c1476b34c2efd4a
+DIST icedtea6-1.12.2.tar.gz 6632211 SHA256 897a8834b8ddd6891f0eef46c0f799d11cbecf168c4383cfb26d0dad80328794 SHA512 9e219e3b9a87c9073a4759edcd1f416246085f755c7c9a3faf17cfcfed8a55b39e25511a2cd7d4526791bdd4d88063343b15391a6ee85a2b715c0cf0415e6ef8 WHIRLPOOL b97ee2c5a1168cc76299be468a3d11bba0ae31f69e0ea55745e60c0abcd195893e99ffa3408ea89385959d5d4f939a1fa77b1b73e8a1046effa607d512460c0f
 DIST jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz 298435 SHA256 bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 SHA512 fa3428d8997f9696cce4fa32c9de677ef193bc12236ef8b431af647b57d26725f4a3019abc87ade0cf10c7d6a745c18eb78e8e126d6842e788c8cefcbd2b006d WHIRLPOOL d1ca7dc677b7abbd600262f30c2c3774f502ef661f3dca60d4664c87b50b9a90c808e106f607a1dde7b3f4cf44a7a4a9e647877a2cc3332866b6b2bd34eb2a2a
-DIST jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d SHA512 8b479a23f4c2eb16100bb0745452c652849f8e18912756e2d9f8ac9cd395f4bcf89af89d6feda25c8ec41cb90b7f17bebe646637234ed360c65da2a45dbbac04 WHIRLPOOL b9ba7a0c73e16245c109f983435f00a9349c747cc5b5ef4592b8aaf7efc95af0992d9c897530a12e886e7f20687a290f70f3cb27529f1661bc37d76d00f2b2af
-DIST jaxp144_03.zip 5964999 SHA256 c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012 SHA512 fe65d396d0a57bc2b5dd2d8b00b0ecea860d4e5a5c9cb489bc5b9d7abd90861dedd26088184de93807646277c23d3712e8af79e56251f079ef22ed5a3b8f9a90 WHIRLPOOL 16ebcc9715ca221b7a6cc802367b33b74636bf7fe06035df798d47a6de1ec8ab370027fa17b37e6e5f4dd1a1059a4f8ffd236a4c969594d9a7479b198a6928f4
 DIST jaxp144_04.zip 5976385 SHA256 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c SHA512 9090d37f62f57d3dd8fb5981e3ce4a1ae87f1ef19abdb9df4775df1a48419cd16016c025a65516cfe3329885ac164cc45e4204dbc8d03239d368ebc962c824a4 WHIRLPOOL 6646fc6cfc83fbc26aef79cc219e008ee28fe4cf649ec4fc0e5bff045dd76b737c1036631acc9439137a50c2ee33dc7534b2de914877d1b695a3741ca3e6b1c8
 DIST jdk6-jaf-b20.zip 71243 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 SHA512 22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a WHIRLPOOL 2b02e883c7a2341ce927f402a9abc5a632a6718f713fbaa5c65133a0ac81a1a58a317b7e2028c309196805dc43146c591852c05144c64f2428938cb3ec4972d2
 DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 SHA256 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3 SHA512 643266da495f239aca1a08ba85af337e5ab50e5b859bffbccab64cf1c4099cae641d9741a20ca59c599c1285266a79489dec190d7fb15daa88c82b69ce97dbd6 WHIRLPOOL cbd0614060d887ce5e1ee6aefaa213265ee45ae11b3f0f90eef0cfa5ee5db1c35d8209bf1d2dab6f5966af22ab14312891081cfa6ca4a11de92f272f33a2ea20
-DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227 SHA512 a965efa2fbe95a32988f78f1e51c42321ff42c1e631d5062aff204ba42839d6e05455f1ae039540e38ec947b50a635984cd3302eb09e81962575510309374e05 WHIRLPOOL 2dd759c4d8a23f0eb66bb28e1b48842fa3984d9796833bbbb6a3305a49d9cb1f2ce19b59c93b9f2a33d679559bf893fd62b4f831aa76bb053351e219639d9286
 DIST openjdk-6-src-b27-26_oct_2012.tar.gz 45789350 SHA256 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 SHA512 4198f11b2f49c9bc5ffbeadf2d0d87dfa413a918d49faff3a043266bf4a2fa99579fba3c6d75164d87e88b8fc5c97c3c1527560eb25c55cdd42ad813c8e175e8 WHIRLPOOL 5038258710f2c0eac1a5a1957629998d931d49a6145450485b84e21988d8fdfa5127dc0852067319fb2ac054f621ec511c0d8e01961943c7e4a223049317b894
-EBUILD icedtea-6.1.11.5.ebuild 10670 SHA256 7ec451b5e53b50a634cc026e47ee701695beea59dbd3794bf224e6557d6faa7e SHA512 83bb6f3c0a6fc2fc2c67b16f7e20e2d40b9422f0baf3b872adac8a782a5c93b721a6674f3d204d537c4556d48037f7ced570cb9f4dc75ebcdae84b49da5cb93d WHIRLPOOL d80fabe21656692166851bcb1052d41f4be3245d5956064244fe265205c062593dfd0003d2c1cc66fc2d494c3fae0fc1f6556d10367dbc9577a24f5474a4338b
-EBUILD icedtea-6.1.12.0.ebuild 9862 SHA256 a6a25bf70815e1cb234b626ead974aca6b2382cf8304f2cf26eb638bc974f34d SHA512 cc5687b5abc5f0d98d9f5f79ee1bf20bed4d7033f4ce86aac5b02a42816a3188459443663e070dabc261192923d044dd8c3b657e3864673f02b706309a281b19 WHIRLPOOL 9599aedbe84a48b31e936dcfd2d82aba07a7643a33ac829e3ff3c4295689f29295d7e36c567b1dae8a5ec8665808b222c8d7b43a1009f3e509c548d20898bae3
-EBUILD icedtea-6.1.12.1.ebuild 9777 SHA256 f8078fd5e91284029c5ed0ff0ef1df0d81ff983f2a25928fa3912d935c3db3b6 SHA512 b583370bfc5d6a1e746464f20eb99b57bb5873d5fff54813ae69eb0d989b2367db0e3d339b3c5a2d85a83fdddf17673c912e104fc0d306b22fc6cf96a05e12bc WHIRLPOOL 2d0e39960d5b2d19547384b21d1da13251e88668a9c80d3ba22e5044f2b474f36f2a43aa7a55c4e009e024f321afa91cf406b1a9295463d28c0c3f6567b41ee0
-EBUILD icedtea-7.2.3.4.ebuild 10854 SHA256 a7e87339bdd132e1a7c7495e825b1f077412dd501f4a7a77d149c9f3a6b402bc SHA512 67434d0447f6640d7304243405630cc180d2719556dbd797ff947c13298efc7e1874b5adacd6157137ebc86da90da70d5796de21be5005aac7b7caf7f018da61 WHIRLPOOL 979c91ff2a230633a4eebd5802850c520e4c8d09b745e03dd6facc08701b62b596cf35396413e82aba6cf5615f6ffa08550f7b898f14afbcae11cf605c755045
-MISC ChangeLog 20398 SHA256 1c7787c0f8dbf9c890d693672f2a0f93381018bff82354cf7f422e11f196286e SHA512 e0a92c22db2c6d83cd10d21bb1033f7f3beaa23715a7e1247b90208025b7c0a25392e9546435e1086a588c4c184b60251479a7382126c4ede60a38de2a0257c2 WHIRLPOOL de65b3d02579318b2cd7813e4fbce16e46b1752bd96c78cab1c81d82eec292110c0d6dcbeb5c95916f3124c5abc28693debf18694ffc74d095400f31b8836230
+EBUILD icedtea-6.1.12.2.ebuild 9777 SHA256 a019c646cf409e61e386dac73358f1db415936138c6dd435fffb1ea93f775723 SHA512 5175cbeb21f197b7b9eda554cb1b5a977b14ddaa045a6c88625ea81876d3948d026a6ec43a8b9229a76b4f6a9859dd534bfaef0992d8c49524acef1ec351af5e WHIRLPOOL 746c1170f2412dd103bfa136d29b1346bbda891e13744c95f169d77392b0bb322d33b2cb123381c08a038530770924b65c6c0dfc1efaf974b070ae881af94c11
+EBUILD icedtea-7.2.3.6.ebuild 10836 SHA256 aab554312810c9e5147510c4be5292bb538e406cad5db693e6545cef661bbfd4 SHA512 f7b459af0746cb8abdb2f6c20d489409ad308f89a5eee3b3dd3f3af2e60583493ed400c73b1550b77a9a5eb2744085a20717b531fe519c4765c053a1a9309f35 WHIRLPOOL b54252ea60e7f0ac70720bcf34668ed9598338e9887181f21d09fa457e60e42b7852c9b954ee94e8c461eed8bc15c9e7884ebec04cd01e4360b74f0537425e38
+MISC ChangeLog 21041 SHA256 c4e6dc4bb17f904c7840e452553e73a1c469eea5e957cd5125a406d5ac922668 SHA512 16a47c4d2eab49bc1351d926dfd5371f276ea7ba855347ec1c08b638a77290b9bc702a01d472607bf6d1c8dade4816bb10f6f3a3c6425d5e314ffdacb7d8c8f1 WHIRLPOOL 5369c8187ae75e0621be349eb58410a218f4302e4fb524525c956992f23fd206f2d550af9517ff25347fda6c689169e7dc48f2ccaa87979b8cbc802e4077d0dd
 MISC metadata.xml 1493 SHA256 13532771b5aeb1b23a22b1ea5947feabe6011d567d15e38e676e4045e8adcf12 SHA512 ecd4563d7550be63e20371b67510d16582d661914df3ccad31faa59e173aa51d81a3ae6b19518dfb86bce23f231ad0fc44f042ff187613fe2ec9680f1621061d WHIRLPOOL 3bb02e03a422667191a98bc0cfa695b0f35a565d38b979f413b2a0768d6fea2d47692279433ab85e4871ee5968e81e1e229a09f134f68e0c0966cecb9646a23a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRGIglAAoJELjwI6Q8XPdaae0H/iTnYINnZ5vXIfh5qiQjdOzf
-VNXkQ1oNLrAIQgawQYDEq/N4sJiNjdQMTbOJAPq+hXYrrVm4/+ALSYJCyAi6Rv9v
-qAFG0BVGT+jEpZCBqUA/UHoDRls2bL8yHkqRjYh/SabKzEPxC8i+P9jaZrocc1tU
-3pH+sn4fdhNwnn72rq50KYKip/26LCCt8Mp3zI7wmonbXlGaer6bAqqVFLVXy+UE
-w7nDYTKdHk4V0ODhLJn1/lMMYApkeKOaOX1MqFf/c91b6MPjFGo9vfHT3//4s4p/
-HnCuaNi3Rf50yKgnU4bLFcbEUiGhI/TDl/FbHRp7FpGe/qDjBYjEvlgGlOalhMQ=
-=BhcU
+iQEcBAEBCAAGBQJRG+MqAAoJELjwI6Q8XPda7jMH/1Mv9oeQSLKeeT6IQM5lmk4u
+87i21FgL0y0Havq6G5XCJrKV1P2hYNzg+GGzlGdTIIWYSQowqKecPmA2TznyIE9I
+5u6YXeEPYA3R3D71QhwOoo6sktcE/VMJBbZ+wBOYMRHiJIFGtSe/0wdtWxEYmZCq
+ig6G4x8eegjDiZhLOGHZvKWveSf6lKRflUwRNezz6iePob+2hqDoaaXEWXlmB95h
+i2dDUn+fNqCHp4Cn6c0osCq6LkBQVcZ8QmM45oz/HCdjK6Mh1VpBqD/MYWRBW30Q
+JXtM++SWbNniRyoXBivAG97RlQ0+OL2mJCwLp8KuZ4a4PnUSXGDCrruhwzxssXE=
+=h/I5
 -----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
deleted file mode 100644
index 25cf27af3401..000000000000
--- a/dev-java/icedtea/files/icedtea-6-pass_javac_memory_args_to_vm.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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-6.1.12.0-parallel-unpack.patch b/dev-java/icedtea/files/icedtea-6.1.12.0-parallel-unpack.patch
deleted file mode 100644
index 53c63290dd04..000000000000
--- a/dev-java/icedtea/files/icedtea-6.1.12.0-parallel-unpack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Fix parallel unpacking #453608
-
-diff --git a/Makefile.am b/Makefile.am
-index 48029bc..34882a7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1099,7 +1099,7 @@ clean-extract-openjdk:
- 	rm -f stamps/patch-fsg.stamp
- 	rm -f stamps/patch.stamp
- 
--stamps/extract-cacao.stamp:
-+stamps/extract-cacao.stamp: stamps/download-cacao.stamp
- if BUILD_CACAO
- if !USE_SYSTEM_CACAO
- if USE_ALT_CACAO_SRC_DIR
-@@ -1124,7 +1124,7 @@ endif
- 	mkdir -p stamps
- 	touch $@
- 
--stamps/extract-jamvm.stamp:
-+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
- if BUILD_JAMVM
- 	set -e ; \
- 	if ! test -d jamvm ; \
diff --git a/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
deleted file mode 100644
index 97ca435d041a..000000000000
--- a/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Author: Ralph Sennhaser <sera@gentoo.org>
-
-The idea is to apply the pax markings before using a freshly built jdk. Be it
-for running tests or building additonal vms or after bootstrap to build the
-final jdk.
-
-There are currently two types of pax markings with the userspace utilities
-chpax and paxctl. Both types of pax marking are base on modifing the ELFs. A
-third type based on xattrs is in development.
-
-diff --git a/Makefile.am b/Makefile.am
-index 82ef261..e17fa5f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -421,8 +421,10 @@ else
- ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
--if HAS_PAX
--ICEDTEA_PATCHES += patches/no-test_gamma.patch
-+if WITH_PAX
-+ICEDTEA_PATCHES += \
-+	patches/no-test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-@@ -450,7 +450,7 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/cp40188-opengl.patch
- endif
- endif
- 
--if !HAS_PAX
-+if !WITH_PAX
- ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch
- endif
- 
-@@ -1359,6 +1359,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
- 	  $(ICEDTEA_ENV) \
- 	  -C openjdk \
- 	  $(ICEDTEA_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-@@ -1586,6 +1587,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
- 	  $(ICEDTEA_ENV_ECJ) \
- 	  -C openjdk-ecj/ \
- 	  $(ICEDTEA_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
- 	@echo "ecj-poured IcedTea is served:" \
- 	  $(ECJ_BUILD_OUTPUT_DIR)
- 	mkdir -p stamps
-diff --git a/acinclude.m4 b/acinclude.m4
-index 503131c..e80b209 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1677,3 +1677,49 @@ AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes")
- AM_CONDITIONAL([CP40188_JAVAH], test x"${it_cv_cp40188_javah}" = "xyes")
- AC_PROVIDE([$0])dnl
- ])
-+
-+AC_DEFUN_ONCE([IT_WITH_PAX],
-+[
-+  AC_MSG_CHECKING([for pax utility to use])
-+  AC_ARG_WITH([pax],
-+              [AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
-+  [
-+    PAX_COMMAND=${withval}
-+    if test "x${PAX_COMMAND}" = "xno"; then
-+      PAX_COMMAND="not specified"
-+    fi
-+  ],
-+  [ 
-+    PAX_COMMAND="not specified"
-+  ])
-+  case "x${PAX_COMMAND}" in
-+    xchpax)
-+      case "${host_cpu}" in
-+        i?86)
-+          PAX_COMMAND_ARGS="-msp"
-+          ;;
-+        *)
-+          PAX_COMMAND_ARGS="-m"
-+          ;;
-+      esac
-+      ;;
-+    xpaxctl)
-+      case "${host_cpu}" in
-+        i?86)
-+          PAX_COMMAND_ARGS="-msp"
-+          ;;
-+        *)
-+          PAX_COMMAND_ARGS="-m"
-+          ;;
-+      esac
-+      ;;
-+    *)
-+      PAX_COMMAND="not specified"
-+      PAX_COMMAND_ARGS="not specified"
-+      ;;
-+  esac
-+  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
-+  AC_MSG_RESULT(${PAX_COMMAND})
-+  AC_SUBST(PAX_COMMAND)
-+  AC_SUBST(PAX_COMMAND_ARGS)
-+])
-diff --git a/configure.ac b/configure.ac
-index 580840e..f37ef68 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,7 +51,6 @@ IT_CHECK_GCC_VERSION
- IT_CHECK_NUMBER_OF_PARALLEL_JOBS
- IT_CP_SUPPORTS_REFLINK
- IT_CAN_HARDLINK_TO_SOURCE_TREE
--IT_CHECK_FOR_PAX
- IT_LOCATE_NSS
- 
- # Use xvfb-run if found to run gui tests (check-jdk).
-@@ -189,6 +188,9 @@ IT_WITH_TZDATA_DIR
- IT_GETDTDTYPE_CHECK
- IT_JAVAH
- 
-+IT_WITH_PAX
-+AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
-+
- dnl pkgconfig cannot be used to find these headers and libraries.
- AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
- 	,[AC_MSG_ERROR("CUPS headers were not found -
-diff --git a/pax-mark-vm.in b/pax-mark-vm.in
-new file mode 100644
-index 0000000..bdff735
---- /dev/null
-+++ b/pax-mark-vm.in
-@@ -0,0 +1,13 @@
-+#!/bin/sh
-+
-+# Taken from Gentoo's pax-utils.eclass
-+list_paxables() {
-+       file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
-+}
-+
-+if test "@PAX_COMMAND@" != "not specified"; then
-+       for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
-+               echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
-+               @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
-+       done
-+fi
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
---- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \
diff --git a/dev-java/icedtea/files/icedtea-7.2.3.2-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.3.2-pax_mark_rmic_java.patch
deleted file mode 100644
index c66525332b00..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.3.2-pax_mark_rmic_java.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..85ac971 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
- if WITH_PAX
--ICEDTEA_PATCHES += patches/test_gamma.patch
-+ICEDTEA_PATCHES += \
-+	patches/test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
---- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \
diff --git a/dev-java/icedtea/files/icedtea-7.2.3.3-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.3.3-pax_mark_rmic_java.patch
deleted file mode 100644
index c66525332b00..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.3.3-pax_mark_rmic_java.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..85ac971 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
- if WITH_PAX
--ICEDTEA_PATCHES += patches/test_gamma.patch
-+ICEDTEA_PATCHES += \
-+	patches/test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
---- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \
diff --git a/dev-java/icedtea/files/icedtea-7.2.3.4-parallel-unpack.patch b/dev-java/icedtea/files/icedtea-7.2.3.4-parallel-unpack.patch
deleted file mode 100644
index 8819e3bf7c9d..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.3.4-parallel-unpack.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Fix parallel unpacking #453608
-
-diff --git a/Makefile.am b/Makefile.am
-index 3f96d92..714cefa 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1289,7 +1289,7 @@ endif
- clean-extract-cacao: clean-cacao
- 	rm -f stamps/extract-cacao.stamp
- 
--stamps/extract-jamvm.stamp:
-+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
- if BUILD_JAMVM
- 	set -e ; \
- 	if ! test -d jamvm ; \
diff --git a/dev-java/icedtea/icedtea-6.1.11.5.ebuild b/dev-java/icedtea/icedtea-6.1.11.5.ebuild
deleted file mode 100644
index 57c9ea4fec28..000000000000
--- a/dev-java/icedtea/icedtea-6.1.11.5.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2013 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.5.ebuild,v 1.2 2013/01/23 17:15:27 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 flag-o-matic
-
-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 #422525
-	epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-	local config bootstrap enable_cacao
-	local vm=$(java-pkg_get-current-vm)
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	if [[ ${bootstrap} == enable ]]; then
-		# icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		# Don't use eclipse-ecj-3.7 #392587
-		local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
-		ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
-		if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
-			ecj_jar="${ecj_jar%/lib/ecj.jar}"
-			ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
-			ewarn "Found usable: ${ecj_all[@]##*/}"
-			ewarn "using ${ecj_all##*/} instead"
-			ecj_jar="${ecj_all}"/lib/ecj.jar
-		fi
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	case "${ARCH}" in
-		amd64|sparc|x86)
-			if use cacao; then
-				ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-				ewarn 'If so, please rebuild with USE="-cacao"'
-				config+=" --enable-cacao"
-			fi
-			;;
-		arm)
-			config+=" --enable-jamvm" #IT1266
-			replace-flags -Os -O2 #BGO453612 #IT1267
-			;;
-		*)
-			config+=" --enable-cacao"
-			;;
-	esac
-
-	# 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}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
diff --git a/dev-java/icedtea/icedtea-6.1.12.0.ebuild b/dev-java/icedtea/icedtea-6.1.12.0.ebuild
deleted file mode 100644
index c44bf89da67a..000000000000
--- a/dev-java/icedtea/icedtea-6.1.12.0.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.0.ebuild,v 1.3 2013/02/05 07:33:54 zerochaos 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 eutils java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-OPENJDK_BUILD="27"
-OPENJDK_DATE="26_oct_2012"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-JAXP_TARBALL="jaxp144_04.zip"
-JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
-JAF_TARBALL="jdk6-jaf-b20.zip"
-# Download cacao and jamvm regardless for use with EXTRA_ECONF
-CACAO_TARBALL="68fe50ac34ec.tar.gz"
-JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.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 ~arm ~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}
-	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}"/${P}-parallel-unpack.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"
-
-	# 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} \
-		--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 THANKYOU
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
diff --git a/dev-java/icedtea/icedtea-6.1.12.1.ebuild b/dev-java/icedtea/icedtea-6.1.12.2.ebuild
index 4f59b0c4ef0f..c0bd58b34384 100644
--- a/dev-java/icedtea/icedtea-6.1.12.1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.1.ebuild,v 1.1 2013/02/11 05:51:50 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.2.ebuild,v 1.1 2013/02/13 18:56:54 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
diff --git a/dev-java/icedtea/icedtea-7.2.3.4.ebuild b/dev-java/icedtea/icedtea-7.2.3.6.ebuild
index 0ab93b7f7061..30fd206c5c24 100644
--- a/dev-java/icedtea/icedtea-7.2.3.4.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.4.ebuild,v 1.3 2013/02/01 09:12:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.6.ebuild,v 1.1 2013/02/13 18:56:54 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,18 +9,18 @@
 
 EAPI="4"
 
-inherit autotools eutils java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
+inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
 
 ICEDTEA_VER=$(get_version_component_range 2-)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-CORBA_TARBALL="dc9234e25ab0.tar.gz"
-JAXP_TARBALL="aa3654afea12.tar.gz"
-JAXWS_TARBALL="7182233cc27e.tar.gz"
-JDK_TARBALL="96d4f04f2b7c.tar.gz"
-LANGTOOLS_TARBALL="946195011b30.tar.gz"
-OPENJDK_TARBALL="8bd8e70d4a03.tar.gz"
-HOTSPOT_TARBALL="beecf0b9e760.tar.gz"
+CORBA_TARBALL="97a8b625f6e9.tar.gz"
+JAXP_TARBALL="d7feafb8427b.tar.gz"
+JAXWS_TARBALL="b900024eb4ba.tar.gz"
+JDK_TARBALL="6bb01322bb5a.tar.gz"
+LANGTOOLS_TARBALL="e0739a8783d1.tar.gz"
+OPENJDK_TARBALL="dd8d1a8f222f.tar.gz"
+HOTSPOT_TARBALL="bc0de5a0ece2.tar.gz"
 CACAO_TARBALL="a567bcb7f589.tar.gz"
 JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
 
@@ -156,9 +156,6 @@ java_prepare() {
 
 	# icedtea doesn't like some locales. #330433 #389717
 	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${P}-parallel-unpack.patch
-	eautoreconf
 }
 
 bootstrap_impossible() {
@@ -191,6 +188,7 @@ src_configure() {
 	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
 	case "${ARCH}" in
 		amd64|sparc|x86)
 			;;