[gentoo-commits] proj/java:master commit in: dev-java/icedtea/

["Vlastimil Babka" <caster@gentoo.org>]

commit:     965ba04666c44a5da6719f0e0ce748ef801f8edf
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Mon Jun 10 00:39:45 2013 +0000
Commit:     Vlastimil Babka <caster <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 00:39:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=965ba046

New IcedTea 2.4.0 release: bitly.com/11Bzajd

Package-Manager: portage-2.2.0_alpha173
Manifest-Sign-Key: 248BDC07

---
 dev-java/icedtea/ChangeLog              |   6 +
 dev-java/icedtea/Manifest               |  43 ++--
 dev-java/icedtea/icedtea-7.2.4.0.ebuild | 365 ++++++++++++++++++++++++++++++++
 dev-java/icedtea/metadata.xml           |   3 +-
 4 files changed, 400 insertions(+), 17 deletions(-)

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 939a0fe..164e780 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*icedtea-7.2.4.0 (10 Jun 2013)
+
+  10 Jun 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +icedtea-7.2.4.0.ebuild:
+  New IcedTea 2.4.0 release: bitly.com/11Bzajd
+
 *icedtea-7.2.1.8 (12 May 2013)
 
   12 May 2013; Andrew John Hughes <andrew@gentoo.org> -icedtea-7.2.1.7.ebuild,

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 7997182..80a74c4 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -47,6 +47,16 @@ DIST icedtea-2.3-jdk-8e91101e36f0.tar.gz 44999191 SHA256 349009abfc8df1575336648
 DIST icedtea-2.3-langtools-fd956199cb82.tar.gz 2312634 SHA256 2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12 SHA512 d52833753b1692e61a105815de351c30ea1f047fd2fbf007ddf3e111c8fb63a2254083f941637eedab175dc708e642dcec0c87f431f372110d30e69ce1070e55 WHIRLPOOL df88d5a87ada5dd3b2b0a7c7b4e24b3975257b807e53c96fc9f63e45cefae2ade5ffed09ec7c17bd41835c04b283f322b92fbf2ce5c2fb1cf2a29a716cae6c64
 DIST icedtea-2.3-openjdk-12b96a57263c.tar.gz 131726 SHA256 651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc SHA512 2f16e5ce13db60d805a4f784847a0ff377d334cdc054cd684c7662cf895fba5bfeabfa40184bece81d7be853fa91e7cd8f85e2e442c7f2096c7e6d2ca40b336a WHIRLPOOL 72e7e401117ded89691a1ec0595c28c3523ec259e5708c45beaaa7af783d9a53fcc0e43b934005d855305c5d6a3ceb73c03be161f9269f207b9f4529164850fa
 DIST icedtea-2.3.9.tar.gz 5056166 SHA256 7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da SHA512 93fd7f51ce9ff8912985d1754bc2284621356bca39a1a2906a317d8509edc1d05f212e9edb9ab34f90a649c11ea87924afe18b7c0f642310b4f59299dc2fe174 WHIRLPOOL 87b0eb3766568f7a9e4e47d6cc1e7273061a42a74ba0bc9a50b931b6669a8ceb78213c3bb2417cab63ef151e4a0281505ce375ef039c59294dacd9d5ccb08d1c
+DIST icedtea-2.4-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
+DIST icedtea-2.4-corba-71d5ec2f3dfb.tar.gz 1437142 SHA256 0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c SHA512 183cdb392910197b6341e6a29dc0fcbe5bc3ded9fdb39c2903b8fab10233c8a502dc4c203333f85b3b885560a9d72b2ccb709a23a6ca6999efc04bb34a3541d5 WHIRLPOOL 97a97d0e0e2e9d67fcd5858ea93f30e3cb3c9eae7f44175f5b152b924136ab0378b4dcf056fa147a799c520124c217bdf44b07f5ac67ed049297f005fbe7c6d4
+DIST icedtea-2.4-hotspot-c67fd7874b1a.tar.gz 9586827 SHA256 34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d SHA512 25bd0701412a7525410b84d21a3021f11f0e2046c9487e5ef13a22ac8e4418f0e516e60769d76dfb08d223a8e4af415ec58fad4f4b5417b3386235f5b45a2018 WHIRLPOOL cc9257787f9401539985739240049d0548e0c9bb40717c85a4e9cb7dbf3c876d2ac785dc5c07f336961cc48385160554b1b474af11c5c1f6427e935bfd35da7c
+DIST icedtea-2.4-jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz 314689 SHA256 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 SHA512 dd5e7b122c82987b9508ef809c7bbc797f509ba817a72852d708e23039b2f2c7efef4ee0431ec0e0a0f7ac612928bb9bf49eb80b476494c4b3176337aedbf2dc WHIRLPOOL 7e4366d19571ecce408370454905772393af86bbe88039911b495154a45dab8348aaf02ce6a1ba6be84dc991ae7e636d74e10ef53ae7f273ba6f0694a8421bc9
+DIST icedtea-2.4-jaxp-5eaf3bca7f68.tar.gz 3855961 SHA256 25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd SHA512 6038e236e22900e1fefa584cc37cd32fd92f5c015a6b4cb45aa4e1f396af68061b2afbcef58e9bbbfec8262eefcb7a2430ff5f4f9960af2f0e241eec59077136 WHIRLPOOL 20aba3d3ced5025ab63e35b15a0ab99fe5e86293c38ffecaa60f4f90d1bda6817b654de755e36fa3858aed45693b0ef90ed5e7e255c302718fba0fc3616db107
+DIST icedtea-2.4-jaxws-9d2007a13c02.tar.gz 2758578 SHA256 4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456 SHA512 b1b7ea0f1370e4e39d08b50f0488e6dbd3aafe57269289512e23397897fbfb79225fa246d204d6c8627c482aab6d408c34ffec7a87aa29518acb5e736b3d56a2 WHIRLPOOL 322c7189851efa68f5c9c81c3786ba0958a20a0e017561965093aa2eec68393b6e075d10d77149e916dd52b0a69ab3be7e8e9d58080fb6a95817e438d44e97a8
+DIST icedtea-2.4-jdk-29ce11184945.tar.gz 45161099 SHA256 13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352 SHA512 03c58ca778b92cb8d8d4c1d41b677882880f8945cf2bbd091d449a66b4b99d183cd90685956b7ecccac5591550e825eb5930db12a524cc567627a8a36a028937 WHIRLPOOL 0136dab7c5895056053a0cf0469cd61f08a3c2367ee15059f8497504da1b0ed12f3d2c275b962dfa0d78c8d2f712a4a88c9d3ef8ffaf94cfc7f7bdda1a6a8c78
+DIST icedtea-2.4-langtools-ffb1b6bc4750.tar.gz 2314902 SHA256 80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3 SHA512 7017d869092228a8030a75119756c0fc559d9d7e1b919cc416a423aef5cc5e8750054f4e6956bf9e58bbdd0c7704bdcdb991852c92ff22a787e38ffcc4d33299 WHIRLPOOL d489392f4422c57b67af1a29326cb257667538685913f852334a72742d3a85f0ef3871f15ee5f629461b0ea7d3d4ea6c54f38af1323ac0b61f5aa40411a75125
+DIST icedtea-2.4-openjdk-9c74cb4a3ae8.tar.gz 134492 SHA256 4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579 SHA512 9f87377b36a9273fcf250f9f05c175932848cee2bf4d1f5022f603250af5353290ac823eb0d8b05a4405f01a667e73732cb05cd9da28a10c01cb9fedb2d0579b WHIRLPOOL 2e95d5884da4179265bb5cb3e1d53dd7426972044c483358399d4936220cac61fcbe4a5752a07a677894bbfe7a7d4a8ead7f79d53efecc6501d8e8fc4249fed3
+DIST icedtea-2.4.0.tar.gz 4793749 SHA256 be030583f0216151bd4b67b354085bf957b532d7bd2d67f14166bb6a1fc5497a SHA512 769475b16f502632c2f32ed4552dda10b382896aeea365a3fa7e46cc6d8e4719348a9fdddc24b77b4f457192714a961d60abee3e0c9f5cc12b8cfc1a80a6117b WHIRLPOOL 50654a8ea67b9769691e8aebbae1b70ef2fc98c09bcd87289e1c522c4cc8922ae15d701de9f6f534d5ab096146a34b3038b96dccf78511ff34f90592624fb9c5
 DIST icedtea-3.0-cacao-d6264eb66506.tar.gz 4210323 SHA256 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c SHA512 9867eab28944e2ccf82555fe385efc4494068b087789b0a5cc2ed94723b442e96b7e7e19ec3e2c670608ba8336173325690f413d7779c35fedb108450ab90237 WHIRLPOOL 184eee0d85ccd783e7b95a5dc560b1073c068107ed4cdd6d877b1ff14fdf7c199f61ea8cb01c1eb63e19c2de22b45840dc0841a7e099413194b376a1bc6fdcb4
 DIST icedtea-3.0-corba-2a00aeeb466b.tar.gz 1456877 SHA256 fd30dec3d15ad284365facb0a9195188c95033e908c8c247d137046fc501b2df SHA512 de8e7a1138dd4cab8abb2e07ef25dec14b8001175335bb3344563fd21e01bd64a6d96a894f102fcbf250a49eecb06f17266a3397be292ba8967e83325f01d4ed WHIRLPOOL 68c091c72d19cbf7730b48fa9ca92810e8c63525b4f3df3e3398883edf2ed0a0d6af16a3b3df8411451d189d9dd5a044bd2ee251805aeb5790b619bfd4684d32
 DIST icedtea-3.0-hotspot-65b797426a3b.tar.gz 8885242 SHA256 a91ac222d0cd8fd2d3e02bb5ec53d49d3ecebffa2dc4506c86679709217b2366 SHA512 4d23f1b9b2ff5b39c5b4d89437dac394e830b0daff53cd64f69675cd139a9f8b41c4ca63af0b57d5c43d0307d54b08c785b4af589b65442824172376d2310edb WHIRLPOOL 5fcbdbb7b3e20657c10172c297486e4756c05dfdcd2ac1bf833a5c037fb852dac6924767adba07a9681edcaa6c6b57cd4296226a9cfac8ab54b1ccc9cc036abe
@@ -73,22 +83,23 @@ EBUILD icedtea-6.9999.ebuild 10505 SHA256 1e838ef1ece737538726337e022b2866d0022a
 EBUILD icedtea-7.2.1.8.ebuild 12034 SHA256 e314720ec518ff3dc898fbc597ed96f44c00625d2a54a4e5ab085dc3b5a163e9 SHA512 b34a11845ffa5742b6f0b6e0b55171983d5e2b75b5c332d7247fa02895a8f6df45dd170a13d9ee33bcec1edf7042f823a526f764b14fa75d4176c2e0d177f9b5 WHIRLPOOL 7f458008d1144a23b2c385401828954f48d0f7c3ee680e091c50c71f5ea89d5a6454d186df90c0d19c817af855e6f0e35151837fdc15aed5e7abdd3060e1ca2a
 EBUILD icedtea-7.2.2.8.ebuild 11985 SHA256 83bc50a8de33e07ddb23d284728d1acaa5bf43202b8c488f0503e582a7c28a38 SHA512 407a2419513bf2cffefe5bd7c8369d33f6765fe4bd264b830ab7ec6231ac3e10442c976e534de3d0f17d2aea96f1b6dcdaf6663ac4d32b7d2cda9f969f6e9ef6 WHIRLPOOL 1495d8588126ad5f7673f8f2ccd6b24fac97ab88f392c440b6ae498cd60b4aace7499a98d071330adb78af77e5e1c14f116bac6bea91a36223f044a16a8ff32f
 EBUILD icedtea-7.2.3.9.ebuild 12320 SHA256 90740046bae71f02edf0fa0c10dac591a0b7cc3838eeed962e1d92413414c894 SHA512 029294c3d2eacc3598da1cc1f40164f3a370de575d1778893a4ea7a7838da02bb82b2022167163dd557a898c7c50e3a8a12c98a25b521fa84a3645986653dc2a WHIRLPOOL d2b8bf12d9267a5aee808fea9d721e1321d9a8cbbd1fb9d977393eb3f5502bb61ecedec279ee9df0df5574d7133d03c81d178fb708f1361a0f649b939675ccf9
-MISC ChangeLog 74248 SHA256 aa92df8ff01d2a470c9b40d88ed834d1efdc9b1b6bd0af4fd3083c26eb784dff SHA512 beae1b3b0030ae6457b03ac7010f62e4d18102c4bcf9f57efcc8ed9af44402ff4e909d0532308dc639611b7aa0711e022470df1b2c23d816675be96b89899f08 WHIRLPOOL 39cb79e1c5e955a27e42f6260bd253fe3ce2897070edcc0475a48f5bc2cdb9a677c43c849f4b334dbfcaebc5173b668ea15381de49a034a345e01dca71e2be37
-MISC metadata.xml 1436 SHA256 2d401635b3f9ab5b158e71d40b2d7704224ae0a027fcf7c4c7f7c5c29935196a SHA512 e345e46175edc1bfda1e798a87a1540e9a588f44e93673684b0d13bb88767c40e3482f73adca6669bea4880a45a69b6af194b361c6927a883fbe747fc4ba0e61 WHIRLPOOL 449c34d2dbbef9edc1d421dd91f374ab40adcebb3d8785710fc98e5ccad551fe6fca8b79adb2b8606c320b9af09f66eb6b9f1aba3b6d7f8481d665503e4da0da
+EBUILD icedtea-7.2.4.0.ebuild 11873 SHA256 2b0d3a94262eca08b9863a1012db08286cfedf4c5958b7324d7e569e0ab03f8a SHA512 669cffad35ecfe92fbfdd11ce3a80c616a3ded680977ad8d96649cd5c596192ecbc2970565610b0ae78d01c0b960439317dc21549b6917f1e4dd7e6fbb72f321 WHIRLPOOL 23d02cee1e63f6f15021eaddd592146ec6d3202908056a744d7e98ba8b9760dac9c56f73722ef8382e99a2a298a192ac25c06637ba71f63294b0bdd3a4be792f
+MISC ChangeLog 74417 SHA256 a8ff0779d15c8cfbc07df426856e7eb4e0ac3c6039cda2b37e6ce87d412d6622 SHA512 48810536894e666996046ac63c84781451a1e4491c16d5479e5ed480c6227879f876eba870d1107311ba4c10ad2213fb5e97d5b1cc120d42cb9bcb6d4a7de826 WHIRLPOOL 860d96adcf9e62d77fe32077049f3a383af9681a54156ff1ec3ada4cf6e07cd80a78e5ef95340ec9b0fb107ceb8bc6075c5cdfc83c42db6deb0aa4bdaaecc74d
+MISC metadata.xml 1520 SHA256 3a075d6201b9c7b16a83725defac31dcab277bd80141a9643bb2858f1a52e384 SHA512 07a8ee0749962e557eaa994ac4e03f740ae2796cf5477905ff0fe54cec7cf2390a8e29e1c47db6ae6531d60b719aa069d766336e83f09d527858a13bccfc33cd WHIRLPOOL f269aeb502965fb3cc2d074f5f4cee899d3a64d0d319da3895418315cde0806074ba874a968b2f3ea0c710bb0cfefd6adb7c4894f486b5513813e12e517ad890
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRj/rUAAoJEDuWpXgki9wHsaUP/1R3kLdtur3R6hO7Nsnkm2F5
-6wC4qfO1G8Wx/8U+0kKU6gCFqTOgvA3lA0N+YY9LtM6S833ngG0KScZUaujMc5d4
-7IS9IP/ftZdlGJFxpOLrW/cRvl8NH+5bN5hZY+WxAw3hRAHBERS9WOKnvB/B7mpp
-WQf5qgJc+9c22eEB+C5N84tutyRdTLCIxbvLt1YuZ0D3iImgftWiFrWXWKxrdnyU
-EB/VOEf92/98Y9Nr/Swj+bgTCA08XiItTWEl9+EW9sUeXIsc37mPcvJx6g05fWB/
-adU6ldXOTeKvPQtJdgBsqrkf5GU8XqFH28D4nPUruVO49lHNFPgjFblMH4SopycV
-Vabx1R1LrJrjd24jURMwB2qDIFgpN2SS5nYeC20/q/LQS4EbRAxVjUBdsJaRxVMe
-3EfRP38MrqYYbU7mqWOsyPyQJYQw8R7DaBMJLawz8WPZHUFHbqyMc6rgpg58M1Ti
-mL73PydBCGuZP6EPg8oqOl7HULKd5cNNL26RzrC20fLCyi4RZWyhXp0IBKgHa/QK
-M7buybDr7Ln1+iBpxS4/8Tk1r1J59uzNrs+RbViKWGTO2XbyvyG4Jmgx76KjKfR7
-boso2k1+b5vrd4g73ybu9aUTxQZgymw/4v92+hhH7RKfXGzGcA3s11Xt6RaKQZo6
-FVX2fXIk+dmRaQEgzwPY
-=AKXv
+iQIcBAEBCAAGBQJRtSBQAAoJEDuWpXgki9wHlJ0P/jjwE6OJblpn2b4zlI7NlRxK
+8gqNHMOwrbIlQIe1AybiytmIBufO/fDgcVaQUpLuriwmuRdKIlzQ5qV1O28APMpW
+JlUeZQCg/6RCavdWohrLkYObiEKj3ebf/q+PN4aMRS7xaGGVAn5Jb4Xya1tQSwea
+upe6ROEzoRqNCVWlv/R/opDQJaGNpb9yjMBcqjo5bliypZKOAIlTdJD7ZAsO6DKI
+xPqrUkw1KqbdujVq6mgxI2EohaR1H2wFoJC0SfxQus0taOS5Cy6fTVShl8k121T6
+OtcSVkErdBmeKtWD3VuXsT8KJ3ZhzuS8D6Or4ZmT0IarAiZ/FhRXFODvoIiU2EmW
+0VF6GXn/r6u054aH/m/lA8j9eKV8YZEI9LzP0TGIYa+b7GenWZEF9qk45/DH+PTY
+fZguLTO5nr5+0e7zq47DHgax6nvYBAXYyKWhngkNOq1XJUDM/NrYnci9SIBwAU5g
+2ebK8bLlZWbi5tl0Sj6gz1lJ36rdSFb4IGnHQxATlqUqEZ+qI0QZrtk9EmkkK0j3
+iNvR/oC178goBpnlVjQqOiMitsA7owTnJj1GXRgYuxT2wx1hTV49aZkKrylUuLCd
+0UM0n/dUhr4nA7WgLztHvtFxG9OajBm01oEFKbxVW4zZjPiu0jxsGsk7D1pnF/2q
+5wgxyuyQ+wjy/6rHys3D
+=jcmG
 -----END PGP SIGNATURE-----

diff --git a/dev-java/icedtea/icedtea-7.2.4.0.ebuild b/dev-java/icedtea/icedtea-7.2.4.0.ebuild
new file mode 100644
index 0000000..301cb5e
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.4.0.ebuild
@@ -0,0 +1,365 @@
+# 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.0-r3.ebuild,v 1.1 2011/12/02 12:27:17 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 java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 2-)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+CORBA_TARBALL="71d5ec2f3dfb.tar.gz"
+JAXP_TARBALL="5eaf3bca7f68.tar.gz"
+JAXWS_TARBALL="9d2007a13c02.tar.gz"
+JDK_TARBALL="29ce11184945.tar.gz"
+LANGTOOLS_TARBALL="ffb1b6bc4750.tar.gz"
+OPENJDK_TARBALL="9c74cb4a3ae8.tar.gz"
+HOTSPOT_TARBALL="c67fd7874b1a.tar.gz"
+CACAO_TARBALL="e215e36be9fc.tar.gz"
+JAMVM_TARBALL="jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
+	 -> ${OPENJDK_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
+	 -> ${CORBA_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
+	 -> ${JAXP_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
+	 -> ${JAXWS_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
+	 -> ${JDK_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
+	 -> ${HOTSPOT_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
+	 -> ${LANGTOOLS_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="7"
+KEYWORDS="~amd64 ~ia64 ~x86"
+
+IUSE="+X +alsa cacao cjk +cups debug doc examples jamvm javascript +jbootstrap +nsplugin
+	+nss pax_kernel pulseaudio +source test zero +webstart"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	>=dev-libs/atk-1.30.0
+	>=dev-libs/glib-2.26
+	media-libs/fontconfig
+	>=media-libs/freetype-2.3.5
+	>=x11-libs/cairo-1.8.8
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.8:2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	>=x11-libs/pango-1.24.5"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6
+	media-libs/lcms:2
+	>=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 )
+	>=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"
+}
+
+src_configure() {
+	local config bootstrap use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# Whether to bootstrap
+	bootstrap="disable"
+	if use jbootstrap; then
+		bootstrap="enable"
+	fi
+
+	if has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		bootstrap="enable"
+		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+		config="${config} --with-ecj-jar=${ecj_jar}"
+	fi
+
+	config="${config} --${bootstrap}-bootstrap"
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes";
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes";
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO
+	if ! has "${ARCH}" amd64 sparc x86 ; then
+		if has "${ARCH}" ppc ppc64 arm ; then
+			use_cacao="yes";
+		else
+			use_zero="yes";
+		fi
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		cacao_config="--enable-cacao";
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		zero_config="--enable-zero";
+	fi
+
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
+
+	if use javascript ; then
+		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config="${config} --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		--disable-downloading --disable-Werror \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable jamvm) \
+		$(use_with pax_kernel pax paxctl) \
+		${zero_config} ${cacao_config}
+}
+
+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}
+
+	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 9391911..fe3fb71 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -14,8 +14,9 @@
 </maintainer>
 <longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription>
 <use>
-  <flag name="cacao">Build additionally the CACAO virtual machine.</flag>
+  <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
   <flag name="hs23">Use the new version of HotSpot (23).</flag>
+  <flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
   <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
   <flag name="nss">Enable NSS security provider support.</flag>
   <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>