diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
| commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
| tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-java | |
| parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) | |
gentoo resync : 20.03.2021
Diffstat (limited to 'dev-java')
101 files changed, 1608 insertions, 161 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz Binary files differindex 1f56532f07a2..15cae7f481ca 100644 --- a/dev-java/Manifest.gz +++ b/dev-java/Manifest.gz diff --git a/dev-java/asm-analysis/Manifest b/dev-java/asm-analysis/Manifest index 908f444d55ff..966510bc11f1 100644 --- a/dev-java/asm-analysis/Manifest +++ b/dev-java/asm-analysis/Manifest @@ -6,4 +6,4 @@ EBUILD asm-analysis-6.2.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09c EBUILD asm-analysis-7.3.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82 EBUILD asm-analysis-8.0.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82 EBUILD asm-analysis-9.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82 -MISC metadata.xml 1081 BLAKE2B ef7ebc4b8e0fa96285ccd95dd05ae14cc365a3e044e3d89736a208b6378c6f4e3c1a42c5d69fd2b48f02039b6cf99c9b409935536405208f8a81a4ad194b625d SHA512 60c78bc7e78f78df7b5d2a50fb0333a3082cccf539398857b06a95892cf462e6aac2ed9ae206cf5276b8a100ebce08c5d0d73f3f3d74a7403c87963beeb10582 +MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53 diff --git a/dev-java/asm-analysis/metadata.xml b/dev-java/asm-analysis/metadata.xml index f653390931e4..e1ae832ca03b 100644 --- a/dev-java/asm-analysis/metadata.xml +++ b/dev-java/asm-analysis/metadata.xml @@ -5,7 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>kaiboma06@gmail.com</email> <name>Kaibo Ma</name> </maintainer> diff --git a/dev-java/asm-commons/Manifest b/dev-java/asm-commons/Manifest index a977c9b256b3..5692c5f0b21a 100644 --- a/dev-java/asm-commons/Manifest +++ b/dev-java/asm-commons/Manifest @@ -6,4 +6,4 @@ EBUILD asm-commons-6.2.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156 EBUILD asm-commons-7.3.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6 EBUILD asm-commons-8.0.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6 EBUILD asm-commons-9.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6 -MISC metadata.xml 1081 BLAKE2B ef7ebc4b8e0fa96285ccd95dd05ae14cc365a3e044e3d89736a208b6378c6f4e3c1a42c5d69fd2b48f02039b6cf99c9b409935536405208f8a81a4ad194b625d SHA512 60c78bc7e78f78df7b5d2a50fb0333a3082cccf539398857b06a95892cf462e6aac2ed9ae206cf5276b8a100ebce08c5d0d73f3f3d74a7403c87963beeb10582 +MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53 diff --git a/dev-java/asm-commons/metadata.xml b/dev-java/asm-commons/metadata.xml index f653390931e4..e1ae832ca03b 100644 --- a/dev-java/asm-commons/metadata.xml +++ b/dev-java/asm-commons/metadata.xml @@ -5,7 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>kaiboma06@gmail.com</email> <name>Kaibo Ma</name> </maintainer> diff --git a/dev-java/asm-tree/Manifest b/dev-java/asm-tree/Manifest index b507097dfc4d..4144a3b51699 100644 --- a/dev-java/asm-tree/Manifest +++ b/dev-java/asm-tree/Manifest @@ -6,4 +6,4 @@ EBUILD asm-tree-6.2.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be EBUILD asm-tree-7.3.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472 EBUILD asm-tree-8.0.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472 EBUILD asm-tree-9.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472 -MISC metadata.xml 1081 BLAKE2B ef7ebc4b8e0fa96285ccd95dd05ae14cc365a3e044e3d89736a208b6378c6f4e3c1a42c5d69fd2b48f02039b6cf99c9b409935536405208f8a81a4ad194b625d SHA512 60c78bc7e78f78df7b5d2a50fb0333a3082cccf539398857b06a95892cf462e6aac2ed9ae206cf5276b8a100ebce08c5d0d73f3f3d74a7403c87963beeb10582 +MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53 diff --git a/dev-java/asm-tree/metadata.xml b/dev-java/asm-tree/metadata.xml index f653390931e4..e1ae832ca03b 100644 --- a/dev-java/asm-tree/metadata.xml +++ b/dev-java/asm-tree/metadata.xml @@ -5,7 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>kaiboma06@gmail.com</email> <name>Kaibo Ma</name> </maintainer> diff --git a/dev-java/asm-util/Manifest b/dev-java/asm-util/Manifest index 7c9526cebb69..6227cd85f344 100644 --- a/dev-java/asm-util/Manifest +++ b/dev-java/asm-util/Manifest @@ -6,4 +6,4 @@ EBUILD asm-util-6.2.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14 EBUILD asm-util-7.3.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a EBUILD asm-util-8.0.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a EBUILD asm-util-9.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a -MISC metadata.xml 1081 BLAKE2B ef7ebc4b8e0fa96285ccd95dd05ae14cc365a3e044e3d89736a208b6378c6f4e3c1a42c5d69fd2b48f02039b6cf99c9b409935536405208f8a81a4ad194b625d SHA512 60c78bc7e78f78df7b5d2a50fb0333a3082cccf539398857b06a95892cf462e6aac2ed9ae206cf5276b8a100ebce08c5d0d73f3f3d74a7403c87963beeb10582 +MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53 diff --git a/dev-java/asm-util/metadata.xml b/dev-java/asm-util/metadata.xml index f653390931e4..e1ae832ca03b 100644 --- a/dev-java/asm-util/metadata.xml +++ b/dev-java/asm-util/metadata.xml @@ -5,7 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>kaiboma06@gmail.com</email> <name>Kaibo Ma</name> </maintainer> diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index 0b7e6e0ab800..234539ad1778 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -2,15 +2,20 @@ DIST asm-3.3.1.tar.gz 854626 BLAKE2B e8738aeda26f72c4630d33f1696188501022b4764f9 DIST asm-4.0.tar.gz 752187 BLAKE2B 00795e18a65d1c3d17ddb722fad20c0c7b01101ffc766a0d5f82da83ce0763401c36857780ee82267d18fa67993314069645ffc188207e4628e99626b3409a07 SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db DIST asm-5.0.3.tar.gz 781742 BLAKE2B a2d3f0e59244d27c090be8cfab67f86369a6dae0c49a3526ee25b7c4454c93df1efee461c9a4be33b414161b66d0df65b935ff06850ad8fa6a48fdbc178e77c1 SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af DIST asm-5.1.tar.gz 791417 BLAKE2B 90ee3e28b20ce649763c43cf1b0bb495995dcfc31a534d774c727d201a913b8ae25f4c015e580c9d73b6f3a847ce32720a0c2b0ea61eab8b35e92be4beaab2fe SHA512 de702516f9e16686c027c9a200a1750e6dcaee96bb1ed8bc0591673404d015b8817e37f210be645681dff7a2c31f7ddce8b406ccc8c6e11f1424e19c04c38f1e +DIST asm-ASM_3_3_1.tar.gz 14406355 BLAKE2B 4f2634f1cefa3d7342682eba41ac035b0c2ad60457cd976ad194d9a3b728f0ea904ae4f35620116fa81e0095c40d7a30bd95f4f317a118b79fe2a80e1708f16a SHA512 24a48b5a84baeae64dbc587ca4acc2c9a37993a17e0651cdd4881e73567be79b87b50057fa4d0eb2ad5dcdd975566fddf426749ca560ce0453c444aacff3592e +DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e +DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518 DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff DIST asm-ASM_7_3_1.tar.gz 1556552 BLAKE2B 23d7b21de9c163e2e69b8edb5d5d72a79ddcdd80e03393bef33285dc2455a59267ba5a95dec21d9d22e04b2518e593fbf8e856c9f361516826e1141131657259 SHA512 09abd673152ffa2d9f88aea8d940f77e8fc16e8d4b3486f39b8ae56c6f57cf4e40cff8ba829ca568c6ca71d8b676dee394d0e2f36bbf9781f9e3a9ad106e201b DIST asm-ASM_8_0_1.tar.gz 1559218 BLAKE2B 2b1d039ccb569cf2574d55fb7f6d2c1535dfa3edfab785a6f0622a893cb5f83f21de2d6a737ac164914893cccdd1d87754284742cdf20f2bbd4f57843dd3b36d SHA512 0b0773c3970a426ebca489e68641c3ecf0cfd3b48cddba1b56ffe0e0ab95274b5a7bcb3ae8b5ade04dffdc366bd0fdd6fd0f0db59936d1994f88107e15c90932 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18 EBUILD asm-3.3.1-r1.ebuild 870 BLAKE2B e51b652599a40b8845d5c35ba37d6f20202c92092fab393040dfc7f9fbd17834d8afc73869065956bb4b2bf2d14b62f3d0c200b3dc8524bd029d4d98c244db8a SHA512 55384ff316829c25d191ec5d6280a487627ae2354436ff9ebd7ad0d10efb32d734a9dd33bb6cfa0cf823bf4d4b84b7651605cf3ea7b2a6022aba848f849afb43 +EBUILD asm-3.3.1-r2.ebuild 925 BLAKE2B b8d162ad54bfd93b1e1784ea36211251241f8ec669a8031a9118a9000b02176e99643ef56822c521f5eca6b40be0053a58f15f5c05b87ddf32339577bcd02985 SHA512 80a89ac921c28bb5fbc4bcdc5e330cfceee17c17ac15514f9f9cac5f9aaef8a668fc023d79b2f17e659bb5fd66d716fce23c88bc961dd70aaf6454f920139b95 EBUILD asm-5.0.3.ebuild 1209 BLAKE2B 79453429c1e78192909435ae7247f0e11e4464ed38f4a0d2d1c2cfe5714ec1e433aed16ad5f0433abb07bee40369a5b5b135d644bbcf36719336d658937343e5 SHA512 3c03125070730ce4d554d163afde459b1f862235fddbff7788fb50556772c8709107c84eb56948c5c4d2bb2e86c9e98be18417ea70b573e562efac971f97003e -EBUILD asm-5.1.ebuild 1209 BLAKE2B 67b2b998cbe6c063362c8c1ad52d1a7d0c315e953f7086a167c4d53ed6a39340596f12b2ff57b9c6808062f8ad19f6b95c3bd642ed6b5fbe834f2aad881fb7f1 SHA512 eef56477abf698df89d26b18dadab6a13d6bdb624262f711cff34f22a7b61aa8881ee5d679fe8759bb2442cf7552a05ea355677a7dd19e316b0c3c2215951c8a -EBUILD asm-6.2.1.ebuild 568 BLAKE2B 9a27b351e265867302d8003376b992ca8fabfc5bf60c224f142f27f3414d03956150a865057fd1e28bce77f526fd0b0c345a7f287c96758d7b3f5b5228f7907f SHA512 ea2e107ce6653644a7df344b0c09fa12751584a83a6b5cf4fae9554f23a485ea1c788601adba2b670df9471fccefdd7bb07cafdf6ac8ab794639841b9c581b13 -EBUILD asm-7.3.1.ebuild 568 BLAKE2B 6bcee43b6942f454b91e4bb8bc0dcc67660e4b7dead4789afeec5c17fefa4b2faa75581fce0f0c7796a2eceee317294529629242a4910fe05175302235da34fc SHA512 b858ea8e1bfdd274701359eba7c784c1afca1f27f3c2f397419fc19694ee5caabb4af312b13e1d99fbbed7c818f2e70b063302a6fd59670619ea0b3ff2b868c7 -EBUILD asm-8.0.1.ebuild 568 BLAKE2B 67de6b694bdd1a776555b1011ee1149432e828cfa733d4cb142f0a70ed5b9333bba4cb626e7ab495e6327484a16d1d25e736679448b90dc2d23cee4f48df0522 SHA512 52d9fea58c7f175721008f4885d3c5b87a84ef8f8a31ea4f6eeec6a492fb765f27f0da1b9a43375967d8e3d3853b928a22fb38b1b562e8a3b668f2667df8717c -EBUILD asm-9.1.ebuild 568 BLAKE2B ed82a7167ef4b0cf0a8b375f06928cd4472ff10b840a27ea6d9bc24be40aadae21c540aaed80dfb08e45476228f7dcc0db8947fb34b8464bc1dd2cb28cbc1983 SHA512 4929ac17afec26b1a4d944426a6eeb7e9a68f9f816fbe760a1ea65904503b43924aeeec6dd6751968a475cc80824a4358cca89640f82ada786f6442192ee260a -MISC metadata.xml 1081 BLAKE2B ef7ebc4b8e0fa96285ccd95dd05ae14cc365a3e044e3d89736a208b6378c6f4e3c1a42c5d69fd2b48f02039b6cf99c9b409935536405208f8a81a4ad194b625d SHA512 60c78bc7e78f78df7b5d2a50fb0333a3082cccf539398857b06a95892cf462e6aac2ed9ae206cf5276b8a100ebce08c5d0d73f3f3d74a7403c87963beeb10582 +EBUILD asm-5.1-r1.ebuild 1284 BLAKE2B cd9ba7ce9846795d6aed159bd8273e786098736d29343fd7e4599726f11cfc46dd84512604a6b979cbde94c0a3223e8297f2ae69f47703fbf270678ebfa8508c SHA512 dfcafbdf2b442e3a2fc602ed9445ad7a2d2852de8bcfb859f62a1e74925d30372c6a23722217a8d92356990ca817225244282e0947c2e8355d794459114a0153 +EBUILD asm-5.1.ebuild 1209 BLAKE2B 55f774cbe303d63d983a31937babd7e15f04273ea4c1d4052aae21aff2a150919abb490127b7bd8371979120a1b6a793f75ec0ef5f93e1082408d0e800a62a59 SHA512 010768d998a2d406d7ea90492e51bb1056fb4797bebd939aa3f7d776f4a5a599143615fc4471340f8d500345830975c6a48bc1a3191bd5e984e14cac26d57805 +EBUILD asm-6.2.1.ebuild 568 BLAKE2B 32971b777f8b654ad23e36ec2e15e9ce1dc2e0724dbed9baa3ffd1a508deee565b95031352813f6bddb6bd5f147e2d013e7022cb3b149a50e88bfb5a993db423 SHA512 13492f12664ba269f2ab8cb331bdba728279feaa29dc6c1315164ca16c2de12778958fead17eb827095ef61f273045be6d9efbdd07772e177a10e5b379dd35dc +EBUILD asm-7.3.1.ebuild 568 BLAKE2B 5813e8eda936a34f77c9647583b92e7ae845b52aa6c9a74408cf096a4b1badfad8fa1b075429bd75ac0d3aea2fe0b9adefca15265869d981dc18a29453d25d40 SHA512 5619c7922bab5b984283968749a46fce73903ebe4db57589f37b2c21a0f242ef03498e753dd0464aa68e66d798db07e3656e30d86ad015799dd1b6e668612bd7 +EBUILD asm-8.0.1.ebuild 568 BLAKE2B 5861690e7bb9868484dbf18e6bd1dd62efd3e779aa63a35364e832db79b4d01d799d583b5c8fcf4967c5815d45baf836b6c2557f597b54deb12b9558790d91ca SHA512 847fcfa188a7028850fb66ebb9f1d615a0f645a0b845276eb0d1c2abdbb5d02d6e9b411d633887d655f9dcbfd9a75670e33d2dc5346330f765b47a21bb8466a3 +EBUILD asm-9.1.ebuild 568 BLAKE2B fb9ac711d6adce8911b558a5558be89dbb2eeb25d37112c506f6797328424c7c966163bcbd266d79403237de21527a2f4b14c0623ac1e1d2179c90d0063f293f SHA512 c6599e31d0522123145c51e3dc9972940d6ced2173156fd4c3f0eaef93b97b087412ce2267f613de64df14f3dff23d7a140d3341c15d56d5ec9a1ee44146b5d2 +MISC metadata.xml 1230 BLAKE2B a71da4c461c9ba0e7092f9c16916b0a72359fa198654c7ddabd4544efa0eb17c52378712dfe4bad27f5dcd14b289999d899dac0e89a7fd19350afe951de27839 SHA512 91a6876a431249ac794c998ab741eb4c8e3bef302e090402fd7b84dd6ebfb7734a4dfcf85fdd1ab3cedbf1d746f60ec7aa4444be44a8e316e01b8d1d45fcee5d diff --git a/dev-java/asm/asm-3.3.1-r2.ebuild b/dev-java/asm/asm-3.3.1-r2.ebuild new file mode 100644 index 000000000000..b67557484231 --- /dev/null +++ b/dev-java/asm/asm-3.3.1-r2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WANT_ANT_TASKS="ant-owanttask" +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Bytecode manipulation framework for Java" +HOMEPAGE="https://asm.ow2.io" +MY_P="ASM_${PV//./_}" +SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="3" +KEYWORDS="~amd64 ~ppc64 ~x86 ~sparc-solaris ~x86-solaris" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/asm-${MY_P}" + +# Needs deps we don't have yet +RESTRICT="test" + +EANT_DOC_TARGET="jdoc" + +# Fails if this property is not set +EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar" + +src_install() { + for x in output/dist/lib/*.jar ; do + java-pkg_newjar ${x} $(basename ${x/-${PV}}) + done + use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/ + use source && java-pkg_dosrc src/* +} diff --git a/dev-java/asm/asm-5.1-r1.ebuild b/dev-java/asm/asm-5.1-r1.ebuild new file mode 100644 index 000000000000..b53de05f70d8 --- /dev/null +++ b/dev-java/asm/asm-5.1-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Bytecode manipulation framework for Java" +HOMEPAGE="https://asm.ow2.io" +MY_P="ASM_${PV//./_}" +SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.gz" + +LICENSE="BSD" +SLOT="4" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" + +CDEPEND="" +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/asm-${MY_P}" + +# Needs dependencies we don't have yet. +RESTRICT="test" + +EANT_DOC_TARGET="jdoc" + +# Fails if this objectweb.ant.tasks.path is not set. +# Java generics seem to break unless product.noshrink is set. +EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true" + +src_prepare() { + default + # Borrow some ant scripts from an old version to avoid requiring + # bndlib and friends. This may not work forever! + cp -vf "../asm-ASM_4_0/archive"/*.xml archive/ || die +} + +src_install() { + for x in output/dist/lib/*.jar ; do + java-pkg_newjar "${x}" $(basename "${x%-*}.jar") + done + + use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/ + use source && java-pkg_dosrc src/* +} diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1.ebuild index e210b62e4860..0b38eae33728 100644 --- a/dev-java/asm/asm-5.1.ebuild +++ b/dev-java/asm/asm-5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 diff --git a/dev-java/asm/asm-6.2.1.ebuild b/dev-java/asm/asm-6.2.1.ebuild index ed050bec9824..d5e30d7baf28 100644 --- a/dev-java/asm/asm-6.2.1.ebuild +++ b/dev-java/asm/asm-6.2.1.ebuild @@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="http://asm.ow2.org" +HOMEPAGE="https://asm.ow2.io" MY_P="ASM_${PV//./_}" SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz" LICENSE="BSD" diff --git a/dev-java/asm/asm-7.3.1.ebuild b/dev-java/asm/asm-7.3.1.ebuild index a9e66f9b283d..9b1ce17b7973 100644 --- a/dev-java/asm/asm-7.3.1.ebuild +++ b/dev-java/asm/asm-7.3.1.ebuild @@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="http://asm.ow2.org" +HOMEPAGE="https://asm.ow2.io" MY_P="ASM_${PV//./_}" SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz" LICENSE="BSD" diff --git a/dev-java/asm/asm-8.0.1.ebuild b/dev-java/asm/asm-8.0.1.ebuild index 76ad51bd4ada..9535ca9a5ecb 100644 --- a/dev-java/asm/asm-8.0.1.ebuild +++ b/dev-java/asm/asm-8.0.1.ebuild @@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="http://asm.ow2.org" +HOMEPAGE="https://asm.ow2.io" MY_P="ASM_${PV//./_}" SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz" LICENSE="BSD" diff --git a/dev-java/asm/asm-9.1.ebuild b/dev-java/asm/asm-9.1.ebuild index 7ff100a3d930..73bac3be0c6f 100644 --- a/dev-java/asm/asm-9.1.ebuild +++ b/dev-java/asm/asm-9.1.ebuild @@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="http://asm.ow2.org" +HOMEPAGE="https://asm.ow2.io" MY_P="ASM_${PV//./_}" SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz" LICENSE="BSD" diff --git a/dev-java/asm/metadata.xml b/dev-java/asm/metadata.xml index f653390931e4..382aec39b1e3 100644 --- a/dev-java/asm/metadata.xml +++ b/dev-java/asm/metadata.xml @@ -5,7 +5,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>kaiboma06@gmail.com</email> <name>Kaibo Ma</name> </maintainer> @@ -23,4 +23,8 @@ therefore designed and implemented to be as small and as fast as possible. </longdescription> + <upstream> + <doc>https://asm.ow2.io/documentation.html</doc> + <bugs-to>https://gitlab.ow2.org/asm/asm/issues</bugs-to> + </upstream> </pkgmetadata> diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest index ebd307fb345f..5758d136a34d 100644 --- a/dev-java/assertj-core/Manifest +++ b/dev-java/assertj-core/Manifest @@ -1,3 +1,3 @@ DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3 EBUILD assertj-core-2.3.0.ebuild 745 BLAKE2B 2dffcadb02ebd13c9178b71c4ae4732573c8a5d9464fa49cd8289dc7effc99738da2f019ed4575c34ad1bc64366c21ca88f85def16bb016030d5b3a1ddc14696 SHA512 6c6c8f520d2d64839eb615d5f4d8c5fb477657527885c1085e01a7b14cfeff7309ceb341722146becd80d24c12879bc6c854e3563c0aa718924aa6392bf7ddc3 -MISC metadata.xml 639 BLAKE2B 1bf3a68298529b7356f7416cd193cedb70c3f44fda7753cff7a9213d75e8ff000b92bd3bec724b5fe8eabec254c26920bedcccaa450e565074a1451cfc08b735 SHA512 784148def8994941ba884e79622d7d9ac8c6f2c5eb0a15acc003aa2b345c63a4574d4a9b3f521943f841598d61b1ce1a512bfe0328e51d10d9cfe4c7124a0cb7 +MISC metadata.xml 639 BLAKE2B 838a5321ee12c23f8d85c9767a15085724c1fb872fefdc9412d67f113de7e1515dca16afe11c5f5fd55790bb9e4feaac3bd26027a33f728655592bb7bbd448cc SHA512 ae023f76f4d256b3efc4b8393370db21600ebd381066691574ef9f02b962bd49996af10eb74fc009b94860e29b3a18d747943ddb3642e0501c14b41bbe428359 diff --git a/dev-java/assertj-core/metadata.xml b/dev-java/assertj-core/metadata.xml index a7b501cac593..e2ea74d8f3ec 100644 --- a/dev-java/assertj-core/metadata.xml +++ b/dev-java/assertj-core/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest index 8f8ae15b497b..8d17c740ce22 100644 --- a/dev-java/bsh/Manifest +++ b/dev-java/bsh/Manifest @@ -1,3 +1,3 @@ DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c EBUILD bsh-2.0_beta6-r1.ebuild 1303 BLAKE2B a74bca95046e027ce0f462b559ebd8c679545d034f3b4057759e96b32c61898e5c707444e40965e2b0e7cd5df7e4c78b97eb68e419305d18df48c4d62694ce18 SHA512 847ec48e9c52470178835285f7cd1b575cb73af4f206efaa9007adb6d4306057aea26516ab5f804adf379ddf2d12736b00831b562e200743f245dcd804dece1c -MISC metadata.xml 330 BLAKE2B 4295b9afc957d9b69add3267ff62910a7cb8bed9b918dec04d0f56612f452b669639462479e9627c2fd451977c4f74b2ddbf031b395e34e11a0af34a70405d8b SHA512 5c495c72dfc5d55c63b0af0740b0b82306e047817965a8c095dc6ae89324af842d5f8ccaa218107ff715544051e9c984fd1997ca11786a9c0fd070d72441b7be +MISC metadata.xml 330 BLAKE2B f6a3eddd83a1af377f5f482041ef9bf0bfd4cd820a1304a60b1e9579a9aef5c6b7d7f4149e8e34ae55f93d23c846d7487963dd997f22141ee51c3990813732c7 SHA512 70339f4f92b294ca23db2e095fae9c56bf48714d1070090410618c8ce69d651d39ed78bd45371b7b84e46bf864c3a7bb1e53190f93667ee6d8a01366051a6a62 diff --git a/dev-java/bsh/metadata.xml b/dev-java/bsh/metadata.xml index 203bfa39aeaf..69b7ba94f68d 100644 --- a/dev-java/bsh/metadata.xml +++ b/dev-java/bsh/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest index c39fd4d7c1e0..a8275df96aeb 100644 --- a/dev-java/commons-compress/Manifest +++ b/dev-java/commons-compress/Manifest @@ -1,5 +1,7 @@ AUX MANIFEST.MF 1222 BLAKE2B a7ec1ac35802d24cbc9ce95d3974004d89e6233aa41f95a33733b08dc447c54bbd6da2a3a01ef2d46cee303578a4dd116704e7e1dc551af1212b0b3ed891ea1e SHA512 048b09aa2ae2e20c8b5b0e116eb49fd680634e9b654d5026004e32a39bec4e5b669afcadea8338764a157f70cc0c3fdb5d2ce98513bfeae267be7ae02935381d AUX build.xml 11340 BLAKE2B 9a0366053069ca9d060257887cbe70a9de8e8796894975b00b0c25fb96b80d84e83e371debb619efbfbd244f31a0214d7487f38611f8532da838a971b5b8d528 SHA512 09abd59212021ac20fae760ce127546bde53e40e2ed0db26a0a93417c681e46b038d1940964e55fd46a8f7db44b5ea2666459d75358ee1dd5882895c803e0c89 DIST commons-compress-1.10-src.tar.gz 8528642 BLAKE2B 7fe3891340f8d215134c6926711dabe139cc978560c1c92739a755d69f8f99503e3aa7f8b9a5728922e11109ee196f27ae04a03e26e009a61415d5df2bba975e SHA512 1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910 +DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B 5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6 SHA512 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e EBUILD commons-compress-1.10.ebuild 1498 BLAKE2B 753e2e3e8cc14f90ccadcdfc82f73dc5af6d54d7db6ad81b28465c235895325119df88e03028b214427a6642c05aa4b8b4554a5572dcf71dceebdb61bfef42a9 SHA512 0a172dfe3c1026925fd92418085c1324e9fae506f85917e84fee68d9ee4fb38d38c8019c7730157deb2e3fea7ab241296ff74787be3e5a23c996f81267695537 +EBUILD commons-compress-1.20.ebuild 1070 BLAKE2B e62e87c31d535950f9aa90e55847a36b153b446f065955f00bdc4faaa0df672ab5daf3265d2d537eab8b221ed8dc910a4cf05b2bdcb7ba4935cc391422463af8 SHA512 04fe39bb22322218cfe93e2a9a71828aa13805db75e9184b06b3934f65839ac5f43df609e763afee6c484c8546da0e92a75c5d04c508cd40261e7824077f272d MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 diff --git a/dev-java/commons-compress/commons-compress-1.20.ebuild b/dev-java/commons-compress/commons-compress-1.20.ebuild new file mode 100644 index 000000000000..f20803df625f --- /dev/null +++ b/dev-java/commons-compress/commons-compress-1.20.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirrors.supportex.net/apache//commons/compress/source/commons-compress-1.20-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-compress-1.20.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.apache.commons:commons-compress:1.20" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java API for working with archive files" +HOMEPAGE="https://commons.apache.org/proper/commons-compress/" +SRC_URI="https://mirrors.supportex.net/apache//commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +CDEPEND=" + dev-java/brotli-dec:0 + dev-java/xz-java:0 + dev-java/zstd-jni:0 +" + +DEPEND=" + >=virtual/jdk-1.8:* + ${CDEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CDEPEND}" + +S="${WORKDIR}/${P}-src" + +JAVA_ENCODING="iso-8859-1" + +JAVA_GENTOO_CLASSPATH="brotli-dec,xz-java,zstd-jni" +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/core-specs-alpha/Manifest b/dev-java/core-specs-alpha/Manifest index c1b01f077cc1..0effab637858 100644 --- a/dev-java/core-specs-alpha/Manifest +++ b/dev-java/core-specs-alpha/Manifest @@ -3,4 +3,4 @@ DIST core-specs-alpha-0.1.24.tar.gz 9896 BLAKE2B cb06053d2aa77b4bbd58b612fb0f801 DIST core-specs-alpha-0.2.44.tar.gz 10163 BLAKE2B c81ebb08779c3db137363ffb12bc7e26d29cd67323c98430a033f639714da83bf8c9d14146c12d925094e057d3735d100e33656e9571a0a4c107dc9fb56359e9 SHA512 1a59b947c580e45a280b25d5827a174565e066dde577685ca86aa1bbd9767716991cefb8a944c7ded0f84a71f9902f7fcdb5baacc7e19180096d599a51083048 EBUILD core-specs-alpha-0.1.24.ebuild 884 BLAKE2B 70d8e88cedeb0a133411990f3849b479f24896f644ab5620fe3c3377b793cc6c553177fb6386eed57becfd0876557eea2c512bb0be837e635e24f214cfb9c2ca SHA512 7a93646083f75faedb51925814ad00463348424d704fefc8eee4f780199e8a363b8e343421cc62439d0e4744f03418c65b59495a87a1560dd1590f0b99d9e06d EBUILD core-specs-alpha-0.2.44.ebuild 884 BLAKE2B eecf5279ed83fde8cf61cf672f017bfdb38ad4ca58a18eb56b1e550417271ee0b9dac6da589c7769d78fc3768b30e70b62e9663bbfb1f9d7ded797332087ad9a SHA512 d4628a9171862783508b7e7d522db649af73724234ece129e851d14bacee696c5c348f95a76860f4483119403c6a0a7a441677fc016ad8354b6a4b4afc8e33f5 -MISC metadata.xml 451 BLAKE2B 67e193d5ecdbc6e472b46b38ed2182c23e2506c07f048df3ae5b2192fa30d8fa4d8f6481d0cc85475008992c38e9d46daaf63c5ba5ee42db8a1f5d1eba1e206e SHA512 a5543ddb12939e3f7a3d091968098e1ffaeabbc774022098773d5f81fab71639ec75fd2294f5797c7d33734a6a3096b68d66bcc79e48780a7fad14cb1d3a5538 +MISC metadata.xml 481 BLAKE2B 5077630f26ed6daf5fa01d4a256b14428ed0b7b0fffd264fd4120709bb6d671c332d767326fe38016a8de89f23d166508927a98eddc907baf4f72ba13b43f6e5 SHA512 b833cd62bf3d25bb9140e0619218e68ac35d9ec6667d73a14ea01e738d746afd587e83633e713bd7fe808b177a50e795ce7bc30a1e215c6cce9d3656161a4fab diff --git a/dev-java/core-specs-alpha/metadata.xml b/dev-java/core-specs-alpha/metadata.xml index 3e2f01e0d964..4e34b7026845 100644 --- a/dev-java/core-specs-alpha/metadata.xml +++ b/dev-java/core-specs-alpha/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>tgbugs@gmail.com</email> <name>Tom Gillespie</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-java/fastutil/Manifest b/dev-java/fastutil/Manifest index 9d3c9b33aadb..334b5a8a64ef 100644 --- a/dev-java/fastutil/Manifest +++ b/dev-java/fastutil/Manifest @@ -1,3 +1,3 @@ DIST fastutil-7.0.10.zip 518168 BLAKE2B 7941e4b6725a45e7e4f08d6c3c2b44fc5940266d0274ea2c8342747e8078024056c4c39e2d64a2f529599b9780b66f1dbd041f5de4e5fec3879c35fc923702c2 SHA512 9345f509243bf91123b4232b95915ae4d6071b5da17948cf62e993e77e9ed947637f02937ccd98edbfd874db7f98c1858357e21721feb338d97041a7bcc3e558 EBUILD fastutil-7.0.10.ebuild 828 BLAKE2B ddceb91f90c3ef093fef0dc9cbadf98883acb71222b69fbfacb187687f63eedb7035726b9f0410b313d0588b1d28202df4d4b7654e54de2f2c0e7e1f13f88ab5 SHA512 74b0b380bdc479f97b5da50d2dcf2ee114b6a11a168fbca1330827b93467e385a2ebf009d69bb4e924c25de2305ddb277a2859120867461272d605b6357f9a82 -MISC metadata.xml 315 BLAKE2B 182d83d40631234d357d332b8e293c21bb2f3eae973943e9e4bad72d59e6d99beba37ea7040f609490b2f5e9dd9dc6844c29bdcd2067862620b883cd53032e3f SHA512 447055480b194584c2a20458664b53916d198417612b3a084f7d36dc18ea0d4678b93ba916295905059ec37d92a18bfdf2e04b536b5aca378325f38037730ad9 +MISC metadata.xml 315 BLAKE2B f7936e933c4510bf344b870432c54ff24221dbecc10375fe7e4a7b9e06c894b6b8557f1900ab88603cf2607fbff91506cd76b8ef84b14f5f7ae0c35611b3a697 SHA512 ced6b57b11305f857f84b07905dd24732cd43bbfdfc8269b3bfede120b1ca284964d793ede90fa05180f53e7cf136f4ec67b8c3735412ca5a64f02a6c1fc2db9 diff --git a/dev-java/fastutil/metadata.xml b/dev-java/fastutil/metadata.xml index ef9d3ced77a5..a17b5c024c8d 100644 --- a/dev-java/fastutil/metadata.xml +++ b/dev-java/fastutil/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest index 53630aed67c7..c357cd76d56e 100644 --- a/dev-java/freemarker/Manifest +++ b/dev-java/freemarker/Manifest @@ -1,4 +1,4 @@ AUX build.xml.patch 2160 BLAKE2B 15221b65f00871e3e01b30b735d9ac3498644eb5570e4d8ac5e75ad4dc995719f40832fe9a58fa367aee8a8a2a0d854ea99370cd1def119c30371c3f503b2a69 SHA512 ae01462ed0a8fc61fc6e34b99b536bf7d36da73744a070ad63f555af07de5dec3a0926b97fc984ab481db7b7c8807db53998f83e17a5717e805c87a49047731a DIST freemarker-2.3.25.tar.gz 1873971 BLAKE2B 52c64938c67ac0303b07f4aa74c3fc7ccc0be68bd37a7c6c663ac0849acc9f2236d1028abb377efa6fdb518840b1961e71c1a02a37388864f9be14b3b443f28a SHA512 32a41a73a2f71a4e0ae8829da2c09e07204aa2b4a6899e2c7a3db0bde5d3e129ec7b44b7299a20165d7eb88f4f7d1bd9f0b7a1fd116dc11493134bec2306d1ac EBUILD freemarker-2.3.25.ebuild 1521 BLAKE2B c2bfe59271f782fbdf032ae0bef290652b02cc360a597190fb08fa404823272a6f2ba5dbecac0c86ee6a2be1f3ebcfdd259ea37a1bd801daf44b1cca78b41d4e SHA512 dab420734ea60b4b26781240046a5791a48d0346ec30526563e6caa656062a550948a61232664f96544cc4b6f4a865626d0bd21ab1ef60d1e3743da7b32c0039 -MISC metadata.xml 383 BLAKE2B 37aff0d8a54a89b0cc78ccc0b9f09b86c1cd91f6759511711124cb805bcc61b682111a6664c8ea03d701ad92a0eb72a4108e09bad1a33a4c5dde3d7ed4f1b646 SHA512 2b6f5f22ae11f25aac3cbf3a2c3f3161ab391b932740d964b41bb84d24f54d12a8fa60f11502571b30d5100bd7fc578d82939de0ae7d1bef0d22df910edfed2c +MISC metadata.xml 383 BLAKE2B 673f786e4169d8ce1dfa9b341738f6b30cab82a6c0c86cbb53e6b3ef7fb853285ad33551d0a1f436a77eb5fd029f5a50120a4a3dc29e0edd8643a6248af540f5 SHA512 6159fec9f927ef733fb89aa11bf0fc6e9920d9b4d33601bf728d6f0c32a625ed673a4c1db0fd4d364664479da85c3bd0a11e26debdb0664a88659970740c8202 diff --git a/dev-java/freemarker/metadata.xml b/dev-java/freemarker/metadata.xml index 62aedeea4e53..e471a93e212d 100644 --- a/dev-java/freemarker/metadata.xml +++ b/dev-java/freemarker/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest index c96bec1ee0a5..4628da5e2642 100644 --- a/dev-java/gcj-jdk/Manifest +++ b/dev-java/gcj-jdk/Manifest @@ -1,3 +1,3 @@ AUX javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb EBUILD gcj-jdk-5.4.0-r1.ebuild 3726 BLAKE2B aabad7193016c3035c3d75c338606e865d084deb7e75f509728ecf31206455bc8b4c79130cf40a9f266a102aa329dae9bc914a86a58863912a7e336457708f40 SHA512 3019ade48332e0313aae1f4fc12f1aebde7a6734a8c7966dbc3d34b70a81aff1aa8e37173bdc2d249316ee13010928e64c8f0ae00df3adc3a73bd5eae41fdb78 -MISC metadata.xml 587 BLAKE2B f7ac8f38876d21fa09c3452344ca5b0c3d32090d15eb9753cb3c466d30ddf3f99289d41297c84956384f851767419112adbf349bcff99977377e9476644fa952 SHA512 6d748a94a49716fdc70c7983b87cb37ec1809d2c43b823486110957cd38fe6766db6627f3d548fec0c204af153f852bb1e75dbc112ecce2bfb26478b8db46754 +MISC metadata.xml 617 BLAKE2B 92b08aedb4220dd134d8a7da3355638ba5599b0cbdc6a42c4f21ce224f1c5fba664328c9629b7ea772d3f7c24bd4cfb0023049318366f7bef038742075e564c0 SHA512 d37993bbdfb72db0d6f13de58a527b28e82cf6e4ab36aff4dc75a338fbc08ff45537e4540cee5e6b107128c9f14e47819fc67c4935092d1c79b5b71be4c2825b diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml index 7ea0b046d2a9..860110bf6d56 100644 --- a/dev-java/gcj-jdk/metadata.xml +++ b/dev-java/gcj-jdk/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>gnu_andrew@member.fsf.org</email> <name>Andrew John Hughes</name> </maintainer> @@ -9,7 +9,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest index 958add0d4b89..e6dafa6d4945 100644 --- a/dev-java/gradle-bin/Manifest +++ b/dev-java/gradle-bin/Manifest @@ -1,3 +1,3 @@ DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d EBUILD gradle-bin-6.3.ebuild 985 BLAKE2B 5108b1a0ec969d79b2a27256b8c9ba5430f4d4326bd0e692cebeb31c9f09830592c3b856b19376fc6eef2d14069bf3c804b11f8054e7464a5a88c2b6b81cfd58 SHA512 c04c5d989701292ee4cd269e61ba989b5dfb818822b8c92f274c808216fadea75014ca21359ccdc859f29cc62812f3bc45c4a6db71a0f800f25575587373b583 -MISC metadata.xml 435 BLAKE2B 22a7527b15ef2974a3e389977eb4056c03f7575ec9866848b90ef9e98bb7d2d645e83408f0ab4cbb139699757e7e3a1b5eb458a389563597ae3fa0ff5c310c0b SHA512 2a8b7c438d8aed952350c0a08660bde349363bb80794de9197c7ac107409021c1e38f0168e13213d730c6251ed9e39f644c42d6de050f0e58e862efaa46b2a43 +MISC metadata.xml 449 BLAKE2B b675645687a94a13762df0ee0607f6e9bbab7fcae1a7570c0648d3d574f640b3460ec3b2dc6ed8554026a70287abc349bb2a3f601e534d370cd6ad08c2f791ad SHA512 0393173c9476820673d65582c827868e2b16e346d07be73d8be2f37e1599c3e643e4c16d2fff37ef1ae1d3b8dd667492c2f166a352d382ba4a6334134af41354 diff --git a/dev-java/gradle-bin/metadata.xml b/dev-java/gradle-bin/metadata.xml index 1b6bfaff005f..f9d3fac87a16 100644 --- a/dev-java/gradle-bin/metadata.xml +++ b/dev-java/gradle-bin/metadata.xml @@ -5,7 +5,7 @@ <email>chainsaw@gentoo.org</email> <name>Tony Vroon</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>flo@geekplace.eu</email> </maintainer> <maintainer type="project"> diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest index e47cae3095ad..23e284d15961 100644 --- a/dev-java/hamcrest-core/Manifest +++ b/dev-java/hamcrest-core/Manifest @@ -1,7 +1,11 @@ AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb061c451a58d99385a2c41be28a137b209783affd76e1e0bd901a5497d40b290ac219d61046fc65931ea056c725ae0f835ee1 SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5 +AUX hamcrest-core-1.1-java-11.patch 1516 BLAKE2B 0a6c7fdc74015377075f174149a1fe2f55a3a4e782490c5bc7cac4abc3b0f8996e39dd98c094637f9899b58b15f9339b800154e4ab380395c06167c28d603076 SHA512 43b084fafa7d1c69f3cd6924e3446c32f20481da1148a77d2dc9021a439257eaa518e3b57a8049f3212cba75f62e1cd3db2c6feea36e28a6c93584fbb48ee968 AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3 +AUX hamcrest-core-1.3-java-11.patch 1204 BLAKE2B 25f17238124829786bd3c8dbc468536f8a6bb684531e7859c003789249c88307d063aaf5b3e47abca5a93884bb3378d9197ce112d3237eaf1d021ad75e678e61 SHA512 6269c90835fea7387e5f830160c536eb91ab3037ed2e9bd5142f8cd2029fbea9e9baf374aa0fba98e0d59f0a0e83cd41f1d81265d94099013b81841253a85f20 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f EBUILD hamcrest-core-1.1-r3.ebuild 716 BLAKE2B a0442ff57be2628e59b831794fb9e48cb54d1ae88abd9ab69bdfe39195e55c16da9234241af00378345e21dd4b98421b625a3e42ffe254f57b2b4fd0a4b8cb55 SHA512 8138d54074543ccbf142647639eb45efd304b0bceffcd0fbe942e3dfcfe565d15c184178661495717aee507196284543a7d4f596e0ea828f1b1871d6ba29f260 +EBUILD hamcrest-core-1.1-r4.ebuild 819 BLAKE2B 3f493eba6cefdb44388ce7ff68358973124e501d4d64baa3db1ed090fc14879ea84cdc703a5735101980a7b65b9c3cca6fd0128e3faa70e70af42a1f54a7d80e SHA512 67e6a9862994324c14eae28d426ff1b9265bec1fb1ccb82ada71f2b376b13ec57d010c10678fc570ef60b6cf6a05a15558901ecaf0aee8f4e092db8a571f542c EBUILD hamcrest-core-1.3-r1.ebuild 1508 BLAKE2B 9d6f9a554c9194ae529da1323cb299012e0c9e24eb824abc81c97832d6bb3388278b1d2b70c2ab63a881d90e7e37051ab8a77775ebe58b6718f60a19a02a39cc SHA512 0c4e858cabb30eb516ee565bc12a34b3a10c160b8604a6c2ea7c64fdf1ef7f18f307bfd1f6dde9689606fc1396b67c54ed129c49bf92affa91917033ffddd510 +EBUILD hamcrest-core-1.3-r2.ebuild 1589 BLAKE2B 836857be5cc28379c345ded0738cb3d48dc43096d804b80bdb9e2345961a53b6b084e3e0fe39ef18fdb81cbf226005d1f6e82e7ae219db8467588043287a3e56 SHA512 9be6623ef6703d1a6dd930d4000d939de5d11f65221f9bcb4e537e6e9804a5cb3a9fa50d9661bd7af57950366d4f5bd825ecdd7e90a814f08bce4fab6fbdc5f3 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8 diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch new file mode 100644 index 000000000000..1e3805eb1755 --- /dev/null +++ b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch @@ -0,0 +1,42 @@ +diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +index d435303..962c945 100644 +--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java ++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +@@ -1,6 +1,7 @@ + package org.hamcrest.core; + + import java.util.Arrays; ++import java.util.List; + + import org.hamcrest.Description; + import org.hamcrest.Factory; +@@ -32,7 +33,7 @@ public class AllOf<T> extends ShortcutCombination<T> { + */ + @Factory + public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) { +- return allOf(Arrays.asList(matchers)); ++ return allOf((List<Matcher<? super T>>) Arrays.asList(matchers)); + } + + /** +diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +index e003a7f..4ed9030 100644 +--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java ++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +@@ -1,6 +1,7 @@ + package org.hamcrest.core; + + import java.util.Arrays; ++import java.util.List; + + import org.hamcrest.Description; + import org.hamcrest.Factory; +@@ -33,7 +34,7 @@ public class AnyOf<T> extends ShortcutCombination<T> { + */ + @Factory + public static <T> Matcher<T> anyOf(Matcher<? super T>... matchers) { +- return anyOf(Arrays.asList(matchers)); ++ return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers)); + } + + /** diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch new file mode 100644 index 000000000000..b250f1cc7c01 --- /dev/null +++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch @@ -0,0 +1,26 @@ +diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +index a206b80..d55cf6b 100644 +--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java ++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +@@ -57,7 +57,7 @@ public class AllOf<T> extends DiagnosingMatcher<T> { + */
+ @Factory
+ public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
+- return allOf(Arrays.asList(matchers));
++ return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+ }
+
+ /**
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +index 55d08dd..2a46631 100644 +--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java ++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +@@ -47,7 +47,7 @@ public class AnyOf<T> extends ShortcutCombination<T> { + */
+ @Factory
+ public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
+- return anyOf(Arrays.asList(matchers));
++ return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+ }
+
+ /**
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild new file mode 100644 index 000000000000..36347fc3a513 --- /dev/null +++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +MY_PN="hamcrest" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Library of matchers for building test expressions" +HOMEPAGE="https://github.com/hamcrest" +SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-solaris" + +RDEPEND=" + >=virtual/jre-1.8:*" + +DEPEND=" + >=virtual/jdk-1.8:* + source? ( app-arch/zip )" + +S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}" + +JAVA_SRC_DIR="${PN}/src" + +PATCHES=( + # https://bugs.gentoo.org/751379 + "${FILESDIR}"/hamcrest-core-1.1-java-11.patch +) + +src_prepare() { + default + java-pkg_clean +} diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild new file mode 100644 index 000000000000..1af30d072f00 --- /dev/null +++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +MY_PN="hamcrest" +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Core library of matchers for building test expressions" +HOMEPAGE="https://github.com/hamcrest" +SRC_URI="mirror://gentoo/${MY_P}.tgz" + +LICENSE="BSD-2" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos" + +DEPEND="~dev-java/hamcrest-generator-${PV}:1.3 + >=virtual/jdk-1.8:* + userland_GNU? ( sys-apps/findutils )" + +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_ANT_REWRITE_CLASSPATH="true" +JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar" + +EANT_BUILD_TARGET="core" + +PATCHES=( + # https://bugs.gentoo.org/751379 + "${FILESDIR}"/hamcrest-core-1.3-java-11.patch +) + +src_prepare() { + default + # Empty out the contents of the generator target; it has already been built. + eapply "${FILESDIR}/hamcrest-1.3-empty_generator.patch" + + # Fix problems with Javadoc target. + eapply "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch" + + find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files" + + local cp="build/${P}.jar" + cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})" + EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}" +} + +src_install() { + java-pkg_newjar build/${P}.jar ${PN}.jar + + dodoc README.txt CHANGES.txt + + use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents + use source && java-pkg_dosrc ${PN}/src/main/java/org +} diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest index 63ea5851c3d9..c7ee902025ca 100644 --- a/dev-java/hamcrest-generator/Manifest +++ b/dev-java/hamcrest-generator/Manifest @@ -1,4 +1,5 @@ AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 EBUILD hamcrest-generator-1.3-r2.ebuild 1324 BLAKE2B 80e8b7ef81afe127b0cb4cd17db60e376f448d304695f9ff65a4e9c5571a1a57a1cdf292612bf4671d6c260b377be68d72895a3dee9a15527028f7a390581a8e SHA512 acae20ed327ca7555e47d676ef768991dab7fde73c8156b9f0b167f4ea6fac5079c155148c84bfd4df8c6569be8a7812853e05b25d889ef42c3634a9e2916e11 +EBUILD hamcrest-generator-1.3-r3.ebuild 1306 BLAKE2B e862807de2f19aaed010d88080e9d589cf730545cd6f7bf1bf1cebc3080362d55c667cf6c294ee727fc3d02407caf3439f457a1ad60203178efd0d69b5068046 SHA512 5c3dd291f0d2d20ac1787fcd734eaf69e03043e6733ba7fc7cbc6906dfb489e2164f68f46f53f77fb12522694958d108a4fe3c23c84fab26599159680ebbc6d4 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8 diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild new file mode 100644 index 000000000000..0c1e98d14c19 --- /dev/null +++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="source test" + +inherit java-pkg-2 java-ant-2 + +MY_PN="hamcrest" +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions" +HOMEPAGE="https://github.com/hamcrest" +SRC_URI="mirror://gentoo/${MY_P}.tgz" + +LICENSE="BSD-2" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos" + +CDEPEND="dev-java/qdox:1.12" + +DEPEND=">=virtual/jdk-1.8:* + userland_GNU? ( sys-apps/findutils ) + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.8:* + ${CDEPEND}" + +EANT_BUILD_TARGET="generator" +EANT_EXTRA_ARGS="-Dversion=${PV}" + +src_prepare() { + default + # Don't include source in JAR. If a Gentoo user wants the source the source + # USE flag will be enabled. + eapply "${FILESDIR}/${P}-no_jarjar.patch" + + find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files" + + # These jars must be symlinked. Specifying them using gentoo.classpath + # does not work. + java-pkg_jar-from --into lib/generator qdox-1.12 qdox.jar qdox-1.12.jar +} + +src_install() { + java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar + + dodoc README.txt CHANGES.txt + + use source && java-pkg_dosrc ${PN}/src/main/java/org +} diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest index 0536bf2f5781..c158dd648c53 100644 --- a/dev-java/icedtea-sound/Manifest +++ b/dev-java/icedtea-sound/Manifest @@ -1,3 +1,3 @@ DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a EBUILD icedtea-sound-1.0.1.ebuild 884 BLAKE2B cbeab5af2535f85b974f70eb861412ea9f94e7c48adc82d72a2b51930053d45cf894dbf9c9a499f33b207a84b5fdfca1b65a95c695ed0060bf4603b1901780b2 SHA512 0de6493e5357a26f9577c98496e66e72b96452e5f5d92f7e6e1c1d3c7470563b793266d280caa672b593cadac7b5d6e21996ccc391ce3af8758432d8a2e77d47 -MISC metadata.xml 368 BLAKE2B 456c9159397faa36fe3eafa4ec60a46a43ed4e2436f6c1175147da66b2ec2b6b97d4e03b08e53340382ddc06d0ad0007e8d31a6a8c90c39522c84f4393a0ec08 SHA512 e7b3e6a4142b0c38a9620af80161d2b4a2cba75dcb5a95fe19c9eb1f98f23888d0bb97369103a577a6ecc5e72d78dd3ab86d1cc7cd8d984ba9ccd9d35c17a509 +MISC metadata.xml 382 BLAKE2B 59a6ba628e5453fa0b74e335ddc7b2518b2624037549c20a2850c3dce7119c52c7b592bc875a89e5b04eac272f98156b9819d03623c35580c55501ce6d3b4cd7 SHA512 210018116f0894a6eb291b92cc5994b4e89870035e884b5248f930172cfa431f18dca6acd972ed0b1f366b6aa441e46ff2730c291b4334db4637aeca1e64091f diff --git a/dev-java/icedtea-sound/metadata.xml b/dev-java/icedtea-sound/metadata.xml index b9ef3f832b7d..72ea7ca75a41 100644 --- a/dev-java/icedtea-sound/metadata.xml +++ b/dev-java/icedtea-sound/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>gnu_andrew@member.fsf.org</email> <name>Andrew John Hughes</name> </maintainer> diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 357af0dcceb6..5f4428c34f51 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -25,4 +25,4 @@ DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591ba DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 EBUILD icedtea-3.17.0.ebuild 12309 BLAKE2B 749c85a4365c8ce9330de196578f8a7b4cdaac48608e24c50df9244e27e95f62ef97c5b5652cf1af25b3042dfe537344acb617efe54b5cd481b971bb620f7a6f SHA512 9770ce5deb3950ceda3d5fd4089c09feaea93c2181751a561a4166333f727f7afd3a46d0b49bd15174184e1a4b5a72f866d2fdf679886b0e8cd52f8445b29ac7 EBUILD icedtea-3.17.1.ebuild 12309 BLAKE2B 37146e81d1edc8dd7fc12baa6ed22c4498cc9768d95d14f371003b60d4eb52df0249f3a9a0f15832a78cf52aef3453684b2b5aa57129ed77a48189d9adc36b0c SHA512 edb424109fae679985c7b53eddced8aa926bf812291a2a580b37d8430c4e4e6b506a04db15a5f9cd86151102c1dc1dd4636c39e1ccfe3f604006f587633098e3 -MISC metadata.xml 2078 BLAKE2B 62fdcb5253303938fdb76f663ddc6f3916435a3c9ed96bd4dbace4def75710e6dfe651466cf2ec9783cb897e13347c64eed12b20c90b68635865c395979bd67a SHA512 1e7b759aa3b3e5a50347cfd788c50435a28dbe094cead897e35c7be4fc85dcc47fab0091592d8ca74f7274e77e57b75658ad97385faaa7d3287579f88a198cf1 +MISC metadata.xml 2108 BLAKE2B 3160040a91a46f2b5dc9be02405ad35849b5c02ddfae81a17ec47a15bd9103cb17bcd0c1065a660e3ffcd4e8d815fffab4c020d3dfbe5e9936826bb15072e00d SHA512 fdcb8411daaabf953bbb75d8b58137ab1f7a3755a1c016ba431ab366177eb91e9cef365fc921d989384f076c589fc46358838d4a4c86cd50955cfcfc9b97dd74 diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml index 55c624c0a067..18643722fecb 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>gnu_andrew@member.fsf.org</email> <name>Andrew John Hughes</name> </maintainer> @@ -13,7 +13,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest new file mode 100644 index 000000000000..308d1d8855f0 --- /dev/null +++ b/dev-java/jakartaee-migration/Manifest @@ -0,0 +1,3 @@ +DIST jakartaee-migration-0.2.0-sources.tar.gz 34495 BLAKE2B 98e281d4a0a2c27215131b4b72406fbf9d6b335602df6e44be8eec252071482305182ab8d3554317650f69197438c1634982ba77297c93603835ded1fe43d105 SHA512 c3874cf036051a0636287b3afa78af96458816601a7a79117994389f31ad8f253d9b0a9bb1530de3263f1b8ca2f63fcdf113b3ad933a545136559ca80ae7700f +EBUILD jakartaee-migration-0.2.0.ebuild 1389 BLAKE2B 3ad313f6831a5515aabdb82fdacf79b8f5c797ffb2795cd69f3cebb30c52b4d8084cab5a74adef3b8fe0618d54d89702edeffa136c138727a929377d8a8a37be SHA512 ead7d25c89c56bf8c7e7a5731addd40b6ef4d984a0c653926230b3944069a8cbf310c1122d1f03304faad98799f9a20b78a29e98c5d69ebeb209f547ab8bedcf +MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 diff --git a/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild new file mode 100644 index 000000000000..7815b0e6bc20 --- /dev/null +++ b/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v0.2.0/source/jakartaee-migration-0.2.0-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild jakartaee-migration-0.2.0.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.tomcat:jakartaee-migration:0.2.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9." +HOMEPAGE="https://tomcat.apache.org" +SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +CDEPEND=" + dev-java/ant-core:0 + >=dev-java/bcel-6.5.0:0 + >=dev-java/commons-compress-1.20:0 + dev-java/commons-io:1 +" + +DEPEND=" + >=virtual/jdk-1.8:* + ${CDEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CDEPEND} +" + +S="${WORKDIR}/${P}" + +JAVA_LAUNCHER_FILENAME="${PN}" + +JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1" +JAVA_SRC_DIR="src/main/java" +JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI" +JAVA_RESOURCE_DIRS=( + "src/main/resources" +) + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS=( + "src/test/resources" +) diff --git a/dev-java/jakartaee-migration/metadata.xml b/dev-java/jakartaee-migration/metadata.xml new file mode 100644 index 000000000000..2444066aa02b --- /dev/null +++ b/dev-java/jakartaee-migration/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> +</maintainer> +</pkgmetadata> diff --git a/dev-java/jargs/Manifest b/dev-java/jargs/Manifest index b6aafc8dd3f8..65dba8949108 100644 --- a/dev-java/jargs/Manifest +++ b/dev-java/jargs/Manifest @@ -1,3 +1,3 @@ DIST jargs-1.0.zip 202051 BLAKE2B dbf74d90a5c229f9ca1ba42c8d0b3b35404b3eb7c5dc7af0a76fc222465707b9dbfe44fef63cb1ffbc64821fa2f0c7e8144466e44de9bbf84cf198f5a107e31c SHA512 c121a8850c43fda1561df2ead211d526596b3aa8d01074df86ef0fa68eab83021fbb99ba16f05a0a20185b027f820643189c591bc8b79fb29d579eff4745b359 EBUILD jargs-1.0.ebuild 556 BLAKE2B 6003311771e030c4f2dadff72c08aa22c0b984a72786d2bb61d07beb22796aad8127a242591e944fc56604387f0c9072dffdf404431eadfe2bd38e18c3fd474a SHA512 4312ddf7383efa9b098e7f9c6746f49bdd77242bf910f6196eedfed2c7531f8b23f7f3b6fa9fe32dd420a60787e85222bf60618373ae371602950e4db95328e1 -MISC metadata.xml 376 BLAKE2B 28627c0b5a5b855f815a0a1d0d5546ee392dee917be5819e1a9dd5094bb782a511402135a4b56f91e41b71b8f86dea1925d0b363cea9b6d53b5247e76e87e895 SHA512 6dce1f0c46259c53b16a7d846ec695d2969815566641e15efa3949304a0e534f78b2981673f71af5c851feb5976999fb7c846356448942feee7a57446abfb3f4 +MISC metadata.xml 376 BLAKE2B e7ea00029cc75fba1532b6c80c9bca23c62372bfd6e110c7b14d487a4c61a2ad703bf7049f30e312ac3e0d2f5dbbc1026909bb8d78f1515201cd0ac58ed19598 SHA512 c11ec80d93b5135983534df74d66f04fe8a67344c3242ee565f4d3cac30eb1ae5b48fed9992bddf57a257c219f987e7f1fa712f72ef4c917d8b4433842d46501 diff --git a/dev-java/jargs/metadata.xml b/dev-java/jargs/metadata.xml index bd60fb04a3db..b4b878fa541f 100644 --- a/dev-java/jargs/metadata.xml +++ b/dev-java/jargs/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/java-dep-check/Manifest b/dev-java/java-dep-check/Manifest index ed962d282c1e..68424b0b509b 100644 --- a/dev-java/java-dep-check/Manifest +++ b/dev-java/java-dep-check/Manifest @@ -1,5 +1,8 @@ AUX Main-0.3.java 11702 BLAKE2B f0f67f098fdf20cb6ad78ec6f0e20afa29cae2c7b62bbafea7a0e6ec5c3ab83029e7929d1e7d78b93b7551c62802a5b2a9f7ba40e16d99c7037ebcb8d2d71e1a SHA512 a70c0161fe72e8f4b4476cbdad5ae3074fbb7321214723a7b1b7778fd06de4eb616479de2b5d6ce9a6dab2e919d721ce2b177a515039a0b9592aa2b5e1017e88 AUX Main-0.4.java 14943 BLAKE2B ec9f08f76a38e16f17e68e05e06985f11700532c6f6827518cd8303635d240f7c425a205dbc2c41df870b1029d83a3b04b5d20a76f10275786a8d7c457472501 SHA512 340e6912285ee5c61116cd838c2abf68c573e57053d0b923fcd3929e19253d7cf29a281b226a3624a69b358f112bdf4a554b6c23b850933d60d7a1fd059f7a1e +AUX Main-0.5.java 14974 BLAKE2B c8cab47bca61f5c792d214f817768ed9455bb31f407ea5259e760ee8e66c6ab7cd811079bd8d1764fbf0c70da4aad1d9ab5500385c3894292b6e8e8e51c54e6f SHA512 3111783b22e01b357bae675fabd9af86536d4db82cc7dad1f4dac4c3a64efd84f3b6f35e5b5698dafc696d3ecde49589bcb167967130004e3fd1716db9d868f6 EBUILD java-dep-check-0.3-r1.ebuild 645 BLAKE2B 06181b8bd751a72d4a2876d4d44dbce6a037abcc23a09b9e91994a3987a03442dd58d6b191ea9ead5d2187254455c625c6cca587d61136ae236148e28eb92505 SHA512 6da35a65c72ef3d61f4544d49fadac6d743d8b348130ae811b620d62b428227ad4a8cc889d78dd409291dc59a621f459c27993033d7daa2eee5f23ce4d786ebe +EBUILD java-dep-check-0.4-r1.ebuild 649 BLAKE2B d16786af2d2378bf0d70520970e3a9d682aeef99befed7387fbebbeffe779b88f2e5d3f7e73a0af92cc27ad2728c5cb9216a46692e229f34e9f8d844b1f51b99 SHA512 b27edcf5cd769cd34d1ab2c4a041cb633ae3b3e6b8c670600e5341fd4f16b253b0d245aa6b32e60aa696c7e800f4739ec3d73172ecf38f4935c68820c9d3cb46 EBUILD java-dep-check-0.4.ebuild 642 BLAKE2B adffd940e68f3e7653a1b723acb360b31d7d402e3415649608d161c0c5dfa7cbc0ca476ac47b284d2af5f76632300f96d77350e130e8839aad36dd0520b9a842 SHA512 61463bfcced95396791da6dcd12135c0724294956c74743492c4fb8a21199aa855250797e6aa6a5b34ad4a5b2e6c0bc34bd77745e4769f4aae6335821ce048e1 +EBUILD java-dep-check-0.5.ebuild 649 BLAKE2B d16786af2d2378bf0d70520970e3a9d682aeef99befed7387fbebbeffe779b88f2e5d3f7e73a0af92cc27ad2728c5cb9216a46692e229f34e9f8d844b1f51b99 SHA512 b27edcf5cd769cd34d1ab2c4a041cb633ae3b3e6b8c670600e5341fd4f16b253b0d245aa6b32e60aa696c7e800f4739ec3d73172ecf38f4935c68820c9d3cb46 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 diff --git a/dev-java/java-dep-check/files/Main-0.5.java b/dev-java/java-dep-check/files/Main-0.5.java new file mode 100644 index 000000000000..bcd6b4f2a9d6 --- /dev/null +++ b/dev-java/java-dep-check/files/Main-0.5.java @@ -0,0 +1,442 @@ +/** + * This file is part of javadepchecker + * + * Copyright (C) 2016 Gentoo Foundation + * + * javadepchecker is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package javadepchecker; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Set; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.Properties; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; + +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; + +/** + * Main Class of javadepchecker + * Gentoo Java Utility to scan class files for unneeded dependencies and + * ophaned class files + * + * @author Petteri Räty <betelgeuse@gentoo.org> + * @author Serkan Kaba <serkan@gentoo.org> + * @author William L. Thomson Jr., <wlt@o-sinc.com> + */ +public final class Main extends ClassVisitor { + + static private String image = ""; + private Set<String> mDeps = new HashSet<>(); + private Set<String> mCurrent = new HashSet<>(); + + /** + * Empty Constructor, sets ASM op code version + */ + public Main() { + super(Opcodes.ASM5); + } + + /** + * Get jar names from the Gentoo package and store in a collection + * + * @param pkg Gentoo package name + * @return a collection of jar names + */ + private static Collection<String> getPackageJars(String pkg) { + ArrayList<String> jars = new ArrayList<>(); + try { + Process p = Runtime.getRuntime().exec("java-config -p " + pkg); + p.waitFor(); + BufferedReader in; + in = new BufferedReader(new InputStreamReader(p.getInputStream())); + String output = in.readLine(); + if (output!=null/* package somehow missing*/ && + !output.trim().isEmpty()) { + jars.addAll(Arrays.asList(output.split(":"))); + } + } catch (InterruptedException | IOException ex) { + Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); + } + return jars; + } + + /** + * Scan jar for classes to be processed by ASM + * + * @param jar jar file to be processed + * @throws IOException + */ + public void processJar(JarFile jar) throws IOException { + Collections.list(jar.entries()) + .stream() + .filter((JarEntry entry) -> (!entry.isDirectory() && entry.getName().endsWith("class"))) + .forEach((JarEntry entry) -> { + InputStream is = null; + try { + Main.this.mCurrent.add(entry.getName()); + is = jar.getInputStream(entry); + new ClassReader(is).accept(Main.this, 0); + } catch (IOException ex) { + Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); + } finally { + try { + if(is!=null) + is.close(); + } catch (IOException ex) { + Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); + } + } + }); + } + + /** + * Check if a dependency is needed by a given package + * + * @param pkg Gentoo package name + * @param deps collection of dependencies for the package + * @return boolean if the dependency is needed or not + * @throws IOException + */ + private static boolean depNeeded(String pkg, + Collection<String> deps) throws IOException { + Collection<String> jars = getPackageJars(pkg); + + // We have a virtual with VM provider here + if (jars.isEmpty()) { + return true; + } + for (String jarName : jars) { + JarFile jar = new JarFile(jarName); + for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) { + String name = e.nextElement().getName(); + if (deps.contains(name)) { + return true; + } + } + } + return false; + } + + /** + * Check for orphaned class files not owned by any package in dependencies + * + * @param pkg Gentoo package name + * @param deps collection of dependencies for the package + * @return boolean if the dependency is found or not + * @throws IOException + */ + private static boolean depsFound(Collection<String> pkgs, + Collection<String> deps) throws IOException { + boolean found = true; + Collection<String> jars = new ArrayList<>(); + + pkgs.forEach((String pkg) -> { + jars.addAll(getPackageJars(pkg)); + }); + + if (jars.isEmpty()) { + return false; + } + ArrayList<String> jarClasses = new ArrayList<>(); + jars.forEach((String jarName) -> { + try { + JarFile jar = new JarFile(jarName); + Collections.list(jar.entries()).forEach((JarEntry entry) -> { + jarClasses.add(entry.getName()); + }); + } catch (IOException ex) { + Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); + } + }); + for (String dep : deps) { + if (!jarClasses.contains(dep)) { + boolean systemClass = false; + + if (!dep.startsWith("org/apache/commons/cli/") && !dep.startsWith("org/objectweb/asm/")) { + try { + Class.forName(dep.replaceAll("\\.class$", "").replace('/', '.')); + systemClass = true; + } catch (final ClassNotFoundException ex) { + // it's not a syste class + } + } + + if (!systemClass) { + if (found) { + System.out.println("Class files not found via DEPEND in package.env"); + } + System.out.println("\t" + dep); + found = false; + } + } + } + return found; + } + + /** + * Core method, this one fires off all others and is the one called from + * Main. Check this package for unneeded dependencies and orphaned class + * files + * + * @param env + * @return + */ + private static boolean checkPkg(File env) { + boolean needed = true; + boolean found = true; + HashSet<String> pkgs = new HashSet<>(); + Collection<String> deps = null; + InputStream is = null; + + try { + // load package.env + Properties props = new Properties(); + is = new FileInputStream(env); + props.load(is); + + // load package deps, add to hashset if exist + String depend = props.getProperty("DEPEND"); + if(depend!=null && + !depend.isEmpty()) { + for (String atom : depend.replaceAll("\"","").split(":")) { + String pkg = atom; + if (atom.contains("@")) { + pkg = atom.split("@")[1]; + } + pkgs.add(pkg); + } + } + + // load package classpath + String classpath = props.getProperty("CLASSPATH"); + if(classpath!=null && + !classpath.isEmpty()) { + Main classParser = new Main(); + for (String jar : classpath.replaceAll("\"","").split(":")) { + if (jar.endsWith(".jar")) { + classParser.processJar(new JarFile(image + jar)); + } + } + deps = classParser.getDeps(); + } + + for (String pkg : pkgs) { + if (!depNeeded(pkg, deps)) { + if (needed) { + System.out.println("Possibly unneeded dependencies found"); + } + System.out.println("\t" + pkg); + needed = false; + } + } + found = depsFound(pkgs, deps); + + } catch (IOException ex) { + Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); + } finally { + try { + if(is!=null) + is.close(); + } catch (IOException ex) { + Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); + } + } + return needed && found; + } + + /** Main method, parse command line opts, invoke the package checker + * @param args the command line arguments + * @throws java.io.IOException + */ + public static void main(String[] args) throws IOException { + int exit = 0; + try { + CommandLineParser parser = new PosixParser(); + Options options = new Options(); + options.addOption("h", "help", false, "print help"); + options.addOption("i", "image", true, "image directory"); + options.addOption("v", "verbose", false, "print verbose output"); + CommandLine line = parser.parse(options, args); + String[] files = line.getArgs(); + if (line.hasOption("h") || files.length == 0) { + HelpFormatter h = new HelpFormatter(); + h.printHelp("java-dep-check [-i <image>] <package.env>+", options); + } else { + image = line.getOptionValue("i", ""); + + for (String arg : files) { + if (line.hasOption('v')) { + System.out.println("Checking " + arg); + } + if (!checkPkg(new File(arg))) { + exit = 1; + } + } + } + } catch (ParseException ex) { + Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); + } + System.exit(exit); + } + + /** + * Add dependency to deps hashset + * + * @param dep dependent class name + */ + private void addDep(String dep) { + mDeps.add(dep + ".class"); + } + + /** + * Add dependency type to deps hashset + * + * @param dep dependent class name + */ + private void addDep(Type dep) { + if (dep.getSort() == Type.ARRAY) { + addDep(dep.getElementType()); + } + if (dep.getSort() == Type.OBJECT) { + addDep(dep.getInternalName()); + } + } + + /** + * Get deps not contained in the current hashset + * + * @return a collection of deps + */ + private Collection<String> getDeps() { + ArrayList<String> result = new ArrayList<>(); + mDeps.stream().filter((s) -> (!mCurrent.contains(s))).forEach((s) -> { + result.add(s); + }); + return result; + } + + @Override + public void visit(int version, + int access, + String name, + String signature, + String superName, + String[] interfaces) { + if(superName != null) { + addDep(superName); + } + for (String iface : interfaces) { + addDep(iface); + } + } + + @Override + public FieldVisitor visitField(int access, + String name, + String desc, + String signature, + Object value) { + addDep(Type.getType(desc)); + return null; + } + + @Override + public MethodVisitor visitMethod(int access, + String name, + String desc, + String signature, + String[] exceptions) { + for (Type param : Type.getArgumentTypes(desc)) { + addDep(param); + } + + if (exceptions != null) { + for (String exception : exceptions) { + addDep(exception); + } + } + addDep(Type.getReturnType(desc)); + return new MethodVisitor(Opcodes.ASM5) { + @Override + public void visitLocalVariable(String name, + String desc, + String signature, + Label start, + Label end, + int index) { + addDep(Type.getType(desc)); + } + + @Override + public void visitFieldInsn(int opcode, + String owner, + String name, + String desc) { + addDep(Type.getObjectType(owner)); + addDep(Type.getType(desc)); + } + + @Override + public void visitMethodInsn(int opcode, + String owner, + String name, + String desc, + boolean itf) { + addDep(Type.getObjectType(owner)); + } + + @Override + public AnnotationVisitor visitParameterAnnotation(int parameter, + String desc, + boolean visible) { + return Main.this.visitAnnotation(desc, visible); + } + }; + } + + @Override + public AnnotationVisitor visitAnnotation(String desc, boolean visible) { + addDep(Type.getType(desc)); + return null; + } +} diff --git a/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild new file mode 100644 index 000000000000..eb7e53a80eee --- /dev/null +++ b/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 2016-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java Dependency checker" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +COMMON_DEP=" + dev-java/commons-cli:1 + dev-java/asm:4" +RDEPEND=">=virtual/jre-1.8:* + ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.8:* + ${COMMON_DEP}" + +JAVA_GENTOO_CLASSPATH="asm-4,commons-cli-1" + +src_unpack() { + cp "${FILESDIR}/Main-${PV}.java" Main.java || die +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN} --main javadepchecker.Main +} diff --git a/dev-java/java-dep-check/java-dep-check-0.5.ebuild b/dev-java/java-dep-check/java-dep-check-0.5.ebuild new file mode 100644 index 000000000000..eb7e53a80eee --- /dev/null +++ b/dev-java/java-dep-check/java-dep-check-0.5.ebuild @@ -0,0 +1,32 @@ +# Copyright 2016-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java Dependency checker" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +COMMON_DEP=" + dev-java/commons-cli:1 + dev-java/asm:4" +RDEPEND=">=virtual/jre-1.8:* + ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.8:* + ${COMMON_DEP}" + +JAVA_GENTOO_CLASSPATH="asm-4,commons-cli-1" + +src_unpack() { + cp "${FILESDIR}/Main-${PV}.java" Main.java || die +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN} --main javadepchecker.Main +} diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest index dc34a5e3725f..5aaaa4288958 100644 --- a/dev-java/java-service-wrapper/Manifest +++ b/dev-java/java-service-wrapper/Manifest @@ -1,4 +1,4 @@ -AUX java-service-wrapper-3.5.25-as-needed.patch 6957 BLAKE2B 9e6aa50657ad0833ea4adc08bd5f6b71695df6369a12d0a0c91f62d587cb7e619a8337cfe6c34e5d278eed5bf5e060355751b2b61c891bdabd59b142865893b1 SHA512 f45dcda4ff87b98cf60d3db5bbd98b6f0dfced2d784076d49f0e29997b25f9f3eefe8b7d3410ff2df3e8cff11910a226996763982193d44b5c99aa03ade8aaef +AUX java-service-wrapper-3.5.25-as-needed.patch 7033 BLAKE2B dc74a0794917171dd7b84cc54a0f6536ee9a36d5082535219f1ade57f6b1482e6c68ac71b20e1c8c9fd4495ebc246f7680c8a7a567e338b55ce2e8021e164784 SHA512 6fbaead84aec096aec6f05414d0250ab0d2407e09616eb8c0e72a67e61c2b127433f41f89d6513ac55aef43e5427b3cedda841618138e6c1b18d8b26a1e1cf86 AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 BLAKE2B d1da7d6f8f195d690d687f4d1f48f302b45dd2a12612c75fcce5fae3881469a1dd237baedef5846861deb4c8c697633de3b24598f62ca650deb339f6f2dbb219 SHA512 907f07bcf3debd45d07639ea8b60c21be1190cb7939b28c05eaebdd8713e818402d8da9722be09a7d20fb5598a44d0682bb32a6897b97ef7faf2bd74ca9f8824 AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4 diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch index d956ff0b0043..85d3d791199e 100644 --- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch +++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch @@ -1,4 +1,5 @@ - +https://bugs.gentoo.org/622806 +https://sourceforge.net/p/wrapper/patches/25/ --- src/c/Makefile-linux-armel-32.make.old 2014-07-21 10:48:31.000000000 +0200 +++ src/c/Makefile-linux-armel-32.make 2014-07-21 10:50:11.000000000 +0200 @@ -33,14 +33,14 @@ diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest index 0a370ffe62dc..106b599043d0 100644 --- a/dev-java/javacup/Manifest +++ b/dev-java/javacup/Manifest @@ -1,4 +1,5 @@ AUX javacup-0.11b_beta20150326-build-xml-svn.patch 1385 BLAKE2B 43ed5b0c75aa308f2301d8e7d633ca69689a1772a7d8f0f7dbd6f914f1bbf571dcef0ac9fb9cacbe07aaa8c50fca69f0fa95f661314dfab2c16ac96ad50f11f7 SHA512 211157370c61995a05ce45e70941d99da9031174fae2b6e4bbacfdd0c402c451009eb5952a8c3cf8a586402aa138e70733dfd46ce9cf6b5fb680edf65657506c DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e +EBUILD javacup-0.11b_p20151001-r1.ebuild 2790 BLAKE2B 7539940729bc92676ef614ec76a0287da8f38a8bc3a25616496f8c4b25e178a86dfbcd892ef08dfb96b170e2e3114412eac40fe1862dbe1b39ae7fa5abd56889 SHA512 ae3f59c9d126dfa5db224313cc631df3055b48af66457c9b03340caa4e28afbfe83a5d272d9a8e94b06b93aa472ea5c414a5a84ee6a49795674753e7ef160279 EBUILD javacup-0.11b_p20151001.ebuild 2798 BLAKE2B 8bf3e57971595295db4c5af67e9d810577fb1cd017a226ad4bf6f1835fa96d1150f9135e7ac5e4b2b374d2d433f58d6ad55193465a8f092e8d82c83c949f2050 SHA512 cc8885b9d6dfa24f39d9ad9ad28f4af755d1c50182b388f7ce1243125de58aade47872647b2fd5add3a4f80af1b88697da39855fab8d0d95e49e6db75b087bfb MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 diff --git a/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild b/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild new file mode 100644 index 000000000000..587cf479708e --- /dev/null +++ b/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +MY_PV=${PV/_beta/-} +MY_PV=${MY_PV/_p/-} +MY_PV=${MY_PV#0.} +MY_P=java-cup-${MY_PV%-*} + +DESCRIPTION="CUP Parser Generator for Java" +HOMEPAGE="http://www2.cs.tum.edu/projects/cup/" +SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +DEPEND="dev-java/ant-core:0 + dev-java/jflex:0 + >=virtual/jdk-1.8:*" + +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_ANT_REWRITE_CLASSPATH="yes" +JAVA_ANT_CLASSPATH_TAGS+=" taskdef" + +S="${WORKDIR}" + +src_prepare() { + default + # Bizarrely, you can't build from the tarball without this patch. + eapply "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch + + # The JFlex package name has changed to lower case. + sed -i "s/JFlex\./jflex./g" build.xml || die + + # Remove the bundled JFlex. + rm -v bin/JFlex.jar || die +} + +src_configure() { + EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex) + java-ant-2_src_configure +} + +src_compile() { + # Annoyingly javacup bundles an older version of itself that will + # break jflex if that has already been built against this newer + # version beforehand. Even more annoyingly, the binary download is + # built with Java 8, which isn't much use to us. We therefore use + # any installed javacup that is newer than the bundled version where + # possible. If this approach turns out to be unworkable then we may + # just have to use the bundled jflex for bootstrapping. + if has_version \>=${CATEGORY}/${PN}-0.11b:${SLOT}; then + # Use PORTAGE_QUIET to suppress a QA warning that is spurious + # thanks to has_version above. This is Portage-specific but + # showing the warning elsewhere isn't the end of the world. + einfo "Bootstrapping with installed javacup ..." + EANT_GENTOO_CLASSPATH_EXTRA+=":$(PORTAGE_QUIET=1 java-pkg_getjars --build-only javacup)" eant + else + einfo "Bootstrapping with bundled javacup ..." + EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant + fi + + # Clean everything except the new jar. + rm -rv java/ classes/ || die + + einfo "Recompiling with newly built javacup ..." + EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant + + use doc && ejavadoc -sourcepath src/ -d javadoc java_cup +} + +src_install() { + java-pkg_newjar dist/${MY_P}.jar + java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar + java-pkg_dolauncher ${PN} --jar ${PN}.jar + java-pkg_register-ant-task + + dodoc changelog.txt + docinto html + dodoc manual.html + + use source && java-pkg_dosrc java/* + use doc && java-pkg_dojavadoc javadoc +} diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest index 41dc56b11912..5a58e3cc820d 100644 --- a/dev-java/jclasslib/Manifest +++ b/dev-java/jclasslib/Manifest @@ -1,3 +1,3 @@ DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc EBUILD jclasslib-3.1.ebuild 776 BLAKE2B 29602b4386651dd5edaeb924ce4b56125554159e448b649ecb99cbd3a0ea0dabd1d0fd0d7714a070d078aaefed44e93991671a1c98f92809c249dc32d077c652 SHA512 91d0ebeffa9539c9e6aeae71951d9cd89f1c1aa2c701a086c3bcc904f8692af6cbd3038c63faa40c918bc64af4cb6fc15b1dd26347df0a96d3c8ca3b045e1cb6 -MISC metadata.xml 374 BLAKE2B e0919272ff6e152907ffa22c7bc8778201b38ae1f53a553cc66ccc4d13095ec1ed7044c4fc3eab3eb4aecdb6667bbf4701b6934d06f0eb01519b01fc9aec4145 SHA512 7f7c3383fdc738b2e67837e024d23c6b9fc4a3288b443ecac539c69766b94769a60a0bc0e1b271d6698266fe3c7f3fee81444e36c4e6dd57e8568c51cea140ca +MISC metadata.xml 374 BLAKE2B a45fdc671c3258da8b801aaf106c28ba5ec42cdee2997c0d57d1a94878036c8ffc669cc9e209e09b19aa6f382f1094b40e0e5617c570a45d28152504c7c44f03 SHA512 fd9cad2f9460867de742c4ce2a0dab9467db869f95b5e70e40856408f3d2bb98f6d67b4d26ed75d32d924e0c920db4030a9443742941f40f089f5a39cae8a2c9 diff --git a/dev-java/jclasslib/metadata.xml b/dev-java/jclasslib/metadata.xml index f860d915bfe9..f6dc3aa541c8 100644 --- a/dev-java/jclasslib/metadata.xml +++ b/dev-java/jclasslib/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest index f6d3ad857c40..a548d86b0c3b 100644 --- a/dev-java/jflex/Manifest +++ b/dev-java/jflex/Manifest @@ -1,4 +1,5 @@ AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6 DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b +EBUILD jflex-1.6.1-r1.ebuild 3547 BLAKE2B 3f31c1b03cf1de496c4e97a9a4470758cf8809d457fefc29a140e2f1d5d23b2e517d3f9755a551e76680e7e2b96bdede3a9893d116a95561514978b57ae2fac1 SHA512 d5dc5c9ab7ada77845f6aadb93c69baac1a89d1068f50246a6a297cbeacdf84d8e88c151d74844796df3f24d8a0c29eff4a0492c790c2d55a2cb553521408a86 EBUILD jflex-1.6.1.ebuild 3550 BLAKE2B 60652de3c6f2251ce128ff058e36265a5ebc15b98db0f0ec5c1c611adcbf868a2cb3855f535ac15897bae15bdac1cba1dc813720a8adcf5968a3f7a3e2f0a5bb SHA512 5cb6e698518eb0d765c35647766a3cab0550e5c48f7e37330321a22039ba1c99fee64cbbaf26faca01f684cd7fe7ae98a03aa694c6eb32b8f4672541f2ea2977 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild new file mode 100644 index 000000000000..d7bddcf955e5 --- /dev/null +++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JFlex is a lexical analyzer generator for Java" +HOMEPAGE="https://www.jflex.de/" +SRC_URI="https://${PN}.de/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos" +IUSE="examples test vim-syntax" +RESTRICT="!test? ( test )" + +CDEPEND="dev-java/ant-core:0" + +RDEPEND=">=virtual/jre-1.8:* + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + ${CDEPEND}" + +DEPEND=">=virtual/jdk-1.8:* + test? ( dev-java/junit:4 ) + ${CDEPEND}" + +PDEPEND="dev-java/javacup:0" + +S="${WORKDIR}/${P}" +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + eapply_user + + # See below for details. + eapply "${FILESDIR}/icedtea-arm.patch" + + # We need the bundled jflex.jar. + rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die + + # Remove the bundled java-cup.jar if unneeded. + if has_version ${PDEPEND}; then + rm -v lib/java-cup-*.jar || die + fi +} + +src_configure() { + # javacup is a cyclic dependency. Use the package if we have it, + # otherwise use the bundled version and install the package later. + if has_version ${PDEPEND}; then + # Use PORTAGE_QUIET to suppress a QA warning that is spurious + # thanks to has_version above. This is Portage-specific but + # showing the warning elsewhere isn't the end of the world. + JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar) + else + JAVACUP=$(echo lib/java-cup-*.jar) + fi + + JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}" +} + +jflex_compile() { + java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die + java-pkg-simple_src_compile + java-pkg_addres ${PN}.jar src/main/resources +} + +src_compile() { + java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die + + # The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running + # jflex. We have patched jflex to fix it but we have to run the + # bundled version first. -Xint works around the problem. See + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678. + use arm && local JFLEX_ARGS="-Xint" + + # First compile (without doc/source) using the bundled jflex. + JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS} + + # Then recompile using the fresh jflex. + jflex_compile -cp "${PN}.jar:${JAVACUP}" +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN} --main ${PN}.Main + + java-pkg_register-dependency javacup javacup-runtime.jar + java-pkg_register-ant-task + + use examples && java-pkg_doexamples examples + dodoc {changelog,README}.md + + if use doc; then + dodoc doc/*.pdf + docinto html + dodoc doc/*.{css,html,png} doc/COPYRIGHT + fi + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins lib/${PN}.vim + fi +} + +src_test() { + if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then + # This results in a StackOverflowError as of 1.8.0.65 but works + # fine on icedtea:7. Don't know about icedtea:8 yet. + rm -v src/test/java/jflex/EmitterTest.java || die + fi + + local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)" + + local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n") + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + + ejavac -classpath "${CP}" $(find src/test/java -name "*.java") + ejunit4 -classpath "${CP}" ${TESTS} +} diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest index d03e1566b721..c5c74e6f7e83 100644 --- a/dev-java/jmock/Manifest +++ b/dev-java/jmock/Manifest @@ -1,6 +1,8 @@ -AUX jmock-1.2.0-AbstractMo.patch 1189 BLAKE2B d10edde92384c86c2cbf9605cffcf25aa0acbd073e8803b88cccca2b4b94839e28458cb02f647cb492615836e7df02562329fb6135876c2a39fe5bb8fa7766bd SHA512 b4d59d16c2c513031b3b36fc2bdf4526cee8bfa405cac4c2c76d850289a835ba6e57d4e042ed4afe2814a217dcc1493afe80af9fd17fa066d1ada96af6dfa663 +AUX jmock-1.2.0-AbstractMo.patch 1193 BLAKE2B b822ccada923c92a421294549ffb9f02fffeffbd7a57bdc79e0749147a361ad2cd0fed6b5b63166d21078684b235312393fb7af63a3b293d0e8a7a1f18fa70eb SHA512 53ac2c2f603aa8685aa18737b96a05fa590ed9bda8208dc06ceca159eed7dcb609a01cfb113597fad335f5ceed89d796e448c4deaffd3076a29d57c6ed8f15ed DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223da6e2743830c4c9b8b728484b1ebed8fb347c240f50f6936c2fd1e4ee85b754315682047a87a14414effc3a48 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e -EBUILD jmock-1.2.0-r1.ebuild 971 BLAKE2B ebd8861dc5e02c85c98289f2820a7be9f006f97ee62fce32c7c45880bfaaa03745f78677408a1c6aac383bfa7e85e2ea26f0166c59bcdf8e541171b63575d6c7 SHA512 1450db05391b0241bf95f78824092d5bf4657632155f28a70d47cfd79510526399c7b1351a58318b9723b22f17f34e44d8a4bad6f2f17c4135a12d29e7fd92d0 -EBUILD jmock-2.6.1.ebuild 828 BLAKE2B c76836b50142234275461ef7e3801bf2d4e698f63d826496db984dd514234278b6307d49d340e5941ad3cdf00e4a0307c3ca17fef9409344668417fccf345242 SHA512 13a6f4ef2997353cb0761d5da4fc571324cd401375a54fdb629135ae09cfca077d6ba266a681bb1d737ca3c927707bb64dea79599e825095793485b0e51314f7 +EBUILD jmock-1.2.0-r1.ebuild 963 BLAKE2B 53c60bdddb516f45f903006554fe3db2069b8a0f22508849f1af907e8e6489a5928b80e0491ef1cd793cf629d224559224852f1b016d46256296ed5ef5c8c7cf SHA512 a9b123f34046856f913ecfa0fdf70f243b4e0914a56746a95af2738aca3c17756f4c3319978bb7070157be0460c8f59478c8801bafd089572cf9383ddef06117 +EBUILD jmock-1.2.0-r2.ebuild 965 BLAKE2B 4d3a87e9f269319f352a8abbe56102fed3f51f7a531a1ecdf3c07dff064814f507d2bb8c078eed2d929bf789dc8f014fe09736d0d71da70c0fa78e3a3c4a6d2c SHA512 d25b8b8de0e4efbb709616ee9d7d7a6be36fe80f39b80e386222bd46f99171d55a7ab0b544a78c522882cc97e5e7405f8521d0a9d3b013509ad11e7a31530329 +EBUILD jmock-2.6.1-r1.ebuild 827 BLAKE2B f2866e65ae2a8d260827802c36196c6de59b1fc5a2a40e1f07263e0670b9ba143cb751468144a68dc16a427c15d64607ae3743cd09353d4c6485d4b7dfe14215 SHA512 dafa81e697fa9ce57547ac75d72787b6dbdaff3b227c06be7e6f08c06bd4e208c6c2fcfb538f9bacf5ca2a6da96f83a68f53f57ae24dfaccd28f1258f9b15877 +EBUILD jmock-2.6.1.ebuild 820 BLAKE2B 0041aabe995530a8105d30a7914629446f722c1508da4307234f746278a578e5fe2c42716822f4e2ee0980c0ef6882515615934dee7b05d208f7c8f021eae6dc SHA512 8a41af0316631b30d9b891eb7cc153ec0fdcad09786f807f657e1e2a5c1170f25004103dff1ffcf99f54cc63097beb2fd0b299e86f226c531b9ca593e61c3f03 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 diff --git a/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch index 1e3a939d26d3..75b5195c37a2 100644 --- a/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch +++ b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch @@ -1,5 +1,5 @@ ---- src/org/jmock/expectation/AssertMo.java.orig 2015-08-28 10:15:13.490000000 +0000 -+++ src/org/jmock/expectation/AssertMo.java 2015-08-28 10:15:22.206000000 +0000 +--- a/src/org/jmock/expectation/AssertMo.java.orig 2015-08-28 10:15:13.490000000 +0000 ++++ b/src/org/jmock/expectation/AssertMo.java 2015-08-28 10:15:22.206000000 +0000 @@ -73,15 +73,15 @@ assertTrue("Should not have verified", threwException); } diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild index 62eb3c443dfb..3d0abb03985f 100644 --- a/dev-java/jmock/jmock-1.2.0-r1.ebuild +++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild @@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Library for testing Java code using mock objects" -SRC_URI="http://www.${PN}.org/downloads/${P}-jars.zip" -HOMEPAGE="http://www.jmock.org/" +SRC_URI="http://${PN}.org/downloads/${P}-jars.zip" +HOMEPAGE="http://jmock.org/" LICENSE="BSD" SLOT="1.0" diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r2.ebuild new file mode 100644 index 000000000000..f30beade3c05 --- /dev/null +++ b/dev-java/jmock/jmock-1.2.0-r2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Library for testing Java code using mock objects" +HOMEPAGE="http://jmock.org/" +SRC_URI="http://jmock.org/downloads/${P}-jars.zip" + +LICENSE="BSD" +SLOT="1.0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +CDEPEND="dev-java/junit:0" + +RDEPEND=">=virtual/jre-1.8:* + ${CDEPEND}" + +DEPEND="app-arch/unzip + >=virtual/jdk-1.8:* + ${CDEPEND}" + +S="${WORKDIR}/${P}" + +JAVA_SRC_DIR="src" +JAVA_GENTOO_CLASSPATH="junit" + +PATCHES=( + # This patch isn't changing the behaviour if jmock per se. + # Only the formatting is altered. + "${FILESDIR}"/${P}-AbstractMo.patch +) + +src_unpack() { + unpack ${A} + unzip "${P}"/jmock-core-"${PV}".jar -d src || die + mv src "${P}" || die +} + +src_prepare() { + default + find -name "*.class" -delete || die + rm *.jar || die +} diff --git a/dev-java/jmock/jmock-2.6.1-r1.ebuild b/dev-java/jmock/jmock-2.6.1-r1.ebuild new file mode 100644 index 000000000000..150ebf8f03ce --- /dev/null +++ b/dev-java/jmock/jmock-2.6.1-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Library for testing Java code using mock objects" +HOMEPAGE="http://jmock.org" +SRC_URI="http://jmock.org/downloads/${P}-jars.zip" + +LICENSE="BSD" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +CDEPEND="dev-java/hamcrest-core:1.3 + dev-java/hamcrest-library:1.3 + dev-java/junit:4" + +RDEPEND=">=virtual/jre-1.8:* + ${CDEPEND}" + +DEPEND="app-arch/unzip + >=virtual/jdk-1.8:* + ${CDEPEND}" + +JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3,junit-4" + +S="${WORKDIR}/${P}" + +src_unpack() { + unpack ${A} + cd "${S}" || die + unzip ${P}.jar -d src || die + rm *.jar || die +} + +src_prepare() { + default + find -name "*.class" -delete || die +} diff --git a/dev-java/jmock/jmock-2.6.1.ebuild b/dev-java/jmock/jmock-2.6.1.ebuild index 750c4115862f..6761ae6b5229 100644 --- a/dev-java/jmock/jmock-2.6.1.ebuild +++ b/dev-java/jmock/jmock-2.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Library for testing Java code using mock objects" -SRC_URI="http://www.jmock.org/downloads/${P}-jars.zip" -HOMEPAGE="http://www.jmock.org" +SRC_URI="http://jmock.org/downloads/${P}-jars.zip" +HOMEPAGE="http://jmock.org" LICENSE="BSD" SLOT="2" diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest index f06b996a8f19..4b0ca791c430 100644 --- a/dev-java/junit/Manifest +++ b/dev-java/junit/Manifest @@ -3,5 +3,5 @@ DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6 DIST junit4-r4.13.1.tar.gz 1072560 BLAKE2B d7a8ecf804f83461c281a494c1ad85e6797af64fd1344ba41a919a2783c28fc7c36b6c85984aaff66d41a99fde0141532be2e9bb00f3f53ae467f6dbde937f4a SHA512 a4c284f756916077100181af1dd8c0febdc855e21ea600366e5fda3904919ec2c4a5e828961c322f080f177eb53485c9ad01bfc65c7489a741be63c96cd472bb EBUILD junit-3.8.2-r2.ebuild 842 BLAKE2B 01cc39cca58291852a2bd71b97283ce344656648c741792013e7daaf50cccad14551e4d0885d9fa4c3dfe52cfccd18c0943a55c0d479cd49b1d182eaa8252f75 SHA512 25a498140852340c429d965b8770a1844fdcff906164fcdf873e32cd303871b446d80d88fef2772c765254c7396fdd6a3688e9b253f04cf02c289c5a85e99ebe EBUILD junit-4.12-r1.ebuild 1477 BLAKE2B 92482da40156f07c657f3f9463f7e9763330ad496032b74199084f8fb4bd521e236332050c461a06270b3574086d5dd2b3413f55cbf9c6361c171e31aafccdbb SHA512 418decaf336841e80eb82a8905d99fb897155fc2bc1ec45f7be72324f03cc63e6f07b9e1ecd3b12e9d8149291970ab2f27b0c482a96e48d1bc7e8301e8190f35 -EBUILD junit-4.13.1.ebuild 1483 BLAKE2B f56b0f948417658ab16cf313b4aff3c6122331e8ae2229da5854b9b36203a4927ef0fdfee7a4a37b7c393a8700868b8fae09d7722cee5cf264a411e890413614 SHA512 63916ea343e2e3472b861826de9aff49ed621d10bc59e2d8c6e1fba15877e255234448a07951a27d26cf9d1454e9bf4b5d93b41da960733000e4de7b6cd9b0c7 -MISC metadata.xml 367 BLAKE2B 7cd798ae028c83275e61522be10a35abba419a823042be242ee7fdf7e0ccfc978e817affaaf154b8d0723f502499f17bb81b0622fa493dc812b82ad23dfa647b SHA512 44e492dfaaa9faf54f4aaf420d5816da8d117951d6a52e37c76a9e533fcefbeaa3c44bafa4d525f878deb3af2b7f426e72a62b16464e85ce9690c61b1f0da71f +EBUILD junit-4.13.1.ebuild 1561 BLAKE2B dae7806e52c1224bb555f9d3979382d453a51e11add5c2c212e49091b4189b157766e76de49d99184417aad1993e1615caa9800e175348424078e667611b698e SHA512 01cc082bebd6fab811ce838e3cb2f6c28f78da8f74eb6af6f67c41df6d7b27f6f5bfa213ed047ec8b895fe5048c5768fdd0d07e4c4db48f7f221fba32c642460 +MISC metadata.xml 368 BLAKE2B 8461f82cd98863df6643a7727fdef984d30f6cd8f9cf7cb37453fbae186896b2845bda742864eadaab1fc932604a48957b0c7f7b80ecfa8ca107276287abc602 SHA512 f9bf527c63c7c4cfb4c0967918b23e6c2abe6c9239d2a873bf2ccefe31be8224c38d4062c71b6ee2692f5b36a27c348e3fc24d48279bc392a9efae2a8d17e077 diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild index 60c035757c38..d1c31fdaf6f0 100644 --- a/dev-java/junit/junit-4.13.1.ebuild +++ b/dev-java/junit/junit-4.13.1.ebuild @@ -11,26 +11,31 @@ MAVEN_ID="junit:junit:4.13.1" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Simple framework to write repeatable tests" +HOMEPAGE="https://junit.org/junit5/" SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz" -HOMEPAGE="http://junit.org/" + LICENSE="EPL-1.0" SLOT="4" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="examples" -CDEPEND="dev-java/hamcrest-core:1.3" - -RDEPEND=">=virtual/jre-1.8 +CDEPEND=" + dev-java/hamcrest-core:1.3 + dev-java/hamcrest-library:1.3 + " +RDEPEND=" + >=virtual/jre-1.8:* ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.8 +DEPEND=" + >=virtual/jdk-1.8:* ${CDEPEND}" S="${WORKDIR}/${MY_P}" JAVA_SRC_DIR="src/main/java" -JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3" +JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3" -java_prepare() { +src_prepare() { + default rm -v lib/*.jar || die } diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml index 9c59435e026b..618f5e0e4b6d 100644 --- a/dev-java/junit/metadata.xml +++ b/dev-java/junit/metadata.xml @@ -6,7 +6,7 @@ <name>Java</name> </maintainer> <upstream> - <remote-id type="github">junit-team/junit</remote-id> + <remote-id type="github">junit-team/junit4</remote-id> <remote-id type="sourceforge">junit</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/metadata.xml b/dev-java/metadata.xml index 878473a04601..110adbe2ca1d 100644 --- a/dev-java/metadata.xml +++ b/dev-java/metadata.xml @@ -41,4 +41,3 @@ z językiem programowania Java. </longdescription> </catmetadata> - diff --git a/dev-java/microba/Manifest b/dev-java/microba/Manifest index 590126392253..cfc8395f1d3d 100644 --- a/dev-java/microba/Manifest +++ b/dev-java/microba/Manifest @@ -1,3 +1,3 @@ DIST microba-0.4.4.3.zip 89737 BLAKE2B 130f6a39f069b0b4e93f352b7fea10abd6eec23b7f0392ad15fa34c198b4dfb46a9b0208322b245f0934e2ff2260661934f958e6216a45c4c69573976f366a2c SHA512 17933578fe101053a1004a1aa0ef342ffa1dc1f2ea2d670fa8aa2523c7d8207bb79e54755e58d0b7ce5ba627ca3b348ac10870718622e818f4097a966acc0a10 EBUILD microba-0.4.4.3-r1.ebuild 768 BLAKE2B 118819854bb185b357736387a7b016f30a9e2bbd768b93a8b129c2e06854414fb7ce21c08a84bed586f5e9419a7ebc867f878f34c35eb179a3e033a02eedd5b9 SHA512 57501fb0b7b526e150ac60f1d6ff9435500ee771348e63f6487e2d78b4ec7904fca664c9bfbcc91a02e7e9e479af483492c5ecdbb9ebc30528901aa61156cc16 -MISC metadata.xml 367 BLAKE2B 8b77b9e21a7b7ecf7cf4ec5f6038d89099400f34b5400d781657881199a66b76d54b6795b5b32bab132d6eac75c904ec59e02d0024ad8a7c9ba2f8ed23b83e9c SHA512 ff305633c3f8b368c57882d57a545755dacd718071f0e3a00e438c1eac3281057d4572b085cea61ea2ef40574fcd924032529b8267485ae6a5788d594b0305c1 +MISC metadata.xml 367 BLAKE2B 8a7e3d742a170dd9320fa338ad9b142c6f24dca994719e34ddddb705b899d9515c3262bc84123c07067c1014d12a281fdc884e798bd4648fbe2e7ff12926f935 SHA512 da7a401cfef034bd8ab514f2502d1da0ddeeaba7436ea370cd1ee08570e3733afdc519b8736fa6910b82ea30f1759162584f60ddd198cceba0bf0eac367688ae diff --git a/dev-java/microba/metadata.xml b/dev-java/microba/metadata.xml index 21819550bc2e..bf98076be4e0 100644 --- a/dev-java/microba/metadata.xml +++ b/dev-java/microba/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index b4e74bc0ccdc..46ea537c8b07 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -8,6 +8,7 @@ DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz 176435718 BLAKE2B c99 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.9_11.tar.gz 177065013 BLAKE2B 04bb16a464a7984df770c52c5e2b8b1d9ec79142eb8a9c9a95a8ea02656b823a2505085e1521d94b9d994a1f5675fb524b917c9fdea46269e45a43d10c066947 SHA512 45619214cfc54be5b68e1ac8112a239a156be5a126631b2ff994a3b70e2e0aa899e5f9a4d31381eba2eb743790e4bdc2014ac342419a004502ce40945b3f4890 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz 194069769 BLAKE2B b537bdf553b1da11c06ba8aed7f2baa498da384209b5c94b22995a6d05e1d83b4fee215c6c27e1975e6d2e04805916f85c8fa244f53a6f002d3eb42d56898b74 SHA512 993881259ba470030c589f272d239aa185b1b460c4d505a266cb99f7107de2aa646b3cb8bb8d38fa454d226228c6d3dd8245301c8535c7f6b3bec766cc555bf9 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz 193980586 BLAKE2B cc927d923ca29ca41ea9cfc38bf07761904fb9f31fa59b5c882ec260d982a9af6c49034d80e6ed4d141c5ece1a1d297c3c153358ad940e61a4f667c53d6c040c SHA512 1ccaba9673a85287953a6ffbedf7caec4c2d64e0a121277bca6e40a6d47eaf414ed7470971f271e28309b97e95268348a7ad4fb2a03861eeb193d1f0536f2727 +DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz 186160219 BLAKE2B 5a044db5ff02dadd8a1677254c8653e14f41e09e4180dc8726d35dd293193e8a332db54aede19d7a2c2bd3c3b3c799cb0faa315bfd9deda03c231fd01670ff61 SHA512 cd115893162a9db3e7e5763028a0040eb83773ae82cd056fdb9400ae3a2b720e7e1bee24a0251ea29eb01923400a1c459d3fbca08bf563d15f7434f5a4d6c69f DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2fc6a1cf23c9c04522a82f74ba60c53cc461e370c8aa88d6b62b4c4539e96d233a232f38390b9f0932768c5fb662a44e425d0f5bebbf982c657686b163d7 SHA512 5b44f094219daf383743d463c50917c2d60b289187e363748c3a4dc16471d84e4d28b6bc30879d137b79645f7ce977c755e8a5714bc272e012bce900f3db8ea4 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz 102312570 BLAKE2B b4280d8c1e2132956ec103899defb9000bfda303350b72c9797cc1634429cefe173b17617f687eadcb7c8259d7423cef8b68ce9c89e2b31340fa9e3c6e8ad265 SHA512 d2e6795daa7b413d7ee0fb217d3210b809ac87df11e2ecb3a9befaabc7cd501b67c5526b1498666476a3a7526648d85f43a28a170fa870b3e738daecbc8c41a5 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz 99368824 BLAKE2B 970a0859a09002978b7603beb9cd94556fcdbb8923a88e48dca167e5ecc1495fddd00c786c7b9c0e608de48d485b2e8b4da7491d4e85e488fd1baf7ddc021951 SHA512 6974c06644aed4c7fb8f6004f4d8fd7790252e148ecfb3e1d29a7251429e413e8adbd910231b3cd5b9dd195a570b3fbeb95e6ab09b3ae318f3f842eb7ac418c6 @@ -15,8 +16,9 @@ DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz 100818464 BLAKE2B b2666 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz 100365310 BLAKE2B 0b7621ba2f5a68d936039d20228b8c7cdddfa528a2b0e5471952ab96ff4d91f30a5892f5deca9b1e1ef88ce334fee5720f0e06bfed67ad9cd170ee0cbb6e65a5 SHA512 36b5fb22c1859710f520255bb6a2c8d4e6b650f77ac2ce988cb9dca570622753c8eae9d27c2955af2f37e6379532babd942ff82863cd771d3f4e247b57a93f84 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz 103650413 BLAKE2B 6fd50cdefa5daf6d155000b653b695511953d486ba9f4bf7426caf8dc6d7b7d3cf46c4426982a400c19a6fe0f6eb557a232853c3e4211e1961e8aa890c1721cf SHA512 22a4b5c27d2fad79b7bf8a8ae896a9b30e3d303bb4ca30611dbbb1f5811f4524a98c44a68c4546906f566b7d672f6ab48d10cf270870c1b86e7a7688d249c555 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz 102873064 BLAKE2B 2331a8c4fd404ea6d44ae5e9f168e7955b96888ebceaa0d72cc1ae044972869bdede26e1d69b926fbac1ad54cdfa4080b2dffd41e6667717a34ceb5da96c8eb3 SHA512 c56b4106f6f21c116d5229973f562e93aec91ae815b9f61291ae052540cd6c473ce74da9f9404c4d9028b313a70beae6bf328d2cdcc5c8ec8ebaca8d0fd3e892 -EBUILD openjdk-bin-11.0.10_p9.ebuild 2979 BLAKE2B f7a8ebc65c05886c8ca3544bd25c059a8f7eddf9e35daa23ce44f1b02102b59c6ef110bae5b74249d2e9090934a0fa2ead043af616adf653451947f37d77aa92 SHA512 3ce971bd6441b866822597bc9ed3f60be306bdf452758595ba4924dcce8a435edd3fb25278600a762502c89db61cae9a531439596a6910fc5c7c2db6eeee1e08 +DIST OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz 101808251 BLAKE2B 7abcbe6b0f061f9b5d4cd4709fa2d6a53184c41a313a5bf861ff0796b2673bb2a8c783e56769aab20954258c5e505c6a057b3838408cc948500ea9f3e723f646 SHA512 7fb53d3cc6994d87769c53c992ef7fc4adf2488b6a0c41e3c2004ce334a86da7e9fb4955b58c9e06566c5999f317579736ad0f346dd8dd56037d3ec0d5689812 +EBUILD openjdk-bin-11.0.10_p9.ebuild 3511 BLAKE2B 37160845edf57ff8bc990a40545106628af6feaaf41c93a2a1a74fbf19998f5b05a90a194ed16c8ff68c255ddb213a60e2cebbd1958ad99e44ac139fd725a5da SHA512 5c5601dac2dee4c2f8fca804de5183efcc8b3701fd0f2d0d0435d49271f63a0ccd8dab5b812cf780f6b09fd25113675dd8b1f91b1bb8f06d57d48746bc5d7d6b EBUILD openjdk-bin-11.0.9_p11.ebuild 2979 BLAKE2B 079df8fd920641207a0f5473e1bf98d9ec399152a26135d77bb3a4890d773d270d3e43899327201b6d15e64075a34004bf00fbfa3f901eab877fe5286c23e096 SHA512 0b5c6642d6896025b6ecfbef4ab78c680391fd52b1b26a9cc3370403fefe0e83e5ce92c745e06b68a9ea96a72143c1827bb620fd9862a6819fb90d9b4ccfefcc EBUILD openjdk-bin-8.272_p10.ebuild 2150 BLAKE2B e5491e066b77dba9da871523bfbcda4c54ae8c1a81b714fecaf8e9dba08a4a13034ad512e0fa1bae65e4d6148015a8118a314b8fc1476acc1a66e9649a7545fe SHA512 406c0f47ec88471786a7742290ee20723b66e09fcff0ec867bc010085144a643d22cd69d208e1466f6475daf2a3f8e8878cffff03a392bfb6c988f97bc68fafd -EBUILD openjdk-bin-8.282_p08.ebuild 2480 BLAKE2B 5a6ce67f483d9bc33e2484aed4896397299bb600ea5023412e73b9ec8f5f2d9ae30930d50281c4c5b5f16c2576d8bcdd51078645c2080c1950bedc6068fc49a9 SHA512 2d51980616e575dc8b7b019a77857877c10a387873e7c85fc59d3a503b2fdc670f7177b8bf67807ec78aeead9490d9eed965aa6c24283df26f8cce73e56551cc +EBUILD openjdk-bin-8.282_p08.ebuild 2984 BLAKE2B f7ee3c47ade97bc482d836ebc8d04d5a76a8888de8846c98ec4f1754d7310ae755c7338ee09b0e4d5eadaf2fb0bb5a379b98dcf3f9930b41e7db37cbfac1f613 SHA512 849748924f899d3d86a6e8ed7bd0e2b287c855cc3e9ca5e83eeb7c788ec86761b2578a21a3385f33557836d631ffa2fab8ab120eb9c3b8c6a18b201238cb0ad4 MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild index 4583d7823353..3eaf868c6d29 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild @@ -6,8 +6,13 @@ EAPI=6 inherit java-vm-2 toolchain-funcs abi_uri() { + local os=linux + case ${2} in + *-macos) os=mac ;; + *-solaris) os=solaris ;; + esac echo "${2-$1}? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz )" } @@ -19,29 +24,32 @@ SRC_URI=" $(abi_uri aarch64 arm64) $(abi_uri ppc64le ppc64) $(abi_uri x64 amd64) + $(abi_uri x64 x64-macos) " DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" HOMEPAGE="https://adoptopenjdk.net" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos" IUSE="alsa cups +gentoo-vm headless-awt selinux source" RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) )" RESTRICT="preserve-libs splitdebug" @@ -55,23 +63,36 @@ pkg_pretend() { fi } +src_unpack() { + default + if [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable + fi +} + src_install() { local dest="/opt/${P}" local ddest="${ED%/}/${dest#/}" - # Not sure why they bundle this as it's commonly available and they - # only do so on x86_64. It's needed by libfontmanager.so. IcedTea - # also has an explicit dependency while Oracle seemingly dlopens it. - rm -vf lib/libfreetype.so || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if use headless-awt ; then + rm -v lib/lib*{[jx]awt,splashscreen}* || die + fi fi if ! use source ; then diff --git a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild index 7bba13d4c195..861deb4537cb 100644 --- a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild @@ -6,8 +6,13 @@ EAPI=6 inherit eapi7-ver java-vm-2 abi_uri() { + local os=linux + case ${2} in + *-macos) os=mac ;; + *-solaris) os=solaris ;; + esac echo "${2-$1}? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${3-${MY_PV/-/}}.tar.gz + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz )" } @@ -24,29 +29,32 @@ SRC_URI=" $(abi_uri aarch64 arm64 jdk${MY_PV}) $(abi_uri ppc64le ppc64) $(abi_uri x64 amd64) + $(abi_uri x64 x64-macos) " LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos" IUSE="alsa cups examples headless-awt selinux source" RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - arm? ( dev-libs/libffi-compat:6 ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + arm? ( dev-libs/libffi-compat:6 ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) ) " @@ -60,6 +68,9 @@ src_unpack() { # 753575 if use arm; then mv -v "${S}"* "${S}" || die + elif [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable fi } @@ -69,20 +80,25 @@ src_install() { rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die - # this does not exist on arm64 hence -f - rm -fv jre/lib/*/libfreetype.so* || die - - if ! use alsa ; then - rm -v jre/lib/*/libjsoundalsa.so* || die - fi - - if ! use examples ; then - rm -vr sample || die - fi - - if use headless-awt ; then - rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ - {,jre/}bin/policytool bin/appletviewer || die + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # this does not exist on arm64 hence -f + rm -fv jre/lib/*/libfreetype.so* || die + + if ! use alsa ; then + rm -v jre/lib/*/libjsoundalsa.so* || die + fi + + if ! use examples ; then + rm -vr sample || die + fi + + if use headless-awt ; then + rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ + {,jre/}bin/policytool bin/appletviewer || die + fi fi if ! use source ; then diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest index c99548631cb4..1a1559d6e521 100644 --- a/dev-java/osgi-core-api/Manifest +++ b/dev-java/osgi-core-api/Manifest @@ -1,3 +1,3 @@ DIST osgi.core-5.0.0.jar 418232 BLAKE2B d7cfb8b2c6ff955ffc8252f248eb7bec562d16598e1a56fb50f12c099adae8b5268bc26003e166794eaee8fa6cb116ce388eb1981ef5a09394c05b7ea8655f0d SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3 -EBUILD osgi-core-api-5.0.0-r1.ebuild 580 BLAKE2B 0a4938075d4317681763c0527211e81c1974c44fbdbd8b54aea169523a1320890ec75b26f1d707344e1f75a15358c2497df255d692897d337dbaab1e058125f5 SHA512 4f9043052ce2a2508dd630b0e132195b2068055cc8dd1cb481fa5e8c5aaa1047007302f04c153dbae97cd3cf78d4f5e0b1640275ca6e6ffd511aded5299a99cd +EBUILD osgi-core-api-5.0.0-r1.ebuild 591 BLAKE2B 437dff5358d14e6f8f92fc5b1f37b67a985e34203ca910a8bad45cb0f76c01569f6d1c34c2e61220af7ec827c4d330e9da675c985684fdf41087c381222d6640 SHA512 c7d54fdfea926849023632e34117e6970f18ce8767905bf1139c2028c7c5dae2ad213151c73351e84e52037643af03d2679ce84ebf6ef889de1d038da08f5b0f MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild index b6dbedd21ac1..9ef2442e4438 100644 --- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild +++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux" +KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x64-macos" IUSE="" RDEPEND=" diff --git a/dev-java/piccolo2d/Manifest b/dev-java/piccolo2d/Manifest index f36ae7d9aab6..dabc045872d5 100644 --- a/dev-java/piccolo2d/Manifest +++ b/dev-java/piccolo2d/Manifest @@ -1,3 +1,3 @@ DIST piccolo2d-3.0.zip 786064 BLAKE2B f550bc7d39811998616000833543e048c879eeaf5006ba3d1cd19c7ac3c3c588fdf1c9b66986e5232dea49c1081082716e16542918319c18207cc2177d38ff10 SHA512 c57d0e86ea36e662027559c63c8e300629361849d4526d9271ea1ed3c8d55296ab1fab846c7a475c5d831fc6330052fa897ba8d3f89a196bca752a7ae802aa2a EBUILD piccolo2d-3.0-r1.ebuild 1120 BLAKE2B 0bada107c136f31b96d5045132a717ba15deb80129a22a8dd800e2644fc2055cb41a91594fc9aa897cddaeb72192af19613aced26826c687cb43250dd2f22f35 SHA512 dddbb48aa868a36363479e8f28fbbda3bb5fb8d2ac1642da705c7255c4cfb48afb770a9742fdb6688b4120a4d1f7147a567d581eadae3235ecf34a28a5c5f05b -MISC metadata.xml 379 BLAKE2B 91a8e052e0698a62a8596c658229b78e0750cc80e34ce81d3be41c833e106f2e2f0d7c5eb7d148b2674f4e218602b054e2435c52d9c0ce27ef546ad0ff43d9bc SHA512 dd13d25a0d532e7246cdc32b6e058dc9fa3979d4d28e459ecde801b103ca8e40cf9f154208c9ee364379f2f6c6059011269a75d658d68b207e7d013c7d0bdf02 +MISC metadata.xml 379 BLAKE2B 8e4337e2de075e9c1697e3a9497b50f9c3e549ca16bc7ec5e242bf8021e75154d28dedf7a7fc481d2177a8a70e2012ff8547cacea4666bbe173c611cb1892855 SHA512 6411900dad2b5f7e410713dc14fd3d968d28a4c0a8235435e60e67d2ceeb9576681b8fd33efe9c9324a04869c29f73ee69d0469b5a56656eb2e256cc58849fd7 diff --git a/dev-java/piccolo2d/metadata.xml b/dev-java/piccolo2d/metadata.xml index f053cea1a4e7..4f70e1c96374 100644 --- a/dev-java/piccolo2d/metadata.xml +++ b/dev-java/piccolo2d/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index cfe9e69f8c65..6faa5a663a6a 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -7,4 +7,4 @@ EBUILD protobuf-java-3.12.4.ebuild 1478 BLAKE2B 8cdc4e335d0cb6b9e5002fc6ac099c03 EBUILD protobuf-java-3.13.0.ebuild 1477 BLAKE2B 669066ea60706166627b293179241302d89a4b7241e438a7f98c49992b5283eb201df25b0ee93273276324c3974e64062c80b108168e64606258e2d59f6e30f4 SHA512 a4883fd56780e65ea4cdb48a8e830a996c1bab4b92ab7a5faec99bc0e6711ddd03b094e5607a23bdd8d946161282ea12f19920f14943542c085256e6d2f8131c EBUILD protobuf-java-3.14.0.ebuild 1478 BLAKE2B eff459444ef91a15f63b6d3cb2f8d1afebf3695e4f98f793f3fc855a5b81d89923af0ea6d7c09928452913239c8234380111c4de3a1387c4ebf51f16d96aab1a SHA512 3b5c168862ed9b7d208ba14515dfcf450c3764a2ee7b562d05bf274ffba0f8c691b8a48821169b75a000c1a165fe2b028ccc0ac0b76b79462b2787edb28e7e5f EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B e5d0f477b6bf5ba696b07c2ea7e85c56d47027f42041230496c76705e5df4a986278fe08ea5d802e25595bfdd052a9a09435d196bc8eee67b5993bf3f6a8a452 SHA512 bdfe81f22c4a512704e5b41abbb84bb9196552a38f4df0a305a6a63a80383a9bf33f62dc48230ca39befa734150443d5e7415bf328e3c6d7ec4b1eee9c09f293 -MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8 +MISC metadata.xml 549 BLAKE2B 3b081008d6ff92b24f670c1b8861400871454e96c5f0ca170c3825d6dda8d356f341fbfad7b5a9f330a7f9891d0e3b91a9f4842c480ee8a74f6aaf371884dcc2 SHA512 37ecf8aa151f5d08443a07c40188ec7061947a06453e39d07fa9b0da0cbeb2ccb76e517e7e2c2e3a2afe07874c817cf644dcd8775ad78f18b5f55496bc198b72 diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml index f8086ae85526..f618b52a34c1 100644 --- a/dev-java/protobuf-java/metadata.xml +++ b/dev-java/protobuf-java/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest index e338ce511d7d..a4f7c0b8a02b 100644 --- a/dev-java/snappy/Manifest +++ b/dev-java/snappy/Manifest @@ -6,5 +6,5 @@ AUX 1.x-build.xml 8496 BLAKE2B 0ab98a4149d0d7b294efec29374c59af8599362fa40d04737 DIST snappy-java-1.0.3_rc3.tar.gz 5466748 BLAKE2B a58847aa56d05659bcf53f0f7a6ba9c52611784bc6a8cc40d5838309e94c72bba8c8a1a27ca5249a223823a8cc1267dabeb12f369dae71999f55d5a64a111948 SHA512 eae4551d929f951be204218926cdea773a337ad584bd6fe49083526430a4e1ea80b395a627ecebc861232d36d2ec9034f2ebccac885da13e93fb74846298ba64 DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62 SHA512 32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e EBUILD snappy-1.0.3_rc3.ebuild 1451 BLAKE2B 12d41c164386a228231b3483f8dc6024a7430af3f55a4ea34339c7da98d19ce7eb8c57ee7a2171aef7b96e420f86d7d3b29dadfb74ecd9c27b1e054e34308f77 SHA512 268de9c4e6a5edbd07cb48dab62da2120187d359e16496457859a7e2772c1add9236c4b4bec3d64f28153b9a7db0d90594d2d3aac8e871e048c7373e4b09f271 -EBUILD snappy-1.1.0.1.ebuild 1466 BLAKE2B 4e46b14af58b6ebd415599bce40cb173c2f1452bcdd64c4b36216abe1e2e80a4fd611e28d6073b96a259cc38e49ea4edf52cd811bc733ef56d90bcc6b5c11a9d SHA512 ce574f4a7f8fe94d7bc72206b1330645249c7f538adb573a5a289d39475c4c05f38aeece92004a9dbb586511b2729fcfae977b99567476a5f756c24cab256d55 +EBUILD snappy-1.1.0.1.ebuild 1697 BLAKE2B 303375436532cd1e63fb71b70230f072f7678519b39415e11137cd040ab0562e4fa850c980b0c7c9c343e63ef8aedf1da9311f33ffbecbbd72ba725e79b5bf86 SHA512 3f7c40dd83d8a7205640663a14f8ef31f7944000d8011019690a7c37b4fdb32e6c541139cdae2ac67ba02f666d61c98351cc08aeff6816803bdb3c2f7433b86d MISC metadata.xml 319 BLAKE2B aa818743200d9cb65ddafa6f447c385862a603467950a6a71e6aba21f2510add3ab16fe39e11b02848bf97e15eb28827b2705b5288ee21a5b4b158574e10f915 SHA512 c652d81b9f2400efd81da0f61ed764ef80873e16b5e04d6c5689ec7633f34f83065edc2f2a7f7fd0443770e281befb5700c3416ea0aa74c548a85e337a9fed6e diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild b/dev-java/snappy/snappy-1.1.0.1.ebuild index 60983950c431..443002b9ab82 100644 --- a/dev-java/snappy/snappy-1.1.0.1.ebuild +++ b/dev-java/snappy/snappy-1.1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -16,7 +16,7 @@ SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${PN}-java-$ LICENSE="Apache-2.0" SLOT="1.1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~x64-macos" IUSE="" CDEPEND="dev-java/osgi-core-api:0 @@ -53,7 +53,14 @@ src_compile() { } src_install() { - java-pkg_doso "${S}"/target/libsnappyjava.so + local jniext=.so + if [[ ${CHOST} == *-darwin* ]] ; then + jniext=.jnilib + # avoid install_name check failure + install_name_tool -id @loader_path/libsnappyjava${jniext} \ + "${S}"/target/libsnappyjava${jniext} + fi + java-pkg_doso "${S}"/target/libsnappyjava${jniext} java-pkg_dojar "${S}/target/${PN}.jar" use source && java-pkg_dosrc "${S}"/src/main/java/* diff --git a/dev-java/spec-alpha/Manifest b/dev-java/spec-alpha/Manifest index ed879b287653..239001a0b178 100644 --- a/dev-java/spec-alpha/Manifest +++ b/dev-java/spec-alpha/Manifest @@ -3,4 +3,4 @@ DIST spec-alpha-0.1.143.tar.gz 35568 BLAKE2B f63fdd2b3c83dbd3936e36ff57b6ea399b7 DIST spec-alpha-0.2.176.tar.gz 37055 BLAKE2B 0588772e4a47a5b122984abefaf5ef2d0fffbacaf277b22737c94889e646c16a029017d405b72b829e88bcf03b12f689cb2053884b24b47193a26978ab54a318 SHA512 decf0dbff09bf8ee12503e6117ab635b98cd8dd2c389acf7aeebf00f32b5fd8250d66c2ec54cfe5da45e727e39480ae738a3ee7fcad71684d8c3acf464fe21e7 EBUILD spec-alpha-0.1.143.ebuild 869 BLAKE2B d901bd0b70f0312d0e4d581b45d7d6350265200533dd6bf157705aad03ea3878e772a8995d0054cdb928a8ee45d92d2c47c46c2989472e8f7500c641729f649e SHA512 efc9183c36885f20caba13f61514afc0f2b05bb663bb4790c779be15a8c82a8a08b99a64ff30c8a37f673fa1c55dfefa4a267a08adbffe30f0057aaf8483bebf EBUILD spec-alpha-0.2.176.ebuild 869 BLAKE2B a67b4f7a48c6ec63f39c474e57734c255be135ce0b400f8e7c958f1dadd7f7a7d46aae1fd4d7d298fb7083fcebecde093f987a6426c0b8975c2b5176530311bd SHA512 ffb2c5f5fae16ca5f18bd439b4087eda56f0c4aabaffbafea253d76e10806790558c573716cba07c29fcf2b6fa03a12c5a46525654e0d96c7346a9a16205a2ba -MISC metadata.xml 445 BLAKE2B 8dbbf132af2d8ad24de8fc1aeeeeaf381dd5578e9b06c1ebd611b47b754dfb846deb5ccc86538ca672fed41f2fb67dc3f21f61b27a06b1f06055854d427f4fad SHA512 2a09095ee7891155258f300b37cc9707f6cb8f4d002b76cdec22ff2e26b59a25be0a38fe7235cf1fd01322b3388ee8c356cc903733acb0c9b8da113d2b9239ff +MISC metadata.xml 475 BLAKE2B 990e8c578a8ef2de5631891132aff9a4e1cf481ad51dfdebe13833f2064dd785d07a01b6b8d1dee160146f667df8b27d62adbcb1d30aab5b4959ada49c67287e SHA512 6516536797ad86d28d3f5837506dc9e3bf8b99287b1d984ead967fac98fa9ff555b5ea878de354aec0e5a6c97691eae397a8f13df7371d20cc40ba359fe98112 diff --git a/dev-java/spec-alpha/metadata.xml b/dev-java/spec-alpha/metadata.xml index d7856d86ee56..be4b4200cdb4 100644 --- a/dev-java/spec-alpha/metadata.xml +++ b/dev-java/spec-alpha/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>tgbugs@gmail.com</email> <name>Tom Gillespie</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-java/spice-jndikit/Manifest b/dev-java/spice-jndikit/Manifest index 76e689ded088..28b9d62cd37a 100644 --- a/dev-java/spice-jndikit/Manifest +++ b/dev-java/spice-jndikit/Manifest @@ -1,3 +1,3 @@ DIST spice-jndikit-1.4.zip 55185 BLAKE2B 4d5068a3f2e12d287ecd657e2092a2e73e6637f2285dcea58b6d8c820508f21f1ceb508514813b34cf9c1a7536cbc530aba1edf0ca80603b3008e3afa240582a SHA512 798a1671cf79a9ecf7777a2b5b6caa0074dcca97cecb445c8dad9a44144cc71fed312f7a13d4b7e12f09eb23b0525b38bca62d67866db76f03ceb5a7a0501501 EBUILD spice-jndikit-1.4.ebuild 868 BLAKE2B 2ba91fedd394e87c0fe49c7366a7759a4c1095b03fcb50765e99d03ab55aed61b9529ec299df4971d1045a68885dc04e6f73fd332e344c335ecae99ef7b137da SHA512 c42bbb64c7e51c2f34aaf7d09c3f9a958f75acb85364f6b5e3e9f316f2aa4c57ac7feb70388fd3a6992d362b112fc57c8f4d1d01c873997cb756329e89c9011a -MISC metadata.xml 553 BLAKE2B d097fce9e744f8edd8d86284f5fc71cd4a987af0db70a475bca9db42c18127fe2bda1e04fb6bfb564483858e4aaf737d917a6deff7917643123996db89119f46 SHA512 53926ae768029abd0e9bc1a4bd55c641c0a6547e0db60e0538bef4f020ac018ab2617cd925f1c81852e1b92d6da5f97ee792f3f400329dc750da77e533517976 +MISC metadata.xml 553 BLAKE2B eaae2087353a12dd0c5a5570fa3f372ac9f19230e29fc6e0a5952a9cf512c1efa1ee9f3fb50fa962e6cbf42e2b07d4dbb8993ba6e6d261bd02da7499d9b99e9f SHA512 1c2b8767831d4e9fc398c09a3b502911c0c680b4c7e126254ed5abc9b34ae814724de311d45adb58c327e03b5c08b528ba95ceae182f3fc69efd6e476ae44367 diff --git a/dev-java/spice-jndikit/metadata.xml b/dev-java/spice-jndikit/metadata.xml index 38b4a7041837..18fdb353db5d 100644 --- a/dev-java/spice-jndikit/metadata.xml +++ b/dev-java/spice-jndikit/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/swingx-ws/Manifest b/dev-java/swingx-ws/Manifest index 4f101e4fc4d7..1530519ca74f 100644 --- a/dev-java/swingx-ws/Manifest +++ b/dev-java/swingx-ws/Manifest @@ -2,4 +2,4 @@ DIST swingx-ws-1.0-sources.jar 281598 BLAKE2B bf978c90d302183818a9da0bc2151b03bc DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da EBUILD swingx-ws-1.0-r1.ebuild 1392 BLAKE2B b9b473f8dd3bb53e8a707c03f2356cd5716556078e45dd21c290ecaee4308149cdd88609ff314845aa2384334352bc1ddc671a70dbbbd2647c7a411ba9cce96c SHA512 7fba5f418d1f17920d2e5813a33692c615c028455457637e8e7ba8e9a479ceebe39500dd98ab3184291836552f0cbd3ebaf9498694b2b91519a49b905507eb16 EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1748 BLAKE2B 61caa7e1ff917faf40d1d2e4996d2de87cd92b525ba3893c320f58c081a62b468c85737160a76cb834ff9362b0a839b81b0659198ef1377531053cd949f7b53a SHA512 5e6a936b62bd3bb712b0ad7881f9335bd8a7757fd78b978dc97c89b6bd150e53862d78055ec4329a49ba466919150fda5af27ced9588cea0b7cab458a0f6a35a -MISC metadata.xml 459 BLAKE2B 33dce90cfd998c8a2c5ae695840604ff6092fe43765f6825af684689d30f69b6cd806b3b3ddf591c587bd397426dc8186449597bcdb9e14052ab029de9cb7ecb SHA512 ba6627622238e8d5ebfac52de63029eee448edd37a4819cc08677abd2f04601be6f29943785ff5abb16e602e919d04ec15427de0b371962cf03e1d35da6315d9 +MISC metadata.xml 459 BLAKE2B 40942c76285fa089dd6908e56dc8a44b0dbfdd2d68fe4724d3abb3c033521aae35e7ca2f3defe33cc13d7178331761ad2d278740eae5e7706d00d76fc640621f SHA512 53ceb5cc03ae00c6b8633353d7851a3a3faaa2436a6e612c8d9424dd88a04c6052bbc108f8a94dfb16285ce28cd5d6e1260b619903bf6ebff7cb2e5ca1d89e8d diff --git a/dev-java/swingx-ws/metadata.xml b/dev-java/swingx-ws/metadata.xml index 89a4387936f7..4a2709478a9d 100644 --- a/dev-java/swingx-ws/metadata.xml +++ b/dev-java/swingx-ws/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest index f22ea33ad6cd..354a7316d39b 100644 --- a/dev-java/testng/Manifest +++ b/dev-java/testng/Manifest @@ -1,3 +1,3 @@ DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e EBUILD testng-6.9.10.ebuild 1750 BLAKE2B d371f64cb0d0df974e35adb987fc41a0c2d916b7a188f20b01255477243bdcbb98bcadbba373010df1d40a0cce1f2aad9e8b3d3ba2df0e53633d38d9607ec3ef SHA512 16a574302dbf241ba9a195f141e6626ddde5362a7ea3a025ce8f4721b7d485f14dac23a0c616a1034d353ef8399c26ac7a92a71f07ff21a5816df37bafa9d8ae -MISC metadata.xml 314 BLAKE2B 827119483a30d9ad2a35c20ad9149f941326fe6eb74c0a10401bf8b96ae07b233fc4177f87b1fae02c6d766304ff3002d70c8b9aaa9ff87f9ae951793e191d6d SHA512 dc86504b0f3aa0bcd4adf4470e7391a05eb5cead186f79b0fc35ee3dd57ca1c927454e4150463376ca37ba5396e9f75328bdb8969613457a9ddadbd5ab81cf98 +MISC metadata.xml 314 BLAKE2B 7750c36abcf989f704db0760b3e48d331329361fc0c6053966c4e658286b0762a78d3cf13d60c711cfeeb818ce380b1da88b95930c485bbe857a5748ac0e73a7 SHA512 3424de693fdbf8c629df163e74c075446f93f3f73129baec49417040b5ad89acbd70ac9272e4e1065aaaf7a6f3a44a6e15d000860e6f97e2467286fb2df419b5 diff --git a/dev-java/testng/metadata.xml b/dev-java/testng/metadata.xml index 741d9407384d..40124b35b074 100644 --- a/dev-java/testng/metadata.xml +++ b/dev-java/testng/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 691386ff2a85..9eda0af5343d 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -4,6 +4,7 @@ AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e AUX tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 718 BLAKE2B f6e5fb4b569cb54dd6274023e155abf988c1efe724b4e42e31d96e897f8a1cc8afb64ca673d32ef30e2b44d74afcafd8cf7e1fb33372e95b802e17d9c6354270 SHA512 c7d5d2babde536adff9c5fa2ff41405ef7ab8013ebf91cd5f9ff7aeb5f5bfebe6e1e0dd9ceb7c031a4905258701156060a26ee5555ca1e3077181afe4d351c9f AUX tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 710 BLAKE2B 177affee37d70208942c709324c4a7a4c561a28197792683a1f21dd747cb90f2d9fc2c32cf28cab0ad575c22dfa93efeaf7ba7f5254dbe67fe1a8b6fe5fd504f SHA512 0233b3fa6f6e3de36d62056035c84f9a22e866ff61e4cfd0976b7aa7e8ae019421bad25e49430e47a0476d09b5c1037d453e807ea02605a4f161d876f303c24a DIST apache-tomcat-10.0.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53 +DIST apache-tomcat-10.0.4-src.tar.gz 5964416 BLAKE2B 23332b90316cedd1916b59b1b31b1c16e34c193ba61660c7c8e41e3b983a35873660eaf8e3f0777704d5663f0ede2dc39b81997a73ee726ff73d6c6392582163 SHA512 677b978afd51fe1756b486c9d5576b9fa03b5b775c462263237aef6d17f36d7e718cfb5e46a49da942b1bf6681b166a4af781138f55d89a019bf12b48eb22882 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c @@ -15,16 +16,17 @@ DIST apache-tomcat-8.5.64-src.tar.gz 5863485 BLAKE2B c297c0803c74a969e96b99c379b DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838 DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640 SHA512 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26 DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B fda3081d66c9018a49e5a07bfb5d54b133fe51dff69b692480065d8d9a4877ce5b5b152e33f6d4cfaf28940ec6b556c9a2455c8fda56ea0552e4d1f83f0f9cbe SHA512 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f -EBUILD tomcat-servlet-api-10.0.2.ebuild 3165 BLAKE2B cf4aa92c2b241461c134a5c77349dc03c20e64d3eb3ab30ca89841a1ecfa48346e5295bf6485ef169121e2d714fc290e8fa108fec4448702ba9894285b649215 SHA512 4b26edaa5ef0802a210a52c8f43e363cce30d5a2746cf241e79de7ba62bad52b412ab9b8913895a190d1a26c223f69412d23e5bd8777fb26c684ab028a041c8f +EBUILD tomcat-servlet-api-10.0.2.ebuild 3164 BLAKE2B b3710592d4aba3023f425618d646593736af882f7f36791f8c0cf48e69c834b5acf4cb7be6bc16ab353533ed93cd0a72c93a9aca3e3b8a5b3cce74a1a2259c58 SHA512 bd50c82827a648b0fef4be3205405b49ba415dfb2f9a117701b2061a9d8ab2d263b613b97dcfc03561cb027f99c6c8ad7cda7d40f9cdf0e251e41efa2a589651 +EBUILD tomcat-servlet-api-10.0.4.ebuild 3173 BLAKE2B 29212c3e8101cf949bb6d5a111e7a9b1525f38d9c8eb103d5e2f4971456159d3f0f3de8908b9adbf831ad7e672b95397783a988d81297fa98da18f7313440938 SHA512 2e532ae99f36940a7a228798c4f7f0e66dbbb9d05793bbbb68117d16c74809da0b842d2648703aa0ec1d599b46a4d91a1411a76276f8885137b8dca988ebaf31 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b EBUILD tomcat-servlet-api-5.5.36.ebuild 1426 BLAKE2B 02098b91f21bde7a24d0cf38bb224cfeca5218d53c943c24db8a342cb54a7658016e127a0719b0206b9cdc14c73b8066f335400202710d5a82ea3db91cd4b2f6 SHA512 d70314124ddd901892fb92163ba78d719d875582704868870c74b94163da96e56f17eadd1a833a64058467f0de9c39ccb3f8892970221fb946d8a645db174218 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0 EBUILD tomcat-servlet-api-7.0.107.ebuild 2994 BLAKE2B 4e8f86d3f068f2e1dd1029ba8fa6d7df7b628a26ed5366d940b20d5375070d09caf2efd3429e8784fd1777d771a107a9184d7a46113966a994e4c496106bf37e SHA512 dde6491804e3f3ecae22d42fc35f40e64d867af0962fa0f9f4e91eedeb4df973175b3eccd45e59ed00eb3e7ec676326861540da6a8176e8275bbd6abfd8da6eb -EBUILD tomcat-servlet-api-7.0.108.ebuild 2996 BLAKE2B bc663cdfda29e16b0d0bff18bb6a6e4f8f3f5c3deb7a7a9a134cce09115c6f57606061e5238f279d99a5476f7fb9388d1280ad3f0e2b1844034dee186ed0bd27 SHA512 d78ba594fc8f2c65c3e1ef8856a1269bf282e3c33ad260941a2d7f671b68752456bcacddc08d4cde175f9db12fc839de68d79f559f00a349edff50eae1b1bf8b +EBUILD tomcat-servlet-api-7.0.108.ebuild 2995 BLAKE2B 35de7330c7750162de0e4f81f08c4536f4bec60122c3f69b5526b104a412573c775c34376698a384a10e5367df947d9cbb708a2522e899a7dd177666953a4917 SHA512 e8c41d609804d30dbe25aa61df632ab0c3031d28eadd36ed75d6b0e8438cfd3c96f269a0f3e9e0d0e7a4d1de26f1304fce9282509c751eed222c13e1f772d43d EBUILD tomcat-servlet-api-8.5.61.ebuild 3006 BLAKE2B 5a5ace1a95a190f6de2b56f42eaa80a0c35e4bec8905143350cf0f98af9e1d5d110622579b1164ea3f1af65581f06f886fa49d589e81f676694ed67178f613f2 SHA512 73d09c2d4aac971b1f00f9d4f6028d19270c343dcd0e4048585c2addd33b781bae4be3a9376739763fee8432479a4a1ad85a8e63c46dcf8b1b17b22ee872456c -EBUILD tomcat-servlet-api-8.5.63.ebuild 3008 BLAKE2B 8f01f33afc915191bdeb51e7b3989b7486e91e280e373dc06f80c228c1732ab6ccedad59f456425bfaf5b379d8afbb9cc0ae10241d874d5e3f67baeeed1dd20b SHA512 817cab543d860a9906a6b61e6dfe102da11beeda46c324d6ffa4711e5a17921185c3566f8da832a8f0d409b019946ab9c395a2ad6c7a717a6e9eb3fce22a91f4 +EBUILD tomcat-servlet-api-8.5.63.ebuild 3007 BLAKE2B fde18d95a829f850ea8bb1eef772b639e447d114391286e55c54fa1e28947065b97098fab8e2289dd4e105d5acc812578acd7338bdeab872018dc5d98aaadce4 SHA512 6d0ce135abb51bcea4cbe5f6777e9a192a2d7c488315f4346ae52d76cb1ade204bc173edbd20625dcd80db6444f04d804315f1311ba156d4b3c55250aada4bc0 EBUILD tomcat-servlet-api-8.5.64.ebuild 3013 BLAKE2B eaafab16ad5d3abd8548472444dde131df8aa69d8c76e5791fe9411649e5e0d02f6c2acfceedb46a437b9f6751b881aac947cec86df75d585bcba767f937a659 SHA512 59cfd4b848df3ca159c9cedb031d15fb9d5b0f28e9d2c8e7d6e2244ff0d4a70f2d39033bf49857ab4cd55406bca5ecc6de82d9c50e82acd6a04ff4709fbe0a44 EBUILD tomcat-servlet-api-9.0.41.ebuild 3172 BLAKE2B 28700a17edaf81fa47d08083fa506c89cc81a876dd4cc29310bba7487454317c271bef7641c0fc93f99b9a53155c2d99c4ebfa90c5f73d2e0188b75211f46625 SHA512 11cf7359592cf2ff2e2ff453fb90f649f6c9f2e444c5e58dfb84808256f13557be9dfadb188669fae88856af6aca9ecd242d043f9d43f96574715c35db9ef17f -EBUILD tomcat-servlet-api-9.0.43.ebuild 3174 BLAKE2B 1e0e628d53d7747c3882523cb73de01000800bdf16e2daed89c769047935d49d35ca49fba0ea2aa071e232193507a2bbab0e1b7a05cca3a4b44ddd3df6c9c9dc SHA512 7506cd8f698ee205dfa186a5e0715eb3844fe71f7afe4f56e51c3b0695f8af2285e0d7cbf157e7bdec81ee96bae2d9aae1218ee940579e82109007945d2648c3 +EBUILD tomcat-servlet-api-9.0.43.ebuild 3173 BLAKE2B ce7f0f3452899ea4354dbea3af3844c22c3e8f4e9b710920b6f77f3a9aef403b232451fbb12721027d109d19030fd07321e1edee4981d7edb56ad18ad1209433 SHA512 c1e97c19fbf7ff51a5e1c0c619e0b6d6d4436baa23f12803ca257e13f6e583342b91c3866595a1a386b0890755c06d5f5d0bec900ea4c63fff853e2d5c9e4489 EBUILD tomcat-servlet-api-9.0.44.ebuild 3178 BLAKE2B 340842e202037af6b9df88fb08a73e7aaf9c52e1ddaab5034aa5611f70df1d8aa5213eb1d783c38fce546dcf3fb6658c224342a4b00310b042b6fac5232e4d37 SHA512 63f9e79717f395a40ab5d9ea9429273ec902ec1866c43551099095298e1a8c4d0e603dc61bc7ea914ad1957d8a794a52826ef23ea6376dfbdadf777dbbd39bca MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild index 5c22f78e4c33..b8fec495a250 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="5.0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild new file mode 100644 index 000000000000..30dd1169f097 --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="source" + +inherit eutils java-pkg-2 java-pkg-simple + +MY_A="apache-${PN}-${PV}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="5.0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.8" +RDEPEND=">=virtual/jre-1.8" + +S="${WORKDIR}/${MY_P}/" + +# we don't have the aQute.bnd.annotation.spi packaged +PATCHES=( + "${FILESDIR}/${PN}-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch" +) + +JAVA_TEST_SRC_DIR="src/test" + +SERVLET_API_JAR="servlet-api.jar" +SERVLET_API_SRC="src/main/servlet-api" +SERVLET_API_RESOURCES="src/resources/servlet-api" +EL_API_JAR="el-api.jar" +EL_API_SRC="src/main/el-api" +EL_API_RESOURCES="src/resources/el-api" +JSP_API_JAR="jsp-api.jar" +JSP_API_SRC="src/main/jsp-api" +JSP_API_RESOURCES="src/resources/jsp-api" + +src_prepare() { + default + + # The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package + mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ + ${EL_API_SRC} ${EL_API_RESOURCES} \ + ${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \ + ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" + + pushd java || die "Failed to cd to java dir" + + cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" + mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources" + cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" + + popd + + for file in $(find src -type f | grep -vE "\.java$"); do + target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") + mkdir -p ${target_dir} || die "Failed to create resource directory" + mv $file ${target_dir} || die "Failed to move resource file" + done + + mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" + + java-pkg-2_src_prepare +} + +src_compile() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" + java-pkg-simple_src_compile +} + +src_install() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + java-pkg-simple_src_install +} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild index cdb2d22d435e..f6011174998b 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.0" -KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild index 0209b9ea50cd..b6efba166758 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.1" -KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild index 6939efb958e6..8b077fcce91c 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.43.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="4.0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8" diff --git a/dev-java/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest index bd63bf09f41e..3a46c9132ee7 100644 --- a/dev-java/xalan-serializer/Manifest +++ b/dev-java/xalan-serializer/Manifest @@ -1,3 +1,4 @@ DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8 +EBUILD xalan-serializer-2.7.2-r1.ebuild 1151 BLAKE2B c3b96ea77ac1bc0196de1615b16d9ac5ae404d56a6cc6d9238ea39a430e634e7c61346474a8dd08fc5fe10eaa76042c7bc7a442292c5b71d4242ce5117f9758b SHA512 e2ce9eeff54ba0f9d445a2478e7315bea4b4f0220840ecc5e9e4815f86652ccdf16555f87d261087bc6cf5d8be1456fef31d67cd871a3881f0a2396f64dc0aef EBUILD xalan-serializer-2.7.2.ebuild 1172 BLAKE2B 0363376283dc843270c2aa5727a416bdf630fe32a1479d1f95da735a869ea3630cca1d09e03f7cebf905fa0fbcd692e51e57713e85214943a3450b0581f383bc SHA512 f2a5960b5d0d9e8f59286f96d167d40ba932a6aaccb88b48bd2eee14f0223c3b59dc7deada3b8b23b2a5ee3975c6130810d72d24c590de82f47e884ab8cd8d84 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2-r1.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2-r1.ebuild new file mode 100644 index 000000000000..1f6ae506e46a --- /dev/null +++ b/dev-java/xalan-serializer/xalan-serializer-2.7.2-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +MY_PV="$(ver_rs 1- '_')" +MY_P="xalan-j_${MY_PV}" + +DESCRIPTION="DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces" +HOMEPAGE="https://xalan.apache.org/" +SRC_URI="mirror://apache/xalan/xalan-j/source/${MY_P}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" + +JAVA_SRC_DIR="src" +JAVA_RESOURCE_DIRS="resources" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + # kill all non-serializer sources to ease javadocs and dosrc + find src/org/ -type f ! -path "src/org/apache/xml/serializer/*" -delete || die + + # remove bundled jars + find -name "*.jar" -delete || die + rm src/*.tar.gz || die + + # move resources elsewhere + mkdir -p resources/org/apache/xml/serializer || die + mv src/org/apache/xml/serializer/*.properties resources/org/apache/xml/serializer/ || die +} |