From: James Le Cuirot Date: Tue, 1 Sep 2015 23:15:37 +0000 (+0100) Subject: dev-java/icedtea: Version bumps to address security vulnerabilities X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d01de01bb17c0f85add5ea5b94fe9c91e596841;p=gentoo.git 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 --- diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 573aa64b5ad3..366d921e73d1 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 a9017fc3f030..000000000000 --- 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 c68ac5333d09..000000000000 --- 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 469eb9647ad9..745d54be40f6 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% rename from dev-java/icedtea/icedtea-7.2.5.5.ebuild rename to dev-java/icedtea/icedtea-7.2.5.6.ebuild index 986d07483aa3..06dbc68ac67f 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.6.1.ebuild b/dev-java/icedtea/icedtea-7.2.6.1.ebuild new file mode 100644 index 000000000000..2027cea9899f --- /dev/null +++ b/dev-java/icedtea/icedtea-7.2.6.1.ebuild @@ -0,0 +1,412 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $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" + +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="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}" +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 ~arm ~x86" +RESTRICT="test" + +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=" + >=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" +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=" + >=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 + >=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} ) + 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 )" + +# 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-bin:6 + dev-java/icedtea:7 + dev-java/icedtea:6 + ) + app-arch/cpio + app-arch/unzip + app-arch/zip + app-misc/ca-certificates + >=dev-java/ant-core-1.8.2 + dev-lang/perl + >=dev-libs/libxslt-1.1.26 + dev-libs/openssl + 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 icedtea-bin-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} +} + +java_prepare() { + 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 + + # icedtea doesn't like some locales. #330433 #389717 + export LANG="C" LC_ALL="C" +} + +src_configure() { + 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-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 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) \ + ${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 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 + + # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool + if use webstart || use nsplugin; then + dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings + dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings + fi + if use webstart; then + dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws + dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws + fi + + # Fix the permissions. + find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die + + # We need to generate keystore - bug #273306 + einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" + mkdir "${T}/certgen" && cd "${T}/certgen" || die + cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die + for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do + openssl x509 -text -in "${c}" >> all.crt || die + done + ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die + cp -vRP cacerts "${ddest}/jre/lib/security/" || die + chmod 644 "${ddest}/jre/lib/security/cacerts" || die + + # OpenJDK7 should be able to use fontconfig instead, but wont hurt to + # install it anyway. Bug 390663 + cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die + eprefixify "${T}"/fontconfig.Gentoo.properties + insinto "${dest}"/jre/lib + doins "${T}"/fontconfig.Gentoo.properties + + set_java_env "${FILESDIR}/icedtea.env" + 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 3f20a4b8631e..3b78faba42e5 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -9,22 +9,21 @@ Proxy Maintainer - caster@gentoo.org - Vlastimil Babka - Committer (CC me) + chewi@gentoo.org + James Le Cuirot + Committer 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. - Make X buildtime-only depenency. - Make alsa buildtime-only dependency. - Build CACAO virtual machine on platforms supporting HotSpot. (experimental) - Make CUPS build-only dependency. + Install non-headless AWT libraries, needed by some GUIs (used to be X flag) + Use the CACAO virtual machine rather than HotSpot. Enable better font rendering using fontconfig. Use the JamVM virtual machine rather than HotSpot. If possible, recompile the final IcedTea executables with itself. Enable NSS security provider support. Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled. - For building when running a PaX enabled kernel. + Apply patch needed for pax enabled kernels. + Build the SCTP NIO channel implementation against lksctp Build the PCSC driver against pcsc-lite Build the SunEC provider against system NSS Enable SystemTap probes in HotSpot.