diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2012-09-26 08:42:27 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2012-09-26 08:42:27 +0000 |
| commit | ecaf9ccdd1044e0c5c47b09ff84737beeadca43a (patch) | |
| tree | ae59c07fa484bd85b40c7122afc454fd6c5a945b /dev-java/icedtea | |
| parent | Marked stable on AMD64 based on arch testing by Vicente "peratu" Olivert Rier... (diff) | |
| download | historical-ecaf9ccdd1044e0c5c47b09ff84737beeadca43a.tar.gz historical-ecaf9ccdd1044e0c5c47b09ff84737beeadca43a.tar.bz2 historical-ecaf9ccdd1044e0c5c47b09ff84737beeadca43a.zip | |
Fix package.env entry of rhino. #433283
Remove vulnarable. #433389
Package-Manager: portage-2.1.11.13/cvs/Linux x86_64
Diffstat (limited to 'dev-java/icedtea')
23 files changed, 33 insertions, 3654 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 77ad0ae071a5..ae178651893c 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,23 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.81 2012/09/02 11:48:02 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.82 2012/09/26 08:42:27 sera Exp $ + + 26 Sep 2012; Ralph Sennhauser <sera@gentoo.org> -icedtea-6.1.11.2.ebuild, + -icedtea-6.1.11.3.ebuild, icedtea-6.1.11.4.ebuild, + -files/icedtea-7-compile_for_7_cacao_mem.patch, + -files/icedtea-7.2.0-explicit-gthread.patch, + -files/icedtea-7.2.0_pax_kernel_support.patch, -icedtea-7.2.1.ebuild, + -icedtea-7.2.1.1.ebuild, -files/icedtea-7.2.1.1-pax_mark_rmic_java.patch, + -files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch, -icedtea-7.2.2.ebuild, + -icedtea-7.2.2.1.ebuild, -files/icedtea-7.2.2.1-pax_mark_rmic_java.patch, + -files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch, + -files/icedtea-7.2.2.1-warnings_are_errors.patch, + -files/icedtea-7.2.2-no_suffix.patch, -icedtea-7.2.3.1.ebuild, + -files/icedtea-7.2.3.1-pax_mark_rmic_java.patch, icedtea-7.2.3.2.ebuild, + -files/icedtea-7-compiler_detection_cleanup.patch, + -files/icedtea-7-no_suffix.patch: + Fix package.env entry of rhino. #433283 + Remove vulnarable. #433389 *icedtea-6.1.11.4 (02 Sep 2012) diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index e81323d40ded..eadaf0c509de 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -1,73 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +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_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-no_suffix.patch 833 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8 SHA512 d6982b5c7a7df41769cbd14067cff3425af8520d3f8a870028a80b443fe537af1923ed1fc8050ed6fed1d18058c8798bdb578bf19eefc87380c6861702761625 WHIRLPOOL 3df9e0571624fe619170c54379ce673470bb6b9e192942f27300ef5b44f1471cc3abf211bc728a2dbed8070c57d935f8c425129243973f4f9a16d2998a2523b5 -AUX icedtea-7.2.0-explicit-gthread.patch 696 SHA256 78e55b212004127726c8f0ab02b8a0a1c01677443237505a21fb803b38e08c55 SHA512 de4da833fbf5c09b9a9d64b8a4fa3e9e5187296e3da91b410bc2da5207d020a26a3348b70eacb199c5b3efb1eb72023c23b2d327cdc91ce64c6f49b313cf7d22 WHIRLPOOL 386621a8e223f93d12e48a0a1c554284f80ae181b4785e675952df132dd810d4112c0b519235c80cef02b8b894d1ea317922a0bb85948461b881df96e6ef9474 -AUX icedtea-7.2.0_pax_kernel_support.patch 6511 SHA256 4771937bbb89a92fd77dc5e5945231ae511f284fa368648bb7aa34e0fb48ba9e SHA512 4c51920e1376597d91bf11f0e217c177e954d4d59930b9177c48dc2c6c835a0994dbea11ea2cf9e42f4c3b63e0f21ecf4a4ce5790955673b382438cb77ee4e39 WHIRLPOOL 4190de4e1f4c5660154075a85a2c56d6577d13a14d019346e82a86edac1016bf2ff71b07c9c217693eceb46cfcdb216356ff8259736e782104924e056b7e7d9c -AUX icedtea-7.2.1.1-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45 -AUX icedtea-7.2.1.1-pr986-cacao_memory_fix.patch 6342 SHA256 5ad35a62ceb49215631d7d91b8e610598110d4b935140c5498b76f9a697cab3f SHA512 40a5e55691fe2430fe2c449788e1f61bd701d687e4c6ceab026baa8eebfc36ee1e22ff3aab2d1da80c8914abb423f220963a44949678165cb5416e7b43d4629b WHIRLPOOL 4543bb42ae9c6eff0e1e0d4ec0726106c3a55b996daa30bb7bea68174e37f14d231207e24722bb3fe0164a34182db1359fd5c9da8af2376dc9729eceac81880c -AUX icedtea-7.2.2-no_suffix.patch 833 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8 SHA512 d6982b5c7a7df41769cbd14067cff3425af8520d3f8a870028a80b443fe537af1923ed1fc8050ed6fed1d18058c8798bdb578bf19eefc87380c6861702761625 WHIRLPOOL 3df9e0571624fe619170c54379ce673470bb6b9e192942f27300ef5b44f1471cc3abf211bc728a2dbed8070c57d935f8c425129243973f4f9a16d2998a2523b5 -AUX icedtea-7.2.2.1-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45 -AUX icedtea-7.2.2.1-pr986-cacao_memory_fix.patch 7401 SHA256 e2060ed9acf9ae9da8943ffec470b09745d758c6c6de8ac06737ea26eef21795 SHA512 023578a2243672503e78a159d1774bcbe9d8cf4fc514166a9bf040e25cc7d28422b3a9469d804909e8a8fecfadd9fd31e8f34f85ae688a58620272ae620135f7 WHIRLPOOL 79fade6ca0c0d42f004e0a88f31159b4cabf5b4391ef30c78d74cf01bcf44f78bbf970ac070e8e8f320eb0dfd7fa17e335412156c2e004a47c2d47faba5bc309 -AUX icedtea-7.2.2.1-warnings_are_errors.patch 6739 SHA256 b824eb31b96aad79e877e8ea4e05e44bcfa16d840a3328260d41a465e7ff7f03 SHA512 65ad279885c3645cc208cbc611df4badb8187793c2667af2c123b0c29a213701293dadcc23b3a65ae6ac0ffedd4b5e6ef0b020bf95e620d7d5cac3fcf912b4c9 WHIRLPOOL 21e1faf63a89e856cb44e97612f4e3496a35064211096a738d6533cfc8fc2712f1891df3294e59b2c254b58fc2635ca1334519596f440f86e124a359a522a8ae -AUX icedtea-7.2.3.1-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45 AUX icedtea-7.2.3.2-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45 AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258 -DIST 0036fe6fe7dc.tar.gz 3971078 SHA256 245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2 SHA512 45644cc13d7d44d43c949c78fb2399e9aa796562026f9570de10cf3677381b578af83c1720b0a4fa6c0be2f8493975e05f3805fc06fcebc733630dae9340d7ae WHIRLPOOL 452ef804a5eb87ca47d67083c4a43049301b3ea8a56e9031eb38edbb702d370f67314b7b76c0656f57c8b99bc41669811bed92478701cfd34bfa8c7322f14778 -DIST 0b776ef59474.tar.gz 128861 SHA256 15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe SHA512 2cb8838b44b83a596b34a383b1578eaeb4be6c8df453531c66630f134633c757a958ad86f18327eefcb4501aed9225d62d8836ae15b796e0c0179ce692aafd53 WHIRLPOOL e9dade224f0dbfe8639b67a8fa811b689fac8af36f87703e871ea467a1fa13262743e32c65bef200f06271950933e3604a31648627a3138cdcc99f86e1783864 -DIST 0cf6181d44db.tar.gz 2311102 SHA256 9fbd9e68422aaae9b6962bb7a9400a45959bf36b5f1ea443fbbd270dda9feca1 SHA512 c3dda08fc4a134537c6662877190e444fb3cf9cb2e47b52a2225af101a1c3d8d41abaa34390fa1cd0d0a864411269d514e9a839086b8b3071462bf47babc3359 WHIRLPOOL a73a2f75b2822c2d9d207c0d6f52a42451004a843f02aa15a307ceb0ff770ce81f9087a560c339d3d944510c01055290eae137d27b93a9c7e234cf18ea5ebb07 -DIST 0e651e004747.tar.gz 8994812 SHA256 d68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1 SHA512 5a1c7e8079fc2955983edb7bd5d85b3470a944b59f18bc5b3f41d7bee14964b8315a19753ac0ac2fcb75b04cbebcdcb043b858615b0cbba34cbd1b6aabb75306 WHIRLPOOL 016f7211a4e6e0145ee28b76b6a99f4a56d607bb050393e525ae3158f9953b955c6090823525315f654fdb81ac4afa5f88e9eb463a9b80756800bf705d94dba4 -DIST 1cf75c0e2c96.tar.gz 3985855 SHA256 8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e SHA512 d800aeb9685548ba6e4955dfd3dfd63fe656b5075ab6847e7c98043c50ed3a3494a727037380adbf0be801fd4a2932f003b97708a936277994939c49fca6a6d6 WHIRLPOOL d34c568db93f00e111f11149683b3ceb3b1f085cb241eb8df1e4b51758699d9ebdded5e40609fb2fbf5d620a344499756f02b11447d18c50655230d24256972d -DIST 22cc03983e20.tar.gz 129111 SHA256 ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7 SHA512 c6d067471a4b1ee77a88395ff03795358db8f633a68006b6f5f8f2cf9c6db95cb144ab824d5c6a1474053485660fc6d31aecd765932373a91badac35b0393881 WHIRLPOOL a1aa2aae22d5cbfbce582e1d6025b548ae42dbc5e6712789ea322224231e1c76ececb795242c04d5480394beb36a1c60e6adb63aca96a3b096b928c1a1bd363a -DIST 3231f3e9c517.tar.gz 1449514 SHA256 9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274 SHA512 b918b7ceaadc4f265f54a0c74ed88ddea72a7bba54c39fb38a780fcf88138bbf723624f445852b1a8394b19e11dc9503323ad19b46c41170046128c414f0a285 WHIRLPOOL 61486703bf67ae02816efef5c586c59b69a7c410ed4a2de2c2cce4068ddc08bf1e31352a3c89ff79d32c7bfbff8340ac4265b075dc49d5390e6cc5c4bfb265a3 -DIST 335fb0b059b7.tar.gz 3971488 SHA256 ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd SHA512 af9d77d1819d20142179aa4ae2f51b5713381539626762698691940ae25e451c4304d865ceef6d4cccd73e015a7b4caba8e1dc11d1ee7718e5e3f0d46148f5cc WHIRLPOOL 8905ec62a5411003a50822ad4122c538ca942e0b2c9223c33abc7d4cf0fcadefc12e5bc6b05ec52bf98167f2bacdf03d4606fb0b20a1382d7ea23e5ae70fe02e -DIST 338c21646c76.tar.gz 1447906 SHA256 10425cbbb439551293a7a96a128f25ce408c38826bef8562f4c2d65d3134a1d3 SHA512 a7b9aa38297bf42a755a7c0250e8106b374f44764542bd3d314a0c93af5c0261f9d15717ccbd024b2272f04cd220e24a74232b6fa4b2df847e5ee889b978cd0b WHIRLPOOL 20fe9bebaca713e54b26c34b5bb61830ac833f769f2278068ad90cd35a7dcff541574f5323c2f8b0cfd048e68d8b49d1e5b08a72866eb8b27e5fcd09ccd022a8 -DIST 38deb372c569.tar.gz 1450094 SHA256 b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93 SHA512 e2649648d752d8b412e249c0ff5d319fca3043c053d29a60fa6f79f44211656c92e0c83f04d3ab0c3be1e1201aea0f14ac3035f9a7ef53446e429bd7ab33ab9f WHIRLPOOL 21edaa9d200a316f6602c3569e5af132cbc5c31e3793c8b6452eb21e10d58811619ccdf0a2fd224a701c85a8670f9a5440e1f71005787c8740dfaf65f7aaa0a6 -DIST 3e0087ab5e92.tar.gz 9591074 SHA256 3e85e236b683c14bad9505f414a0acd876956bb8e67362acd6a5bbae99bbe9e4 SHA512 33ceb4cfbdccd1913241b216670e4c59d81dc5419d8c416e6c88fc97cff43088c3b1a1c60d85e456679baae8e47c454f1be04428c3e94fd5ed1313eb84bd1678 WHIRLPOOL 28bb1dab51e347df91e19945d0ecb69c97704ca44bd35389297c7bad51d4c71bdbc635c0acb290a71cdebbc224dda2924f3832ca985e5e627c4e32a1eebef7eb -DIST 49a6fc8f712f.tar.gz 128837 SHA256 26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54 SHA512 c27ceda3527b80d0cb24101f3e8e4e8eae7c17e88543823610d3d152692a0717bb234db27ddf519b62080fba9248ae29656a0e0f991b07d64357b4afbd41d5a8 WHIRLPOOL 03d541655a6580478b2f86a57ce6d099970012b82054261e70297de3aaff2868046dca90967fbd5f0c101a4549cf8acb3063cf5d3b7f290ca6f2facb7ddff86c -DIST 507eee662587.tar.gz 44936515 SHA256 b7a309b177f53281fba881f379619a6ce36f1f733da610af1275ed160dbe6d02 SHA512 da77c0ba25b89a2eb61fcbe74a0a44bb82fdd38e6210cc65037cd0828437bed35f21bd2bde4f15c6ad6513dc6a1a4d2a43c02c903585bce645aab8524a29a72d WHIRLPOOL 3e86bd29d251ca18b23b1fa44ee55c67d9b56572cd7fe56fbc467b153fdb50086b30591a8642e9121c6224065181d5b3ee888c21b81435c4d665f752ba2e4290 -DIST 50f6f276a06c.tar.gz 43434230 SHA256 5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d SHA512 2a39043200c81571a4f5bb2011915f1ff2f692e783ae970b3917c9d67ef269fc6b73b9bd23da9a4afde39bb31dba53792bf9241e4b01731bc7e4520f05cf264e WHIRLPOOL 2d494d91d0667ed5c3d672f7c8e18b1ca0684aacf31edef7081b95fca4beb3aa172a2acc88325cfbfde0235290a846b93c2a343e08d7b1442855f072e31e63b0 -DIST 5471e01ef43b.tar.gz 2761767 SHA256 1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d SHA512 53396ef5f19f0062e0393b0525e909a49f1ba0af2ed08ef2c3ef48bcd532be7ebbc9f9ee4947466cf4ee5486ef6695c3e42fbcce39045fdb6c3387d694eecde8 WHIRLPOOL 8089242c7b843436df3b6552c07c421f00b8c2300e28a58bbffb37265a1df424fd15c62cfd98e16135bffb357cd4a9665855a7d91a98c59de58528fc0de5a7d1 -DIST 5617f6c5cc94.tar.gz 1447230 SHA256 963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3 SHA512 e69344abd1daa14cad99c4ab397d138d61a57b13965333dbf627193d3a262ca45c953b9338ca651727c001135c54c905d1aec20fcf7702928b9088989c386d55 WHIRLPOOL 392229728f661ba601fd18ea2b7f7de682e7721e1dc04de71f8acee1f8b486b11f4e1028188f7fa60c282b8fcc775851b39e18327962e6de5baa3dd796fed637 -DIST 6c3b742b735d.tar.gz 44788667 SHA256 48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e SHA512 4be68e6d0d46c56f597f0750496f9b19c70a44f8aff07df91e17af71af7a368ae7de090e74e9eaaa9120222523afaeab5a50c483deaf09c1a16cfe0634cc7304 WHIRLPOOL 16322e86c2d1f9e2db1ccb7c3010759dbba1886e325d5f9b2aaea475ba4416cfeee8d3bf1ba9464d25a492b3e132eef7d60a2f2d6cd2fd5256f317dee2f728cd -DIST 7a8825b15df6.tar.gz 3986524 SHA256 297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2 SHA512 5a6459c1d214510adabf9d4f7f62841a34f3ba406c08c12d3e7212399de3e2c36b59511a28b234f076552b4e1b1a96de90bc0fd19472e0d01d310aff7a73d572 WHIRLPOOL 870693026238ec603365ac8175dde13ea180baded1e25d87b78452ea5dc6beaec8f87a1863f3938e4679d5691b24526dfa33a304d53d89aa011ae72d904629ae -DIST 7edfbfe974f2.tar.gz 2760671 SHA256 823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa SHA512 561f3a5409f74c1a27eb793fb1a3ec8355df7eb6449994d497621a546c2eafcdf99a625df67cb01a3bd06d07099137d0f7b926a119aafc31e3167dfb35fc17ea WHIRLPOOL d3ce038cb44f45d34f783841233cb7418a7961631afe1760e026984c32555acd6af4795ef4b88bf75decda593b3f7fd567ae0b1b21f3b201a0441519c390d7ea DIST 7fae6a3a68c7.tar.gz 1453824 SHA256 8d94e9b594e4ae0eff6899cb4ff899ce66db3b4d6ef158e019b7be96e193ec0f SHA512 76b29c79d4219857ab8b628086d3ea9379c490402643bc4947d3253b012115e97c5f4463f54fe7abf5d82227d722e3cb5ebb5060cdaa881bcc214670200040e0 WHIRLPOOL 55cc41286aaf4df881313dcc28664cfaf3f18b51947951a3a47b41ba7081b168941723700e6128f59729460e4c50c0ab192afc7539d131e6e48130799b4cae8c -DIST 839d0155f7cc.tar.gz 44793871 SHA256 19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7 SHA512 815b6036a07552caa96814b3f6559fb5e99cf77168b590137e69a838bdea1b9fc277f3bdecf4f56e07040fcbe1a3b1d7ddd03fb9a7094b208c9e44d81daed919 WHIRLPOOL f6639be4f40d6df9ae4734c97e438bb4a221566a87151bccd97f3db9b417b4e6a484b223a8f62b92ca18a06b3014fd80f20a6de517809520456c4e985b332f93 DIST 867d5041bee6.tar.gz 2311092 SHA256 ded69ccf2baea82b7baf9050c64160733ff45c10c0a363de80d795618c494707 SHA512 eca7177ceca9f90b344167330bba7a3e53989ccfea6bf0e38851735d4bf9dc8f23f1238d26373f1e19c804e7ec05aa4e84c0004847af116bc2183aded9c34cde WHIRLPOOL 18f007a4378c54c6a1ff1befbea87b39e65b3ec48cf69ac7374c3fe695d58197909b4d2952cf7d81ba9c35c40172c89c3c5cb496c1d82140d92435c06ab570d6 -DIST 889dffcf4a54.tar.gz 9363922 SHA256 b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41 SHA512 e4c4cf5e2112eb9829c43ff9b381d34211245f3291181f309fc91181360fe83b8cf12ce21dac67a400e64eaca4e2ef2dbab2a6c07da7d79de99c03103e5eeb46 WHIRLPOOL 79898542e59eac28c223c142e352285e496c91fc133d0a1ddf3990fdd4032209011365a7ea9f456ef07205da97bbe751372058c4d49d260e6913a3c88d4db519 -DIST 8b7c4c5f6ba9.tar.gz 9101747 SHA256 22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2 SHA512 46ea6c2d60dc2f2daadc31c33663c5d48a20121274fea6ca90afc9c470861cd9f4c53bcf4d6b8ad4e3a8fe90fd73282413d10c05f1c240d64f99acb7e7d336f1 WHIRLPOOL 8c172ddb43093474a75ff202d3b8c71e3f993724442a96c1c6036cd30f75cc8cccd0a71b8a78f610dcfc6e33580f43dadf112ca366ca6bec128ee34636f87487 -DIST 9a744f20cfc5.tar.gz 2754118 SHA256 d8a6012bfb7217d3033b4b2c530753f336a5ea52e487f776f0399c87d7979b99 SHA512 da3946d02275b8f3685a2dd260ca391e3ca3f55518ea87b8a702f460c61f18fcc5b19e076dec13b241da2b665615289aba2cc18dc61d6da57f3934ec38f81671 WHIRLPOOL 5745df4b3b7f7e3888ee3075025367d19eb753b8f4195672da23866151bbdeb6853eace4d2c63ecf6c5d2278ec1cdaf4b10b2677f4e9f5bbb01518403f082ac7 -DIST 9bd1d8e8b802.tar.gz 3863897 SHA256 2bddebe957905927dde720619601ffc22d3067448e6079a2befe2ba30de99a15 SHA512 3061095facb5b0216fd40055bc72cdecf3ce57d49974df6691addbbc296596f1c734440db59a843ddde86b8862fd9f497da79e3a9a2730618fa7465b3a404669 WHIRLPOOL 5b5d364a984b9f29df55b272c74800a57db981288f9b5ac1513de24775434dc22b826847a5dde3b82209b0aca60f73aeae2d533b959b260d31429e7bb203a47e -DIST a3fa5d49d528.tar.gz 130422 SHA256 c9c03e96be355de46f7aef23209afe2e9ff58c9bd4cf3e6fa4bebfb8f7dc89aa SHA512 08c0106fd8d0e8c81781e7f002a961d791afeddfa00a9e10ad4eff08e856e69c0360ee9f9e2990ddac7ae24084a9e74acf097636b91bc86dd3f88393112e8242 WHIRLPOOL 1a66ba28258b65b9a87a406cb7a6576d7be3b8fd4f02accdaeb9937770a1e47787cfb4ee4891235b677fb14597c6637fc38016fa14f13da0eca8e734ed82f96c DIST a567bcb7f589.tar.gz 4263355 SHA256 d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 SHA512 2abbd6ad72a5811963610b81ad3f59882fa0109bbffb69316f7bcadd218982abbb7b94ea41ddd379a0dad8586301e1d317226153d2f592876c56e7d338afadf5 WHIRLPOOL e712ee17b9e4e23a1fe54823218a79a45ab1ca11e23de2896b576a2034650bf8b151f01022e0d3f12421008fc1e8d8f9aa0bfc4cc6bce812dcfbbbab1c66af7c -DIST abfb890c262a.tar.gz 2761760 SHA256 e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a SHA512 14a4bc79dc5b70aedcd03bdb75edc08276d6723d2697054975c474d19df703b87f407982599ada7c8cb981f61b5de30e071292e37d2727cd3496505370519577 WHIRLPOOL e534a30d32dff0e5c852353aada373ee68316e1e9ec8991b6c86885b59e49fbc5b88bd3164b652cbff7f73587f138d274b3058ad14f56c8a6f028ebc7ecb8110 DIST acba2d30209d.tar.gz 130448 SHA256 ae63f88590d4aa82de82322e6bb61b31157e49617a4f8c310fc4c4ab4690f528 SHA512 deabb45a62fde29f4d896351a52742fd27f4410899a0b0fa613f5a7142b0a0125a02c36b14ab21f6d98af671e606d032b47edcd5167d498c1f5173b4d83a4818 WHIRLPOOL 4f8dd5ec721ba7fdd163e54d0f83521444962b1ff5c6c0a165773e9dea23c343c2a5c049029ad4144145af8a87e8704c5c9e68a1e8b3572be804a36b9151bff7 -DIST b534c4c6cd9b.tar.gz 2291346 SHA256 c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c SHA512 134554bcd68986ec574e88a5571bc55eb224a2e4a453e7762e9c87b97b871094a2ce828f4d403dd644b927bc303cb6699e34e0beab832e43c800a46e36352aab WHIRLPOOL ab8abfc586830532bfed09fd58e8336a07f936deee248846342c9897b20b55ceadfcbd1783b4c16ee4329964839337b7a9838c67ff95e2004c79a5feb8587800 -DIST beea46c7086b.tar.gz 2304058 SHA256 17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb SHA512 05847a1f83248ef1f41a221cd6e8d274f29490286a0162e29d56661d82702dbb9e58b24b2815ca803749f060a6549871f6e235e4193e819f2c326b9fc9c2486f WHIRLPOOL 9499dcd542d14403ee79276d4884e41feeb88440e837078e827c401c2659e12ebec4d132c656ae1f25bde2261e6d13c88b3f79a154b7b21696989e2aace7e711 -DIST bfe5efd70bce.tar.gz 9363244 SHA256 86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514 SHA512 2a015fef6673f85f152f7d2d9298a6773befec34686a1a170c88b069be5a7de62c51d63afe24fcca7681d1f099956eafb85296107b7bf481925e2b2a9a1b7d5d WHIRLPOOL 22a21277aafd840697191db8f27c0e6cba88c960442b95d474800b7aa994de1d7b0701d7f968bfc1720eb36ae52797c9491faa4a9769a1cf314205aa317c1700 DIST c89c6ac953e7.tar.gz 2754322 SHA256 a411bdde270bb0451b74fc9ba890159ed1f7070bc25f21b3ebd17b79b42805f8 SHA512 d71228526b24bb4ae8aceeaf51ee77cb1ffb0d7aa6373f61f83d13c6428446327c3ba7edd80eb7ba32c55de2916e00ca06ba8c420d6137cb4afeead843ea242d WHIRLPOOL cb34cc39d8595e1d18abd85d95779e8f83bc3fcafc89558d6fc2d163d7e4b00d0715e7e2883d22ac477535158c52c85f584abd75161b4a903eb31aee6010fae5 DIST cff92704c4e0.tar.gz 4261719 SHA256 dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f SHA512 d03f04a13e271a57b8a704ef1684cbf64da0519d579c4bd1aafa0d8e0bc241939018d8425f1b65f6999a7f0dc4b58eb5ba6ea8ed76b3ed5ce3299dd7cd094861 WHIRLPOOL efaabbca72b4471fa72679f071ed0a64184e3281ff7c1a301bcee1a131f3c7f91f93c9f42fc87d4c79e802074da158cdde96578a5eb40f7605c6fbc5b6880959 -DIST d5ddeffc4651.tar.gz 43435299 SHA256 e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98 SHA512 42e4847e20111427f0b1460ee92ba0c72048696c096072084ddee983fe171b30f1c4481080def4368f99a1e15bebf9f242a5a213166459b955a968d848d51dc0 WHIRLPOOL 35abb980f983737c4d3e84a3174cc7b0d0008e8f16ebca2460b0ccbec9411611944c00d1dca5683a9e716b8e279d4e84bfbe21d8846f711ebb32ec569696fde3 -DIST e9b200124386.tar.gz 1453778 SHA256 07dcf05edc38ae63e4b667437cd23e5c3edbf6e03ffd7ce4b3eb24ea4c868468 SHA512 4852ad060d5f645433671da48591015ca8068554f1e1646b449288a35d4c9983dd7ba685db527106cddfcf456ae2bf337b776370c4a269a814bcd8c7348e2eca WHIRLPOOL 6bdb53adc0b8219c3d305a5fa798c1191848f7e929a75eb8cfaa045e89bece895405192bc51248a6f1b304292d8645c14f3228723ffe1d24ced3ced3abe04b95 DIST ea39d76b3bde.tar.gz 9593612 SHA256 25733b44590c950adc42a2e9c366b8a3992803c06dedcc16d2bf0d50fed54844 SHA512 1ce50a238e3420a56c3f17aa6744031be8124c9984525cd66c74ec7871bb1c25aaa2aa729f23e58a59fb27e4365a3fb268f26097062d69581549c08a83cb0719 WHIRLPOOL 2fde8912e828ef5e0d448b0ee6a019cd76d35dc85e5e8604023103cb2c4cb6274d82e432f05822231ec537845cc13a1371ccf4bc804e5a490d9269396e744dd5 DIST ee4bd94136ec.tar.gz 3863931 SHA256 26991edc468b7599a332753a60ff861fde78af439d0a5b87d0e5b389d5e53fb5 SHA512 b995ff0e4ea3dac907a30a437aeb1c21a0ecb248c5e8f62cf5c77511c255da2471e34a23758b66c2419bf9e040a2949bf4069f564edc4944964cd144341c9034 WHIRLPOOL f833dd202edb9786b023d0634311834aee3e4cefd51caf8815a5235de8bab85370329c1fdda9461a5bd0f037fe02f4662ed622f2e29e8d4aea7f8b06456a2b49 DIST f78eb7e08ee1.tar.gz 44934222 SHA256 74cd8b7c7ed1d80dd4cfa45565584ec1c24cfd5e10a32fc026b92f0ce27ff224 SHA512 7b5f09c42403c35d3d11bc22a291709158702abb699cca74e7f3ebcdacd684c8cdd4fd555c85e1b84e57b61f2c0e1bbd5c482bbc448506a67f643ee76b3ceb72 WHIRLPOOL 4cef5657368e52c5c79c3bca96bb6e79168950d9f7277a3addac4b701050b690da43d31877cecdc1e5259d86dba3b795cd9b36ec75d334f0702ec4542803020d -DIST f855bdb37537.tar.gz 2303970 SHA256 d46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19 SHA512 fe866421f2dc98558093d9db0cbe1639b434f63d7a676e41b5d8874a46cf36f5b1d1aa16586c980692d0bae4097399f47939c099c0369c30e2200ba9fd9a0fc7 WHIRLPOOL fedb457aa2f09bca9416b00406838f3ed1baaeb133fe49c98e73ffb7be278ebf1eb7dcba42f6a0c7758404b47ec34b9f382a8dcdf8e988256264592f01b7990e -DIST icedtea-2.1.1.tar.gz 4658834 SHA256 4a015cf3fb8fb9aa6b3ce4a41fd9bc5dcb417a1885a10a01e92d0cc7a5ffdc65 SHA512 055fa8787a49152944c2141d284be358c0e0e7248dc8c56002c06a49040d9b994cf7184b2406bec60771b7621a16c0936384089503f129bbb856f805512c7f5a WHIRLPOOL 70d55da5dd44b424ec23f350a9e0061112588e81bcb64cf50c53e679ba056c6212020069e556ef59baac2421994823843f4eaa4dc41ffa17b154600c0644e2ff -DIST icedtea-2.1.tar.gz 4687722 SHA256 8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6 SHA512 a126f42928387a5482643006422b3a87e8e66d1d0495096944e539256bdb4d0c5d4423d8888a9d9d9a85fb04fec1cbff2488a2bbd6ff1bc46ffcc54623897276 WHIRLPOOL 3a22beff7c51b22487d45538b2b95540ed64facfcc5be0603b19cd8ea5f62b278c82600ee158c58d909103f4f82c7a405eac643043aeb64dd1bb9b881aa49665 -DIST icedtea-2.2.1.tar.gz 4715301 SHA256 0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6 SHA512 03e216e29ed12e8514c4e829c66b5d11f0d9935455409be30fe01874a81a438544a99ed2b6a501d341f79f036bf3c1606ba7c25b27de6fbc6f204457c16779cd WHIRLPOOL 5287ff2a0d950a8b203e0ecc6f6c95aa082ab01105f81287ffb2a43753bf31d3acf7c4b0433acbc2a683112f989b31e2ee75bb8b7a6dce2112c9eafacaeb150b -DIST icedtea-2.2.tar.gz 4749395 SHA256 98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5 SHA512 69418c22d7d6635d236e4ba3b8995019ff1d2ecc1166d10606a797239eed952e4a91dc5cec9ea61433b6cc855a4a8de112f638f6f01ab0ec45ca1440d47b78b9 WHIRLPOOL 4288bec9ad76374ef8d27a9549356361a17bba6bc5f0066c9a523b4b3d0f40abd8c89fd0214386b1a453b7e77723a00f348dc71258169bf7af7abf234967d69d -DIST icedtea-2.3.1.tar.gz 4740854 SHA256 4d5f253fb20d4026ae55e8ab97840e257ca5b89897593a68dd18bb1c48b6f3e9 SHA512 0f415b84f18019690309b57ced53eb23e9a92b3537672b7185062a721ca3f533af65d4571a42501204f6442a22c41762837e222ff02a34c5f628607c009ff2d8 WHIRLPOOL e9794b9a3173302ebf2479dbb3e3b6db0f00ad5213c146c99da4b688164870cd1e9a825e25436e624384f889bb15e59ac03917c1205881997e9c43fe936d4f2e DIST icedtea-2.3.2.tar.gz 5042922 SHA256 d7e87de527934fcbb06c162e0e119d9b118069f3f52a1420d303fe19c5d74ef2 SHA512 e1d56b0576d87f546dd10dc3b684db8af555599706582efc3535ef96732ca1934b1f1bda99dc706b6c242834fdbb16fbd94827e876110cbff1fd7338475d7ae1 WHIRLPOOL 170486abd82b63687d9af14b724aa9143c25a4463802534fe4e0e3470ebcb5950e91353f11170c5d6238015c2fd0124c7ee81388664412fc9ab89df7418f299e -DIST icedtea6-1.11.2.tar.gz 6387625 SHA256 078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5 SHA512 0aa85aba480a59edacb639e639610fc2967834f5b528a8418d972ad5e391913a74546d682943d7df71841281caf5d3639cc49bcdfafd6ef6eebdc0d4899b1018 WHIRLPOOL 7bdaa91b0b50857de18ae13b721572e1fdc7ecbdbd30b15c992bbc2c90ec11aaf7476a8f7b98a54d5dd54b9891e1a3ec0f95be0280fa4b04ec6ce47f51d55da0 -DIST icedtea6-1.11.3.tar.gz 6340923 SHA256 7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4 SHA512 517c81d24c26b583ed3c0cbd3ecd1a4379b9ea323c03349c12e1cb5125ec84c1e91adc3382b8a8bf2146115347d97462cb4d89c7af4bdb485f89aed864d9b082 WHIRLPOOL 532ec3212ffa0a9f97dec174e23a1af3874b2bef2ed327ae3cb97a1b8a920fd1c62008fa458d582df7ce28aa130371644759892137829a01856a3047df75b88f DIST icedtea6-1.11.4.tar.gz 6379356 SHA256 7bc0037514aedbbd5e65edcb2fa300a18285688d27b359c2144fcf563174e4fd SHA512 e50dea9674d5badeebdafe50ca81b5f195cb8fa898ae43f5110971aebf5f5419b2841786aa132e839fec569206a70fb4ace0111ecf5a1b0fe567561fc28a8ccf WHIRLPOOL ac5349ddf715bab29e2e8a93e13e5e8a056c14b8a63976ac1ea96ed14ae7ee0d383eb97716e71d7b348649dab19d58e2c824b0a76128e2cb6518b29c49dd0e50 DIST jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d SHA512 8b479a23f4c2eb16100bb0745452c652849f8e18912756e2d9f8ac9cd395f4bcf89af89d6feda25c8ec41cb90b7f17bebe646637234ed360c65da2a45dbbac04 WHIRLPOOL b9ba7a0c73e16245c109f983435f00a9349c747cc5b5ef4592b8aaf7efc95af0992d9c897530a12e886e7f20687a290f70f3cb27529f1661bc37d76d00f2b2af DIST jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.tar.gz 298410 SHA256 3ca7e297ef4daa56c3dd733e21bce795d57ab071243369aa9400c0384ada8a4c SHA512 5843bdf7e00a120e6dc545b4d2d69f2fb72cb0e368a9fe5e280536bf065c6cb207c75c32477f3ef7d210c8dcbcb93324c14042579b92b177c651dfae1ae95b54 WHIRLPOOL b0a40fd4929acac5d3a24c3aabc9666baf071b84b56e3992d3a191eea202bf8d7d169a68a390816dec606df2055902f33ce10c8c0a5d1b6d46ff7a8869e8098f @@ -75,21 +24,18 @@ DIST jaxp144_03.zip 5964999 SHA256 c1a5348e17b330a7e4b18431e61a40efd2ba99a7da711 DIST jdk6-jaf-b20.zip 71243 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 SHA512 22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a WHIRLPOOL 2b02e883c7a2341ce927f402a9abc5a632a6718f713fbaa5c65133a0ac81a1a58a317b7e2028c309196805dc43146c591852c05144c64f2428938cb3ec4972d2 DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 SHA256 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3 SHA512 643266da495f239aca1a08ba85af337e5ab50e5b859bffbccab64cf1c4099cae641d9741a20ca59c599c1285266a79489dec190d7fb15daa88c82b69ce97dbd6 WHIRLPOOL cbd0614060d887ce5e1ee6aefaa213265ee45ae11b3f0f90eef0cfa5ee5db1c35d8209bf1d2dab6f5966af22ab14312891081cfa6ca4a11de92f272f33a2ea20 DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227 SHA512 a965efa2fbe95a32988f78f1e51c42321ff42c1e631d5062aff204ba42839d6e05455f1ae039540e38ec947b50a635984cd3302eb09e81962575510309374e05 WHIRLPOOL 2dd759c4d8a23f0eb66bb28e1b48842fa3984d9796833bbbb6a3305a49d9cb1f2ce19b59c93b9f2a33d679559bf893fd62b4f831aa76bb053351e219639d9286 -EBUILD icedtea-6.1.11.2.ebuild 9965 SHA256 33c05dcaa376bcd598eccd3d942f98b854d2c1e8d95c56629b8f282387729366 SHA512 d3d5bf8acf03b0f68a5f0664dc88b65b0da99aa138925bea9a0b9d92a4bb933d94ae3033f1a89075583b3ae36d407ad3df84c69ae8b89b06e70ce5a5c56814f3 WHIRLPOOL 84eaa66f62e1cdec120c0f55a0035a197864ab651e71cb0234d2b562ddd39347c6de9023818c361f5f2ef363cc68bd62e759d34722f41850092f49672ace3315 -EBUILD icedtea-6.1.11.3.ebuild 10611 SHA256 dc98226f09f0d5533afab8ead191966ec5e33d0cb0bdbeec14871a62f1600f43 SHA512 8f02e710c579ea25897000a379a845ff08974acd72056bc66d659375e87718b1fdea38dec9c1b41e130394bffc125c031e549471be1b1c9d7ab02f406dd3ca89 WHIRLPOOL 65d862de3bddd875ed4b9cef3491b9c64aaa99440fc6a002497380249480c6f7d42c1212399785864b5868127e97945e73061f8680bf9a7399cd4168fc846689 -EBUILD icedtea-6.1.11.4.ebuild 10658 SHA256 19ea3f41b2620d9a97fce30397a46f14fa7657752589e9c4cd0f48aa5b05f535 SHA512 5c4832dd34fe57c9ffd87d407705e2eee48faf5aa8ae06b5920520e0227ef5ece531c9c997b2ea4f2f67f94bada8e9290f21d0aa1f15966a087a771004b27507 WHIRLPOOL 04a4e13fb14c6fafd3c9144803c46ffcfca3ca6f38ac84168266cccdb125a879e659def75843ce1fb1fa578c3c4d71a1f789e126aedfe939a9bbe7313d95efa3 -EBUILD icedtea-7.2.1.1.ebuild 11129 SHA256 c1ab2a1dd5e22951dbc6f59661ebb1d35659cb64d85793af1d1a6b16119d15a5 SHA512 472a37734ea9623e6bccaa3dea7cce85f445a85adc61bcd5948490c79d8381af60102bd831f5de3f0b5df135163d9f5efb1409994be666602a232ab5fb4672a8 WHIRLPOOL 1fcd0e256a7e281b4e0590de33bc95399d2a16c532ecaf244d597609050a080e9f59a38aaafa651c01f3ca2db9f4fd3816cbba9e620dcf0b09442bc6194112ca -EBUILD icedtea-7.2.1.ebuild 10768 SHA256 8dce1934db92cf728673fcfb12462e1e2852c9e5209d286b3bb80d32f551c364 SHA512 6632e0413e49f95cdc0922e0806a6c5b3723709ad699befd51dd8c1e13cede4835f55d64152f3b8977e1d6aeaa8259246c14113bde05e0d015b0c205e604458c WHIRLPOOL 54fb84fc46df593feccd0032cbcf4c2276511939fdd293f42783239ed52d373d81924a777ff68fd956423c3b57ddd85cfb780a7381c78730a5cfb54ae23054eb -EBUILD icedtea-7.2.2.1.ebuild 11201 SHA256 1e3db28f19f09c592cb6d549f5d072a4a49dbf706562f6b1af4866cfa3710fbe SHA512 d3c4d8adb9a0f89436eedf3823deb7a6fbab617ac8cca8609720dd2456eab61d6566cc7ce9c506b3fdd813d05ea30df4f8503b37a54fa6e6114e2255f97c27b5 WHIRLPOOL d86d1e6d137a3b52aea1973b5db78fac79f54f7c1e8f4884d8648363a75f6021ecfda0c62f8a0ecd991e410d1f75a8f1bfc23198074ed36de6f570398419dfeb -EBUILD icedtea-7.2.2.ebuild 10670 SHA256 c05c67f616b5354f09d9aa43a254c15fd56db22dde9a7661d9d86e0a1eee7127 SHA512 536f9a47e8d57646764c6199d84d0e0ac4185acbc9d23d14c9c297e873d5ff69a3085337ed5c381f6d6f578b492f2ce5ce71bb234446184071f29b39def6c00d WHIRLPOOL b1f4b36d12e848fdf9faaf0d01e1ab11f08937bd4e37c6af5d23137eab5c7083de5e306eb2c45d5f87650ee24dcadf980c49b614c50fbbbe1003686a547f519e -EBUILD icedtea-7.2.3.1.ebuild 10874 SHA256 42637f783f2c46cffa8cc46c7c20e33ff8b4e6c974948abb9aab03d0ce47650d SHA512 7ad11bcfff1c816d6dfb9e0f6db42a73ae940afa6dc88133252c146046e4e51645d2dab4bb424e1b1e26258d2f8e72a32800d37dae509602a4c516b9aa783c2a WHIRLPOOL d2017c5de59daacdf489437925b910ceb7cac5586982706990de1637fe12c0332d2e0623669ed7738ac862fd99c98713aa066afe1025a8e28efed0ab9476a427 -EBUILD icedtea-7.2.3.2.ebuild 10874 SHA256 274ec1d7ee0eb4c66480ccd5b19e00b52cb349dbace40d967e295529dfab1e8c SHA512 8463af24a2e4cec8b4adaa135b826c9dc8c4c5ffd9abf5a62c2ca1040c0ec7d7bdbe0b362a7b44675d18896d75fbb163bd9022780e03c71a4f18cc3c2c9ea1bf WHIRLPOOL c815c29ab4baeb6123aebf05ce8f8a63c756204f106feab6bd880365466105ef95e4917c9eb0ef55a72b941d1f8a4914c18a5ce73536a973df5fd96e1103f971 -MISC ChangeLog 18055 SHA256 7885e96cc5d5ca76e8ee259adef5f91338d58cdf5cca671b51d975d2bd994820 SHA512 651e914fc03560a857c96c93ba16e971ac457ecc1dc2a6dff5074b35a4c2b550354197998c33bc7a12d794aa94aebc3e05803f696aea62d5a4f60850efeaa9b0 WHIRLPOOL e0b1dac5d088fdc84d146aaeab9e6137bec6571d8b46af2bd5b0c52e89a698b2810af252bb2167beab002357aaa5af1aeb3dc7572166418a40fd113585b52fe2 +EBUILD icedtea-6.1.11.4.ebuild 10656 SHA256 2419cc24cdbc11e8b8d871b1b07d85f77a465fe582d34d04d2909e8391c977fd SHA512 3cae4f0b4605de0805d42b0023f5106c5086a45af527b2b775612cb4ca098d9de8faf2ee5898cecf02ebb1e679c326a172e989b8cfb0650fceaf13a2926bf19d WHIRLPOOL a86dfbbea499871feef686dbaf39a1f471f5451b470c701eadd347cfbb0b351724df4d74905f064ccc52be3f8add3786e9dae3e935a96cba598d34c4ba42e04e +EBUILD icedtea-7.2.3.2.ebuild 10872 SHA256 d6eb5881844ece8507e4f40a54e451188bad807d88bde7d8f095196bacecddf6 SHA512 e63581c31ab36e1775868781c48a31e1acdef43fe6bdffb35a80e3c708ea53586292b18053ce5efdfa91a3557e229b48d8eacc04542078abae1e00f95fbb7ee1 WHIRLPOOL 04eb1f6e4a5245c76e662ee4d372915545ff9cc9905dd26c4a880790834912355a39a9909cc5c2ce7bdc66bbe7033ec9f5e77f63866f6eaa1a75a9b20442a69f +MISC ChangeLog 18989 SHA256 5efc673212929da94f13c486c8e7ba6eac28622d6d06f91b6201de2f85c44d2e SHA512 4c1cb15c966c9bd335f9c588d3292b3cc8223a84136ea8b93d3c68376694420ce1aac57a3aeae6136465c6a2a0ca094ba22589cc6c9c7df57e4dd0053713a6de WHIRLPOOL 27161615d002201c23d8202f68d41b0d55ef86feee71590287dd4f5979af827ce8a439193e71ebdf8be4f8302155a1b3e420f796675e7d964f24186bd19fea65 MISC metadata.xml 1493 SHA256 13532771b5aeb1b23a22b1ea5947feabe6011d567d15e38e676e4045e8adcf12 SHA512 ecd4563d7550be63e20371b67510d16582d661914df3ccad31faa59e173aa51d81a3ae6b19518dfb86bce23f231ad0fc44f042ff187613fe2ec9680f1621061d WHIRLPOOL 3bb02e03a422667191a98bc0cfa695b0f35a565d38b979f413b2a0768d6fea2d47692279433ab85e4871ee5968e81e1e229a09f134f68e0c0966cecb9646a23a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREKAAYFAlBDR3wACgkQtbrAj05h3oSsSwCgkbdMSq4dpPNO60+/IJkNvh8e -xNcAn0156qbUGCkILltUcd4t+ie1F81s -=hBhq +iQEcBAEBCAAGBQJQYsAEAAoJEIUJ+svaV163zL8H/2olw3f+vSUQP6kDNUeaqSLs +KoXoSrkaenYwV1QU9kdl6yoSj82H/J8kNmdXhZ6D+re0qSqlS57wdzTogijzqgSf +8fjQCXOtYl+nFPSa9fEbZ1Kt4tgFjF1rJGEUyQwJ0pBrS0Alq/f5mUwFtIm62JdG +olz+I1jruzxuHNEMhDEEao4FsyYHwsuocmG5jDyUW693jUHEZpbA8y0WBehoiS8K +77qGa9Q2sEu8ZXy/03Bo0nTd7imsSZCo6V8xwVyV0BP6HmLpbt9gUtYlFNgMqHn9 +WlNK0hPv1eCZw609SF3Ng8p85FRApzOksrwOkD+r6+lzhehW8iLeqLzkOIAz7d0= +=GUqA -----END PGP SIGNATURE----- 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 497a67fb17a3..000000000000 --- 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 af13d4250196..000000000000 --- 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-no_suffix.patch b/dev-java/icedtea/files/icedtea-7-no_suffix.patch deleted file mode 100644 index 61bbd09d84ee..000000000000 --- 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.0-explicit-gthread.patch b/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch deleted file mode 100644 index 1f13e07df314..000000000000 --- a/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- acinclude.m4.orig 2012-02-25 15:44:58.208371766 +0100 -+++ acinclude.m4 2012-02-25 15:46:03.592027548 +0100 -@@ -2011,7 +2011,9 @@ - AC_MSG_RESULT(${ENABLE_SYSTEM_GTK}) - if test x"${ENABLE_SYSTEM_GTK}" = "xyes"; then - dnl Check for Gtk+ headers and libraries. -- PKG_CHECK_MODULES(GTK, gtk+-2.0,[GTK_FOUND=yes],[GTK_FOUND=no]) -+ dnl Explicitly include gthread-2.0 to get g_thread_init even on glib 2.32 -+ dnl where it is deprecated. -+ PKG_CHECK_MODULES(GTK, gtk+-2.0 gthread-2.0,[GTK_FOUND=yes],[GTK_FOUND=no]) - if test "x${GTK_FOUND}" = xno - then - AC_MSG_ERROR([Could not find Gtk+; install Gtk+ or build with --disable-system-gtk to use the in-tree headers.]) diff --git a/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch deleted file mode 100644 index 2d8f8ce1c15a..000000000000 --- a/dev-java/icedtea/files/icedtea-7.2.0_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.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch deleted file mode 100644 index c66525332b00..000000000000 --- a/dev-java/icedtea/files/icedtea-7.2.1.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.1-pr986-cacao_memory_fix.patch b/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch deleted file mode 100644 index 17e5f2aa9d45..000000000000 --- a/dev-java/icedtea/files/icedtea-7.2.1.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-no_suffix.patch b/dev-java/icedtea/files/icedtea-7.2.2-no_suffix.patch deleted file mode 100644 index 61bbd09d84ee..000000000000 --- a/dev-java/icedtea/files/icedtea-7.2.2-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.2.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch deleted file mode 100644 index c66525332b00..000000000000 --- a/dev-java/icedtea/files/icedtea-7.2.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.2.1-pr986-cacao_memory_fix.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch deleted file mode 100644 index c76c9f3620ec..000000000000 --- a/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.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/files/icedtea-7.2.2.1-warnings_are_errors.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-warnings_are_errors.patch deleted file mode 100644 index 2822155a2e89..000000000000 --- a/dev-java/icedtea/files/icedtea-7.2.2.1-warnings_are_errors.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 49d8bc4..b20ee99 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -235,7 +235,8 @@ REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java - - # Patch list - --ICEDTEA_PATCHES = -+ICEDTEA_PATCHES = \ -+ patches/warnings-are-errors.patch - - # Conditional patches - -@@ -437,7 +438,9 @@ ICEDTEA_ENV = \ - USE_SYSTEM_CUPS="true" \ - CUPS_LIBS="${CUPS_LIBS}" \ - CUPS_CFLAGS="${CUPS_CFLAGS}" \ -- ALT_STRIP_POLICY=no_strip -+ ALT_STRIP_POLICY=no_strip \ -+ COMPILER_WARNINGS_FATAL="@WARNINGS_ARE_ERRORS@" \ -+ JAVAC_WARNINGS_FATAL="@WARNINGS_ARE_ERRORS@" - - if ENABLE_CACAO - ICEDTEA_ENV += \ -diff --git a/acinclude.m4 b/acinclude.m4 -index f0a336f..3dc4aa0 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2244,3 +2244,23 @@ AC_DEFUN_ONCE([IT_WITH_PAX], - AC_SUBST(PAX_COMMAND) - AC_SUBST(PAX_COMMAND_ARGS) - ]) -+ -+AC_DEFUN_ONCE([IT_WARNINGS_ARE_ERRORS], -+[ -+ AC_MSG_CHECKING([whether to treat warnings as errors.]) -+ AC_ARG_ENABLE([warnings-are-errors], -+ [AS_HELP_STRING(--enable-warnings-are-errors,treat warnings as errors [[default=yes]])], -+ [ -+ if test x"${enableval}" = "xyes"; then -+ WARNINGS_ARE_ERRORS="true" -+ else -+ WARNINGS_ARE_ERRORS="false" -+ fi -+ ], -+ [ -+ dnl use local defaults -+ WARNINGS_ARE_ERRORS= -+ ]) -+ AC_MSG_RESULT([${WARNINGS_ARE_ERRORS}]) -+ AC_SUBST([WARNINGS_ARE_ERRORS]) -+]) -diff --git a/configure.ac b/configure.ac -index 36c9d77..af52bf1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,7 @@ IT_DISABLE_TESTS - IT_DISABLE_HOTSPOT_TESTS - IT_DISABLE_LANGTOOLS_TESTS - IT_DISABLE_JDK_TESTS -+IT_WARNINGS_ARE_ERRORS - - # Use xvfb-run if found to run gui tests (check-jdk). - AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], []) -diff --git a/patches/boot/ecj-opts.patch b/patches/boot/ecj-opts.patch -index 99ed532..284bd37 100644 ---- a/patches/boot/ecj-opts.patch -+++ b/patches/boot/ecj-opts.patch -@@ -5,8 +5,8 @@ diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/jav - PACKAGE = java.nio - LIBRARY = nio - PRODUCT = java ---OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror -+-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial - +OTHER_JAVACFLAGS += -Xlint:serial -Werror -- include $(BUILDDIR)/common/Defs.gmk -- -- NIO_SRC = $(SHARE_SRC)/classes/java/nio -+ ifneq ($(JAVAC_WARNINGS_FATAL),false) -+ OTHER_JAVACFLAGS += -Werror -+ endif -diff --git a/patches/warnings-are-errors.patch b/patches/warnings-are-errors.patch -new file mode 100644 -index 0000000..7fe1e08 ---- /dev/null -+++ b/patches/warnings-are-errors.patch -@@ -0,0 +1,129 @@ -+--- openjdk/hotspot/make/linux/makefiles/adlc.make -++++ openjdk/hotspot/make/linux/makefiles/adlc.make -+@@ -67,8 +67,10 @@ -+ CXXFLAGS += -DASSERT -+ -+ # CFLAGS_WARN holds compiler options to suppress/enable warnings. -+-# Compiler warnings are treated as errors -+-CFLAGS_WARN = -Werror -++# Treat compiler warnings as errors, unless warnings are allowed -++ifneq ($(COMPILER_WARNINGS_FATAL),false) -++ CFLAGS_WARN = -Werror -++endif -+ CFLAGS += $(CFLAGS_WARN) -+ -+ OBJECTNAMES = \ -+--- openjdk/hotspot/make/linux/makefiles/gcc.make -++++ openjdk/hotspot/make/linux/makefiles/gcc.make -+@@ -149,8 +149,10 @@ -+ CFLAGS += -pipe -+ endif -+ -+-# Compiler warnings are treated as errors -+-WARNINGS_ARE_ERRORS = -Werror -++# Treat compiler warnings as errors, unless warnings are allowed -++ifneq ($(COMPILER_WARNINGS_FATAL),false) -++ WARNINGS_ARE_ERRORS = -Werror -++endif -+ -+ # Except for a few acceptable ones -+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit -+--- openjdk/hotspot/make/solaris/makefiles/gcc.make -++++ openjdk/hotspot/make/solaris/makefiles/gcc.make -+@@ -111,8 +111,10 @@ -+ endif -+ -+ -+-# Compiler warnings are treated as errors -+-WARNINGS_ARE_ERRORS = -Werror -++# Treat compiler warnings as errors, unless warnings are allowed -++ifneq ($(COMPILER_WARNINGS_FATAL),false) -++ WARNINGS_ARE_ERRORS = -Werror -++endif -+ # Enable these warnings. See 'info gcc' about details on these options -+ ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare -+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) -+--- openjdk/jdk/make/java/nio/Makefile -++++ openjdk/jdk/make/java/nio/Makefile -+@@ -31,7 +31,10 @@ -+ PACKAGE = java.nio -+ LIBRARY = nio -+ PRODUCT = java -+-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror -++OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -++ifneq ($(JAVAC_WARNINGS_FATAL),false) -++ OTHER_JAVACFLAGS += -Werror -++endif -+ include $(BUILDDIR)/common/Defs.gmk -+ -+ NIO_SRC = $(SHARE_SRC)/classes/java/nio -+--- openjdk/jdk/make/java/sun_nio/Makefile -++++ openjdk/jdk/make/java/sun_nio/Makefile -+@@ -31,7 +31,11 @@ -+ PACKAGE = sun.nio -+ PRODUCT = sun -+ -+-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror -++OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -++ifneq ($(JAVAC_WARNINGS_FATAL),false) -++ OTHER_JAVACFLAGS += -Werror -++endif -++ -+ include $(BUILDDIR)/common/Defs.gmk -+ -+ # -+--- openjdk/jdk/make/sun/native2ascii/Makefile -++++ openjdk/jdk/make/sun/native2ascii/Makefile -+@@ -30,7 +30,10 @@ -+ BUILDDIR = ../.. -+ PACKAGE = sun.tools.native2ascii -+ PRODUCT = sun -+-OTHER_JAVACFLAGS += -Xlint:serial -Werror -++OTHER_JAVACFLAGS += -Xlint:serial -++ifneq ($(JAVAC_WARNINGS_FATAL),false) -++ OTHER_JAVACFLAGS += -Werror -++endif -+ include $(BUILDDIR)/common/Defs.gmk -+ -+ # This program must contain a manifest that defines the execution level -+--- openjdk/jdk/make/sun/nio/cs/Makefile -++++ openjdk/jdk/make/sun/nio/cs/Makefile -+@@ -36,7 +36,10 @@ -+ # This re-directs all the class files to a separate location -+ CLASSDESTDIR = $(TEMPDIR)/classes -+ -+-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror -++OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -++ifneq ($(JAVAC_WARNINGS_FATAL),false) -++ OTHER_JAVACFLAGS += -Werror -++endif -+ include $(BUILDDIR)/common/Defs.gmk -+ -+ # -+--- openjdk/jdk/make/tools/Makefile -++++ openjdk/jdk/make/tools/Makefile -+@@ -29,7 +29,10 @@ -+ -+ BUILDDIR = .. -+ -+-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true JAVAC_WARNINGS_FATAL=true -++SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true -++ifneq ($(JAVAC_WARNINGS_FATAL),false) -++ SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true -++endif -+ include $(BUILDDIR)/common/Defs.gmk -+ -+ # Note: freetypecheck is built by Sanity.gmk if needed -+--- openjdk/langtools/make/Makefile -++++ openjdk/langtools/make/Makefile -+@@ -111,6 +111,10 @@ -+ ANT_OPTIONS += -Ddebug.classfiles=true -+ endif -+ -++ifeq ($(JAVAC_WARNINGS_FATAL),false) -++ ANT_OPTIONS += -Djavac.lint.opts=-Xlint:all,-deprecation -++endif -++ -+ # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) -+ # and the somewhat misnamed CLASS_VERSION (-target NN) -+ ifdef TARGET_CLASS_VERSION diff --git a/dev-java/icedtea/files/icedtea-7.2.3.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.3.1-pax_mark_rmic_java.patch deleted file mode 100644 index c66525332b00..000000000000 --- a/dev-java/icedtea/files/icedtea-7.2.3.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/icedtea-6.1.11.2.ebuild b/dev-java/icedtea/icedtea-6.1.11.2.ebuild deleted file mode 100644 index d5e806fe3d9e..000000000000 --- a/dev-java/icedtea/icedtea-6.1.11.2.ebuild +++ /dev/null @@ -1,316 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.2.ebuild,v 1.1 2012/05/14 16:27:04 sera Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * -# ********************************************************* - -EAPI="4" - -inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx - -ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) -OPENJDK_BUILD="24" -OPENJDK_DATE="14_nov_2011" -OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" -JAXP_TARBALL="jaxp144_03.zip" -JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip" -JAF_TARBALL="jdk6-jaf-b20.zip" -CACAO_TARBALL="cff92704c4e0.tar.gz" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI=" - http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} - http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL} - http://icedtea.classpath.org/download/drops/${JAF_TARBALL} - http://icedtea.classpath.org/download/drops/${JAXP_TARBALL} - !amd64? ( !sparc? ( !x86? ( - http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} - ) ) )" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="6" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" - -IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin - +nss pax_kernel pulseaudio +source systemtap test +webstart" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" -X_COMMON_DEP=" - dev-libs/glib - >=media-libs/freetype-2.3.5 - >=x11-libs/gtk+-2.8:2 - >=x11-libs/libX11-1.1.3 - >=x11-libs/libXext-1.1.1 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXtst-1.0.3" -X_DEPEND=" - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXp-1.0.0 - x11-proto/inputproto - >=x11-proto/xextproto-7.1.1 - x11-proto/xineramaproto - x11-proto/xproto" - -COMMON_DEP=" - >=media-libs/giflib-4.1.6 - >=media-libs/libpng-1.2 - >=sys-libs/zlib-1.2.3 - virtual/jpeg - javascript? ( dev-java/rhino:1.6 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - systemtap? ( >=dev-util/systemtap-1 )" - -# media-fonts/lklug needs ppc ppc64 keywords -RDEPEND="${COMMON_DEP} - !dev-java/icedtea6 - X? ( - ${X_COMMON_DEP} - media-fonts/dejavu - cjk? ( - media-fonts/arphicfonts - media-fonts/baekmuk-fonts - !ppc? ( !ppc64? ( media-fonts/lklug ) ) - media-fonts/lohit-fonts - media-fonts/sazanami - ) - ) - alsa? ( ${ALSA_COMMON_DEP} ) - cups? ( ${CUPS_COMMON_DEP} )" - -# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# xext headers have two variants depending on version - bug #288855 -# !eclipse-ecj-3.7 - bug #392587 -# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} - || ( - >=dev-java/gcj-jdk-4.3 - dev-java/icedtea-bin:6 - dev-java/icedtea:6 - ) - app-arch/cpio - app-arch/unzip - app-arch/zip - app-misc/ca-certificates - >=dev-java/ant-core-1.8.1 - dev-java/ant-nodeps - dev-lang/perl - >=dev-libs/libxslt-1.1.26 - dev-libs/openssl - virtual/pkgconfig - sys-apps/lsb-release - ${X_DEPEND} - jbootstrap? ( - || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj ) - ) - pax_kernel? ( sys-apps/paxctl )" - -PDEPEND="webstart? ( dev-java/icedtea-web:6 ) - nsplugin? ( dev-java/icedtea-web:6[nsplugin] )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM=" - icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin - gcj-jdk" - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack ${ICEDTEA_PKG}.tar.gz -} - -java_prepare() { - # icedtea doesn't like some locales. #330433 #389717 - export LANG="C" LC_ALL="C" - - epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751 - eautoreconf -} - -src_configure() { - local config bootstrap - local vm=$(java-pkg_get-current-vm) - - # IcedTea6 can't be built using IcedTea7; its class files are too new - if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then - use jbootstrap && bootstrap=yes - elif has "${vm}" gcj-jdk; then - # gcj-jdk ensures ecj is present. - use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap" - bootstrap=yes - else - eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}." - die "Install a GNU Classpath JDK (gcj-jdk)" - fi - - if [[ ${bootstrap} ]]; then - config="${config} --enable-bootstrap" - - # icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337 - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - # Don't use eclipse-ecj-3.7 #392587 - local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* ) - ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" ) - if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then - ecj_jar="${ecj_jar%/lib/ecj.jar}" - ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap" - ewarn "Found usable: ${ecj_all[@]##*/}" - ewarn "using ${ecj_all##*/} instead" - ecj_jar="${ecj_all}"/lib/ecj.jar - fi - config="${config} --with-ecj-jar=${ecj_jar}" - else - config="${config} --disable-bootstrap" - fi - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use CACAO - if ! has "${ARCH}" amd64 sparc x86; then - config="${config} --enable-cacao --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}" - fi - - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" - - if use javascript ; then - config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" - else - config="${config} --without-rhino" - fi - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ - --with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \ - --with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \ - --with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable nss) \ - $(use_enable pulseaudio pulse-java) \ - $(use_enable systemtap) \ - $(use_with pax_kernel pax paxctl) -} - -src_compile() { - # Would use GENTOO_VM otherwise. - export ANT_RESPECT_JAVA_HOME=TRUE - - # Load the least that's needed to avoid possible classpath collisions. - export ANT_TASKS="ant-nodeps" - - emake -} - -src_test() { - # Use Xvfb for tests - unset DISPLAY - - Xemake -j1 check -} - -src_install() { - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" - dodir "${dest}" - - dodoc README NEWS AUTHORS THANKYOU - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - - cd openjdk.build/j2sdk-image || die - - # Ensures HeadlessGraphicsEnvironment is used. - if ! use X; then - rm -r jre/lib/$(get_system_arch)/xawt || die - fi - - #402507 - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # doins can't handle symlinks. - cp -vRP bin include jre lib man "${ddest}" || die - - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README - - if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -r ../docs/* || die - fi - - if use examples; then - dodir "${dest}/share"; - cp -vRP demo sample "${ddest}/share/" || die - fi - - if use source; then - cp src.zip "${ddest}" || die - fi - - # Fix the permissions. - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die - - # Needs to be done before generating cacerts - java-vm_set-pax-markings "${ddest}" - - # We need to generate keystore - bug #273306 - einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" - mkdir "${T}/certgen" && cd "${T}/certgen" || die - cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die - for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do - openssl x509 -text -in "${c}" >> all.crt || die - done - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die - cp -vRP cacerts "${ddest}/jre/lib/security/" || die - chmod 644 "${ddest}/jre/lib/security/cacerts" || die - - # Bug 390663 - cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die - eprefixify "${T}"/fontconfig.Gentoo.properties - insinto "${dest}"/jre/lib - doins "${T}"/fontconfig.Gentoo.properties - - set_java_env "${FILESDIR}/icedtea.env" - if ! use X || ! use alsa || ! use cups; then - java-vm_revdep-mask "${dest}" - fi -} - -pkg_preinst() { - if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then - # portage would preserve the symlink otherwise, related to bug #384397 - rm -f "${EROOT}/usr/lib/jvm/icedtea6" - elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*" - elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1" - elog "If you had icedtea6 as system VM, the change should be automatic, however" - elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" - elog "and the same holds for any user VM settings. Sorry for the inconvenience." - fi -} diff --git a/dev-java/icedtea/icedtea-6.1.11.3.ebuild b/dev-java/icedtea/icedtea-6.1.11.3.ebuild deleted file mode 100644 index c8a5d84aea36..000000000000 --- a/dev-java/icedtea/icedtea-6.1.11.3.ebuild +++ /dev/null @@ -1,336 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.3.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * -# ********************************************************* - -EAPI="4" - -inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx - -ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) -OPENJDK_BUILD="24" -OPENJDK_DATE="14_nov_2011" -OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" -JAXP_TARBALL="jaxp144_03.zip" -JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip" -JAF_TARBALL="jdk6-jaf-b20.zip" -CACAO_TARBALL="cff92704c4e0.tar.gz" -JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI=" - http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} - http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL} - http://icedtea.classpath.org/download/drops/${JAF_TARBALL} - http://icedtea.classpath.org/download/drops/${JAXP_TARBALL} - http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} - http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="6" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" - -IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin - +nss pax_kernel pulseaudio +source systemtap test +webstart" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" -X_COMMON_DEP=" - dev-libs/glib - >=media-libs/freetype-2.3.5 - >=x11-libs/gtk+-2.8:2 - >=x11-libs/libX11-1.1.3 - >=x11-libs/libXext-1.1.1 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXtst-1.0.3" -X_DEPEND=" - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXp-1.0.0 - x11-proto/inputproto - >=x11-proto/xextproto-7.1.1 - x11-proto/xineramaproto - x11-proto/xproto" - -COMMON_DEP=" - >=media-libs/giflib-4.1.6 - >=media-libs/libpng-1.2 - >=sys-libs/zlib-1.2.3 - virtual/jpeg - javascript? ( dev-java/rhino:1.6 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - systemtap? ( >=dev-util/systemtap-1 )" - -# media-fonts/lklug needs ppc ppc64 keywords -RDEPEND="${COMMON_DEP} - !dev-java/icedtea6 - X? ( - ${X_COMMON_DEP} - media-fonts/dejavu - cjk? ( - media-fonts/arphicfonts - media-fonts/baekmuk-fonts - !ppc? ( !ppc64? ( media-fonts/lklug ) ) - media-fonts/lohit-fonts - media-fonts/sazanami - ) - ) - alsa? ( ${ALSA_COMMON_DEP} ) - cups? ( ${CUPS_COMMON_DEP} )" - -# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# xext headers have two variants depending on version - bug #288855 -# !eclipse-ecj-3.7 - bug #392587 -# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} - || ( - >=dev-java/gcj-jdk-4.3 - dev-java/icedtea-bin:6 - dev-java/icedtea:6 - ) - app-arch/cpio - app-arch/unzip - app-arch/zip - app-misc/ca-certificates - >=dev-java/ant-core-1.8.1 - dev-java/ant-nodeps - dev-lang/perl - >=dev-libs/libxslt-1.1.26 - dev-libs/openssl - virtual/pkgconfig - sys-apps/lsb-release - ${X_DEPEND} - jbootstrap? ( - || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj ) - ) - pax_kernel? ( sys-apps/paxctl )" - -PDEPEND="webstart? ( dev-java/icedtea-web:6 ) - nsplugin? ( dev-java/icedtea-web:6[nsplugin] )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM=" - icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin - gcj-jdk" - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack ${ICEDTEA_PKG}.tar.gz -} - -java_prepare() { - # icedtea doesn't like some locales. #330433 #389717 - export LANG="C" LC_ALL="C" - - epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751 #422525 - epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch - eautoreconf -} - -bootstrap_impossible() { - # Fill this according to testing what works and what not - has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 -} - -src_configure() { - local config bootstrap enable_cacao - local vm=$(java-pkg_get-current-vm) - - # IcedTea6 can't be built using IcedTea7; its class files are too new - # Whether to bootstrap - bootstrap="disable" - if use jbootstrap; then - if bootstrap_impossible "${vm}"; then - einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap" - else - bootstrap="enable" - fi - fi - - if has "${vm}" gcj-jdk; then - # gcj-jdk ensures ecj is present. - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" - bootstrap="enable" - fi - - config="${config} --${bootstrap}-bootstrap" - - if [[ ${bootstrap} == enable ]]; then - # icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337 - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - # Don't use eclipse-ecj-3.7 #392587 - local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* ) - ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" ) - if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then - ecj_jar="${ecj_jar%/lib/ecj.jar}" - ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap" - ewarn "Found usable: ${ecj_all[@]##*/}" - ewarn "using ${ecj_all##*/} instead" - ecj_jar="${ecj_all}"/lib/ecj.jar - fi - config="${config} --with-ecj-jar=${ecj_jar}" - fi - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use CACAO - if ! has "${ARCH}" amd64 sparc x86; then - enable_cacao=yes - elif use cacao; then - ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.' - ewarn 'If so, please rebuild with USE="-cacao"' - enable_cacao=yes - fi - - if [[ ${enable_cacao} ]]; then - config="${config} --enable-cacao" - fi - - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" - - if use javascript ; then - config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" - else - config="${config} --without-rhino" - fi - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ - --with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \ - --with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \ - --with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \ - --with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \ - --with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable nss) \ - $(use_enable pulseaudio pulse-java) \ - $(use_enable systemtap) \ - $(use_with pax_kernel pax paxctl) -} - -src_compile() { - # Would use GENTOO_VM otherwise. - export ANT_RESPECT_JAVA_HOME=TRUE - - # Load the least that's needed to avoid possible classpath collisions. - export ANT_TASKS="ant-nodeps" - - emake -} - -src_test() { - # Use Xvfb for tests - unset DISPLAY - - Xemake check -} - -src_install() { - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" - dodir "${dest}" - - dodoc README NEWS AUTHORS THANKYOU - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - docompress -x /usr/share/doc/${PN}${SLOT} - - cd openjdk.build/j2sdk-image || die - - # Ensures HeadlessGraphicsEnvironment is used. - if ! use X; then - rm -r jre/lib/$(get_system_arch)/xawt || die - fi - - #402507 - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # doins can't handle symlinks. - cp -vRP bin include jre lib man "${ddest}" || die - - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README - - if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -r ../docs/* || die - fi - - if use examples; then - dodir "${dest}/share"; - cp -vRP demo sample "${ddest}/share/" || die - fi - - if use source; then - cp src.zip "${ddest}" || die - fi - - # Fix the permissions. - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die - - # Needs to be done before generating cacerts - java-vm_set-pax-markings "${ddest}" - - # We need to generate keystore - bug #273306 - einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" - mkdir "${T}/certgen" && cd "${T}/certgen" || die - cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die - for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do - openssl x509 -text -in "${c}" >> all.crt || die - done - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die - cp -vRP cacerts "${ddest}/jre/lib/security/" || die - chmod 644 "${ddest}/jre/lib/security/cacerts" || die - - # Bug 390663 - cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die - eprefixify "${T}"/fontconfig.Gentoo.properties - insinto "${dest}"/jre/lib - doins "${T}"/fontconfig.Gentoo.properties - - set_java_env "${FILESDIR}/icedtea.env" - if ! use X || ! use alsa || ! use cups; then - java-vm_revdep-mask "${dest}" - fi -} - -pkg_preinst() { - if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then - # portage would preserve the symlink otherwise, related to bug #384397 - rm -f "${EROOT}/usr/lib/jvm/icedtea6" - elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*" - elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1" - elog "If you had icedtea6 as system VM, the change should be automatic, however" - elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" - elog "and the same holds for any user VM settings. Sorry for the inconvenience." - fi -} diff --git a/dev-java/icedtea/icedtea-6.1.11.4.ebuild b/dev-java/icedtea/icedtea-6.1.11.4.ebuild index 19d3fc557cdb..1146ddaa77e3 100644 --- a/dev-java/icedtea/icedtea-6.1.11.4.ebuild +++ b/dev-java/icedtea/icedtea-6.1.11.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.4.ebuild,v 1.1 2012/09/02 11:48:02 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.4.ebuild,v 1.2 2012/09/26 08:42:27 sera Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -213,7 +213,7 @@ src_configure() { einfo "Configuring using --with-parallel-jobs=${procs}" if use javascript ; then - config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" + config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" else config="${config} --without-rhino" fi diff --git a/dev-java/icedtea/icedtea-7.2.1.1.ebuild b/dev-java/icedtea/icedtea-7.2.1.1.ebuild deleted file mode 100644 index d795b20cd88c..000000000000 --- a/dev-java/icedtea/icedtea-7.2.1.1.ebuild +++ /dev/null @@ -1,340 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.1.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * -# ********************************************************* - -EAPI="4" - -inherit 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) -ICEDTEA_PKG=icedtea-${ICEDTEA_VER} -OPENJDK_TARBALL="22cc03983e20.tar.gz" -CORBA_TARBALL="338c21646c76.tar.gz" -HOTSPOT_TARBALL="8b7c4c5f6ba9.tar.gz" -JAXP_TARBALL="7a8825b15df6.tar.gz" -JAXWS_TARBALL="7edfbfe974f2.tar.gz" -JDK_TARBALL="d5ddeffc4651.tar.gz" -LANGTOOLS_TARBALL="b534c4c6cd9b.tar.gz" -CACAO_TARBALL="a567bcb7f589.tar.gz" -JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI=" - http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL} - http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} - http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="7" -KEYWORDS="~amd64 ~ia64 ~x86" - -IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin - +nss pax_kernel pulseaudio +source systemtap test +webstart" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" -X_COMMON_DEP=" - >=dev-libs/atk-1.30.0 - >=dev-libs/glib-2.26 - media-libs/fontconfig - >=media-libs/freetype-2.3.5 - >=x11-libs/cairo-1.8.8 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.8:2 - >=x11-libs/libX11-1.1.3 - >=x11-libs/libXext-1.1.1 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXtst-1.0.3 - >=x11-libs/pango-1.24.5" -X_DEPEND=" - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXp-1.0.0 - x11-proto/inputproto - >=x11-proto/xextproto-7.1.1 - x11-proto/xineramaproto - x11-proto/xproto" - -COMMON_DEP=" - >=media-libs/giflib-4.1.6 - media-libs/lcms:2 - >=media-libs/libpng-1.2 - >=sys-libs/zlib-1.2.3 - virtual/jpeg - javascript? ( dev-java/rhino:1.6 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - systemtap? ( >=dev-util/systemtap-1 )" - -# cups is needed for X. #390945 #390975 -RDEPEND="${COMMON_DEP} - !dev-java/icedtea:0 - X? ( - ${CUPS_COMMON_DEP} - ${X_COMMON_DEP} - media-fonts/dejavu - cjk? ( - media-fonts/arphicfonts - media-fonts/baekmuk-fonts - media-fonts/lklug - media-fonts/lohit-fonts - media-fonts/sazanami - ) - ) - alsa? ( ${ALSA_COMMON_DEP} ) - cups? ( ${CUPS_COMMON_DEP} )" - -# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# xext headers have two variants depending on version - bug #288855 -# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} - || ( - >=dev-java/gcj-jdk-4.3 - dev-java/icedtea-bin:7 - dev-java/icedtea-bin:6 - dev-java/icedtea:7 - dev-java/icedtea:6 - ) - app-arch/cpio - app-arch/unzip - app-arch/zip - app-misc/ca-certificates - >=dev-java/ant-core-1.8.1 - dev-java/ant-nodeps - dev-lang/perl - >=dev-libs/libxslt-1.1.26 - dev-libs/openssl - virtual/pkgconfig - sys-apps/attr - sys-apps/lsb-release - ${X_DEPEND} - pax_kernel? ( sys-apps/paxctl )" - -PDEPEND="webstart? ( dev-java/icedtea-web:7 ) - nsplugin? ( dev-java/icedtea-web:7[nsplugin] )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM=" - icedtea-7 icedtea-bin-7 icedtea7 - icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin - gcj-jdk" - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack ${ICEDTEA_PKG}.tar.gz -} - -java_prepare() { - # For bootstrap builds as the sandbox control file might not yet exist. - addpredict /proc/self/coredump_filter - - # icedtea doesn't like some locales. #330433 #389717 - export LANG="C" LC_ALL="C" - - epatch "${FILESDIR}"/${PN}-7.2.0_pax_kernel_support.patch #389751 - epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch - epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch - epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch - epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525 - eautoreconf -} - -bootstrap_impossible() { - # Fill this according to testing what works and what not - has "${1}" icedtea7 icedtea-7 icedtea-bin-7 icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 -} - -src_configure() { - local config bootstrap - local vm=$(java-pkg_get-current-vm) - - # Whether to bootstrap - bootstrap="disable" - if use jbootstrap; then - if bootstrap_impossible "${vm}"; then - einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap" - else - bootstrap="enable" - fi - fi - - if has "${vm}" gcj-jdk; then - # gcj-jdk ensures ecj is present. - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" - bootstrap="enable" - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - config="${config} --with-ecj-jar=${ecj_jar}" - fi - - config="${config} --${bootstrap}-bootstrap" - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use JamVM as it's the only possibility right now - if ! has "${ARCH}" amd64 sparc x86; then - config="${config} --enable-jamvm" - fi - - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" - - if use javascript ; then - config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" - else - config="${config} --without-rhino" - fi - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ - --with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \ - --with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \ - --with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \ - --with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \ - --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \ - --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \ - --with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \ - --with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable nss) \ - $(use_enable pulseaudio pulse-java) \ - $(use_enable systemtap) \ - $(use_with pax_kernel pax paxctl) -} - -src_compile() { - # Would use GENTOO_VM otherwise. - export ANT_RESPECT_JAVA_HOME=TRUE - - # Load the least that's needed to avoid possible classpath collisions. - export ANT_TASKS="ant-nodeps" - - emake -j 1 -} - -src_test() { - # Use Xvfb for tests - unset DISPLAY - - Xemake -j1 check -} - -src_install() { - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" - dodir "${dest}" - - dodoc README NEWS AUTHORS - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - docompress -x /usr/share/doc/${PN}${SLOT} - - cd openjdk.build/j2sdk-image || die - - # Ensures HeadlessGraphicsEnvironment is used. - if ! use X; then - rm -r jre/lib/$(get_system_arch)/xawt || die - fi - - # Don't hide classes - rm lib/ct.sym || die - - #402507 - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # doins can't handle symlinks. - cp -vRP bin include jre lib man "${ddest}" || die - - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README - - if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -r ../docs/* || die - fi - - if use examples; then - dodir "${dest}/share"; - cp -vRP demo sample "${ddest}/share/" || die - fi - - if use source; then - cp src.zip "${ddest}" || die - fi - - # Fix the permissions. - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die - - # Needs to be done before generating cacerts - java-vm_set-pax-markings "${ddest}" - - # We need to generate keystore - bug #273306 - einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" - mkdir "${T}/certgen" && cd "${T}/certgen" || die - cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die - for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do - openssl x509 -text -in "${c}" >> all.crt || die - done - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die - cp -vRP cacerts "${ddest}/jre/lib/security/" || die - chmod 644 "${ddest}/jre/lib/security/cacerts" || die - - # OpenJDK7 should be able to use fontconfig instead, but wont hurt to - # install it anyway. Bug 390663 - cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die - eprefixify "${T}"/fontconfig.Gentoo.properties - insinto "${dest}"/jre/lib - doins "${T}"/fontconfig.Gentoo.properties - - set_java_env "${FILESDIR}/icedtea.env" - if ! use X || ! use alsa || ! use cups; then - java-vm_revdep-mask "${dest}" - fi - java-vm_sandbox-predict /proc/self/coredump_filter -} - -pkg_preinst() { - if has_version "<=dev-java/icedtea-7.2.0:7"; then - # portage would preserve the symlink otherwise, related to bug #384397 - rm -f "${EROOT}/usr/lib/jvm/icedtea7" - elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*" - elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1" - elog "If you had icedtea7 as system VM, the change should be automatic, however" - elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" - elog "and the same holds for any user VM settings. Sorry for the inconvenience." - fi -} diff --git a/dev-java/icedtea/icedtea-7.2.1.ebuild b/dev-java/icedtea/icedtea-7.2.1.ebuild deleted file mode 100644 index 1e79a2d6397b..000000000000 --- a/dev-java/icedtea/icedtea-7.2.1.ebuild +++ /dev/null @@ -1,334 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.ebuild,v 1.4 2012/05/03 07:42:50 jdhore Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * -# ********************************************************* - -EAPI="4" - -inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx - -ICEDTEA_VER=$(get_version_component_range 2-) -ICEDTEA_PKG=icedtea-${ICEDTEA_VER} -OPENJDK_TARBALL="22cc03983e20.tar.gz" -CORBA_TARBALL="5617f6c5cc94.tar.gz" -HOTSPOT_TARBALL="0e651e004747.tar.gz" -JAXP_TARBALL="1cf75c0e2c96.tar.gz" -JAXWS_TARBALL="7edfbfe974f2.tar.gz" -JDK_TARBALL="50f6f276a06c.tar.gz" -LANGTOOLS_TARBALL="b534c4c6cd9b.tar.gz" -JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI=" - http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/archive/${OPENJDK_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/corba/archive/${CORBA_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxp/archive/${JAXP_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxws/archive/${JAXWS_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jdk/archive/${JDK_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/hotspot/archive/${HOTSPOT_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/langtools/archive/${LANGTOOLS_TARBALL} - !amd64? ( !sparc? ( !x86? ( - http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} - ) ) )" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="7" -KEYWORDS="~amd64 ~ia64 ~x86" - -IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin - +nss pax_kernel pulseaudio +source systemtap test +webstart" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" -X_COMMON_DEP=" - >=dev-libs/atk-1.30.0 - >=dev-libs/glib-2.26 - media-libs/fontconfig - >=media-libs/freetype-2.3.5 - >=x11-libs/cairo-1.8.8 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.8:2 - >=x11-libs/libX11-1.1.3 - >=x11-libs/libXext-1.1.1 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXtst-1.0.3 - >=x11-libs/pango-1.24.5" -X_DEPEND=" - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXp-1.0.0 - x11-proto/inputproto - >=x11-proto/xextproto-7.1.1 - x11-proto/xineramaproto - x11-proto/xproto" - -COMMON_DEP=" - >=media-libs/giflib-4.1.6 - media-libs/lcms:2 - >=media-libs/libpng-1.2 - >=sys-libs/zlib-1.2.3 - virtual/jpeg - javascript? ( dev-java/rhino:1.6 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - systemtap? ( >=dev-util/systemtap-1 )" - -# cups is needed for X. #390945 #390975 -RDEPEND="${COMMON_DEP} - !dev-java/icedtea:0 - X? ( - ${CUPS_COMMON_DEP} - ${X_COMMON_DEP} - media-fonts/dejavu - cjk? ( - media-fonts/arphicfonts - media-fonts/baekmuk-fonts - media-fonts/lklug - media-fonts/lohit-fonts - media-fonts/sazanami - ) - ) - alsa? ( ${ALSA_COMMON_DEP} ) - cups? ( ${CUPS_COMMON_DEP} )" - -# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# xext headers have two variants depending on version - bug #288855 -# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} - || ( - >=dev-java/gcj-jdk-4.3 - dev-java/icedtea-bin:7 - dev-java/icedtea-bin:6 - dev-java/icedtea:7 - dev-java/icedtea:6 - ) - app-arch/cpio - app-arch/unzip - app-arch/zip - app-misc/ca-certificates - >=dev-java/ant-core-1.8.1 - dev-java/ant-nodeps - dev-lang/perl - >=dev-libs/libxslt-1.1.26 - dev-libs/openssl - virtual/pkgconfig - sys-apps/attr - sys-apps/lsb-release - || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) - ${X_DEPEND} - pax_kernel? ( sys-apps/paxctl )" - -PDEPEND="webstart? ( dev-java/icedtea-web:7 ) - nsplugin? ( dev-java/icedtea-web:7[nsplugin] )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM=" - icedtea-7 icedtea-bin-7 icedtea7 - icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin - gcj-jdk" - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack ${ICEDTEA_PKG}.tar.gz -} - -java_prepare() { - # For bootstrap builds as the sandbox control file might not yet exist. - addpredict /proc/self/coredump_filter - - # icedtea doesn't like some locales. #330433 #389717 - export LANG="C" LC_ALL="C" - - epatch "${FILESDIR}"/${PN}-7.2.0_pax_kernel_support.patch #389751 - epatch "${FILESDIR}"/${PN}-7.2.0-explicit-gthread.patch #402481 - eautoreconf -} - -bootstrap_impossible() { - # Fill this according to testing what works and what not - has "${1}" icedtea7 icedtea-7 icedtea-bin-7 icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 -} - -src_configure() { - local config bootstrap - local vm=$(java-pkg_get-current-vm) - - # Whether to bootstrap - bootstrap="disable" - if use jbootstrap; then - if bootstrap_impossible "${vm}"; then - einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap" - else - bootstrap="enable" - fi - fi - - if has "${vm}" gcj-jdk; then - # gcj-jdk ensures ecj is present. - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" - bootstrap="enable" - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - config="${config} --with-ecj-jar=${ecj_jar}" - fi - - config="${config} --${bootstrap}-bootstrap" - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use JamVM as it's the only possibility right now - if ! has "${ARCH}" amd64 sparc x86; then - config="${config} --enable-jamvm --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}" - fi - - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" - - if use javascript ; then - config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" - else - config="${config} --without-rhino" - fi - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ - --with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \ - --with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \ - --with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \ - --with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \ - --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \ - --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable nss) \ - $(use_enable pulseaudio pulse-java) \ - $(use_enable systemtap) \ - $(use_with pax_kernel pax paxctl) -} - -src_compile() { - # Would use GENTOO_VM otherwise. - export ANT_RESPECT_JAVA_HOME=TRUE - - # Load the least that's needed to avoid possible classpath collisions. - export ANT_TASKS="ant-nodeps" - - emake -j 1 -} - -src_test() { - # Use Xvfb for tests - unset DISPLAY - - Xemake -j1 check -} - -src_install() { - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" - dodir "${dest}" - - dodoc README NEWS AUTHORS - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - - cd openjdk.build/j2sdk-image || die - - # Ensures HeadlessGraphicsEnvironment is used. - if ! use X; then - rm -r jre/lib/$(get_system_arch)/xawt || die - fi - - # Don't hide classes - rm lib/ct.sym || die - - #402507 - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # doins can't handle symlinks. - cp -vRP bin include jre lib man "${ddest}" || die - - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README - - if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -r ../docs/* || die - fi - - if use examples; then - dodir "${dest}/share"; - cp -vRP demo sample "${ddest}/share/" || die - fi - - if use source; then - cp src.zip "${ddest}" || die - fi - - # Fix the permissions. - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die - - # Needs to be done before generating cacerts - java-vm_set-pax-markings "${ddest}" - - # We need to generate keystore - bug #273306 - einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" - mkdir "${T}/certgen" && cd "${T}/certgen" || die - cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die - for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do - openssl x509 -text -in "${c}" >> all.crt || die - done - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die - cp -vRP cacerts "${ddest}/jre/lib/security/" || die - chmod 644 "${ddest}/jre/lib/security/cacerts" || die - - # OpenJDK7 should be able to use fontconfig instead, but wont hurt to - # install it anyway. Bug 390663 - cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die - eprefixify "${T}"/fontconfig.Gentoo.properties - insinto "${dest}"/jre/lib - doins "${T}"/fontconfig.Gentoo.properties - - set_java_env "${FILESDIR}/icedtea.env" - if ! use X || ! use alsa || ! use cups; then - java-vm_revdep-mask "${dest}" - fi - java-vm_sandbox-predict /proc/self/coredump_filter -} - -pkg_preinst() { - if has_version "<=dev-java/icedtea-7.2.0:7"; then - # portage would preserve the symlink otherwise, related to bug #384397 - rm -f "${EROOT}/usr/lib/jvm/icedtea7" - elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*" - elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1" - elog "If you had icedtea7 as system VM, the change should be automatic, however" - elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" - elog "and the same holds for any user VM settings. Sorry for the inconvenience." - fi -} diff --git a/dev-java/icedtea/icedtea-7.2.2.1.ebuild b/dev-java/icedtea/icedtea-7.2.2.1.ebuild deleted file mode 100644 index 655481fce78a..000000000000 --- a/dev-java/icedtea/icedtea-7.2.2.1.ebuild +++ /dev/null @@ -1,343 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.2.1.ebuild,v 1.3 2012/06/27 19:08:57 sera Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * -# ********************************************************* - -EAPI="4" - -inherit 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) -ICEDTEA_PKG=icedtea-${ICEDTEA_VER} -OPENJDK_TARBALL="0b776ef59474.tar.gz" -CORBA_TARBALL="38deb372c569.tar.gz" -HOTSPOT_TARBALL="889dffcf4a54.tar.gz" -JAXP_TARBALL="335fb0b059b7.tar.gz" -JAXWS_TARBALL="5471e01ef43b.tar.gz" -JDK_TARBALL="6c3b742b735d.tar.gz" -LANGTOOLS_TARBALL="beea46c7086b.tar.gz" -CACAO_TARBALL="a567bcb7f589.tar.gz" -JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI=" - http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL} - http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} - http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="7" -KEYWORDS="~amd64 ~ia64 ~x86" - -IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin - +nss pax_kernel pulseaudio +source systemtap test +webstart" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" -X_COMMON_DEP=" - >=dev-libs/atk-1.30.0 - >=dev-libs/glib-2.26 - media-libs/fontconfig - >=media-libs/freetype-2.3.5 - >=x11-libs/cairo-1.8.8 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.8:2 - >=x11-libs/libX11-1.1.3 - >=x11-libs/libXext-1.1.1 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXtst-1.0.3 - >=x11-libs/pango-1.24.5" -X_DEPEND=" - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXp-1.0.0 - x11-proto/inputproto - >=x11-proto/xextproto-7.1.1 - x11-proto/xineramaproto - x11-proto/xproto" - -COMMON_DEP=" - >=media-libs/giflib-4.1.6 - media-libs/lcms:2 - >=media-libs/libpng-1.2 - >=sys-libs/zlib-1.2.3 - virtual/jpeg - javascript? ( dev-java/rhino:1.6 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - systemtap? ( >=dev-util/systemtap-1 )" - -# cups is needed for X. #390945 #390975 -RDEPEND="${COMMON_DEP} - !dev-java/icedtea:0 - X? ( - ${CUPS_COMMON_DEP} - ${X_COMMON_DEP} - media-fonts/dejavu - cjk? ( - media-fonts/arphicfonts - media-fonts/baekmuk-fonts - media-fonts/lklug - media-fonts/lohit-fonts - media-fonts/sazanami - ) - ) - alsa? ( ${ALSA_COMMON_DEP} ) - cups? ( ${CUPS_COMMON_DEP} )" - -# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# xext headers have two variants depending on version - bug #288855 -# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} - || ( - >=dev-java/gcj-jdk-4.3 - dev-java/icedtea-bin:7 - dev-java/icedtea-bin:6 - dev-java/icedtea:7 - dev-java/icedtea:6 - ) - app-arch/cpio - app-arch/unzip - app-arch/zip - app-misc/ca-certificates - >=dev-java/ant-core-1.8.1 - dev-java/ant-nodeps - dev-lang/perl - >=dev-libs/libxslt-1.1.26 - dev-libs/openssl - virtual/pkgconfig - sys-apps/attr - sys-apps/lsb-release - ${X_DEPEND} - pax_kernel? ( sys-apps/paxctl )" - -PDEPEND="webstart? ( dev-java/icedtea-web:7 ) - nsplugin? ( dev-java/icedtea-web:7[nsplugin] )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM=" - icedtea-7 icedtea-bin-7 icedtea7 - icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin - gcj-jdk" - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack ${ICEDTEA_PKG}.tar.gz -} - -java_prepare() { - # For bootstrap builds as the sandbox control file might not yet exist. - addpredict /proc/self/coredump_filter - - # icedtea doesn't like some locales. #330433 #389717 - export LANG="C" LC_ALL="C" - - epatch "${FILESDIR}"/${PN}-${SLOT}-no_suffix.patch - epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch - epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch - epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch - epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525 - epatch "${FILESDIR}"/${P}-warnings_are_errors.patch #310503 #418359 - eautoreconf -} - -bootstrap_impossible() { - # Fill this according to testing what works and what not - has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 -} - -src_configure() { - local config bootstrap - local vm=$(java-pkg_get-current-vm) - - # Whether to bootstrap - bootstrap="disable" - if use jbootstrap; then - if bootstrap_impossible "${vm}"; then - einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap" - else - bootstrap="enable" - fi - fi - - if has "${vm}" gcj-jdk; then - # gcj-jdk ensures ecj is present. - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" - bootstrap="enable" - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - config="${config} --with-ecj-jar=${ecj_jar}" - fi - - config="${config} --${bootstrap}-bootstrap" - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use JamVM as it's the only possibility right now - if ! has "${ARCH}" amd64 sparc x86; then - config="${config} --enable-jamvm" - fi - - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" - - if use javascript ; then - config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" - else - config="${config} --without-rhino" - fi - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ - --with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \ - --with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \ - --with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \ - --with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \ - --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \ - --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \ - --with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \ - --with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ - --disable-downloading \ - --disable-warnings-are-errors \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable nss) \ - $(use_enable pulseaudio pulse-java) \ - $(use_enable systemtap) \ - $(use_with pax_kernel pax paxctl) -} - -src_compile() { - # Would use GENTOO_VM otherwise. - export ANT_RESPECT_JAVA_HOME=TRUE - - # Load the least that's needed to avoid possible classpath collisions. - export ANT_TASKS="ant-nodeps" - - emake -} - -src_test() { - # Use Xvfb for tests - unset DISPLAY - - Xemake check -} - -src_install() { - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" - dodir "${dest}" - - dodoc README NEWS AUTHORS - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - docompress -x /usr/share/doc/${PN}${SLOT} - - cd openjdk.build/j2sdk-image || die - - # Ensures HeadlessGraphicsEnvironment is used. - if ! use X; then - rm -r jre/lib/$(get_system_arch)/xawt || die - fi - - # Don't hide classes - rm lib/ct.sym || die - - #402507 - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # doins can't handle symlinks. - cp -vRP bin include jre lib man "${ddest}" || die - - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README - - if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -r ../docs/* || die - fi - - if use examples; then - dodir "${dest}/share"; - cp -vRP demo sample "${ddest}/share/" || die - fi - - if use source; then - cp src.zip "${ddest}" || die - fi - - # Fix the permissions. - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die - - # Needs to be done before generating cacerts - java-vm_set-pax-markings "${ddest}" - - # We need to generate keystore - bug #273306 - einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" - mkdir "${T}/certgen" && cd "${T}/certgen" || die - cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die - for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do - openssl x509 -text -in "${c}" >> all.crt || die - done - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die - cp -vRP cacerts "${ddest}/jre/lib/security/" || die - chmod 644 "${ddest}/jre/lib/security/cacerts" || die - - # OpenJDK7 should be able to use fontconfig instead, but wont hurt to - # install it anyway. Bug 390663 - cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die - eprefixify "${T}"/fontconfig.Gentoo.properties - insinto "${dest}"/jre/lib - doins "${T}"/fontconfig.Gentoo.properties - - set_java_env "${FILESDIR}/icedtea.env" - if ! use X || ! use alsa || ! use cups; then - java-vm_revdep-mask "${dest}" - fi - java-vm_sandbox-predict /proc/self/coredump_filter -} - -pkg_preinst() { - if has_version "<=dev-java/icedtea-7.2.0:7"; then - # portage would preserve the symlink otherwise, related to bug #384397 - rm -f "${EROOT}/usr/lib/jvm/icedtea7" - elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*" - elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1" - elog "If you had icedtea7 as system VM, the change should be automatic, however" - elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" - elog "and the same holds for any user VM settings. Sorry for the inconvenience." - fi -} diff --git a/dev-java/icedtea/icedtea-7.2.2.ebuild b/dev-java/icedtea/icedtea-7.2.2.ebuild deleted file mode 100644 index fc1b9a185e78..000000000000 --- a/dev-java/icedtea/icedtea-7.2.2.ebuild +++ /dev/null @@ -1,334 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.2.ebuild,v 1.1 2012/06/10 13:56:19 sera Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * -# ********************************************************* - -EAPI="4" - -inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx - -ICEDTEA_VER=$(get_version_component_range 2-) -ICEDTEA_PKG=icedtea-${ICEDTEA_VER} -OPENJDK_TARBALL="49a6fc8f712f.tar.gz" -CORBA_TARBALL="3231f3e9c517.tar.gz" -HOTSPOT_TARBALL="bfe5efd70bce.tar.gz" -JAXP_TARBALL="0036fe6fe7dc.tar.gz" -JAXWS_TARBALL="abfb890c262a.tar.gz" -JDK_TARBALL="839d0155f7cc.tar.gz" -LANGTOOLS_TARBALL="f855bdb37537.tar.gz" -JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI=" - http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/archive/${OPENJDK_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/corba/archive/${CORBA_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxp/archive/${JAXP_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxws/archive/${JAXWS_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jdk/archive/${JDK_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/hotspot/archive/${HOTSPOT_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/langtools/archive/${LANGTOOLS_TARBALL} - !amd64? ( !sparc? ( !x86? ( - http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} - ) ) )" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="7" -KEYWORDS="~amd64 ~ia64 ~x86" - -IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin - +nss pax_kernel pulseaudio +source systemtap test +webstart" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" -X_COMMON_DEP=" - >=dev-libs/atk-1.30.0 - >=dev-libs/glib-2.26 - media-libs/fontconfig - >=media-libs/freetype-2.3.5 - >=x11-libs/cairo-1.8.8 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.8:2 - >=x11-libs/libX11-1.1.3 - >=x11-libs/libXext-1.1.1 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXtst-1.0.3 - >=x11-libs/pango-1.24.5" -X_DEPEND=" - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXp-1.0.0 - x11-proto/inputproto - >=x11-proto/xextproto-7.1.1 - x11-proto/xineramaproto - x11-proto/xproto" - -COMMON_DEP=" - >=media-libs/giflib-4.1.6 - media-libs/lcms:2 - >=media-libs/libpng-1.2 - >=sys-libs/zlib-1.2.3 - virtual/jpeg - javascript? ( dev-java/rhino:1.6 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - systemtap? ( >=dev-util/systemtap-1 )" - -# cups is needed for X. #390945 #390975 -RDEPEND="${COMMON_DEP} - !dev-java/icedtea:0 - X? ( - ${CUPS_COMMON_DEP} - ${X_COMMON_DEP} - media-fonts/dejavu - cjk? ( - media-fonts/arphicfonts - media-fonts/baekmuk-fonts - media-fonts/lklug - media-fonts/lohit-fonts - media-fonts/sazanami - ) - ) - alsa? ( ${ALSA_COMMON_DEP} ) - cups? ( ${CUPS_COMMON_DEP} )" - -# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# xext headers have two variants depending on version - bug #288855 -# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} - || ( - >=dev-java/gcj-jdk-4.3 - dev-java/icedtea-bin:7 - dev-java/icedtea-bin:6 - dev-java/icedtea:7 - dev-java/icedtea:6 - ) - app-arch/cpio - app-arch/unzip - app-arch/zip - app-misc/ca-certificates - >=dev-java/ant-core-1.8.1 - dev-java/ant-nodeps - dev-lang/perl - >=dev-libs/libxslt-1.1.26 - dev-libs/openssl - virtual/pkgconfig - sys-apps/attr - sys-apps/lsb-release - ${X_DEPEND} - pax_kernel? ( sys-apps/paxctl )" - -PDEPEND="webstart? ( dev-java/icedtea-web:7 ) - nsplugin? ( dev-java/icedtea-web:7[nsplugin] )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM=" - icedtea-7 icedtea-bin-7 icedtea7 - icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin - gcj-jdk" - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack ${ICEDTEA_PKG}.tar.gz -} - -java_prepare() { - # For bootstrap builds as the sandbox control file might not yet exist. - addpredict /proc/self/coredump_filter - - # icedtea doesn't like some locales. #330433 #389717 - export LANG="C" LC_ALL="C" - - epatch "${FILESDIR}"/${P}-no_suffix.patch - eautoreconf -} - -bootstrap_impossible() { - # Fill this according to testing what works and what not - has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 icedtea-7 icedtea-bin-7 icedtea7 -} - -src_configure() { - local config bootstrap - local vm=$(java-pkg_get-current-vm) - - # Whether to bootstrap - bootstrap="disable" - if use jbootstrap; then - if bootstrap_impossible "${vm}"; then - einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap" - else - bootstrap="enable" - fi - fi - - if has "${vm}" gcj-jdk; then - # gcj-jdk ensures ecj is present. - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" - bootstrap="enable" - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - config="${config} --with-ecj-jar=${ecj_jar}" - fi - - config="${config} --${bootstrap}-bootstrap" - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use JamVM as it's the only possibility right now - if ! has "${ARCH}" amd64 sparc x86; then - config="${config} --enable-jamvm --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}" - fi - - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" - - if use javascript ; then - config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" - else - config="${config} --without-rhino" - fi - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ - --with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \ - --with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \ - --with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \ - --with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \ - --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \ - --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ - --disable-downloading \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable nss) \ - $(use_enable pulseaudio pulse-java) \ - $(use_enable systemtap) \ - $(use_with pax_kernel pax paxctl) -} - -src_compile() { - # Would use GENTOO_VM otherwise. - export ANT_RESPECT_JAVA_HOME=TRUE - - # Load the least that's needed to avoid possible classpath collisions. - export ANT_TASKS="ant-nodeps" - - emake -} - -src_test() { - # Use Xvfb for tests - unset DISPLAY - - Xemake check -} - -src_install() { - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" - dodir "${dest}" - - dodoc README NEWS AUTHORS - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - docompress -x /usr/share/doc/${PN}${SLOT} - - cd openjdk.build/j2sdk-image || die - - # Ensures HeadlessGraphicsEnvironment is used. - if ! use X; then - rm -r jre/lib/$(get_system_arch)/xawt || die - fi - - # Don't hide classes - rm lib/ct.sym || die - - #402507 - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # doins can't handle symlinks. - cp -vRP bin include jre lib man "${ddest}" || die - - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README - - if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -r ../docs/* || die - fi - - if use examples; then - dodir "${dest}/share"; - cp -vRP demo sample "${ddest}/share/" || die - fi - - if use source; then - cp src.zip "${ddest}" || die - fi - - # Fix the permissions. - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die - - # Needs to be done before generating cacerts - java-vm_set-pax-markings "${ddest}" - - # We need to generate keystore - bug #273306 - einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" - mkdir "${T}/certgen" && cd "${T}/certgen" || die - cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die - for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do - openssl x509 -text -in "${c}" >> all.crt || die - done - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die - cp -vRP cacerts "${ddest}/jre/lib/security/" || die - chmod 644 "${ddest}/jre/lib/security/cacerts" || die - - # OpenJDK7 should be able to use fontconfig instead, but wont hurt to - # install it anyway. Bug 390663 - cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die - eprefixify "${T}"/fontconfig.Gentoo.properties - insinto "${dest}"/jre/lib - doins "${T}"/fontconfig.Gentoo.properties - - set_java_env "${FILESDIR}/icedtea.env" - if ! use X || ! use alsa || ! use cups; then - java-vm_revdep-mask "${dest}" - fi - java-vm_sandbox-predict /proc/self/coredump_filter -} - -pkg_preinst() { - if has_version "<=dev-java/icedtea-7.2.0:7"; then - # portage would preserve the symlink otherwise, related to bug #384397 - rm -f "${EROOT}/usr/lib/jvm/icedtea7" - elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*" - elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1" - elog "If you had icedtea7 as system VM, the change should be automatic, however" - elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" - elog "and the same holds for any user VM settings. Sorry for the inconvenience." - fi -} diff --git a/dev-java/icedtea/icedtea-7.2.3.1.ebuild b/dev-java/icedtea/icedtea-7.2.3.1.ebuild deleted file mode 100644 index 0c69616e5ae1..000000000000 --- a/dev-java/icedtea/icedtea-7.2.3.1.ebuild +++ /dev/null @@ -1,337 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.1.ebuild,v 1.1 2012/08/31 14:28:28 caster Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * -# ********************************************************* - -EAPI="4" - -inherit 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) -ICEDTEA_PKG=icedtea-${ICEDTEA_VER} -OPENJDK_TARBALL="a3fa5d49d528.tar.gz" -CORBA_TARBALL="e9b200124386.tar.gz" -HOTSPOT_TARBALL="3e0087ab5e92.tar.gz" -JAXP_TARBALL="9bd1d8e8b802.tar.gz" -JAXWS_TARBALL="9a744f20cfc5.tar.gz" -JDK_TARBALL="507eee662587.tar.gz" -LANGTOOLS_TARBALL="0cf6181d44db.tar.gz" -CACAO_TARBALL="a567bcb7f589.tar.gz" -JAMVM_TARBALL="jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.tar.gz" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI=" - http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL} - http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} - http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="7" -KEYWORDS="~amd64 ~ia64 ~x86" - -IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin - +nss pax_kernel pulseaudio +source systemtap test +webstart" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" -X_COMMON_DEP=" - >=dev-libs/atk-1.30.0 - >=dev-libs/glib-2.26 - media-libs/fontconfig - >=media-libs/freetype-2.3.5 - >=x11-libs/cairo-1.8.8 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.8:2 - >=x11-libs/libX11-1.1.3 - >=x11-libs/libXext-1.1.1 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXtst-1.0.3 - >=x11-libs/pango-1.24.5" -X_DEPEND=" - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 - >=x11-libs/libXp-1.0.0 - x11-proto/inputproto - >=x11-proto/xextproto-7.1.1 - x11-proto/xineramaproto - x11-proto/xproto" - -COMMON_DEP=" - >=media-libs/giflib-4.1.6 - media-libs/lcms:2 - >=media-libs/libpng-1.2 - >=sys-libs/zlib-1.2.3 - virtual/jpeg - javascript? ( dev-java/rhino:1.6 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - systemtap? ( >=dev-util/systemtap-1 )" - -# cups is needed for X. #390945 #390975 -RDEPEND="${COMMON_DEP} - !dev-java/icedtea:0 - X? ( - ${CUPS_COMMON_DEP} - ${X_COMMON_DEP} - media-fonts/dejavu - cjk? ( - media-fonts/arphicfonts - media-fonts/baekmuk-fonts - media-fonts/lklug - media-fonts/lohit-fonts - media-fonts/sazanami - ) - ) - alsa? ( ${ALSA_COMMON_DEP} ) - cups? ( ${CUPS_COMMON_DEP} )" - -# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# xext headers have two variants depending on version - bug #288855 -# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} - || ( - >=dev-java/gcj-jdk-4.3 - dev-java/icedtea-bin:7 - dev-java/icedtea-bin:6 - dev-java/icedtea:7 - dev-java/icedtea:6 - ) - app-arch/cpio - app-arch/unzip - app-arch/zip - app-misc/ca-certificates - >=dev-java/ant-core-1.8.1 - dev-java/ant-nodeps - dev-lang/perl - >=dev-libs/libxslt-1.1.26 - dev-libs/openssl - virtual/pkgconfig - sys-apps/attr - sys-apps/lsb-release - ${X_DEPEND} - pax_kernel? ( sys-apps/paxctl )" - -PDEPEND="webstart? ( dev-java/icedtea-web:7 ) - nsplugin? ( dev-java/icedtea-web:7[nsplugin] )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM=" - icedtea-7 icedtea-bin-7 icedtea7 - icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin - gcj-jdk" - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack ${ICEDTEA_PKG}.tar.gz -} - -java_prepare() { - # For bootstrap builds as the sandbox control file might not yet exist. - addpredict /proc/self/coredump_filter - - # icedtea doesn't like some locales. #330433 #389717 - export LANG="C" LC_ALL="C" - - epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525 - eautoreconf -} - -bootstrap_impossible() { - # Fill this according to testing what works and what not - has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 -} - -src_configure() { - local config bootstrap - local vm=$(java-pkg_get-current-vm) - - # Whether to bootstrap - bootstrap="disable" - if use jbootstrap; then - if bootstrap_impossible "${vm}"; then - einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap" - else - bootstrap="enable" - fi - fi - - if has "${vm}" gcj-jdk; then - # gcj-jdk ensures ecj is present. - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" - bootstrap="enable" - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - config="${config} --with-ecj-jar=${ecj_jar}" - fi - - config="${config} --${bootstrap}-bootstrap" - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use JamVM as it's the only possibility right now - if ! has "${ARCH}" amd64 sparc x86; then - config="${config} --enable-jamvm" - fi - - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" - - if use javascript ; then - config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" - else - config="${config} --without-rhino" - fi - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ - --with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \ - --with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \ - --with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \ - --with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \ - --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \ - --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \ - --with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \ - --with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ - --disable-downloading --disable-Werror \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable nss) \ - $(use_enable pulseaudio pulse-java) \ - $(use_enable systemtap) \ - $(use_with pax_kernel pax paxctl) -} - -src_compile() { - # Would use GENTOO_VM otherwise. - export ANT_RESPECT_JAVA_HOME=TRUE - - # Load the least that's needed to avoid possible classpath collisions. - export ANT_TASKS="ant-nodeps" - - emake -} - -src_test() { - # Use Xvfb for tests - unset DISPLAY - - Xemake check -} - -src_install() { - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" - dodir "${dest}" - - dodoc README NEWS AUTHORS - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - docompress -x /usr/share/doc/${PN}${SLOT} - - cd openjdk.build/j2sdk-image || die - - # Ensures HeadlessGraphicsEnvironment is used. - if ! use X; then - rm -r jre/lib/$(get_system_arch)/xawt || die - fi - - # Don't hide classes - rm lib/ct.sym || die - - #402507 - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # doins can't handle symlinks. - cp -vRP bin include jre lib man "${ddest}" || die - - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README - - if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -r ../docs/* || die - fi - - if use examples; then - dodir "${dest}/share"; - cp -vRP demo sample "${ddest}/share/" || die - fi - - if use source; then - cp src.zip "${ddest}" || die - fi - - # Fix the permissions. - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die - - # Needs to be done before generating cacerts - java-vm_set-pax-markings "${ddest}" - - # We need to generate keystore - bug #273306 - einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" - mkdir "${T}/certgen" && cd "${T}/certgen" || die - cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die - for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do - openssl x509 -text -in "${c}" >> all.crt || die - done - ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die - cp -vRP cacerts "${ddest}/jre/lib/security/" || die - chmod 644 "${ddest}/jre/lib/security/cacerts" || die - - # OpenJDK7 should be able to use fontconfig instead, but wont hurt to - # install it anyway. Bug 390663 - cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die - eprefixify "${T}"/fontconfig.Gentoo.properties - insinto "${dest}"/jre/lib - doins "${T}"/fontconfig.Gentoo.properties - - set_java_env "${FILESDIR}/icedtea.env" - if ! use X || ! use alsa || ! use cups; then - java-vm_revdep-mask "${dest}" - fi - java-vm_sandbox-predict /proc/self/coredump_filter -} - -pkg_preinst() { - if has_version "<=dev-java/icedtea-7.2.0:7"; then - # portage would preserve the symlink otherwise, related to bug #384397 - rm -f "${EROOT}/usr/lib/jvm/icedtea7" - elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*" - elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1" - elog "If you had icedtea7 as system VM, the change should be automatic, however" - elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" - elog "and the same holds for any user VM settings. Sorry for the inconvenience." - fi -} diff --git a/dev-java/icedtea/icedtea-7.2.3.2.ebuild b/dev-java/icedtea/icedtea-7.2.3.2.ebuild index 358314ffd552..9d2024677f19 100644 --- a/dev-java/icedtea/icedtea-7.2.3.2.ebuild +++ b/dev-java/icedtea/icedtea-7.2.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.2.ebuild,v 1.1 2012/09/02 10:52:37 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.2.ebuild,v 1.2 2012/09/26 08:42:27 sera Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -205,7 +205,7 @@ src_configure() { einfo "Configuring using --with-parallel-jobs=${procs}" if use javascript ; then - config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" + config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" else config="${config} --without-rhino" fi |