commit: 5a464aaae3ba9c90da7f19f6dddf8df03ffb5ab7 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed May 6 21:52:10 2015 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed May 6 21:52:10 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=5a464aaa
Latest releases now in the tree. Apply my changes to the remainder. Package-Manager: portage-2.2.18 Manifest-Sign-Key: 9C6D7DE4 dev-java/icedtea/Manifest | 42 ++- dev-java/icedtea/icedtea-3.9999.ebuild | 16 +- dev-java/icedtea/icedtea-6.1.13.7.ebuild | 372 ----------------------- dev-java/icedtea/icedtea-6.9999.ebuild | 15 +- dev-java/icedtea/icedtea-7.2.5.5.ebuild | 418 -------------------------- dev-java/icedtea/icedtea-7.2.6.0_pre18.ebuild | 16 +- 6 files changed, 42 insertions(+), 837 deletions(-) diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index a3e8f4f..3530542 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -4,17 +4,6 @@ Hash: SHA256 AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19 AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619 AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258 -DIST icedtea-2.5-aarch64-1939c010fd37.tar.bz2 8151626 SHA256 ac35bd6620553478700aaf8c825e373a7329d66473899f7184eb5a317f3db97f SHA512 b594b384bfeb18c1a1b493de7a73fef91e646769ef737009d4326922e1ba70bb0cbcd8a21b4fd352ea6155342eda7de25dddc781c3751e2a19aea07ad9dd04e0 WHIRLPOOL 853098684b5b3db7eb1a32c360c12d45c7c5e4ea877e598f466531efd1d80f90cee28cd8321fd90b044ba27e4fc142e808112bdcb603fc5d7a0c23d08be748e7 -DIST icedtea-2.5-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba -DIST icedtea-2.5-corba-52db6f325d61.tar.bz2 1069991 SHA256 f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51 SHA512 22da9802c9354a96ba1440568d698ae5fec14db89668d665e169a571d26627f7343f1a42bdbb84d4d647d4694380bb49a987ce2cf190507614b76493bc2cbd06 WHIRLPOOL 62586a018ca3856e2d1e918385d9044dfebe45fd20bb7cbd28aa5fabf2bbb7c814790911b8bac6f7459ff333fd2fa25854d538bb49b22e656ee1239839513f27 -DIST icedtea-2.5-hotspot-cac66550581b.tar.bz2 7799870 SHA256 d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb SHA512 ba6c9cca89537837fbb201a29a634a6775bcbcc988bb145aa661183c57498db586d24046ccc27df2cb84d6971a3830942cec669a764a295696391015592d5dbd WHIRLPOOL 121630db41435d87a3bfad0ea2926b685b52321dc120c421cc08253fdce5bbbfada95b2a895b3bc48b8dcc42d45431ca2f617c75b507f548808cf5a1c9496335 -DIST icedtea-2.5-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4 -DIST icedtea-2.5-jaxp-80b5a93b1406.tar.bz2 2739415 SHA256 293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256 SHA512 1f3296081493324c410ff053195f4766918cb14ab62b3630cab22b84e00200b6a69f95bbd00bd3e98c6218c0bc63e3c71fc777aef3186d696dce4be34e9023b5 WHIRLPOOL 7ed664c7265e88c8293f897516857a000ca40dbef30b3311013d7710b71287e1b1c0fa1e1408a4391c9d89722efa503d88b93d3b80c24ab912e48a757f7e43ef -DIST icedtea-2.5-jaxws-3706d41e1476.tar.bz2 2019449 SHA256 76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be SHA512 21961675d9b7277e9b1285c4182ba9cef14dbff88fe80cffbcdfe3c0062d23b2296aa568571b68a35dbe46b6ab50a7eb63bedd4de422724239af79240ff67163 WHIRLPOOL f5258aa7de3f23690cd17db5a1a742eb8108bbcdb41f4e437bddb95472f0b48ca4a408ed4a098c996d23b22889606eeaeec13ab9c6f10c4a40800e128cc7025a -DIST icedtea-2.5-jdk-fb9961d8dfda.tar.bz2 31868377 SHA256 c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483 SHA512 e93864204ddc263caa1e8fc366723b5e3bf774040d9af3a49ab379f3d20888f3228d1712edd07c37d7e29b2fc6961e21aff106d4a91e2646aa45f082bb93c1cc WHIRLPOOL 1c12cb46c5d896026165dab6fcaf8f29fa368176bbb12b42a1a0c338c4503b7bd9aeb761cbb7269cba8bebdc2a7c25824540e4fa1027c77a29c6621b95a51bb2 -DIST icedtea-2.5-langtools-3ffd17553e8c.tar.bz2 1701795 SHA256 71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660 SHA512 5a86c77bedd3a65d94ee7ef37eda4008bc07603b4085e63ae547b17c8c6d723441fc0919be63dd9530626ad02fb9fbdb6723cadfe0d25deb6c4044af2ba60546 WHIRLPOOL 4d9b0540c7f130450cbef855873d631b4b403bd7b6fe0ee4c2c88b5d23b8de5c2e1101adc1822ab08b13a668f7aca8d81f31d98f82497de93444e104bf4a0738 -DIST icedtea-2.5-openjdk-f8c87dd516ff.tar.bz2 127435 SHA256 5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d SHA512 7c652e8a441e7732ac62b1ffff26c9b6478232235207120c55de3fcf5246af96a7be1a3e89f8373f01ba915dd68d32f52a46dc970ec3a632966c400fc04279cf WHIRLPOOL f6d0d9228df4452a310b150fd7c866ad0a727bc5b1e61ab6340233b73af838ce8544a298bf6c3a3a683115f72c68f52740773069a7ae65af606969078df8430e -DIST icedtea-2.5.5.tar.xz 2026212 SHA256 09e7aeb739a468dec8357f4b0757624b6c7ef38065fdf50323d369deac983dc7 SHA512 ae6a81c5bbd126ca990138c8ea15d4f0e57d4af3c633a03fcf6ce580f6b9cc1ea1948562783ddda6134aae8585ef90efca89239d1773bf16deb38c13850912b5 WHIRLPOOL 6cdd8c105cd2ff0a1dbd6a0d0283f4bd0901ed400d8e4d81503b97645af591147ec455564d8d4c9c2cf9fbcd968cb2d2e50c239782b7c8b041dbfad488661f80 DIST icedtea-3.0-cacao-d6264eb66506.tar.gz 4210323 SHA256 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c SHA512 9867eab28944e2ccf82555fe385efc4494068b087789b0a5cc2ed94723b442e96b7e7e19ec3e2c670608ba8336173325690f413d7779c35fedb108450ab90237 WHIRLPOOL 184eee0d85ccd783e7b95a5dc560b1073c068107ed4cdd6d877b1ff14fdf7c199f61ea8cb01c1eb63e19c2de22b45840dc0841a7e099413194b376a1bc6fdcb4 DIST icedtea-3.0-corba-2a00aeeb466b.tar.gz 1456824 SHA256 10bdd5cb934b6c6ce7fc0faaf9bb7f489c24136db82a5862cf82957f94ef67c4 SHA512 6a6b4c401db985eff5efb498a73606269cef48e5d3b32aacb0187fda9694fb83eb2e591946e49c4d87eba968a6d610b5acbe0b1925f369a4eb0eca3899829998 WHIRLPOOL 3dd73fb2b564ddd47c60c2840bdda6d9ee4b99252e207287b603b3f9a42a2e6e6b0cb372618fe51d058580b5296cd2a54673bca7143ff459582904a24046dc77 DIST icedtea-3.0-hotspot-65b797426a3b.tar.gz 8884528 SHA256 e30bc3fa830478d6784d5578f0c7e82c7fbc0261c10112ff72ce4a5ce1093732 SHA512 bdfeb70bb224aed1c1a8da69d5f2cfb98f97f09ea9d842d138c6629792ebf4775cc9595eb981fcdc9bc4ad743a9fed9f922ba459e7845cc13b37ce25303a934f WHIRLPOOL 4b174bd400743a6c8e9e9b89a7375aa5976934c170f74a6526f1407e13d94e829b83f3c2bee198c64c3db1017d97d4ba7e7f9ae63334959efbdad754840bff51 @@ -24,11 +13,8 @@ DIST icedtea-3.0-jaxws-c88bb21560cc.tar.gz 2862295 SHA256 c6ee04818488c042b27dce DIST icedtea-3.0-jdk-758db1c4c65c.tar.gz 52985486 SHA256 476f61c1de7cbf4c7d1fe51bfe813049ba55707b808f0572a898653dacc4dfdb SHA512 7b8d7daa420ea4432416a3a31538feb959bb92277e4226a5c26bc8bb012ec9ca9be2ed7fd8002ed138d0b71fde7c964eaeea31f25bb7391ad5fc9772acd09c79 WHIRLPOOL d24f968f21a617bbd2b46ffe3ad38b6613be236a3c7ba594c1fdd59f82ad65c449fe990594f5be64f35dd43bf12bd02f73b24634c03bfd727182e348beae1fff DIST icedtea-3.0-langtools-ed69d087fdfd.tar.gz 2817543 SHA256 ef15659e1e3d685402d53a9d0d087bcc3499f305001a6d8976a2138db7c70229 SHA512 c72f98c2a3b0c019de4908c20ef0face54792a7e20b0d00eccc6af2da9e35535562c412fda0e84ad372f4f759aaebbd42c9f3974ae8d729ef32efc3b978ec1b0 WHIRLPOOL 11b1a663f3a1ab7cc576ae03c9892c93535aba99e1afa221b93c56dcbe0f5c92d5b04b0203c363d40035055327ee1e2f0e485d710f631f6a1a980216ae5c0ff8 DIST icedtea-3.0-openjdk-cd7f2c7e2a0e.tar.gz 427938 SHA256 aae139654d4bbc23da7eb9eff4fe7c6a70f219f69ec3e39b4506f97a9c9d3a39 SHA512 b6fcf2b9c7d422342258e0bd6c121912bddac60f6184883cfbf54b73e9caeac042864bb3a79dbf6702de2fb564b8354aaa1e68d01eb633a2f3d8283baf1762f1 WHIRLPOOL 3b63fcad95e227aa6785e48f2e1ee683e53ee9211e98fa5f64f68f86d5abfea5ec7b27554e547a6e4d84385a5f97ffc2aa2dc44711e9eec0ba3a27fc1cb8d3d3 -DIST icedtea-6.1.13-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3 -DIST icedtea-6.1.13-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4 DIST icedtea-6.9999-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3 DIST icedtea-6.9999-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4 -DIST icedtea6-1.13.7.tar.xz 4511300 SHA256 a5ca64ae94ec27d28be91f4f0624164f9b4e6e92e417e52b296556005142183b SHA512 8e701f78d31888f4e2d362fcd46ee73aae67b57e3fe0b648f12b408298391149704aefac749294a0911581e1e70f30bff57d35a748b8e3e19e57a1911aa3d241 WHIRLPOOL 5131a79b6481b500ff70a50964f0eb206565d149196c5ab350c5f06015a73cf063dceeb3946a3c3bf45eb99a0f178ab180537089c906a7816356b4e289e69002 DIST icedtea7-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba DIST icedtea7-corba-15250731630c.tar.bz2 1071010 SHA256 9448485932e5f74b545e7c9e1d4a586bf4a93c85223e500d803eecfe287786fb SHA512 15871d248bd3491e53b687a4dc51765e82c8c17d5044b27cc29852902a85e0abbaf1aa93d774009c991131c4915c519d3779b04341faf365096f14419ec55847 WHIRLPOOL b74550d7353d2bf0c53bff3575042c6abd195f79fe0226e46e6b283157162317b63cfb7885571bdb4490606dac9016e57ff4671ba9ebc2c368d60b828997acec DIST icedtea7-hotspot-1792bfb4a54d.tar.bz2 8148494 SHA256 c08056f64be5923353a75838e66b26aedf0213cbf2296cac449a5ee874c6759a SHA512 ff9fbf1656178f7c89bb249623f615aa2abfdd379fde2fb84c60f94e739951077b3e64659b26b867ca1d81962fbe44fe3fb11447919d5ad14df5ef79fed95a7b WHIRLPOOL 11ccdbca767122ca319d1a542965a325b5095f5f60dc4492eb4402fa19c2245bc947843c9a8851b9233b3bf57780c5a81952cbe97672769fcbaeeb6a5ed0f81a @@ -39,17 +25,27 @@ DIST icedtea7-jdk-19a30444897f.tar.bz2 32261734 SHA256 2f3c22d729d65851f491d924f DIST icedtea7-langtools-bb9d09219d3e.tar.bz2 1709221 SHA256 5df2c2a496409b0eb1f4ff923ee6de554ab74af8b91af26185f7e2f73071642d SHA512 51d9e5cbfbde281b8dbe0dc6d3ed3ee6a4cdda853809e64931220126de34ea74fa9359ea24cffaf913ea57b967a54fc0d25f31b2bdf62d0c8549cab07e83c969 WHIRLPOOL 655b67b53b6e8166e128bf1621eaa1fed39e18c0b336b6228a4fca4d64ec2efd60d66b1e02b5844beb9107ed1420f471f2ce687773c778418ab75e02e2d8d4f2 DIST icedtea7-openjdk-e229119aa0a0.tar.bz2 128769 SHA256 8c77d4d16d38b2ee4edd98525186548c33138a400c61978e1e54b70c494250df SHA512 91e0eab9e9ba1f6ddc922e1a8e6093f211aabfeef0b8e833db871a40a3b624fcf7155efcd2d2de48b9992985079430b5d193277bf3744e4083de0fa0c7e18bc0 WHIRLPOOL c0ad8c0ed7e12f3717f030412408791b1fa3670167baf58cf879c1034781bce9ac8666edf2beb4169c0e6aab7165797e7b366fa7decdebabf54dfacfc460593c DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234 -EBUILD icedtea-3.9999.ebuild 11661 SHA256 3a2f3d9c6ecd7305c36118d1984917ca7e3d0ed3ac0063a5e450181786327523 SHA512 1287f5518f64cc991365d0d271bee9531d955690f3128dabf7432e928a72d2413b396c1523a91d1d47cb63d7abe891f52a72e05b7c2e7ab1214639b98510c8ac WHIRLPOOL 878ab905a55d29dd5e60caa57bcf9c7e829fd28b10c83c4d3d965cebe932d87e65dd6b69580e6e2fe87d247973bf86d1dd2abff0be693152330e12a5f885aebc -EBUILD icedtea-6.1.13.7.ebuild 11029 SHA256 6b497bbc3f5e4f574d2c89208b57b600fd2c8717febb2483cc2f8c6db71b4f5c SHA512 9560e9a3d8caf8cef2de441e3d05777034e9d8de6d765fdc581951d634d6aa99f64720a9c931058eefb23385782f8ab3eed3802ed08d90059342b29e995f419b WHIRLPOOL d1e3bb631527b7eb1faf53a7ff2f770293b13c1b02b3fc067585601f083c98b6b60a6c293abe317960adc3a8fc130dd26390567284c97003aa713cb200b4b058 -EBUILD icedtea-6.9999.ebuild 11019 SHA256 3cdcbb3649cc1c06d31e543b4b101af6ac9c62870f6e435e3f056ffca28cba6a SHA512 28235c314ee686c1d6eb4abb9ef5d11d92db44b4d957577ce129b6baa273c38403d89b0a7269e159f0c655dcc0483c0a79634a503c0f2a7461398fe19eff54db WHIRLPOOL d1935fe748c30ee1b2932203db4c45a114ab54fd7df7f6ed175e1185b4a25528e53a17ee9852e779c634ed2e3c83734b563eca740c17ae4e9ad91406a6e1145f -EBUILD icedtea-7.2.5.5.ebuild 13128 SHA256 e0d9d32408b3d88d105563a6fde536cb8d97c9035583950185b33a621dcab0c9 SHA512 0e35e71a0682ae2d5b88a6d459a6e375139f1262c22de5db6098364058cdfd6b21dcdaf335ebe9b667659ef561d69a1272c63336b4a782aa208736c833b069b0 WHIRLPOOL dbd541a14e770257ed9ce786bbe9c2064f9345d5200ca80bba7caf7b7ec66226d8c4ca393d847bc1b486f64557677e716b76efed6210ba5bb9ee3e772e110be7 -EBUILD icedtea-7.2.6.0_pre18.ebuild 12570 SHA256 beb537c74be9c4f790ad4606e4b8c8fce3dca6e424a4fd4062f4e4c6b7beae20 SHA512 b094d0d9ea4776e2f1a6191c160a519f2c2e7549e3623aca016197ce1b24899129764aefe04586fc178cc1445c69b81fed283bac9988c1403433b1d69382876a WHIRLPOOL 9aca281a8d878e2649da9b4ff98daa135e3a640fb40bd59a27be67e4a645692d70fe77aaaee0ab2aa8fcec4e093d203314fc2f27ab25f4129ee1d51434aba713 +EBUILD icedtea-3.9999.ebuild 11496 SHA256 6a41aa4e75075b70ca4e4932ae3fc7602bd56d3487976f3f22fc811cd827cfd0 SHA512 557247243bdd27ed9998ed15ceb5f149e8be85e4ba00816ff76418ba52b6a6cae2a57da6cf4e50f8adafc7a83d13480fcddea98a92b136405671fa5b59a2c681 WHIRLPOOL 5a40401c7dcefa15fdc49ebc100b47fc8e4ad3039708002c02aacafd2cae122a1517a24d474f3002dcdb423d30559376a943cda2829ba6399d9703fbe6d85c45 +EBUILD icedtea-6.9999.ebuild 10838 SHA256 7b2ce1fafb59a31eaddac430747c87e04db399ef9b2ad292e86faa180ad2a7ff SHA512 b32208511634bab46469a7206438d94e501e39db75818c70a35c73722cb8da11a632626015910a81fd3361d698fe936f9904279f6074a4cf0f675ea1121d60b1 WHIRLPOOL ffbd710fdc271e23b7e888ad181c8867ecbee20d58afd5f660101a0134a5051ec601c0f283b0bb320dbbf55d705203aaf68cf00980510451141dbde9dafc68bb +EBUILD icedtea-7.2.6.0_pre18.ebuild 12408 SHA256 cfc0fa5d980722060112f76ae6f3f1e8f06e04732b57ca53ecab5e119e1171eb SHA512 a00699fb1b22dc6211eb0c19b718d2668536e327ff906edfff0ac959d36c16be8ac73b94a358e44a6fa2d43246887a832c5caae1a0e1b330c310be58ea31e843 WHIRLPOOL 3e5c759e23bc2ae11a173d455e1d1366cd8d5fe8ed7d28b871debaa2ee32d846e21dc4dff19cedf1788b3d089a1a83a5325eca9c46dbbbe3fe873664a4b2b988 MISC ChangeLog 89288 SHA256 84b1cbbdb1f15cafaea2db1312bab8914e0c0ea00a45b3a2ed8d85f3b1bca904 SHA512 607dd4788497aaa9b110f968da68f4712ef0efe27264c37f9139bfaf937937551e1a456b5281a3d5fab29787d75477a1c6d5fa2dc7573b4cd71abfcc79ec6c06 WHIRLPOOL 96efdf80bf92dcf4a92ed1898b4f484f113497df67c47aa377b952a4f6c97530ccd3eafb56aa9b3747d9084ee89b10f39ae8a5cbf9905aef505fc06e23db08f2 MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iF4EARYIAAYFAlUt38sACgkQz9oPmzWWQiLKOgEAMDNWUqvBMmB9yND36dmYeviZ -ZOjdLTEYedkFRxW8URABAAGZF1qUr+rc0eL+tt0ccFXsqLRSFFWjH2eFw7QXX6wN -=hKpH +iQJ8BAEBCABmBQJVSo0KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy +MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k+ZoP/3M9LO3sfq4Mu4/PNI1TlU7N +i9Mby284ABlYpOQanVGvMB1ONxM7Za+FgY1AD4opl/BW/t/Qmyu4cWmvnRKV+Qz+ +ca2GTNpWC24wee6DiuHOvlbraGs+LjVUnUBrwOx3dqCJwsrWaHMTEyiZ2FY3it8l +HkMVhv0v9PqFrq40kJ5M67H3Wt4xgEfnb6CDWdTwDeAIGCEtS7IWcITSvDFjgeAJ +4EJXdqEZ2J88SiairlIUYwenYeFvICvHOPrViT995jkgSHfEdtIr0GsxQa1q8Ra/ +vTn1Tj96YqI8LJO1Q61PfjPY0vcK2EROYWhD27+S2++0cgksnWkb5Oz41USMYZff +tp6OlqX2+nDgctgVUD/pBf3ULpQeFKEsibo/0dItmDVEB1IBK6qvcON7IvLeCqX3 +LcwGdIa2V9AtbJ4zJk5edrv1G0f7NJae+hULjushOtebwTlYQulvcZ7ojuhNjG04 +hy8nDnf9uh4kivAzJwv0pVJbwpxqzD4oTuPAocMVBjfkx0fcwNC6Mm11hCGEWJSf +vm3i4yycmiaWA8q/m1KgKRGCdjLppMsYQqCn4AJVFJ7/k8ld6lBwywKwvy4UP9Qb +Ke4KwMLCLh4w/tHcQY3ARp78Ks41lA3+tkpwo7gGVEYgpiREvLAnWbYKpMCdmj6X +e8sSb/1e2kf6eA3FfPjG +=D+Qt -----END PGP SIGNATURE----- diff --git a/dev-java/icedtea/icedtea-3.9999.ebuild b/dev-java/icedtea/icedtea-3.9999.ebuild index ab24bf9..17ec04c 100644 --- a/dev-java/icedtea/icedtea-3.9999.ebuild +++ b/dev-java/icedtea/icedtea-3.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $ +# $Header: $ # Build written by Andrew John Hughes ([email protected]) # ********************************************************* @@ -58,6 +58,7 @@ EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea"; LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" SLOT="8" KEYWORDS="~amd64 ~x86" +RESTRICT="test" IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin +nss pax_kernel pulseaudio selinux +source systemtap test +webstart" @@ -69,7 +70,7 @@ CUPS_COMMON_DEP=" >=net-print/cups-1.2.12" X_COMMON_DEP=" >=dev-libs/atk-1.30.0 - >=dev-libs/glib-2.26 + >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.3.5 >=x11-libs/cairo-1.8.8 @@ -313,7 +314,7 @@ src_test() { src_install() { local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" + local ddest="${ED}${dest#/}" dodir "${dest}" dodoc README NEWS AUTHORS @@ -334,19 +335,18 @@ src_install() { touch jre/.systemPrefs/.system.lock || die touch jre/.systemPrefs/.systemRootModFile || die - # doins can't handle symlinks. + # doins doesn't preserve executable bits. cp -vRP bin include jre lib man "${ddest}" || die dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -A dtd -r ../../docs/* || die + docinto html + dodoc -r ../docs/* fi if use examples; then - dodir "${dest}/share" - cp -vRP demo sample "${ddest}/share/" || die + cp -vRP demo sample "${ddest}" || die fi if use source; then diff --git a/dev-java/icedtea/icedtea-6.1.13.7.ebuild b/dev-java/icedtea/icedtea-6.1.13.7.ebuild deleted file mode 100644 index 0ad0028..0000000 --- a/dev-java/icedtea/icedtea-6.1.13.7.ebuild +++ /dev/null @@ -1,372 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild,v 1.1 2014/11/01 17:59:37 caster Exp $ -# Build written by Andrew John Hughes ([email protected]) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * -# ********************************************************* - -EAPI="5" - -inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx - -ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) -ICEDTEA_BRANCH=$(get_version_component_range 1-3) -OPENJDK_BUILD="35" -OPENJDK_DATE="14_apr_2015" -OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz" -# Download cacao and jamvm regardless for use with EXTRA_ECONF -CACAO_TARBALL="68fe50ac34ec.tar.gz" -JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz" - -CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}" -JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org"; -SRC_PKG="${ICEDTEA_PKG}.tar.xz" -SRC_URI=" - http://icedtea.classpath.org/download/source/${SRC_PKG} - https://java.net/downloads/openjdk6/${OPENJDK_TARBALL} - http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} - http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -SLOT="6" -KEYWORDS="~amd64 ~x86" - -IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin - +nss pax_kernel pulseaudio selinux +source systemtap test zero +webstart" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" -X_COMMON_DEP=" - dev-libs/glib - >=media-libs/freetype-2.3.5:2= - >=x11-libs/gtk+-2.8:2= - >=x11-libs/libX11-1.1.3 - >=x11-libs/libXext-1.1.1 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXtst-1.0.3 - x11-libs/libXt" -X_DEPEND=" - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 - x11-proto/inputproto - >=x11-proto/xextproto-7.1.1 - x11-proto/xineramaproto - x11-proto/xproto" - -COMMON_DEP=" - >=media-libs/giflib-4.1.6:= - >=media-libs/libpng-1.2:= - >=sys-libs/zlib-1.2.3:= - virtual/jpeg:0= - >=media-libs/lcms-2.5 - javascript? ( dev-java/rhino:1.6 ) - kerberos? ( virtual/krb5 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) - systemtap? ( >=dev-util/systemtap-1 ) - !dev-java/icedtea-web:6" - -# 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} ) - selinux? ( sec-policy/selinux-java )" - -# 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.2 - dev-lang/perl - >=dev-libs/libxslt-1.1.26 - dev-libs/openssl - virtual/pkgconfig - sys-apps/lsb-release - ${X_DEPEND} - pax_kernel? ( sys-apps/elfix )" - -PDEPEND="webstart? ( dev-java/icedtea-web:0 ) - nsplugin? ( dev-java/icedtea-web:0[nsplugin] )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -icedtea_check_requirements() { - local CHECKREQS_DISK_BUILD - - if use doc; then - CHECKREQS_DISK_BUILD="8500M" - else - CHECKREQS_DISK_BUILD="8000M" - fi - - check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - icedtea_check_requirements -} - -pkg_setup() { - icedtea_check_requirements - - 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 ${SRC_PKG} -} - -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" -} - -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 bootstrap cacao_config config hotspot_port use_cacao use_zero zero_config - 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+=" --${bootstrap}-bootstrap" - - # Use Zero if requested - if use zero; then - use_zero="yes" - fi - - # Use CACAO if requested - if use cacao; then - use_cacao="yes" - fi - - # Are we on a architecture with a HotSpot port? - # In-tree JIT ports are available for amd64, arm, sparc and x86. - if { use amd64 || use arm || use sparc || use x86; }; then - hotspot_port="yes" - fi - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use CACAO on ppc and Zero on anything else - if test "x${hotspot_port}" != "xyes"; then - if { use ppc || use ppc64; }; then - use_cacao="yes" - else - use_zero="yes" - fi - fi - - # Turn on CACAO if needed (non-HS archs) or requested - if test "x${use_cacao}" = "xyes"; then - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.' - ewarn 'If so, please rebuild with USE="-cacao"' - fi - cacao_config="--enable-cacao" - fi - - # Turn on Zero if needed (non-HS/CACAO archs) or requested - if test "x${use_zero}" = "xyes"; then - zero_config="--enable-zero" - fi - - config+=" --with-parallel-jobs=$(makeopts_jobs)" - - if use javascript ; then - config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" - else - config+=" --without-rhino" - fi - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ - --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \ - --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ - --with-pkgversion="Gentoo package ${PF}" \ - --disable-downloading --disable-Werror \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable kerberos system-kerberos) \ - $(use_enable nss) \ - $(use_enable pulseaudio pulse-java) \ - $(use_enable systemtap) \ - $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ - ${zero_config} ${cacao_config} -} - -src_compile() { - # Would use GENTOO_VM otherwise. - export ANT_RESPECT_JAVA_HOME=TRUE - - # With ant >=1.8.2 all required tasks are part of ant-core - export ANT_TASKS="none" - - emake -} - -src_test() { - # Use Xvfb for tests - unset DISPLAY - - Xemake check -} - -src_install() { - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" - dodir "${dest}" - - dodoc README NEWS AUTHORS - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - - cd openjdk.build/j2sdk-image || die - - # Ensures HeadlessGraphicsEnvironment is used. - if ! use X; then - rm -r jre/lib/$(get_system_arch)/xawt || die - fi - - # Don't hide classes - rm lib/ct.sym || die - - #402507 - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # doins can't handle symlinks. - cp -vRP bin include jre lib man "${ddest}" || die - - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README - - if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -A dtd -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 - - # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool - if use webstart || use nsplugin; then - dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings - dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings - fi - if use webstart; then - dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws - dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws - 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 - java-vm_sandbox-predict /proc/self/coredump_filter -} - -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.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild index 68b2848..85d06cc 100644 --- a/dev-java/icedtea/icedtea-6.9999.ebuild +++ b/dev-java/icedtea/icedtea-6.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5.ebuild,v 1.1 2014/10/19 06:46:41 caster Exp $ +# $Header: $ # Build written by Andrew John Hughes ([email protected]) # ********************************************************* @@ -34,6 +34,7 @@ EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea6"; 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="" +RESTRICT="test" IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux +source systemtap test zero +webstart" @@ -44,7 +45,6 @@ ALSA_COMMON_DEP=" CUPS_COMMON_DEP=" >=net-print/cups-1.2.12" X_COMMON_DEP=" - dev-libs/glib >=media-libs/freetype-2.3.5:2= >=x11-libs/gtk+-2.8:2= >=x11-libs/libX11-1.1.3 @@ -280,7 +280,7 @@ src_test() { src_install() { local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" + local ddest="${ED}${dest#/}" dodir "${dest}" dodoc README NEWS AUTHORS @@ -301,19 +301,18 @@ src_install() { touch jre/.systemPrefs/.system.lock || die touch jre/.systemPrefs/.systemRootModFile || die - # doins can't handle symlinks. + # doins doesn't preserve executable bits. cp -vRP bin include jre lib man "${ddest}" || die dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -A dtd -r ../docs/* || die + docinto html + dodoc -r ../docs/* fi if use examples; then - dodir "${dest}/share" - cp -vRP demo sample "${ddest}/share/" || die + cp -vRP demo sample "${ddest}" || die fi if use source; then diff --git a/dev-java/icedtea/icedtea-7.2.5.5.ebuild b/dev-java/icedtea/icedtea-7.2.5.5.ebuild deleted file mode 100644 index 38fc404..0000000 --- a/dev-java/icedtea/icedtea-7.2.5.5.ebuild +++ /dev/null @@ -1,418 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.3.ebuild,v 1.1 2014/11/01 21:43:06 caster Exp $ -# Build written by Andrew John Hughes ([email protected]) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * -# ********************************************************* - -EAPI="5" -SLOT="7" - -inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx - -ICEDTEA_VER=$(get_version_component_range 2-) -ICEDTEA_BRANCH=$(get_version_component_range 2-3) -ICEDTEA_PKG=icedtea-${ICEDTEA_VER} -CORBA_TARBALL="52db6f325d61.tar.bz2" -JAXP_TARBALL="80b5a93b1406.tar.bz2" -JAXWS_TARBALL="3706d41e1476.tar.bz2" -JDK_TARBALL="fb9961d8dfda.tar.bz2" -LANGTOOLS_TARBALL="3ffd17553e8c.tar.bz2" -OPENJDK_TARBALL="f8c87dd516ff.tar.bz2" -HOTSPOT_TARBALL="cac66550581b.tar.bz2" -AARCH64_TARBALL="1939c010fd37.tar.bz2" -CACAO_TARBALL="e215e36be9fc.tar.gz" -JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz" - -CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}" -JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}" -JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}" -JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}" -LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}" -OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}" -HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}" -AARCH64_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch64-${AARCH64_TARBALL}" - -CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}" -JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}" - -DROP_URL="http://icedtea.classpath.org/download/drops"; -ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org"; -SRC_PKG="${ICEDTEA_PKG}.tar.xz" -SRC_URI=" - http://icedtea.classpath.org/download/source/${SRC_PKG} - ${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL} - ${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL} - ${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL} - ${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL} - ${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL} - ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL} - ${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL} - ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} - ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} - ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -KEYWORDS="~amd64 ~x86" - -IUSE="+X +alsa cacao cjk +cups debug doc examples infinality jamvm javascript +jbootstrap kerberos +nsplugin - nss pax_kernel pulseaudio selinux smartcard +source +sunec test zero +webstart" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" -X_COMMON_DEP=" - >=dev-libs/atk-1.30.0 - >=dev-libs/glib-2.26 - media-libs/fontconfig - >=media-libs/freetype-2.5.3:2=[infinality?] - >=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/libXt - >=x11-libs/pango-1.24.5" -X_DEPEND=" - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2 - x11-proto/inputproto - >=x11-proto/xextproto-7.1.1 - x11-proto/xineramaproto - x11-proto/xproto" - -COMMON_DEP=" - >=media-libs/giflib-4.1.6:= - >=media-libs/lcms-2.5 - >=media-libs/libpng-1.2:= - >=sys-libs/zlib-1.2.3:= - virtual/jpeg:0= - javascript? ( dev-java/rhino:1.6 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - kerberos? ( virtual/krb5 ) - >=dev-util/systemtap-1 - smartcard? ( sys-apps/pcsc-lite ) - sunec? ( >=dev-libs/nss-3.16.1-r1 ) - !dev-java/icedtea-web:7" - -# cups is needed for X. #390945 #390975 -# gsettings-desktop-schemas is needed for native proxy support. #431972 -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} ) - selinux? ( sec-policy/selinux-java ) - >=gnome-base/gsettings-desktop-schemas-3.12.2" - -# 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.2 - 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/elfix )" - -PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] ) - nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] ) - pulseaudio? ( dev-java/icedtea-sound )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -icedtea_check_requirements() { - local CHECKREQS_DISK_BUILD - - if use doc; then - CHECKREQS_DISK_BUILD="9000M" - else - CHECKREQS_DISK_BUILD="8500M" - fi - - check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - icedtea_check_requirements -} - -pkg_setup() { - icedtea_check_requirements - - 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 ${SRC_PKG} -} - -java_prepare() { - # For bootstrap builds as the sandbox control file might not yet exist. - addpredict /proc/self/coredump_filter - - # icedtea doesn't like some locales. #330433 #389717 - export LANG="C" LC_ALL="C" -} - -src_configure() { - local bootstrap cacao_config config hotspot_port hs_tarball use_cacao use_zero zero_config - local vm=$(java-pkg_get-current-vm) - - # Whether to bootstrap - bootstrap="disable" - if use jbootstrap; then - bootstrap="enable" - fi - - if has "${vm}" gcj-jdk; then - # gcj-jdk ensures ecj is present. - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" - bootstrap="enable" - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - config+=" --with-ecj-jar=${ecj_jar}" - fi - - config+=" --${bootstrap}-bootstrap" - - # Use Zero if requested - if use zero; then - use_zero="yes" - fi - - # Use CACAO if requested - if use cacao; then - use_cacao="yes" - fi - - # Are we on a architecture with a HotSpot port? - # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86. - if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then - hotspot_port="yes" - fi - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use CACAO on ppc and Zero on anything else - if test "x${hotspot_port}" != "xyes"; then - if use ppc; then - use_cacao="yes" - else - use_zero="yes" - fi - fi - - # Turn on CACAO if needed (non-HS archs) or requested - if test "x${use_cacao}" = "xyes"; then - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.' - ewarn 'If so, please rebuild with USE="-cacao"' - fi - cacao_config="--enable-cacao" - fi - - # Turn on Zero if needed (non-HS/CACAO archs) or requested - if test "x${use_zero}" = "xyes"; then - zero_config="--enable-zero" - fi - - # Use appropriate HotSpot tarball for architecture - if { use arm || use arm64; }; then - hs_tarball="${DISTDIR}/${AARCH64_GENTOO_TARBALL}"; - else - hs_tarball="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}"; - fi - - config+=" --with-parallel-jobs=$(makeopts_jobs)" - - if use javascript ; then - config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" - else - config+=" --without-rhino" - fi - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \ - --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \ - --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \ - --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \ - --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \ - --with-hotspot-src-zip="${hs_tarball}" \ - --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \ - --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \ - --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ - --with-pkgversion="Gentoo package ${PF}" \ - --disable-downloading --disable-Werror \ - --enable-system-lcms \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable nss) \ - $(use_enable jamvm) \ - $(use_enable kerberos system-kerberos) \ - $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ - $(use_enable smartcard system-pcsc) \ - $(use_enable sunec) \ - $(use_enable infinality) \ - ${zero_config} ${cacao_config} -} - -src_compile() { - # Would use GENTOO_VM otherwise. - export ANT_RESPECT_JAVA_HOME=TRUE - - # With ant >=1.8.2 all required tasks are part of ant-core - export ANT_TASKS="none" - - emake -} - -src_test() { - # Use Xvfb for tests - unset DISPLAY - - Xemake check -} - -src_install() { - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" - dodir "${dest}" - - dodoc README NEWS AUTHORS - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - - cd openjdk.build/j2sdk-image || die - - # Ensures HeadlessGraphicsEnvironment is used. - if ! use X; then - rm -r jre/lib/$(get_system_arch)/xawt || die - fi - - # Don't hide classes - rm lib/ct.sym || die - - #402507 - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - # doins can't handle symlinks. - cp -vRP bin include jre lib man "${ddest}" || die - - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README - - if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -A dtd -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 - - # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool - if use webstart || use nsplugin; then - dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings - dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings - fi - if use webstart; then - dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws - dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws - 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.6.0_pre18.ebuild b/dev-java/icedtea/icedtea-7.2.6.0_pre18.ebuild index 5f046f7..b5984f2 100644 --- a/dev-java/icedtea/icedtea-7.2.6.0_pre18.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.0_pre18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $ +# $Header: $ # Build written by Andrew John Hughes ([email protected]) # ********************************************************* @@ -55,6 +55,7 @@ EHG_REVISION="${ICEDTEA_PKG}${ICEDTEA_PRE}" LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" KEYWORDS="" +RESTRICT="test" IUSE="+X +alsa cacao cjk +cups debug doc examples infinality jamvm javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux smartcard +source sunec test zero +webstart" @@ -66,7 +67,7 @@ CUPS_COMMON_DEP=" >=net-print/cups-1.2.12" X_COMMON_DEP=" >=dev-libs/atk-1.30.0 - >=dev-libs/glib-2.26 + >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.5.3:2=[infinality?] >=x11-libs/cairo-1.8.8:= @@ -313,7 +314,7 @@ src_test() { src_install() { local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}/${dest}" + local ddest="${ED}${dest#/}" dodir "${dest}" dodoc README NEWS AUTHORS @@ -334,19 +335,18 @@ src_install() { touch jre/.systemPrefs/.system.lock || die touch jre/.systemPrefs/.systemRootModFile || die - # doins can't handle symlinks. + # doins doesn't preserve executable bits. cp -vRP bin include jre lib man "${ddest}" || die dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -A dtd -r ../docs/* || die + docinto html + dodoc -r ../docs/* fi if use examples; then - dodir "${dest}/share" - cp -vRP demo sample "${ddest}/share/" || die + cp -vRP demo sample "${ddest}" || die fi if use source; then
