* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2014-03-28 16:56 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2014-03-28 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 8a8d003e76e11b450cbd6fa7e250f61fa793da25
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Mar 28 16:56:15 2014 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Mar 28 16:56:15 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=8a8d003e
Fix ecj jar requirement in 2.4.6 & update to 1.13.2: http://bitly.com/1f0BhnC
Package-Manager: portage-2.2.7
Manifest-Sign-Key: 248BDC07
---
dev-java/icedtea/ChangeLog | 7 +++++
dev-java/icedtea/Manifest | 35 +++++++++++-----------
dev-java/icedtea/files/icedtea-7-ecj_jar.patch | 28 +++++++++++++++++
...tea-6.1.13.1.ebuild => icedtea-6.1.13.2.ebuild} | 24 +++++++--------
dev-java/icedtea/icedtea-7.2.4.6.ebuild | 5 +++-
5 files changed, 69 insertions(+), 30 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 4da20fd..8a74cdb 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*icedtea-6.1.13.2 (28 Mar 2014)
+
+ 28 Mar 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +files/icedtea-7-ecj_jar.patch, +icedtea-6.1.13.2.ebuild,
+ -icedtea-6.1.13.1.ebuild, icedtea-7.2.4.6.ebuild:
+ Fix ecj jar requirement in 2.4.6 & update to 1.13.2: http://bitly.com/1f0BhnC
+
*icedtea-7.2.3.14 (28 Mar 2014)
*icedtea-7.2.4.6 (28 Mar 2014)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index d441fa6..bb4de93 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -8,6 +8,7 @@ AUX icedtea-6.1.10.4_pax_kernel_support.patch 4152 SHA256 4a6f3462e9dd47dcc5941d
AUX icedtea-6_pax_kernel_support.patch 4862 SHA256 7e9235d5f2b70b3e70c0940d35dc312fa59444e763eb5f521f2b71f86a24f70b SHA512 e9ec9df75925aa408ee78c4730be320231017f6a180f34b0406ef1393a142d14192cd3bc63c1929f9c6904c569f2a4150ceb7f286c69f3084053aab73b4ed253 WHIRLPOOL 3bef4746ed97e8e2f8a37cc337cf50b137afc985220e7804759331aa75c3c4a90b6f2266c3ec8449d6726ea4f45b4b1f55d653048039429013e08f57a50acdb1
AUX icedtea-7-compile_for_7_cacao_mem.patch 3414 SHA256 0ace12a18f471ddec1412e4eea999a5b38dca0dd653b2a8f0bc80449380c77eb SHA512 2fa5b2483bc19968c7cff322415c63fe94afb2145400770c4d8f5ededb025f35ff441f56c9f0b3326d54804e1976554c3b6a347b8f8d27cf4910d8e39ecf234d WHIRLPOOL dbc9adb2d0f33b35dfbc25a522c7057ca64af44f7fed103b31d990b8e47af3611e88a77ac04a4de68f119dd209333e060cc2122e41c5fb1c1a8007f10fb8109c
AUX icedtea-7-compiler_detection_cleanup.patch 6833 SHA256 406fccc762d84cb73bb2ef7f934e770a88d82ead45eed860135b4571a6b3a91a SHA512 e2bb1ea1197d44127b214f14c70323fa5f99094720986cdf6429a503f330536ce2d0a3988782736ed2491c1497d70c7fdbac4588df04dcd9b43c8f8bed1adb7e WHIRLPOOL a70d1ba986e598abb04cf5263d063529aded1a683470dc73c2f7c56c8da8dfead09f15cc28ff86379588216a72c0b7be0fa09cadd68decd683aaf0e8ffa23fa0
+AUX icedtea-7-ecj_jar.patch 718 SHA256 e01eef0e5b99a3ab9dd596c0f347d9ac93877bffcc4b37899c543e115bc2a841 SHA512 79bad0e1e518482d1b5faeb30dfa7fdc60f1ebd306773afdfdc8ebc98c1cf3770a4bd2b70628f20e822ad23c1e9fdf4bbdb66db9c29e26c431df93eb8d712663 WHIRLPOOL 505d999e31d2f0b79df9b30bf20fe0d5c2fd4e5602f0a1231e9a4afddd112e6613980c1ef1ff773d30c1b0b07ba21e3b20d645149a16d9ec1120650959dd9383
AUX icedtea-7-no_suffix.patch 833 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8 SHA512 d6982b5c7a7df41769cbd14067cff3425af8520d3f8a870028a80b443fe537af1923ed1fc8050ed6fed1d18058c8798bdb578bf19eefc87380c6861702761625 WHIRLPOOL 3df9e0571624fe619170c54379ce673470bb6b9e192942f27300ef5b44f1471cc3abf211bc728a2dbed8070c57d935f8c425129243973f4f9a16d2998a2523b5
AUX icedtea-7.2.1-pax_kernel_support.patch 6511 SHA256 4771937bbb89a92fd77dc5e5945231ae511f284fa368648bb7aa34e0fb48ba9e SHA512 4c51920e1376597d91bf11f0e217c177e954d4d59930b9177c48dc2c6c835a0994dbea11ea2cf9e42f4c3b63e0f21ecf4a4ce5790955673b382438cb77ee4e39 WHIRLPOOL 4190de4e1f4c5660154075a85a2c56d6577d13a14d019346e82a86edac1016bf2ff71b07c9c217693eceb46cfcdb216356ff8259736e782104924e056b7e7d9c
AUX icedtea-7.2.1-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45
@@ -52,7 +53,7 @@ DIST icedtea-6.9999-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230b
DIST icedtea-6.9999-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
DIST icedtea6-1.11.15.tar.xz 9250216 SHA256 4bd083ceb51da976b6f135780067cee8c84908db0143482ab743101bd0a2458a SHA512 1b30c206748f81d57c2aababd038d91051ccad2491ec7ad11f4fe770a158c31267e97bd70809453a47f12db723b7e33dc204dc9d6e5b0bc94bde665baf3c4ba3 WHIRLPOOL d3b21646dda6a4b6ca6c0d3eca31392829c62fe90ecba9e9106ca18fd3b586e1535814ec9ac0629c2f2f82a48bacec69be9edf3f98c51068895973d81561de21
DIST icedtea6-1.12.8.tar.xz 9249200 SHA256 cb584a3983e146b91f64c31594f8c599604fbc91fd3560503fdd65b04c6bfb7c SHA512 f7292eca9f36eef220fe92e011d3a6136005ff160922dc8adbb6e7714f2cd25a104ea33434f4a8f509ae508346b1c2c6ba21a6e4e9c32bc5f6bfb844bd3b45dc WHIRLPOOL 5310f150634257cbdc21df3b2d97d539222ef0a8c49ab75afd194ac0a638445bc7ce8749ff4929bcb3c766f4866250000b5c84d75dc00c2cea49363e9903b427
-DIST icedtea6-1.13.1.tar.xz 4963036 SHA256 5b2fe75660282889217fe997e9c8f9e70982f2c72fc2ca59db80e7da7380d7c1 SHA512 0406eecfe0e22942a3b709826a6311f8efa9a1b80fbacfbb9cb700ce6870d1ce33bb005798631453b1e7012d802d9347c5a6c70e6b4f29770dd6e64a4fc08a68 WHIRLPOOL dc9bb11637f22d48db762b44f561ffa2eeb5cc12efbfeb3cf38fc23267d0a96dc0fd8f36173b5b90ac38c808301c7b34df7a0dcb539416f04103bd4ebe7dae0e
+DIST icedtea6-1.13.2.tar.xz 4969948 SHA256 b7614cf5f90d10a3ad379c65bc7d9c5f64ca38beafe50282e131612d62b1a1f9 SHA512 26d4a327c4b2eb8a989d1df4d919a48365164617f06ed5a8963e060a96223d1812eb2886fcf30b4c869064085ead22338340cdae4ba7bf4715aa318b3ef5b67a WHIRLPOOL c637776234b34ee68c803f1495f76cd9051889781e05274017fd2c85e30df01eb75bc45d753073c8c36ff495be3fa474d05a709ab924446d8615a356d7bc2557
DIST icedtea7-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
DIST icedtea7-corba-16906c5a09da.tar.gz 1423305 SHA256 29dec824dd068c8ba89e9d079bc63e5c408ccc915118098381734495a0ef6610 SHA512 e9042652d275d497aed8263c8e4b5532862a0b8912d450dd7fd6bc588914efcb5d74e01c9c6df0bb41c62db0156edd4d7f2f739995f4b44656e70099c23c5396 WHIRLPOOL 4e5036e665bebff03da99d94a66baf93ec0dd2b9a37bb0bcdfd8669ee3672aa5a2946d2772a7b8de196a060d606eba715aaceeb5e1bd3f87ca8616b4dffff4c0
DIST icedtea7-hotspot-f30e87f16d90.tar.gz 10191891 SHA256 871fa08b8e9d7a2958cee844f940752c39b1946146dc382c005269e86b687a49 SHA512 6ce7ba45494cdf99126830d2f7f53ed3d93cfa545371e34b64218e4a59e51a1fa4b022cfdcfcbee2a0ac91b806071968062805225320b0b746f5bf20a9a45acd WHIRLPOOL 7bb5d2122d8ef560af2060890c3867811e0d3d6e9da1cf743c492f1fe22571c6c4e46c18b16822178c21b2dcd642d05f17e1c5336c117f974e5693e2969b8f99
@@ -68,27 +69,27 @@ DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256 ebd9fdf39c8590cd620cb7
EBUILD icedtea-3.9999.ebuild 10726 SHA256 f1deeffdef35c0e28abb4d39fdde2d6fdd394e17db564ee161edfff0bbf52f77 SHA512 3a0eb9273a9bf2f1deb950bbc298c064f9cb02c1e80c64bdb3c6f7f5d61f67d12b18fb6d573f3b40cbd68c6ad1ca402001bbf3e0c733365cf33a063b439c6e23 WHIRLPOOL 74d29695d3e6bb529c3447c87cd2b0339e2ce65173070ac8ccc778fba7e6df73360d9b3c9317556f46a41f97726481803fd4491e1e1b37cb29791e6ce5a1c7fb
EBUILD icedtea-6.1.11.15.ebuild 10040 SHA256 ac62790f1ba463dca60afde7f89aeb4e987eb1d9123f3ad44b04dea692dd8691 SHA512 0e36d645059c1a904dde5f3c84c054bb684889756cd4e6416cae36294d030e799c1a241855e9b9650ba55d1c9f0135f28e15b02132522fd9848359f9ec6cb187 WHIRLPOOL 6edecf5db05474d89adad93bcb613deaf392b73e16570ad2ed21192f47251daa2371bb9ce7534814a356620f196564ff2581322a976ac6a8ca4c8ed651ebe952
EBUILD icedtea-6.1.12.8.ebuild 9492 SHA256 8b97bdef92ecfb9122b1f8374bff68f17552e45cf17f9dbb986a2824b10e8115 SHA512 a14c37fba3565f729350bbb67f6b06f6ca1eca79014840ae5284645905d840af1149f2f4991ecbd862e4f2df29cac007194ac001b6d48f589dc96cebc650fd45 WHIRLPOOL 91a26676ddef39939958a560742ed9385f5c0136bc017a64267e8a8288b2efabd10757795d8b16e156eacf04032ad1e34ec1c73f0dd21875de057834e36bf738
-EBUILD icedtea-6.1.13.1.ebuild 9736 SHA256 05d1aeeb467466452ac391bb0f71389eb792fb3449b955b19768b87b8f3fed68 SHA512 59625f6497406d1bdd3ab38e65bd85280dd1378eb6339e28d3574e3ae7a91078f045621571ce447c0866e15af9543d9b9994a476bda53b5139c9244789bf5f0a WHIRLPOOL 730f0747f711b404fbcd0cbd5562e7d959e05af6c93a9a8901d5be7198d3940abd13f77f4e9630ccb8720a3bef1e5efe407537a7e44ff1381a54144b916a8ff7
+EBUILD icedtea-6.1.13.2.ebuild 9803 SHA256 fef0b0dc3ea85e6141e8b03d58b497eeb4ea22d44c55d8db165475550eb4aba5 SHA512 287bb8ba237d2b1474d0a302e6db7d301c715fa844772e83ca1f828e429652fcbdf68b90b8d823fc3d56798c11f1ddaf171ccac413967cdb01da09378baebde5 WHIRLPOOL a33a800ab5b9e7e7c57a52d5c709a19d7b846e3ff6b2e938c4ee027a36b61908b250a04c51ee4111e9a945b3c1f6409c48369fa6a1ccbf41fb9d9df418d5f9f4
EBUILD icedtea-6.9999.ebuild 9520 SHA256 961454b9a5dfc61ed5fa2930703e9231ad4abc9e101f1baf671ea8df43918093 SHA512 54c12e0cfe78f60290c9c01d6862711be56af3e52d44cb27a7f882385573d1a053da6b73156ee2907cf91ce1fcc5e08cd824c90878b2201fed126fa83cea1694 WHIRLPOOL 61bdcd6e8bfa9fcd99cd34c7ef57fb811c89be277c5502c8135f262a44d0c155a62ec6cc56e50de8652a9272259f2cdedde34cae18fed808792fdff2cc60c5e1
EBUILD icedtea-7.2.3.14.ebuild 11992 SHA256 72d5278634a54ebaec90cb9f931a6f8208020507daecce647cd5d45dfe9fc64d SHA512 6325ab084010f1a38cd3ec1bae85316a7b8e020c34940d5a3ab6aa6e3d0a2edf95f60877ccdbd59552240a46664958781dbb77a27235ae28e55b5e226fabaa01 WHIRLPOOL 23cf80fa22e9f05569ef10f4af38122a2b5c310000d42ee782ddb9f1659983bbea86a4be4b1f8bff1b0fb5b64ff79234501194363edd7d2bb296e4d6104296b9
-EBUILD icedtea-7.2.4.6.ebuild 11980 SHA256 c83e2d4c8131328d75c61d4332650d4d6e1cf894a75c02ac72585fcea4fb4532 SHA512 f8108f12a4f7534b02c04e1e908f8f4c181b02957ea3d06d6bd1e16dddecdd8fd08edfccda1ffd8e09493f936ca7714803bd998a08be587a96ae1dd06709fd8e WHIRLPOOL 6d658de072e2c7f98cdee2e24475673b49e304308e58244dc28afd1546eaf05892d44fda750cdf6a2e99e6f76a3293a321fbf08434de3057511602edb13b4200
+EBUILD icedtea-7.2.4.6.ebuild 12054 SHA256 16e5affb85134b25a050838fb8b2abb95e172be1f7c31480b74eb63ff59a1ebb SHA512 613c8aa5aa851fc2856ba91248985f8fdb4fbbec326c8c7bd3fe59ccf158fbab7b63c7853de848850fab0c7168d9440f2fb61ffdd389adad7c87b93b30c69345 WHIRLPOOL f5a6a4006d95a9d827be7df55600b204bf2670d14dd96617393d6b487c5e40e2947d6c059cd2bba7e6dc3621025977f2544d6af424c6d7e09591bf45484d630d
EBUILD icedtea-7.9999.ebuild 11789 SHA256 992830a01e167b153053e852836ed0dc14127cbd075dd0cfe8a20561d6500a78 SHA512 7704c2c6fa9246745c84a789b6de5899392e36dba9e972f644f41f7df49e5ac5f2ce9a699c96946f0bc5b1d3c0464e2e01777a6a5f84b2ea9a6df6065fa98c6e WHIRLPOOL 47c798c0b6d9b51512bcf0da3984c9179e9c6c8f7124f883ed27e5d94861838f40e0440c97905b8844049e753b93eeae8d47b70aeacf3f62a32209268e5295b3
-MISC ChangeLog 79982 SHA256 737a7f783df726cb8f2371826ab9b31601fc0c3039b3795a858f8e6f5305935e SHA512 9892fd4e738f935ae92a4380f9afd89a89c143863c6e6a1c6fe7641196035a61f447a12eb93ca990f445e3a4baa54a10b8d6019b6ff226c6e942360afb2176b7 WHIRLPOOL 94343822d6770c68e8b4ab5dd59cf776a80f1d4f601b460c603106c92102baaf5caa1da72904d3e9515f62743a5d7e73832291ab10e4eeb19844f486773a35e2
+MISC ChangeLog 80270 SHA256 87e3102a463efbc45cf57c0a861d228657ccbce9cd251ea0ebc59a725d4565d2 SHA512 e89128eb5c53379a8305e20e89598ff1d70b80dba7bb2109afd4a1a9b259b8355ac157422393269fc4cca5bfbb1911370f05149c780131d8db4512515dec3a75 WHIRLPOOL 7f57305093a872a73d9373d88e6a8c37b2b0827b2d67c43a62003f4cb6e27a2e4add031382cc140373ebc165a410df0d9a84b3ac66214dad659b371d36f710af
MISC metadata.xml 1528 SHA256 dfa77e191787243660217bd236197611b76c2a4cbc4e5a63ad128d1a62905356 SHA512 3c4d436c7607814b7442d3b84480efacd0db79323c4954d88c0086292534d8bfd8a02af512e72225ec8adc269a03679709a984bc63dff48311a9bdaf3b991d76 WHIRLPOOL ff9090ec45c7c857db175a7c820f8eb9173372acca9c82b2a09ba08cbc0fac2f74f3e4f3c092f6acb7781592ccb26589ef29b7fd5528bd6d11c414c4d697d94c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJTNX/MAAoJEDuWpXgki9wHpSAP/jbxFUCmL9xG2j9es1/xOhj0
-/hrcAksjJ12pXsFQ6rIrD8mTQoNtzeLKxLe/u5JFXBJ6m4ICn4Z+rZljpRCWKzfP
-oiLUzd+iK8KaL7z5FhbzX3d5+mzTYH3pPGFFV/wdT+UUJ+v28y2yfFDhirLt1zTF
-3QooCVHO58an+kQt9GDUzqtqe/1XddgqeaOPHJ7MbJiXZXlDFYVQjtmyvSO4iDjY
-+7zI3pe6PdwJnjDpQ73lIYesvKcyq+uCeYG8hhZcTKjEbXPzI4hSJFiJPBSX5hYn
-0ADjIALNJKljnkJCBgjfPtOn66WqA8MrYpidgrVsYFIE9UnLj/96sWnJXhcMYv7a
-6kMC7Yt5QOAyJNLOhEjkaMnAoCMt/BnMLPxkCt7ByFzPxXg1MMsj8OE2qK5GfJuC
-GKrjJtVPDTKpj7iu7ee7np20/RE6+UfekOTB5n42B59f+ITTlh0E4nDiCRvt+XOq
-h1td3xuvLcT6V4ondPlCZpV+pNeD473/BSpcQFeHxr8YxIy1IRf0P9uBpcs3oCNt
-jP9wC6MdUh/NS82HM93RGMGfj6kMCfkRxyYn2jB2loUbibq5P0AKRMdBSksPmhH7
-sEHQ3uTR20BfODHXxBWZZRDft6pNWaQKbenaKa8c00YQG5Ls0qo1N1NC+YUyXc5d
-pWTNYct9SmMqx7/CurNA
-=0ZBn
+iQIcBAEBCAAGBQJTNamuAAoJEDuWpXgki9wHw1AP/j6YR5rjGu4mD3m158uj1WKu
+lOMVM0nXmRkPF0n+2GkxGQZ8F4ybIO0NfDIb1QclwqPWzDpghM7lPg1uiz0OEyxk
+m2Q1InDQpJmulNgruSJSnn9Co8qDnlrnhKtyqoNRnPuHLLSccLdGkMxHuPxAcgm9
+pvDedzpvzWYUWwJYsXyzXWMD+LyimqzfWyYVDtmtn6wHQeV3U4hpNPIwNlmEwT/0
+5Lf4isOL489aAKUZY0ClfCJta0wngCIav3VYrkRY5vT1lweJmsphlawvcC7Gisbs
+6e6Ey+iGAuNw6hWvGJAS44bfzLNOD7gGAtNRV+kqG3Iq3GVyWGqbOixLqDZjUdvf
+SKI05oYI9udVbKV1o5yJpNrFpkYOe0d9qeRqI6pO4lpJn/JfKko4NXNFmmYbGFJE
+Wuc9sMSjRM4LPvwoN4FztkkPCA1PIZQZDnNjpeDRLHOwN5kWefTuNgOpJ+doLjLq
+m8jCASobdb8kPpptTl223xm3qNPbpXhgUV8sRdP0RWXf4xj0PJ3qhnvZrkgz+Gyv
+wj9ucjai8o9MbZkmrJCWpbBx4uAAFh3Ck9xLN0wbj5l+vlSP+tJt6+XEhxUT3a6K
+H6AyQPqHxADgUonzCrf80WoEGdKkjAs1hKtznXtLrNLUNVgIiH6R7wX6DGDrXIIP
+2yxfbPWdTy3rCoFqEcPX
+=qE4F
-----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/icedtea-7-ecj_jar.patch b/dev-java/icedtea/files/icedtea-7-ecj_jar.patch
new file mode 100644
index 0000000..0ca1dc1
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7-ecj_jar.patch
@@ -0,0 +1,28 @@
+diff -r d2bc83a8ce09 acinclude.m4
+--- a/acinclude.m4 Fri Mar 28 12:27:42 2014 +0000
++++ b/acinclude.m4 Fri Mar 28 15:34:35 2014 +0000
+@@ -134,6 +134,12 @@
+ IT_USING_ECJ
+ IT_WITH_GCJ
+
++ if test "x${ECJ_JAR}" = "xno"; then
++ if test "x${JAVAC}" = "x"; then
++ AC_MSG_ERROR("No compiler or ecj JAR file was found.")
++ fi
++ fi
++
+ if test x"${GCJ}" != xno ; then
+ JAVAC="${JAVA} -classpath ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main"
+ fi
+@@ -350,11 +356,6 @@
+ fi
+ fi
+ AC_MSG_RESULT(${ECJ_JAR})
+- if test "x${ECJ_JAR}" = "xno"; then
+- if test "x${JAVAC}" = "x"; then
+- AC_MSG_ERROR("No compiler or ecj JAR file was found.")
+- fi
+- fi
+ AC_SUBST(ECJ_JAR)
+ ])
+
diff --git a/dev-java/icedtea/icedtea-6.1.13.1.ebuild b/dev-java/icedtea/icedtea-6.1.13.2.ebuild
similarity index 95%
rename from dev-java/icedtea/icedtea-6.1.13.1.ebuild
rename to dev-java/icedtea/icedtea-6.1.13.2.ebuild
index a594126..5e906ad 100644
--- a/dev-java/icedtea/icedtea-6.1.13.1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.2.ebuild
@@ -7,7 +7,7 @@
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
# *********************************************************
-EAPI="4"
+EAPI="5"
inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
@@ -46,8 +46,8 @@ 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
+ >=media-libs/freetype-2.3.5: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
@@ -63,15 +63,15 @@ X_DEPEND="
x11-proto/xproto"
COMMON_DEP="
- >=media-libs/giflib-4.1.6
- >=media-libs/libpng-1.2
- >=sys-libs/zlib-1.2.3
- virtual/jpeg:0
+ >=media-libs/giflib-4.1.6:=
+ >=media-libs/libpng-1.2:=
+ >=sys-libs/zlib-1.2.3:=
+ virtual/jpeg:0=
>=media-libs/lcms-2.5
javascript? ( dev-java/rhino:1.6 )
kerberos? ( virtual/krb5 )
nss? ( >=dev-libs/nss-3.12.5-r1 )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= )
systemtap? ( >=dev-util/systemtap-1 )"
# media-fonts/lklug needs ppc ppc64 keywords
@@ -112,7 +112,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
virtual/pkgconfig
sys-apps/lsb-release
${X_DEPEND}
- pax_kernel? ( sys-apps/paxctl )"
+ pax_kernel? ( sys-apps/elfix )"
PDEPEND="webstart? ( dev-java/icedtea-web:6 )
nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
@@ -204,15 +204,15 @@ src_configure() {
--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 \
+ --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+ --disable-downloading --disable-Werror \
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
$(use_enable kerberos system-kerberos) \
$(use_enable nss) \
$(use_enable pulseaudio pulse-java) \
$(use_enable systemtap) \
- $(use_with pax_kernel pax paxctl)
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh")
}
src_compile() {
diff --git a/dev-java/icedtea/icedtea-7.2.4.6.ebuild b/dev-java/icedtea/icedtea-7.2.4.6.ebuild
index 71abc01..80f02d6 100644
--- a/dev-java/icedtea/icedtea-7.2.4.6.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.4.6.ebuild
@@ -9,7 +9,7 @@
EAPI="5"
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 2-)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
@@ -173,6 +173,9 @@ java_prepare() {
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
+
+ epatch "${FILESDIR}/${PN}-${SLOT}-ecj_jar.patch"
+ eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2014-04-16 4:49 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2014-04-16 4:49 UTC (permalink / raw
To: gentoo-commits
commit: 9e194391473ed94138e599fab06f8ebc807367ef
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Wed Apr 16 04:49:18 2014 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Wed Apr 16 04:49:18 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=9e194391
IcedTea 2.4.7 security update: http://bitly.com/1maXJMQ
Package-Manager: portage-2.2.10
Manifest-Sign-Key: 248BDC07
---
dev-java/icedtea/ChangeLog | 15 ++
dev-java/icedtea/Manifest | 57 ++---
.../icedtea-6-pass_javac_memory_args_to_vm.patch | 99 --------
.../icedtea-6.1.10.4_pax_kernel_support.patch | 143 ------------
.../files/icedtea-6_pax_kernel_support.patch | 163 -------------
.../files/icedtea-7-compile_for_7_cacao_mem.patch | 85 -------
.../icedtea-7-compiler_detection_cleanup.patch | 257 ---------------------
dev-java/icedtea/files/icedtea-7-ecj_jar.patch | 28 ---
dev-java/icedtea/files/icedtea-7-no_suffix.patch | 25 --
.../files/icedtea-7.2.1-pax_kernel_support.patch | 202 ----------------
.../files/icedtea-7.2.1-pax_mark_rmic_java.patch | 31 ---
.../icedtea-7.2.1-pr986-cacao_memory_fix.patch | 143 ------------
.../icedtea-7.2.2-pr986-cacao_memory_fix_v2.patch | 184 ---------------
...edtea-7.2.4.6.ebuild => icedtea-7.2.4.7.ebuild} | 20 +-
14 files changed, 47 insertions(+), 1405 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 3832cfd..507dc0e 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,21 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*icedtea-7.2.4.7 (16 Apr 2014)
+
+ 16 Apr 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +icedtea-7.2.4.7.ebuild, -files/icedtea-6-pass_javac_memory_args_to_vm.patch,
+ -files/icedtea-6.1.10.4_pax_kernel_support.patch,
+ -files/icedtea-6_pax_kernel_support.patch,
+ -files/icedtea-7-compile_for_7_cacao_mem.patch,
+ -files/icedtea-7-compiler_detection_cleanup.patch,
+ -files/icedtea-7-ecj_jar.patch, -files/icedtea-7-no_suffix.patch,
+ -files/icedtea-7.2.1-pax_kernel_support.patch,
+ -files/icedtea-7.2.1-pax_mark_rmic_java.patch,
+ -files/icedtea-7.2.1-pr986-cacao_memory_fix.patch,
+ -files/icedtea-7.2.2-pr986-cacao_memory_fix_v2.patch, -icedtea-7.2.4.6.ebuild:
+ IcedTea 2.4.7 security update: http://bitly.com/1maXJMQ
+
*icedtea-6.1.13.3 (15 Apr 2014)
15 Apr 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 170224f..f791794 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -3,28 +3,17 @@ 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.10.4_pax_kernel_support.patch 4152 SHA256 4a6f3462e9dd47dcc5941dd67a56bbd9ea874dca2a94566f0f38c2d241efeb74 SHA512 03c1b7b2596d4590d1eb3b9536dbcea8168c08ba0b57fa84921be705a30706c06d0495a6703e1bb6e5580bcf026a19e9e8387254e55c0c874453164df40ed71c WHIRLPOOL 06b7f5b355e203337a656ca576c612e526bdb44ad64668a757c7d8b3ca9006b7907d2209d13f57158f35a872fd057f6933faa4a81dd79e742cbe4f03ff571649
-AUX icedtea-6_pax_kernel_support.patch 4862 SHA256 7e9235d5f2b70b3e70c0940d35dc312fa59444e763eb5f521f2b71f86a24f70b SHA512 e9ec9df75925aa408ee78c4730be320231017f6a180f34b0406ef1393a142d14192cd3bc63c1929f9c6904c569f2a4150ceb7f286c69f3084053aab73b4ed253 WHIRLPOOL 3bef4746ed97e8e2f8a37cc337cf50b137afc985220e7804759331aa75c3c4a90b6f2266c3ec8449d6726ea4f45b4b1f55d653048039429013e08f57a50acdb1
-AUX icedtea-7-compile_for_7_cacao_mem.patch 3414 SHA256 0ace12a18f471ddec1412e4eea999a5b38dca0dd653b2a8f0bc80449380c77eb SHA512 2fa5b2483bc19968c7cff322415c63fe94afb2145400770c4d8f5ededb025f35ff441f56c9f0b3326d54804e1976554c3b6a347b8f8d27cf4910d8e39ecf234d WHIRLPOOL dbc9adb2d0f33b35dfbc25a522c7057ca64af44f7fed103b31d990b8e47af3611e88a77ac04a4de68f119dd209333e060cc2122e41c5fb1c1a8007f10fb8109c
-AUX icedtea-7-compiler_detection_cleanup.patch 6833 SHA256 406fccc762d84cb73bb2ef7f934e770a88d82ead45eed860135b4571a6b3a91a SHA512 e2bb1ea1197d44127b214f14c70323fa5f99094720986cdf6429a503f330536ce2d0a3988782736ed2491c1497d70c7fdbac4588df04dcd9b43c8f8bed1adb7e WHIRLPOOL a70d1ba986e598abb04cf5263d063529aded1a683470dc73c2f7c56c8da8dfead09f15cc28ff86379588216a72c0b7be0fa09cadd68decd683aaf0e8ffa23fa0
-AUX icedtea-7-ecj_jar.patch 718 SHA256 e01eef0e5b99a3ab9dd596c0f347d9ac93877bffcc4b37899c543e115bc2a841 SHA512 79bad0e1e518482d1b5faeb30dfa7fdc60f1ebd306773afdfdc8ebc98c1cf3770a4bd2b70628f20e822ad23c1e9fdf4bbdb66db9c29e26c431df93eb8d712663 WHIRLPOOL 505d999e31d2f0b79df9b30bf20fe0d5c2fd4e5602f0a1231e9a4afddd112e6613980c1ef1ff773d30c1b0b07ba21e3b20d645149a16d9ec1120650959dd9383
-AUX icedtea-7-no_suffix.patch 833 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8 SHA512 d6982b5c7a7df41769cbd14067cff3425af8520d3f8a870028a80b443fe537af1923ed1fc8050ed6fed1d18058c8798bdb578bf19eefc87380c6861702761625 WHIRLPOOL 3df9e0571624fe619170c54379ce673470bb6b9e192942f27300ef5b44f1471cc3abf211bc728a2dbed8070c57d935f8c425129243973f4f9a16d2998a2523b5
-AUX icedtea-7.2.1-pax_kernel_support.patch 6511 SHA256 4771937bbb89a92fd77dc5e5945231ae511f284fa368648bb7aa34e0fb48ba9e SHA512 4c51920e1376597d91bf11f0e217c177e954d4d59930b9177c48dc2c6c835a0994dbea11ea2cf9e42f4c3b63e0f21ecf4a4ce5790955673b382438cb77ee4e39 WHIRLPOOL 4190de4e1f4c5660154075a85a2c56d6577d13a14d019346e82a86edac1016bf2ff71b07c9c217693eceb46cfcdb216356ff8259736e782104924e056b7e7d9c
-AUX icedtea-7.2.1-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45
-AUX icedtea-7.2.1-pr986-cacao_memory_fix.patch 6342 SHA256 5ad35a62ceb49215631d7d91b8e610598110d4b935140c5498b76f9a697cab3f SHA512 40a5e55691fe2430fe2c449788e1f61bd701d687e4c6ceab026baa8eebfc36ee1e22ff3aab2d1da80c8914abb423f220963a44949678165cb5416e7b43d4629b WHIRLPOOL 4543bb42ae9c6eff0e1e0d4ec0726106c3a55b996daa30bb7bea68174e37f14d231207e24722bb3fe0164a34182db1359fd5c9da8af2376dc9729eceac81880c
-AUX icedtea-7.2.2-pr986-cacao_memory_fix_v2.patch 7401 SHA256 e2060ed9acf9ae9da8943ffec470b09745d758c6c6de8ac06737ea26eef21795 SHA512 023578a2243672503e78a159d1774bcbe9d8cf4fc514166a9bf040e25cc7d28422b3a9469d804909e8a8fecfadd9fd31e8f34f85ae688a58620272ae620135f7 WHIRLPOOL 79fade6ca0c0d42f004e0a88f31159b4cabf5b4391ef30c78d74cf01bcf44f78bbf970ac070e8e8f320eb0dfd7fa17e335412156c2e004a47c2d47faba5bc309
AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258
DIST icedtea-2.4-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
-DIST icedtea-2.4-corba-48ef1bb6d120.tar.gz 1442170 SHA256 2fcfe699797154da8b4ba5242e32468b2f3f42a0cb17039915bfb1f84887a5b6 SHA512 8035aef58fae33994c5e05b4337b4726a534b2bf6b5b11705b1015ef10abf3ba536f40e79ad55878cf3ec00a5181cccf3c36e8074e7108599df809f01daa7a30 WHIRLPOOL a148570e274139f41a1b138498a0c04fdb3ab446b9054a41d483032f288c5c7257d8982271eaa2ef83433eec7522436fa83d46f5c0966c84d673bd5aeda032a1
-DIST icedtea-2.4-hotspot-172674e0ab65.tar.gz 9735722 SHA256 2aadfe9b1848a619bd2d35f802b3e71ef5286e7822f9e7b02ce2539ca817d9b0 SHA512 5b9c991cad8f0e16880d89aad7d39207020aab541a485f89e398888129e309b96a840d7fe5b28dcf4678f358f05a144aee7a42b44073d5759710ba94902a19bb WHIRLPOOL bedb192261a1a58347186fc9321c828226b878e4088ff84fb4f8865f44d397c9f90cea1a2e79364c6f4912bf2b8ea8f25b02c732f23afafcaa70db9c4a5022c1
+DIST icedtea-2.4-corba-e6ad5b912691.tar.gz 1441793 SHA256 cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674 SHA512 ab787baa78e9494fc7a9d12351121a64392b5490409fabb6d343fcf78191e0a7f838d14e2251b35d6b8ac15df950e259bb6ae7a191934cf391a0c00774c4ce4c WHIRLPOOL 1b1c7a401cb6a5f62fd5393bca806f25ca7b093ebcdc09600fac3114d6aa9a5dbd0317ce934a34992fb75fe017e638ed879d661e7854459d2416f80d5c021da1
+DIST icedtea-2.4-hotspot-69b542696e5b.tar.gz 9735746 SHA256 e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65 SHA512 6480f7df5f139d5ade06fd949e7daaa258d7a8db972ac36690092fbedb3702b8a92e51d9504d445c6c4ed07fb47e088ccf6efc01b96e292e602eaf8f246b98ed WHIRLPOOL 1343acc29f546fc12a665031a9b9af7c4fa6210c40c08ea2050dbe66c56dfe2624178037ba3d8bf52deb7461aeb12bd1565ab48c7fcefa450c995b0468820487
DIST icedtea-2.4-jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz 316422 SHA256 4662da1fe3e0e11d8fa685c7f2fc748576b9f3d3e37dc56b798dd6a5bd6b61e7 SHA512 a8132ce0f97f5ba090b12aad847072861f8913fe1fdc3a540e9e353b0d9ddc564a96ab2bcbfa27a7068bba606428d7dc9de4f7ad668e546151657f9ddcfc28ad WHIRLPOOL 8e274825bec5c47787eda0e25a0bc4a586a8938c1fa3c4f0c4f7c04e679d28458a61f45bfa62b255a630a4ca3a5c5d1aa3436086cba92ee7a43d3a2b8684e330
-DIST icedtea-2.4-jaxp-e0ba4b9a8b91.tar.gz 3890052 SHA256 e7014057721b8392676bd24760c3f7b3dd40548abb3c8dfbe8df2fa04d7c1fca SHA512 f98b2f8b74018759f0c0affa9b0f50445d9af80123a56388cbed2f6b09f6d347210f623fc34766f5c939518aef04a2fd78276edb6436b6c53df054bf52f31dee WHIRLPOOL 844264c51c87a2da35f94e56d3c7f98eebdd7e924c23b4f4d1aeffc7ac591e5c7814333d3ae22c17cc425c2bbd4814025c85bee37c616d6dc9f5e54810c9b161
-DIST icedtea-2.4-jaxws-4bd947cd146b.tar.gz 2769192 SHA256 17ed5278872ad0c9ec3a849caf1480e5942b714e35c9a4a949d09daac4b34c5a SHA512 b3895d253d5bf09b7fe15b7e030d31edf781c841ae6f897af97dfdff31be6e44d8942feb517ea2daa7a583332260b0076ae9e6578eb6b5ec66e2f2c4a5b5a033 WHIRLPOOL 905ba1118f028f9ca95ba4dec97d8f966bf7094b3e01294f3fe99872dbf2337a8d4ba87743cedfa67e3e903da9f35c60bd487b389b6cdbce3510beedf497e87f
-DIST icedtea-2.4-jdk-b5282042aae0.tar.gz 39944139 SHA256 ab9b0e973625604b12a2f027cb2a6f9bc5160ef7df55408da6ca8a9c3aaed2d5 SHA512 601fdbe5d0108892218aeca3e6a060e950accea0d25884301f778418e92b2b5556f43c83bb3fb7076eea6cddb52c39fcc441713a15b9b1ce2acd7ceb73a8dec3 WHIRLPOOL d21b6f0e2cd19afda989e609a19a1b80d337fa698c4819c2ea028d36e027397c54f52a1c45e5cdb13ef851fe71e401d15aeacffb706b6ad596e59aa42218c4f6
-DIST icedtea-2.4-langtools-06eeb77dac24.tar.gz 2299189 SHA256 a67e62618c70ef9190b2aef2b49be9d79624be9363bda258828b17494e092477 SHA512 765be36e2ba36cb448e88bb9c853e439c96ed8f09fd1b73c63b20254b94ba935db4aaef10415d63049b4d18c30dd48a6662f1153e0f21f40a05995df2b00c302 WHIRLPOOL a488dcb7c611ed3c618f410b1eb9b1a6763b70e941e0b645f797f8c0e3c80fed29261e5d4000ad15e53691b76a0fbb6122441e2b0608c3fdcdf5963f11120ae8
-DIST icedtea-2.4-openjdk-b028e58c1b77.tar.gz 137171 SHA256 e6be030ac5934781d9682dc3108980fa7d2330c32da3cea4ae74df11fbaa92f2 SHA512 2993693d49c0694345407ed3f604ef2acb2ebced4dd4ba0f26a33b28fe169de820d0ba9124f88f7a8eaa98b1fbb714cc54be282293e93cb660e4bea77a400d83 WHIRLPOOL 3070cd39f64105ab5c0bab945b751c5dd0c46dd8917fa5b7716de3854e37129a58d6892d78be0f40ac9d77a34069cfd52626c7c002a0f5afc3bad51881c988e7
-DIST icedtea-2.4.6.tar.xz 3418828 SHA256 c333bcaba46d8684b5ac727486d8b935ac77b9ba3cc5da1aad9d8c7422cbfa19 SHA512 cb414d4386184a97caad4b56e5222461eda09172d7f316e92e9c8356ff5235821b75a37b9719322c4723fae3de4d35787b031aa00a4099b2824e13afceda0e06 WHIRLPOOL 3b5a26d5ecfe56ee1bb8250d494244dba75f6550c09409d84ea8911e3d69bab6971906a96172dedc57980605e87022afaf4e2dfcde55a43a49dd7fae5e5b71f1
+DIST icedtea-2.4-jaxp-94b7e8e0d96f.tar.gz 3889649 SHA256 3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea SHA512 b604b7e52453680a20bd303ffa389f937d9f31bb50016b9b359d39b7f4af6deca6cd1e5b3e13f2d40f0d0c46ae9c0370a31afd30b8cc64c5854020804dd38855 WHIRLPOOL abf4f10153f82f0c6201c60d0eb29445ae908e3881be671fbe733e15e49d42d59a704583d2db53e9b08ebdb5f0fb20a8007df21836772c6039c9097a7841bc9b
+DIST icedtea-2.4-jaxws-bd9a50a78d04.tar.gz 2779009 SHA256 3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d SHA512 2a1ccdcdf4f6058649514f98c718a542cbdb5e76e997ad77fbcc1a8a7efdf2f787d04909ef0434af07c97373626b5d439718161defe537eea8a2eb56b5405de5 WHIRLPOOL c6cea6a31e01d160a7490297b143beaa0b9f5e586ab1608a8a8fd9a3207660c4d39abda680154ff56f29b8a14477bdaf850b80e93d9dd354dca665c630a83a94
+DIST icedtea-2.4-jdk-9448fff93286.tar.gz 39963396 SHA256 9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be SHA512 498434ee55cd0ff0f9522b5e7ef6f69c7a54750ca24b336519e24822185e6311ad84ae84b40a470a34b870a19c0191433b49bfb195c5bc6f28f2d4f1f3ee4ac7 WHIRLPOOL 0c70f98bea74707744213b98ed9391890bd5f8afd7f33963c55cec95985969e0a9a08ac29e01ee211a6d211240f22c3596d21914b2f99cc90334cd29f0470393
+DIST icedtea-2.4-langtools-8c26a3c39128.tar.gz 2299228 SHA256 5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b SHA512 96a0d00bc7992d84bec61999e158f9a955233a1a15671a5496fed4fd270b40b6526bb11dc70e1e5c85f2fdbdf0df06efd3e805c910d2b7410d78c9c4fe78da8a WHIRLPOOL 0d03d1ecd2789e5b97500a7bcc3ed8ebca484c64b2d0b94989acf551314e3a3df3979f2aa57a78109b62f3ce47ce43aa23b8547395227fe979128b0f7fd5b3f2
+DIST icedtea-2.4-openjdk-13970e76b784.tar.gz 137938 SHA256 bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b SHA512 3898815c8c7b99e8b25d710f48ef25d9e0a5ac2c332ce3c1f870b30bfe1198492029767b75f0f8cb85f6b55e2432b14e8c71b0ceab0d25e6c047bfcde766a6f5 WHIRLPOOL d9f0250f3e527aa9898933911c5059fd7d4f0821184f8a216c02afeeb4179f770372631c344bb6ef9d814e07e21e024259355dc317126f1b23ee6e4fabbf3096
+DIST icedtea-2.4.7.tar.xz 3419144 SHA256 b66973bef7808f8fb03be64e44d312ea2d13590a68a6a4e6690dbcdd1947459d SHA512 d252c06271693d6a3524b0678e4f75bf1fa5970501bce181de3dca701582a7c178a17b569d10caf130262c7110e60ba3d874f405bbd458d861d24cfe73df465d WHIRLPOOL 5fd01d01d1d84763bbfb4ddb407c7eea4f9c832b54844576f56982adb4f7b29c6d703b38e878308cb6277468e47ab831d1bc9acb61adf513e3ef957ca1d0b355
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
@@ -53,24 +42,24 @@ DIST openjdk-6-src-b31-15_apr_2014.tar.xz 33245892 SHA256 362d9bf20e91393b52dd05
EBUILD icedtea-3.9999.ebuild 10726 SHA256 f1deeffdef35c0e28abb4d39fdde2d6fdd394e17db564ee161edfff0bbf52f77 SHA512 3a0eb9273a9bf2f1deb950bbc298c064f9cb02c1e80c64bdb3c6f7f5d61f67d12b18fb6d573f3b40cbd68c6ad1ca402001bbf3e0c733365cf33a063b439c6e23 WHIRLPOOL 74d29695d3e6bb529c3447c87cd2b0339e2ce65173070ac8ccc778fba7e6df73360d9b3c9317556f46a41f97726481803fd4491e1e1b37cb29791e6ce5a1c7fb
EBUILD icedtea-6.1.13.3.ebuild 9803 SHA256 1ec39a4a05b15b91dc1aad9edfc0ad7dc1e9a41a11ae3989be065699058a9b9e SHA512 7a6a8bbdbaf614543a54a8958477ac5827dc896cb368afb08cc16c110fc42f1e727eadc05bae24d321ce3cb056a76eaf4dbe4edafd6c7ab2619ff6badac79c4b WHIRLPOOL 59f3d078c6ec7f8c1d470217ee93e3f150adb3db8be850784839e5cfbe8b68b889ce42a4fc364578257f10e43addddf381f0814147c81478aaf9aad825c79b0d
EBUILD icedtea-6.9999.ebuild 9520 SHA256 961454b9a5dfc61ed5fa2930703e9231ad4abc9e101f1baf671ea8df43918093 SHA512 54c12e0cfe78f60290c9c01d6862711be56af3e52d44cb27a7f882385573d1a053da6b73156ee2907cf91ce1fcc5e08cd824c90878b2201fed126fa83cea1694 WHIRLPOOL 61bdcd6e8bfa9fcd99cd34c7ef57fb811c89be277c5502c8135f262a44d0c155a62ec6cc56e50de8652a9272259f2cdedde34cae18fed808792fdff2cc60c5e1
-EBUILD icedtea-7.2.4.6.ebuild 12054 SHA256 16e5affb85134b25a050838fb8b2abb95e172be1f7c31480b74eb63ff59a1ebb SHA512 613c8aa5aa851fc2856ba91248985f8fdb4fbbec326c8c7bd3fe59ccf158fbab7b63c7853de848850fab0c7168d9440f2fb61ffdd389adad7c87b93b30c69345 WHIRLPOOL f5a6a4006d95a9d827be7df55600b204bf2670d14dd96617393d6b487c5e40e2947d6c059cd2bba7e6dc3621025977f2544d6af424c6d7e09591bf45484d630d
+EBUILD icedtea-7.2.4.7.ebuild 11999 SHA256 490fd948685b3a3781b4c4d785cf9e44299c7f499d3c9b5e760bd26a887cf277 SHA512 51ee216a38bef2effafe78dee27b1594f86bfdc4ffbde31d0a83cee5de5762ba802c0c3ad5a3235aed2b8d9590132f77e6495341a485eeb761d2629e6838446c WHIRLPOOL 1ce4f7392f70188e60cf6057bddb31a78fa7df4e82a6af6365e283cf8a166fbb4657d7533a6e0b0b7d776a1be69ee9b06f59c661e9c85d902c5e683e30088f47
EBUILD icedtea-7.9999.ebuild 11789 SHA256 992830a01e167b153053e852836ed0dc14127cbd075dd0cfe8a20561d6500a78 SHA512 7704c2c6fa9246745c84a789b6de5899392e36dba9e972f644f41f7df49e5ac5f2ce9a699c96946f0bc5b1d3c0464e2e01777a6a5f84b2ea9a6df6065fa98c6e WHIRLPOOL 47c798c0b6d9b51512bcf0da3984c9179e9c6c8f7124f883ed27e5d94861838f40e0440c97905b8844049e753b93eeae8d47b70aeacf3f62a32209268e5295b3
-MISC ChangeLog 80560 SHA256 3545af4b1abaf2a26c01ca18ab4128895c2faa15eafd2a193b7d0ca66bdb771a SHA512 3ae14bc035046174df12542f6195dc4036d019f6862fd97eefb0087116e4c7e035ddb9b02861d638c4c2c1c52b4e8c6ff5f90b3c0661ad3fb823e6bee2983b6d WHIRLPOOL fcfe1195feffd9bb9a9f267c4d110f0fd17af0fda785134aeb4d8b0694efbb2352b89aec09796f505f40eab2c014cc6466959ba35cd58a901e7e76dd56c39088
+MISC ChangeLog 81293 SHA256 fb11c8fed44b44d1514ff34b3c6d481fdc4cbcbfc7000c7acb0d16e3fc780d5f SHA512 cf64e690c2af149d241df2a04df63f34a312f6b1e597188252ea5823cb5d980b88ad536656a96a7a20f9ba84015b65f7b62bd338cd8b1d67cf0770671f63c208 WHIRLPOOL 531da94a3331b8957338f38319531d79722ad15c5b56f8f518edd30e10686b590d60551117dc4347de2c11e596b428e2c70e8bd7d5a90cb478e4cf95ec313d04
MISC metadata.xml 1528 SHA256 dfa77e191787243660217bd236197611b76c2a4cbc4e5a63ad128d1a62905356 SHA512 3c4d436c7607814b7442d3b84480efacd0db79323c4954d88c0086292534d8bfd8a02af512e72225ec8adc269a03679709a984bc63dff48311a9bdaf3b991d76 WHIRLPOOL ff9090ec45c7c857db175a7c820f8eb9173372acca9c82b2a09ba08cbc0fac2f74f3e4f3c092f6acb7781592ccb26589ef29b7fd5528bd6d11c414c4d697d94c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJTTcLYAAoJEDuWpXgki9wHIRUP/07OWN1B+gl0JYX9ZZSBleOL
-M5reWeslgImAXIbtQA2dymdcEJSnWfN9MtNkoxSew1e4IVRDdr0q+oluhQpozCYl
-y4Qw/jCfyA1bmOwcPRR+09XigFHbR6b3hZLAFolj8Hs90DVfOzgkYzMh/P5Bh4eL
-UoqlVh+Z3w6JAFNjY3Fe2RdQNYFX+PN3htVmYs6fcJ5JLdPb7kWNEmb4/jQAybiQ
-LC+ZJpilhD+Kwi1cvh/Ytx+l6PnGtzNAFeQEL68OpGoCYzIQXQcUiRHFeof9Zw0n
-Rr1YPcsw+g4R+OwR1SI0ANw8uMUE1Cv9wEAl5/p/g4+XJfiK+3anDuc1VHLBQc8s
-bs969sZvEvioByBB0fhfBYH3acUbznWDJzaqkyO6imoKkCXi3Y2z4MLHFbO0chFZ
-At0zI7xo2URno8Cyj33QkjqboaaoXHoRWXpajemDZHG+vi5B2HXUMcVvVADj76O1
-SzoG/QPt5+wUnlXc2aOqWceNLk66KrH3aIjrl1uma1UZnPcjF7yBFlTIQf3e4nU9
-PmTA5x55PJ6FQxk2lq4271vP0DKHaxzBvRjJ8aN5w/W52TIiJRYRidTSiXxtvqLH
-8YGPo4MDWcqO/2rXAqkhu7vWbMggwiXMuKJMtclHhDZ+jbUiTTq4zVYJqxy4uGj0
-nwsnXkzB1DgfFIDL1vfy
-=eQxy
+iQIcBAEBCAAGBQJTTgvOAAoJEDuWpXgki9wHClcP/2EmFuJIiYzwkjmeGjBwCSVW
+W6iXzii/cYFw8d9rAgZLpUAGELPmrQIfseuUQRa4mUqgP9WBsB+86foKCcWm7UFc
+qgyjtMS52xncbTMCb9bondXJ6XNCOIycANqaztnEbdzH2k8UJfkL+U0p3w+9LEyk
+xoNUZtx8/4/W4HCJ7yvGIIIU9VtqrTCyy3jquQF0qUOnkQYZxBTgay/4+IuKEGWP
+WeP+fG1ys0C2+ccMme+OwYdYaFeSqtT2bxd37gzA8FnYbjgfmfzqJKTO0l/F9XmN
+KNHKz2bStO2VuBjQkWPzWdQI+0LJNJ8uQ3vDjydsFCtO7p6SA5QU6le6BEEd2Gip
+LOYwMMz38+/O/uNV6RoAH5FUrcJt56ReqQO0bBgv1HDQZc/ad4KCp9t6IA27+9Lq
+/YSMZP+G04m5JPxsmRB3nWB1qVboSqnMYa4YcXAAstLo9P7t7o4KP2L5UF1u1Yn6
+tMysUvzow4WOGTCIWWvByMuqHW1RuKaHNHJdSf8bNdZ//ksITV0EJzW8g6bYZIqA
+kyEjZjNErq2FvT7VKfRGvp/Rj4zen+QICKy6WbtluvbieQ34lEkGavCIng3KBvFK
+zI34ZJQPMx6Q/4O4UgC4LM90oau+OB+sAoA6YsO8MaLXpXe2V4iM80GGMNlnr/XO
+psymNtXFyhfQJVV5GC5d
+=Mq4w
-----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 25cf27a..0000000
--- 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.10.4_pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-6.1.10.4_pax_kernel_support.patch
deleted file mode 100644
index 8046925..0000000
--- a/dev-java/icedtea/files/icedtea-6.1.10.4_pax_kernel_support.patch
+++ /dev/null
@@ -1,143 +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,7 +421,7 @@ else
- ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
-
--if HAS_PAX
-+if WITH_PAX
- ICEDTEA_PATCHES += patches/no-test_gamma.patch
- endif
-
-@@ -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/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 97ca435..0000000
--- 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-compile_for_7_cacao_mem.patch b/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch
deleted file mode 100644
index 497a67f..0000000
--- a/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@member.fsf.org>
-# Date 1339588177 -3600
-# Node ID df0999b55509faf1504b3ff55152a61a7cff57fc
-# Parent e6d81fc2c9439652f903664d51a13732c73485ea
-Make compile-for-7.patch apply after cacao/memory.patch
-
-2012-06-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
-
- * Makefile.am:
- Apply compile-for-7-cacao-mem.patch instead of
- compile-for-7.patch when using a compiler that
- supports diamond and either USING_CACAO or BUILD_CACAO
- are set.
- * patches/boot/compile-for-7-cacao-mem.patch:
- Version of compile-for-7.patch post applying
- cacao/memory.patch.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -364,8 +364,16 @@
- if JAVAC_LACKS_DIAMOND
- ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch
- else
-+if USING_CACAO
-+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
-+else
-+if BUILD_CACAO
-+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
-+else
- ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7.patch
- endif
-+endif
-+endif
-
- if DTDTYPE_QNAME
- ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch
-diff --git a/patches/boot/compile-for-7-cacao-mem.patch b/patches/boot/compile-for-7-cacao-mem.patch
-new file mode 100644
---- /dev/null
-+++ b/patches/boot/compile-for-7-cacao-mem.patch
-@@ -0,0 +1,42 @@
-+diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make openjdk-boot/hotspot/make/linux/makefiles/rules.make
-+--- openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make 2012-06-13 03:40:41.009311243 +0100
-++++ openjdk-boot/hotspot/make/linux/makefiles/rules.make 2012-06-13 03:48:41.838257784 +0100
-+@@ -139,8 +139,8 @@
-+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
-+
-+ # Settings for javac
-+-BOOT_SOURCE_LANGUAGE_VERSION = 6
-+-BOOT_TARGET_CLASS_VERSION = 6
-++BOOT_SOURCE_LANGUAGE_VERSION = 7
-++BOOT_TARGET_CLASS_VERSION = 7
-+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+
-+diff -Nru openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make openjdk-boot/hotspot/make/solaris/makefiles/rules.make
-+--- openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make 2012-06-13 03:40:41.009311243 +0100
-++++ openjdk-boot/hotspot/make/solaris/makefiles/rules.make 2012-06-13 11:36:03.057522188 +0100
-+@@ -131,8 +131,8 @@
-+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
-+
-+ # Settings for javac
-+-BOOT_SOURCE_LANGUAGE_VERSION = 6
-+-BOOT_TARGET_CLASS_VERSION = 6
-++BOOT_SOURCE_LANGUAGE_VERSION = 7
-++BOOT_TARGET_CLASS_VERSION = 7
-+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+
-+diff -Nru openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make openjdk-boot/hotspot/make/windows/makefiles/rules.make
-+--- openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make 2012-06-13 03:40:41.009311243 +0100
-++++ openjdk-boot/hotspot/make/windows/makefiles/rules.make 2012-06-13 11:36:19.537797380 +0100
-+@@ -43,8 +43,8 @@
-+ !endif
-+
-+ # Settings for javac
-+-BOOT_SOURCE_LANGUAGE_VERSION=6
-+-BOOT_TARGET_CLASS_VERSION=6
-++BOOT_SOURCE_LANGUAGE_VERSION=7
-++BOOT_TARGET_CLASS_VERSION=7
-+ JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+
diff --git a/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch b/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch
deleted file mode 100644
index af13d42..0000000
--- a/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@member.fsf.org>
-# Date 1339484856 -3600
-# Node ID 1a9e619bc32e81697bf4200a607935ee00c8d388
-# Parent 7ceb431c104f1da9cbabebdcc223b008e0177a71
-Bring compiler detection into line with other jdk tools and check java/javac work before running other macros.
-
-2012-03-20 Andrew John Hughes <ahughes@redhat.com>
-
- * acinclude.m4:
- (IT_FIND_COMPILER): Define only once and
- rename from IT_FIND_JAVA_COMPILER.
- (IT_FIND_ECJ): Use same form as detection
- for java, javah, jar and rmic.
- (IT_FIND_JAVAC): Likewise.
- (IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
- java and javac actually work together to compile code
- before running other tests such as the dtdtype one.
- (IT_CHECK_FOR_CLASS): Depend on java/javac working.
- (IT_GETDTDTYPE_CHECK): Likewise. Add -target 5.
- (IT_JAVAH): Depend on java/javac working.
- * configure.ac: Invoke IT_FIND_COMPILER rather than
- IT_FIND_JAVA_COMPILER.
-
-diff --git a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -117,50 +117,41 @@
- AC_SUBST(OS_PATH)
- ])
-
--AC_DEFUN([IT_FIND_JAVA_COMPILER],
-+AC_DEFUN([IT_FIND_COMPILER],
- [
-- JAVAC=${SYSTEM_JDK_DIR}/bin/javac
- IT_FIND_JAVAC
- IT_FIND_ECJ
- IT_USING_ECJ
-
-+ AC_SUBST(ECJ)
- AC_SUBST(JAVAC)
- ])
-
--AC_DEFUN([IT_FIND_ECJ],
-+AC_DEFUN_ONCE([IT_FIND_ECJ],
- [
-+ ECJ_DEFAULT=/usr/bin/ecj
-+ AC_MSG_CHECKING([if an ecj binary was specified])
- AC_ARG_WITH([ecj],
-- [AS_HELP_STRING([--with-ecj[[=PATH]]],the path to an ecj binary)],
-+ [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
- [
-- if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
-- IT_CHECK_ECJ(${withval})
-+ if test "x${withval}" = "xyes"; then
-+ ECJ=no
- else
-- if test "x${withval}" != xno; then
-- IT_CHECK_ECJ
-- fi
-+ ECJ="${withval}"
- fi
- ],
- [
-- IT_CHECK_ECJ
-+ ECJ=no
- ])
-- if test "x${JAVAC}" = "x"; then
-- if test "x{ECJ}" != "x"; then
-- JAVAC="${ECJ}"
-- fi
-+ AC_MSG_RESULT(${ECJ})
-+ if test "x${ECJ}" = "xno"; then
-+ ECJ=${ECJ_DEFAULT}
- fi
--])
--
--AC_DEFUN([IT_CHECK_ECJ],
--[
-- if test "x$1" != x; then
-- if test -f "$1"; then
-- AC_MSG_CHECKING(for ecj)
-- ECJ="$1"
-- AC_MSG_RESULT(${ECJ})
-- else
-- AC_PATH_PROG(ECJ, "$1")
-- fi
-+ AC_MSG_CHECKING([if $ECJ is a valid executable file])
-+ if test -x "${ECJ}" && test -f "${ECJ}"; then
-+ AC_MSG_RESULT([yes])
- else
-+ ECJ=""
- AC_PATH_PROG(ECJ, "ecj")
- if test -z "${ECJ}"; then
- AC_PATH_PROG(ECJ, "ecj-3.1")
-@@ -171,43 +162,45 @@
- if test -z "${ECJ}"; then
- AC_PATH_PROG(ECJ, "ecj-3.3")
- fi
-+ if test -z "${ECJ}"; then
-+ AC_PATH_PROG(ECJ, "ecj-3.4")
-+ fi
- fi
- ])
-
--AC_DEFUN([IT_FIND_JAVAC],
-+AC_DEFUN_ONCE([IT_FIND_JAVAC],
- [
-+ JAVAC_DEFAULT=${SYSTEM_JDK_DIR}/bin/javac
-+ AC_MSG_CHECKING([if a javac binary was specified])
- AC_ARG_WITH([javac],
- [AS_HELP_STRING([--with-javac[[=PATH]]],the path to a javac binary)],
- [
-- if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
-- IT_CHECK_JAVAC(${withval})
-+ if test "x${withval}" = "xyes"; then
-+ JAVAC=no
- else
-- if test "x${withval}" != xno; then
-- IT_CHECK_JAVAC(${JAVAC})
-- fi
-+ JAVAC="${withval}"
- fi
- ],
-- [
-- IT_CHECK_JAVAC(${JAVAC})
-+ [
-+ JAVAC=no
-+ ])
-+ AC_MSG_RESULT(${JAVAC})
-+ if test "x${JAVAC}" = "xno"; then
-+ JAVAC=${JAVAC_DEFAULT}
-+ fi
-+ AC_MSG_CHECKING([if $JAVAC is a valid executable file])
-+ if test -x "${JAVAC}" && test -f "${JAVAC}"; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ JAVAC=""
-+ AC_PATH_PROG(JAVAC, "javac")
-+ fi
-+ AC_SUBST(JAVAC)
- ])
- ])
-
--AC_DEFUN([IT_CHECK_JAVAC],
--[
-- if test "x$1" != x; then
-- if test -f "$1"; then
-- AC_MSG_CHECKING(for javac)
-- JAVAC="$1"
-- AC_MSG_RESULT(${JAVAC})
-- else
-- AC_PATH_PROG(JAVAC, "$1")
-- fi
-- else
-- AC_PATH_PROG(JAVAC, "javac")
-- fi
--])
--
--AC_DEFUN([IT_FIND_JAVA],
-+AC_DEFUN_ONCE([IT_FIND_JAVA],
- [
- JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
- AC_MSG_CHECKING([if a java binary was specified])
-@@ -1158,6 +1151,7 @@
- ])
-
- AC_DEFUN([IT_JAVAH],[
-+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
- AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [
- SUPERCLASS=Test.java
- SUBCLASS=TestImpl.java
-@@ -1452,6 +1446,44 @@
- AC_CONFIG_FILES([tz.properties])
- ])
-
-+dnl check that javac and java work
-+AC_DEFUN_ONCE([IT_CHECK_JAVA_AND_JAVAC_WORK],[
-+ AC_REQUIRE([IT_FIND_JAVA])
-+ AC_REQUIRE([IT_FIND_COMPILER])
-+ AC_CACHE_CHECK([if the VM and compiler work together], it_cv_jdk_works, [
-+ CLASS=Test.java
-+ BYTECODE=$(echo $CLASS|sed 's#\.java##')
-+ mkdir tmp.$$
-+ cd tmp.$$
-+ cat << \EOF > $CLASS
-+[/* [#]line __oline__ "configure" */
-+
-+public class Test
-+{
-+ public static void main(String[] args)
-+ {
-+ System.out.println("Hello World!");
-+ }
-+}]
-+EOF
-+ if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-+ if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
-+ it_cv_jdk_works=yes;
-+ else
-+ it_cv_jdk_works=no;
-+ AC_MSG_ERROR([VM failed to run compiled class.])
-+ fi
-+ else
-+ it_cv_jdk_works=no;
-+ AC_MSG_ERROR([Compiler failed to compile Java code.])
-+ fi
-+ rm -f $CLASS *.class
-+ cd ..
-+ rmdir tmp.$$
-+ ])
-+AC_PROVIDE([$0])dnl
-+])
-+
- dnl Generic macro to check for a Java class
- dnl Takes two arguments: the name of the macro
- dnl and the name of the class. The macro name
-@@ -1459,6 +1491,7 @@
- dnl replaced by '_' and all letters capitalised.
- dnl e.g. IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER],[java.util.Scanner])
- AC_DEFUN([IT_CHECK_FOR_CLASS],[
-+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
- AC_CACHE_CHECK([if $2 is missing], it_cv_$1, [
- CLASS=Test.java
- BYTECODE=$(echo $CLASS|sed 's#\.java##')
-@@ -1504,7 +1537,8 @@
- AC_PROVIDE([$0])dnl
- ])
-
--AC_DEFUN([IT_GETDTDTYPE_CHECK],[
-+AC_DEFUN_ONCE([IT_GETDTDTYPE_CHECK],[
-+ AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
- AC_CACHE_CHECK([if javax.xml.stream.events.Attribute.getDTDType() wrongly returns a QName], it_cv_dtdtype, [
- CLASS=Test.java
- BYTECODE=$(echo $CLASS|sed 's#\.java##')
-@@ -1561,7 +1595,7 @@
- }
- }]
- EOF
-- if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-+ if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
- if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
- it_cv_dtdtype=no;
- else
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,7 +97,7 @@
- IT_CHECK_IF_DOWNLOADING
- IT_CHECK_FOR_JDK
- IT_FIND_JAVA
--IT_FIND_JAVA_COMPILER
-+IT_FIND_COMPILER
- IT_FIND_JAVAH
- IT_FIND_JAR
- IT_FIND_RMIC
diff --git a/dev-java/icedtea/files/icedtea-7-ecj_jar.patch b/dev-java/icedtea/files/icedtea-7-ecj_jar.patch
deleted file mode 100644
index 0ca1dc1..0000000
--- a/dev-java/icedtea/files/icedtea-7-ecj_jar.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -r d2bc83a8ce09 acinclude.m4
---- a/acinclude.m4 Fri Mar 28 12:27:42 2014 +0000
-+++ b/acinclude.m4 Fri Mar 28 15:34:35 2014 +0000
-@@ -134,6 +134,12 @@
- IT_USING_ECJ
- IT_WITH_GCJ
-
-+ if test "x${ECJ_JAR}" = "xno"; then
-+ if test "x${JAVAC}" = "x"; then
-+ AC_MSG_ERROR("No compiler or ecj JAR file was found.")
-+ fi
-+ fi
-+
- if test x"${GCJ}" != xno ; then
- JAVAC="${JAVA} -classpath ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main"
- fi
-@@ -350,11 +356,6 @@
- fi
- fi
- AC_MSG_RESULT(${ECJ_JAR})
-- if test "x${ECJ_JAR}" = "xno"; then
-- if test "x${JAVAC}" = "x"; then
-- AC_MSG_ERROR("No compiler or ecj JAR file was found.")
-- fi
-- fi
- AC_SUBST(ECJ_JAR)
- ])
-
diff --git a/dev-java/icedtea/files/icedtea-7-no_suffix.patch b/dev-java/icedtea/files/icedtea-7-no_suffix.patch
deleted file mode 100644
index 61bbd09..0000000
--- a/dev-java/icedtea/files/icedtea-7-no_suffix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <ahughes@redhat.com>
-# Date 1338297380 -3600
-# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb
-# Parent 2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d
-Don't add a suffix for building the default, IcedTea.
-
-2012-05-25 Andrew John Hughes <ahughes@redhat.com>
-
- * Makefile.am:
- (versioning): Don't add a suffix if building
- the default project, 'icedtea'.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1435,7 +1435,7 @@
- echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
- >>openjdk/jdk/make/common/shared/Defs.gmk ;
- endif
-- if test x"$(PROJECT_NAME)" != "xjdk7"; then \
-+ if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
- proj_suffix="-$(PROJECT_NAME)"; \
- fi ; \
- if test x"$(VERSION_SUFFIX)" != "x"; then \
diff --git a/dev-java/icedtea/files/icedtea-7.2.1-pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-7.2.1-pax_kernel_support.patch
deleted file mode 100644
index 2d8f8ce..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.1-pax_kernel_support.patch
+++ /dev/null
@@ -1,202 +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.
-
-The embedded test_gamma.patch is taken from icedtea 2.0 itself.
-
-diff --git a/Makefile.am b/Makefile.am
-index 129edf2..158b149 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -279,6 +279,10 @@ else
- ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
-
-+if WITH_PAX
-+ICEDTEA_PATCHES += patches/test_gamma.patch
-+endif
-+
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-
- # Bootstrapping patches
-@@ -300,7 +304,6 @@ ICEDTEA_BOOT_PATCHES = \
- patches/boot/jar.patch \
- patches/boot/symbols.patch \
- patches/boot/tobin.patch \
-- patches/boot/test_gamma.patch \
- patches/boot/tools.jar.patch \
- patches/boot/jopt.patch \
- patches/boot/jaxp-dependency.patch \
-@@ -320,6 +323,10 @@ ICEDTEA_BOOT_PATCHES = \
- patches/boot/ecj-autoboxing.patch \
- patches/boot/xsltproc.patch
-
-+if !WITH_PAX
-+ICEDTEA_BOOT_PATCHES += patches/boot/test_gamma.patch
-+endif
-+
- if CP39408_JAVAH
- ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
- endif
-@@ -1612,6 +1619,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.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
-@@ -1765,6 +1773,7 @@ stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
- $(ICEDTEA_ENV_BOOT) \
- -C openjdk-boot \
- $(ICEDTEA_BUILD_TARGET)
-+ $(abs_top_builddir)/pax-mark-vm $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
- @echo "Bootstrapped IcedTea is served:" \
- $(BOOT_BUILD_OUTPUT_DIR)
- mkdir -p stamps
-diff --git a/acinclude.m4 b/acinclude.m4
-index 5310d71..f08f1a9 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2181,3 +2181,49 @@ rmdir tmp.$$
- AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "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 e0b866b..7c665ef 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,6 +146,9 @@ IT_WITH_PROJECT
- IT_ENABLE_HG
- IT_WITH_TZDATA_DIR
-
-+IT_WITH_PAX
-+AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
-+
- AC_PATH_TOOL([HG],[hg])
- if test "x${enable_hg}" = "xyes"; then
- if test "x${HG}" = x; then
-diff --git a/patches/test_gamma.patch b/patches/test_gamma.patch
-new file mode 100644
-index 0000000..7e8d3d6
---- /dev/null
-+++ b/patches/test_gamma.patch
-@@ -0,0 +1,47 @@
-+diff -Nru ../openjdk.orig/openjdk/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
-+--- ../openjdk.orig/openjdk/hotspot/make/linux/Makefile 2009-10-30 17:37:07.000000000 +0000
-++++ openjdk/hotspot/make/linux/Makefile 2009-10-30 17:45:40.000000000 +0000
-+@@ -287,42 +287,36 @@
-+
-+ $(TARGETS_C2): $(SUBDIRS_C2)
-+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-+- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
-+ ifdef INSTALL
-+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
-+ endif
-+
-+ $(TARGETS_TIERED): $(SUBDIRS_TIERED)
-+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-+- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+
-+ $(TARGETS_C1): $(SUBDIRS_C1)
-+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-+- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+
-+ $(TARGETS_CORE): $(SUBDIRS_CORE)
-+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-+- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+
-+ $(TARGETS_ZERO): $(SUBDIRS_ZERO)
-+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
-+- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+
-+ $(TARGETS_SHARK): $(SUBDIRS_SHARK)
-+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
-+- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+
-diff --git a/pax-mark-vm.in b/pax-mark-vm.in
-new file mode 100644
-index 0000000..118bb61
---- /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/dev-java/icedtea/files/icedtea-7.2.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.1-pax_mark_rmic_java.patch
deleted file mode 100644
index c665253..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.1-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.1-pr986-cacao_memory_fix.patch b/dev-java/icedtea/files/icedtea-7.2.1-pr986-cacao_memory_fix.patch
deleted file mode 100644
index 17e5f2a..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.1-pr986-cacao_memory_fix.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Nru icedtea-2.1.1.orig/acinclude.m4 icedtea-2.1.1/acinclude.m4
---- icedtea-2.1.1.orig/acinclude.m4 2012-06-13 02:56:54.455836680 +0100
-+++ icedtea-2.1.1/acinclude.m4 2012-06-13 02:57:31.660476528 +0100
-@@ -2258,3 +2258,18 @@
- AC_SUBST(PAX_COMMAND)
- AC_SUBST(PAX_COMMAND_ARGS)
- ])
-+
-+AC_DEFUN([IT_USING_CACAO],[
-+ AC_REQUIRE([IT_FIND_JAVA])
-+ AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
-+ if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
-+ it_cv_cacao=yes;
-+ else
-+ it_cv_cacao=no;
-+ fi
-+ ])
-+ USING_CACAO=$it_cv_cacao
-+ AC_SUBST(USING_CACAO)
-+ AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
-+ AC_PROVIDE([$0])dnl
-+])
-diff -Nru icedtea-2.1.1.orig/configure.ac icedtea-2.1.1/configure.ac
---- icedtea-2.1.1.orig/configure.ac 2012-06-13 02:56:54.459836748 +0100
-+++ icedtea-2.1.1/configure.ac 2012-06-13 02:57:31.660476528 +0100
-@@ -101,6 +101,7 @@
- IT_FIND_JAR
- IT_FIND_RMIC
- IT_FIND_NATIVE2ASCII
-+IT_USING_CACAO
- if test "x$enable_bootstrap" = "xyes"; then
- IT_FIND_ECJ_JAR
- IT_FIND_TOOL([XSLTPROC], [xsltproc])
-diff -Nru icedtea-2.1.1.orig/Makefile.am icedtea-2.1.1/Makefile.am
---- icedtea-2.1.1.orig/Makefile.am 2012-06-13 02:56:54.403835785 +0100
-+++ icedtea-2.1.1/Makefile.am 2012-06-13 02:57:31.648476322 +0100
-@@ -249,6 +249,11 @@
- patches/cacao/launcher.patch \
- patches/cacao/jsig.patch \
- patches/cacao/memory.patch
-+else
-+if USING_CACAO
-+ICEDTEA_PATCHES += \
-+ patches/cacao/memory.patch
-+endif
- endif
-
- if ENABLE_CACAO
-diff -Nru icedtea-2.1.1.orig/patches/cacao/launcher.patch icedtea-2.1.1/patches/cacao/launcher.patch
---- icedtea-2.1.1.orig/patches/cacao/launcher.patch 2012-06-13 02:28:23.950879620 +0100
-+++ icedtea-2.1.1/patches/cacao/launcher.patch 2012-06-13 02:59:50.858865063 +0100
-@@ -1,14 +1,3 @@
----- openjdk/jdk/make/docs/Makefile.orig 2010-08-27 20:01:53.000000000 +0200
--+++ openjdk/jdk/make/docs/Makefile 2010-09-07 12:56:00.309691118 +0200
--@@ -70,7 +70,7 @@
-- ifeq ($(ARCH_DATA_MODEL),64)
-- MAX_VM_MEMORY = 1024
-- else
--- MAX_VM_MEMORY = 512
--+ MAX_VM_MEMORY = 768
-- endif
--
-- # List of all possible directories for javadoc to look for sources
- --- openjdk/jdk/src/share/bin/java.c.orig 2010-09-07 05:24:49.307192201 +0200
- +++ openjdk/jdk/src/share/bin/java.c 2010-09-07 12:56:00.309691118 +0200
- @@ -174,6 +174,8 @@
-diff -Nru icedtea-2.1.1.orig/patches/cacao/memory.patch icedtea-2.1.1/patches/cacao/memory.patch
---- icedtea-2.1.1.orig/patches/cacao/memory.patch 2012-06-13 02:28:23.954879676 +0100
-+++ icedtea-2.1.1/patches/cacao/memory.patch 2012-06-13 03:01:11.156239098 +0100
-@@ -1,6 +1,70 @@
----- openjdk.orig/langtools/make/build.xml 2010-06-01 11:25:40.145287816 +0100
--+++ openjdk/langtools/make/build.xml 2010-06-21 21:48:41.000000000 +0100
--@@ -554,6 +554,7 @@
-+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2012-06-07 19:21:17.000000000 +0100
-++++ openjdk/hotspot/make/linux/makefiles/rules.make 2012-06-13 03:36:26.364575315 +0100
-+@@ -141,7 +141,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2012-06-07 19:21:17.000000000 +0100
-++++ openjdk/hotspot/make/solaris/makefiles/rules.make 2012-06-13 03:36:26.364575315 +0100
-+@@ -133,7 +133,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make 2012-06-07 19:21:17.000000000 +0100
-++++ openjdk/hotspot/make/windows/makefiles/rules.make 2012-06-13 03:36:26.364575315 +0100
-+@@ -45,7 +45,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION=6
-+ BOOT_TARGET_CLASS_VERSION=6
-+-JAVAC_FLAGS=-g -encoding ascii
-++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+
-+ ProjectFile=jvm.vcproj
-+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
-+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2012-06-08 14:12:38.000000000 +0100
-++++ openjdk/jdk/make/common/shared/Platform.gmk 2012-06-13 03:36:26.380575614 +0100
-+@@ -447,7 +447,7 @@
-+ else \
-+ echo "false"; \
-+ fi)
-+- MAX_VM_MEMORY := 512
-++ MAX_VM_MEMORY := 1536
-+ MIN_VM_MEMORY := $(MAX_VM_MEMORY)
-+ else
-+ MB_OF_MEMORY := unknown
-+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
-+--- openjdk.orig/jdk/make/docs/Makefile 2012-06-08 14:12:38.000000000 +0100
-++++ openjdk/jdk/make/docs/Makefile 2012-06-13 03:36:26.380575614 +0100
-+@@ -69,9 +69,9 @@
-+ # NOTE: javadoc will not complete without these larger settings.
-+ # WARNING: This could cause thrashing on low memory machines.
-+ ifeq ($(ARCH_DATA_MODEL),64)
-+- MAX_VM_MEMORY = 1024
-++ MAX_VM_MEMORY = 1792
-+ else
-+- MAX_VM_MEMORY = 512
-++ MAX_VM_MEMORY = 768
-+ endif
-+
-+ # List of all possible directories for javadoc to look for sources
-+diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
-+--- openjdk.orig/langtools/make/build.xml 2012-02-15 08:26:56.000000000 +0000
-++++ openjdk/langtools/make/build.xml 2012-06-13 03:36:26.380575614 +0100
-+@@ -796,6 +796,7 @@
- <compilerarg value="-implicit:none"/>
- <compilerarg value="-Xprefer:source"/>
- <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
diff --git a/dev-java/icedtea/files/icedtea-7.2.2-pr986-cacao_memory_fix_v2.patch b/dev-java/icedtea/files/icedtea-7.2.2-pr986-cacao_memory_fix_v2.patch
deleted file mode 100644
index c76c9f3..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.2-pr986-cacao_memory_fix_v2.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@member.fsf.org>
-# Date 1339542060 -3600
-# Node ID e6d81fc2c9439652f903664d51a13732c73485ea
-# Parent 1a9e619bc32e81697bf4200a607935ee00c8d388
-PR986: Allow CACAO builds of IcedTea to be able to build IcedTea without bootstrap.
-
-2012-06-12 Andrew John Hughes <gnu_andrew@member.fsf.org>
-
- PR986
- * Makefile.am:
- (ICEDTEA_PATCHES): Add memory patch when
- building using CACAO as well, even if the
- result is not a CACAO build.
- * acinclude.m4:
- (IT_USING_CACAO): New macro; detects use of
- CACAO as the build VM so memory limits can
- be raised accordingly.
- * configure.ac: Call IT_USING_CACAO.
- * patches/cacao/launcher.patch:
- Move memory increase to memory.patch.
- * patches/cacao/memory.patch:
- Extend with additional cases in HotSpot and
- the JDK.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -249,6 +249,11 @@
- patches/cacao/launcher.patch \
- patches/cacao/jsig.patch \
- patches/cacao/memory.patch
-+else
-+if USING_CACAO
-+ICEDTEA_PATCHES += \
-+ patches/cacao/memory.patch
-+endif
- endif
-
- if ENABLE_CACAO
-diff --git a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2278,3 +2278,18 @@
- AC_SUBST(PAX_COMMAND)
- AC_SUBST(PAX_COMMAND_ARGS)
- ])
-+
-+AC_DEFUN([IT_USING_CACAO],[
-+ AC_REQUIRE([IT_FIND_JAVA])
-+ AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
-+ if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
-+ it_cv_cacao=yes;
-+ else
-+ it_cv_cacao=no;
-+ fi
-+ ])
-+ USING_CACAO=$it_cv_cacao
-+ AC_SUBST(USING_CACAO)
-+ AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
-+ AC_PROVIDE([$0])dnl
-+])
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,6 +102,7 @@
- IT_FIND_JAR
- IT_FIND_RMIC
- IT_FIND_NATIVE2ASCII
-+IT_USING_CACAO
- if test "x$enable_bootstrap" = "xyes"; then
- IT_FIND_ECJ_JAR
- IT_FIND_TOOL([XSLTPROC], [xsltproc])
-diff --git a/patches/cacao/launcher.patch b/patches/cacao/launcher.patch
---- a/patches/cacao/launcher.patch
-+++ b/patches/cacao/launcher.patch
-@@ -1,15 +1,3 @@
--diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
----- openjdk.orig/jdk/make/docs/Makefile 2012-03-21 17:09:55.000000000 +0000
--+++ openjdk/jdk/make/docs/Makefile 2012-03-23 00:46:49.461847958 +0000
--@@ -73,7 +73,7 @@
-- else ifeq ($(ARCH),universal)
-- MAX_VM_MEMORY = 1024
-- else
--- MAX_VM_MEMORY = 512
--+ MAX_VM_MEMORY = 768
-- endif
--
-- # List of all possible directories for javadoc to look for sources
- diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c
- --- openjdk.orig/jdk/src/share/bin/java.c 2012-03-21 17:09:55.000000000 +0000
- +++ openjdk/jdk/src/share/bin/java.c 2012-03-23 00:46:49.461847958 +0000
-diff --git a/patches/cacao/memory.patch b/patches/cacao/memory.patch
---- a/patches/cacao/memory.patch
-+++ b/patches/cacao/memory.patch
-@@ -1,6 +1,85 @@
----- openjdk.orig/langtools/make/build.xml 2010-06-01 11:25:40.145287816 +0100
--+++ openjdk/langtools/make/build.xml 2010-06-21 21:48:41.000000000 +0100
--@@ -554,6 +554,7 @@
-+diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/rules.make openjdk/hotspot/make/bsd/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/bsd/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/bsd/makefiles/rules.make 2012-06-12 10:50:20.974290246 +0100
-+@@ -128,7 +128,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/linux/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
-+@@ -128,7 +128,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/solaris/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
-+@@ -120,7 +120,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/windows/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
-+@@ -45,7 +45,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION=6
-+ BOOT_TARGET_CLASS_VERSION=6
-+-JAVAC_FLAGS=-g -encoding ascii
-++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+
-+ ProjectFile=jvm.vcproj
-+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
-+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2012-06-08 17:12:17.000000000 +0100
-++++ openjdk/jdk/make/common/shared/Platform.gmk 2012-06-12 10:50:20.982290377 +0100
-+@@ -537,7 +537,7 @@
-+ else \
-+ echo "false"; \
-+ fi)
-+- MAX_VM_MEMORY := 512
-++ MAX_VM_MEMORY := 1536
-+ MIN_VM_MEMORY := $(MAX_VM_MEMORY)
-+ else
-+ MB_OF_MEMORY := unknown
-+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
-+--- openjdk.orig/jdk/make/docs/Makefile 2012-06-08 17:12:17.000000000 +0100
-++++ openjdk/jdk/make/docs/Makefile 2012-06-12 11:09:31.616702981 +0100
-+@@ -69,11 +69,11 @@
-+ # NOTE: javadoc will not complete without these larger settings.
-+ # WARNING: This could cause thrashing on low memory machines.
-+ ifeq ($(ARCH_DATA_MODEL),64)
-+- MAX_VM_MEMORY = 1024
-++ MAX_VM_MEMORY = 1792
-+ else ifeq ($(ARCH),universal)
-+- MAX_VM_MEMORY = 1024
-++ MAX_VM_MEMORY = 1792
-+ else
-+- MAX_VM_MEMORY = 512
-++ MAX_VM_MEMORY = 768
-+ endif
-+
-+ # List of all possible directories for javadoc to look for sources
-+diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
-+--- openjdk.orig/langtools/make/build.xml 2012-06-08 17:12:36.000000000 +0100
-++++ openjdk/langtools/make/build.xml 2012-06-12 10:50:20.974290246 +0100
-+@@ -796,6 +796,7 @@
- <compilerarg value="-implicit:none"/>
- <compilerarg value="-Xprefer:source"/>
- <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
diff --git a/dev-java/icedtea/icedtea-7.2.4.6.ebuild b/dev-java/icedtea/icedtea-7.2.4.7.ebuild
similarity index 96%
rename from dev-java/icedtea/icedtea-7.2.4.6.ebuild
rename to dev-java/icedtea/icedtea-7.2.4.7.ebuild
index 80f02d6..4319bd6 100644
--- a/dev-java/icedtea/icedtea-7.2.4.6.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.4.7.ebuild
@@ -9,18 +9,18 @@
EAPI="5"
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+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="48ef1bb6d120.tar.gz"
-JAXP_TARBALL="e0ba4b9a8b91.tar.gz"
-JAXWS_TARBALL="4bd947cd146b.tar.gz"
-JDK_TARBALL="b5282042aae0.tar.gz"
-LANGTOOLS_TARBALL="06eeb77dac24.tar.gz"
-OPENJDK_TARBALL="b028e58c1b77.tar.gz"
-HOTSPOT_TARBALL="172674e0ab65.tar.gz"
+CORBA_TARBALL="e6ad5b912691.tar.gz"
+JAXP_TARBALL="94b7e8e0d96f.tar.gz"
+JAXWS_TARBALL="bd9a50a78d04.tar.gz"
+JDK_TARBALL="9448fff93286.tar.gz"
+LANGTOOLS_TARBALL="8c26a3c39128.tar.gz"
+OPENJDK_TARBALL="13970e76b784.tar.gz"
+HOTSPOT_TARBALL="69b542696e5b.tar.gz"
CACAO_TARBALL="e215e36be9fc.tar.gz"
JAMVM_TARBALL="jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz"
@@ -137,6 +137,7 @@ 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
dev-lang/perl
>=dev-libs/libxslt-1.1.26
dev-libs/openssl
@@ -173,9 +174,6 @@ java_prepare() {
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
-
- epatch "${FILESDIR}/${PN}-${SLOT}-ecj_jar.patch"
- eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2015-01-23 19:50 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2015-01-23 19:50 UTC (permalink / raw
To: gentoo-commits
commit: b57daf7b8fe634077ed0dec9afe9beaf444a5d83
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Jan 23 19:50:14 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Jan 23 19:50:14 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=b57daf7b
IcedTea 2.5.4 released: http://bitly.com/it20504
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 35964222
---
dev-java/icedtea/ChangeLog | 7 +
dev-java/icedtea/Manifest | 27 +-
dev-java/icedtea/files/7085757-currency_fix.patch | 412 ---------------------
...edtea-7.2.5.3.ebuild => icedtea-7.2.5.4.ebuild} | 19 +-
4 files changed, 28 insertions(+), 437 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 73f874b..85f26ab 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*icedtea-7.2.5.4 (23 Jan 2015)
+
+ 23 Jan 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +icedtea-7.2.5.4.ebuild, -files/7085757-currency_fix.patch,
+ -icedtea-7.2.5.3.ebuild:
+ IcedTea 2.5.4 released: http://bitly.com/it20504
+
11 Jan 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild:
Let CACAO handle ppc64 with OpenJDK 6 / IcedTea 1.x as there is no HotSpot
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 4bf0ffe..76e7fb4 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,20 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 7085757-currency_fix.patch 13087 SHA256 0735c2235ab7ed0c54769e6709ef0c30e4c892ae702a7bdd355eefb0e0f91802 SHA512 249579d9910d3fbf30e7cf5ffe41b0ea47af9ddc2cdec592008c597a9102bd4482565016c71389d2ea9bd6d806f68b38f52e2e237f0daa9109cac5d192e0c63d WHIRLPOOL 90f04220538e3855da0727ba12a3d3c4f146cd122a99aaa12fd4c76e9647cb2ec04f9e585d5d400d0dc7ee477a56d511c95b8a9018a7bbb1a339a7c9b3f75cb5
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-2.5-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
-DIST icedtea-2.5-corba-4aed5efcd8df.tar.bz2 1068089 SHA256 8ceb2cd60782b7fc14b88e3d366f273873fa5436cf0e36b86406c0905b7dc43c SHA512 d9b6d50f629611bb8f74e491c3ecbf9d991216efc13e80f90f627f1d312718a29bd83fb0262f198ffa6ec1abe6fe720e0f28acfda64deb335aa3535f0d9d73f6 WHIRLPOOL 1336dc17eeeaf8e14c8ccdeb72651c40d3c7726aa0bf818ceefef4cf36daa5d4dcd375163ddd040669a91aa2eabff072e01a402d7eb5a713da7196c2d910025e
-DIST icedtea-2.5-hotspot-1d0d98e7c981.tar.bz2 7788973 SHA256 8c8e1f7e97f47fe4029e0b0ba42b3515474adabe64e1fbee15c0e2e22a13aa28 SHA512 a6d09c320528bf5e895716b7c59c3f41e8a939a5ca6612c436a4360ccf1ca0ad8124671b7ea1c920106b7e9a1d4f6185f68302c5edc375294a6095690b237eeb WHIRLPOOL a58f7e21fc58c34d3d21cc6bd9de0fed9f170f9485971755fbe9e058e1f02cdf49e57f7f149d93b49a6fbfff389e232a880185270e1cceb817d8953b7e892a15
+DIST icedtea-2.5-corba-3c9f523bf96e.tar.bz2 1069035 SHA256 7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b SHA512 d1d9b085d4f514a3a8ae01c61ee2f828fe35f78bf1a81ec481e33494e679870dad07518176f77188b9617973839259004a4b13f7815031e488bfc0302c260462 WHIRLPOOL 06494d08debabd7dab5f059a1b45b9018e95c462813201283700556e8b535e9526c1a464296b689eb24ad921ea24a8075fe9c7673c1231206c918ad9f1656f37
+DIST icedtea-2.5-hotspot-6144ca9b6a72.tar.bz2 7799854 SHA256 4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34 SHA512 3a55c4052861d6f736f41264588a461e0a97a2b820016499c5e4e15601e920f5f9024519948f21a22c17d9486ae408979044700d13e97f82317135c928c22659 WHIRLPOOL ebaa60209c9d24dfc826fadd7563ae0fd9fcfea5ec6d01211e625eb48c7e57ab5edc481c292814287b4e318a9b7872ddac149984fd9b953efd3daa66ff49004c
DIST icedtea-2.5-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
-DIST icedtea-2.5-jaxp-c903902aadd7.tar.bz2 2727171 SHA256 2d13a82078f3f2b8831d1e670e5e75719336a56490df64f16ab7647674a272ef SHA512 1c97cd352b7f228dd200e3333e96dbfcd57517292a9d20bdbfcabfd244667ac9ceaf88330bb9fd0c828e2743e0c0afaf00b83db2252235c2cd1adc91d54e8372 WHIRLPOOL b132028aad790ccea59195a801e4bb39439fd78fa2330dfc7aa42ecbd40dee31ac5804c092d767dd469531d4f56b005e5e8cf5f772ffc8ec60e0e4c833ce2d71
-DIST icedtea-2.5-jaxws-d3bef5fd93db.tar.bz2 2017453 SHA256 5a63d85307203f1aed1e31459ad5e32687909e0640d424ff6f540d9b1cceeb1e SHA512 58d5f1761efd1e83e2b53a5c5288ee9aca4d29a84cad81b3282b6ea9a661ebfd259b43cf9f065418b1ecaa377666179d7a79b3220ecfc909fe57d53ef13b08a0 WHIRLPOOL add5fef21f8aab12bb99fb5727ca79956b30f730ba495e310e7dddd8857476b4c9a46478e68a7b888491ceb81043437c27ab79703328c941a44835a93f999110
-DIST icedtea-2.5-jdk-6b81c7cc733e.tar.bz2 31655613 SHA256 40c4dda969be0ecd213e79269184e19cfc32100b83777dc529b3cf4b6aa3e12f SHA512 aa66d7d9f60700c7fee8d8d829d59f3ea9032fc881594ed5e7df26bf894c9963c953445463b8b49b2285f00d6f24a1d4c5aef753973541f9ee3883d5050ee974 WHIRLPOOL 60ba3f9b5930e056c225d14e9c5d6142e61745b8e43c50f705dd6cb6efaddd88879ab674cac48630031f81e7db7ed3abc17b2424a0d02ef3372e7bf026688260
-DIST icedtea-2.5-langtools-a64b8bf851a9.tar.bz2 1699562 SHA256 516f6c21719f4b5a2092847c147cde7890c5a30d4aed9425ff667c0164ef1dd0 SHA512 4b2fb2afe632044720b98034b3b73a6cd00ab4be6b0ef213a18f7ed4bf78eb09c5fe57266d481c6346b68450308e10110b01c2f08595df73278bf00709cd96e3 WHIRLPOOL 21c3e692bdf26540a1f249da360f8b45ef733a6a35cd095f9bdd765efa810c7f5d21ab46f3307d29cc9c8ccb79b37c4c581b7d0532ad59cc32a003f99d2917bd
-DIST icedtea-2.5-openjdk-49dc79ef05ab.tar.bz2 125441 SHA256 3ba1a30762f5d5890e8ee6af11f52213ab9c574c01f07c75a081c42034f5d5c9 SHA512 e53bf0dbc5b92f19589bdf62f6b06ea489a2097337659e3ee5055898cea39116253e87bf33ce904038499b6133c98a08fc5bc007b6b6cb70e182ac122f278cef WHIRLPOOL 680ab70e0d4feb207d887efb708ac807c88b4025e0676b83db568ddc7704b6dc04e8afe3a2c9a8311174c9df947ce53cb80dfa84766a07e94598b1f41e546ee2
-DIST icedtea-2.5.3.tar.xz 2021560 SHA256 f4f2922cfec262496e935f81c1d39af66a789f69aa12d1ceee51bcca8934f1f0 SHA512 37dcf2d0c76d1fa6fd703c3cab2d067f74a0d31627ecee135b455c1d89c43da8008fbc35dd6e7c23f05f3c8aaacb4a1c3d75663c643a8202d15fdf9c62881f54 WHIRLPOOL e7f8330003bb5a13aae645a1882d60d6772498e824dd7b46d0cf301aa51ff1430e976638709707f9410f4e7fa7d9484f6918b167f1d84712ccd4ad0adaa42131
+DIST icedtea-2.5-jaxp-ca26767d3375.tar.bz2 2728259 SHA256 84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3 SHA512 85caaed404ab953481de90e4a50b29bf92eb3e676fd6cdc954fd8a9592f0d6ed9938c1390e7ce862ac48c6e502ae6dd4bd76294dbe1f56cd5362f3965a191eee WHIRLPOOL c5b15eba9062514c91f1c37f65431e99a47c5368d6893fe36cedf23fad59279bfda0e2e20673edd8c644991e9b2866944be562f6db85e24fbbb79ae8eb6c1a02
+DIST icedtea-2.5-jaxws-9a6c90336922.tar.bz2 2018258 SHA256 4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b SHA512 461a49455176d35806e69a4f7585719f6d77adcb10966a4bf7b1bfbde86dae5117bb1c6a0f79eaf7f41d4b95ecc83255843d80d3fb7d39265bee844f8e7bfd22 WHIRLPOOL 00e747ae276b486b6aed1e5979d64f0564f2bdd3c42bb547e3facdbac080add1c9ff1a9b206993d914971c9ef7bb020c229ea19d0dd78e2996ba01082ccf4041
+DIST icedtea-2.5-jdk-1e6db4f8b0f3.tar.bz2 31604700 SHA256 e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09 SHA512 d3f3cedfd1532f5a64e5ab7e0c651ca16f7c98082d7d9c7c8961f348fde9d7a1c040d6361b515812098533c44dc44092d3467d096a5e73f76823062d06773730 WHIRLPOOL 0e21c57ec755c67bf674904f3a3e28efd07c2d4954615c8c54be929cdd7ad8c4ce440823d3dedc55a660035632928de6972e69283b00de900629d1fb7e5841a4
+DIST icedtea-2.5-langtools-960cdffa8b3f.tar.bz2 1700558 SHA256 4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a SHA512 2fd48f7c4fed57afe9058a3f012ef4ecbaa121bde43fade5d0795effef48dadc7e2f1735aa8b1a4df2784fa013c1c89082e19c4b7d41845f8c2b242a072a6d1d WHIRLPOOL b973b2a51951408793882190c7f864460ca24247bd856d78622b252419a95e15beb2943e5b3ab0935965001b594fb719c0ef055bb1b0e4e371d68e5ee0d9bc3a
+DIST icedtea-2.5-openjdk-6cf2880aab5e.tar.bz2 126463 SHA256 88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1 SHA512 1f53421a3eae13003290b762150e6c24cceee11e1ff9c68f8097a7e88b6befe0b7f80f44e28f61f009c18991ea72cbda5514e6a884b982e630706c4c9afba64e WHIRLPOOL f1050b5b9d2ca0aee62e8e03843d1baea3c9c0278e56f86c589f522e6a10a3a31e3f33bebb7899e5ba28a49e16f9fee5dbe45a71b106e92f4aa98ad68edf3656
+DIST icedtea-2.5.4.tar.xz 2018092 SHA256 1b50f5c42417c899e0dc831351470557c504c4e648f72cc621be9318c215ffda SHA512 03f6cd15a0347694d7ac5d58e293fec894fc8957165a75fe54ace50ce74c8dbd47b541748a96dd5b0ccbbbde10e6e28d6bb63692955bb4b379d56241cdb6f4be WHIRLPOOL 9963c0c8809afbcb87cacffd684d935a01380235be0eee946475598fcbf3049b86ec2c92c41cdaab657568005a0d9612ab76a9588a0c5561280e5f7b83bb9e78
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
@@ -43,14 +42,14 @@ DIST openjdk-6-src-b33-14_oct_2014.tar.xz 33476800 SHA256 cabc35587a90fa81edd8ba
EBUILD icedtea-3.9999.ebuild 11661 SHA256 3a2f3d9c6ecd7305c36118d1984917ca7e3d0ed3ac0063a5e450181786327523 SHA512 1287f5518f64cc991365d0d271bee9531d955690f3128dabf7432e928a72d2413b396c1523a91d1d47cb63d7abe891f52a72e05b7c2e7ab1214639b98510c8ac WHIRLPOOL 878ab905a55d29dd5e60caa57bcf9c7e829fd28b10c83c4d3d965cebe932d87e65dd6b69580e6e2fe87d247973bf86d1dd2abff0be693152330e12a5f885aebc
EBUILD icedtea-6.1.13.5-r1.ebuild 11029 SHA256 ba4422794d3810272a2a1058985510d186ff4be9d8692fd2437ef57ed1773741 SHA512 d5db738c8c0b813b44ee2d3dee0fdc669d00fb35112f8066540f3d9b1c0b225f1a8081d3c4502bb1b56ca2f21d82ba28608a722b28a4c4f10f726535986931f8 WHIRLPOOL 588c21167b99f6af14eb2a52721456a0b6ee5e3a27890d35afe649a653aef131543af36331203ec90da30512291698a3d9144a4c418c8c3668b64427f64e36cc
EBUILD icedtea-6.9999.ebuild 10736 SHA256 e24fd15c06009009eb81d6d6380667026184b7f9a1afc7fbdd77895363a7f2a4 SHA512 ffdd505208273611598d13c7779242c56d9ff80cf0c3f073445d42e38de1942ff9feb3e29f974bd58c791cfc68e3ef50cdd0e42f27cad3d22b5c7c3ddc29d76f WHIRLPOOL a3c0843a623c9ef908800aafac06a470d9ad90c3331349bfdc6038b12e3a6cb44558b6f7ce170522bb9edc349786f6e54bfd21cbb7978f2e0d00fe9e6968c714
-EBUILD icedtea-7.2.5.3.ebuild 12710 SHA256 f6707610fccc5f9cabb6069cfb2c6cf76025d2051d2df74b7ba04fb2b25fdd74 SHA512 6161e431ed56f3e3fd5d6b5391d7090db3140788730c3e1c96277491a47f416f12f9eaa852a634f43b645743254638f9b645e7a77362c8a301157395b72aa255 WHIRLPOOL ca0ae74585fee47fdb105c801d0a51f33448d267bf4bcf5289f553e7c1be6e2af44374bc07afe070742c3cfafa204ff76615ccc3a2488d367e355613899e173b
+EBUILD icedtea-7.2.5.4.ebuild 12637 SHA256 0c7a5a18a4dee892346cc693ebcd274730e3102b486431c1368f823ed757921b SHA512 e3fffe574f88531b37706322f0837c879072172bc4beeba805fdd8f0e8126520e3aedbc0dac81909ab7ca640ab8709b6e92e9017c51fdb434e053277f73586b7 WHIRLPOOL 8c605cb4797a412002bd8c82abc5941c2a99e68b7189c0e14fa392715fd8b4f7d2a0962c75daacf5e6bbd15bd639220f2715b694740b89b9922e5e7aa4f6ef52
EBUILD icedtea-7.2.6.0_pre11.ebuild 12570 SHA256 0644ba31949bb0d2ccd5d78ee3577f458b9aa00a59565f7cdb81787b134aa927 SHA512 1e6610482a02360534232a96bd607cda6fbf4f1651e62b2c66011a6f34cf8bc1828ade48ee00315e679c5bd4435e0cec0d4e1be81aa82ee0bea027a4522bfdab WHIRLPOOL 4db1f14099cc1563077f75246bf9b9efb83d39955a8039e89323c5dfdc35fcd4a5c83f707f8af3494e763f7bda08a323a4f00b037337fb7caf7f4d7aea0fb884
-MISC ChangeLog 87964 SHA256 0d71cecfe368c0fdcdfcd9c2b4d1db01c045603e7970b922c68070dce982a80d SHA512 7706467bf4d5310b0bc62a502b096229bde0179dd2db9f56fd2fba323c59b9ffb7d6b7e180145bce47b33a1a5ee2ffb04d1165dc1b4483ec2b6f9f3615ba383d WHIRLPOOL db2720aa75c93351512b08c27a029638e2077a5cb49f3a10dc79d09ef094bd3d2e0c5e0995ff50cff0300fcfe9e2ad2b166849d1458e17109372285a0dbf1d23
+MISC ChangeLog 88199 SHA256 682f01868c0c4de28ccb174bc2b4e554ee61c9e88311b2ad87c76823695d002e SHA512 32144458a455df0b677e05ec3165b89ef3581a184d78556ed22e174bba5f11e471fc514ce649f6f81b1be433c79b1c14aba80b60393cd16d4c01dc91642cd067 WHIRLPOOL 10026e3c3971b9d78e2c7deb2a46f497cecd3dbc96e89d79caab36c77bf2910e32507f45fd705de44bd1909b216af11dcfa5231c629fdbe4ba410cdbcf29a8fc
MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EARYIAAYFAlSyu4UACgkQz9oPmzWWQiI6fAEAX+J6T4rtkta9QiqoiuNN8NQ7
-sdUQuQUbqeML5DRQdL8BAEkgrGxdBBDzzIKXrkfnoz4NqBROyobG8kfBe5zyGJsD
-=RUob
+iF4EARYIAAYFAlTCpe8ACgkQz9oPmzWWQiLxJwEAGW2Dt89xPNYdIpoQ+F7F6pQU
+iO+c+0o5L3SKqpOEAogBADwmodA/Kkiydw/9y/N4Kv7K4fJJYAOTPpPp0sE0rBMD
+=KKnE
-----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/7085757-currency_fix.patch b/dev-java/icedtea/files/7085757-currency_fix.patch
deleted file mode 100644
index 5a01325..0000000
--- a/dev-java/icedtea/files/7085757-currency_fix.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-diff -r 13b10ea1447c Makefile.am
---- a/Makefile.am Fri Dec 12 20:13:40 2014 +0000
-+++ b/Makefile.am Sat Jan 03 16:53:45 2015 +0000
-@@ -242,7 +242,7 @@
-
- # Patch list
-
--ICEDTEA_PATCHES =
-+ICEDTEA_PATCHES = patches/7085757-currency_data.patch
-
- # Conditional patches
-
-diff -r 13b10ea1447c patches/7085757-currency_data.patch
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/patches/7085757-currency_data.patch Sat Jan 03 16:53:45 2015 +0000
-@@ -0,0 +1,396 @@
-+# HG changeset patch
-+# User coffeys
-+# Date 1412008618 -3600
-+# Mon Sep 29 17:36:58 2014 +0100
-+# Node ID 2f94c1a494f0aaad61626a7f901ddfbf57bd0199
-+# Parent 993c08c0fcc7c6f404f708728679e6e707a95f8c
-+7085757: Currency Data: ISO 4217 Amendment 152
-+7195759: ISO 4217 Amendment 154
-+8021121: ISO 4217 Amendment Number 156
-+8055222: Currency update needed for ISO 4217 Amendment #159
-+8006748: getISO3Country() returns wrong value
-+7077119: remove past transition dates from CurrencyData.properties file
-+7028073: The currency symbol for Peru is wrong
-+Reviewed-by: naoto
-+
-+diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/java/util/CurrencyData.properties
-+--- openjdk/jdk/src/share/classes/java/util/CurrencyData.properties Fri Sep 27 13:06:47 2013 -0700
-++++ openjdk/jdk/src/share/classes/java/util/CurrencyData.properties Mon Sep 29 17:36:58 2014 +0100
-+@@ -1,5 +1,5 @@
-+ #
-+-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
-++# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ #
-+ # This code is free software; you can redistribute it and/or modify it
-+@@ -26,10 +26,9 @@
-+ formatVersion=1
-+
-+ # Version of the currency code information in this class.
-+-# It is a serial number that accompanies with each amendment, such as
-+-# 'MAxxx.doc'
-++# It is a serial number that accompanies with each amendment.
-+
-+-dataVersion=151
-++dataVersion=159
-+
-+ # List of all valid ISO 4217 currency codes.
-+ # To ensure compatibility, do not remove codes.
-+@@ -49,11 +48,12 @@
-+ NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
-+ PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
-+ SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
-+- SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
-++ SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
-+ TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\
-+ UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
-+ XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
-+- XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZWD716-ZWL932-ZWN942-ZWR935
-++ XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\
-++ ZWN942-ZWR935
-+
-+
-+ # Mappings from ISO 3166 country codes to ISO 4217 currency codes.
-+@@ -71,7 +71,7 @@
-+ #
-+ # The table is based on the following web sites:
-+ # http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/db_en.html
-+-# http://www.bsi-global.com/iso4217currency
-++# http://www.currency-iso.org/iso_index/iso_tables.htm
-+ # http://www.cia.gov/cia/publications/factbook/indexgeo.html
-+
-+ # AFGHANISTAN
-+@@ -105,7 +105,7 @@
-+ # AUSTRIA
-+ AT=EUR
-+ # AZERBAIJAN
-+-AZ=AZM;2005-12-31-20-00-00;AZN
-++AZ=AZN
-+ # BAHAMAS
-+ BS=BSD
-+ # BAHRAIN
-+@@ -320,7 +320,7 @@
-+ # LAO PEOPLE'S DEMOCRATIC REPUBLIC
-+ LA=LAK
-+ # LATVIA
-+-LV=LVL
-++LV=LVL;2013-12-31-22-00-00;EUR
-+ # LEBANON
-+ LB=LBP
-+ # LESOTHO
-+@@ -332,7 +332,7 @@
-+ # LIECHTENSTEIN
-+ LI=CHF
-+ # LITHUANIA
-+-LT=LTL
-++LT=LTL;2014-12-31-22-00-00;EUR
-+ # LUXEMBOURG
-+ LU=EUR
-+ # MACAU
-+@@ -378,7 +378,7 @@
-+ # MOROCCO
-+ MA=MAD
-+ # MOZAMBIQUE
-+-MZ=MZM;2006-06-30-22-00-00;MZN
-++MZ=MZN
-+ # MYANMAR
-+ MM=MMK
-+ # NAMIBIA
-+@@ -440,7 +440,7 @@
-+ # REUNION
-+ RE=EUR
-+ # ROMANIA
-+-RO=ROL;2005-06-30-21-00-00;RON
-++RO=RON
-+ # RUSSIAN FEDERATION
-+ RU=RUB
-+ # RWANDA
-+@@ -463,6 +463,8 @@
-+ WS=WST
-+ # SAN MARINO
-+ SM=EUR
-++# SOUTH SUDAN
-++SS=SSP
-+ # SAO TOME AND PRINCIPE
-+ ST=STD
-+ # SAUDI ARABIA
-+@@ -532,7 +534,7 @@
-+ # TUNISIA
-+ TN=TND
-+ # TURKEY
-+-TR=TRL;2004-12-31-22-00-00;TRY
-++TR=TRY
-+ # TURKMENISTAN
-+ TM=TMT
-+ # TURKS AND CAICOS ISLANDS
-+@@ -558,7 +560,7 @@
-+ # VANUATU
-+ VU=VUV
-+ # VENEZUELA
-+-VE=VEB;2008-01-01-04-00-00;VEF
-++VE=VEF
-+ # VIET NAM
-+ VN=VND
-+ # VIRGIN ISLANDS, BRITISH
-+@@ -572,7 +574,7 @@
-+ # YEMEN
-+ YE=YER
-+ # ZAMBIA
-+-ZM=ZMK
-++ZM=ZMW
-+ # ZIMBABWE
-+ ZW=ZWL
-+
-+@@ -583,7 +585,7 @@
-+ minor0=\
-+ ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\
-+ GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\
-+- TPE-TRL-VUV-XAF-XOF-XPF
-++ TPE-TRL-UGX-VND-VUV-XAF-XOF-XPF
-+ minor1=
-+ minor3=\
-+ BHD-IQD-JOD-KWD-LYD-OMR-TND
-+diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/java/util/LocaleISOData.java
-+--- openjdk/jdk/src/share/classes/java/util/LocaleISOData.java Fri Sep 27 13:06:47 2013 -0700
-++++ openjdk/jdk/src/share/classes/java/util/LocaleISOData.java Mon Sep 29 17:36:58 2014 +0100
-+@@ -1,5 +1,5 @@
-+ /*
-+- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
-++ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+@@ -433,6 +433,7 @@
-+ + "SN" + "SEN" // Senegal, Republic of
-+ + "SO" + "SOM" // Somalia, Somali Republic
-+ + "SR" + "SUR" // Suriname, Republic of
-++ + "SS" + "SSD" // South Sudan
-+ + "ST" + "STP" // Sao Tome and Principe, Democratic Republic of
-+ + "SV" + "SLV" // El Salvador, Republic of
-+ + "SX" + "SXM" // Sint Maarten (Dutch part)
-+diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames.properties
-+--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties Fri Sep 27 13:06:47 2013 -0700
-++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties Mon Sep 29 17:36:58 2014 +0100
-+@@ -1,5 +1,5 @@
-+ #
-+-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
-++# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ #
-+ # This code is free software; you can redistribute it and/or modify it
-+@@ -26,7 +26,7 @@
-+ #
-+ # COPYRIGHT AND PERMISSION NOTICE
-+ #
-+-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
-++# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
-+ # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-+ #
-+ # Permission is hereby granted, free of charge, to any person obtaining
-+@@ -226,6 +226,7 @@
-+ SOS=SOS
-+ SRD=SRD
-+ SRG=SRG
-++SSP=SSP
-+ STD=STD
-+ SVC=SVC
-+ SYP=SYP
-+@@ -277,6 +278,7 @@
-+ YUM=YUM
-+ ZAR=ZAR
-+ ZMK=ZMK
-++ZMW=ZMW
-+ ZWD=ZWD
-+ ZWL=ZWL
-+ ZWN=ZWN
-+@@ -443,6 +445,7 @@
-+ sos=Somali Shilling
-+ srd=Surinamese Dollar
-+ srg=Surinamese Guilder
-++ssp=South Sudanese Pound
-+ std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
-+ svc=Salvadoran Col\u00f3n
-+ syp=Syrian Pound
-+@@ -486,7 +489,9 @@
-+ xpd=Palladium
-+ xpf=CFP Franc
-+ xpt=Platinum
-++xsu=Sucre
-+ xts=Testing Currency Code
-++xua=ADB Unit of Account
-+ xxx=Unknown Currency
-+ yer=Yemeni Rial
-+ yum=Yugoslavian New Dinar (1994-2002)
-+diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties
-+--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties Fri Sep 27 13:06:47 2013 -0700
-++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties Mon Sep 29 17:36:58 2014 +0100
-+@@ -35,4 +35,4 @@
-+ # This notice and attribution to Taligent may not be removed.
-+ # Taligent is a registered trademark of Taligent, Inc.
-+
-+-PEN=S/
-++PEN=S/.
-+diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties
-+--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties Fri Sep 27 13:06:47 2013 -0700
-++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties Mon Sep 29 17:36:58 2014 +0100
-+@@ -35,4 +35,5 @@
-+ # This notice and attribution to Taligent may not be removed.
-+ # Taligent is a registered trademark of Taligent, Inc.
-+
-++EUR=\u20AC
-+ LTL=Lt
-+diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties
-+--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties Fri Sep 27 13:06:47 2013 -0700
-++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties Mon Sep 29 17:36:58 2014 +0100
-+@@ -35,4 +35,5 @@
-+ # This notice and attribution to Taligent may not be removed.
-+ # Taligent is a registered trademark of Taligent, Inc.
-+
-++EUR=\u20AC
-+ LVL=Ls
-+diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/LocaleNames.properties
-+--- openjdk/jdk/src/share/classes/sun/util/resources/LocaleNames.properties Fri Sep 27 13:06:47 2013 -0700
-++++ openjdk/jdk/src/share/classes/sun/util/resources/LocaleNames.properties Mon Sep 29 17:36:58 2014 +0100
-+@@ -1077,6 +1077,7 @@
-+ SN=Senegal
-+ SO=Somalia
-+ SR=Suriname
-++SS=South Sudan
-+ ST=Sao Tome And Principe
-+ SV=El Salvador
-+ SX=Sint Maarten (Dutch part)
-+diff -r 993c08c0fcc7 -r 2f94c1a494f0 test/java/util/Currency/ValidateISO4217.java
-+--- openjdk/jdk/test/java/util/Currency/ValidateISO4217.java Fri Sep 27 13:06:47 2013 -0700
-++++ openjdk/jdk/test/java/util/Currency/ValidateISO4217.java Mon Sep 29 17:36:58 2014 +0100
-+@@ -1,5 +1,5 @@
-+ /*
-+- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-++ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+@@ -22,7 +22,7 @@
-+ */
-+ /*
-+ * @test
-+- * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203
-++ * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
-+ * @summary Validate ISO 4217 data for Currency class.
-+ */
-+
-+@@ -92,7 +92,7 @@
-+
-+ /* Codes that are obsolete, do not have related country */
-+ static final String otherCodes =
-+- "ADP-AFA-ATS-AYM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-NLG-PTE-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZWD-ZWN-ZWR";
-++ "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-PTE-ROL-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-VEB-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZMK-ZWD-ZWN-ZWR";
-+
-+ static boolean err = false;
-+
-+diff -r 993c08c0fcc7 -r 2f94c1a494f0 test/java/util/Currency/tablea1.txt
-+--- openjdk/jdk/test/java/util/Currency/tablea1.txt Fri Sep 27 13:06:47 2013 -0700
-++++ openjdk/jdk/test/java/util/Currency/tablea1.txt Mon Sep 29 17:36:58 2014 +0100
-+@@ -1,12 +1,12 @@
-+ #
-+ #
-+-# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA151.doc
-+-# (As of 7 April 2011)
-++# Amendments up until ISO 4217 AMENDMENT NUMBER 159
-++# (As of 15 August 2014)
-+ #
-+
-+ # Version
-+ FILEVERSION=1
-+-DATAVERSION=151
-++DATAVERSION=159
-+
-+ # ISO 4217 currency data
-+ AF AFN 971 2
-+@@ -23,7 +23,7 @@
-+ AU AUD 36 2
-+ AT EUR 978 2
-+ # MA 129
-+-AZ AZM 31 2 2005-12-31-20-00-00 AZN 944 2
-++AZ AZN 944 2
-+ BS BSD 44 2
-+ BH BHD 48 3
-+ BD BDT 50 2
-+@@ -96,7 +96,7 @@
-+ GM GMD 270 2
-+ GE GEL 981 2
-+ DE EUR 978 2
-+-GH GHC 288 2 2007-07-01-00-00-00 GHS 936 2
-++GH GHS 936 2
-+ GI GIP 292 2
-+ GR EUR 978 2
-+ GL DKK 208 2
-+@@ -135,14 +135,14 @@
-+ KW KWD 414 3
-+ KG KGS 417 2
-+ LA LAK 418 2
-+-LV LVL 428 2
-++LV LVL 428 2 2013-12-31-22-00-00 EUR 978 2
-+ LB LBP 422 2
-+ #LS ZAR 710 2
-+ LS LSL 426 2
-+ LR LRD 430 2
-+ LY LYD 434 3
-+ LI CHF 756 2
-+-LT LTL 440 2
-++LT LTL 440 2 2014-12-31-22-00-00 EUR 978 2
-+ LU EUR 978 2
-+ MO MOP 446 2
-+ MK MKD 807 2
-+@@ -166,7 +166,7 @@
-+ MS XCD 951 2
-+ MA MAD 504 2
-+ # MA 130
-+-MZ MZM 508 2 2006-06-30-22-00-00 MZN 943 2
-++MZ MZN 943 2
-+ MM MMK 104 2
-+ # MA 134
-+ ME EUR 978 2
-+@@ -200,7 +200,7 @@
-+ PR USD 840 2
-+ QA QAR 634 2
-+ RE EUR 978 2
-+-RO ROL 946 2 2005-06-30-21-00-00 RON 946 2
-++RO RON 946 2
-+ RU RUB 643 2
-+ RW RWF 646 0
-+ SH SHP 654 2
-+@@ -227,6 +227,7 @@
-+ SB SBD 90 2
-+ SO SOS 706 2
-+ ZA ZAR 710 2
-++SS SSP 728 2
-+ ES EUR 978 2
-+ LK LKR 144 2
-+ SD SDG 938 2
-+@@ -255,7 +256,7 @@
-+ TM TMT 934 2
-+ TC USD 840 2
-+ TV AUD 36 2
-+-UG UGX 800 2
-++UG UGX 800 0
-+ UA UAH 980 2
-+ AE AED 784 2
-+ GB GBP 826 2
-+@@ -266,14 +267,14 @@
-+ UY UYU 858 2
-+ UZ UZS 860 2
-+ VU VUV 548 0
-+-VE VEB 862 2 2008-01-01-04-00-00 VEF 937 2
-+-VN VND 704 2
-++VE VEF 937 2
-++VN VND 704 0
-+ VG USD 840 2
-+ VI USD 840 2
-+ WF XPF 953 0
-+ EH MAD 504 2
-+ YE YER 886 2
-+-ZM ZMK 894 2
-++ZM ZMW 967 2
-+ ZW ZWL 932 2
-+ #XAU XAU 959
-+ #XBA XBA 955
diff --git a/dev-java/icedtea/icedtea-7.2.5.3.ebuild b/dev-java/icedtea/icedtea-7.2.5.4.ebuild
similarity index 96%
rename from dev-java/icedtea/icedtea-7.2.5.3.ebuild
rename to dev-java/icedtea/icedtea-7.2.5.4.ebuild
index d3bce52..a358402 100644
--- a/dev-java/icedtea/icedtea-7.2.5.3.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.5.4.ebuild
@@ -10,18 +10,18 @@
EAPI="5"
SLOT="7"
-inherit autotools check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+inherit check-reqs java-pkg-2 java-vm-2 multiprocessing 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="4aed5efcd8df.tar.bz2"
-JAXP_TARBALL="c903902aadd7.tar.bz2"
-JAXWS_TARBALL="d3bef5fd93db.tar.bz2"
-JDK_TARBALL="6b81c7cc733e.tar.bz2"
-LANGTOOLS_TARBALL="a64b8bf851a9.tar.bz2"
-OPENJDK_TARBALL="49dc79ef05ab.tar.bz2"
-HOTSPOT_TARBALL="1d0d98e7c981.tar.bz2"
+CORBA_TARBALL="3c9f523bf96e.tar.bz2"
+JAXP_TARBALL="ca26767d3375.tar.bz2"
+JAXWS_TARBALL="9a6c90336922.tar.bz2"
+JDK_TARBALL="1e6db4f8b0f3.tar.bz2"
+LANGTOOLS_TARBALL="960cdffa8b3f.tar.bz2"
+OPENJDK_TARBALL="6cf2880aab5e.tar.bz2"
+HOTSPOT_TARBALL="6144ca9b6a72.tar.bz2"
CACAO_TARBALL="e215e36be9fc.tar.gz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -193,9 +193,6 @@ java_prepare() {
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
-
- epatch "${FILESDIR}/7085757-currency_fix.patch"
- eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2015-06-19 15:30 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2015-06-19 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 7051c1a8df1a46abe02fba4a410403da64d5e94a
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Jun 19 15:25:46 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Jun 19 15:25:46 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=7051c1a8
Bump to IcedTea 3.0.0pre04.
Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222
dev-java/icedtea/ChangeLog | 6 +++
dev-java/icedtea/Manifest | 31 +++++++--------
dev-java/icedtea/files/pr2383.patch | 12 ------
...0.0_pre03.ebuild => icedtea-3.0.0_pre04.ebuild} | 46 +++++++++++-----------
4 files changed, 44 insertions(+), 51 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 704e010..f8cc3e4 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_pre04 (19 Jun 2015)
+
+ 19 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +icedtea-3.0.0_pre04.ebuild, -files/pr2383.patch, -icedtea-3.0.0_pre03.ebuild:
+ Bump to IcedTea 3.0.0pre04.
+
*icedtea-7.2.6.0_pre23 (17 Jun 2015)
17 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 1aa0066..8db9557 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -4,7 +4,6 @@ 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
-AUX pr2383.patch 438 SHA256 da00790f5ab98b83e04b123e400017269bf79dcbcfcce7ab259d7ea23e4e0df7 SHA512 061eaf09218f47764fe38d4b70890b9636ece4f01360045f4da850e864820efe497a28aad51d2583ede5fb2fdbbde2ce035b6eaeb8aedfa8ae288552609df1be WHIRLPOOL 930b499c591734a970e5b9c4f8992dcb699ccec86a4fd590bca4d177c4f3f167019a3e204da6f989e9ac697544c29402b753d1374802e8d92966a2bd93dc2244
DIST icedtea-2.6-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
DIST icedtea-2.6-corba-9d5c92264131.tar.bz2 1072026 SHA256 744b293bd34a570bc2155698a3e46572cb0e8433f7edcdcb594a37d8f8ac1cdd SHA512 0b6a0338c7fdc6c501f7fc3a0d8e504989c0342820d3e5705d81b7066bf10387d7adf0e6cc49991a5f80f61da8fd480a6a0e8d7bbdf8272ba81047a84393b770 WHIRLPOOL ef944ce528d90a3fed7c69743c4577295b919a8979517eac84d2f21d56c4a375c7194740e96662e2c9ae6804bd87b11b6a5d507da35fb7f6b92c66e0afb6bf5c
DIST icedtea-2.6-hotspot-1afefe2d5f90.tar.bz2 8159547 SHA256 e12e2d3d7b228abc3fa12a75455d3af883bce94f58df65e16e7f953592747054 SHA512 b00815a59dad0d8a786ef78147aafaa29e480cf19c83fbbda8c2fe9d7118f5cbecd8a211bfdd0a5fef62c4b2903bf093396a0c93b1e27e9cac4d5e06d37dd6dd WHIRLPOOL acc0781e78a9c924e8f20b095bb50d4bb5dd76806b7143458495b7ede06545896992e89f10ed069d2aed081ee07cc3542832904d38c13d68f56277ac5208ab16
@@ -14,28 +13,28 @@ DIST icedtea-2.6-jaxws-87290096a2fa.tar.bz2 2020651 SHA256 760c32f84da4cf8794d68
DIST icedtea-2.6-jdk-ec336c81a545.tar.bz2 32381225 SHA256 7019b768badebe30ec3cea2fe04b240b8760e9879d8d215f3b6151d8f1dce9ba SHA512 6b1298afbd06881ad1463bd56c5afc390dd409d229493b61acc70d5b2acf0b13aa0009686f72d722c3b25396ac7482d7bea2019dbd5f6951418ee85aedcb044d WHIRLPOOL 878739d0901efd337963d9a8c73b34f2e33cd3abe0d54b4a44206ee0cd1cf74ad00910ae5447245e56065402f2e98bcfee19932281ca91801191f8efecb2d18a
DIST icedtea-2.6-langtools-403eeedf70f4.tar.bz2 1709637 SHA256 4389ea4ab8032be7ad1e4ad5f16d6b563059776b766e1672ecfff4b80d46f3e1 SHA512 989b71e3b2082505853b6349af6f5a56c54c9819c562d5958dce2e742162bcce0bcfd8ed4b70209685b10cc34cc8fe2dbd27971c1f22dfcca00cc26ad0beb303 WHIRLPOOL 6f8dc2a99a6a031921122a1314c3b0cf711f520e048eccd83055fad0b15eca141814f284330ab0b726c21eb9c2cc35a845a4e46e431c97ec9d7c0194f5f529a3
DIST icedtea-2.6-openjdk-88ad67ad5b51.tar.bz2 129582 SHA256 f2c024cae6479b49a864685a7c87b0e8109099e8057de878147363b579aa33ff SHA512 9fc3c494f6b6ee4d6400f4e03bc0b30d2fdfd36e96a4a8525f2a7c974a16e9cce5d8e789a8f52e38c4b414d79081f3b750e183adb4db7b1a664cd97e9c3e7c0b WHIRLPOOL 53cbcdcd4c9461f8744e24feadf83455f4d42a3e2b1ea034b1e1bcd4fd909dbfe3ed9ab4ab5a138ee51cadb55ba414be78853275b3098636af6a6b6c17d580a2
-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-3.0-corba-b493e7b682c9.tar.xz 932016 SHA256 ededc4d28a6735c88ced8642caf4e08af285f9f5e6cec8ea96aedd525d539468 SHA512 e31c4c1eee1a56dea6119a59071dea01741a47c1e161f7c76342529b286165f7af4cb6cc51884d6a2afe975b6ad64486f60cfe8ec480da7e3d23d7b74c7fdf5e WHIRLPOOL 43f4c58bdeff668dc7f6cf360d7831213e5c73b2ab4075b1d86b2b0fff6fef328e7791724270b7aa34589d64fec81d5ca090303c457bd4813d24cb429f9b7c08
+DIST icedtea-3.0-hotspot-7e5a87c79d69.tar.xz 6688888 SHA256 5204a95ccacd5d6d7569063bb38788d1f89464e1305d97ebff334bcb922039a8 SHA512 b195de612ef9ae9924d6ad3be255e36622fdc27966aa154e29891b529a85a86d356f36fee515d12155a0fffd2813b75584640ee4eb36ef0c055f141a1ac42ec4 WHIRLPOOL c3407b8350a79c04c519fdbd158643391318e0cadff81ee7ff17cb9d984412b65c45f530f28f35f87f3f2a547a43b317a0d5faa371dcc870bb442dd3e8e6af4a
+DIST icedtea-3.0-jaxp-c62dd685e517.tar.xz 2292012 SHA256 c624f315d5b381c830f3df4e673c6f11200bb8036359524b1f0943fe1f1e7e55 SHA512 44d571ff34abde984543227fb3a2e6b327686afe5ce5d5283a1d929b31221d8bf79627961b70c0e202d6a334bff7b43ae5e4b619ba2c83aa10362b243cf987c9 WHIRLPOOL 968ec0237b60a19f4f5abe6d8173569440f82dfcf9c43ffbd6afb451e13ef5e58f84dad14c1a85ae007e355da85a4fb04b636f3e3f1b56d4976d424d545b5319
+DIST icedtea-3.0-jaxws-db7fdb068af9.tar.xz 2261956 SHA256 45abcc59f9910017f6fa0949a76051cad36ea11199acebef01fbc6801cdf5a77 SHA512 1aea51d40bc865df21a3e0703c9a65d715b3bb8d0f590574b56e171c798c9ea3ca765f6c9494529f1bf0c2549665fd66fe1089580e2fd123a24fac028d8d712a WHIRLPOOL 668741f80f7924cedc4f642f76252fd158de740691399343b1bec8dd01c18d05b54fb48d06e3b97074bf1c93c43a08a6145ca25ce560ce2fca8225f487fe08fc
+DIST icedtea-3.0-jdk-8450ad6fa3f5.tar.xz 37882344 SHA256 c69a236376c4d2f9008a2c0f375d572fd8d54f34a8c656761d4c5ac315765af0 SHA512 5a552e844ccc5e091b15ad4ea706422d04b46116842fbb67103e14f3ff6b7320c72a204d91764bc0fee3e1f90e0d0145745c66397a5b515199ce244cd468d1ba WHIRLPOOL a8dc27fdc43ec72a1128a45fb9bf3da2d9d9f6c326d10c83c7a6e6b0461cd474ffeddee932c468b9000d8cfc3b13f4047cf0907d68c4de816a258f6e39300753
+DIST icedtea-3.0-langtools-66f265db6f47.tar.xz 2046268 SHA256 23e22a4e6fdfe3d9a4e09d4001316ec29fee2329f3aaf52fade9e67764b3e7c3 SHA512 874bd1d8dd984c3f385442ca399b6b8ebaf3cf1b786dcff8c5b86dcb5dc87ac39e93feebe9d2151ef8e08664c395c260fc45da2ffedf092c5b17e03474a8f61b WHIRLPOOL 527b5c3cff1862a91d80026e5c514e4d22000f8c5af18e86e521feaa6e0fd1bf8d9786b98ecb3c0360dbabef22991ca91ecfcff6f20c1df6943666755b76699a
+DIST icedtea-3.0-nashorn-bb36d4894aa4.tar.xz 2158376 SHA256 6932a9f964d76682595279f96364b90bf9f24f557c86b8a68352c93bf94ae386 SHA512 f823477bc3959be4d7832249c2af66a321186c53b87ecbfe30d40bef9b46c5b656d7e894f464fb1d71465bee138f641325082dafd42f694b8dc2cb897fa1cffd WHIRLPOOL b5de24c3c14f256246c00438a7ce6e8e6e3e344b1834eddbe3aed6fe1dd5a51a1d37a76b1bd2916d64a6f98b4b2a9f95e95c2412648a6e3cfc9da1a240df1a71
+DIST icedtea-3.0-openjdk-0503e9c58a13.tar.xz 320224 SHA256 50733aaaee4dd8df3206f63eb1a2a7ad001a58370c370da7846d3f32a44486f5 SHA512 82c01eeb012dc5e948c070d5c20476c0de8769efe419f1bb2dc8573715dcd0452fbcf06cb73838982d5724925f0676a8e6572bb4016f6e8a86bae336c5d0f88a WHIRLPOOL 4b97616b8d9cde6ccc718fd9701193d111b15e178dda7e939245b0d224ca020392ba54b05fe32685b057dea45c6c6b0407a716b648f47e5b1504f40e97373347
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 icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
+DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234
-EBUILD icedtea-3.0.0_pre03.ebuild 11419 SHA256 57b5cbcc851338d3d3f1d65642082d39f3f2c40f709204413d74f85bab1a0988 SHA512 1bb58f7f05caf822d09d08b37c876727f1f554e960363837d99d26ad593e16dbae01791231f029689aa5a203d18a65127cea9ac04bcecf54578a685a4badffa5 WHIRLPOOL 5f93a29b4c52a0f1861b0801f612231d210ab5333f6541659aa2207b0b69a1913e28491ffe0a285539ae8863579370b392c09a582933e2e19c71b52b8fac8622
+EBUILD icedtea-3.0.0_pre04.ebuild 11493 SHA256 bf4707e16f0b4270c6531163bef13d8d7958585945ef0f012b07c104d625a9d7 SHA512 d014c2622e44b8cd1590d2b08f8d92a9fc05a768b4dc1eeed21056e9882f5639aec55db360234277ce1b01fb2ec917f107e459ef318c893c1263c86ea8ba83d0 WHIRLPOOL 2b7526928820e3551b7327639cfda5c69e67417015e219c15efa3766594732c7d482df0e94dbe4f5d507143cd1bee8c3b10d17125b2ae9c3a85e3db1eb106dfc
EBUILD icedtea-6.9999.ebuild 10839 SHA256 ffa41507a26006ff1e7a16e8ca71c399dff000f5dcf080db57fe05a0aa539538 SHA512 2e52a795b404784ce5669c1e085761e623bf7dfb433eb0312989dc47b9ee58c97ea31052c486bafa66b20ab7bd82a35a43bc5866dd1047852d144ab65629c3af WHIRLPOOL 22dccdf4b9232e2d6d231e86086924c3005da09d152f7c3db651727e4791f03e85e43c32bd2693691d326c38c6fb384313aa1bc50fe26d2ff700d295f824ef52
EBUILD icedtea-7.2.6.0_pre23.ebuild 12748 SHA256 bed5696805b5a9ee86de93511638911984b3ae92b496fc4c89f10885968946ee SHA512 43930c64f3c1805748c6a581f5fd148038fa04bab370271e5be3b140694a648c9581dcf6b9b69d3ecc7da4f9ae1fd1f0e0fe8ab1a533c2f9fccec8603bcc8aa1 WHIRLPOOL a17d5c72dd5da012a96a0983e53db6a49615ce89353846441b45f4f6e911a6c0ba4830b9926d4830531c51b081a91541c78b12b1d245bea85dfb4ce0327ccfe7
-MISC ChangeLog 90181 SHA256 16334149d796c64e48113dcc6f4ca19db1f8714f8898b64438d64661622024bb SHA512 55407202e63d3917db815f8f8b6d00a920330f183098f02b31f0ff9c557c7b708a21e9ba02a24764d22f8bea9b7cf551d68d1362920242c04bda2c3104a5ff29 WHIRLPOOL cdb93aa9b61f119172bf427f6d9fa848b8abff61a518642ded51c6719318b64aa55504bab8db2298ad2d03a2a8ebf90455e8793ec667ef867071d96c3f7f1c26
+MISC ChangeLog 90391 SHA256 c461792a2bc38efcf51d03bece0134bf9f59b72785997d1a3604140791110fa9 SHA512 94b6dd6ee6d32945aa5399809dfe3629b3ea74d55807c862241345c3a9845918932516fea4a642add7c321931771df3c8eb6004a5d6e9bcb987fccde69ee7a2d WHIRLPOOL cdcfb42510a4f1e6954d114f778d6f7eebef1cbaf02dde7a6d0628452ce1e18f0227d3b9ca75fb16953ad97e54185b4911787d69f6fc58a5d2e2e8d078357a4e
MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EARYIAAYFAlWBV+cACgkQz9oPmzWWQiKgKwEA/F7O+BMMmz9KdgLDc6a1p0Ke
-b6xhXdGcsNkhXO1dXdMA/Ak5a+xUqXLqC5pVD2En37l6sZzDoWlVrIwVAwhrJ4ED
-=+5qt
+iF4EARYIAAYFAlWENHYACgkQz9oPmzWWQiLtDQEAz+uC6IEwJGzc2FR5dVkAKzTE
+Vpe7LbyBowwAuFC/lg0A/R3+avlIxGeNXbGHbeNBwKfXgOJ05ET9TUYWB7g2PwAG
+=pric
-----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/pr2383.patch b/dev-java/icedtea/files/pr2383.patch
deleted file mode 100644
index 0ae484e..0000000
--- a/dev-java/icedtea/files/pr2383.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.0.0_pre03.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre04.ebuild
similarity index 91%
rename from dev-java/icedtea/icedtea-3.0.0_pre03.ebuild
rename to dev-java/icedtea/icedtea-3.0.0_pre04.ebuild
index c08489c..e01ec1d 100644
--- a/dev-java/icedtea/icedtea-3.0.0_pre03.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.0_pre04.ebuild
@@ -16,14 +16,15 @@ ICEDTEA_VER=$(get_version_component_range 1-3)
ICEDTEA_BRANCH=3.0
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
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"
+CORBA_TARBALL="b493e7b682c9.tar.xz"
+JAXP_TARBALL="c62dd685e517.tar.xz"
+JAXWS_TARBALL="db7fdb068af9.tar.xz"
+JDK_TARBALL="8450ad6fa3f5.tar.xz"
+LANGTOOLS_TARBALL="66f265db6f47.tar.xz"
+OPENJDK_TARBALL="0503e9c58a13.tar.xz"
+NASHORN_TARBALL="bb36d4894aa4.tar.xz"
+HOTSPOT_TARBALL="7e5a87c79d69.tar.xz"
+
CACAO_TARBALL="c182f119eaad.tar.xz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -35,11 +36,12 @@ LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBAL
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}"
+
+CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
DROP_URL="http://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
HOMEPAGE="http://icedtea.classpath.org"
@@ -58,10 +60,10 @@ 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"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="+X +alsa cacao cjk +cups debug doc examples jamvm +jbootstrap +nsplugin
- +nss pax_kernel pulseaudio selinux +source systemtap test zero +webstart"
+ +nss pax_kernel pulseaudio selinux +source test zero +webstart"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
@@ -111,7 +113,7 @@ RDEPEND="${COMMON_DEP}
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
- media-fonts/lklug
+ !ppc64? ( media-fonts/lklug )
media-fonts/lohit-fonts
media-fonts/sazanami
)
@@ -189,7 +191,6 @@ java_prepare() {
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
- epatch "${FILESDIR}/pr2383.patch"
eautoreconf
}
@@ -239,18 +240,14 @@ src_configure() {
# Are we on a architecture with a HotSpot port?
# 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
+ if { use amd64 || use arm64 || use ppc64 || use sparc || use x86; }; then
hotspot_port="yes"
fi
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
- # Otherwise use JamVM on arm & ppc and Zero on anything else
+ # Otherwise use Zero for now until alternate VMs are working
if test "x${hotspot_port}" != "xyes"; then
- if { use arm || use ppc; }; then
- use_jamvm="yes"
- else
use_zero="yes"
- fi
fi
# Turn on JamVM if needed (non-HS archs) or requested
@@ -273,6 +270,9 @@ src_configure() {
# Turn on Zero if needed (non-HS/CACAO archs) or requested
if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
zero_config="--enable-zero"
fi
@@ -295,6 +295,7 @@ src_configure() {
--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
--with-pkgversion="Gentoo ${PF}" \
--disable-downloading --disable-Werror \
@@ -306,7 +307,6 @@ src_configure() {
$(use_enable doc docs) \
$(use_enable nss) \
$(use_enable pulseaudio pulse-java) \
- $(use_enable systemtap) \
$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
${zero_config} ${cacao_config} ${jamvm_config}
}
@@ -318,7 +318,7 @@ src_compile() {
# With ant >=1.8.2 all required tasks are part of ant-core
export ANT_TASKS="none"
- emake
+ emake LDFLAGS=
}
src_test() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2015-11-13 7:10 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2015-11-13 7:10 UTC (permalink / raw
To: gentoo-commits
commit: 10e165e075061a73cda563c63616e9cf3d7b63b4
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Nov 13 07:01:49 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Nov 13 07:01:49 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=10e165e0
dev-java/icedtea: Update to 1.13.9 (http://bitly.com/it11309)
Package-Manager: portage-2.2.20.1
dev-java/icedtea/ChangeLog | 7 ++++
dev-java/icedtea/Manifest | 4 +--
.../files/6-cacao-dynmaxheap-Makefile.patch | 10 ------
dev-java/icedtea/files/6-cacao-dynmaxheap.patch | 42 ----------------------
...-6.1.13.8-r1.ebuild => icedtea-6.1.13.9.ebuild} | 8 ++---
5 files changed, 11 insertions(+), 60 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index de17131..94da502 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*icedtea-6.1.13.9 (13 Nov 2015)
+
+ 13 Nov 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +icedtea-6.1.13.9.ebuild, -files/6-cacao-dynmaxheap-Makefile.patch,
+ -files/6-cacao-dynmaxheap.patch, -icedtea-6.1.13.8-r1.ebuild:
+ dev-java/icedtea: Update to 1.13.9 (http://bitly.com/it11309)
+
*icedtea-7.2.6.2 (23 Oct 2015)
23 Oct 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index a5415e2..d8c7f70 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -27,6 +27,6 @@ DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
-DIST icedtea6-1.13.8.tar.xz 4566076 SHA256 fcbc623957e393a00d6189cb88288fed21c21860485092ea7719a12fbbc00adb SHA512 16ab0ec383809467266f9e55ce7d0333187041db3796aa940bc91078557397728b5c2b13b80d20b171b133da589207cbb7b9906719dd949af91df1cac207c9ec WHIRLPOOL 193b67b98c90b42252b894b4032d057073570a7b4460dd8c9f8f2ddce0647c6268702b8ceb519251d4eca489213ff20e384f0653cf8fae034947f72c8d0fa2a4
+DIST icedtea6-1.13.9.tar.xz 4573884 SHA256 61e0fb2ed0fc2d793a42e24d2192423f8a7ccb04f130d82d5889a0ecf52bc965 SHA512 b1a6e7d36904e3a9cea620c86dc656324bc99622d470f021f86a66c77919d8faf774d199f42669f9813f1ca4c41f2a920a66f9927d33eeca5476edd26438822a WHIRLPOOL 32586b8563cb7c9246bfb1731d409a03d0367b653dff866f9a3e8b4deb1f09d6405e8e103a94681fe3e80ba4dd042782a2defec409f0b020c1d3c263bf3feec1
DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234
-DIST openjdk-6-src-b36-22_jul_2015.tar.xz 33757312 SHA256 c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 SHA512 52ce3ca2feae2fb00e0363d5c0a7e03efc79b8fe803049ee91e252e436433b6bcba0e0536f886f4def8297d34fb6c1bdcc5ddbbcac9344abee172c0adf6e126e WHIRLPOOL 026e1629cc0bf1ff0342d68eca3a9c822d51c2eea3a1cbf828aa001e59cce5946eca5681d89890fd7968f52b51592e5a472eb6f8e033a1906631da5c50b78684
+DIST openjdk-6-src-b37-11_nov_2015.tar.xz 33790124 SHA256 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d SHA512 e7da587e5cb5a99d3a92bc64ae1bc668bd470cd5664f097197d87af07aa32414903c1b212693449e471b933ed6b1bc7e754fb56ccd7af23038d766dbfdf8eba8 WHIRLPOOL 685fd308007bc236b2c461c09186f910ef5c829a3f557fad5b37902d0550b66d7be82502a66209c99430639d875356f5249fa5047f46468983d164aa156aed17
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
deleted file mode 100644
index dc87ae8..0000000
--- a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig 2015-07-28 07:21:16.447388803 -0700
-+++ Makefile.in 2015-09-06 09:13:16.548000000 -0700
-@@ -182,6 +182,7 @@
- @WITH_RHINO_TRUE@ patches/rhino.patch
-
- @BUILD_CACAO_TRUE@am__append_22 = \
-+@BUILD_CACAO_TRUE@ patches/cacao/dynmaxheap.patch \
- @BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \
- @BUILD_CACAO_TRUE@ patches/cacao/memory.patch \
- @BUILD_CACAO_TRUE@ patches/cacao/hotspot/original/memory.patch \
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
deleted file mode 100644
index 33b9818..0000000
--- a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User James Le Cuirot <chewi@gentoo.org>
-# Date 1441543564 -3600
-# Sun Sep 06 13:46:04 2015 +0100
-# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
-# Parent e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
-Dynamically set the maximum heap size on Linux
-
-diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
---- cacao/cacao/src/vm/vm.cpp Mon Feb 11 19:31:28 2013 +0100
-+++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:46:04 2015 +0100
-@@ -33,6 +33,10 @@
- #include <errno.h>
- #include <stdlib.h>
-
-+#if defined(__LINUX__)
-+#include <unistd.h>
-+#endif
-+
- #include "vm/types.h"
-
- #include "arch.h"
-@@ -702,6 +706,19 @@
- opt_heapstartsize = HEAP_STARTSIZE;
- opt_stacksize = STACK_SIZE;
-
-+#if defined(__LINUX__)
-+ // Calculate 1/4 of the physical memory.
-+ uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
-+
-+ if (qmem > INT32_MAX) {
-+ // More than 2GB will overflow so cap it.
-+ opt_heapmaxsize = 2047 * 1024 * 1024;
-+ } else if (qmem > HEAP_MAXSIZE) {
-+ // Otherwise use this if greater than default (128MB).
-+ opt_heapmaxsize = (s4) qmem;
-+ }
-+#endif
-+
- // First of all, parse the -XX options.
-
- #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.9.ebuild
similarity index 97%
rename from dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
rename to dev-java/icedtea/icedtea-6.1.13.9.ebuild
index 18438c6..15c6d9a 100644
--- a/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.9.ebuild
@@ -13,8 +13,8 @@ inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator vi
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
ICEDTEA_BRANCH=$(get_version_component_range 1-3)
-OPENJDK_BUILD="36"
-OPENJDK_DATE="22_jul_2015"
+OPENJDK_BUILD="37"
+OPENJDK_DATE="11_nov_2015"
OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
# Download cacao and jamvm regardless for use with EXTRA_ECONF
CACAO_TARBALL="68fe50ac34ec.tar.gz"
@@ -152,10 +152,6 @@ src_unpack() {
}
java_prepare() {
- # CACAO has a fixed default max heap of 128MB. This sucks.
- cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
- epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
-
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2016-08-05 20:45 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-08-05 20:45 UTC (permalink / raw
To: gentoo-commits
commit: c070f1fbc1cf036100de3dbe51bca5bcfb99567a
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 5 20:39:01 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 5 20:39:01 2016 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=c070f1fb
dev-java/icedtea: Switch from set_java_env to new java-vm_install-env
Package-Manager: portage-2.3.0
dev-java/icedtea/files/icedtea.env | 18 ------------------
dev-java/icedtea/files/icedtea.env.sh | 18 ++++++++++++++++++
dev-java/icedtea/icedtea-3.1.0.ebuild | 2 +-
dev-java/icedtea/icedtea-6.1.13.11.ebuild | 2 +-
dev-java/icedtea/icedtea-6.9999.ebuild | 2 +-
dev-java/icedtea/icedtea-7.2.6.7.ebuild | 2 +-
dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild | 2 +-
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dev-java/icedtea/files/icedtea.env b/dev-java/icedtea/files/icedtea.env
deleted file mode 100644
index 463add6..0000000
--- a/dev-java/icedtea/files/icedtea.env
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="IcedTea JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.@SLOT@"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea/files/icedtea.env.sh b/dev-java/icedtea/files/icedtea.env.sh
new file mode 100644
index 0000000..d24e1e6
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea.env.sh
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="IcedTea JDK ${PV}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/$([[ ${SLOT} = [67] ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)$([[ ${SLOT} = 6 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/native_threads/)"
+MANPATH="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.${SLOT}"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea/icedtea-3.1.0.ebuild b/dev-java/icedtea/icedtea-3.1.0.ebuild
index 321f773..3aeb583 100644
--- a/dev-java/icedtea/icedtea-3.1.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.1.0.ebuild
@@ -360,7 +360,7 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
diff --git a/dev-java/icedtea/icedtea-6.1.13.11.ebuild b/dev-java/icedtea/icedtea-6.1.13.11.ebuild
index 4e90f1f..f1ef452 100644
--- a/dev-java/icedtea/icedtea-6.1.13.11.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.11.ebuild
@@ -344,7 +344,7 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild
index 7bd3197..d60452f 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -344,7 +344,7 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
diff --git a/dev-java/icedtea/icedtea-7.2.6.7.ebuild b/dev-java/icedtea/icedtea-7.2.6.7.ebuild
index 19f400d..fe9ade9 100644
--- a/dev-java/icedtea/icedtea-7.2.6.7.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.7.ebuild
@@ -370,7 +370,7 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
index 2e80c20..a425040 100644
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
@@ -373,7 +373,7 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-08-05 20:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-05 20:45 [gentoo-commits] proj/java:master commit in: dev-java/icedtea/, dev-java/icedtea/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2015-11-13 7:10 Andrew John Hughes
2015-06-19 15:30 Andrew John Hughes
2015-01-23 19:50 Andrew John Hughes
2014-04-16 4:49 Andrew John Hughes
2014-03-28 16:56 Andrew John Hughes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox