commit:     43acb543f09e3b296e0b1762ab6eb9d7e6fd0c98
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Tue May 26 17:12:06 2015 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Tue May 26 17:12:06 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=43acb543

Bump IcedTea 3.x.x support to 3.0.0pre03.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222

 dev-java/icedtea/ChangeLog                         |   6 +
 dev-java/icedtea/Manifest                          |  58 ++++----
 dev-java/icedtea/files/pr2383.patch                |  12 ++
 ...ea-3.9999.ebuild => icedtea-3.0.0_pre03.ebuild} | 156 ++++++++++-----------
 4 files changed, 113 insertions(+), 119 deletions(-)

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index ecc023f..bee084a 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*icedtea-3.0.0_pre03 (26 May 2015)
+
+  26 May 2015; Andrew John Hughes <gnu_and...@member.fsf.org>
+  +files/pr2383.patch, +icedtea-3.0.0_pre03.ebuild, -icedtea-3.9999.ebuild:
+  Bump IcedTea 3.x.x support to 3.0.0pre03.
+
   07 May 2015; James Le Cuirot <ch...@gentoo.org> icedtea-3.9999.ebuild,
   icedtea-6.9999.ebuild, icedtea-7.2.6.0_pre18.ebuild:
   Fix various dependency SLOTs.

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index bccdba3..fda7038 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -4,48 +4,38 @@ 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.env 1074 SHA256 
b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 
933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a
 WHIRLPOOL 
57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258
-DIST icedtea-3.0-cacao-d6264eb66506.tar.gz 4210323 SHA256 
94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c SHA512 
9867eab28944e2ccf82555fe385efc4494068b087789b0a5cc2ed94723b442e96b7e7e19ec3e2c670608ba8336173325690f413d7779c35fedb108450ab90237
 WHIRLPOOL 
184eee0d85ccd783e7b95a5dc560b1073c068107ed4cdd6d877b1ff14fdf7c199f61ea8cb01c1eb63e19c2de22b45840dc0841a7e099413194b376a1bc6fdcb4
-DIST icedtea-3.0-corba-2a00aeeb466b.tar.gz 1456824 SHA256 
10bdd5cb934b6c6ce7fc0faaf9bb7f489c24136db82a5862cf82957f94ef67c4 SHA512 
6a6b4c401db985eff5efb498a73606269cef48e5d3b32aacb0187fda9694fb83eb2e591946e49c4d87eba968a6d610b5acbe0b1925f369a4eb0eca3899829998
 WHIRLPOOL 
3dd73fb2b564ddd47c60c2840bdda6d9ee4b99252e207287b603b3f9a42a2e6e6b0cb372618fe51d058580b5296cd2a54673bca7143ff459582904a24046dc77
-DIST icedtea-3.0-hotspot-65b797426a3b.tar.gz 8884528 SHA256 
e30bc3fa830478d6784d5578f0c7e82c7fbc0261c10112ff72ce4a5ce1093732 SHA512 
bdfeb70bb224aed1c1a8da69d5f2cfb98f97f09ea9d842d138c6629792ebf4775cc9595eb981fcdc9bc4ad743a9fed9f922ba459e7845cc13b37ce25303a934f
 WHIRLPOOL 
4b174bd400743a6c8e9e9b89a7375aa5976934c170f74a6526f1407e13d94e829b83f3c2bee198c64c3db1017d97d4ba7e7f9ae63334959efbdad754840bff51
-DIST icedtea-3.0-jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 
SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d SHA512 
8b479a23f4c2eb16100bb0745452c652849f8e18912756e2d9f8ac9cd395f4bcf89af89d6feda25c8ec41cb90b7f17bebe646637234ed360c65da2a45dbbac04
 WHIRLPOOL 
b9ba7a0c73e16245c109f983435f00a9349c747cc5b5ef4592b8aaf7efc95af0992d9c897530a12e886e7f20687a290f70f3cb27529f1661bc37d76d00f2b2af
-DIST icedtea-3.0-jaxp-ef3495555a4c.tar.gz 3864022 SHA256 
25256922c03ea7b27ba8ef99f5db05816f999544c84a43bd5a3f6df1080128b3 SHA512 
11ee1572bef5258292b2a8eb46c618aae95121a1bd7ab0a6f76e8986f16c336b01b964ff87a6708fc2b0ab237433b190a6ab2bdb454e498d50051c623b675fe6
 WHIRLPOOL 
ffb4f80cbe298dd33018ffeb89be6037a5f288554b250059209a604767958fe4cd653c909b0bf2db68f9ede46c727b6878e936306fe0b9a14731d6a82049cd2e
-DIST icedtea-3.0-jaxws-c88bb21560cc.tar.gz 2862295 SHA256 
c6ee04818488c042b27dcef5620006bdf79f2a7d0cab56180af3e340f174fb5c SHA512 
e55a035f1b8473d39a6d94d2b8dc51c13011e71cb8eb28eee3bb088362c807416eb5b10054a599c62e95125d29ce4fe87e886bddc03fb1015c21078fa799053b
 WHIRLPOOL 
6076199fed52dc75116daa3a95bb4c77c6420493fb9253b3dfb8dbdbc4ca016bb530559d3bfb2fcd49ccb5c20853298b2120f59beb57a41007701c8f5ec7de05
-DIST icedtea-3.0-jdk-758db1c4c65c.tar.gz 52985486 SHA256 
476f61c1de7cbf4c7d1fe51bfe813049ba55707b808f0572a898653dacc4dfdb SHA512 
7b8d7daa420ea4432416a3a31538feb959bb92277e4226a5c26bc8bb012ec9ca9be2ed7fd8002ed138d0b71fde7c964eaeea31f25bb7391ad5fc9772acd09c79
 WHIRLPOOL 
d24f968f21a617bbd2b46ffe3ad38b6613be236a3c7ba594c1fdd59f82ad65c449fe990594f5be64f35dd43bf12bd02f73b24634c03bfd727182e348beae1fff
-DIST icedtea-3.0-langtools-ed69d087fdfd.tar.gz 2817543 SHA256 
ef15659e1e3d685402d53a9d0d087bcc3499f305001a6d8976a2138db7c70229 SHA512 
c72f98c2a3b0c019de4908c20ef0face54792a7e20b0d00eccc6af2da9e35535562c412fda0e84ad372f4f759aaebbd42c9f3974ae8d729ef32efc3b978ec1b0
 WHIRLPOOL 
11b1a663f3a1ab7cc576ae03c9892c93535aba99e1afa221b93c56dcbe0f5c92d5b04b0203c363d40035055327ee1e2f0e485d710f631f6a1a980216ae5c0ff8
-DIST icedtea-3.0-openjdk-cd7f2c7e2a0e.tar.gz 427938 SHA256 
aae139654d4bbc23da7eb9eff4fe7c6a70f219f69ec3e39b4506f97a9c9d3a39 SHA512 
b6fcf2b9c7d422342258e0bd6c121912bddac60f6184883cfbf54b73e9caeac042864bb3a79dbf6702de2fb564b8354aaa1e68d01eb633a2f3d8283baf1762f1
 WHIRLPOOL 
3b63fcad95e227aa6785e48f2e1ee683e53ee9211e98fa5f64f68f86d5abfea5ec7b27554e547a6e4d84385a5f97ffc2aa2dc44711e9eec0ba3a27fc1cb8d3d3
+AUX pr2383.patch 438 SHA256 
da00790f5ab98b83e04b123e400017269bf79dcbcfcce7ab259d7ea23e4e0df7 SHA512 
061eaf09218f47764fe38d4b70890b9636ece4f01360045f4da850e864820efe497a28aad51d2583ede5fb2fdbbde2ce035b6eaeb8aedfa8ae288552609df1be
 WHIRLPOOL 
930b499c591734a970e5b9c4f8992dcb699ccec86a4fd590bca4d177c4f3f167019a3e204da6f989e9ac697544c29402b753d1374802e8d92966a2bd93dc2244
+DIST icedtea-3.0-cacao-c182f119eaad.tar.xz 3056520 SHA256 
bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 
22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 WHIRLPOOL 
ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
+DIST icedtea-3.0-corba-6c974fba96cb.tar.xz 931856 SHA256 
0b65f0faec1d3bea618a5d7ebc5fa734163ee21039e58ba1f38acf99ff92bbca SHA512 
2ba96d4d3f117bca3f724408a1d2a74656e5a69f0b2797ff723209cb454865e4cd1ce4c08a263c8ef9627f1ab7841b9b00a6b876088a8f3b21cdcb0046aacec4
 WHIRLPOOL 
d5371381062a9838f74955b7ab1ccb8bdb420b29b11e5310a8fe83d4a7c8079d15b5bb275815f8749476e5784487e0ad8d5dce448f3e668576aad8d127d0cc2b
+DIST icedtea-3.0-hotspot-85e5201a55e4.tar.xz 6687348 SHA256 
0fcf2f5f49ff4504fd095a57e767ea3c3eb8181e65d9e8b3f3accd3f03ff97b8 SHA512 
5c8e839d2d74b0308f468d8763a69ab06920f43b92659bbac76f53b48d83ce8d7070a091ca36df99629364fc8d05b8272e7c12d04609b969d5e8db6ace6908df
 WHIRLPOOL 
aa4f6f4f67a18699e491bfef32fa86a17e276fb91ffa5c55fb4906c5123ffdc886395ea606323b4a1807af687d104616d5f5aa81f94b57919476cad82471c960
+DIST icedtea-3.0-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 
SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 
a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
 WHIRLPOOL 
2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
+DIST icedtea-3.0-jaxp-e727012c23d9.tar.xz 2292392 SHA256 
01dc9a20c521ffa8057dbf47a4f7b555a47156c6f9a1826e2ef893deb830c5cc SHA512 
56b5a645aeec9e8849eaf9b02b16fc16b504f136ff52fd09a822638e285675c399da9a2dc943a0668d55b51c1f5644239c8f198d3a36cc7b3ef39675a45f62b9
 WHIRLPOOL 
a2d4073f7e1fa4b11710c5ce3e87d9f2490b1b29295d9d77ee0a5b26f98101f34c1be8b3fedfc0da15756f837f9ce2edf402a0fac42e5e271e52fe783c0c079c
+DIST icedtea-3.0-jaxws-7ba7b06f15cf.tar.xz 2261928 SHA256 
2fc04ea4fabef520222600d533d72eb8305882349f8a6763144032a93bca521f SHA512 
b0fed65d1d25ef14843e129e37ad0da33165e9c6455946469d2ce3605052c8911976accbf0999b68929ead00028af0b26adcb6c245f6ef356c26fd2eea45ca41
 WHIRLPOOL 
81d82467e14b0ceeb513a67863397e9488ac288374bd0b9ad740fe7d66d0f9a18229931ecb9386d5dadac33f62d8dc86934a33e8f891444d9b69f6bb80ab7b34
+DIST icedtea-3.0-jdk-a5c3d9643077.tar.xz 37890512 SHA256 
1190242429de1c3c25db5114b35b9237deb53fe776a4b17613641d457030d9c7 SHA512 
6aba5722d1ada7eda3fffe66c6b4a14fb9945920a8463d64b13fb43f2e9f16ccbb6d1e72bd14d38fead9c7380534fcc0abd7be6ff3a1ad2c75b006d6c9663828
 WHIRLPOOL 
6eb79b256f4e469f0f977d4afb01e24591fe0090898c107f115620fc87cf64f570b1299541ff0a27b599b32b2879795e4a636d9ac982fbf571516651be205114
+DIST icedtea-3.0-langtools-0d5d2b8411d9.tar.xz 2044980 SHA256 
71dbcb8990f66749332d72001ea79b458baa51fcd1086907178c83f07007a860 SHA512 
882c8535ed15c9c652c6289d47eb79c2932d7179c331c7ade70575e68f97f079ad76d45fa0a5e556efd9e6f07ec4ca786e804d6af02faebb75d89a300368f9a3
 WHIRLPOOL 
6ee11b1d040e4daa095055b48942b4fd7886e0186c3faf55e94f726ab9ac51a69a906d18dfc15be502bf31a42ea827c896c9700adb7bf2b98c31f649b3bfc5e7
+DIST icedtea-3.0-nashorn-d8fc6574c0b2.tar.xz 2163612 SHA256 
b85c66df90280d529894563ab774968a462a57ad9568d8a2ab31a7f897cbe1e2 SHA512 
d64b729f557b0bb55099735065c4c6e6ce80c0234ab21da4507c5727dda970a867d6f796290fd0a0c92f4a9f1302920f83b32e63e30f596a70e385e7c8518717
 WHIRLPOOL 
99e73302fdd36aa1eeddcab36bbfd9596ac245372b0b5097565bbf81cee5acaf5eb6aaa243a18d67336204b6e92c4eaae5f26950bdd80ce43339814b65850b0a
+DIST icedtea-3.0-openjdk-44a10ae251ca.tar.xz 319768 SHA256 
b915757c7c17448c670e93b7b9885e46afad43fbf6585c2e0f9d3582237a8bd7 SHA512 
85cd2dbd4cd2462a9b9c6201edac3c09725a1136b3616d4681ffab2e8740755c98d8daeca135039de77b07aa403844d0daf0b7ae5fd36957f28bfff57f4e32c8
 WHIRLPOOL 
17d4e3343b9e439cc18e71829871db735e055ea654858c2ca691d4339832331c45c2be30977571ef91b91e3b93340a73c98eb1298eda98bd5997fdd49b74d18d
 DIST icedtea-6.9999-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 
b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 
bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f
 WHIRLPOOL 
539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
 DIST icedtea-6.9999-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 
317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc 
SHA512 
a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
 WHIRLPOOL 
2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
 DIST icedtea7-cacao-e215e36be9fc.tar.gz 4263463 SHA256 
4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 
2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f
 WHIRLPOOL 
7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
-DIST icedtea7-corba-15250731630c.tar.bz2 1071010 SHA256 
9448485932e5f74b545e7c9e1d4a586bf4a93c85223e500d803eecfe287786fb SHA512 
15871d248bd3491e53b687a4dc51765e82c8c17d5044b27cc29852902a85e0abbaf1aa93d774009c991131c4915c519d3779b04341faf365096f14419ec55847
 WHIRLPOOL 
b74550d7353d2bf0c53bff3575042c6abd195f79fe0226e46e6b283157162317b63cfb7885571bdb4490606dac9016e57ff4671ba9ebc2c368d60b828997acec
-DIST icedtea7-hotspot-1792bfb4a54d.tar.bz2 8148494 SHA256 
c08056f64be5923353a75838e66b26aedf0213cbf2296cac449a5ee874c6759a SHA512 
ff9fbf1656178f7c89bb249623f615aa2abfdd379fde2fb84c60f94e739951077b3e64659b26b867ca1d81962fbe44fe3fb11447919d5ad14df5ef79fed95a7b
 WHIRLPOOL 
11ccdbca767122ca319d1a542965a325b5095f5f60dc4492eb4402fa19c2245bc947843c9a8851b9233b3bf57780c5a81952cbe97672769fcbaeeb6a5ed0f81a
+DIST icedtea7-corba-15250731630c.tar.bz2 1070729 SHA256 
038202eb0daf849028c28ada6e11e0b8ef0308c26d45f94a0aefb834a4d41bf2 SHA512 
c85f34283d81e72718bcbf2e201d26bf4f3937773d145a620e0e525a6b0015f5b33c68272ed7ca0541894f54a54fa61780d4c563848f55a43cbdde4d22877ec9
 WHIRLPOOL 
8fd4ddd54ec710b79239edf48fa6c6384e03c8fad37d79e7d76eb0ce4d45803dac51cd8e59060e43b8eaf443c36cd28413469bf9229e35f482bda7be224fe0f2
+DIST icedtea7-hotspot-1792bfb4a54d.tar.bz2 8151087 SHA256 
b5d129a569016dadd359b7aa7b28b4832476b3eec2aafe42e21f1c9fd85f18de SHA512 
d848bea522675fbe7f0162800a1593620604aa6d8ff1d184ad8a0a0fe67f738387f83510f4e68ce80cc00cb78ad2c7cc2f851cd3897ba31f3492925ceacc174b
 WHIRLPOOL 
3fe0e2940e4abdfcb7f2a7280835626ffaeacbfe11ec373190a3044f349b0e0f9a912a26829574bf93443217c2d912f3e26804dc19a79e667f4a4bb2841a2a14
 DIST icedtea7-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 
SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 
a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
 WHIRLPOOL 
2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
-DIST icedtea7-jaxp-8cc37ea6edf6.tar.bz2 2726893 SHA256 
66ee4dfac13fd748a6e7f42726be66b625ba0ee5454635e48c4f4b17c4257210 SHA512 
ce1cfec73e2b86cddcd0ee29fd72e9c16221e9bee15de19018865935dd85304fd130ace329ffbc2e5b49ab4dc8b5971eb32a5789644f5ae2fe1812e8e300312e
 WHIRLPOOL 
f80bdcab08d729f6fca6e7fe82f16b907f7e876aae4541e125720a6eca80db9d217967a328418cf4cf7cc4c8bf86689e54a3cfe92ffdd951cab2d1b2669bf2e2
-DIST icedtea7-jaxws-5ee59be2092b.tar.bz2 2020900 SHA256 
5891f10569b4f26f6bf6eb8548a565057930d7ca39e19a72ba28a220fd920614 SHA512 
a3688463cbfbf48ac52058ccac0ca4e8cc17d1027ffee19e6315a22ca00e3738a47fda7475e9d6e18114ea3b28595e77e8c5884e5a0bea4d08b56d1e11991120
 WHIRLPOOL 
99e354eb2718050f759eca4e47cb3cc3d29d25820573d9895f316a9432cf0abc4903efe0235232d0a7b8e988550cdcf3fb60617d8df01d769814fef22289b131
-DIST icedtea7-jdk-19a30444897f.tar.bz2 32261734 SHA256 
2f3c22d729d65851f491d924fb0844f7a04c6e4d9b5e926f08938d58e214dd1a SHA512 
ee7875b12f85fa2dc5e8fc8dd4c855f8724c0f607602892234e0a2afe0d474401e6f36f3bfa21e313f38e77c32944c53291aa81b27c318177b39cd15e932749b
 WHIRLPOOL 
8aa3876641c62bc8d6271fd659d015e1dffd9f30e2b22005746a0c7d74372b1eb2f620adc11c89954172182f94f9437af5bc871a0c715df34aa6525ebb2f1870
-DIST icedtea7-langtools-bb9d09219d3e.tar.bz2 1709221 SHA256 
5df2c2a496409b0eb1f4ff923ee6de554ab74af8b91af26185f7e2f73071642d SHA512 
51d9e5cbfbde281b8dbe0dc6d3ed3ee6a4cdda853809e64931220126de34ea74fa9359ea24cffaf913ea57b967a54fc0d25f31b2bdf62d0c8549cab07e83c969
 WHIRLPOOL 
655b67b53b6e8166e128bf1621eaa1fed39e18c0b336b6228a4fca4d64ec2efd60d66b1e02b5844beb9107ed1420f471f2ce687773c778418ab75e02e2d8d4f2
-DIST icedtea7-openjdk-e229119aa0a0.tar.bz2 128769 SHA256 
8c77d4d16d38b2ee4edd98525186548c33138a400c61978e1e54b70c494250df SHA512 
91e0eab9e9ba1f6ddc922e1a8e6093f211aabfeef0b8e833db871a40a3b624fcf7155efcd2d2de48b9992985079430b5d193277bf3744e4083de0fa0c7e18bc0
 WHIRLPOOL 
c0ad8c0ed7e12f3717f030412408791b1fa3670167baf58cf879c1034781bce9ac8666edf2beb4169c0e6aab7165797e7b366fa7decdebabf54dfacfc460593c
+DIST icedtea7-jaxp-8cc37ea6edf6.tar.bz2 1117476 SHA256 
0d8576adf45130c23fb1e4e79585cbba0a5259ec89da7bd61e53c08a886ca70d SHA512 
f3681022249b46e4ca020d304cfb82dcb25f59bf1fb20e0320931e40407899ad979b4d03b402a52abf6b528d7bbfa2a7bdbf89f8afa9fcda90a2c867dd839953
 WHIRLPOOL 
6c35c0f55dd46d2e933fa37435222ad61726a3e5769c7db5ffedee02c22b35633f064941f42ad2e3c483a5fd9e890fdf1fab720e1e1e2fc80225e78c9f45b081
+DIST icedtea7-jaxws-5ee59be2092b.tar.bz2 2020593 SHA256 
0408a8a0c02b84ed7b7701c0572dfae0fc886713614b2fcdada81b3d30a1ce23 SHA512 
5c49b064c124325107795e8492e47f1ef3fee23b025333774a81c8926f9aea7c2c94ac9b32eefc81f68d88269fb79d5a2969755d5fe2c8d0f1656e61a7ee24a7
 WHIRLPOOL 
72c27cc0d85e03a46b668a3949b4d391e06d9dedff77a4ac64377b5606e3482475b053e119ce1ce923cd3c7ac7f495044113a96a5a0744520cdb3a746200d0bd
+DIST icedtea7-jdk-19a30444897f.tar.bz2 32277741 SHA256 
bf66dabb0d427968fe8cbf26045ffa8d1db9fe9230f5819a3d88e61d2d56cd38 SHA512 
1b44f5aad7fdaeeacdbb9dce50a9291dda1e0a76f54635b3334c176053ac4d9bba637997730f96670470bd6cfcda557c075be3fbec8f022db3129f8e3dd04945
 WHIRLPOOL 
9c9ea64c065454a13785a89e47fb7f9945e730e9a83ca30f32a0c5ae87ad4d67fb7d9e1e4712cd82cf2fa9f1001c7b6f0712ab5bf5b48bdce7d0ab210e371fb7
+DIST icedtea7-langtools-bb9d09219d3e.tar.bz2 1708961 SHA256 
9f1b3252e84759750bc8259d6b2d94ccf8f778d56fe6fa7dca2c9a70a317bd48 SHA512 
ba28c4f9c010e4db8fbfe1051d8ccc058943246f9062dbabb98f714f2473d0b5dac6103ac9d7dc1be93f1fe4083ec78a66e66a94424afec95cc747084961a8e7
 WHIRLPOOL 
30c0dd5cfe2bb3d8488c7f946530b01b443cca00600737a148684d55b1dda58ae38b64bc0f30012fd503ba75b58f04fd618025cd9312b9306d1743f7b547fd15
+DIST icedtea7-openjdk-e229119aa0a0.tar.bz2 128772 SHA256 
af57bdf261cf377f5cdabab4a8a271a838b8f7969be7331d99390ff39f6f7b0a SHA512 
5c1e5801253da4e5bd97152d47981ec38b32eea674a511ac4f9db441161bf05661cb1817378dba25187c6f3f4df4f21d947571463ece87fd5359f0232e874377
 WHIRLPOOL 
7430b79cd79a45cf410bfdbae1fa1feebe2169ef5436012cb7c7f46997fe9ea157a64ce8cc7106d8d3003eb0b394c5633c837843cfb7b4d521b36a9829b10d84
 DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 
131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 
bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5
 WHIRLPOOL 
69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234
-EBUILD icedtea-3.9999.ebuild 11508 SHA256 
bb74a988fd9094e22dbbf078cee09e761f13c8ef5ebdf63b63c6f9b2ac9d1e90 SHA512 
79680e1c02a246d04cecf9ec683032fd070696937ddc562ef8b192d02877a877d8c01fa93c49cc6f79c728cb6f98706f4652b8e96859c942e1d3128784be34a3
 WHIRLPOOL 
637639e8a15ff8bb30a83f3948eaa0997c37efb313485aea7a7d65a40023cf749840fbb2404ed4292df510345fef0961c5e61e5389baf49bb4a6458a8346054b
+EBUILD icedtea-3.0.0_pre03.ebuild 11419 SHA256 
57b5cbcc851338d3d3f1d65642082d39f3f2c40f709204413d74f85bab1a0988 SHA512 
1bb58f7f05caf822d09d08b37c876727f1f554e960363837d99d26ad593e16dbae01791231f029689aa5a203d18a65127cea9ac04bcecf54578a685a4badffa5
 WHIRLPOOL 
5f93a29b4c52a0f1861b0801f612231d210ab5333f6541659aa2207b0b69a1913e28491ffe0a285539ae8863579370b392c09a582933e2e19c71b52b8fac8622
 EBUILD icedtea-6.9999.ebuild 10839 SHA256 
ffa41507a26006ff1e7a16e8ca71c399dff000f5dcf080db57fe05a0aa539538 SHA512 
2e52a795b404784ce5669c1e085761e623bf7dfb433eb0312989dc47b9ee58c97ea31052c486bafa66b20ab7bd82a35a43bc5866dd1047852d144ab65629c3af
 WHIRLPOOL 
22dccdf4b9232e2d6d231e86086924c3005da09d152f7c3db651727e4791f03e85e43c32bd2693691d326c38c6fb384313aa1bc50fe26d2ff700d295f824ef52
 EBUILD icedtea-7.2.6.0_pre18.ebuild 12409 SHA256 
0e4f133c68a421e89794560b2e956acc0106d4be1c86c512b7f71945db57c6a0 SHA512 
a9b727004b708c1ea572b585e2b5281ded50e9caba2422961f6695590d63e61355cbc150192ab97c48c7713c8dcb63ff1deed183cb27b25d96b8926aa8f98e5d
 WHIRLPOOL 
9a6554a678d0ea2d69723df6667f518138de549adc46d8d4110a8d867805ded356fea18fa4bb6ce9c1b761354368fa0a0b92bc2146cb878fe4f9d43e1aaa9ddf
-MISC ChangeLog 89701 SHA256 
5e776a8bf6021b6a60599658779e67bd52ef16b4126d060a47930c87a6014e73 SHA512 
cc1a9ef5e30f3f7962e18ce285ab74bd0ecfb4f0bc2ec9e0921c1966e837ffd9334c15fce861fe3620fffc3dccd06bd0132c33cfd651840ee0eab1e161ced92e
 WHIRLPOOL 
2d0b20f8e0f676a4d85a016498d8c2820693765c5931b7c5c323f8300f4026c5ad03af5c8113b70664f62d7fde34bdec743412b8b2bd7d24554d15b1261f636e
+MISC ChangeLog 89920 SHA256 
d24c68944e3c1de45257b023dbe2a1ef5320d666ac39b189167037291cf0a59e SHA512 
e03d04ee46f97734873251a717b243ff60e95084a8d44e956d884c6f27388028d07fb747a027dc28fe6baebfd70997cb126d0a724f06dd3b0ff5403f3aef2dda
 WHIRLPOOL 
8f400742e14dfeb02378a86a19777fab317717495f70fc530e26c6e600e10a03d531b047c7d11edaa2c4e0e71b3dcaa40feab5dc83f8bf92f48a066770578b6e
 MISC metadata.xml 1680 SHA256 
41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 
5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c
 WHIRLPOOL 
5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVS1t9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k2h0P/iSBOcgz63foJ5dspR/SFvCU
-tie8BdUXCR3jy7oRcu5slOT/6YhwL8Q/FIB2Fk9x+eZH/VLnScAbc1pgKvdSezZ0
-+wQljxdAfx8UMJ0y3HXI73zheTHy+uv59VTfaghtu+k4RB94qL04WFNQ31/Me1DI
-NrSVsAJuhyVvQyXXTau2OgheO4YcYeWGC72r/nspxm9lG6CqBpUIed7kvP7zhGzj
-WYMssgNlWC6MCHJtaKAOIpmnl+QWkMJeK0FVwQ0QKbAqJ5uCOL0T5bXGaliKVDO7
-C3pPpJW4+WMhotmqBD4oUPOxfE1FIszv759zylpLHQzubEgzp6VvD/aTIyVCFkjt
-vKuY1FD0GmUVg2fWyXu9GMGlljl+PQXW5ZNZVAVFSBiLjhe382bNkJawTNczHLjE
-8aurkEggCQfMNV5rp8T7QRJ5/SVYE1F4vk7+2fMWB1l2Ca4xtrsMHTiWze5xQzSe
-e0WtRRVYgWic1yMwjOWUuMSpWyS9lG8J8VgMbezeHCrzvSITydgpdF8xxU/86Lia
-6+wZqtYnxC9DnnKNFVxF42YFamIuIYp2x17uOuWZNDANNokETcgLtk0JFqlPy3gf
-J4Cr5/u+oQkYYn0o8xc8X3bUASyph1z+az5BL1aZC/u/mMt61K51Dw5qmIrkK+fB
-0a7bELAJe6nyFiYoXEQi
-=Osdu
+iF4EARYIAAYFAlVkqWEACgkQz9oPmzWWQiJo8wD/a/YDX6+LHfwkpP0NbeoIY5MI
+Kf5+gv6xrz6UFO3FP/ABALDZsUckw5VjnKBQr0jOeVjKceb10C9C+rDU4tmjw/IL
+=Qqp+
 -----END PGP SIGNATURE-----

diff --git a/dev-java/icedtea/files/pr2383.patch 
b/dev-java/icedtea/files/pr2383.patch
new file mode 100644
index 0000000..0ae484e
--- /dev/null
+++ b/dev-java/icedtea/files/pr2383.patch
@@ -0,0 +1,12 @@
+diff -r 10e7f91158ff Makefile.am
+--- a/Makefile.am      Fri May 22 06:02:08 2015 +0100
++++ b/Makefile.am      Tue May 26 03:31:31 2015 +0100
+@@ -2461,7 +2461,7 @@
+       touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.systemRootModFile
+ if ENABLE_DOCS
+       ${mkinstalldirs} $(DESTDIR)$(docdir)/html
+-      cp -RP $(BUILD_IMAGE_DIR)/docs $(DESTDIR)$(docdir)/html
++      cp -RP $(BUILD_OUTPUT_DIR)/docs $(DESTDIR)$(docdir)/html
+ endif
+ if !ENABLE_JAMVM
+ if !ENABLE_CACAO

diff --git a/dev-java/icedtea/icedtea-3.9999.ebuild 
b/dev-java/icedtea/icedtea-3.0.0_pre03.ebuild
similarity index 73%
rename from dev-java/icedtea/icedtea-3.9999.ebuild
rename to dev-java/icedtea/icedtea-3.0.0_pre03.ebuild
index 397e25a..c08489c 100644
--- a/dev-java/icedtea/icedtea-3.9999.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.0_pre03.ebuild
@@ -8,21 +8,24 @@
 # *********************************************************
 
 EAPI="5"
+SLOT="8"
 
 inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing 
pax-utils prefix versionator virtualx
 
-ICEDTEA_VER=$(get_version_component_range 1-)
+ICEDTEA_VER=$(get_version_component_range 1-3)
 ICEDTEA_BRANCH=3.0
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-CORBA_TARBALL="2a00aeeb466b.tar.gz"
-JAXP_TARBALL="ef3495555a4c.tar.gz"
-JAXWS_TARBALL="c88bb21560cc.tar.gz"
-JDK_TARBALL="758db1c4c65c.tar.gz"
-LANGTOOLS_TARBALL="ed69d087fdfd.tar.gz"
-OPENJDK_TARBALL="cd7f2c7e2a0e.tar.gz"
-HOTSPOT_TARBALL="65b797426a3b.tar.gz"
-CACAO_TARBALL="d6264eb66506.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="6c974fba96cb.tar.xz"
+JAXP_TARBALL="e727012c23d9.tar.xz"
+JAXWS_TARBALL="7ba7b06f15cf.tar.xz"
+JDK_TARBALL="a5c3d9643077.tar.xz"
+LANGTOOLS_TARBALL="0d5d2b8411d9.tar.xz"
+OPENJDK_TARBALL="44a10ae251ca.tar.xz"
+NASHORN_TARBALL="d8fc6574c0b2.tar.xz"
+HOTSPOT_TARBALL="85e5201a55e4.tar.xz"
+CACAO_TARBALL="c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
 
 CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
 JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
@@ -30,38 +33,35 @@ 
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}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_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}"
 
+DROP_URL="http://icedtea.classpath.org/download/drops";
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}"
+
 DESCRIPTION="A harness to build OpenJDK using Free Software build tools and 
dependencies"
 HOMEPAGE="http://icedtea.classpath.org";
 SRC_URI="
-       http://hg.openjdk.java.net/jdk8/jdk8/archive/${OPENJDK_TARBALL}
-        -> ${OPENJDK_GENTOO_TARBALL}
-       http://hg.openjdk.java.net/jdk8/jdk8/corba/archive/${CORBA_TARBALL}
-        -> ${CORBA_GENTOO_TARBALL}
-       http://hg.openjdk.java.net/jdk8/jdk8/jaxp/archive/${JAXP_TARBALL}
-        -> ${JAXP_GENTOO_TARBALL}
-       http://hg.openjdk.java.net/jdk8/jdk8/jaxws/archive/${JAXWS_TARBALL}
-        -> ${JAXWS_GENTOO_TARBALL}
-       http://hg.openjdk.java.net/jdk8/jdk8/jdk/archive/${JDK_TARBALL}
-        -> ${JDK_GENTOO_TARBALL}
-       http://hg.openjdk.java.net/jdk8/jdk8/hotspot/archive/${HOTSPOT_TARBALL}
-        -> ${HOTSPOT_GENTOO_TARBALL}
-       
http://hg.openjdk.java.net/jdk8/jdk8/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}"
+       ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+       ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+       ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+       ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+       ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+       ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+       ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+       ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+       ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+       ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
 EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea";
+EHG_REVISION="${ICEDTEA_PKG}${ICEDTEA_PRE}"
 
 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="8"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
 
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-       +nss pax_kernel pulseaudio selinux +source systemtap test +webstart"
+IUSE="+X +alsa cacao cjk +cups debug doc examples jamvm +jbootstrap +nsplugin
+       +nss pax_kernel pulseaudio selinux +source systemtap test zero 
+webstart"
 
 # Ideally the following were optional at build time.
 ALSA_COMMON_DEP="
@@ -75,7 +75,7 @@ X_COMMON_DEP="
        >=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/gtk+-2.8:2=
        >=x11-libs/libX11-1.1.3
        >=x11-libs/libXext-1.1.1
        >=x11-libs/libXi-1.1.3
@@ -93,14 +93,13 @@ X_DEPEND="
 
 COMMON_DEP="
        >=media-libs/giflib-4.1.6:=
-       media-libs/lcms:2
+       >=media-libs/lcms-2.5
        >=media-libs/libpng-1.2:0=
        >=sys-libs/zlib-1.2.3:=
        virtual/jpeg:0=
-       javascript? ( dev-java/rhino:1.6 )
        nss? ( >=dev-libs/nss-3.12.5-r1 )
        pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-       systemtap? ( >=dev-util/systemtap-1 )"
+       >=dev-util/systemtap-1"
 
 # cups is needed for X. #390945 #390975
 RDEPEND="${COMMON_DEP}
@@ -137,7 +136,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} 
${X_COMMON_DEP}
        app-arch/unzip
        app-arch/zip
        app-misc/ca-certificates
-       >=dev-java/ant-core-1.8.2
        dev-lang/perl
        >=dev-libs/libxslt-1.1.26
        dev-libs/openssl
@@ -145,7 +143,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} 
${X_COMMON_DEP}
        sys-apps/attr
        sys-apps/lsb-release
        ${X_DEPEND}
-       pax_kernel? ( sys-apps/paxctl )"
+       pax_kernel? ( sys-apps/elfix )"
 
 PDEPEND="webstart? ( dev-java/icedtea-web:0 )
        nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
@@ -191,6 +189,7 @@ java_prepare() {
        # icedtea doesn't like some locales. #330433 #389717
        export LANG="C" LC_ALL="C"
 
+       epatch "${FILESDIR}/pr2383.patch"
        eautoreconf
 }
 
@@ -200,7 +199,7 @@ bootstrap_impossible() {
 }
 
 src_configure() {
-       local bootstrap config hotspot_port jamvm_config use_jamvm use_zero 
zero_config
+       local bootstrap cacao_config config hotspot_port jamvm_config use_jamvm 
use_zero zero_config
        local vm=$(java-pkg_get-current-vm)
 
        # Whether to bootstrap
@@ -233,9 +232,14 @@ src_configure() {
                use_jamvm="yes"
        fi
 
+       # Use CACAO if requested
+       if use cacao; then
+               use_cacao="yes"
+       fi
+
        # Are we on a architecture with a HotSpot port?
-       # In-tree JIT ports are available for amd64, ppc64 (le&be), sparc and 
x86.
-       if { use amd64 || use ppc64 || use sparc || use x86; }; then
+       # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), 
SPARC and x86.
+       if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use 
x86; }; then
                hotspot_port="yes"
        fi
 
@@ -258,6 +262,15 @@ src_configure() {
                jamvm_config="--enable-jamvm"
        fi
 
+       # Turn on CACAO if needed (non-HS archs) or requested
+       if test "x${use_cacao}" = "xyes"; then
+               if test "x${hotspot_port}" = "xyes"; then
+                       ewarn 'Enabling CACAO on an architecture with HotSpot 
support; issues may result.'
+                       ewarn 'If so, please rebuild with USE="-cacao"'
+               fi
+               jamvm_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"
@@ -265,12 +278,6 @@ src_configure() {
 
        config+=" --with-parallel-jobs=$(makeopts_jobs)"
 
-       if use javascript ; then
-               config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
-       else
-               config+=" --without-rhino"
-       fi
-
        unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
 
        econf ${config} \
@@ -281,18 +288,27 @@ src_configure() {
                --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-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
                --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
                --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
                --with-jdk-home="$(java-config -O)" \
+               --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+               --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
                --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+               --with-pkgversion="Gentoo ${PF}" \
                --disable-downloading --disable-Werror \
+               --disable-hotspot-tests --disable-jdk-tests \
+               --enable-system-lcms --enable-system-gif \
+               --enable-system-jpeg --enable-system-png \
+               --enable-system-zlib \
                $(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) \
-               ${zero_config} ${jamvm_config}
+               $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+               ${zero_config} ${cacao_config} ${jamvm_config}
 }
 
 src_compile() {
@@ -313,52 +329,29 @@ src_test() {
 }
 
 src_install() {
+       default
+
        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/images/j2sdk-image || die
 
        # Ensures HeadlessGraphicsEnvironment is used.
        if ! use X; then
-               rm -r jre/lib/$(get_system_arch)/xawt || die
+               rm -r "${ddest}"/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 doesn't preserve executable bits.
-       cp -vRP bin include jre lib man "${ddest}" || die
-
-       dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-       if use doc; then
-               docinto html
-               dodoc -r ../docs/*
+       if ! use examples; then
+               rm -rf "${ddest}"/demo "${ddest}"/sample || die
        fi
 
-       if use examples; then
-               cp -vRP demo sample "${ddest}" || die
+       if ! use source; then
+               rm -f "${ddest}"/src.zip || die
        fi
 
-       if use source; then
-               cp src.zip "${ddest}" || die
-       fi
+       dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
 
        # 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
@@ -370,13 +363,6 @@ src_install() {
        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}"

Reply via email to