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_and...@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() {
