* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2015-09-02 23:00 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2015-09-02 23:00 UTC (permalink / raw
To: gentoo-commits
commit: 4d01de01bb17c0f85add5ea5b94fe9c91e596841
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 1 23:15:37 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 23:00:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d01de01
dev-java/icedtea: Version bumps to address security vulnerabilities
6.1.13.8 to replace vulnerable 6.1.13.7, plus 7.2.5.6 and 7.2.6.1 to
replace vulnerable 7.2.5.5. 7.2.5.6 is needed for ppc because
non-HotSpot builds are broken under 7.2.6.1. See IcedTea #2058 [1].
Also fixes:
* Removal of binaries depending on X and ALSA (#401621)
* Building with IcedTea 6 (#531082)
* PaX marking (#541462)
* Building with GCC 5 (#548784)
[1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2058
Package-Manager: portage-2.2.20.1
dev-java/icedtea/Manifest | 38 ++--
dev-java/icedtea/files/6-more-memory.patch | 20 --
dev-java/icedtea/files/7-more-memory.patch | 96 ---------
...tea-6.1.13.7.ebuild => icedtea-6.1.13.8.ebuild} | 83 ++++----
...edtea-7.2.5.5.ebuild => icedtea-7.2.5.6.ebuild} | 155 +++++++++------
...edtea-7.2.5.5.ebuild => icedtea-7.2.6.1.ebuild} | 215 +++++++++++----------
dev-java/icedtea/metadata.xml | 15 +-
7 files changed, 265 insertions(+), 357 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 573aa64..366d921 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,15 +1,23 @@
-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-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 icedtea6-1.13.7.tar.xz 4511300 SHA256 a5ca64ae94ec27d28be91f4f0624164f9b4e6e92e417e52b296556005142183b SHA512 8e701f78d31888f4e2d362fcd46ee73aae67b57e3fe0b648f12b408298391149704aefac749294a0911581e1e70f30bff57d35a748b8e3e19e57a1911aa3d241 WHIRLPOOL 5131a79b6481b500ff70a50964f0eb206565d149196c5ab350c5f06015a73cf063dceeb3946a3c3bf45eb99a0f178ab180537089c906a7816356b4e289e69002
-DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234
+DIST icedtea-2.5-aarch64-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
+DIST icedtea-2.5-corba-a146d87ff390.tar.bz2 1070505 SHA256 d2c060e77ac62a2ace76cf7d098973803398a33c627b40401ca36e9344442136 SHA512 065f138eeedddf0703a2229d10c384a6003b4404a6fa2766ef3a1df8d29d71f1fddc609b9840ddaa31553a29c287eab33d368e227ccc25650aba4e98d50b4aa2 WHIRLPOOL 274acd68bf5e06d68bac50253ebb0e68bf0333188636ce7d96a403778af737547d4a3a154c1bc99c8151816b18dba25cdda1febf19cada7f2e9f3c0884a3c51e
+DIST icedtea-2.5-hotspot-383de087ee57.tar.bz2 7802328 SHA256 2831eeb73a4af0007fb31978e8a17aae1e9677bd545563956f99b1e0ec8bb923 SHA512 42d540632e315318e91a61ee21e2fb6c8e4b813d5bba734b9a1658be8799063a7547d6ee30846a070e806e63f77220a08e215d071c8f622cddfc1f923e9d7d07 WHIRLPOOL 747c4b273126989081789574a63a99ca8a03e9024e5626e9dd78c320df047bcb774610efb4a32cab8bf25b1e8b71f8b4268d298338edac512a46a43dc55179ba
+DIST icedtea-2.5-jaxp-3d9457280537.tar.bz2 2738979 SHA256 488480d8f69297e38f4b6df0131dfc445b59cad9b99327f29096ad820c972c38 SHA512 743931ba791ba09d5f0c45d589e5ba2562f6bed395f766619c8d1d15fd35f709e888017387d6cd01005156dca756450c7c0d286ca8a1585c012099164d977920 WHIRLPOOL 3f78e43fd0a31f97b944ff87133795a0a71be9a8b0b4efeb718ff215d947267270de8533d4378d82f2685cc69f9b599b5acf70564527fb37452666e998a8ebc1
+DIST icedtea-2.5-jaxws-bc5d03e92fd3.tar.bz2 2019582 SHA256 98c6c09d41ef3d179fb4f47e733be0f306ad85479473d5ec51c58acac07cf491 SHA512 a50929f80c40ddf11ad35571540a7d09c6b069b4d055dec41ff6c50d1d737bcf26fc7d14096d4528d184f7c83cadc61cf764664ecd25693afdbe48e59bf00c68 WHIRLPOOL c3e40d74a9ac4c2aa9e9a722c39de36f713b85b36517b8e1bc3b992d040a695c4fd50bafce5f4a4a8f55522faf580c16ba87818368d5a48d05e7e9a809880966
+DIST icedtea-2.5-jdk-48b2e510f78e.tar.bz2 31880992 SHA256 c944ef8d1810e861b54d3f8122960dd4b247b52ed23afd5b1cb053da988fffe4 SHA512 84f4122ec8336b5e3c71b17426f77d0b7719d0e688f3c5a9606db5749187e7858334de5438b683729b73fb91200b8cf087ee2166cd284baab38b3ac5d08ac6a1 WHIRLPOOL 68d2f890434afab440dd8e63fcfc00bdeb792b276ed9bbf2eb813197e2842d7d5903f1f3ca04df830118ced1fe2443b211faebf6f172d9e6dfab82fb1e2ebf22
+DIST icedtea-2.5-langtools-a6d3d79b4547.tar.bz2 1702391 SHA256 9f272f88ea0e8c090fb659c48f96f73fb066e6863f13f293e4ab19d691254693 SHA512 4a39600151f400cf6c17124757e4e8e877cf863445b9c95fb6c8c095f3f46072054f1b2f0262b4964594d6a330579cead0fdd423d61cfd425ec05b90121f79fe WHIRLPOOL 553ede3cf18308f79f4cedf57b2f491780532e23c546e158aca286076d6ab618d1fdf6d825a79fcf3c1a9fc18b2c130d2f84c29c37f3e19fe6e01a14bcb969d8
+DIST icedtea-2.5-openjdk-44f140fd2873.tar.bz2 127517 SHA256 d100158d10a47b064f700f516874c987f105e05947e580d5a143e00fb0b30fad SHA512 82bceecd1fb29b184ea45e5cfbf819b497707e041bc8d25a4ca8447e736db5f5d859dd9ad0129ba2fe300ce3d2ace18d8e528967ec43e467ef12991a860ea5d3 WHIRLPOOL e037bbbd9f85d81ce57759e68f40116db3178a43f4260806e0734fc2a1cd05f86f43cdd82aacaa8f4780e75a1ec7c7e0a7780baf722803a0a711506f0ba847f2
+DIST icedtea-2.5.6.tar.xz 2034152 SHA256 bb3c7e9fd372c737849d9d3129d935174492a0d924a2801223c822426338b8c4 SHA512 773601e4fc08d9a448f6f306e5678eca6f0b5b4704cdca66a40434de6e6b8208bc826e2a63235160b6b88bd92d746f8f7d1a74cfcfc0eaa58417ac3c8cb8aeb3 WHIRLPOOL 2443d7e1387f7d4d9f5b05d85a1768c9346e394713333862e62e24585091aaab0d74f9099c8aa1bd6add5b4cd5179132c238021f1a40576c7a40de43ab170bce
+DIST icedtea-2.6-corba-2545636482d6.tar.bz2 1071895 SHA256 cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8 SHA512 16a0bd71db484cd948ef3e941566af5b63d657f4d946caed0cef2fb104680beb21bd8633a6f48501c987cedb7949d7228ca7957e5fae3f4adc9ec48050193a12 WHIRLPOOL 98a317a85c4eed1098c7391f67e6687869337a1576bedc65ec4ddfde5885b4c514d12a5aebdac20a70970bb4c79d8b14f7bc153bf0b105b747f4e63ac79c3b79
+DIST icedtea-2.6-hotspot-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
+DIST icedtea-2.6-jaxp-ffbe529eeac7.tar.bz2 2737160 SHA256 c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb SHA512 1d8e68f0118f0e8465e333a8edd8aa9fdc16591c62bf4cc5c7791fb7f9acb97b9c6290fa4879a13138a68cb8b4fa93534cef3ebaee7bb8f3c0565595a3228493 WHIRLPOOL e85c5840883eaef4b1ebbb2dd0bae7d82457e01b6591653ac8d2d12a045f0736cb85b4c056a33614df7bb3b63cd61cf9e7caecdb5dae5f1d6be4f7ed1456cb53
+DIST icedtea-2.6-jaxws-b9776fab65b8.tar.bz2 2021243 SHA256 2d5ff95dc62ab7986973e15e9cf91d5596d2cf486ee52beab9eab62f70f2ae9f SHA512 0d5fc0001571381d151033b4e8ca98658bed3943c34faafc73ffea2d537d44b433ad49e246fc00335828418fc6e1c40d75fd1ee2280ebf0bf4014b4551f80bb0 WHIRLPOOL f35173656c30525678a1a09a5b30ef019816ee006e7c0682c3852df7a92523eef28b936418805d6dc874a31db3d3ddd1d02938227a8ba6b9080d17239c68ff74
+DIST icedtea-2.6-jdk-61d3e001dee6.tar.bz2 32421128 SHA256 a8083e75e14ddb4575bf2cd733e80a0074201b45d8debbe04f84564b32875363 SHA512 d5921683a63cca12fb73224ddd248ae37a986af1f9df131a130fb6f2f808631730298770382a90468b136c2bedb699985d129acb7e0fa2de662ab7543bcfba4c WHIRLPOOL 17d84d00f39774e08ba2934fd3e59cf5a372d0a8180576b2dbe6add617f36482cbd31f6d982e0b50b27fea54b9d35aec8552ab8d399cf7bd75047d4e55c1356d
+DIST icedtea-2.6-langtools-9c6e1de67d7d.tar.bz2 1710699 SHA256 6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43 SHA512 38136bba4d52b8de60e9a38f6ad47253d7513e46d82830ebb8f2f8659f66f99b7e3d7c4ad31c604cc5c516f1de331f2cdaf0ab0b37cff1dfd327c25ccc0f246f WHIRLPOOL 697447e27419d265a4e3f178f665ba59ba11ae0865acb4133c3e20096501b119b10c566c3a15ab5bd8b83a96fa48de36ca7be41cab92cff73c2e269e470bf333
+DIST icedtea-2.6-openjdk-39b2c4354d0a.tar.bz2 129720 SHA256 0168a0174ee47407139ee32458c4d2a298ba4f44260343b209250156e4da463f SHA512 b17315b58d6662953f7a6d73eb222a5a81165f55bed2f48f3d3915a169e8c8e503b5f22c59fce5cd3202ed2392f946f8701d9cff92d235ae44696d370f2efd28 WHIRLPOOL 5f14c467228f0a96c4b2e9b67a64836d871fbbfa13daec5b77adb8b39d8db4d20d18130f548c838826d58523f1cdc7972744ddbb564d07dc0fe27f6fa456a629
+DIST icedtea-2.6.1.tar.xz 2049108 SHA256 cce4fac1e729690e986ef6f6d1c47b507f622a61da33d57d2b0a8c12e23e2068 SHA512 b465a025cd44c5395b43067042882cf272f5a9c71f06380a9bc4dedbd5e99c512161c84eaad8175aeb87d0477cd568aca4968862f02b9bd969736d2ee904b990 WHIRLPOOL 682dc4e4b14a604b1f30bf4a315ec56e91fddb72445dfe4110517e0e0dc5c4deb68565accf0600e6959febd818161078f1c65cf74a87e848c803820afce2bdb1
+DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
+DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
+DIST icedtea-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
+DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
+DIST icedtea6-1.13.8.tar.xz 4566076 SHA256 fcbc623957e393a00d6189cb88288fed21c21860485092ea7719a12fbbc00adb SHA512 16ab0ec383809467266f9e55ce7d0333187041db3796aa940bc91078557397728b5c2b13b80d20b171b133da589207cbb7b9906719dd949af91df1cac207c9ec WHIRLPOOL 193b67b98c90b42252b894b4032d057073570a7b4460dd8c9f8f2ddce0647c6268702b8ceb519251d4eca489213ff20e384f0653cf8fae034947f72c8d0fa2a4
+DIST openjdk-6-src-b36-22_jul_2015.tar.xz 33757312 SHA256 c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 SHA512 52ce3ca2feae2fb00e0363d5c0a7e03efc79b8fe803049ee91e252e436433b6bcba0e0536f886f4def8297d34fb6c1bdcc5ddbbcac9344abee172c0adf6e126e WHIRLPOOL 026e1629cc0bf1ff0342d68eca3a9c822d51c2eea3a1cbf828aa001e59cce5946eca5681d89890fd7968f52b51592e5a472eb6f8e033a1906631da5c50b78684
diff --git a/dev-java/icedtea/files/6-more-memory.patch b/dev-java/icedtea/files/6-more-memory.patch
deleted file mode 100644
index a9017fc..0000000
--- a/dev-java/icedtea/files/6-more-memory.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- patches/cacao/launcher.patch.orig 2015-04-15 01:08:25.659995834 +0100
-+++ patches/cacao/launcher.patch 2015-05-18 22:12:49.492593647 +0100
-@@ -1,11 +1,14 @@
- --- openjdk/jdk/make/docs/Makefile.orig 2010-06-21 21:15:08.000000000 +0000
- +++ openjdk/jdk/make/docs/Makefile 2010-06-23 18:35:55.529822335 +0000
--@@ -70,7 +70,7 @@
-+@@ -68,9 +68,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 = 1024
-++ MAX_VM_MEMORY = 1792
- else
- - MAX_VM_MEMORY = 512
--+ MAX_VM_MEMORY = 768
-++ MAX_VM_MEMORY = 1280
- endif
-
- # List of all possible directories for javadoc to look for sources
diff --git a/dev-java/icedtea/files/7-more-memory.patch b/dev-java/icedtea/files/7-more-memory.patch
deleted file mode 100644
index c68ac53..0000000
--- a/dev-java/icedtea/files/7-more-memory.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- patches/cacao/memory.patch.orig 2015-04-15 01:08:12.571871465 +0100
-+++ patches/cacao/memory.patch 2015-05-18 21:23:17.604748525 +0100
-@@ -6,7 +6,7 @@
- BOOT_SOURCE_LANGUAGE_VERSION = 6
- BOOT_TARGET_CLASS_VERSION = 6
- -JAVAC_FLAGS = -g -encoding ascii
--+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
- 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.
-@@ -18,7 +18,7 @@
- BOOT_SOURCE_LANGUAGE_VERSION = 6
- BOOT_TARGET_CLASS_VERSION = 6
- -JAVAC_FLAGS = -g -encoding ascii
--+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
- 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.
-@@ -30,7 +30,7 @@
- BOOT_SOURCE_LANGUAGE_VERSION=6
- BOOT_TARGET_CLASS_VERSION=6
- -JAVAC_FLAGS=-g -encoding ascii
--+JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-++JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m
- BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-
- ProjectFile=jvm.vcproj
-@@ -42,14 +42,14 @@
- echo "false"; \
- fi)
- - MAX_VM_MEMORY := 512
--+ MAX_VM_MEMORY := 1536
-++ MAX_VM_MEMORY := 1792
- 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,9 +69,9 @@
-+@@ -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)
-@@ -59,8 +59,11 @@
- - MAX_VM_MEMORY = 1536
- + MAX_VM_MEMORY = 1792
- else
-- MAX_VM_MEMORY = 768
-+- MAX_VM_MEMORY = 768
-++ MAX_VM_MEMORY = 2048
- 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
-@@ -80,7 +83,7 @@
- BOOT_SOURCE_LANGUAGE_VERSION = 6
- BOOT_TARGET_CLASS_VERSION = 6
- -JAVAC_FLAGS = -g -encoding ascii
--+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
- 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.
---- patches/boot/compile-for-7-cacao-mem.patch.orig 2015-04-15 01:08:12.519870970 +0100
-+++ patches/boot/compile-for-7-cacao-mem.patch 2015-05-18 21:35:10.136903342 +0100
-@@ -9,7 +9,7 @@
- -BOOT_TARGET_CLASS_VERSION = 6
- +BOOT_SOURCE_LANGUAGE_VERSION = 7
- +BOOT_TARGET_CLASS_VERSION = 7
-- JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
- 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
-@@ -23,7 +23,7 @@
- -BOOT_TARGET_CLASS_VERSION = 6
- +BOOT_SOURCE_LANGUAGE_VERSION = 7
- +BOOT_TARGET_CLASS_VERSION = 7
-- JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
- 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
-@@ -37,6 +37,6 @@
- -BOOT_TARGET_CLASS_VERSION=6
- +BOOT_SOURCE_LANGUAGE_VERSION=7
- +BOOT_TARGET_CLASS_VERSION=7
-- JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m
- BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-
diff --git a/dev-java/icedtea/icedtea-6.1.13.7.ebuild b/dev-java/icedtea/icedtea-6.1.13.8.ebuild
similarity index 85%
rename from dev-java/icedtea/icedtea-6.1.13.7.ebuild
rename to dev-java/icedtea/icedtea-6.1.13.8.ebuild
index 469eb96..745d54b 100644
--- a/dev-java/icedtea/icedtea-6.1.13.7.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.8.ebuild
@@ -9,19 +9,19 @@
EAPI="5"
-inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils 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_BUILD="36"
+OPENJDK_DATE="22_jul_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}"
+CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
HOMEPAGE="http://icedtea.classpath.org"
@@ -37,8 +37,9 @@ SLOT="6"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
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"
+IUSE="+alsa +awt cacao cjk +cups debug doc examples +gtk 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="
@@ -46,8 +47,8 @@ ALSA_COMMON_DEP="
CUPS_COMMON_DEP="
>=net-print/cups-1.2.12"
X_COMMON_DEP="
- >=media-libs/freetype-2.3.5:2=
- >=x11-libs/gtk+-2.8:2=
+ >=media-libs/giflib-4.1.6:=
+ >=media-libs/libpng-1.2:0=
>=x11-libs/libX11-1.1.3
>=x11-libs/libXext-1.1.1
>=x11-libs/libXi-1.1.3
@@ -64,42 +65,37 @@ X_DEPEND="
x11-proto/xproto"
COMMON_DEP="
- >=media-libs/giflib-4.1.6:=
- >=media-libs/libpng-1.2:0=
+ >=media-libs/freetype-2.3.5:2=
+ >=media-libs/lcms-2.5
>=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"
+ 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
- )
- )
+ !dev-java/icedtea-web:6
+ media-fonts/dejavu
alsa? ( ${ALSA_COMMON_DEP} )
+ awt? ( ${X_COMMON_DEP} )
+ cjk? (
+ media-fonts/arphicfonts
+ media-fonts/baekmuk-fonts
+ media-fonts/lklug
+ media-fonts/lohit-fonts
+ media-fonts/sazanami
+ )
cups? ( ${CUPS_COMMON_DEP} )
+ gtk? ( >=x11-libs/gtk+-2.8:2 )
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}
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
|| (
>=dev-java/gcj-jdk-4.3
dev-java/icedtea-bin:6
@@ -113,9 +109,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
dev-lang/perl
>=dev-libs/libxslt-1.1.26
dev-libs/openssl
- virtual/pkgconfig
sys-apps/lsb-release
- ${X_DEPEND}
+ virtual/pkgconfig
pax_kernel? ( sys-apps/elfix )"
PDEPEND="webstart? ( dev-java/icedtea-web:0 )
@@ -157,9 +152,6 @@ src_unpack() {
}
java_prepare() {
- # ppc and/or CACAO demands more RAM to build.
- epatch "${FILESDIR}/${SLOT}-more-memory.patch"
-
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter
@@ -237,13 +229,15 @@ src_configure() {
--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
--with-pkgversion="Gentoo package ${PF}" \
--disable-downloading --disable-Werror \
+ $(use_enable awt system-gif) \
+ $(use_enable awt system-png) \
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
$(use_enable kerberos system-kerberos) \
$(use_enable nss) \
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
$(use_enable pulseaudio pulse-java) \
$(use_enable systemtap) \
- $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
${zero_config} ${cacao_config}
}
@@ -274,9 +268,13 @@ src_install() {
cd openjdk.build/j2sdk-image || die
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
+ if ! use alsa; then
+ rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ if ! use awt ; then
+ rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+ {,jre/}bin/policytool bin/appletviewer || die
fi
# Don't hide classes
@@ -332,16 +330,7 @@ src_install() {
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
}
diff --git a/dev-java/icedtea/icedtea-7.2.5.5.ebuild b/dev-java/icedtea/icedtea-7.2.5.6.ebuild
similarity index 80%
copy from dev-java/icedtea/icedtea-7.2.5.5.ebuild
copy to dev-java/icedtea/icedtea-7.2.5.6.ebuild
index 986d074..06dbc68 100644
--- a/dev-java/icedtea/icedtea-7.2.5.5.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.5.6.ebuild
@@ -12,17 +12,19 @@ SLOT="7"
inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
-ICEDTEA_VER=$(get_version_component_range 2-)
+ICEDTEA_VER=$(get_version_component_range 2-4)
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"
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="a146d87ff390.tar.bz2"
+JAXP_TARBALL="3d9457280537.tar.bz2"
+JAXWS_TARBALL="bc5d03e92fd3.tar.bz2"
+JDK_TARBALL="48b2e510f78e.tar.bz2"
+LANGTOOLS_TARBALL="a6d3d79b4547.tar.bz2"
+OPENJDK_TARBALL="44f140fd2873.tar.bz2"
+HOTSPOT_TARBALL="383de087ee57.tar.bz2"
+AARCH64_TARBALL="b19bc5aeaa09.tar.bz2"
+
CACAO_TARBALL="e215e36be9fc.tar.gz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -35,8 +37,8 @@ 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}"
+CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
DROP_URL="http://icedtea.classpath.org/download/drops"
ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
@@ -59,11 +61,14 @@ SRC_URI="
${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 ~arm ~ppc ~x86"
+KEYWORDS="~ppc"
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"
+IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
+ jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
+ pulseaudio selinux smartcard source +sunec test zero +webstart"
+
+REQUIRED_USE="gtk? ( awt )"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
@@ -71,20 +76,14 @@ ALSA_COMMON_DEP="
CUPS_COMMON_DEP="
>=net-print/cups-1.2.12"
X_COMMON_DEP="
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.26:2
- 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=
+ >=media-libs/giflib-4.1.6:=
+ >=media-libs/libpng-1.2:0=
>=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"
+ x11-libs/libXt"
X_DEPEND="
>=x11-libs/libXau-1.0.3
>=x11-libs/libXdmcp-1.0.2
@@ -95,49 +94,53 @@ X_DEPEND="
x11-proto/xproto"
COMMON_DEP="
- >=media-libs/giflib-4.1.6:=
+ >=dev-libs/glib-2.26:2
+ >=dev-util/systemtap-1
+ media-libs/fontconfig
+ >=media-libs/freetype-2.5.3:2=[infinality?]
>=media-libs/lcms-2.5
- >=media-libs/libpng-1.2:0=
>=sys-libs/zlib-1.2.3:=
virtual/jpeg:0=
+ gtk? (
+ >=dev-libs/atk-1.30.0
+ >=x11-libs/cairo-1.8.8:=
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.8:2=
+ >=x11-libs/pango-1.24.5
+ )
javascript? ( dev-java/rhino:1.6 )
- nss? ( >=dev-libs/nss-3.12.5-r1 )
kerberos? ( virtual/krb5 )
- >=dev-util/systemtap-1
+ nss? ( >=dev-libs/nss-3.12.5-r1 )
smartcard? ( sys-apps/pcsc-lite )
- sunec? ( >=dev-libs/nss-3.16.1-r1 )
- !dev-java/icedtea-web:7"
+ sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-# 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
- )
- )
+ !dev-java/icedtea-web:7
+ >=gnome-base/gsettings-desktop-schemas-3.12.2
+ media-fonts/dejavu
alsa? ( ${ALSA_COMMON_DEP} )
+ awt? ( ${X_COMMON_DEP} )
+ cjk? (
+ media-fonts/arphicfonts
+ media-fonts/baekmuk-fonts
+ media-fonts/lklug
+ media-fonts/lohit-fonts
+ media-fonts/sazanami
+ )
cups? ( ${CUPS_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )
- >=gnome-base/gsettings-desktop-schemas-3.12.2"
+ 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
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
|| (
>=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
@@ -147,10 +150,9 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
dev-lang/perl
>=dev-libs/libxslt-1.1.26
dev-libs/openssl
- virtual/pkgconfig
sys-apps/attr
sys-apps/lsb-release
- ${X_DEPEND}
+ virtual/pkgconfig
pax_kernel? ( sys-apps/elfix )"
PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
@@ -180,6 +182,7 @@ pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-7 icedtea-bin-7
+ icedtea-6 icedtea-bin-6
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
@@ -193,8 +196,10 @@ src_unpack() {
}
java_prepare() {
- # ppc and/or CACAO demands more RAM to build.
- epatch "${FILESDIR}/${SLOT}-more-memory.patch"
+ if ! use cups; then
+ # CUPS is always needed at build time but you can at least make it dlopen.
+ sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
+ fi
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter
@@ -204,7 +209,7 @@ java_prepare() {
}
src_configure() {
- local cacao_config config hotspot_port hs_tarball use_cacao use_zero zero_config
+ local cacao_config config hotspot_port hs_tarball jamvm_config use_cacao use_jamvm use_zero zero_config
local vm=$(java-pkg_get-current-vm)
# gcj-jdk ensures ecj is present.
@@ -220,6 +225,11 @@ src_configure() {
use_zero="yes"
fi
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
# Use CACAO if requested
if use cacao; then
use_cacao="yes"
@@ -241,6 +251,15 @@ src_configure() {
fi
fi
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ jamvm_config="--enable-jamvm"
+ fi
+
# Turn on CACAO if needed (non-HS archs) or requested
if test "x${use_cacao}" = "xyes"; then
if test "x${hotspot_port}" = "xyes"; then
@@ -252,6 +271,9 @@ src_configure() {
# Turn on Zero if needed (non-HS/CACAO archs) or requested
if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
zero_config="--enable-zero"
fi
@@ -284,19 +306,23 @@ src_configure() {
--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}" \
+ --with-pkgversion="Gentoo ${PF}" \
--disable-downloading --disable-Werror \
- --enable-system-lcms \
+ --disable-hotspot-tests --disable-jdk-tests \
+ --enable-system-lcms --enable-system-jpeg \
+ --enable-system-zlib \
+ $(use_enable awt system-gif) \
+ $(use_enable awt system-png) \
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
- $(use_enable nss) \
- $(use_enable jamvm) \
+ $(use_enable gtk system-gtk) \
+ $(use_enable infinality) \
$(use_enable kerberos system-kerberos) \
+ $(use_enable nss) \
$(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}
+ ${zero_config} ${cacao_config} ${jamvm_config}
}
src_compile() {
@@ -326,9 +352,13 @@ src_install() {
cd openjdk.build/j2sdk-image || die
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
+ if ! use alsa; then
+ rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ if ! use awt; then
+ rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
+ {,jre/}bin/policytool bin/appletviewer || die
fi
# Don't hide classes
@@ -392,9 +422,6 @@ src_install() {
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
}
diff --git a/dev-java/icedtea/icedtea-7.2.5.5.ebuild b/dev-java/icedtea/icedtea-7.2.6.1.ebuild
similarity index 73%
rename from dev-java/icedtea/icedtea-7.2.5.5.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.1.ebuild
index 986d074..2027cea 100644
--- a/dev-java/icedtea/icedtea-7.2.5.5.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.1.ebuild
@@ -10,20 +10,21 @@
EAPI="5"
SLOT="7"
-inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
-ICEDTEA_VER=$(get_version_component_range 2-)
+ICEDTEA_VER=$(get_version_component_range 2-4)
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"
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="2545636482d6.tar.bz2"
+JAXP_TARBALL="ffbe529eeac7.tar.bz2"
+JAXWS_TARBALL="b9776fab65b8.tar.bz2"
+JDK_TARBALL="61d3e001dee6.tar.bz2"
+LANGTOOLS_TARBALL="9c6e1de67d7d.tar.bz2"
+OPENJDK_TARBALL="39b2c4354d0a.tar.bz2"
+HOTSPOT_TARBALL="b19bc5aeaa09.tar.bz2"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
@@ -33,10 +34,9 @@ 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}"
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
DROP_URL="http://icedtea.classpath.org/download/drops"
ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
@@ -51,19 +51,20 @@ SRC_URI="
${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}
- arm? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
- arm64? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
- !arm? ( !arm64? ( ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_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 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
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"
+IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
+ jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
+ pulseaudio sctp selinux smartcard source +sunec test zero +webstart"
+
+REQUIRED_USE="gtk? ( awt )"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
@@ -71,20 +72,14 @@ ALSA_COMMON_DEP="
CUPS_COMMON_DEP="
>=net-print/cups-1.2.12"
X_COMMON_DEP="
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.26:2
- 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=
+ >=media-libs/giflib-4.1.6:=
+ >=media-libs/libpng-1.2:0=
>=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"
+ x11-libs/libXt"
X_DEPEND="
>=x11-libs/libXau-1.0.3
>=x11-libs/libXdmcp-1.0.2
@@ -95,49 +90,54 @@ X_DEPEND="
x11-proto/xproto"
COMMON_DEP="
- >=media-libs/giflib-4.1.6:=
+ >=dev-libs/glib-2.26:2
+ >=dev-util/systemtap-1
+ media-libs/fontconfig
+ >=media-libs/freetype-2.5.3:2=[infinality?]
>=media-libs/lcms-2.5
- >=media-libs/libpng-1.2:0=
>=sys-libs/zlib-1.2.3:=
virtual/jpeg:0=
+ gtk? (
+ >=dev-libs/atk-1.30.0
+ >=x11-libs/cairo-1.8.8:=
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.8:2=
+ >=x11-libs/pango-1.24.5
+ )
javascript? ( dev-java/rhino:1.6 )
- nss? ( >=dev-libs/nss-3.12.5-r1 )
kerberos? ( virtual/krb5 )
- >=dev-util/systemtap-1
+ nss? ( >=dev-libs/nss-3.12.5-r1 )
+ sctp? ( net-misc/lksctp-tools )
smartcard? ( sys-apps/pcsc-lite )
- sunec? ( >=dev-libs/nss-3.16.1-r1 )
- !dev-java/icedtea-web:7"
+ sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-# 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
- )
- )
+ !dev-java/icedtea-web:7
+ >=gnome-base/gsettings-desktop-schemas-3.12.2
+ media-fonts/dejavu
alsa? ( ${ALSA_COMMON_DEP} )
+ awt? ( ${X_COMMON_DEP} )
+ cjk? (
+ media-fonts/arphicfonts
+ media-fonts/baekmuk-fonts
+ media-fonts/lklug
+ media-fonts/lohit-fonts
+ media-fonts/sazanami
+ )
cups? ( ${CUPS_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )
- >=gnome-base/gsettings-desktop-schemas-3.12.2"
+ 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
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
|| (
>=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
@@ -147,10 +147,9 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
dev-lang/perl
>=dev-libs/libxslt-1.1.26
dev-libs/openssl
- virtual/pkgconfig
sys-apps/attr
sys-apps/lsb-release
- ${X_DEPEND}
+ virtual/pkgconfig
pax_kernel? ( sys-apps/elfix )"
PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
@@ -180,6 +179,7 @@ pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-7 icedtea-bin-7
+ icedtea-6 icedtea-bin-6
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
@@ -193,8 +193,10 @@ src_unpack() {
}
java_prepare() {
- # ppc and/or CACAO demands more RAM to build.
- epatch "${FILESDIR}/${SLOT}-more-memory.patch"
+ if ! use cups; then
+ # CUPS is always needed at build time but you can at least make it dlopen.
+ sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
+ fi
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter
@@ -204,7 +206,7 @@ java_prepare() {
}
src_configure() {
- local cacao_config config hotspot_port hs_tarball use_cacao use_zero zero_config
+ local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
local vm=$(java-pkg_get-current-vm)
# gcj-jdk ensures ecj is present.
@@ -220,6 +222,11 @@ src_configure() {
use_zero="yes"
fi
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
# Use CACAO if requested
if use cacao; then
use_cacao="yes"
@@ -241,6 +248,15 @@ src_configure() {
fi
fi
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ jamvm_config="--enable-jamvm"
+ fi
+
# Turn on CACAO if needed (non-HS archs) or requested
if test "x${use_cacao}" = "xyes"; then
if test "x${hotspot_port}" = "xyes"; then
@@ -252,16 +268,12 @@ src_configure() {
# Turn on Zero if needed (non-HS/CACAO archs) or requested
if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
zero_config="--enable-zero"
fi
- # 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
@@ -278,25 +290,33 @@ src_configure() {
--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-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_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}" \
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --with-pkgversion="Gentoo ${PF}" \
--disable-downloading --disable-Werror \
- --enable-system-lcms \
+ --disable-hotspot-tests --disable-jdk-tests \
+ --enable-system-lcms --enable-system-jpeg \
+ --enable-system-zlib \
+ $(use_enable awt system-gif) \
+ $(use_enable awt system-png) \
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
- $(use_enable nss) \
- $(use_enable jamvm) \
+ $(use_enable gtk system-gtk) \
+ $(use_enable infinality) \
$(use_enable kerberos system-kerberos) \
+ $(use_enable nss) \
$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ $(use_enable sctp system-sctp) \
$(use_enable smartcard system-pcsc) \
$(use_enable sunec) \
- $(use_enable infinality) \
- ${zero_config} ${cacao_config}
+ ${zero_config} ${cacao_config} ${jamvm_config}
}
src_compile() {
@@ -317,44 +337,26 @@ src_test() {
}
src_install() {
+ default
+
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- dodoc README NEWS AUTHORS
- dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
- cd openjdk.build/j2sdk-image || die
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
+ if ! use alsa; then
+ rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
fi
- # Don't hide classes
- rm lib/ct.sym || die
-
- #402507
- mkdir jre/.systemPrefs || die
- touch jre/.systemPrefs/.system.lock || die
- touch jre/.systemPrefs/.systemRootModFile || die
-
- # doins doesn't preserve executable bits.
- cp -vRP bin include jre lib man "${ddest}" || die
-
- dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
- if use doc; then
- docinto html
- dodoc -r ../docs/*
+ if ! use awt; then
+ rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
+ "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
fi
- if use examples; then
- cp -vRP demo sample "${ddest}" || die
+ if ! use examples; then
+ rm -r "${ddest}"/demo "${ddest}"/sample || die
fi
- if use source; then
- cp src.zip "${ddest}" || die
+ if ! use source; then
+ rm -v "${ddest}"/src.zip || die
fi
# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
@@ -370,9 +372,6 @@ src_install() {
# 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
@@ -392,9 +391,6 @@ src_install() {
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
}
@@ -408,4 +404,9 @@ pkg_preinst() {
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
+
+ gnome2_icon_savelist;
}
+
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 3f20a4b..3b78fab 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -9,22 +9,21 @@
<description>Proxy Maintainer</description>
</maintainer>
<maintainer>
- <email>caster@gentoo.org</email>
- <name>Vlastimil Babka</name>
- <description>Committer (CC me)</description>
+ <email>chewi@gentoo.org</email>
+ <name>James Le Cuirot</name>
+ <description>Committer</description>
</maintainer>
<longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription>
<use>
- <flag name="X">Make X buildtime-only depenency.</flag>
- <flag name="alsa">Make alsa buildtime-only dependency.</flag>
- <flag name="cacao">Build CACAO virtual machine on platforms supporting HotSpot. (experimental)</flag>
- <flag name="cups">Make CUPS build-only dependency.</flag>
+ <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
+ <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
<flag name="infinality">Enable better font rendering using fontconfig.</flag>
<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
<flag name="nss">Enable NSS security provider support.</flag>
<flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
- <flag name="pax_kernel">For building when running a PaX enabled kernel.</flag>
+ <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
+ <flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
<flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
<flag name="sunec">Build the SunEC provider against system NSS</flag>
<flag name="systemtap">Enable SystemTap probes in HotSpot.</flag>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2016-01-07 15:36 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-01-07 15:36 UTC (permalink / raw
To: gentoo-commits
commit: dbb4430a5a7e54165041053fc5817aeafce7e6d4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 15:36:14 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 15:36:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb4430a
dev-java/icedtea: Patch against icedtea bug #2781
CACAO have now fixed this upstream and it will hopefully make it into
the next icedtea release.
Package-Manager: portage-2.2.26
dev-java/icedtea/files/icedtea-bug-2781.patch | 42 ++++++++++++++++++++++
...7.2.6.3-r3.ebuild => icedtea-7.2.6.3-r4.ebuild} | 5 +--
2 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/dev-java/icedtea/files/icedtea-bug-2781.patch b/dev-java/icedtea/files/icedtea-bug-2781.patch
new file mode 100644
index 0000000..5cc32c3
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-bug-2781.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User Stefan Ring <stefan@complang.tuwien.ac.at>
+# Date 1452083014 -3600
+# Node ID 9295d3c06eb706407b5af1412674c8f0a0ce9fdf
+# Parent 468081e3e037df27b6427aa298dfaaa20f4ba4bf
+Fix some oversights during a large macro cleanup in 1e9787c3484e
+
+diff --git cacao/cacao/src/vm/jit/verify/typecheck-common.cpp cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
+--- cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
++++ cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
+@@ -281,7 +281,7 @@
+
+ dv->type = sv->type;
+ if (dv->type == TYPE_ADR) {
+- dv->typeinfo = sv->typeinfo;
++ typeinfo_t::clone(sv->typeinfo, dv->typeinfo);
+ }
+ }
+ return true;
+diff --git cacao/cacao/src/vm/jit/verify/typeinfo.cpp cacao/cacao/src/vm/jit/verify/typeinfo.cpp
+--- cacao/cacao/src/vm/jit/verify/typeinfo.cpp
++++ cacao/cacao/src/vm/jit/verify/typeinfo.cpp
+@@ -1674,6 +1674,7 @@
+ classref_or_classinfo common;
+ classref_or_classinfo elementclass;
+ int dimension;
++ ArrayType elementtype;
+ bool changed;
+ typecheck_result r;
+
+diff --git cacao/cacao/src/vm/resolve.cpp cacao/cacao/src/vm/resolve.cpp
+--- cacao/cacao/src/vm/resolve.cpp
++++ cacao/cacao/src/vm/resolve.cpp
+@@ -703,7 +703,7 @@
+
+ /* uninitialized objects are illegal here */
+
+- if (subtinfo->is_primitive()) {
++ if (subtinfo->is_newobject()) {
+ exceptions_throw_verifyerror(refmethod,
+ "Invalid use of uninitialized object");
+ return resolveFailed;
diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild b/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
similarity index 98%
rename from dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
index bd433a4..7621ae1 100644
--- a/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
@@ -266,8 +266,9 @@ src_configure() {
cacao_config="--enable-cacao"
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
- export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
- ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781
+ export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch icedtea-bug-2781.patch"
+ ln -snf "${FILESDIR}"/{${SLOT}-cacao-pr-157,icedtea-bug-2781}.patch . || die
fi
# Turn on Zero if needed (non-HS/CACAO archs) or requested
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2016-04-24 10:17 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-04-24 10:17 UTC (permalink / raw
To: gentoo-commits
commit: 398a6d1309de3ee878e7e586a894c7c921a88d30
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 10:15:32 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 10:17:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=398a6d13
dev-java/icedtea: Bump to 7.2.6.6 wrt security bug #581028
Non-Zero HotSpot builds on arm are currently disabled as the JIT code
behind it is currently broken.
Package-Manager: portage-2.2.28
dev-java/icedtea/Manifest | 16 +--
dev-java/icedtea/files/7-cacao-pr-157.patch | 139 ---------------------
...ea-7.2.6.5-r1.ebuild => icedtea-7.2.6.6.ebuild} | 27 ++--
3 files changed, 18 insertions(+), 164 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index f200eb7..bfc60fa 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,11 +1,11 @@
-DIST icedtea-2.6-corba-389551542e13.tar.bz2 1072454 SHA256 427969fdd78513a11ddd9d5131a068e0b26ca2c8f14951bf8b161fecd07fe77f SHA512 b9b48e79dc183e823caa2bc8600de001618ce5c9a10671639ade9cc6515ddf90a8a4554cf76c7633632ffc71833f247b39ae184a8c625f11cdd92a393eefb201 WHIRLPOOL 0a14f7f118c4bd4623b0351f870927e08485d79ede3153b7d171f9fc303b8a8dba182185c1db9b21fd88ad094d8706890c77cbfbb5dccb8a587130e53c37d622
-DIST icedtea-2.6-hotspot-04d7046d2d41.tar.bz2 8164174 SHA256 43983232fb10abeac99478e7045c04a93fef86185e2b9ee9c7b46f2903441cfc SHA512 7ecd1880eaa3e5c5dcad9ed083bd530e13f0a13476ee4594c37d2bbb55ca816423609075e97aadb3072010163bcb9b16935b5047688315af74a2d63099323a38 WHIRLPOOL 268d38ac11f1af3648e482d8e27b327b2d2ca7fcf7f2eab1350374c2dde4afa8373ac97ed3ef9531921bae8dbe7a07114c0dc2f14dc50f04bb50e078b0197aa7
-DIST icedtea-2.6-jaxp-8a56658cb829.tar.bz2 2732669 SHA256 7bb5e1bc9f0807061e157aeb356dd0e3b9fa019fb316beee3aa0181a335ba37a SHA512 64ad347aebc763ff8f9db3821b0197a400ffb5c6c75900be9b25d2af0b090323bebb0ab44b6f43a8d5c1a13f9d779dadf07a99d245281cfbcc0673db30b063cb WHIRLPOOL 83c9773b809dd85baa637152b3bbc2d7f9c7c61c4659a16edbc883ea0efaa70dde0533395b1e8b1f17fcc8b2f9cccd85e244e773b16bcf0cc735b8f51f4c076c
-DIST icedtea-2.6-jaxws-9c049d7f5adc.tar.bz2 2021930 SHA256 4e759ade7e47713f6f26afc1ffcd02f2edf967582fae2ec6b4d73dc81be926d0 SHA512 8b71f5bcdad6e2191c100d8095aa0bbffaafc79a4a4b81d495430ba6c4ea1287b407f36333def5384f646cd18d916270b900f8af475641ed8c5d3361dc613d69 WHIRLPOOL f8cbe3646698c3d8b564b700ea53c2e1cf37ce8f47498a286173cfe338330bc640844c4e0d6271e283c84c2db71f76f7bf8127fbf93145ed87a972662a3df32a
-DIST icedtea-2.6-jdk-e727fe32654c.tar.bz2 32423186 SHA256 cd3810553b1066c21f2fe08a73de72e38ba7e72295cd32dec70db481a24421ba SHA512 459c0ae24f9514020d794d8acf0189c0ef9dff589f034a061cea605890ae7ed6327ab4adc1761be406bd8e3c808d3f4506b3610b8096c5045844f54aac51c994 WHIRLPOOL 861ca3d1163357e5c5562146e8940082bfbc36e7cb12ac0517d68f5d4a4e98c8ddeeabc0376d2b9db2bbfd2742c64014f7deaa8553269a798be8e5e3f399969b
-DIST icedtea-2.6-langtools-f6593c32cc46.tar.bz2 1707644 SHA256 6c6c676c60af61638a0c3176f0312fcc0abad16d1d3cdbe11aeefcc3357a78d9 SHA512 d469a26381d5163998c85f9afa33facd1d46650b7097cdeb190d4b50b087abea5fb3b4caf8a72e228e5c7d012dc1e2c44c0bca6d4363be354f2923f48127aa8e WHIRLPOOL 940591f4601f00eb3ba5422a7687e148a4acb61ece99e29daa0eff145f4897750b9780af5cceb21aa1a1a951d4ce6dc84427bb76bbb42a23acab5e977cca501c
-DIST icedtea-2.6-openjdk-8e728c41fec5.tar.bz2 130030 SHA256 c66f56a91a6fa9e3c889bbbc5432a4e082b7d3735188fb508fa7ec70c142abdb SHA512 10626285c0dda1fa9ba3b843cc70d61c1d417dd87e5def60d8df6d19b4ce40d2b0b0e007b6a52b4468b5a152aa50f9efc6a45dfe6f31cfbf2d47897bee3ca13f WHIRLPOOL 8f4f5e5c4e75a0d9aae89872482925a37b80a7e85d74a8d6968c28fa3dd488176ddeff9c62f81b90a4e994ac2c04d6704b6a2eba4cf734783ff106af8942ce25
-DIST icedtea-2.6.5.tar.xz 2072216 SHA256 e752304496bb11ae9952beb11e6743dd84e55b340eaca716f310c5a0f48b53f7 SHA512 8b6dd1fcec8ceaa0525872123ab9327093c5df35b322569942909a0a61e0bd4225984e2f17f30bd392b829368379cbd3efc8b14ce09a442b9d13eaa78d749d5a WHIRLPOOL 8bd4512ddbeceeda7515a4e74555243582a8201eb800f7a357cb67e9744f30d030fbadd571e4130a18d9c43cbb4f25227e453e95976ae83118e0a79f4f6f2b39
+DIST icedtea-2.6-corba-ca3e3c4c5a61.tar.bz2 1072731 SHA256 ce886c97a150465df3a36c4281d5f36ba8ee2b081b5b76ecfbefaddb723b6a2d SHA512 377893e3ff8285966cb06ca2c4b276a4241df191743b585feac9c142135ec5b74615433c5a52576206077d282683ebab5f05a7130921ff76b5b7916561d6926b WHIRLPOOL 7889d1af35038e8f213fa9213f7051d62ecaf9e8034888483947299e64a80b60fac468c36589577d1608175e71e7f5ebe7c73725a4943d99b064427a0b19211a
+DIST icedtea-2.6-hotspot-3022a3d80efd.tar.bz2 8164643 SHA256 a4e8f4fef724a34e5eece3c2c1de4e60ff12e752549c8df11ddcd6f3042e0dc2 SHA512 44e99f086a16ccec2460ce8335ecabb3893f81abe64b4940ac66cd17d4651e37f6fdc1706ecd8150d5310cf240359ccac0aa77d96fab82a8216e1ddfd88ab70b WHIRLPOOL 35a7951ddf1ec416e031faa1c65210f76b58693ab41442c2eb0ad4ec631da8942feefb050dd9c173a43c9ad76ad3e1e7e9529375ada9f321e4bd876558d13002
+DIST icedtea-2.6-jaxp-683427778edf.tar.bz2 2733076 SHA256 679eb46054afea3098713beee85639c4a5a5af881e94be527409feaea4272d30 SHA512 26fe3739e85f63eb2149db4c89dbe31f4d54c1c7265802e456ad4df4212a9218b60667c6ab33e6f2874ac9b86d12630b6a9877d9a2b104f27276a564498d5678 WHIRLPOOL 9765849715ed80900e8c18a7a83e48af79c9b187bd152c294198b316c5973df7388d92c5b5653269a00fd318325571ddcd23101f8795a37be1a82c565927c244
+DIST icedtea-2.6-jaxws-63f7bf7ed2d4.tar.bz2 2022402 SHA256 f9af138096f4d11e381c3cc949dd3ee37cee5bfff15dc21cff5c16a2f9e7c218 SHA512 05c0f06f8f77c133aed646b0172cd40ffbe606f2d3e092b89f5f6f5a53dd489ef87b0abd9bb3013bf31ab2ea693c2ab627c4da7f19075628ada28a4ba1d85735 WHIRLPOOL ac19707fc39e8255762977c9b86991d8f425e18da6cbdf4fff33cb2f911bbb0ce9891c4d8c9b912aa5a13460ca188ac81388b099b7d1f4e63d98bb76927b8e6e
+DIST icedtea-2.6-jdk-55c38c1ace75.tar.bz2 32434755 SHA256 1baa92ca72db1b80fff18ca26bd49e5fd5f2927df9eceebf3456cbd86a710a9f SHA512 7fe81eaa9f1f96f95276d8a4fe5c48817324d487e99c43360cbcccf48d2bef7e43be3bc0f38c9cbdaf4a63794c83d04fb362bd64a3f18e886d9f87868024d6d8 WHIRLPOOL 8b00b6c3fb18970896bd943cfee01929edb8b2c4f3e74caef7e5629b3de34aeca0cdb7ed911f9627f8bb83221ed3cfc3319a1b65159a0a2cfd4799daeb28e52d
+DIST icedtea-2.6-langtools-e42dd50480d3.tar.bz2 1708918 SHA256 54bb2cee7b4fc5bbc63a4c9d7008602e12f75431c7f129ade7c405b53c2363f3 SHA512 55ad5b729fe85710089017402e575b5f5f2426c54401bb40202af2bb7af722d2b3370f12f5ba6be941b60177ee45ad15911fdca554c213c09c93d9404d85565c WHIRLPOOL 6c4d5dec34dfdcd9ffc831020790529193b665f92cc7bee33df8e5a7c97a0dc51f1adb5b675c81fb347f07ed4854bcb6bec34714935995826573c2c1464d186f
+DIST icedtea-2.6-openjdk-882cfee70fe8.tar.bz2 130156 SHA256 24f813e6cb938272a4da37b46b48aa86820b13be0747747e6c8fb4aad72cadf3 SHA512 fe72b626a60e8dc7939d35069ed90e8053676e8b45a9eca78d6abb2c7e3bff15ed7f84300542e726a8cd6a8fcc73ae2f779843de79654dd6cb4ef04fb134c222 WHIRLPOOL 4cc443730734c5b3d4f57de7b3ecfaefe8029ce4143b60e80011d871f322076816edc11a39c718f0cfa6d2283315186b8fe488b1f8b5aea16736a88970af513b
+DIST icedtea-2.6.6.tar.xz 2072632 SHA256 79949744436158d9ded3a758c22da7629f843ea3913afdffc65ea0f1a26d544a SHA512 ba603ec6c16b5642d1591717ea14378ebe045e4128a8eb517de94df32c3bb03b636f051e682cf5990c3a1bcbf2460a97965cdc139bf265fe5f97bedaa539092c WHIRLPOOL 7716613f6463dcaa514c980ef0850c2ad42319275b504d0ec55e0dd54e0dbff5c74af4f53b0e466dbb41c4ab5ae2694cb3a5f74b19de4913790ef9bff6554985
DIST icedtea-3.0-corba-37af47894175.tar.xz 936876 SHA256 d77480d5d0c9620562a66b01fda9be4de58c2881cec680b4f2682ef09087b3cc SHA512 21b2f069f1eaca62a46518173de3c1368963db489f436d5ad705c7cb36ecc259d342c059c4c593427e96604164f78be761e1fe4118d8517ece3630280524ad30 WHIRLPOOL ac7292f0a32cfa7b58d3616b704bfd90ead49044bb51fccc1ca87900555d15f28b3d3137512fe007b40f0a130d3e6eb9d805112725914b0f0721ac8dbad8794c
DIST icedtea-3.0-hotspot-5e587a29a6aa.tar.xz 6766584 SHA256 76717fa6a84fde60075c19fbc261709bd9c3b849952c817c0ac6b46b757ac0d7 SHA512 c8a2355ef81ad1dd4a2f6be0e5cdaba9d6d66a4fd5514718cc09ed391bcce269a17a34fbc89d7c6d3e7a2632f2ffcb0028a8faaf41649055a096407a24cacd0e WHIRLPOOL 4e83ea5ee631ca76e7919a944f9f1a3a007ca951a99552ee087bd6d2d6e027c5ce9963ec3c593c8132a984dd9818fc42abfb0792b3628d44491488700b20ec09
DIST icedtea-3.0-jaxp-4ed5441e40e1.tar.xz 2296120 SHA256 4ccce5442642561cda78116a019f5c0ea690725a374ccf5695b3af00393d26e8 SHA512 47e968f674176f74706ab268098a1635a54de7282993abc46a1c72c8d24f21216ed898bbca830623f5afd11912a744138547d6d22a82f68fa1ba15ccc7a9e375 WHIRLPOOL e94f961336d1e8b176ab2486ae98852049f930af3ee31dd3f7491544244c78d6b5657334fb45b9cc863bb6c377a6b1ab5d71df1257d02bc9e79513cd41ecc2ce
diff --git a/dev-java/icedtea/files/7-cacao-pr-157.patch b/dev-java/icedtea/files/7-cacao-pr-157.patch
deleted file mode 100644
index 0701363..0000000
--- a/dev-java/icedtea/files/7-cacao-pr-157.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -Naur cacao/cacao/src/vm/options.cpp cacao/cacao/src/vm/options.cpp
---- cacao/cacao/src/vm/options.cpp 2014-12-12 21:14:45.000000000 +0000
-+++ cacao/cacao/src/vm/options.cpp 2015-12-23 21:01:37.644275263 +0000
-@@ -26,6 +26,7 @@
- #include "config.h"
-
- #include <limits.h>
-+#include <stddef.h>
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -60,9 +61,9 @@
-
- bool opt_run = true;
-
--s4 opt_heapmaxsize = 0; /* maximum heap size */
--s4 opt_heapstartsize = 0; /* initial heap size */
--s4 opt_stacksize = 0; /* thread stack size */
-+size_t opt_heapmaxsize = 0; /* maximum heap size */
-+size_t opt_heapstartsize = 0; /* initial heap size */
-+size_t opt_stacksize = 0; /* thread stack size */
-
- bool opt_verbose = false;
- bool opt_debugcolor = false; /* use ANSI terminal sequences */
-diff -Naur cacao/cacao/src/vm/options.hpp cacao/cacao/src/vm/options.hpp
---- cacao/cacao/src/vm/options.hpp 2014-12-12 21:14:45.000000000 +0000
-+++ cacao/cacao/src/vm/options.hpp 2015-12-23 21:01:37.645275246 +0000
-@@ -26,6 +26,7 @@
- #ifndef OPTIONS_HPP_
- #define OPTIONS_HPP_ 1
-
-+#include <stddef.h> // for size_t
- #include <stdint.h> // for int64_t
- #include <stdio.h> // for FILE
- #include "config.h" // for ENABLE_DEBUG_FILTER, etc
-@@ -77,9 +78,9 @@
- extern bool opt_jar;
- extern bool opt_run;
-
--extern s4 opt_heapmaxsize;
--extern s4 opt_heapstartsize;
--extern s4 opt_stacksize;
-+extern size_t opt_heapmaxsize;
-+extern size_t opt_heapstartsize;
-+extern size_t opt_stacksize;
-
- extern bool opt_verbose;
- extern bool opt_debugcolor;
-diff -Naur cacao/cacao/src/vm/vm.cpp cacao/cacao/src/vm/vm.cpp
---- cacao/cacao/src/vm/vm.cpp 2014-12-12 21:14:45.000000000 +0000
-+++ cacao/cacao/src/vm/vm.cpp 2015-12-23 21:01:38.046268504 +0000
-@@ -29,9 +29,14 @@
- #include <cerrno>
- #include <cstdlib>
- #include <exception>
-+#include <stddef.h>
- #include <stdint.h>
- #include <inttypes.h>
-
-+#if defined(__LINUX__)
-+#include <unistd.h>
-+#endif
-+
- #include "md-abi.hpp"
-
- #include "mm/codememory.hpp"
-@@ -690,6 +695,19 @@
- opt_heapstartsize = HEAP_STARTSIZE;
- opt_stacksize = STACK_SIZE;
-
-+#if defined(__LINUX__)
-+ // Calculate 1/4 of the physical memory.
-+ size_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
-+
-+ if (qmem > INT32_MAX) {
-+ // Allocate no more than 2GB.
-+ opt_heapmaxsize = INT32_MAX;
-+ } else if (qmem > HEAP_MAXSIZE) {
-+ // Otherwise use this if greater than default (128MB).
-+ opt_heapmaxsize = qmem;
-+ }
-+#endif
-+
- // First of all, parse the -XX options.
- options_xx(vm_args);
-
-@@ -896,18 +914,33 @@
- case OPT_SS:
- {
- char c;
-- int j;
-+ size_t j;
-
-+ errno = 0;
- c = opt_arg[strlen(opt_arg) - 1];
-+ j = strtoul(opt_arg, NULL, 10);
-+
-+ if (errno)
-+ break; // Invalid.
-
- if ((c == 'k') || (c == 'K')) {
-- j = atoi(opt_arg) * 1024;
-+ if (j > SIZE_MAX / 1024)
-+ break; // Overflow.
-+ else
-+ j *= 1024;
-
- } else if ((c == 'm') || (c == 'M')) {
-- j = atoi(opt_arg) * 1024 * 1024;
--
-- } else
-- j = atoi(opt_arg);
-+ if (j > SIZE_MAX / 1024 / 1024)
-+ break; // Overflow.
-+ else
-+ j *= 1024 * 1024;
-+
-+ } else if ((c == 'g') || (c == 'G')) {
-+ if (j > SIZE_MAX / 1024 / 1024 / 1024)
-+ break; // Overflow.
-+ else
-+ j *= 1024 * 1024 * 1024;
-+ }
-
- if (opt == OPT_MX)
- opt_heapmaxsize = j;
-@@ -1498,9 +1531,9 @@
- void VM::print_run_time_config()
- {
- puts("Run-time variables:\n");
-- printf(" maximum heap size : %d\n", opt_heapmaxsize);
-- printf(" initial heap size : %d\n", opt_heapstartsize);
-- printf(" stack size : %d\n", opt_stacksize);
-+ printf(" maximum heap size : %lu\n", opt_heapmaxsize);
-+ printf(" initial heap size : %lu\n", opt_heapstartsize);
-+ printf(" stack size : %lu\n", opt_stacksize);
-
- #if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
- printf(" gnu.classpath.boot.library.path: %s\n", _properties.get("gnu.classpath.boot.library.path"));
diff --git a/dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.6.ebuild
similarity index 93%
rename from dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.6.ebuild
index f1c743e..02601f1 100644
--- a/dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.6.ebuild
@@ -3,10 +3,6 @@
# $Id$
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
EAPI="5"
SLOT="7"
@@ -16,13 +12,13 @@ ICEDTEA_VER=$(get_version_component_range 2-4)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="389551542e13.tar.bz2"
-JAXP_TARBALL="8a56658cb829.tar.bz2"
-JAXWS_TARBALL="9c049d7f5adc.tar.bz2"
-JDK_TARBALL="e727fe32654c.tar.bz2"
-LANGTOOLS_TARBALL="f6593c32cc46.tar.bz2"
-OPENJDK_TARBALL="8e728c41fec5.tar.bz2"
-HOTSPOT_TARBALL="04d7046d2d41.tar.bz2"
+CORBA_TARBALL="ca3e3c4c5a61.tar.bz2"
+JAXP_TARBALL="683427778edf.tar.bz2"
+JAXWS_TARBALL="63f7bf7ed2d4.tar.bz2"
+JDK_TARBALL="55c38c1ace75.tar.bz2"
+LANGTOOLS_TARBALL="e42dd50480d3.tar.bz2"
+OPENJDK_TARBALL="882cfee70fe8.tar.bz2"
+HOTSPOT_TARBALL="3022a3d80efd.tar.bz2"
CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -230,8 +226,9 @@ src_configure() {
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
+ # In-tree JIT ports are available for amd64, arm64, ppc64 (be&le), SPARC and x86.
+ # arm is broken as of 7.2.6.6.
+ if { use amd64 || use arm64 || use ppc64 || use sparc || use x86; }; then
hotspot_port="yes"
fi
@@ -261,10 +258,6 @@ src_configure() {
ewarn 'If so, please rebuild with USE="-cacao"'
fi
cacao_config="--enable-cacao"
-
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
- export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
- ln -snf "${FILESDIR}"/${SLOT}-cacao-pr-157.patch . || die
fi
# Turn on Zero if needed (non-HS/CACAO archs) or requested
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2016-04-26 19:01 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-04-26 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 0eac68e65b969b82748fafeb45459af229ed0d61
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 12:15:28 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 19:01:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eac68e6
dev-java/icedtea: Bump to 3.0.1 wrt security bug #581238
Package-Manager: portage-2.2.28
dev-java/icedtea/Manifest | 18 ++++++++--------
dev-java/icedtea/files/8-ccache.patch | 11 ----------
.../{icedtea-3.0.0.ebuild => icedtea-3.0.1.ebuild} | 25 ++++++++++------------
3 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index bfc60fa..2db0569 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -6,15 +6,15 @@ DIST icedtea-2.6-jdk-55c38c1ace75.tar.bz2 32434755 SHA256 1baa92ca72db1b80fff18c
DIST icedtea-2.6-langtools-e42dd50480d3.tar.bz2 1708918 SHA256 54bb2cee7b4fc5bbc63a4c9d7008602e12f75431c7f129ade7c405b53c2363f3 SHA512 55ad5b729fe85710089017402e575b5f5f2426c54401bb40202af2bb7af722d2b3370f12f5ba6be941b60177ee45ad15911fdca554c213c09c93d9404d85565c WHIRLPOOL 6c4d5dec34dfdcd9ffc831020790529193b665f92cc7bee33df8e5a7c97a0dc51f1adb5b675c81fb347f07ed4854bcb6bec34714935995826573c2c1464d186f
DIST icedtea-2.6-openjdk-882cfee70fe8.tar.bz2 130156 SHA256 24f813e6cb938272a4da37b46b48aa86820b13be0747747e6c8fb4aad72cadf3 SHA512 fe72b626a60e8dc7939d35069ed90e8053676e8b45a9eca78d6abb2c7e3bff15ed7f84300542e726a8cd6a8fcc73ae2f779843de79654dd6cb4ef04fb134c222 WHIRLPOOL 4cc443730734c5b3d4f57de7b3ecfaefe8029ce4143b60e80011d871f322076816edc11a39c718f0cfa6d2283315186b8fe488b1f8b5aea16736a88970af513b
DIST icedtea-2.6.6.tar.xz 2072632 SHA256 79949744436158d9ded3a758c22da7629f843ea3913afdffc65ea0f1a26d544a SHA512 ba603ec6c16b5642d1591717ea14378ebe045e4128a8eb517de94df32c3bb03b636f051e682cf5990c3a1bcbf2460a97965cdc139bf265fe5f97bedaa539092c WHIRLPOOL 7716613f6463dcaa514c980ef0850c2ad42319275b504d0ec55e0dd54e0dbff5c74af4f53b0e466dbb41c4ab5ae2694cb3a5f74b19de4913790ef9bff6554985
-DIST icedtea-3.0-corba-37af47894175.tar.xz 936876 SHA256 d77480d5d0c9620562a66b01fda9be4de58c2881cec680b4f2682ef09087b3cc SHA512 21b2f069f1eaca62a46518173de3c1368963db489f436d5ad705c7cb36ecc259d342c059c4c593427e96604164f78be761e1fe4118d8517ece3630280524ad30 WHIRLPOOL ac7292f0a32cfa7b58d3616b704bfd90ead49044bb51fccc1ca87900555d15f28b3d3137512fe007b40f0a130d3e6eb9d805112725914b0f0721ac8dbad8794c
-DIST icedtea-3.0-hotspot-5e587a29a6aa.tar.xz 6766584 SHA256 76717fa6a84fde60075c19fbc261709bd9c3b849952c817c0ac6b46b757ac0d7 SHA512 c8a2355ef81ad1dd4a2f6be0e5cdaba9d6d66a4fd5514718cc09ed391bcce269a17a34fbc89d7c6d3e7a2632f2ffcb0028a8faaf41649055a096407a24cacd0e WHIRLPOOL 4e83ea5ee631ca76e7919a944f9f1a3a007ca951a99552ee087bd6d2d6e027c5ce9963ec3c593c8132a984dd9818fc42abfb0792b3628d44491488700b20ec09
-DIST icedtea-3.0-jaxp-4ed5441e40e1.tar.xz 2296120 SHA256 4ccce5442642561cda78116a019f5c0ea690725a374ccf5695b3af00393d26e8 SHA512 47e968f674176f74706ab268098a1635a54de7282993abc46a1c72c8d24f21216ed898bbca830623f5afd11912a744138547d6d22a82f68fa1ba15ccc7a9e375 WHIRLPOOL e94f961336d1e8b176ab2486ae98852049f930af3ee31dd3f7491544244c78d6b5657334fb45b9cc863bb6c377a6b1ab5d71df1257d02bc9e79513cd41ecc2ce
-DIST icedtea-3.0-jaxws-a81c04154cc5.tar.xz 2266356 SHA256 ef550609aaa526084256a7fdf6c326015641d6d8c80540c830c0c62302a2f076 SHA512 53ef8dfb1fa0602bfbbb75ca1f8a80af6c09029f22e69625680ce55aa04b820bdfc042d57e5edafbf25ea4f43c32fb988bad9e19b78676cb937af9062ec28ca2 WHIRLPOOL d76bae6c0b1540fe28dbbb5d516fea2c09facb29fd605df38429273e8358de6d0ca1f685098aa3c334a4ca9eeff66ff9759ba704697786a230315d236e01cca1
-DIST icedtea-3.0-jdk-3334efeacd83.tar.xz 38245460 SHA256 fa74b8aaa389495a685f3a28151a1957ff8ff88a4d4792059c5c1fb7c12eb1cd SHA512 92106e36d9dd522c355eec877709862b7e1ae18790a0965fa7fc74c1cd2b4aea145b630e37fa953e9cfd0feaadcba0117675bbb8e2c5705379078e16ac53a37e WHIRLPOOL 86cd77313b1fc50d6ff96de3e41d2d9c53627971ba475120d1724a1a690876e3383be6633baf074e14d95f0c0c16727f4bda5465ee66423dba1c8cc6533ab800
-DIST icedtea-3.0-langtools-dd581e8047e6.tar.xz 2055716 SHA256 e0e0e6a7cf8575506579306f76cca872b01a3f08a4880fb9b316444fb206ea86 SHA512 da64e53d360f591af599105cb244898f5092c3613f12f013244f9180b27629efcc0d5abbf2cf3043fd8c80edccfb9ad34dff854f36e539d24d206f6908c4f908 WHIRLPOOL f96b5afc4744f0cab3efdbb460da1c82bd2d8a370b59891ca3d0d351ecaf772c8c8414f92267be52f816d7d227d3dc175db2058fb6c9b7a7113b634fa47038e0
-DIST icedtea-3.0-nashorn-697c5f792bec.tar.xz 2220600 SHA256 b4c59d8269511f2073498518e599ec91dff11c57cadc0b97fa88af81835122c0 SHA512 e719c91ede0db0a5a0c97ff8ee165fadfecab053a48116d48974e24af06559540d2924b0d582fa4d4d5e4971ebc5929aa70b775f0fc6991c8311ca78d7860cd2 WHIRLPOOL e29ab3b81d095034e90c2996802f2c4ce1b338be817cf81ffddb084eedf52638e2b011b379534a9856303d3c3b722ef699d61d25a18f8e7910442c3139e01265
-DIST icedtea-3.0-openjdk-8ed8d26a3f9a.tar.xz 330164 SHA256 5b032673d74c4e2529427b9570b177285dc9a6430d016ef2e072dd2167669031 SHA512 9b0c6952e66708810cbdcd4f0a093f8d6f954c5cf1d098b6d70eced8908689fc0716fbb76ea6344c4a01127177fb078b31706551289aa7bd80fb649efe4d9018 WHIRLPOOL 361e0f9d3653a5718b3a2a1609c5b73adcee89c22f81e1c108c39499b5e755be639241a1de2946622731255ccbb8d00b097f77176fd31e7b9cfebfdcf94e1feb
-DIST icedtea-3.0.0.tar.xz 1402156 SHA256 947add69b3b89d7685cb0c9e2b51fc561e27f6e7c0bf1ea98dac8156fa8629a9 SHA512 80bece0c0dbe4c0eaf8716abd0018ae71fc62dd9a3698eeca37383af51884cac5b1185f226003e396b4b5691beca478b5419755795f906962e9f66674294ae9b WHIRLPOOL 4811b4041f96e2debc1f8760eb1c9c318f3c40b36ee45042788c99b74c9886c46a9859fe23eb369f531c596252a89e80b32b71b364e13bd1478c04e66911e824
+DIST icedtea-3.0-corba-a6736e860d67.tar.xz 937360 SHA256 42351003e03f8893435e424e652558ac7e6e7af86a0cf01338c84184b8ab6e50 SHA512 63aeb0f41b8d889a8e1f4a5a8033903145f4ef5bbdc5606085ee23f59f1696323a201e5ebd5ba9bb926b895bd773bdbce6bd1e2f421a4e13d499974cdc601c2c WHIRLPOOL f39270d8032772a86675ffb7a0c148743a765d4f133856a6dda203597143924f7695ce69637ade527cd2e615bfc0070045d881ad4b77d8db064b24b20cebe4fc
+DIST icedtea-3.0-hotspot-7bb48ba4de4f.tar.xz 6767200 SHA256 c15794ae90ee52222b73a5c8eb0a397062226fe8215aeed72fdf28f9c26780de SHA512 700c95265ff36912472126762a41642f4e49153411730748d112ee630497d4b5e487666755ccce1e3965ed55abde775ae44813bda24069a34a28be81b62b64d2 WHIRLPOOL d8f940158f08b0e171e7cb527ada65e17cad9c3ba09ac8c71bd6e126e27c2255dca6b8a2398eebd8b6b7db7df283fa57b74818607e2a8a68bffb0196e8d2c01f
+DIST icedtea-3.0-jaxp-c7145fc644df.tar.xz 2296808 SHA256 c0a9d523d451b895066dd747ee595eebba29f5626e9a69d9467cccd9b2df37c4 SHA512 39082376e3f24f589eab24c586c5af724e78f24a76b6d9c376b4b7197a36a9aabf85d7ad0717dc4ccc336ae8b1deb55e6d47f7ce5808150133814b9241f2a0e8 WHIRLPOOL 3a4f727482efc70938acb99d12bee9a81de5f89926607e9aaf46af681fc3e7364bb3fd2423d82f10ee62479a10cfc8ac2c944dc92ec61f5932855afda3cb6cf7
+DIST icedtea-3.0-jaxws-412389386184.tar.xz 2266852 SHA256 e378c1f46b067c9527d174c3683f4022eca3fe17bcf0e79177fa1713197d3338 SHA512 c8ef598c1625d3868302d1baefb9e40b7cd9540593278ff11c2cec73a7007d589daf873cb6ae06104d002f84a527f702ad673619b8970f8b1a542cf75014ec80 WHIRLPOOL 50c22b3433481cab34cbe028048314d17296fcf59239aeec8fa8e97d51b1cbb359d051e5ee8728027f81ed7f9a50ff73399c919c080e3baaf2db985e36bd8b21
+DIST icedtea-3.0-jdk-dab76de2f91c.tar.xz 38264484 SHA256 550556487de7fd769a9398082f26b358a2e5c07c2c1eb09724f0862667589cdd SHA512 54820354f847b2d28afb2523cd9cf4c24407add86135ccd30713c1c0319aa30a97b8a6fc6ac83e0fd100e1c00f4e96007f115faf4a3f5346865c535d80c19a93 WHIRLPOOL 794630afeecce34c1ac57b1f382b5fec4f60db25904fe3edba02f2105cac66f0e867162a92f6fed5a20b51ee03f7b39d91b0b9885c6f079b95953a985da62915
+DIST icedtea-3.0-langtools-ad6886e3a101.tar.xz 2056412 SHA256 2602601152576021736028604e56cf32f8e3f5997fe220e90297132274a251ca SHA512 9f5f1b69171b67320dd48cf7e88ae337983c1b90c516b034fd823ee349c0f1aa2554ccd22f59ce6d24aae530686c09bfcff1c48925f92f16b29e8327662ca574 WHIRLPOOL 21463b6d1cfebbe4a0dc127b934edecb347827f7351cd4ce4a717b7560ea3a6c8aaee74a76454f50879607f09e2d33a16f29520076d3c1446d16978461faf075
+DIST icedtea-3.0-nashorn-c89dc17f7c75.tar.xz 2220176 SHA256 e7040d55a499c002cd6edcedc44890072a2f88cb19a341950e5865c544b51edc SHA512 3cf12d2696b630eec2a4c6fefe08db9e14db62bbd81a3a4546ef886f6b7fa059a2f41dd3a4377ab2da1f65d371b70766caac4054b447454863de82ce961c3d31 WHIRLPOOL ad2ede063f0e6cb1a67f90d42ddcf2ab33175008361620abf04ccc1a55b9e3c2a8a9827100137842c8f6de2a3af367b6143c0916a5ffa4920dbcd33fb66547c0
+DIST icedtea-3.0-openjdk-6a70821528ba.tar.xz 330720 SHA256 8b766fffa39d67e62802a8cddd23e02b0ac2fd6aff48658b4b08fd6dbee38184 SHA512 5054d4a541b8f3e6fd09cd44355b39d3a0e1ea27247bcaf8bb800e1e3cf23a4133076383b74c19be1928a5fc0c3986ab3303614a834b9741209dcf20eb19d703 WHIRLPOOL 7ea8c98d4dca75325841929aa8049ecf713e637124e4ce6f9a98d7845d25153d851c42f632132ab61ff6823e0aeab07ad0dc43e6f699d4f3747b536e90eb0b76
+DIST icedtea-3.0.1.tar.xz 1403400 SHA256 346ce30de1de6c493729b79b246f250438fc5b8df7eae47229a97f9000a73af2 SHA512 01506994e3c4b4a1dc927251de0db5e5a22754031604cf7c8660597525616d3205527ed768d67aa4b4c62b40a0e3fbd3327c97b95c81b634175dec69c5802c8f WHIRLPOOL 0641f49b6fcccb3981e2756a2403638897887634ff09b6ede9ae61af80259b5bc1168c6c5f236a07157befec4a1fe848d0814afe5515bb5a98c591370c62dacb
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
diff --git a/dev-java/icedtea/files/8-ccache.patch b/dev-java/icedtea/files/8-ccache.patch
deleted file mode 100644
index c846dba..0000000
--- a/dev-java/icedtea/files/8-ccache.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openjdk/common/autoconf/generated-configure.sh.orig 2016-04-01 04:32:19.000000000 +0100
-+++ openjdk/common/autoconf/generated-configure.sh 2016-04-10 20:04:53.472885447 +0100
-@@ -35764,7 +35764,7 @@
- # precompiled headers.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
- $as_echo_n "checking if ccache supports precompiled headers... " >&6; }
-- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
-+ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.[456789]|[2-9])") 2> /dev/null`
- if test "x$HAS_GOOD_CCACHE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
- $as_echo "no, disabling ccache" >&6; }
diff --git a/dev-java/icedtea/icedtea-3.0.0.ebuild b/dev-java/icedtea/icedtea-3.0.1.ebuild
similarity index 95%
rename from dev-java/icedtea/icedtea-3.0.0.ebuild
rename to dev-java/icedtea/icedtea-3.0.1.ebuild
index 25d6d24..0a142c0 100644
--- a/dev-java/icedtea/icedtea-3.0.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.1.ebuild
@@ -12,14 +12,15 @@ ICEDTEA_VER=$(get_version_component_range 1-3)
ICEDTEA_BRANCH=$(get_version_component_range 1-2)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="37af47894175.tar.xz"
-JAXP_TARBALL="4ed5441e40e1.tar.xz"
-JAXWS_TARBALL="a81c04154cc5.tar.xz"
-JDK_TARBALL="3334efeacd83.tar.xz"
-LANGTOOLS_TARBALL="dd581e8047e6.tar.xz"
-OPENJDK_TARBALL="8ed8d26a3f9a.tar.xz"
-NASHORN_TARBALL="697c5f792bec.tar.xz"
-HOTSPOT_TARBALL="5e587a29a6aa.tar.xz"
+
+CORBA_TARBALL="a6736e860d67.tar.xz"
+JAXP_TARBALL="c7145fc644df.tar.xz"
+JAXWS_TARBALL="412389386184.tar.xz"
+JDK_TARBALL="dab76de2f91c.tar.xz"
+LANGTOOLS_TARBALL="ad6886e3a101.tar.xz"
+OPENJDK_TARBALL="6a70821528ba.tar.xz"
+NASHORN_TARBALL="c89dc17f7c75.tar.xz"
+HOTSPOT_TARBALL="7bb48ba4de4f.tar.xz"
CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -60,9 +61,9 @@ KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
jamvm +jbootstrap libressl nsplugin pax_kernel
- pulseaudio sctp selinux smartcard +source sunec test +webstart zero"
+ pulseaudio sctp selinux smartcard +source +sunec test +webstart zero"
-REQUIRED_USE="gtk? ( !headless-awt ) test? ( sunec )"
+REQUIRED_USE="gtk? ( !headless-awt )"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
@@ -266,10 +267,6 @@ src_configure() {
zero_config="--enable-zero"
fi
- # https://bugs.openjdk.java.net/browse/JDK-8067132
- export DISTRIBUTION_PATCHES="${SLOT}-ccache.patch"
- ln -snf "${FILESDIR}"/${SLOT}-ccache.patch . || die
-
# IcedTea itself doesn't handle ccache yet.
if has ccache ${FEATURES}; then
ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2017-12-06 21:54 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2017-12-06 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 01f25a98b29dfe6e337fe45efea5e38266d137b0
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 6 21:46:36 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 6 21:54:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f25a98
dev-java/icedtea: Goodbye Java 7!
Package-Manager: Portage-2.3.16, Repoman-2.3.6
dev-java/icedtea/Manifest | 13 +-
dev-java/icedtea/files/icedtea.env.sh | 4 +-
dev-java/icedtea/icedtea-7.2.6.11.ebuild | 387 -------------------------------
dev-java/icedtea/metadata.xml | 1 -
4 files changed, 4 insertions(+), 401 deletions(-)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 35d2eb77de4..c629cf52eb3 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,12 +1,4 @@
-DIST icedtea-2.6-corba-803456f62297.tar.bz2 1073306 SHA256 ff818ceedd154fa4d55d38b50fccd6a19de242a592d9ffbed7368bc56c091b81 SHA512 87b374d6907dcd72043cb3a86eed08e836861c238282fdd8c9684b6653b5788f1d183038572282f92dd81381765ac41243c6faa52033173157bb8b48b928d071 WHIRLPOOL fd9c85f496fc129ca2f7f90afd6c5e824d1f2e44b2ac54147f20c45855eab6107479d6f9ab0d218e56323cbfd78f0f66701ebaa1ec5f7cb115d7eff0a854f9a6
-DIST icedtea-2.6-hotspot-809ae803d8ea.tar.bz2 8210978 SHA256 a6055f2eb2c6f159fdc20fc5268ffb27d6cb7959ed7af28ee8a0f862b5b6dbf8 SHA512 8d4bb7a97e2213d21a99261d9f9a32824830f1b178260cb170eeb45ac54414bd26042dc75b2dc719850638571cf8057d7d3fdb65c32fbed8797e6242ba257e7f WHIRLPOOL e398a14c87bd46ed8e44427aa1630e1d1304b5e5cdf2bde9b2a9f565a88ecc3463eee173c652e47082d8942a04717b39f0c325f87c42f6861bdcf843e5b5fb39
-DIST icedtea-2.6-jaxp-46f2d7395127.tar.bz2 2733486 SHA256 a2642f8792edf7e40169ddafcd7a3c297e75b41f7c65fac2a84787376a65977d SHA512 a08618aca24f80f67669f62743150eaf7a33a602f9b5d806f3c0213261144a15006c4348800e25d5746500735498bc0c8380ee9adc75b6fce17283d9f4971358 WHIRLPOOL 2e2cdea8dae12ba7aedc16197c32e0bac376cbca675334eab6c7cde62a2de38887366212cec9f5fd13fa945f5e11d370462edc6531584d6a78148d9c7807d9fb
-DIST icedtea-2.6-jaxws-e17af60ebbd6.tar.bz2 2022975 SHA256 a299f434b48e5ed1e57085be5515ea1dbfbad971d08d386f070d653d2ea878be SHA512 145ae63e81a1c2cce6e462c2b38b05d79d138a89f5f4176151e87a8dcfb27c0b8f47c826ea12d85acdd31733ea253aaf9fbb019e605a4cc24c4b66803ca01f61 WHIRLPOOL eb404fd684c1f156f0fc481da0137c31a1eabce2f9867e8a67a67a392b1e62b741b32d3b23ef9c3866026bac87925279159abbc6c6b84521e05ea2f099aafe0e
-DIST icedtea-2.6-jdk-082c6e8b8812.tar.bz2 32843611 SHA256 ce4eca8a320c7514a7ecaa513a2a9cbb82a74e0256c8ba277fa692debe952eb5 SHA512 7974d9d7d55c4a57b53ee5e29f36ef058d207eee1701eac0e8b32b8f13a9084b08ff9fcde00cb16f4c23fa6bf371361f183b07f418cd6d200b67a67f86fa6785 WHIRLPOOL 431b45c17a9834799cacc575c9d96b8e7a19460491edcbfe01101270602aca0fc522dcebedce6bcf33f61bab632d58f169e0af70636533bdc4c3f51337d8a48f
-DIST icedtea-2.6-langtools-cddb1f9f8b9c.tar.bz2 1711691 SHA256 650a2d3881ba02ea10cbb6ddeef3888103fccaa904cb23517e07b3acd26d4c7f SHA512 6301ca17725dcf085b4dea74d453bb2ec9e7620b6791bdba6cf70fd4fac3f53679c8281db17c343ae4639a3c5431d9af09d76619825e2a8f3072bf46e09a9ce1 WHIRLPOOL 75111e57719c8d7956046ffb573682074a9013e6b01636d5083018fae34a6986f58eef2c89281d7708b644cd9847f11c24a6f1f6d18b8ef03ac4f9b801f07628
-DIST icedtea-2.6-openjdk-499e7894cc44.tar.bz2 130600 SHA256 0d521feed6275102ba3b3ee394330fefe20463dd63caa7197c7fd93e132519fe SHA512 95a0168b109266dfe7af97355f34888559f1978201fc7fe9c1b7b15074793d850a68ce031603bb62c4ad6790e8575ebf7e73fca2fdd8f03c9ab0a4e24e3e07b8 WHIRLPOOL 264b87945b13cf6a0adde36b084bb6889a0567e80b035ab4296b8f8bbe433c058ccfa09e32ba1a14914b5b44ea1ecf2a56c8f894c18d31087b0aed504b04a39f
-DIST icedtea-2.6.11.tar.xz 2117880 SHA256 20063c314535e4ed4b8099e497b880e4f346c85e7315a2573d0f398b973777c5 SHA512 b77b5cf632d357f6ca87f2a9cfe179b95941a10e669997feb2506da56baa09fa5b94ea6025471ac6e4165bd9769799c84159d5fa39c19f1111bdb8770314d587 WHIRLPOOL 80af9323a6a8315f0a68a75db736ec35fbfa53a1b30f052cfa80256aa1dd04e9619ef9ccf9999333bc90826ca3b57750c4f62b64549ee39a71e73f7cc57d277b
-DIST icedtea-3.6-aarch32-7b008fa0fb6d.tar.xz 6742092 SHA256 c20ed439e32c6d72321097289bf7ac19bfae172a90efe23e08c54e63c53b402c SHA512 5cb9d97eac22fbc576b45201785a9d620daed744a2f43eb711371ff561c7d132ebdc3f291d785d285d4801c0d9b1c3bfaf57488fc8c9d31b69ba8ccd18f6c1b1 WHIRLPOOL 0ba359548f05f888d83534d0308a6bd7501ac6d95dc1f88338e8836959951a2bcea6f686785ffa4945049a345776d0a06dd03b6eebbee289b82df1da41a69be6
+DIST icedtea-3.6-aarch32-7b008fa0fb6d.tar.xz 6742092 BLAKE2B 3bbc62d745a48ef06ca2cdb8b1acbebcda37731e8121377f55ef572cf64287814a27465726ed3a61f56e684198d397a351f186bd85415f49990a0579c7bbafad SHA512 5cb9d97eac22fbc576b45201785a9d620daed744a2f43eb711371ff561c7d132ebdc3f291d785d285d4801c0d9b1c3bfaf57488fc8c9d31b69ba8ccd18f6c1b1
DIST icedtea-3.6-corba-13a5a8a3c66f.tar.xz 938380 BLAKE2B 3060158fd278a1c79da4095787a4d6a934641a733c6001a6afb1ba2025efb3cb3ad811c13de13db8f6db8e9eaa606cfdafb8586dd0c78ece81312c2d772257b4 SHA512 5af5898c71e2f8b4feeb55d0976828ed89cc089048b64c5b8ffe55bc0db267e58c21bc6099737a50245352f6b1ccb510fbca3871c371bbc5109323c9a372e698
DIST icedtea-3.6-hotspot-9bad7d4825fb.tar.xz 6820148 BLAKE2B 5a885bdbf1339c512b0941c93c3a1dd6151633b75471f76564c08f7930068c6200c771b8a812381c750545a26fef3d5c5a1f03b7c241d4e18bc5b3ebe30225fd SHA512 231775c3f7610388f2f5b11b60aed927e9f50cf0a65bf0675402b72c77ec1c4253e6151cbe0a27f9254297af024eae0f0ddd30a3d4b084699e730249202b9c51
DIST icedtea-3.6-jaxp-947a7b1ce48b.tar.xz 2297468 BLAKE2B 0fb3376b7a5f2a419d40a0e5da353a77e6274fba60287d15a63b092e6694a14af9aca71c3f485a77bb8f7c2a741505bc62f6fbe988e7e182c173a9eaf157a31e SHA512 b557ef3a702ec2689578485d6a7444350aa6ce55b0eea6757996b52026e877861f6989a33b4b429dc56cbf7ff81c142696dac893552bdc7330213f45cbbea665
@@ -15,8 +7,7 @@ DIST icedtea-3.6-jdk-a05e38417041.tar.xz 39075276 BLAKE2B d1ae911f47d3fd1be1b15d
DIST icedtea-3.6-langtools-61a1c711f7ab.tar.xz 2065880 BLAKE2B 47268b281d169b3dd355f5c199f6cdc085685c085537b6c8c34385427a3cb806c7b90e44e5ab9b79d9bddb494b50cb03079a94bbde9a8ddd800f6cc6ce14add9 SHA512 92787dcd32ef1f19c1bc01d0dc1e604c09af81dc380eef6584f6c7bc221b285cc14ec5c13226178e2f44e904353af69f416bafe55db6ad414ad79db4878220d8
DIST icedtea-3.6-nashorn-a2d2fc80c97a.tar.xz 2231644 BLAKE2B a32b75a5a97b233afc9420708aabf3c6b0800ef61b6e108871e732d6c2ceb9cce540245e275f76e43c1da4ec079c9ce2692c3bbadbc7eee2bbd4cdf066789ebc SHA512 950989f71c7fef858eb8cd20024a2094e8d102b921d05fb1e4a320a431c3306178269e737f02318c448f57cd540ae6996552880ae419ef647e7dedb6b4a6ebbf
DIST icedtea-3.6-openjdk-eb577ed6ec93.tar.xz 333636 BLAKE2B cf804790add194b62f7ead5f0f23ae4bf414142c1b3d241eb90f04594af0f76d165f060a87b006d3f431acafb6280512ba638b28c76cdd6d52f99ab24b5a136c SHA512 db794e9bd39f8994b29677dec62b5f47e5ab92b75a3c9c1922903095269a94d4f44b57a73360d64671f3c9a1403d83dbd0251354818842b2f95ac13073d19f27
-DIST icedtea-3.6-shenandoah-7eeed7dc4676.tar.xz 6935216 SHA256 0e04e065df996b967c1c9b5b14765c0b55e91c1efd5bc55a733eefca6bb21586 SHA512 4f3938acc6c49a5b9178618fd4f60a0458cbe5a3df82cb46a5dcafc6e63a74216eea55c42fee5a7ad964cc39ea816f3734dd3a8806cc71feba86e150760b3a55 WHIRLPOOL 4e79d937f5190681f6a2172099bbcb3be068b7c3115e1fe2228bfc552b2f8e2280f3f53a9bac162f2d89b11ff5cb3801ec74ed72caf00a230a26427f500ae0a6
+DIST icedtea-3.6-shenandoah-7eeed7dc4676.tar.xz 6935216 BLAKE2B 063d498832d5aaed280cc4d55aebbe95c900405e7229e1b5f81c12adcf0787c25f76c91db32985477bb7b98b0c1500c96579c9420d35c159f1c0c16027c7fc08 SHA512 4f3938acc6c49a5b9178618fd4f60a0458cbe5a3df82cb46a5dcafc6e63a74216eea55c42fee5a7ad964cc39ea816f3734dd3a8806cc71feba86e150760b3a55
DIST icedtea-3.6.0.tar.xz 1489504 BLAKE2B 759adf7a4fad51fe0f80028d4174feb93afe0aece121be3e0794de620300a384ad0107eadb5c3f4dd5a3aeeaad496a510298d05c9a8e0f07b3b997e59ec4306b SHA512 7e19b66267266453b4aabeefcebe0d889604b329a5ad0338cc54cb49cef2b806fbc7cc0dd7078df231b04e033abe0c47de1b4c78e2f68682d9243e3064159c28
-DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 BLAKE2B 5c1faa3cbbfea62f819562a01ec389f3682cf3164d06f5404d1d16359c87b37d6ae4101f7c33cde30bad4f3d52af18f0f410e36868b2c9d1280661d2340e683b SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
diff --git a/dev-java/icedtea/files/icedtea.env.sh b/dev-java/icedtea/files/icedtea.env.sh
index cf3791afd73..ac8303bda07 100644
--- a/dev-java/icedtea/files/icedtea.env.sh
+++ b/dev-java/icedtea/files/icedtea.env.sh
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
VERSION="IcedTea JDK ${PV}"
@@ -7,7 +7,7 @@ JDK_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
JAVAC="\${JAVA_HOME}/bin/javac"
PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/$([[ ${SLOT} = 7 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
MANPATH="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man"
PROVIDES_TYPE="JDK JRE"
PROVIDES_VERSION="1.${SLOT}"
diff --git a/dev-java/icedtea/icedtea-7.2.6.11.ebuild b/dev-java/icedtea/icedtea-7.2.6.11.ebuild
deleted file mode 100644
index 0b01f2d8254..00000000000
--- a/dev-java/icedtea/icedtea-7.2.6.11.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-EAPI="6"
-SLOT="7"
-
-inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-4)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="803456f62297.tar.bz2"
-JAXP_TARBALL="46f2d7395127.tar.bz2"
-JAXWS_TARBALL="e17af60ebbd6.tar.bz2"
-JDK_TARBALL="082c6e8b8812.tar.bz2"
-LANGTOOLS_TARBALL="cddb1f9f8b9c.tar.bz2"
-OPENJDK_TARBALL="499e7894cc44.tar.bz2"
-HOTSPOT_TARBALL="809ae803d8ea.tar.bz2"
-
-CACAO_TARBALL="cacao-c182f119eaad.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}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${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}
- ${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 ~arm64 ~x86"
-
-IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
- jamvm javascript +jbootstrap kerberos libressl nsplugin nss pax_kernel
- pulseaudio sctp selinux smartcard source +sunec test +webstart zero"
-
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# 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="
- >=media-libs/giflib-4.1.6:=
- >=media-libs/libpng-1.2:0=
- >=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/libXcomposite"
-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="
- app-misc/mime-types
- >=dev-libs/glib-2.26:2
- >=dev-util/systemtap-1
- media-libs/fontconfig
- >=media-libs/freetype-2.5.3:2=
- >=media-libs/lcms-2.5
- >=sys-libs/zlib-1.2.3:=
- virtual/jpeg:0=
- gtk? (
- >=dev-libs/atk-1.30.0
- >=x11-libs/cairo-1.8.8:=
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.8:2=
- >=x11-libs/pango-1.24.5
- )
- javascript? ( dev-java/rhino:1.6 )
- kerberos? ( virtual/krb5 )
- nss? ( >=dev-libs/nss-3.12.5-r1 )
- sctp? ( net-misc/lksctp-tools )
- smartcard? ( sys-apps/pcsc-lite )
- sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND="${COMMON_DEP}
- !dev-java/icedtea:0
- !dev-java/icedtea-web:7
- >=gnome-base/gsettings-desktop-schemas-3.12.2
- media-fonts/dejavu
- alsa? ( ${ALSA_COMMON_DEP} )
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- cups? ( ${CUPS_COMMON_DEP} )
- !headless-awt? ( ${X_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
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
- || (
- >=dev-java/gcj-jdk-4.3
- dev-java/icedtea-bin:7
- 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
- !libressl? ( dev-libs/openssl )
- libressl? ( dev-libs/libressl )
- sys-apps/attr
- sys-apps/lsb-release
- virtual/pkgconfig
- 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
- icedtea-6 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}
-}
-
-src_configure() {
- # 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"
-
- local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
- local vm=$(java-pkg_get-current-vm)
-
- # gcj-jdk ensures ecj is present.
- if use jbootstrap || has "${vm}" gcj-jdk; then
- use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
- config+=" --enable-bootstrap"
- else
- config+=" --disable-bootstrap"
- fi
-
- # Use Zero if requested
- if use zero; then
- use_zero="yes"
- fi
-
- # Use JamVM if requested
- if use jamvm; then
- use_jamvm="yes"
- fi
-
- # Use CACAO if requested
- if use cacao; then
- use_cacao="yes"
- fi
-
- # Are we on a architecture with a HotSpot port?
- # In-tree JIT ports are available for amd64, 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 JamVM if needed (non-HS archs) or requested
- if test "x${use_jamvm}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-jamvm"'
- fi
- jamvm_config="--enable-jamvm"
- fi
-
- # Turn on CACAO if needed (non-HS archs) or requested
- if test "x${use_cacao}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- fi
- cacao_config="--enable-cacao"
- fi
-
- # Turn on Zero if needed (non-HS/CACAO archs) or requested
- if test "x${use_zero}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
- fi
- zero_config="--enable-zero"
- fi
-
- 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="${DISTDIR}/${HOTSPOT_GENTOO_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}" \
- --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --with-pkgversion="Gentoo ${PF}" \
- --disable-downloading --disable-Werror --disable-tests \
- --enable-system-lcms --enable-system-jpeg \
- --enable-system-zlib --disable-systemtap-tests \
- --enable-improved-font-rendering \
- $(use_enable !headless-awt system-gif) \
- $(use_enable !headless-awt system-png) \
- $(use_enable !debug optimizations) \
- $(use_enable cups system-cups) \
- $(use_enable doc docs) \
- $(use_enable gtk system-gtk) \
- $(use_enable kerberos system-kerberos) \
- $(use_enable nss) \
- $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
- $(use_enable sctp system-sctp) \
- $(use_enable smartcard system-pcsc) \
- $(use_enable sunec) \
- ${zero_config} ${cacao_config} ${jamvm_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() {
- default
-
- local dest="/usr/$(get_libdir)/icedtea${SLOT}"
- local ddest="${ED}${dest#/}"
-
- if ! use alsa; then
- rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if use headless-awt; then
- rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
- "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
- fi
-
- if ! use examples; then
- rm -r "${ddest}"/demo "${ddest}"/sample || die
- fi
-
- if ! use source; then
- rm -v "${ddest}"/src.zip || die
- fi
-
- dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
- # Fix the permissions.
- find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
- # 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
-
- java-vm_install-env "${FILESDIR}/icedtea.env.sh"
- 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
-
- gnome2_icon_savelist;
-}
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index fd585923d58..533bc719560 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -26,7 +26,6 @@
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
- <flag name="nss">Enable NSS security provider support.</flag>
<flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
<flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
<flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (x86_64 only)</flag>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/, dev-java/icedtea/files/
@ 2021-04-02 9:02 Georgy Yakovlev
0 siblings, 0 replies; 6+ messages in thread
From: Georgy Yakovlev @ 2021-04-02 9:02 UTC (permalink / raw
To: gentoo-commits
commit: 0e7e963bf1e61e2fb4f5ba7c47e8d080e3b452f4
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 2 09:00:29 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Apr 2 09:02:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e7e963b
dev-java/icedtea: bump to 3.18.0
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-java/icedtea/Manifest | 11 +
.../files/openjdk-8-hotspot-arrayallocator.patch | 16 +
dev-java/icedtea/icedtea-3.18.0.ebuild | 386 +++++++++++++++++++++
3 files changed, 413 insertions(+)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 4dbaeda9ac6..c93595edba8 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -20,5 +20,16 @@ DIST icedtea-3.17-shenandoah-3.17.0.tar.xz 7277048 BLAKE2B 034d27ce07b48d2730218
DIST icedtea-3.17-shenandoah-3.17.1.tar.xz 7276688 BLAKE2B 02db748f1b87694fe0995b153211ccfeb8719a0b8e5f32396eff15012e396647294eb809b6561f1ed845cfd0f43a8b297f55f444651020ea42f1a05c2f0d4692 SHA512 a1bdda704f0331ad445143a7bd9fba33090c2cfd1a6d73a6c427378e3685ca40e0d600256c3c678820061e93d5bdc3faf9040bb11e62647d7b3f9218406405a7
DIST icedtea-3.17.0.tar.xz 1565156 BLAKE2B f2b5f0b0ac1de70ddd5faa1215fcb17b5b7bee726ca5dd81bc2e3948c7fd342dfe1d7c9dbd232696bf0f2d68f214b0132f386d182b1fe15ec72cdb77cc0ba67c SHA512 4183037d6829f7fdd25b970853e84bfeecb45adca7fb78e773c431e401c155c212b78bc6daf80d8479c13e9ca63ad5446122a8ec2d6e6b1bede8ee747ba7a91b
DIST icedtea-3.17.1.tar.xz 1565996 BLAKE2B 36a92826fd7f1cda9b1b90d93b57c4fe63cdcbd3e5d6320f3b6ac9819720156943232b17c9b3a6a5ca796cb2a29ef47426e9f10491af844bfa12a99252312d69 SHA512 eaf66df177f08cf335fe795f816e4f6b70a25a402ff8db4c1a2c545dd129350e1135c45e131eab8820620de2a75fda1d56141583ec1a651218d0a02680eb1df7
+DIST icedtea-3.18-aarch32-3.18.0.tar.xz 7057736 BLAKE2B bd681871da038ee1eaabe5c38e830a9d80fff30f8793b81afb69803107d0ee2ae8f3dad3985ec05c86120f1e3c86101984397476a76bce30a7b1852784175521 SHA512 3bc033bb4256d6a8ee8387998fbb4b1a14d2c6882337366085ca4648eb9b2a34176003e23e420703a075fb5322a1be3547d5ed82188d97e1f12429b4a8b3671d
+DIST icedtea-3.18-corba-3.18.0.tar.xz 948504 BLAKE2B 00deb77d5aebf19ad404bf44ac7367017f8aee6699e11b93d2cb44f7d23f17f13caba8aee9862b25e528bee3d8fbfa728260850d1aa2f66839b079b1111d3af4 SHA512 db71a9fd6288a8217a8338dda70a87eb4b97f1659c7e990eccd2774785bf1da9e35b71e231e108c610784922d1fa01cdaf115941189910ef9c68cf70746296ea
+DIST icedtea-3.18-hotspot-3.18.0.tar.xz 7110964 BLAKE2B ac45a7271f50a93b0ee27e6096820f3f93a02db42c6fde549515c3297590c94fff349a6cec5c9caf7bda31bbe36d6609097b4f73e99cdc1fe46bcfff0330a82e SHA512 abc46441c6ea7f652ee42376425e2fdd34a18de0803a13f38aa002a57a2835f8e2995f9a762fb53f114ad7b1030fc9ab82bd00839fccf57315018519df1c5c5f
+DIST icedtea-3.18-jaxp-3.18.0.tar.xz 2268136 BLAKE2B 6f398420e55684792020da116f8da25e1b4a59b2423d6b37ed55a567ba68aedca7a59c99ee0e3a87785a12910b518d07a9d0d248bb3ae151f81c7622ec904299 SHA512 fe8d25e38d05e0f65f91712ee7e4b6469605c9a6bd9b0cbdd29f483889b267483008fb913191ffa277047a66ad43eb397582935d984fad00e469b118532a1adf
+DIST icedtea-3.18-jaxws-3.18.0.tar.xz 2277356 BLAKE2B f0c3123722df57346461940f41e6b394a34c9e508ab3d2fa9f75581d4d626468394e2854129671e9bd68ecd217ed3aa0933cd14e2e74acd82d1cccd897e2b209 SHA512 b6879bdab06d1706945960b64f8dcff5ee8e81b95a733807768a0c2a5f329967e671d760a64239a42d6d5f9bf55b2904bf67082a4cd01ca5656bc323b041ff19
+DIST icedtea-3.18-jdk-3.18.0.tar.xz 40637140 BLAKE2B de565a2ba7cdb3732a551aa513cac3f52bf330590e011c6b05d47da1cee8389315ba3eb8112ce3c3d0510a049c49c147ea3a474eaadf70535fe30f63576fa293 SHA512 022115dbfc9ab7217a74b10e347a6a3a5eaa1112fef53cb37ff9dc003ec5bd3018b5b0bf675465d1c496e57b9b177102c6fef135acc881f3db49bea51c4f7375
+DIST icedtea-3.18-langtools-3.18.0.tar.xz 2080068 BLAKE2B e2781cc6728594a6c5e8dd213c810ae7fbed8d365da6db600e75b5786573b3d201cb0c3ed10221de1c139fe7ed55b59e57c47927272374e32ae94e586d6f0f9d SHA512 d96ded5041e488860baf1c17346e9342fb086e999fbf5d5a4dd5be97e0db17771f594c60f584d549d7ce1b4e1aa58b165a32f0633101bb70ea5c2d77758bb42b
+DIST icedtea-3.18-nashorn-3.18.0.tar.xz 2323912 BLAKE2B ab0c7dc3635a6eb7feb350d56c0fd5e03b36b60b107b26dbb04262291c4c0d57077bff5f7d949d95ec1de04210e06f40600d360600db09421f1dc0f801968817 SHA512 2bd488893ac33a16480cceb16fab62c11f8032e68d84818ad20aaa4c3928af6c77c60f8bd94878aa02b703e0302847272688d8641145972071c4e9a048cd5a13
+DIST icedtea-3.18-openjdk-3.18.0.tar.xz 364932 BLAKE2B 098ae1025f0457e14a4afc7b67ad6063f99be5fa486a2f6e187e490fe7b87efbf1cdc6fad2b33f7ae4f92817d5a0410254c723853a2519dacb5c21961c4d7558 SHA512 b4b40d19bb12ae85d68b110eb51051c089a9b7e857eceb10429b609a9f11671cbee34cfcef5c89ef23ad6aea80e4bcad1ed085fb310e09942816c5dccc8f171d
+DIST icedtea-3.18-shenandoah-3.18.0.tar.xz 7279864 BLAKE2B 1d8cfccda9cf24a5522862634d3699a7bd9cd445da7a08ab2061da45ddb885e023d56c096813710ef4f7ddb458300737bae21a56900bfb00e3ed5ac696af2059 SHA512 f8c5d4f108a3575f154a462e8cf907c14fbcdfc95708ebabbf530a79cc66979cc7e141cd239d6603e4a47d114130b07e6f32edb9145930e573a239fa0c91e75b
+DIST icedtea-3.18.0.tar.xz 1565468 BLAKE2B e6bffb9860ae8824a96e55970056025bc426453c26f91a7eb52f01f5ada7c0cb0bdcc4efa503186f514759f914d9053d08ba540bde7d15be81736037ce5d8db5 SHA512 e94c365513e5fa8a17d61fe7957db85018510567df9ba115c9bca98c658257ff1f4dff7967e88b73088630f07670beeaa8cbe49706d6bd02fb2804abad5d95b1
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
diff --git a/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch b/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch
new file mode 100644
index 00000000000..ba5283f1577
--- /dev/null
+++ b/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch
@@ -0,0 +1,16 @@
+Workarounds build error:
+Error: dl failure on line 895
+Error relocating .../libjvm.so: _ZN14ArrayAllocatorImL10MemoryType7EE4freeEv: symbol not found
+
+Possibly due to g++ 10.x error on not properly instantiating the template.
+
+--- openjdk/hotspot/src/share/vm/utilities/bitMap.cpp.orig 2020-11-10 14:07:08.372045326 +0200
++++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp 2020-11-10 14:08:07.911412813 +0200
+@@ -42,6 +42,7 @@
+ # include "os_bsd.inline.hpp"
+ #endif
+
++template class ArrayAllocator<BitMap::bm_word_t, mtInternal>;
+
+ BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) :
+ _map(map), _size(size_in_bits), _map_allocator(false)
diff --git a/dev-java/icedtea/icedtea-3.18.0.ebuild b/dev-java/icedtea/icedtea-3.18.0.ebuild
new file mode 100644
index 00000000000..0ec90737581
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.18.0.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI=6
+SLOT="8"
+
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs xdg-utils
+
+ICEDTEA_VER=$(ver_cut 1-3)
+ICEDTEA_BRANCH=$(ver_cut 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+
+CORBA_TARBALL="${PV}.tar.xz"
+JAXP_TARBALL="${PV}.tar.xz"
+JAXWS_TARBALL="${PV}.tar.xz"
+JDK_TARBALL="${PV}.tar.xz"
+LANGTOOLS_TARBALL="${PV}.tar.xz"
+OPENJDK_TARBALL="${PV}.tar.xz"
+NASHORN_TARBALL="${PV}.tar.xz"
+HOTSPOT_TARBALL="${PV}.tar.xz"
+SHENANDOAH_TARBALL="${PV}.tar.xz"
+AARCH32_TARBALL="${PV}.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="https://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="https://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+ https://icedtea.classpath.org/download/source/${SRC_PKG}
+ ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+ shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+ arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_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 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt
+ jamvm +jbootstrap kerberos libressl pax_kernel +pch
+ pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# 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="
+ >=media-libs/giflib-4.1.6:0=
+ >=media-libs/libpng-1.2:0=
+ >=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/libXcomposite
+"
+
+X_DEPEND="
+ x11-base/xorg-proto
+ >=x11-libs/libXau-1.0.3
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXinerama-1.0.2
+"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+COMMON_DEP="
+ >=dev-libs/glib-2.26:2=
+ >=dev-util/systemtap-1
+ media-libs/fontconfig:1.0=
+ >=media-libs/freetype-2.5.3:2=
+ >=sys-libs/zlib-1.2.3
+ virtual/jpeg:0=
+ gtk? (
+ >=dev-libs/atk-1.30.0
+ >=x11-libs/cairo-1.8.8
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.8:2
+ >=x11-libs/pango-1.24.5
+ )
+ kerberos? ( virtual/krb5 )
+ sctp? ( net-misc/lksctp-tools )
+ smartcard? ( sys-apps/pcsc-lite )
+ system-lcms? ( >=media-libs/lcms-2.9:2= )
+"
+
+RDEPEND="${COMMON_DEP}
+ !dev-java/icedtea:0
+ !dev-java/icedtea-web:7
+ >=gnome-base/gsettings-desktop-schemas-3.12.2
+ >=sys-apps/baselayout-java-0.1.0-r1
+ virtual/ttf-fonts
+ alsa? ( ${ALSA_COMMON_DEP} )
+ cups? ( ${CUPS_COMMON_DEP} )
+ !headless-awt? ( ${X_COMMON_DEP} )
+ selinux? ( sec-policy/selinux-java )
+"
+
+# perl is needed for running the SystemTap tests and the bootstrap javac
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+ || (
+ dev-java/openjdk-bin:8
+ dev-java/openjdk:8
+ dev-java/icedtea-bin:8
+ dev-java/icedtea:8
+ )
+ app-arch/cpio
+ app-arch/unzip
+ app-arch/zip
+ app-misc/ca-certificates
+ dev-lang/perl
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl:0 )
+ sys-apps/attr
+ sys-apps/lsb-release
+ x11-libs/libXt
+ virtual/pkgconfig
+ pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="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="
+ openjdk-8 openjdk-bin-8
+ icedtea-8 icedtea-bin-8"
+ 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}
+}
+
+src_configure() {
+ # GCC10/-fno-common handling, #723102
+ if [[ $(gcc-major-version) -ge 10 ]]; then
+ append-flags -fcommon
+ append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
+ fi
+ # this patch helps with gcc10 as well
+ # since build system unpacks tarballs itself, this is a way to force makefile
+ # to apply our patch. it expects relative path inside source, so we can't specify
+ # ${FILESDIR} directly.
+ mkdir -v gentoo_patches || die
+ cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die
+ export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch"
+
+ # For bootstrap builds as the sandbox control file might not yet exist.
+ addpredict /proc/self/coredump_filter #nowarn
+
+ # icedtea doesn't like some locales. #330433 #389717
+ export LANG="C" LC_ALL="C"
+
+ local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+ local vm=$(java-pkg_get-current-vm)
+
+ # gcj-jdk ensures ecj is present.
+ if use jbootstrap || has "${vm}" gcj-jdk; then
+ use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+ config+=" --enable-bootstrap"
+ else
+ config+=" --disable-bootstrap"
+ fi
+
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, 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"
+ # Work around stack alignment issue, bug #647954.
+ use x86 && append-flags -mincoming-stack-boundary=2
+ fi
+
+ # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+ # Otherwise use Zero for now until alternate VMs are working
+ if test "x${hotspot_port}" != "xyes"; then
+ use_zero="yes"
+ fi
+
+ if use shenandoah; then
+ if { use amd64 || use arm64; }; then
+ hs_config="--with-hotspot-build=shenandoah"
+ hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+ else
+ eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
+ fi
+ else
+ if use arm ; then
+ hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
+ else
+ hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+ fi
+ fi
+
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+ jamvm_config="--enable-jamvm"
+ fi
+
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+ cacao_config="--enable-cacao"
+ fi
+
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
+ zero_config="--enable-zero"
+ fi
+
+ # PaX breaks pch, bug #601016
+ if use pch && ! host-is-pax; then
+ config+=" --enable-precompiled-headers"
+ else
+ config+=" --disable-precompiled-headers"
+ fi
+
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+ unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+ # force bash for now https://bugs.gentoo.org/722292
+ CONFIG_SHELL="${EPREFIX}/bin/bash" 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-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+ --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+ --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+ --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+ --with-jdk-home="$(java-config -O)" \
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+ --with-pkgversion="Gentoo ${PF}" \
+ --disable-ccache \
+ --disable-downloading --disable-Werror --disable-tests \
+ --disable-systemtap-tests --enable-improved-font-rendering \
+ --enable-system-jpeg --enable-system-zlib \
+ $(use_enable headless-awt headless) \
+ $(use_enable !headless-awt system-gif) \
+ $(use_enable !headless-awt system-png) \
+ $(use_enable doc docs) \
+ $(use_enable kerberos system-kerberos) \
+ $(use_enable system-lcms) \
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ $(use_enable sctp system-sctp) \
+ $(use_enable smartcard system-pcsc) \
+ ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+ default
+}
+
+src_test() {
+ default
+}
+
+src_install() {
+ default
+
+ local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+ local ddest="${ED}${dest#/}"
+
+ if ! use alsa; then
+ rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ if ! use examples; then
+ rm -r "${ddest}"/demo "${ddest}"/sample || die
+ fi
+
+ if ! use source; then
+ rm -v "${ddest}"/src.zip || die
+ fi
+
+ dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
+
+ # Fix the permissions.
+ find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+ dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ java-vm-2_pkg_postinst
+ einfo "JavaWebStart functionality provided by icedtea-web package"
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ java-vm-2_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-02 9:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-02 23:00 [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/, dev-java/icedtea/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2016-01-07 15:36 James Le Cuirot
2016-04-24 10:17 James Le Cuirot
2016-04-26 19:01 James Le Cuirot
2017-12-06 21:54 James Le Cuirot
2021-04-02 9:02 Georgy Yakovlev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox