summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-04-15 12:04:03 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-04-15 12:04:03 +0100
commit7fa8a1e3f149eea4c844c47cfe26136ed7614c58 (patch)
treee514d1b9999d088064bee1e34a3a3c500d6d7a07 /dev-java
parentd993571e2ee444d08f4e9e90d493ee37338657e3 (diff)
gentoo auto-resync : 15:04:2024 - 12:04:02
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin59500 -> 55807 bytes
-rw-r--r--dev-java/ant-antlr/Manifest4
-rw-r--r--dev-java/ant-antlr/ant-antlr-1.10.9.ebuild20
-rw-r--r--dev-java/ant-antlr/metadata.xml8
-rw-r--r--dev-java/ant-apache-bcel/Manifest4
-rw-r--r--dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild15
-rw-r--r--dev-java/ant-apache-bsf/Manifest4
-rw-r--r--dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild23
-rw-r--r--dev-java/ant-apache-bsf/metadata.xml8
-rw-r--r--dev-java/ant-apache-log4j/Manifest4
-rw-r--r--dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild15
-rw-r--r--dev-java/ant-apache-log4j/metadata.xml8
-rw-r--r--dev-java/ant-apache-oro/Manifest4
-rw-r--r--dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild15
-rw-r--r--dev-java/ant-apache-oro/metadata.xml8
-rw-r--r--dev-java/ant-apache-regexp/Manifest4
-rw-r--r--dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild15
-rw-r--r--dev-java/ant-apache-regexp/metadata.xml8
-rw-r--r--dev-java/ant-apache-resolver/Manifest4
-rw-r--r--dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild15
-rw-r--r--dev-java/ant-apache-resolver/metadata.xml8
-rw-r--r--dev-java/ant-apache-xalan2/Manifest4
-rw-r--r--dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild22
-rw-r--r--dev-java/ant-apache-xalan2/metadata.xml8
-rw-r--r--dev-java/ant-commons-logging/Manifest4
-rw-r--r--dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild14
-rw-r--r--dev-java/ant-commons-logging/metadata.xml8
-rw-r--r--dev-java/ant-commons-net/Manifest4
-rw-r--r--dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild14
-rw-r--r--dev-java/ant-commons-net/metadata.xml8
-rw-r--r--dev-java/ant-eclipse-ecj/Manifest7
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild50
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild53
-rw-r--r--dev-java/ant-eclipse-ecj/files/ecj-4.157
-rw-r--r--dev-java/ant-eclipse-ecj/files/ecj-4.267
-rw-r--r--dev-java/ant-eclipse-ecj/metadata.xml15
-rw-r--r--dev-java/ant-ivy/Manifest4
-rw-r--r--dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild (renamed from dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild)31
-rw-r--r--dev-java/ant-ivy/metadata.xml4
-rw-r--r--dev-java/ant-jai/Manifest4
-rw-r--r--dev-java/ant-jai/ant-jai-1.10.9.ebuild16
-rw-r--r--dev-java/ant-jai/metadata.xml8
-rw-r--r--dev-java/ant-javamail/Manifest4
-rw-r--r--dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild18
-rw-r--r--dev-java/ant-javamail/metadata.xml8
-rw-r--r--dev-java/ant-jdepend/Manifest4
-rw-r--r--dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild14
-rw-r--r--dev-java/ant-jdepend/metadata.xml8
-rw-r--r--dev-java/ant-jmf/Manifest4
-rw-r--r--dev-java/ant-jmf/ant-jmf-1.10.9.ebuild16
-rw-r--r--dev-java/ant-jmf/metadata.xml8
-rw-r--r--dev-java/ant-jsch/Manifest4
-rw-r--r--dev-java/ant-jsch/ant-jsch-1.10.9.ebuild14
-rw-r--r--dev-java/ant-jsch/metadata.xml8
-rw-r--r--dev-java/ant-junit/Manifest4
-rw-r--r--dev-java/ant-junit/ant-junit-1.10.9.ebuild24
-rw-r--r--dev-java/ant-junit/metadata.xml8
-rw-r--r--dev-java/ant-junit4/Manifest4
-rw-r--r--dev-java/ant-junit4/ant-junit4-1.10.9.ebuild37
-rw-r--r--dev-java/ant-junit4/metadata.xml8
-rw-r--r--dev-java/ant-junitlauncher/Manifest4
-rw-r--r--dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild12
-rw-r--r--dev-java/ant-junitlauncher/metadata.xml8
-rw-r--r--dev-java/ant-swing/Manifest4
-rw-r--r--dev-java/ant-swing/ant-swing-1.10.9.ebuild15
-rw-r--r--dev-java/ant-swing/metadata.xml8
-rw-r--r--dev-java/ant-testutil/Manifest4
-rw-r--r--dev-java/ant-testutil/ant-testutil-1.10.9.ebuild37
-rw-r--r--dev-java/ant-testutil/metadata.xml8
-rw-r--r--dev-java/ant-xz/Manifest4
-rw-r--r--dev-java/ant-xz/ant-xz-1.10.9.ebuild17
-rw-r--r--dev-java/ant-xz/metadata.xml8
-rw-r--r--dev-java/antlr-tool/Manifest5
-rw-r--r--dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild (renamed from dev-java/antlr-tool/antlr-tool-3.5.3.ebuild)4
-rw-r--r--dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild (renamed from dev-java/antlr-tool/antlr-tool-4.9.3-r1.ebuild)2
-rw-r--r--dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch11
-rw-r--r--dev-java/antlr/Manifest3
-rw-r--r--dev-java/antlr/antlr-3.2-r2.ebuild (renamed from dev-java/antlr/antlr-3.2-r1.ebuild)17
-rw-r--r--dev-java/antlr/files/antlr-3.2-java21.patch31
-rw-r--r--dev-java/auto-service-annotations/Manifest2
-rw-r--r--dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild4
-rw-r--r--dev-java/cglib/Manifest2
-rw-r--r--dev-java/cglib/cglib-3.3.0-r2.ebuild (renamed from dev-java/cglib/cglib-3.3.0-r1.ebuild)16
-rw-r--r--dev-java/commons-codec/Manifest5
-rw-r--r--dev-java/commons-codec/commons-codec-1.16.0.ebuild46
-rw-r--r--dev-java/commons-codec/commons-codec-1.16.1.ebuild2
-rw-r--r--dev-java/commons-compress/Manifest6
-rw-r--r--dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild44
-rw-r--r--dev-java/commons-compress/commons-compress-1.26.1.ebuild2
-rw-r--r--dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch164
-rw-r--r--dev-java/commons-lang/Manifest5
-rw-r--r--dev-java/commons-lang/commons-lang-3.13.0.ebuild29
-rw-r--r--dev-java/commons-lang/commons-lang-3.14.0.ebuild2
-rw-r--r--dev-java/commons-net/Manifest5
-rw-r--r--dev-java/commons-net/commons-net-3.10.0.ebuild2
-rw-r--r--dev-java/commons-net/commons-net-3.9.0.ebuild39
-rw-r--r--dev-java/commons-validator/Manifest4
-rw-r--r--dev-java/commons-validator/commons-validator-1.7.ebuild63
-rw-r--r--dev-java/commons-validator/commons-validator-1.8.0.ebuild2
-rw-r--r--dev-java/failureaccess/Manifest3
-rw-r--r--dev-java/failureaccess/failureaccess-32.1.3.ebuild25
-rw-r--r--dev-java/failureaccess/metadata.xml18
-rw-r--r--dev-java/gnu-jaf/Manifest3
-rw-r--r--dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild29
-rw-r--r--dev-java/gnu-jaf/metadata.xml26
-rw-r--r--dev-java/icu4j/Manifest2
-rw-r--r--dev-java/icu4j/icu4j-74.2-r1.ebuild (renamed from dev-java/icu4j/icu4j-74.2.ebuild)0
-rw-r--r--dev-java/iso-relax/Manifest2
-rw-r--r--dev-java/iso-relax/iso-relax-20050331-r6.ebuild (renamed from dev-java/iso-relax/iso-relax-20050331-r5.ebuild)24
-rw-r--r--dev-java/jakarta-xml-soap-api/Manifest3
-rw-r--r--dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch14
-rw-r--r--dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild (renamed from dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild)13
-rw-r--r--dev-java/javacc/Manifest4
-rw-r--r--dev-java/javacc/javacc-4.1.ebuild2
-rw-r--r--dev-java/javacc/javacc-5.0-r5.ebuild73
-rw-r--r--dev-java/jimfs/Manifest4
-rw-r--r--dev-java/jimfs/jimfs-1.3.0.ebuild70
-rw-r--r--dev-java/jimfs/metadata.xml (renamed from dev-java/ant-apache-bcel/metadata.xml)4
-rw-r--r--dev-java/jtidy/Manifest5
-rw-r--r--dev-java/jtidy/jtidy-1.0-r1.ebuild2
-rw-r--r--dev-java/jtidy/jtidy-1.0-r2.ebuild (renamed from dev-java/jtidy/jtidy-938.ebuild)18
-rw-r--r--dev-java/junit/Manifest3
-rw-r--r--dev-java/junit/junit-5.10.2.ebuild351
-rw-r--r--dev-java/openjdk/Manifest2
-rw-r--r--dev-java/openjdk/openjdk-8.402_p06-r2.ebuild (renamed from dev-java/openjdk/openjdk-8.402_p06-r1.ebuild)8
-rw-r--r--dev-java/plexus-classworlds/Manifest2
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild (renamed from dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild)6
-rw-r--r--dev-java/rhino/Manifest2
-rw-r--r--dev-java/rhino/rhino-1.7.14-r1.ebuild (renamed from dev-java/rhino/rhino-1.7.14.ebuild)6
-rw-r--r--dev-java/tomcat-native/Manifest5
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.39.ebuild86
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.3.0.ebuild2
132 files changed, 603 insertions, 1541 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 007ec1ad9940..4a616ab3b80e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
deleted file mode 100644
index ca46d33a2ca6..000000000000
--- a/dev-java/ant-antlr/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-antlr-1.10.9.ebuild 453 BLAKE2B 178c14fb802c055b1020847df5818ac2a5ec1fd4b105fa0d4f550367d649dee5951385bb4f56e9809d570b602e7064f74161af704b3ce677e08bd80d808b0d5e SHA512 e7ecd1fd12b554eb37a808e46b45e499e37330bcc559df2d1fef88b8e0cb9a19e1a58a86e4792289ef627174c5658b7ae886f2ff3a1039cb8be886feab37edd5
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild
deleted file mode 100644
index 3d1f5f5f4ac0..000000000000
--- a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
-
-src_install() {
- ant-tasks_src_install
- java-pkg_register-dependency antlr
-}
diff --git a/dev-java/ant-antlr/metadata.xml b/dev-java/ant-antlr/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-antlr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
deleted file mode 100644
index a930f617caaf..000000000000
--- a/dev-java/ant-apache-bcel/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-bcel-1.10.9.ebuild 338 BLAKE2B 44087fbd9d4439fc5a464cbb6cf00eaa2805eb93794147b08468b06148b4de27a9bd130f8a4008e4600d668189a5664e68629ad4c2678ddfb6dcb40ec9e3c554 SHA512 86fabe8683642c6a4dd32d6fa3934476571b65070a07f7d1817616c2a5a57afa2d7ca69d6edc81e05f18aa5051e9d17372926f9a090baa5e2c22bf77e4293d50
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild
deleted file mode 100644
index 19fd7d66d46e..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=dev-java/bcel-5.1-r3:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
deleted file mode 100644
index 16cd98c6ef81..000000000000
--- a/dev-java/ant-apache-bsf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-bsf-1.10.9-r1.ebuild 609 BLAKE2B 9407f384e44a848aa16b5cb3ff30c581b3745203316be2459b21802d529f3d2b229445e4dc9e3840a5a9b135e749eeb2b920f27147343a3462c99f6b51a4aa88 SHA512 f8942024e00822c700e807b30721396526d1559ba476d01f567c2db700a4c675677d95c96fe3284c669b89123617d73953c92efd60705b8bbb8a0bda0f77eaac
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild
deleted file mode 100644
index 04cdcf48579c..000000000000
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="bsf-2.3"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="python javascript tcl"
-
-DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[javascript?,tcl?]"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
- elog "ruby and beanshell. See its postinst elog messages for instructions."
- fi
-}
diff --git a/dev-java/ant-apache-bsf/metadata.xml b/dev-java/ant-apache-bsf/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-apache-bsf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
deleted file mode 100644
index fe85d70079d0..000000000000
--- a/dev-java/ant-apache-log4j/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-log4j-1.10.9-r1.ebuild 347 BLAKE2B b3c4e70431cfb83884046e5bd5130fc8b3cd58c7156816dfb6c0c082397bc0dd8c5ac2be3216baed0f7c15da44bd4ab67e751b4c741a6b1ca43b6655a0a8ee4e SHA512 a2243f1a089dbbbfca7c3b8df213e168203b68a4d61fccc2f0d335cc2a2ba78e5ee4b5aa0fb16a6764b499b81342b6cd0de69201fc7c27b1ebb2c88db917ac09
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
deleted file mode 100644
index b7f808b7f60d..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="log4j-12-api-2"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="dev-java/log4j-12-api:2"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/metadata.xml b/dev-java/ant-apache-log4j/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-apache-log4j/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
deleted file mode 100644
index a6e975570b13..000000000000
--- a/dev-java/ant-apache-oro/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-oro-1.10.9.ebuild 360 BLAKE2B dce73357d362c81b94597014f13cf71e5d3f979703bd2fe3405a170ca07dda999ca2d69decf66bf7c1c1f6dc77a8afd87fc8158798846de0488917011ba649f2 SHA512 227808dfe7014d7242d1889ce1277f5b63ec04ba321f909a41bac2aa402bcde597693c94dd1ec5e76af239f309ecedb85d93855589b577ef15e43048d39132da
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
deleted file mode 100644
index 4fa3ab36eac0..000000000000
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="jakarta-oro-2.0"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/metadata.xml b/dev-java/ant-apache-oro/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-apache-oro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
deleted file mode 100644
index ea709f1c06f7..000000000000
--- a/dev-java/ant-apache-regexp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-regexp-1.10.9.ebuild 364 BLAKE2B 3b770ed2f6901c13c8fa78f7409df76ed67280bb29d85fc0b109587c1585c8899e5dd54e86fcd2fbd2f458a6a25a39dd09cde0b9ad8636818126bc555bcc6523 SHA512 ee5e58f5db4d87bd809c7b2a92a47d125a6dcbc11438d61a054f298061051d491cc785bffceed561c6ca99dbdcf0a402d068c05ccdecb42a3b969c7a2896848d
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild
deleted file mode 100644
index 07ce567a85e6..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/metadata.xml b/dev-java/ant-apache-regexp/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-apache-regexp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
deleted file mode 100644
index 8bb420ffdeb1..000000000000
--- a/dev-java/ant-apache-resolver/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-resolver-1.10.9.ebuild 367 BLAKE2B 93a5d420b2f580b00f56cefcf533457967b3eeea180dfbf580c5aa53a01176b5a98b9bec909597ed0d6d7383e7d37556d8cb48fc6e4f6c6fc33a1e78fb115506 SHA512 fff63ab8c91b2cdebba05e41fcef21e547262c5f471d754a56b2f55bd87a774198c78072787ebb3d65346da9b9687177008c653e423d407f2c4e48aaf68033a5
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild
deleted file mode 100644
index 77c663e553ce..000000000000
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xml-commons-resolver"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/metadata.xml b/dev-java/ant-apache-resolver/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-apache-resolver/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
deleted file mode 100644
index 69723cb3646d..000000000000
--- a/dev-java/ant-apache-xalan2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-xalan2-1.10.9.ebuild 441 BLAKE2B ce94b639b5119285b03381dd2b20a7a485fba413bc33e3553a7cda0166e0ac98ef1177975d3e44dd2b0196dac7813e5cbabcab84b75c77cc825e01c0fc41bb4c SHA512 3f8b3e9523d10219455148c9cebb30c169142dbdbc4d362a631ca58166b6087f7b4241c1eaa399b68ed360ac09d8340c6501534510f47c8de176539a820546e2
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
deleted file mode 100644
index a46ac087c870..000000000000
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xalan"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="dev-java/xalan:0
- dev-java/xalan-serializer:0"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- ant-tasks_src_unpack all
- java-pkg_jar-from xalan-serializer
-}
diff --git a/dev-java/ant-apache-xalan2/metadata.xml b/dev-java/ant-apache-xalan2/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-apache-xalan2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
deleted file mode 100644
index a678451d0dcf..000000000000
--- a/dev-java/ant-commons-logging/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-commons-logging-1.10.9.ebuild 327 BLAKE2B b5985776a3b6ba0bddd04cb4fafb6cd53d33f39d24f99251e3d48bf6cebb7f9d974bc9e9eaabd3f86a1de8398ed989128c5a21228c99e67652d0731d7f5d2358 SHA512 a8bc8117a7083d1a2169e74d39be696219ef8c710eadf2dbd3a7a162e7f9efdf58866a848c1926be9541c1ebbbedf255f7e83520c7d6a4ab4b0014836f1e4754
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
deleted file mode 100644
index ce6a50054a6c..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/metadata.xml b/dev-java/ant-commons-logging/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-commons-logging/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
deleted file mode 100644
index 3dedab2db40e..000000000000
--- a/dev-java/ant-commons-net/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-commons-net-1.10.9.ebuild 323 BLAKE2B e66c0595831596c0f751b819c0d22a8611cb275d1c3397cf98665565f9ae07c3a60416fde49c42e7a8bbcaed2901bf29439f964ec3d4a731cc53d841db961942 SHA512 8ab7017e01f53857b2e91f2f5666eb0f5e19df57a2355e73d41c951d34749a70e829b1ddd2636ce368a199f8dd26e0c9a0c36345b1d20fc463f7ab4a33d87ca4
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
deleted file mode 100644
index 1ba1262c90f3..000000000000
--- a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/metadata.xml b/dev-java/ant-commons-net/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-commons-net/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
deleted file mode 100644
index 7d925270028d..000000000000
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
-AUX ecj-4.26 390 BLAKE2B 42e06c8114370763caeee14aee4e4471ba5781f2257abab6ba69ff8657946681e06994804b5ba5d23547b066e8784bdda3bc2ba254ae357f98d234bd4da7a415 SHA512 9b29d5e650ec30e9d493d48c29820dbb2de79fa1cc897de3ccfc2558814a882e5ba0a35567d1fbcea11b050a2ced7b48f2c53a97a9f420ef81e715ab5156f9e0
-DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
-DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
-EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1264 BLAKE2B 69b2683dbf261cfa42366352f567326bef3ee90368899ce57b58541df7de181dd34b018b59e66cf5cef7846fcd03302eced7669b64b653a83c4169a72a6f7bcb SHA512 a275af869a5421975047a752121be71bccef71a23567c11a2fea71c2f574d198c0cd4284f5bd9527fbe0a7ccbd24fcfb6e9e61bb9fcd283d872c94911940d5a2
-EBUILD ant-eclipse-ecj-4.26.ebuild 1420 BLAKE2B a8b84c31f5921f47234544ccfb594b081a07cb42e8e6a31346ea5f69e00fb5fcd586700afa421043f25393416c31a8cd6a60cfa1c8ff14f71edc44d4e49ecc0f SHA512 7087a4dcb93b0b87d512ba018817fcb613030d4ddbbfe4835b948da1281460d468ea5273bdedd1ee101e3fa6823a1623a3b76fc4ca2135b01441933558afd183
-MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
deleted file mode 100644
index 86295bc01b6a..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 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 prefix
-
-DMF="R-${PV}-202003050155"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="4.15"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- dev-java/ant-core:0"
-RDEPEND="${CDEPEND}
- >=virtual/jre-11:*"
-DEPEND="${CDEPEND}
- >=virtual/jdk-11:*"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
- default
-
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
-
- rm build.xml || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
-}
-
-src_install() {
- java-pkg-simple_src_install
- insinto /usr/share/java-config-2/compiler
- doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
deleted file mode 100644
index 478ef5996a68..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202211231800"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="4.26"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- dev-java/ant-core:0"
-# though technically both could be set to 1.8 and it would
-# compile using jdk 11+, it would not compile using jdk 1.8
-# because eclipse ecj has min jdk 11
-RDEPEND="${CDEPEND}
- >=virtual/jre-11:*"
-DEPEND="${CDEPEND}
- >=virtual/jdk-17:*"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
- default
-
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
-
- rm build.xml || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
-}
-
-src_install() {
- java-pkg-simple_src_install
- insinto /usr/share/java-config-2/compiler
- doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.15 b/dev-java/ant-eclipse-ecj/files/ecj-4.15
deleted file mode 100644
index f943dedcc19b..000000000000
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.15
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.15"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.15*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.15,ant-eclipse-ecj-4.15"
-GENERATION="2"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.26 b/dev-java/ant-eclipse-ecj/files/ecj-4.26
deleted file mode 100644
index 950088453264..000000000000
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.26
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.26,ant-eclipse-ecj-4.26"
-GENERATION="2"
diff --git a/dev-java/ant-eclipse-ecj/metadata.xml b/dev-java/ant-eclipse-ecj/metadata.xml
deleted file mode 100644
index 2c9857d120ad..000000000000
--- a/dev-java/ant-eclipse-ecj/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
-<longdescription>
-ECJ is the Eclipse Compiler for Java. It's a separate packaging of
-the embedded Java compiler that comes with Eclipse. It can be used
-as a batch-compiler by running the ecj-3.1 script, or it can be
-used with Ant by using the -lib option to and and setting
--Dbuild.compiler=ecj
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 7c0703e76771..8ba724658f42 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,3 +1,3 @@
DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
-EBUILD ant-ivy-2.5.0-r1.ebuild 8555 BLAKE2B cf37b07fe2a32e39193130bda115e0bafbd268a6c62e3b63ee16717323d81a601af415fc7ad974539f36aa3c86460404b6880c58f64d47fabecf469de0a4bcbd SHA512 ccc5281d3da84393ce2a4e6fcbc5ac78e72fd384365d238900aca37d0b996e011aa022f6afd760195d3b7178728fa18bc2a5b4b67a457aa060a3859a1888820d
-MISC metadata.xml 853 BLAKE2B deb1f7bed1e2828ff976d7a325fdd193fd099d911849bb53320e2093dd9030056b71858ad24bad3308570bf8ef6cf9c4a1d542ce47417683d484327de3a76d0c SHA512 960bc190397b3b2264dbd62b6487c383d11bbe73460ba76791d720fe4f78713158917b45b7e437707ef63dd87c0863caa333b0a9089b66b521792748a52085a1
+EBUILD ant-ivy-2.5.0-r2.ebuild 8507 BLAKE2B f88f6e98d61e346fca76f3e4cdfc1d9ce8cd96fc45bcf7872d2b5e1007ef67346b3a05f02a5b682ca732a014c5f6edfc0e87b28b661635ac38e6d10b46e14491 SHA512 5c6a77d82be45a6e50c4a3ee3615b82a06f36307f5e5436b4f45cf1496e060c650604e0cb300320f19e233e17b307eb40d37c7fd5217b78c3731956f458ab861
+MISC metadata.xml 853 BLAKE2B 908a789bf1e0310f1cb5fe27b360fb21c8b3569d99c20891a10b68be9162cf3c7009eefe0497c370699d005875d937da59b03d8f844a4d1a1a474f313f4c152a SHA512 af35a6ba951105d6c5e24ab2dcfa84a859184623c3911594bc82d72f3f96307da1dd8f6bef9be1297ec7cd0942680d77d6bdb44e2e5c5afe56cde761e018812f
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
index fff42019b905..0158c70768f5 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple java-osgi
DESCRIPTION="Ivy is a free java based dependency manager"
HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
@@ -21,7 +21,7 @@ PROPERTIES="test_network"
RESTRICT="test"
CDEPEND="
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0
dev-java/bcpg:0
dev-java/bcprov:0
dev-java/httpcomponents-client
@@ -31,10 +31,7 @@ CDEPEND="
dev-java/jsch:0
dev-java/jsch-agent-proxy:0
test? (
- dev-java/ant-junit:0
- dev-java/ant-junit4:0
- dev-java/ant-junitlauncher:0
- dev-java/ant-testutil:0
+ >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil]
dev-java/hamcrest-core:1.3
dev-java/hamcrest-library:1.3
dev-java/xmlunit:1
@@ -50,12 +47,28 @@ DOCS=( LICENSE NOTICE README.adoc )
S="${WORKDIR}/apache-ivy-${PV}"
-JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,httpcomponents-client-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
+JAVA_GENTOO_CLASSPATH="
+ ant
+ bcpg
+ bcprov
+ httpcomponents-client-4
+ commons-vfs-2
+ httpcore
+ jakarta-oro-2.0
+ jsch
+ jsch-agent-proxy
+"
JAVA_MAIN_CLASS="org.apache.ivy.Main"
JAVA_SRC_DIR="src/java"
JAVA_RESOURCE_DIRS="resources/java"
-JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
+JAVA_TEST_GENTOO_CLASSPATH="
+ ant
+ hamcrest-core-1.3
+ hamcrest-library-1.3
+ junit-4
+ xmlunit-1
+"
JAVA_TEST_SRC_DIR="test-src/java"
JAVA_TEST_RESOURCE_DIRS="test"
JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml
index 91e2ba1cf10c..84db44eaed66 100644
--- a/dev-java/ant-ivy/metadata.xml
+++ b/dev-java/ant-ivy/metadata.xml
@@ -16,7 +16,7 @@
</longdescription>
<upstream>
<remote-id type="github">apache/ant-ivy</remote-id>
- <doc>https://ant.apache.org/ivy/history/2.5.0</doc>
- <bugs-to>https://issues.apache.org/jira/browse/IVY </bugs-to>
+ <doc>https://ant.apache.org/ivy/history/2.5.0/</doc>
+ <bugs-to>https://issues.apache.org/jira/browse/IVY</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
deleted file mode 100644
index 22e8282567c6..000000000000
--- a/dev-java/ant-jai/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jai-1.10.9.ebuild 365 BLAKE2B 87332418de20a4b6208bd0d09a69b335cc67c3af1528ab059f580e27840c9bc12b4aed44cbf25b4037d7d14f3b3c1b22cd1881c775bd17c31b9daca2d373a590 SHA512 b405ebede92afd868c05b014d5e4494f598cca15418cae0893f677c4b2a110cc7f1a3819264952e241bfabfc9de0a6d5b0c2d454bb9539b98d11c000d378deb5
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-jai/ant-jai-1.10.9.ebuild b/dev-java/ant-jai/ant-jai-1.10.9.ebuild
deleted file mode 100644
index 3a2873b650bb..000000000000
--- a/dev-java/ant-jai/ant-jai-1.10.9.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="sun-jai-bin"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86"
-
-# Unmigrated, has textrels and there's also some source one now too.
-DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jai/metadata.xml b/dev-java/ant-jai/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-jai/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
deleted file mode 100644
index 619877a0615e..000000000000
--- a/dev-java/ant-javamail/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-javamail-1.10.9-r1.ebuild 463 BLAKE2B fe035f7068574e2998906e1b8e830ee39252defb88be2763e742f01efea01b228c2f87cd23fff02ec56cabfb1309ccab99bdcd5cab963802aca19d9f5fe5fa77 SHA512 a2a9540ee38563c8748a5a84cb8b07940e3c40dabca66943dd0bc2e831a3f4f493dce9defe0235f8f53b7f6eba8272b8ba4769dfb97661743e85b4bb3d138246
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
deleted file mode 100644
index c02f16c20d31..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=( "gnu-jaf-1" "javax-mail" )
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# needs some classes from javax.activation.* which are not in jdk 11
-DEPEND="virtual/jdk:1.8
- dev-java/gnu-jaf:1
- dev-java/javax-mail:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/metadata.xml b/dev-java/ant-javamail/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-javamail/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
deleted file mode 100644
index 6165f56365e7..000000000000
--- a/dev-java/ant-jdepend/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jdepend-1.10.9.ebuild 317 BLAKE2B a0d126aab9b66184a656a356d0f11a1b68f01d42b740f1ce3b98c893f9cda9b355cbaf25259f3df0eda4efcea0d108ec7183007c06c064800f51cc9aa5ae9ac2 SHA512 842daced1ca2a35696a63589f207e821a06b221205f1e83d2dff1e2298250cdbf153a2a784d8925f50864aeba12e4765b08a1cd781154f205c24758b9c2a8c06
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild
deleted file mode 100644
index 97d0329f5756..000000000000
--- a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=dev-java/jdepend-2.9-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/metadata.xml b/dev-java/ant-jdepend/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-jdepend/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
deleted file mode 100644
index 0fea98168fcd..000000000000
--- a/dev-java/ant-jmf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jmf-1.10.9.ebuild 438 BLAKE2B 7fd54042613ab6c7bfea3b46f9e35399030f3fa24d046df1a6b3a5b1befae24c1048ef0c2eda2ea294da10e4cf5007e5183e4fe75490850ad20e4699ab75f978 SHA512 636354baa6976dc6664e5b7fe2906cc8b22130963a9f81250e542227bfa6c8ce16c598180157567d4dafd5cf0a1df643b951cf3cb7670ddb2b1a4f8c6d9792f9
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild
deleted file mode 100644
index 76a06ae0e5a0..000000000000
--- a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-# Seems we don't need to depend on jmf-bin, the classes ant imports are in J2SE
-# API since version 1.3.
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/dev-java/ant-jmf/metadata.xml b/dev-java/ant-jmf/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-jmf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
deleted file mode 100644
index 7bf201170ddb..000000000000
--- a/dev-java/ant-jsch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jsch-1.10.9.ebuild 314 BLAKE2B 4e1cc7cb3970969c5258f919bd61890af5e5d76a2fb6bb37b75ec20e512bcf9bfd927fd053a2a3947d7a11d6ebb4799fbdf61d8f31f9d56f0f95b89875b0a892 SHA512 c1915ea29bb56d0db5af6020c4887893b29d0ef087f5b1b88145fcb7004025c5b867386134caf62fee01cd087cecddad369950e51db77ff729b613eae082ac3f
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild
deleted file mode 100644
index 43d214487023..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=dev-java/jsch-0.1.37:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/metadata.xml b/dev-java/ant-jsch/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-jsch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-junit/Manifest b/dev-java/ant-junit/Manifest
deleted file mode 100644
index a3abff690d38..000000000000
--- a/dev-java/ant-junit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-junit-1.10.9.ebuild 440 BLAKE2B 8f2274b3b195460cf2ba81f43aab7105821cefd1b52168fc90b13df4a59d359586f872a08b91d9071eeb896360c1dfea569dbea39221f7d736f42387ea54c562 SHA512 776fcc2f4f9b1bd9754832670244af732d65c2d056a6d5e9e84b157c042db4d7428e0c1875b09bf1ccfa3df82ee60d4ec341beb3f059d1c29e4692b81ede828b
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-junit/ant-junit-1.10.9.ebuild b/dev-java/ant-junit/ant-junit-1.10.9.ebuild
deleted file mode 100644
index cea7fdca5bc1..000000000000
--- a/dev-java/ant-junit/ant-junit-1.10.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="
- dev-java/junit:0
- dev-java/junit:4
-"
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4"
-
-src_compile() {
- eant jar-junit
-}
diff --git a/dev-java/ant-junit/metadata.xml b/dev-java/ant-junit/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-junit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
deleted file mode 100644
index b29683bdd202..000000000000
--- a/dev-java/ant-junit4/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-junit4-1.10.9.ebuild 944 BLAKE2B bed21206d4e2f3377ef1fa6c0fd8abd654ee4d67ee61929c579d2df8c52c5927e5e5737b8ec8a5f0a8e71025a0e01cdc39d2bcc897df695761894a12fd7c9723 SHA512 80b685cb703ac16c633cda917eccc806001762dcc02bb9853e9c28c723529598c3722e6ca017c66e318fc320069196dc9b68eb19bbc1abb0431c83bd3ce42aad
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
deleted file mode 100644
index 9eef99a67149..000000000000
--- a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="dev-java/junit:4
- ~dev-java/ant-junit-${PV}"
-
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
-
-src_prepare() {
- default
-
- java-pkg_jar-from --build-only --into "${S}/lib" ant-junit
-}
-
-src_install() {
- # No registration as ant-task, would be loaded together with ant-junit.
- java-pkg_dojar build/lib/ant-junit4.jar
-
- # As we dont't want to depend on and-junit in package.env, because it depends
- # on junit:0. Instead, we "steal" its jar and record it to our package.env as
- # if it belongs to this package's classpath.
- java-pkg_getjar --build-only ant-junit ant-junit.jar
- java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
-}
diff --git a/dev-java/ant-junit4/metadata.xml b/dev-java/ant-junit4/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-junit4/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest
deleted file mode 100644
index 31b2abecb5b5..000000000000
--- a/dev-java/ant-junitlauncher/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-junitlauncher-1.10.9.ebuild 290 BLAKE2B fa6a86751c034c50520532d28abcde04fce38cd30bc6a614ae32504502fb17abb80c2f5a170316f046296d8163a1d2ad25c398e7cecf9f58a2247efb44841150 SHA512 e1651939495ff6348ad3607d3d2afeb9d3960112df15c0643adc718e4a6bad72cd83a3ab9def2a74ce791204cbed848d070d1f2c4ea36969a24dc592b1685338
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild
deleted file mode 100644
index 2b8d03f2e629..000000000000
--- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/dev-java/ant-junitlauncher/metadata.xml b/dev-java/ant-junitlauncher/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-junitlauncher/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-swing/Manifest b/dev-java/ant-swing/Manifest
deleted file mode 100644
index 5f5e2cb1ead5..000000000000
--- a/dev-java/ant-swing/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-swing-1.10.9.ebuild 369 BLAKE2B c9789a630777d5a0c8ddb7d27e79c1e4c48820f765dc69849c1dc8681d2373e6a92e5c80e75e95396481281a4439d9f373eba93732c3d0b45a1dc083eb361459 SHA512 fe720ee0385d7ad966241777992591e6d97d3370dc35bb13f5c6697753d6f393d4cb1490cc60349744f1a341523056e9962b801cd6651dfd3634325b469cba87
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-swing/ant-swing-1.10.9.ebuild b/dev-java/ant-swing/ant-swing-1.10.9.ebuild
deleted file mode 100644
index c8dfb08b3aa2..000000000000
--- a/dev-java/ant-swing/ant-swing-1.10.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-# No extra dependencies are needed.
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Swing"
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
diff --git a/dev-java/ant-swing/metadata.xml b/dev-java/ant-swing/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-swing/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
deleted file mode 100644
index 1a745abc2778..000000000000
--- a/dev-java/ant-testutil/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-testutil-1.10.9.ebuild 924 BLAKE2B b0d6845fb45a059351172a11ced8b88fecb9bc867fc6b18652f4c23773be72b2500be64455c56210a82cf39ee4989f9ec972a42d40e8f46f8e22a38b7698f11e SHA512 7a54ed003ebacd7c22941d22caad61cc87d5ba922785aa7b793d6c88ab36be8f66c9d224a226023fbe0fbe46e1d4a9517ba7e88f5fa99700c6851083f54c6e66
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
deleted file mode 100644
index 1f1b85e2d3ba..000000000000
--- a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8
- >=dev-java/junit-4.11:4
- ~dev-java/ant-swing-${PV}
- ~dev-java/ant-junit4-${PV}
- ~dev-java/ant-junitlauncher-${PV}"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8"
-
-# The build system builds much more than it actually packages, so there are many
-# build-only deps, but since those are quite common, it wasn't worth to patch it.
-
-src_unpack() {
- ant-tasks_src_unpack base
- java-pkg_jar-from --build-only junit-4,ant-junit4,ant-junitlauncher,ant-swing
- java-pkg_jar-from --build-only ant-core ant-launcher.jar
-}
-
-src_compile() {
- eant test-jar
-}
diff --git a/dev-java/ant-testutil/metadata.xml b/dev-java/ant-testutil/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-testutil/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ant-xz/Manifest b/dev-java/ant-xz/Manifest
deleted file mode 100644
index 43d71ce4b6ad..000000000000
--- a/dev-java/ant-xz/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-xz-1.10.9.ebuild 406 BLAKE2B 9d82e61eaee689875fc4acc85a9d56654071c416a32a2f0660ebb0974c51f7bf69ab85b8591105046ac7b9129bb39a085defc677a500b47c8ff1ee3a6eba4838 SHA512 90f576ab64f6ea00211110b785a29cd80e1d18f2937469fb6f156dc91d14c6743d6f3e3d77c7434f88e2eb7e5472d4847aa291ffb8ae1adbe2ba4e38c8fc8376
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-xz/ant-xz-1.10.9.ebuild b/dev-java/ant-xz/ant-xz-1.10.9.ebuild
deleted file mode 100644
index a7d47300d608..000000000000
--- a/dev-java/ant-xz/ant-xz-1.10.9.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xz-java"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for XZ compression"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="dev-java/xz-java"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-xz/metadata.xml b/dev-java/ant-xz/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/ant-xz/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/antlr-tool/Manifest b/dev-java/antlr-tool/Manifest
index a0c38271d1ab..b3f9b511240f 100644
--- a/dev-java/antlr-tool/Manifest
+++ b/dev-java/antlr-tool/Manifest
@@ -1,8 +1,9 @@
AUX 4.9.3-test-fixes.patch 1399 BLAKE2B 719571607153951b6a44a7bed7c405b6e217f7a458667388d89ca15683342a5d9849155ad03771eb0f7d326af31fd0cf6e0ab9ddfbd385e189b33f0c842ab53e SHA512 b0aed6d54873ffd841ae5ac6ce1afb5d037fdde6e322903e250e46b38b84fd29ca87668f8b1f38a5c6b0ec4ad99953021d4260b67515158accbc37fd325e98eb
+AUX antlr-tool-3.5.3-java21.patch 333 BLAKE2B fcce76be4def5c9c24d21f43659c476680da74154fdd2c315732de1e974069ef1ad678390eb379be10673220659cecdbefc91187ecb8d5a5b9d5ab9607b35a80 SHA512 d78f1bdb9d19523ecbe80a31c165219e2945e5983f4c02e6755eb768c73037dd5e792fba42ed18c6e0cbd6ce55de472a6f42afa91bca6645952dd7accb9f6312
DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c
DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
DIST antlr-tool-3.5.3-sources.jar 949247 BLAKE2B f7afa52faae8324093206b7e56dfda58a79815cc2c13baca1cb93b3424c8b310325885ca8c86f0ca8a016a73e30740c2fa5f34ce71ed3a6cfc5fdeb6f2c4a9a7 SHA512 cfbc612c0257c4f0e09451cd76fe904680b6af132596696f2ef9c4e21dcfc53d53501e4d4d2b1c1cf4391355fa3766cf8dabc718dc3580728d24db3ebc14e696
DIST antlr-tool-4.9.3-sources.jar 961749 BLAKE2B 294c7ba6dff9a1039d3e570d7d49f46a564302d1e7a25ac9f662a2c293cbabadd6a5a4a94d026c4e5fcca37c407e104956badbd1cbbf71b957e464dc67cf823e SHA512 7d70e80714b673eb8301def5e66a7133b2ac477e3cc219e37877ef9df673e0599a1148a8c1929ca8eab081d4e7375c9079241765a1f38832b21cfe8608ef4429
-EBUILD antlr-tool-3.5.3.ebuild 1885 BLAKE2B 2a6d03c164ef67b9863852140d0bd9a2006ed818adf6972eef74698bd6cfdce65aade0eeca494a093b1dfef71ce13c038cb13245779b538a5d4cccb37100faa9 SHA512 1be7541883342648bb9daef6f6f7a10892b0643563624125eb610b575e1e6b5228841c3a596ba2cf0381d4a407396f6f0fe9bdd75ae15b9becede94a081f5f67
-EBUILD antlr-tool-4.9.3-r1.ebuild 3702 BLAKE2B a301909307af6c915ae2b424af9b3ba03f8d81697bd34557ea18ed1d13f8aa1e52f501cbf8ec47172bd25d44f581cc37ec5d7e921000bc88451089b83c860e5d SHA512 57bc1debb62dbb12be391286f7e9f13ae52f8d68501e0d6e410e8caf4dafbe070eb1331ce23216339c7e1e3c47cf25396514ba67fef9cc1e8b0b6be1f5017e78
+EBUILD antlr-tool-3.5.3-r1.ebuild 1958 BLAKE2B 12fec5c5bced1ba7264ab11b938211898a8b32651d5d6ae38d0bc44bb60ac451f4e7b1bead70c523ef9e2a026c11bf2008b65508b0e02826c3c417f8d009fd9e SHA512 dd2278182ceae5f8d82976fbb42c79296ba30e4c3bc45ec6daf29895e80b18a1a9f5d85f57f9f23d4b395a2f85b7e9616d19d6ac2848e52885ec66c97f558fab
+EBUILD antlr-tool-4.9.3-r2.ebuild 3712 BLAKE2B 981bfaf34c02951be230d694b4d58a9aae8c833742e1fd2f95be860754ddddf4351709b8ef70ce0447aa0722227a9ad20bf9d21c063f61552e1ff23ba385f1df SHA512 cfb3eaa48052d148f8c8025e99b6f367738d76a6b4601500137fe13e4c22d98cfd248de5e800aa72dab3edce2f648584ae8168781263181f1c2a2bdc738a3141
MISC metadata.xml 366 BLAKE2B 134ea633a45f3e33d57f4761afb1ff2d7f7778d06d66ff6e2e77a0c5777d48e8009697f64a4d50780b84b6672f352f4714a2b61d206cd158fcddd50902485caa SHA512 5b0bb774c494f1e7bbc486732abcea66922e65cd209df3d9fa090d71dabbc9aae59d437c340a5d78941d730388c95554fa80fb9852c8c0ceed05c9197d236301
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
index 0d99b11e44be..1997ce8c081f 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -58,9 +58,11 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="${TARBALL_S}/tool/src/test/java"
DOCS=( "${TARBALL_S}/tool/CHANGES.txt" )
+PATCHES=( "${FILESDIR}/antlr-tool-3.5.3-java21.patch" )
src_prepare() {
java-pkg_clean
+ default #780585
java-pkg-2_src_prepare
# Some tests fail under Java 8 in ways that probably aren't limited
diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3-r1.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild
index eaf876b5e1b3..2891b009c53f 100644
--- a/dev-java/antlr-tool/antlr-tool-4.9.3-r1.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild
@@ -32,7 +32,7 @@ CP_DEPEND="
~dev-java/antlr-runtime-${PV}:${SLOT}
dev-java/antlr-runtime:3.5
dev-java/jakarta-json-api:1
- dev-java/icu4j:0
+ >=dev-java/icu4j-74.2-r1:0
dev-java/stringtemplate:4
dev-java/treelayout:0
"
diff --git a/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch b/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch
new file mode 100644
index 000000000000..2e196df96ef9
--- /dev/null
+++ b/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch
@@ -0,0 +1,11 @@
+bug #919481
+--- a/org/antlr/codegen/templates/Java/ST.stg
++++ b/org/antlr/codegen/templates/Java/ST.stg
+@@ -32,6 +32,7 @@
+ @outputFile.imports() ::= <<
+ <@super.imports()>
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.*;
+ import java.util.HashMap;
+ >>
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index e43f5d95ea16..6a40a9227c36 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,12 +1,13 @@
AUX 3.2-java-8.patch 1318 BLAKE2B f7cf19e6da346c50ed066782905fffeac9b9f42c9988bc3ba0d18bc434fecfaa6d4ad3e74d2c84c87854716435be4a596c47b919ce42b310e48dc70d184bc7f5 SHA512 70c9dc23ec64ba75bfcfc0597544b13c2c35c523c6f2c9d82dbc54a44c30a5432a56b6193db74ca9c3d92235bdadc5427857c364abc4df79ffdc1d2b55221d32
AUX 3.2-test-fixes.patch 10294 BLAKE2B e2bed0bc4acd8c7de9eacfa6755f81db2cab78fb20518a51051d5a38fb33e25442e5e39ced3a94b525f3dcb5d0bad4c640c3df9da5b431efdf6d76764b11c5bd SHA512 0af15f7e315182f54c65ebcd298ebc02d6715f2233996d0effe7f44eb433e73ed7a33ee12e96d29f72b4437cead864c99150fee60c3c1740b6451619396be72b
+AUX antlr-3.2-java21.patch 1174 BLAKE2B ad4655ffc1fd71e08cd3d8e198716dbff5d1ef3ada1b0f2b6f1a114f503adfaf2cb9e2e2c139ee3c11d251e501c0dd5bc279da188ff5ed2f659470b5629a3b6e SHA512 5d5720f521c704d1e1b85ffbcbe26e78d5c223f96a6b52597fe972f04095d3ab97f15175b7a01801c5d336aa601d6cff2dec55a84a455a73e6aca9f08b2bc18c
DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c
DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
EBUILD antlr-2.7.7-r9.ebuild 1106 BLAKE2B 2be9b879a08cd66733a4319900674b3c15f0164fdf0078231cc617ec23137cca4c1b9a43e649addba3ab7a87e621c94430ee00b4365a80775b5638ccb2454cf6 SHA512 7b19f68f46867aaa9f2a3a68567669c14a3b155fc63cc844237052d54a285b5a00cf58e07ac75fc105a2d681f9650d2832984e06eca3b1818673d0b0c27eea0a
-EBUILD antlr-3.2-r1.ebuild 3204 BLAKE2B ddc76d551fcbfb2b1fd5dff04dd9d37ed2ef513568bd2453f9eea8fe410de84d9c5aa80621326879d8d90c424d3a1b32ce57fdf2c7c36889819c59fde98554cb SHA512 d87a6e984baf9710810914e29ed90da99bc8210381daf95e620a46126da95dc188ada0fb3149a424e01581ae936c324c34459ba6ad487ccf8b6ecaab92750c7e
+EBUILD antlr-3.2-r2.ebuild 3261 BLAKE2B 2295d630faf379ee027a33fcaf9b8f9ab877a717069f2f05a2ecb19663641374456f047c5cc2265de4871a1d20c07fe34b1d779c542b6cb39a99aaa35e7537ef SHA512 7dc7a30d913a804038e903df71e5d6db6f379b8355e21cd7506523cde9d5f088d68eff178ef08f1007d9bdb062155c4b259ccd16e8580d210379dff57af3727a
EBUILD antlr-3.5.3.ebuild 1567 BLAKE2B 68d3718034690e67f6eefd4f184d017b78cebee60593178eb706d23db55bc952f83f5fb2a636170664f3160b88fe37b5daca85ae385453683c593f631ec474f9 SHA512 64cfbec7d445af3fd6f95641f0de34675dadee2b2b12c3bc161d05e69d882e1bd7585ef0037ccbb38c20402a3cc5c0a2c0783945545f858d5a313d62664b024a
EBUILD antlr-4.9.3.ebuild 1595 BLAKE2B fd5186714b10efc3912027942eb4b39a94b21200d9a8b0470eb33960ff8562a9dda4bb25358f11964ee296e6adc72146e103da6b3f5636b570ba0bd6ce57e320 SHA512 a7834d9545685f1eb3fe714488d848ceee82aeb99f46d2de67308ddfee2418f794f814267797ac50f0780cdd8a0c73a5506e6885077f9146bf5f104992f4e3d0
MISC metadata.xml 314 BLAKE2B 997f9c85d72f9b4cae21a3ecd063374f769f369d66ce8531fb158a17b9408ae3d35f117386acd08b89c16d5e0e8130b26ddada87b448529bf41a02deb5c1cdf2 SHA512 ad99513f6581ce95415e908eeba185cd4b6d03a8297e99735c7e79bf3dca1fa0c61a7ae03e47d8ba7429269a29558fae7321583b4f7d328e1da6a091237d9fde
diff --git a/dev-java/antlr/antlr-3.2-r1.ebuild b/dev-java/antlr/antlr-3.2-r2.ebuild
index bf4946c25c62..9b58f9bff97e 100644
--- a/dev-java/antlr/antlr-3.2-r1.ebuild
+++ b/dev-java/antlr/antlr-3.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc test"
@@ -11,19 +11,20 @@ DESCRIPTION="A parser generator for many languages"
HOMEPAGE="https://www.antlr3.org/"
SRC_URI="https://www.antlr3.org/download/${P}.tar.gz
https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
+S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="3"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
RESTRICT="!test? ( test )"
-CDEPEND=">=dev-java/antlr-2.7.7-r7:0
+CP_DEPEND=">=dev-java/antlr-2.7.7-r7:0
dev-java/stringtemplate:0"
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
-DEPEND="${CDEPEND}
+DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*
test? ( dev-java/junit:4 )"
@@ -31,11 +32,10 @@ PATCHES=(
# These fixes have been applied in 3.5.
"${FILESDIR}/${PV}-test-fixes.patch"
"${FILESDIR}/${PV}-java-8.patch"
+ "${FILESDIR}/antlr-3.2-java21.patch"
)
-S="${WORKDIR}/${P}"
JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
-JAVA_GENTOO_CLASSPATH="antlr,stringtemplate"
src_unpack() {
unpack ${P}.tar.gz
@@ -49,7 +49,8 @@ src_prepare() {
# to the tests. This is bad but upstream is never going to update
# 3.2 even though other projects still rely on it. If any issues
# arise, we can only put pressure on those projects to upgrade.
- if java-pkg_is-vm-version-ge 1.8; then
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 1.8; then
rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
fi
diff --git a/dev-java/antlr/files/antlr-3.2-java21.patch b/dev-java/antlr/files/antlr-3.2-java21.patch
new file mode 100644
index 000000000000..8d885f9a5f11
--- /dev/null
+++ b/dev-java/antlr/files/antlr-3.2-java21.patch
@@ -0,0 +1,31 @@
+bug #919684
+--- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
++++ b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
+@@ -36,6 +36,7 @@ import org.antlr.Tool;
+ import org.antlr.analysis.*;
+ import org.antlr.misc.*;
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.AngleBracketTemplateLexer;
+ import org.antlr.tool.*;
+
+--- a/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g
++++ b/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g
+@@ -32,6 +32,7 @@ header {
+ import org.antlr.misc.*;
+ import java.util.*;
+ import org.antlr.stringtemplate.*;
++ import org.antlr.stringtemplate.StringTemplate;
+ import antlr.TokenWithIndex;
+ import antlr.CommonToken;
+ import org.antlr.codegen.*;
+--- a/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg
++++ b/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg
+@@ -33,6 +33,7 @@ group ST;
+ @outputFile.imports() ::= <<
+ <@super.imports()>
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.*;
+ import java.util.HashMap;
+ >>
diff --git a/dev-java/auto-service-annotations/Manifest b/dev-java/auto-service-annotations/Manifest
index af34a4401260..7b5eba66ecb8 100644
--- a/dev-java/auto-service-annotations/Manifest
+++ b/dev-java/auto-service-annotations/Manifest
@@ -1,3 +1,3 @@
DIST auto-service-1.1.1.tar.gz 422101 BLAKE2B 9050607917f6637e77d234074787662b32f0e245a8e61b233cb664834e50ad41523bf89869e7e7b44a9e77db22c99481dce6b7c8051934b4e159fab37f060b36 SHA512 4e18c422103d6857724d5fcb28fc2f12cdaeacd7a47ebdc1982e9cd2e9d83a90e571c5e14332e3fcaac3a9e1ecf947f0e9e89a87c0c3bb1dc2e401b1a76ca044
-EBUILD auto-service-annotations-1.1.1.ebuild 673 BLAKE2B 0b2a466241b4d4e48d789977f58b21df7b088d3d970cb85e20f35aac0d051d702dd66c358c5629da017ae1a8dc9ef6b9977da5ef237545d1625a24993855401f SHA512 e622d9e3f8829cddf4e6f360dd01aebcdc0ceeb1aa123043984a291c3197b4a4901bd30dfde85164051022d834456be7eaca5ceca4a7f4066c02ef98e6a3127b
+EBUILD auto-service-annotations-1.1.1.ebuild 685 BLAKE2B 18c0c70cf0f93ad5e5771cd1c15b65a1c9df02ee42f4acf9c67fdfcc5b86fa125d8513746d85e127dc435acc18ffaf8303e1e7b04eedb37264585ab16f60936c SHA512 238066d76f85cd030267161643bac8d6f408e51211cd7746c29d94d3bc59b5d4c614662e7df671732775c92ffb37d1bc6450a4a83fc75b3cbcc624e834c316da
MISC metadata.xml 293 BLAKE2B 2ddc08b712ae2683ccfa84efea7bd3d852952545fff314dbaf1d6077c353fd370c655dc252fd2a30e2eda3e07ff49e6db25f5d0aaedd87035ef8f5206892ddf2 SHA512 1e7d0b84abaae46ea893cf5b0a079885a1eee89e450dda7e64d0b4075268856c00e64f795708d3a997b4c75e4f1f63d1270080443a350cb85d7b7f5c9a73a455
diff --git a/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild
index 0ae78daf656a..59f4e19a87db 100644
--- a/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild
+++ b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/auto-auto-service-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index 0e89cb99a2e6..f13b635bc7ed 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,3 +1,3 @@
DIST cglib-RELEASE_3_3_0.tar.gz 151490 BLAKE2B d7ca4cc9ea6dad9f7a827c784ad13f93e8f31c817c5a0182a86b2ba759ccd3dfbec88d5178507599cd08a97a1ef13ba4880cab016b68b92dda3358bfb0a751c0 SHA512 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a
-EBUILD cglib-3.3.0-r1.ebuild 2076 BLAKE2B c422f04f799d55ffc657dd28d05ab0b5fe598c352ded8ebcbc941f1e317c68fcde850f25b5daca101c3ad611380702cd264c3e05d00411c0cc9a8d207421dd10 SHA512 25820a58538d0b281fdbe6579ba1f7ffff7a28cf4f6a77227eefc4fe1873c83f6cd0dc271985520c3119fcac8f102a0f1eca3f65400b93524313bd284371b9d7
+EBUILD cglib-3.3.0-r2.ebuild 2057 BLAKE2B d85c553f6a9a2b110f7fd15683422000f262b40113df5197d303962cd8ddb3c82483aadf11a9d004a30237f3a7200b051f0b824176bae4ad9f49c54f8a6151e1 SHA512 c8507f10d9540fd69641fe00d1f7a0ccda7d8a77645452a0c1f0a28b11b088214db01d848dcf3134a6fa7c9054fb2bc575e6f26d3d7f42d86258d033db32ccaf
MISC metadata.xml 663 BLAKE2B b64f3da3e4d1dd5ac67867d982f124244f81c03e91b5d7140ee1b16a0fd0250751d41debf9a228150569b7e750929942d011afb0872e3e5098e6106639e0ee3b SHA512 d05d3d71c2511c289c2d1cd4ba638cdc488ee5ea5a8a0da8145929befb41c3efa64f672f12584974239039536c68051f7665730221364ffd20fb8f301672db42
diff --git a/dev-java/cglib/cglib-3.3.0-r1.ebuild b/dev-java/cglib/cglib-3.3.0-r2.ebuild
index 64fd2b7900fc..fc4bba040586 100644
--- a/dev-java/cglib/cglib-3.3.0-r1.ebuild
+++ b/dev-java/cglib/cglib-3.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,26 +16,25 @@ MY_P=cglib-${MY_PV}
DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
HOMEPAGE="https://github.com/cglib/cglib"
SRC_URI="https://github.com/cglib/cglib/archive//${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-CDEPEND="dev-java/ant-core:0
+CP_DEPEND="
+ >=dev-java/ant-1.10.14-r3:0
dev-java/asm:9
"
DEPEND="
>=virtual/jdk-1.8:*
- ${CDEPEND}
+ ${CP_DEPEND}
"
RDEPEND="
>=virtual/jre-1.8:*
- ${CDEPEND}
+ ${CP_DEPEND}
"
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="asm-9 ant-core"
JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java"
JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources"
@@ -54,7 +53,8 @@ src_test() {
# Caused by: net.sf.cglib.core.CodeGenerationException:
# java.lang.reflect.InaccessibleObjectException-->Unable to make protected final java.lang.Class
# java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain)
- # throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee
+ # throws java.lang.ClassFormatError accessible: \
+ # module java.base does not "opens java.lang" to unnamed module @42bb2aee
local vm_version="$(java-config -g PROVIDES_VERSION)"
if ver_test "${vm_version}" -ge "17" ; then
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 0d6b1a193234..f9a577b315bc 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,7 +1,4 @@
-DIST commons-codec-1.16.0-src.tar.gz 447581 BLAKE2B 111151b4cf409dbc6f69106ed30f2cfd60a1ab3aa15eb0cfe80ff1c2a06875f6856e387f66751c26f58dc29907ae7a03b16f23f7860114839df298a6c37d9fdd SHA512 5212beae43a59d5a92c80f87640278913bf07d6527ead573710391a8b5c813af67f8086de5cd80f4b06845752652684d7c28f6236f5a8bd0bd6a8b89dc0d9532
-DIST commons-codec-1.16.0-src.tar.gz.asc 488 BLAKE2B 96ac95b5efbc812b5df0d002eeff874ff23e05e0229e4f49bf29aaf9c75b32845adeb803c9c8d4d3b190bf2bfab626c59cb2fa2b2439b5611b158d27b73d4c0c SHA512 03f9281e93cd4a1cf42878bd25045368bc72a50edace9b38a977658e7e83b45bfe835065e80e0838a5e57d16a8737624ab388cdcd3fee58ec2114ff4fc241816
DIST commons-codec-1.16.1-src.tar.gz 450009 BLAKE2B da06c823fae5e106c27b10274fb159e3de62827fe1bb1ace8d65377da26d012534636a8ac58a558b653ba3a7e868bb2f7d94b2ea820b5ddc6400fd4d288c6ba9 SHA512 8e2d40ae625c04e61b0dd7473dea0b32fdd13a6d3aad47b8b052952ca46f57d3df4917133f523ea147305a1c7ed9267cce7c4fa34d901496e36e9d5de9856e61
DIST commons-codec-1.16.1-src.tar.gz.asc 488 BLAKE2B d3f193b602339714728875189ae90a49f70f9efb70076e73bdc460ccca99aea832a7cf0b18ecd212b016787f8cc96a1e30f9cb0af7b83f05db2dfba00d71c144 SHA512 a0716601374f17add25698eb5abd111c560c258f4ab18278b6bd857b2bf32916b5e4e590ce8c39a0bdef3b83e16e9330ce84268dec810db7dfab1679cace85af
-EBUILD commons-codec-1.16.0.ebuild 1277 BLAKE2B 2035f7f22c3c0abae857b392806e4a737e2a454dba92f924afbc3e0c12b4bacee3f31e271aa474296424c87841f9d26d5cb11b9d05aa2647a971f479f87ed373 SHA512 0d9444a5a1959eeb5a7d08dd7330fef03b3326399568ca4c19e685c729de0c32f8b31146ea9888ba96271db808b957854d1bc40f21f5fc031ff1ea17acd4144b
-EBUILD commons-codec-1.16.1.ebuild 1281 BLAKE2B 9dbb2e899995af92c78f36311517406c97a0e052191aa0357b8f13c7dc812f0b367a5f68ff131da313ec02fdddf11494715469a55801511ea5e17e63c18a213f SHA512 0ecdd88bf89150d04fc242b478b3c8a52a45932ca98679b8c39b21f384d7eda50af45bb505f06ae0089757c6262bd16fa66e2268cb0645d4c934469d203e7f65
+EBUILD commons-codec-1.16.1.ebuild 1277 BLAKE2B fd813ce6a6526624ea17689178c24acfbdff557a98de71f1a5ef2995dba57aa77060eea8f8a5b5704ece723fe3c96e53e313eea40885ee3fe2e028a3fa2abc92 SHA512 888b364b3b8866e4a45535a7851839af4b9b979f6202ae73217ff35b07e07703d05690a77e27ca805fa60120da25a148765547d31048e933f747c9f8e4211055
MISC metadata.xml 1443 BLAKE2B 9dc72c216ed78422e21ce8c25aab0ca901fe2947ab3d26076379701c7ed585def08c49d258e30d035ffb8e7f618540578cc34ca4246a30e21e1ebbab13c706bd SHA512 1ae390b599a1b817f1d7bc54e8d73dfe596de6a6829ef65554f4a27d16e79e1c99645302d1d761caefb48e46f54ba930cf0991985beedc93e7fb416b7146a920
diff --git a/dev-java/commons-codec/commons-codec-1.16.0.ebuild b/dev-java/commons-codec/commons-codec-1.16.0.ebuild
deleted file mode 100644
index 3f139af22920..000000000000
--- a/dev-java/commons-codec/commons-codec-1.16.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-codec:commons-codec:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Implementations of common encoders and decoders in Java"
-HOMEPAGE="https://commons.apache.org/proper/commons-codec/"
-SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz
- verify-sig? ( https://downloads.apache.org/commons/codec/source/${P}-src.tar.gz.asc )"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-RESTRICT="test" #839681
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/commons-lang:3.6
- dev-java/hamcrest:0
- dev-java/junit:5[migration-support]
- )
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.codec"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
- junit-4
- junit-5
- commons-lang-3.6
- hamcrest
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/commons-codec/commons-codec-1.16.1.ebuild b/dev-java/commons-codec/commons-codec-1.16.1.ebuild
index e092312d1927..96485a4fea70 100644
--- a/dev-java/commons-codec/commons-codec-1.16.1.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.16.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
RESTRICT="test" #839681
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 2447485e9bf4..bafcce7ee3f0 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,8 +1,4 @@
-AUX commons-compress-1.21-asm7+.patch 7037 BLAKE2B 49270e040492c413fb9f26ce81dde2e7594a02b48d4dfd68bfe977eefc9d41e21e585d1a0d2e56803d08d1af617f8c2d0e3f3d3b0cffa893bfc8d2d3c50b6d9d SHA512 6722a9fb119d72c7061d12b94452fac40eef63be7610eee81ddc115c346610e5e4caca0cbf659ec9e7ff1a58f9def4ebfef26476b915bc74299a1f984d2eb29c
-DIST commons-compress-1.26.0-src.tar.gz 54670636 BLAKE2B e29adcab9a10a7d4ada3624afb0d674a592fbd76d93badea833af355415a4e4adb1f954a2986cc9d1ae78dc84cd0380de0f21366cf7ae582e9d89f2cb2cea943 SHA512 9348e2792d67fe977cbfcede80ab95de96e582c3f7239e16e99360decac4e7703f57d4cfec9535cd4a0f884319df851eb5e44214ba8c3dd321cc6ea67f9d1abb
-DIST commons-compress-1.26.0-src.tar.gz.asc 488 BLAKE2B 0b51158ad0eeb91c8ecad1a6d87afd482ddaae7c6d4fd1d86b586886b1d6ba4073d9e6846a84334593676f1a6bb337b250009ddfc0f67838bab38238cd5d2a4c SHA512 31080e6fba38574d84b0af09450eba3c0b4b2781c50e432d5ce0e128a8b3edd105ad75908177c1aa8942d68a095d47e7f3f4d141c8f2227828b294f3da6b343c
DIST commons-compress-1.26.1-src.tar.gz 54843710 BLAKE2B 84c4c1363a4396a06773a8c120f5f32d98fceaa139e33a2a27df79a9aea41b8084a93a5735b0c4cd17fa88c404060af2336ab20f127acceb0da948ff170164c3 SHA512 096c94344a9bbcd021a3cce0869456cf6d22ca5136b63de017922d7c3de5d94b591961fe550201b654f9dc90b2cd8f32ef9bf1e507fddfb2e2f7c33bddc790c4
DIST commons-compress-1.26.1-src.tar.gz.asc 488 BLAKE2B 4df27d6d7ab226eb87ca6b7691c677b95d59c2d37f44ced6a5c0586aefa2506c9a635d869fd181526149416c228a8859a961386ca98519dc080709a55d9264c9 SHA512 b9533d63f961022ca42e79f8aed91a6c4b8a91cb0f3aa095a4ffa2202ed87d171f6c0d32babfbd730eb0c250be2331da4bd12e5251f7e7076f78536d20d96ced
-EBUILD commons-compress-1.26.0-r1.ebuild 1341 BLAKE2B 85ddf9f5e226669d9eef5ae7d23f0db9f34b87d89a1e35219898bf98f516cdee5508865aff05c4250dfd54c90638d23675da1c010a435d1f3ea1dd7e29335f3c SHA512 4985b05053b4ed3e7802db592674ed551c88f67eee48efa1fcd6bc62792c043253de8f10df6d44d8c74d50a4cd33568d80df98d4afd65624fcf3e0123235179b
-EBUILD commons-compress-1.26.1.ebuild 1311 BLAKE2B a79f18019a9a3db0971847376af23bc7a38cb58e2883e90e6489f65ed0d23d89199b37142d6fa01cbca7d6cf0003d3bd30d4d5476c97f20fb081cfca80302154 SHA512 6b80d0c1ccdde1b10def9c85c1971c3249a2b412db3e8fbee2b3688178ea5f8fa0415376e2a79291fcc98f586747a39210de7804540a2cd5b8913027b9f66cd5
+EBUILD commons-compress-1.26.1.ebuild 1307 BLAKE2B 65146a3dec16edfe680b003199565da76945b8b2481103e03f99220641ed5270e27cb0ee14b3e64969b6c47501f68640ca6df1a48a912e9259110b0492420349 SHA512 3c5a9ea89a8b1997e4053cc89150a6334bbfa32ad4e7bf985395efb98f34a64835d47115d4cf5b67a7bdce939a8eca6ba43b8bb72fc24c5a71e875a1a227203a
MISC metadata.xml 325 BLAKE2B 9edddb431124415fe343c5fcfbef16627943a28d12f4bba89559a577e1a2b2eed63a866521f47c504c102c1f5f01cd014c6e453940347ae0bd8e3ebfc5cae68f SHA512 54562f74ac55704a1f09b8dc4d78c5620ba61197e71350d770bddbeafe53c2faaad6d900d284cc265be555d378022b228c6a14b0606f540e2faa16b3df27e939
diff --git a/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild b/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
deleted file mode 100644
index f229ec9ba6d4..000000000000
--- a/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Not ready for running tests, https://bugs.gentoo.org/839681
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-compress:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Java API for working with archive files"
-HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
-SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz
- verify-sig? ( https://downloads.apache.org/commons/compress/source/${P}-src.tar.gz.asc )"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-CP_DEPEND="
- dev-java/asm:9
- dev-java/brotli-dec:0
- dev-java/commons-codec:0
- >=dev-java/commons-io-2.15.1:1
- dev-java/commons-lang:3.6
- dev-java/xz-java:0
- dev-java/zstd-jni:0
-"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-11:*
- dev-java/osgi-core:0"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.compress"
-JAVA_CLASSPATH_EXTRA="osgi-core"
-JAVA_ENCODING="iso-8859-1"
-JAVA_MAIN_CLASS="org.apache.commons.compress.archivers.Lister"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-compress/commons-compress-1.26.1.ebuild b/dev-java/commons-compress/commons-compress-1.26.1.ebuild
index b51066f5a17e..c8764e448be2 100644
--- a/dev-java/commons-compress/commons-compress-1.26.1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.26.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch b/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch
deleted file mode 100644
index e20fa89787dc..000000000000
--- a/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 7709c8be97147e8d5c5d7fa42d076504931ba9e0 Mon Sep 17 00:00:00 2001
-From: Stephan Blecher <token_github@blecher.at>
-Date: Tue, 10 Aug 2021 14:39:21 +0200
-Subject: [PATCH] COMPRESS-582: update harmony to ASM >= 7.0
-
----
- pom.xml | 5 +--
- .../harmony/pack200/Pack200ClassReader.java | 2 +-
- .../compress/harmony/pack200/Segment.java | 35 +++++++++++++++----
- .../harmony/pack200/tests/ArchiveTest.java | 0
- 4 files changed, 32 insertions(+), 10 deletions(-)
- mode change 100644 => 100755 src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
-
-diff --git a/pom.xml b/pom.xml
-index 28f50f06a..1c6844d24 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -78,6 +78,7 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
- <commons.jacoco.version>0.8.7</commons.jacoco.version>
- <commons.japicmp.version>0.15.3</commons.japicmp.version>
- <commons.javadoc.version>3.3.0</commons.javadoc.version>
-+ <asm.version>7.0</asm.version>
- </properties>
-
- <issueManagement>
-@@ -119,9 +120,9 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
-
- <!-- Pack200 -->
- <dependency>
-- <groupId>asm</groupId>
-+ <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
-- <version>3.2</version>
-+ <version>${asm.version}</version>
- <optional>true</optional>
- </dependency>
-
-diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
-index 2a017bc01..7022b7b30 100644
---- a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
-+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
-@@ -40,7 +40,7 @@ public int readUnsignedShort(final int index) {
- // Doing this to check whether last load-constant instruction was ldc (18) or ldc_w (19)
- // TODO: Assess whether this impacts on performance
- final int unsignedShort = super.readUnsignedShort(index);
-- if (b[index - 1] == 19) {
-+ if (index > 0 && b[index - 1] == 19) {
- lastUnsignedShort = unsignedShort;
- } else {
- lastUnsignedShort = Short.MIN_VALUE;
-diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
-index 0609aa4c2..1bc73a018 100644
---- a/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
-+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
-@@ -32,12 +32,20 @@
- 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;
-
-+
- /**
- * A Pack200 archive consists of one or more Segments.
- */
--public class Segment implements ClassVisitor {
-+public class Segment extends ClassVisitor {
-+
-+ public static int ASM_API = Opcodes.ASM4; /* see https://asm.ow2.io/javadoc/org/objectweb/asm/Opcodes.html#ASM4 */
-+
-+ public Segment() {
-+ super(ASM_API);
-+ }
-
- private SegmentHeader segmentHeader;
- private CpBands cpBands;
-@@ -255,8 +263,12 @@ public void visitEnd() {
- *
- * It delegates to BcBands for bytecode related visits and to ClassBands for everything else.
- */
-- public class SegmentMethodVisitor implements MethodVisitor {
--
-+ public class SegmentMethodVisitor extends MethodVisitor {
-+
-+ public SegmentMethodVisitor() {
-+ super(ASM_API);
-+ }
-+
- @Override
- public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
- return new SegmentAnnotationVisitor(MetadataBandGroup.CONTEXT_METHOD, desc, visible);
-@@ -427,7 +439,7 @@ public ClassBands getClassBands() {
- /**
- * SegmentAnnotationVisitor implements <code>AnnotationVisitor</code> to visit Annotations found in a class file.
- */
-- public class SegmentAnnotationVisitor implements AnnotationVisitor {
-+ public class SegmentAnnotationVisitor extends AnnotationVisitor {
-
- private int context = -1;
- private int parameter = -1;
-@@ -443,17 +455,20 @@ public ClassBands getClassBands() {
- private final List nestPairN = new ArrayList();
-
- public SegmentAnnotationVisitor(final int context, final String desc, final boolean visible) {
-+ super(ASM_API);
- this.context = context;
- this.desc = desc;
- this.visible = visible;
- }
-
- public SegmentAnnotationVisitor(final int context) {
-+ super(ASM_API);
- this.context = context;
- }
-
- public SegmentAnnotationVisitor(final int context, final int parameter, final String desc,
- final boolean visible) {
-+ super(ASM_API);
- this.context = context;
- this.parameter = parameter;
- this.desc = desc;
-@@ -478,7 +493,7 @@ public AnnotationVisitor visitAnnotation(String name, final String desc) {
- nameRU.add(name);
- nestTypeRS.add(desc);
- nestPairN.add(Integer.valueOf(0));
-- return new AnnotationVisitor() {
-+ return new AnnotationVisitor(context, av) {
- @Override
- public void visit(final String name, final Object value) {
- final Integer numPairs = (Integer) nestPairN.remove(nestPairN.size() - 1);
-@@ -552,7 +567,7 @@ public void visitEnum(String name, final String desc, final String value) {
- }
- }
-
-- public class ArrayVisitor implements AnnotationVisitor {
-+ public class ArrayVisitor extends AnnotationVisitor {
-
- private final int indexInCaseArrayN;
- private final List caseArrayN;
-@@ -561,6 +576,8 @@ public void visitEnum(String name, final String desc, final String value) {
- private final List T;
-
- public ArrayVisitor(final List caseArrayN, final List T, final List nameRU, final List values) {
-+ super(ASM_API);
-+
- this.caseArrayN = caseArrayN;
- this.T = T;
- this.nameRU = nameRU;
-@@ -612,7 +629,11 @@ public void visitEnum(final String name, final String desc, final String value)
- * SegmentFieldVisitor implements <code>FieldVisitor</code> to visit the metadata relating to fields in a class
- * file.
- */
-- public class SegmentFieldVisitor implements FieldVisitor {
-+ public class SegmentFieldVisitor extends FieldVisitor {
-+
-+ public SegmentFieldVisitor() {
-+ super(ASM_API);
-+ }
-
- @Override
- public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
-diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
-old mode 100644
-new mode 100755
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 4f8596f2fd4b..e844f95df712 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,7 +1,4 @@
-DIST commons-lang-3.13.0-sources.tar.gz 1133483 BLAKE2B bf2239b03129f3cc6104c8ff66ac9d0c2dc7367111e4a8c4d76b5e2773c56a17607e28b24f5d7283b2119c3421f1526dac4ef98ed16da9e8bf9d033fbb7a4b80 SHA512 6fca0ce86aea84458021360bac3f6775135a1a5c1826194921e2d4ead7c12f6ac560e7c3fc240112f862aaee24be8754c37dd867f45e9449cde4a388018d8691
-DIST commons-lang-3.13.0-sources.tar.gz.asc 488 BLAKE2B ecfc26f598b4a683a14803f5eee42f9b9ebfc7c02dac5b9fdc72ef97839e80ac648489da4e136f94044852fb09eff05bc08021cf1678ea9c19065a5b69c1375f SHA512 4d9dca040d9f06791f7f67ad7313e5a2c6bc19a07a62ae4dbcd10712afbcc51e926258938a54f0507d8cd1486041b46b29ed070b488b55833c30cbb6786c4145
DIST commons-lang-3.14.0-src.tar.gz 1153353 BLAKE2B 78d116864e488baf5c0c241b2304244f207c7b56b2f72006648de217d407d7c577a43ed89d78b0c868a2842eb1985c842e214078cc8e55bc5d93fac5553fa2ed SHA512 1ee4176c3588c11594a79f416a1f34b063cddb10c2124a37640fee48e5d8135091573002b6bf1eda5a60a324c1125665dadc93f9bfda32c9270c35113b6e1bea
DIST commons-lang-3.14.0-src.tar.gz.asc 488 BLAKE2B 3ef9b7529a1681e2687f533bf8d45a8394f6633e0a56e8e17ae63b2f8631f94c854b35e50b0f780908ffdcd0f8a8d99d8132aaa1ade5e932ee1ff56181b1ce77 SHA512 025673c12587970de5ebb62aad0d2d34cdbd57c575ebb6c83359b975b3d1ec50ff3caa544395ad04aecd59df454a12a769025635aa55d860195e39086ddcf47e
-EBUILD commons-lang-3.13.0.ebuild 1059 BLAKE2B f6f49f1f21493561d6eb39b220d5602f7802c2b7acd923deeb38f61161b341885addfbf451ff7d64f9935cf4717ddcd6dcb8782475073e47ff21862bd11c2631 SHA512 c219cab7552dd75bae263cd5e7dde15aff431f6ca635c24a38aa92a80ab1e96c4644aac1c20032fb7367e71fbaf10d87c5feacf3f6f61ab63712fc74c17b7899
-EBUILD commons-lang-3.14.0.ebuild 1124 BLAKE2B 393237cd01aa37f6041310cac0bebaac0f92ac5df5ccbcf78bad7aea5834fe8540363b4832941c18aafc55a29f8b62ac7cfcbdd5c2efc036da5d8e6440847e78 SHA512 081017685626dff6e057ab4cb0aa8b67a0e6f6d44e4026363c16084c77bb859cf654c936921bc94a5c759373547debb827e5584b190bcc1160aac786f37814f7
+EBUILD commons-lang-3.14.0.ebuild 1120 BLAKE2B a7d07b12667f76c24f2bda932c98dec418d27859e2b14e0ae6a95b9cdc6397799bf381f28380da5affe8fb92fd16161577ebe6137d5fbe25de455fc9529466b0 SHA512 930882c78902b5138d35c3c8a540ca1d613982946345d37c221ae7c10a3bab13d1cdee8fcbe9fda3e7e3011a6b8cfb74b6941b69116fc4162c676c89e1264831
MISC metadata.xml 321 BLAKE2B f819853737f06392675eee2f97361ee693ab04e6f62c1c801c450d1da45a44ad598bc1837e366502bdccb68c94660c394bb74cd0a2bca07a6d86c9286e973e33 SHA512 a44dc189ce760a3d845652c3361d2eca847a2df71c64290ae71f830e28a5982a6da3145bb958c52bb75db9970182948c19b51a55888a2a888d3e56966cd788a1
diff --git a/dev-java/commons-lang/commons-lang-3.13.0.ebuild b/dev-java/commons-lang/commons-lang-3.13.0.ebuild
deleted file mode 100644
index ebcca6edf83b..000000000000
--- a/dev-java/commons-lang/commons-lang-3.13.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-lang3:3.13.0"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
-SRC_URI="https://archive.apache.org/dist/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz
- verify-sig? ( https://archive.apache.org/dist/commons/lang/source/${PN}3-${PV}-src.tar.gz.asc -> ${P}-sources.tar.gz.asc )"
-
-S="${WORKDIR}/${PN}3-${PV}-src"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.lang3"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-lang/commons-lang-3.14.0.ebuild b/dev-java/commons-lang/commons-lang-3.14.0.ebuild
index 51add8c5a5af..556c3414c385 100644
--- a/dev-java/commons-lang/commons-lang-3.14.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.14.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}3-${PV}-src"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 4fc98ab8c449..dcd776162786 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,7 +1,4 @@
DIST commons-net-3.10.0-src.tar.gz 450082 BLAKE2B 0df46b21ca298393500494e41d918b3fc6e700485c4d9dfb2bab61d8f834a4f44dd881c464c4008731deec9fc82ca36e0442022f0942b3e59e384a2b44329660 SHA512 d9d80255feddfb434d3baa629aa9e6d8feffd530c5e3172106fec55bbc986f6423a46dc9e737a1bb7020c62447229e6b83d0b7f9582d041e1def423536cc92dd
DIST commons-net-3.10.0-src.tar.gz.asc 488 BLAKE2B 31a15e952c55079e595f33be1730126b85c669b481c649e401cb4617a5489fc3e3025e8c172f8193b190b16fe55d9c78c171d16d4adf7fa1a8e71648e295bc77 SHA512 ab27b1fa2c02d79eff26f93697fafc54f22a7368db631bb6f7173b8702cda10836ac8b656df987135fe5c1d39a557840fefb0355d8d52f0e4815808d4938de18
-DIST commons-net-3.9.0-src.tar.gz 440911 BLAKE2B d7f24bff2e36d727bc12bf700b5a5ba9bf6b34a1d63cf892124b81ced113e4b66ebdb8b1eb54fbac33b76efcfc7333150c8d5ce87039cc7204ebf16bb64c8044 SHA512 a2d4ef4937701f28304fdb9a39a0d4a8fdd5fd7ae84c6d647a6b9e05eee68cb4fde8ae9eedd94f45fdc0194d160dd9f64b3c1cfbdd8bcea2214e9826ace32877
-DIST commons-net-3.9.0-src.tar.gz.asc 488 BLAKE2B 7999c63348fdb63de670cf1ace3c928796c663aa960494e0d4a398529b19c4834e9c3d2d8dbdb13e2ba392909e1761458c99332f35e39e0efb0f212b3c0f32de SHA512 72da1fe78bc6c0dea70d171c3c60c7eee8387bb28244f8b67bf38b66c3e7f2c183e4413c3f090a5b1a591ce64a6d43434093425f44c10a9dd03f0b354306e017
-EBUILD commons-net-3.10.0.ebuild 1194 BLAKE2B 930d2f662842a39697c4966dacdea13b037fe304a6b29598c46528d59e7724b17a27c86ca838204497f38fcac06a758d22cb38bebe8ca703730d874fd66a1570 SHA512 c728f9f8aea4bed5722dbf49c309959cbbc9f838045ff7fb3135e4f7c810dffce1888fdee2ba85924cb868ab9d74d4b436eb751cb7c72330afe30b8d4bf7ef37
-EBUILD commons-net-3.9.0.ebuild 1237 BLAKE2B acdec41840d80fb4b683c4abe1d6a0aa0d4999f0368581ad4c640d3c2e1bad2419e875a763f75bb304e26666c825329e4c7c1a935f1016c0d544bb37b05250d8 SHA512 4a0668603b4050c7f4dcfdf36af1bf09dd92e71a95e79385a0c38144bd960910a242567b5ed8ecbc36b39524a4c37f055fbf657c5af21e1fd046d054065b353f
+EBUILD commons-net-3.10.0.ebuild 1190 BLAKE2B e8834b035b2178ec880c79502cbd9606e851a131dd25cd030b2df82181e1e3ab90009179f94db532529110a99b45a64ebadc7c555f3faee21c3c736e17517137 SHA512 ee3d68e1bb51983f05884c93c479df4308da171ae295846475731c26bc970e563046d63f80b1abf78746747b6ade2d29cfb632ca496c8e2a9ce36133b99ddc61
MISC metadata.xml 393 BLAKE2B 344ccb7c8387f2d977c30219cefde70b31255c859898f243ecfde94643641474047299f2438a4067f70cd77ace99fb754ff6dfc2ccdedd2772081870f1444d8f SHA512 75b957e0f6a08377b402e23f49b081ed9add10ff7b3a5d9f52009d48ef4f8d49bb78f48310b93a579b29857562af2d5261f5b4fe4405edd566c1f320ec729046
diff --git a/dev-java/commons-net/commons-net-3.10.0.ebuild b/dev-java/commons-net/commons-net-3.10.0.ebuild
index d49ece23e44e..d4161a272d96 100644
--- a/dev-java/commons-net/commons-net-3.10.0.ebuild
+++ b/dev-java/commons-net/commons-net-3.10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/net/source/commons-net-${PV}-src.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/commons-net/commons-net-3.9.0.ebuild b/dev-java/commons-net/commons-net-3.9.0.ebuild
deleted file mode 100644
index fd0d7b728a57..000000000000
--- a/dev-java/commons-net/commons-net-3.9.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source"
-MAVEN_ID="commons-net:commons-net:3.9.0"
-# No tests, junit-jupiter and junit-vintage are not packaged.
-# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Client-oriented Java library to implement many Internet protocols"
-HOMEPAGE="https://commons.apache.org/proper/commons-net/"
-SRC_URI="mirror://apache/commons/net/source/commons-net-${PV}-src.tar.gz
- verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-
-DOCS=(
- CONTRIBUTING.md
- NOTICE.txt
- README.md
- RELEASE-NOTES.txt
-)
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.net"
-JAVA_ENCODING="iso-8859-1"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index 4898d4aa0ef5..eb1d752d1bbc 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,6 +1,4 @@
-DIST commons-validator-1.7-src.tar.gz 289870 BLAKE2B 576c6ac00187b67618eee251a69e7166cd817bb6184f4cf138a226539fc100a1a4e32ebc4ef6cea567aff581d11c63a817a9dad4836142de4d9a3b313d59a31b SHA512 4007872fda856e9e154f325270748081920d21a716143389713706ca0e5a8ec3c88b9b978d75801a5926723764a81f1dbfd77a8fd4b361b16cd65e84cf47a868
DIST commons-validator-1.8.0-src.tar.gz 291779 BLAKE2B 0a0a0f9019b39ff1899be2f65e5e6750e12ed7b6833cc7e03279b5bedd3b3c3e02561891ba8885b50c356d103dabe207bf18adf04d8e6ba627397c5b81656603 SHA512 f0c2662e5db0bbc6ee9d05d5508caa02bf45b7c7ada92f4a97a867848f3d704b35552d47859a46567705194248e7b88cd8df8f082939012ab60b6aed446e36b2
DIST commons-validator-1.8.0-src.tar.gz.asc 488 BLAKE2B 9e9b7f54f430c5a42de8af6d8c55a0f4029e3a41f0bc41efb08863a9470f0935ad23d6ba6757cf4d5e28c11626e15ae392807ae9c33529a3feb15b90a2316ca5 SHA512 f04709f64026560bfd2f5cc51ebf373d44359452f41af73b53d105059a6760786f49d89837c624cd133875de0a37358af1cf587a6db567e7cc76ce823efa9efd
-EBUILD commons-validator-1.7.ebuild 2118 BLAKE2B 2e202adb19e516314b96709e190e69bd0367905c4b9a9ef320010f37e8439bf01fa697e0bd52d5dbfd7e459ce2518c3a8fbb5f45f9be4f48fa7cf65784bd376d SHA512 6127dcee106e86a2e728090c6b0ffca675461836e4945fecfc2f25c983aff1868ea95cc7d0d90c75f0e6d4d720816137a30f491554c33f127531791914dcf137
-EBUILD commons-validator-1.8.0.ebuild 1084 BLAKE2B 3bd52d88ad80a22b31654fcd494fd421779af91209c6efd9f6084b0c40554e65089c1a59c0e8ac87103735bb731fd62629c06d2eef7d1668c4d6c11ab2ce541e SHA512 e149311c5dcb305d02a859dbe54aef8a01b823c4abb0ec19ba66dd800fc2837f10b49e39fd9f800bf64a29b76c736758b58d55270b9b8ad80ad2532b4fe0c9f5
+EBUILD commons-validator-1.8.0.ebuild 1081 BLAKE2B b60753a6906d088149945b2ef39e827b517c27845d6c93dd7a671d459337ed50fafbad604574b6d92d57a1f901215a9211a907f7c8b841ee1bc4db510ee2c006 SHA512 e79fc18a701f8b0c1ee28c8e957eee88c5b1496616825d0d1d2f9ed519ee1ab991da6eb8ea14fc6c33a2ee9170199063e244962383dd64cb8d03ecaadb92956c
MISC metadata.xml 508 BLAKE2B db7fbd47d5d298fae237b329ee2392cea87a62e6b6a85f67c5f761e0ab4f0690c3cf32a477110ab9b51708a20b69f889255d645e2a1eb0d58a9cbc6931c5186a SHA512 bb5fdb68a0e05ae4442dbfcac08edf01d44b513a91cdac6ab23e25fef9d8e9c3ae0b68d3417b752fc7b69219d946d227775d5a1ed0998ef72993db61a0a6399e
diff --git a/dev-java/commons-validator/commons-validator-1.7.ebuild b/dev-java/commons-validator/commons-validator-1.7.ebuild
deleted file mode 100644
index b71d4a85a4b9..000000000000
--- a/dev-java/commons-validator/commons-validator-1.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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://artfiles.org/apache.org//commons/validator/source/commons-validator-1.7-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-validator-1.7.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-validator:commons-validator:1.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Commons component to validate user input, or data input"
-HOMEPAGE="https://commons.apache.org/proper/commons-validator/"
-SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-beanutils:commons-beanutils:1.9.4 -> >=dev-java/commons-beanutils-1.9.4:1.7
-# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0
-# commons-digester:commons-digester:2.1 -> >=dev-java/commons-digester-2.1:2.1
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CDEPEND="
- dev-java/commons-beanutils:1.7
- dev-java/commons-digester:2.1
- dev-java/commons-logging:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
-# test? org.apache.commons:commons-csv:1.6 -> dev-java/commons-csv:0
-# test? org.bitstrings.test:junit-clptr:1.2.2 -> dev-java/junit-clptr:0
-#
-# restricting for compilation to jdk 1.8 just because of tests which
-# are not adjusted by upstream for jdk 11, otherwise the package works fine with jdk 11
-
-DEPEND="${CDEPEND}
- virtual/jdk:1.8
- test? (
- dev-java/commons-csv:0
- dev-java/junit-clptr:0
- )
-"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-digester-2.1,commons-logging"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-csv,junit-4,junit-clptr"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/commons-validator/commons-validator-1.8.0.ebuild b/dev-java/commons-validator/commons-validator-1.8.0.ebuild
index 293c25a82599..e92d0c4c8374 100644
--- a/dev-java/commons-validator/commons-validator-1.8.0.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.8.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
RESTRICT="test" #839681
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/failureaccess/Manifest b/dev-java/failureaccess/Manifest
deleted file mode 100644
index 4e3f7a6d0634..000000000000
--- a/dev-java/failureaccess/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST guava-32.1.3.tar.gz 5757923 BLAKE2B 6bba8f721399f3d346410f1d00f0f5d97e14e347cdcab70465b449c7d7226fc5d194c25f257029eca15d426ec23e5907632a526120387eb465b3132571855862 SHA512 8efd8072e0aafaa851e18a69af011cbaeba207a7ee2dbe2daee9f70729c1c785d054197e6bf032d30065245070088f9f2d7f1a01f244b00325a3ede9d00fb9ec
-EBUILD failureaccess-32.1.3.ebuild 682 BLAKE2B df28c0bf1938b689f4aaf70e015f7c88c80c09a307dec24562b5e300e339955b6f76369fa7bc08379f1c9ef609cdd4e55dc83c7254bc3f3350b05f7a2e2a666e SHA512 cdaa6af7bbc25b249451f74f702c112fba0cc36afe5573ca68d09c07627f323fdf12397586b24f83539042acbe5aa1a123384b8efc6afe0a6d90e5958e1c7b8e
-MISC metadata.xml 755 BLAKE2B af0cc772ea1dab11a52db3dad6ea865af7cfcda4189778c444810dc03162db63baa1a48379bc16b603669bbb7fbc7ed29db47fbefca65887cb8e05d9f1d87e03 SHA512 caeefc4d01c0e0864858fc7a2c50526df15c27a3ff39f3dd577e508d79893eba8c4849aa685ffcd35382b685b298e0626d44bddc62e960274c43e129abd70ece
diff --git a/dev-java/failureaccess/failureaccess-32.1.3.ebuild b/dev-java/failureaccess/failureaccess-32.1.3.ebuild
deleted file mode 100644
index 753445e72cb5..000000000000
--- a/dev-java/failureaccess/failureaccess-32.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=guava-${PV}
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.guava:failureaccess:1.0.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Guava's InternalFutureFailureAccess and InternalFutures classes."
-HOMEPAGE="https://github.com/google/guava/"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_SRC_DIR="futures/${PN}/src/com/google/common/util/concurrent/internal/"
diff --git a/dev-java/failureaccess/metadata.xml b/dev-java/failureaccess/metadata.xml
deleted file mode 100644
index 599c42537433..000000000000
--- a/dev-java/failureaccess/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <longdescription lang="en">
-Contains com.google.common.util.concurrent.internal.InternalFutureFailureAccess
-and InternalFutures. Most users will never need to use this artifact. Its
-classes are conceptually a part of Guava, but they're in this separate artifact
-so that Android libraries can use them without pulling in all of Guava (just as
-they can use ListenableFuture by depending on the listenablefuture artifact).
- </longdescription>
- <upstream>
- <remote-id type="github">google/guava</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest
deleted file mode 100644
index 13b34d383ec2..000000000000
--- a/dev-java/gnu-jaf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST activation-1.1.2.tar.gz 290644 BLAKE2B 15ec89a5c757bb134b9ec71e384a80dea5394b9b6463ca1fe44e2e622993fa8809231379b262b0a54595c32451a49ef508bea45ce82120138efe07d81939a817 SHA512 26534f7bb47daddf97b850ab74fc8ef2c5bd62d12cfb96e28e235071af7dcfc7761fa15f2d8f3a2d194f035665cef127812b7476af6cc81f6d6374f1fa725584
-EBUILD gnu-jaf-1.1.2-r1.ebuild 708 BLAKE2B a466fe4eafaf5298d4360ffea82bcb6b58cdc3fe545e2a9afa3a22f800bf2a19f401e0003b6e9de9a4b97b86384aa4c25d46cdb32b81efc5e54bb4fd47c3f0b7 SHA512 81dab6f13f54deea40497db67e1459abe57e371b6f9d7ffb8e0fd77fce422c5a5f7cb23f44949543830ed965941390df1900bd9745706f56b041e368fd58f8fb
-MISC metadata.xml 1073 BLAKE2B 34bda1c508acadfec823c9e621452efd7184f5b8b6491d85fce1c4286a983914511e8fe160afb09d71161a1564de0a6e6bcaa7fa85c3a74b65e7e72d117379c9 SHA512 ce26ee9c2e7eb00599548ac00130c7e3485c45f63d7dc040b69267a417d53f0a56fbd1a3d481d69bb26e3f332c8ff0fefac6cc4a0bbaf226f06fd712397e0dab
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
deleted file mode 100644
index 6835f9c1d704..000000000000
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
-HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html"
-SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="1"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/activation-${PV}"
-
-EANT_BUILD_TARGET="activation.jar"
-
-src_install() {
- java-pkg_dojar activation.jar
- einstalldocs
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc source/*
-}
diff --git a/dev-java/gnu-jaf/metadata.xml b/dev-java/gnu-jaf/metadata.xml
deleted file mode 100644
index ab2d72bd90a7..000000000000
--- a/dev-java/gnu-jaf/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
-
-<longdescription>
-GNU JAF is a framework for declaring what beans operate on what MIME
-type data. Content handler beans can be defined to handle particular
-MIME content. The JAF unites internet standards for declaring content
-with JavaBeansâ„¢.
-
-The JAF defines two mechanisms within the framework. The first, the
-file type map, specifies the MIME content type for a given file. The
-default implementation of this uses the UNIX mime.types format to map
-filename extensions to MIME types. The second mechanism, the command
-map, specifies the actions that can be applied to a given MIME content
-type. The default implementation of this uses the standard mailcap format
-to map actions to JavaBeanâ„¢ classes. These beans can then view, edit,
-print, or perform whatever other action is required on the underlying
-resource.
-</longdescription>
-
-</pkgmetadata>
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 5447e1d25bf2..3d6a5f5ac816 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,3 +1,3 @@
DIST icu-74.2.tar.gz 65888936 BLAKE2B 81d5acddbfc58a859906cb61660b6f230b88f4a1b1cfd56838843e9445b5858d3dd4888707026340581322143f6a4b7b81f53b6431fd5d4cc3fb90531c4d82fb SHA512 728ae0f09ffc802d675bcf5b849e3081472de8417736bf8b7df0f4db9d1fb8073779be76536764c9111f7cb0e5ab2d2af6c644cc24be432b9eeae9063802ad6c
-EBUILD icu4j-74.2.ebuild 5578 BLAKE2B e7182cde611fc7f916ee52c54e6e0dcd8caddcd5c64d19710ba13f55fad3aed9023fa465fe27ea7305361ac436a33ba711203c255ca9cf4091c0fd36e1834abc SHA512 76684f46c0cab2ced94491a35ca622a4e9022fc3777ba6dadb91de1651e80bed7a1db9c66eb1b51536dfbcd1e812ccafced81b02e1c8254e7d7042c29a365eef
+EBUILD icu4j-74.2-r1.ebuild 5578 BLAKE2B e7182cde611fc7f916ee52c54e6e0dcd8caddcd5c64d19710ba13f55fad3aed9023fa465fe27ea7305361ac436a33ba711203c255ca9cf4091c0fd36e1834abc SHA512 76684f46c0cab2ced94491a35ca622a4e9022fc3777ba6dadb91de1651e80bed7a1db9c66eb1b51536dfbcd1e812ccafced81b02e1c8254e7d7042c29a365eef
MISC metadata.xml 408 BLAKE2B 8d73c37540d7adce52f3f5b316d7c322bdbbacc3fd2dea5e361352bff8efb3ec2a5b49ca4e7b97d15e8c668e52fe32f90ec1972bae78b9b3b3354973d8fc992a SHA512 eb7df20108b1ebcbf5dd9edd72c2089df2c675028824b4c04976e35b4c306dd459a40aa45b0ac7da5392552657cd1dbaf2fb17b269f9d58110a6ac40dc377b0c
diff --git a/dev-java/icu4j/icu4j-74.2.ebuild b/dev-java/icu4j/icu4j-74.2-r1.ebuild
index df2c5aa4daba..df2c5aa4daba 100644
--- a/dev-java/icu4j/icu4j-74.2.ebuild
+++ b/dev-java/icu4j/icu4j-74.2-r1.ebuild
diff --git a/dev-java/iso-relax/Manifest b/dev-java/iso-relax/Manifest
index cac9301f0ba4..9ce1e69dddb8 100644
--- a/dev-java/iso-relax/Manifest
+++ b/dev-java/iso-relax/Manifest
@@ -1,3 +1,3 @@
DIST iso-relax-20050331.tar.bz2 696665 BLAKE2B 4f366818bed5e31fa8fc2f8759a38dddda26b8d379c4ba81ff3679228826890f7383606901440f51d958a2401943822bcb3a03bde9be1a647245563d58316526 SHA512 c327b461785ce647f9913afa6f5b77c41440e806d566884058be76e14a118d14fa305a1bc0157ee150b199b573e75af954311dc79eb8535599544f094526320a
-EBUILD iso-relax-20050331-r5.ebuild 695 BLAKE2B aa6ac6191ecc9a0be21c96ae573a8c4ebfd4ad23791a8d3afd31bfc1d04f5915a615772f270b4ddc3c44651a240c3c3d8c3e906d17112631854ab9b187b72205 SHA512 e13db9d5454dd9619bf74c0113497c15ef02f065a89bd38aaf7e917b6ffddcf8db925fee91f85d149394c21aa296915ce0e08762a75c4d2ada9744b75bd2742d
+EBUILD iso-relax-20050331-r6.ebuild 652 BLAKE2B fa5d90b3cb303c1347f751c75cf9382c1cfcb78787db7bb2d1619919b2b8b34b108fbd5ef9bec7a0a86bed76c7f35b568c66302431959659766c676ccbeb70a7 SHA512 09e50d63432cf5329e8963838e1543e779fb3f47ec6189a8d021bd948da2d68a6474a9ee6213a94a1694796bfaa465c362e7c5072f377639918f13e1c94da863
MISC metadata.xml 316 BLAKE2B 360a0a89a1c6cf082f7995e4ac740dda2e0197b5bdc1141f0cc2c21dbd7200ff46fa91897663cbb22777322cf49ea876300e792971d2654a9feb3009fca57b06 SHA512 d43cdc8324eca4c92128e04fede85cf82f03de72285ac294599beeee8809e228536a84ee917b18c24ed721e5063e8eb451154dc1eea217ee795d677aa8061745
diff --git a/dev-java/iso-relax/iso-relax-20050331-r5.ebuild b/dev-java/iso-relax/iso-relax-20050331-r6.ebuild
index e0990c5abb6d..6359c5cb8203 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r5.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -10,30 +10,20 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Interfaces useful for applications which support RELAX Core"
HOMEPAGE="http://www.xml.gr.jp/relax/"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}/${P}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-RESTRICT="test"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="
- ${CDEPEND}
+CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
+DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="ant-core"
+RDEPEND=">=virtual/jre-1.8:*"
JAVA_SRC_DIR="src"
src_prepare() {
- default
+ java-pkg-2_src_prepare
java-pkg_clean
}
diff --git a/dev-java/jakarta-xml-soap-api/Manifest b/dev-java/jakarta-xml-soap-api/Manifest
index e009b57a75db..1772631267f8 100644
--- a/dev-java/jakarta-xml-soap-api/Manifest
+++ b/dev-java/jakarta-xml-soap-api/Manifest
@@ -1,3 +1,4 @@
+AUX jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch 509 BLAKE2B 2418ef071dd9e63c3a9896357e59974c90471b8d57bbe1c97ef8e4dadaed5ed54516f192c5c9d901d94d4e86d9f897c8a53ff764f7b8cd4bac125deaf8d3ea6b SHA512 8955d5e63f02801afa714a7cfeab1b6bfbb157ed5d347a239c3e5b1592e01496f5dcfb83c02969be1e46539f02eaadd6d22be5e5c48254f6d0c93b3385871739
DIST jakarta-xml-soap-api-1.4.2.tar.gz 107226 BLAKE2B 4de5b994505d1964b6804010191b7b623322005d7bac6e9295062e821b5e0994a02d04f72d7f1bba9a8bf835ce42f455678af35c8cdf3e9e7208a2fde4151927 SHA512 9df8bb191fee0f6afa46f2d0c4bd5d1760324220be6862ff17df77d0dd4c9341360f18dd935233fdf6d9656d511c5378bd557e3dadd6570dfd3c9d7981179516
-EBUILD jakarta-xml-soap-api-1.4.2-r1.ebuild 1334 BLAKE2B 2ec9f622ebafe937540b106455afb9cd10e9fce01e687f9b8a61de22cd27d395e5d3f528de9bab64de82039dd8049c3f384b1325db94254e9d464ef39943b9b0 SHA512 4006bc79149a43f317538507e55ff5c81f6ed2d4ded3792d6327173c9e0ddb12a2aa8b22800e7ac6c22c72357511bbf90071a4a3272ce474b0e9947de296757d
+EBUILD jakarta-xml-soap-api-1.4.2-r2.ebuild 1379 BLAKE2B 9a9e3a0f68a5c2c9d0cde9717a4b9149c8c4fb93179b242873fb9100b30f219be3c2c715e43a7bd36e3301b3a0d36e784dfef64cc7d59f2e35663434b1c7ec1b SHA512 b216677433e4ce0f5d7db8fcace69642071231eb98eec03e0ea8fa308d0a5ef25fbfac3b8d317f04dd65fb7b9219f9498359dc1856e7d1f8565f71861ff3a070
MISC metadata.xml 320 BLAKE2B fd847b8fbad4684553ca9dc3132b0ebd523f9664cce8e635f38b3804c35c0aad29a331c117910210996fdb4eb309e1e9e2c9625aefec6bc1a36d113a768a0677 SHA512 7137cc73a561da78fa9ce53b07737636fc6144495ca67fac5b6e5a63d41e74bc45ffcc04b459d2018a744f78e5b0ab4f44e944f1ed9a1b672f2efd344f6b212e
diff --git a/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch b/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch
new file mode 100644
index 000000000000..a94489044d7f
--- /dev/null
+++ b/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch
@@ -0,0 +1,14 @@
+bug #923606
+--- a/api/src/test/java/javax/xml/soap/test/SAAJFactoryTest.java
++++ b/api/src/test/java/javax/xml/soap/test/SAAJFactoryTest.java
+@@ -165,9 +165,7 @@ public class SAAJFactoryTest {
+ }
+
+ private void enableSM() {
+- System.setSecurityManager(null);
+- System.setProperty("java.security.policy", classesDir + "javax/xml/soap/test.policy");
+- System.setSecurityManager(new SecurityManager());
++ // no-op
+ }
+
+ protected MessageFactory factory() throws Throwable {
diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild
index 3186460aa436..fc7c2c78bdec 100644
--- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)"
HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws"
SRC_URI="https://github.com/jakartaee/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/saaj-api-${PV}"
# EDL-1.0 equivalent to BSD
# - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers
@@ -35,7 +36,9 @@ RDEPEND="
${CP_DEPEND}
"
-S="${WORKDIR}/saaj-api-${PV}"
+PATCHES=(
+ "${FILESDIR}/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch"
+)
JAVA_SRC_DIR="api/src/main/java"
@@ -46,7 +49,7 @@ JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes )
DOCS=( CONTRIBUTING.md NOTICE.md README.md )
-src_install() {
- java-pkg-simple_src_install
- einstalldocs # https://bugs.gentoo.org/789582
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
}
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 493eee760e0b..c4ed53fc51d0 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,10 +1,8 @@
AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
DIST javacc-4.1.tar.gz 769476 BLAKE2B c2a22fa78ff4dcf1e36221a23ca1e3cd1eecb473a59ea94ce52e298673f6bd18c0ea0cf757dd68885696ebc8cc724d271c69c923a21ffa433d03c1062b1201ee SHA512 911e5e9f062561ade1748dcef3596e0f25c399c4d52dd174773783dadf24a4ceea8d3feab9ab08880370677959051d8557aed815d4c4184f5ecd5789ee8a5754
-DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
DIST javacc-7.0.13.tar.gz 3199783 BLAKE2B 7e3dddbe53a6e417a31bb7386d154c0e9589f17f88e652f5e146a4e344d72cd948d4d8e55fab753bb983e5d31971efc948c1ecdca4e875031bea3f8a38bfc082 SHA512 ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144
DIST javacc-7.0.4.tar.gz 2842349 BLAKE2B e5a2e24c99e5e3883270cf0e3931d7667e5b5b49a11c1d9b79b98767f74f4addf2dc7d3d620550bc1b5bb0bfbef8bf07af48a40d250d0902d97c8215f6cb8e01 SHA512 b93c93e8490aae9a26b0de948896ec6d7a044c205d09584c3908988e24a3ea63a1147365115b17a15c6fb311c44f53ddff7c11f092731cbd05d3ec1950ef57f1
-EBUILD javacc-4.1.ebuild 1478 BLAKE2B 0a6e3b429e290a4371dd7df43e00022849f64fe5ce5a213973a9870da7422a531f6fa64b21859b81fa96a9dd8a9a78ce5a50ab1f897e64a38604c42c185e33a4 SHA512 7e3fc6bdecd437bcb75b07d0d08061bada5482a5c309e21323d9522a0c5e157e4bf7be81bde6dbc8f6aeb99cc778de365076b514cab7a7f2d0ed906301d5b541
-EBUILD javacc-5.0-r5.ebuild 1433 BLAKE2B 275060ccbf5ac28d7ca810d304461ea387dd6e6698cc178804a6b580d12fc9ddeb105f6d6cf385cd0b968b472cecfbdf800d30147c311bf66122df8e49fdfa60 SHA512 920a971a51aedcbbf34885d89657e3032078d5d61bb329db53b16e80a8ea0a8087ba715238b2c0acabfd8b1bd56aeed4d3a2d28e973db44731548ccf51ae3125
+EBUILD javacc-4.1.ebuild 1474 BLAKE2B 284881056fa0908f182327bc15490b16b061e84692a6a0544c843b9a7ea4af69d0eaac5e776add2f4b0b3231cceff3c6ad75530c49a39f4017086de5b8c1c72d SHA512 c30a3ff8049735df79bed7af32265d1390f3ed089970ac56cc5e28d559345339cdcf7cf235a44aa640e2145359cc1bd9d8a6f23593b9d5715da2041aca74ea9d
EBUILD javacc-7.0.13.ebuild 1220 BLAKE2B db96859b4b4286354676f713e3e227014337883216b0a259316036751c7574898c84091012b4c0ddacf2898220f24f2153f208f23ca9924c83c7c30f6ba03922 SHA512 827944d3f19341646de4d3d50fd55ef3c9c484f8f50aaa1b5c4c0da11c870f650afa246fef21fdb7511cda2885a9bd12282e6eb75d37d20059fc05aff9076949
EBUILD javacc-7.0.4.ebuild 1383 BLAKE2B bbc45123fe870bc31b49f067880565a77e7f8035fb9060b218af683027748b07a771ebbfdb98acc256d9b7c70975609d50a7bd6546986c1ffe0fb5ae9615b438 SHA512 c12f855604a816da3844451a210d0f223e02dcba528ddaf21886730f47f41ff8f76b39ee4a365b6038d29e6f309471ab5391e60fa808bd7fc4918dc130a38f70
MISC metadata.xml 308 BLAKE2B 421dc38149fa3d88a66071836b7b00e6218c44f3111bf9e99b3f35f5e6ae3e550290d03b9f4ac960828484c8993b1ae5fe5ba6b4b73e172ddf905127df96eb25 SHA512 d365ba4454a45f49ceadbb4f1700ca58de8b9e0715f02056cbff899507fe39bd64e5d388245d0458ec5be9a30f134a4bcc2d8e678745f0b79502741ae30aeaa0
diff --git a/dev-java/javacc/javacc-4.1.ebuild b/dev-java/javacc/javacc-4.1.ebuild
index 617899a0dcfd..f74f36d4eb2f 100644
--- a/dev-java/javacc/javacc-4.1.ebuild
+++ b/dev-java/javacc/javacc-4.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/javacc-release_${PV//./}"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="dev-java/junit:0"
diff --git a/dev-java/javacc/javacc-5.0-r5.ebuild b/dev-java/javacc/javacc-5.0-r5.ebuild
deleted file mode 100644
index 6df77f9fca66..000000000000
--- a/dev-java/javacc/javacc-5.0-r5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.github.io/javacc/"
-SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-CDEPEND="dev-java/junit:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*
- test? ( >=dev-java/ant-1.10.14:0[junit] )"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0-javadoc.patch
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_GENTOO_CLASSPATH="junit"
-
-src_prepare() {
- default #780585
-
- rm -v lib/junit*/*.jar || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar "bin/lib/${PN}.jar"
-
- if use doc; then
- java-pkg_dohtml -r www/*
- java-pkg_dojavadoc doc/api
- fi
-
- use examples && java-pkg_doexamples examples
- use source && java-pkg_dosrc src/*
-
- echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc || die
- doenvd "${T}"/22javacc
-
- echo "export VERSION=${PV}" > "${T}"/pre || die
-
- local launcher
- for launcher in javacc jjdoc jjtree; do
- java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
- done
-
- einstalldocs
-}
diff --git a/dev-java/jimfs/Manifest b/dev-java/jimfs/Manifest
new file mode 100644
index 000000000000..b0013767171a
--- /dev/null
+++ b/dev-java/jimfs/Manifest
@@ -0,0 +1,4 @@
+DIST jimfs-1.3.0.tar.gz 157568 BLAKE2B 1febcf132c162ebb87ec9507bc12e05d6a9354195f36b0e198fd50faa22284608adafd1989a79390271ced4c063dda44c477fc7ae051c32960afca0f4f2ee2b7 SHA512 1c769ba74d45de1656fd30bd695b61caaa5ec9bd6c6e051310d371012fa6c746d0b2ba85d3f94490ebfb9f74ca75f173b879144673f8e3af8fde1a132725490d
+DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
+EBUILD jimfs-1.3.0.ebuild 1997 BLAKE2B b5eb1d98af5245264dc3da6e5839912862c8087e388ecdf4704e1a5a7069617ecf5ff8b6a00cbbaa4be49c0096eb83c6345cebfc776429c496d2fe4602a5191f SHA512 5801759d563540ce46d530c5c9670150012db819ba8ded63e37532477ffec23cafa399a124b4b347f0c71c91fa05eeceb2f05b35e0f1e3cdabcb967d62b44df7
+MISC metadata.xml 294 BLAKE2B b4e7177f998885c88f01ee2db55848f9a31454a2f9e774a251d1722a9a82cecff72d1ff88e4ff697e37bdbea15f37840d023d86c53dff8320fd0d497d021dfe8 SHA512 d81c97c39ba052c83d13ca477a4c6bd0d2811287471b2466b8aa1fe9f483228edfa95298ce732abf32b2cc38de66bf0f1f2503b6f78e7e53a8bbc9834da91a5e
diff --git a/dev-java/jimfs/jimfs-1.3.0.ebuild b/dev-java/jimfs/jimfs-1.3.0.ebuild
new file mode 100644
index 000000000000..777cf00cfa5c
--- /dev/null
+++ b/dev-java/jimfs/jimfs-1.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.jimfs:jimfs:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An in-memory file system for Java 7+"
+HOMEPAGE="https://github.com/google/jimfs"
+SRC_URI="https://github.com/google/jimfs/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+S="${WORKDIR}/${P}/jimfs"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+CP_DEPEND="
+ dev-java/auto-service-annotations:0
+ dev-java/error-prone-annotations:0
+ dev-java/guava:0
+ >=dev-java/icu4j-74.2-r1:0
+ dev-java/jsr305:0
+"
+
+DEPEND="${CP_DEPEND}
+ dev-java/checker-framework-qual:0
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/guava-testlib:0
+ )"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="checker-framework-qual"
+JAVA_AUTOMATIC_MODULE_NAME="com.google.common.jimfs"
+JAVA_RESOURCE_DIRS="src/main/res"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ mkdir -p src/main/res/META-INF/services || die
+ echo "com.google.common.jimfs.SystemJimfsFileSystemProvider" > \
+ src/main/res/META-INF/services/java.nio.file.spi.FileSystemProvider || die
+}
+
+src_test() {
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar"
+ # Using the defaults of java-pkg-simple would exclude
+ # several tests which are run by "mvn test".
+ pushd src/test/java > /dev/null || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "*Test.java" \
+ ! -name AbstractGlob*.java \
+ ! -name AbstractPathMatcherTest.java \
+ ! -name AbstractJimfsIntegrationTest.java \
+ ! -name AbstractAttributeProviderTest.java \
+ )
+ popd > /dev/null
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/ant-apache-bcel/metadata.xml b/dev-java/jimfs/metadata.xml
index 4221e170cbc0..e1353ba1e585 100644
--- a/dev-java/ant-apache-bcel/metadata.xml
+++ b/dev-java/jimfs/metadata.xml
@@ -3,6 +3,8 @@
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
- <name>Java</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">google/jimfs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index f9f5b4c6c886..9c8d72e41979 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1,6 +1,5 @@
AUX jtidy-1.0-build.xml.patch 998 BLAKE2B 7bd86d87699a784a918e102195e097d3b88bed791af9fd5df929b06609831749a65fb9c7d79aa4aaa86d87c6796872ef1fbc077844a3ec7e431970bc3a094d65 SHA512 18b5679c538aee7821456acd44342a03e79dbb4d5b65ec7f7103a4d2b883f3726f346804d6362e7775b7e2826ea0e002663bfc32c0282a431254bf199791cd9d
DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
-DIST jtidy-r938-sources.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
-EBUILD jtidy-1.0-r1.ebuild 1051 BLAKE2B 7c2dc7e113d109733f3f05d4160edd50155726019c063e249b137b539a2e9a4c5213cdb365f3470384b60e850f1ec923128802ea8b4cbc41379c7b483bf9812f SHA512 ad278e2e648fddea28eaed937ca5d64ab7864b521261f9d267b685b1e2fd08f9ea478d515d89f1a188e884bed9576511f1ce62b4386f2a117fe54ac766853512
-EBUILD jtidy-938.ebuild 737 BLAKE2B a6a2f7fb13e7d0f6f29bc2a0c67f13adb3e422ed1481ae22ff75720d4abae0add850c831e8859183d3c0a8a50ba4818f21dc8e829534689153b0f9eeae6994b1 SHA512 a3a4d602e8247d43050dd49d9565950891ee894fa16736358fe309fc56fc71f59329a9f2d20ca39bb5d3a32b26270c9529914dbb0355740752c61994550d3b62
+EBUILD jtidy-1.0-r1.ebuild 1051 BLAKE2B d78ac8d23e34f8e0b3398d18517ad8cca15fb7a503f4ff3ba729d2f376356da9ba1404899d18b5149c4cf66d1c5500f73b8d91984f0b1586c6951f67804e6a5e SHA512 fbf988d06410e3215bede2e621c701170ab0566eefcda2071da8c913c962a22c7479e718e2f297380c108cff1bf486f5f1ef94aa01b13c5214858e8009ce9e4b
+EBUILD jtidy-1.0-r2.ebuild 804 BLAKE2B 8ac85db819305821b561796a3754cd3361b4465117f32a09641b8f4176a27479a90c44420fb57d5d4e01f4883a51d38c5f6b819727bc1b46a0119595f6d36f00 SHA512 9be5d7952f5fa6b25558b7bc222a63973e862befb460e4ba2781e95e5b55e42cd9eae20f3761b95b23d1fdf5ea7f9b1bf505549762fd99dd92d841d63c4ae6bc
MISC metadata.xml 312 BLAKE2B 0cefe0ab92f9a89c5728c2d7ceb5079e2942590955ebed76105c11ca6e25064fa5d74ad968bdb922be16ef01348ad9e015e68d501c7da3ee6a807cf3821e5380 SHA512 2f68badf7c7d98f60ca73b9fe7e5b5b12168aaec72605ca780e2478ba49f73f460dc3f8a7b4c6d28e334aac3e3e99d76573c4fb8eb40d92619ccbea845947bdd
diff --git a/dev-java/jtidy/jtidy-1.0-r1.ebuild b/dev-java/jtidy/jtidy-1.0-r1.ebuild
index 7c227fdf5e9e..a8f58c01c6ed 100644
--- a/dev-java/jtidy/jtidy-1.0-r1.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-java/jtidy/jtidy-938.ebuild b/dev-java/jtidy/jtidy-1.0-r2.ebuild
index 63fdea8d2708..1e0c92a7ec53 100644
--- a/dev-java/jtidy/jtidy-938.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,21 +8,23 @@ MAVEN_ID="net.sf.jtidy:jtidy:r${PV}"
inherit java-pkg-2 java-pkg-simple
+MY_PV="r938"
+MY_P="${PN}-${MY_PV}"
+
DESCRIPTION="a Java port of HTML Tidy, a HTML syntax checker and pretty printer"
HOMEPAGE="https://sourceforge.net/projects/jtidy/"
-SRC_URI="https://master.dl.sourceforge.net/project/jtidy/JTidy/r${PV}/jtidy-r${PV}-sources.zip"
+SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
LICENSE="HTML-Tidy W3C"
-SLOT="9"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
BDEPEND="app-arch/unzip"
-CP_DEPEND="dev-java/ant-core:0"
-
+CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8 "
+ >=virtual/jdk-1.8:*"
RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8"
+ >=virtual/jre-1.8:*"
JAVA_MAIN_CLASS="org.w3c.tidy.Tidy"
JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 271ea08c961a..16d53653d5b5 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,10 +1,13 @@
AUX junit-4.13.2_p20240222-ignore-failing-test.patch 5184 BLAKE2B d846ac9599216bd9486a26082029dea6a1f1e252f8b023c3e553cc6586365a582b78e20d3a305b7d911ad6a9bd8206057f7ad617e18103c050dd19f46f6c7031 SHA512 bb1f1c13b128fd2a178d58be02b3cc206b030ea421815309dcca3dbed33e529733576e4db0ed5d44d1126ffd077bdad8b9b4cb96d980f8b42d394a32c90d50f6
DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1
+DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f
DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78
DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
+DIST junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd
EBUILD junit-3.8.2-r2.ebuild 789 BLAKE2B ee53cf9ac828f901606a89d814ab3f31d298d43aa9723d7e0d6fef6dcddc1bedd7ceb6187e0347d699c544b1afc0d91ab6ee85c817aeeedc0bea2e86c674126f SHA512 554bf808cf560b308de7cddd530115de136a839c5e7fd98ad7f4178f0014c60b8bc26e770837ecb6750c3a3a068d26dcf7aa913ffdce7b95efe2636cedb929a2
EBUILD junit-4.13.2-r1.ebuild 1372 BLAKE2B 1a355c8f614a9960caf4730bed58545b5ee7cc7d94ffe5f5331d1d4b22fb090ce6bed7565ad61c9086150835ccdff24ee17daf6b8da7cee41671c7631534b466 SHA512 81c8dec8a28df07f9e726bc81b28c9c9c4819e4c27cfd43cb4d24326f4f721baa25adaebc99a59fe1758be4f7fd0a0ff1efbf4fe13901a000780206b052ff474
EBUILD junit-4.13.2_p20240222.ebuild 1544 BLAKE2B bcd585a30d369b48358f32f65fa9926f1504a24386131e01f5a67cf4eb6c19f181eaa5216835a4a969f9c1416a4760e6d5c753c448d7f06365c8f97b494ba44d SHA512 ee171e4b3588ea585744067222bd52ba69a3ebc91f4a37d4c0dc41c623a6b2501f9573da8829dbd6d5f4620369c27491758990be78084e4f4d590db9b658c214
+EBUILD junit-5.10.2.ebuild 12387 BLAKE2B 33ca5767500e992f868291b3308d0c155fd019c881a86bfdaff299aa0bf7fbbbd7bd2aeaf45bafdd68f3703832b862a2f2f20e21b909fb0cdbab32498eae38d0 SHA512 bda6433359e55f78b6d08dc39e2513858ba7cc4d6c323b00eac0fc61c076b7515faad8428e10b46a53b4166ccf2744e139db124c433d7904586b2da8be8bec7c
EBUILD junit-5.9.2.ebuild 12008 BLAKE2B 1fa16dfc90e0e5327d6c0f0878b9fbcc82a7c5893e5bc6d02e8efb8e1eb7a0b58dba867ee4648bc45f47a27dcc72c3ae1fd38666f6196c610ee3129c820bad95 SHA512 96efdd8f81036253b3990aee756be23394611acf52101aee929e837648bfbbe3358e5d1d97985c45044690e2a98b32624dde122d9e46f264c6a154c654b67798
MISC metadata.xml 894 BLAKE2B d0f5c989f8a49dc923dfaf51a7d42d6fdc79a9c2cccd48cd31e687bcc5b7d7f25b15f1e7f91ebfe8f87cc15ce11b37c95e06dcf17611b03066f2b079efc6624b SHA512 7d40683565d1e4ff8ceb183fa26d8d6e3ae77dc1f7335a6ea452589f0f794bae8479a9e97c257a7d2332f3fa83b6721b334557944a4f0d6d064b66e0bcda9bd1
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
new file mode 100644
index 000000000000..6e794beca258
--- /dev/null
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Declare the 'doc' USE flag in IUSE -- not JAVA_PKG_IUSE -- to
+# prevent java-pkg-simple.eclass from handling Javadoc; instead,
+# let this ebuild handle Javadoc generation and installation itself.
+# This ebuild invokes java-pkg-simple.eclass's phase functions
+# multiple times to build multiple modules, but the eclass always
+# installs each module's Javadoc to the same directory, which would
+# trigger an error when the second module's Javadoc is installed.
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit5/"
+DEB="5.10.1-1"
+SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz
+ https://sources.debian.org/data/main/j/junit5/${DEB}/debian/patches/18-java-compatibility.patch \
+ -> junit5-java18-compatibility.patch"
+S="${WORKDIR}/junit5-r${PV}"
+
+LICENSE="EPL-2.0"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="doc migration-support suite vintage"
+
+CP_DEPEND="
+ dev-java/apiguardian-api:0
+ dev-java/opentest4j:0
+ dev-java/open-test-reporting-events:0
+ dev-java/picocli:0
+ dev-java/univocity-parsers:0
+"
+
+# java-utils-2.eclass does not support
+# USE-conditional dependencies in CP_DEPEND
+COND_DEPEND="
+ migration-support? ( dev-java/junit:4 )
+ vintage? ( dev-java/junit:4 )
+"
+
+# Limiting JDK version to >=11 for module-info.java in this package
+# https://bugs.gentoo.org/796875#c3
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}
+ ${COND_DEPEND}
+ test? ( dev-java/jimfs:0 )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+ ${COND_DEPEND}
+"
+
+PATCHES=(
+ "${DISTDIR}/junit5-java18-compatibility.patch"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+}
+
+src_configure() {
+ # Please make sure to declare a module's dependencies before the module itself.
+ # Useful upstream documentation regarding modules and dependencies:
+ # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-metadata
+ # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-diagram
+ JUNIT5_MODULES=(
+ junit-platform-commons
+ junit-platform-engine
+ junit-platform-launcher
+ junit-platform-reporting
+ junit-platform-console # For launching tests from CLI;
+ # an eclass would need it to support running tests using JUnit 5
+
+ $(use suite && echo \
+ junit-platform-suite-api \
+ junit-platform-suite-commons \
+ junit-platform-suite-engine \
+ )
+
+ junit-jupiter-api
+ junit-jupiter-engine # For JUnit Jupiter tests -- the so-called
+ # "JUnit 5 tests", which cannot run on earlier JUnit versions
+ junit-jupiter-params # For parameterized tests; the junit-jupiter
+ # aggregator module includes it, so building it unconditionally
+ $(usev migration-support junit-jupiter-migrationsupport)
+
+ $(usev vintage junit-vintage-engine)
+
+ # Modules not included:
+ # - junit-bom: Has no sources; solely for helping Maven and Gradle
+ # projects that use JUnit 5 manage dependencies easier
+ # - junit-jupiter: Aggregator; does not have 'src/main/java'
+ # - junit-platform-console-standalone: Has no sources; solely used
+ # by the upstream to build a fat JAR that bundles everything, so
+ # users can use just this single JAR to run JUnit 5
+ # - junit-platform-jfr: For an experimental feature
+ # - junit-platform-runner: Deprecated
+ # - junit-platform-suite: Aggregator; does not have 'src/main/java'
+ # - junit-platform-testkit: Requires >=dev-java/assertj-core-3.14.0
+ )
+ local cp_packages=()
+ (use migration-support || use vintage) && cp_packages+=( junit-4 )
+ local save_IFS="${IFS}"
+ IFS=',' JAVA_GENTOO_CLASSPATH="${cp_packages[*]}"
+ IFS="${save_IFS}"
+
+ JUNIT5_VM_VERSION="$(java-config --get-env PROVIDES_VERSION)"
+}
+
+junit5_foreach_module() {
+ local module
+ for module in "${JUNIT5_MODULES[@]}"; do
+ junit5_module_do "${module}" "${@}"
+ done
+}
+
+junit5_module_do() {
+ local module="${1}"
+ # Invocation of the passed function will not be guarded by '|| die'.
+ # Like the case for multibuild_foreach_variant(), it is recommended
+ # that the passed function itself calls 'die'.
+ local func=( "${@:2}" )
+
+ einfo "Running '${func[@]}' for ${module} ..."
+ pushd "${module}" > /dev/null || die "Failed to enter directory '${module}'"
+
+ # Set up Java eclass variables that are
+ # supposed to be set in the ebuild global scope
+
+ local JAVA_JAR_FILENAME="${module}.jar"
+
+ local JAVA_SRC_DIR=(
+ src/main/java
+ src/module
+ )
+
+ local JAVA_RESOURCE_DIRS=()
+ local default_resource_dir="src/main/resources"
+ [[ -d "${default_resource_dir}" ]] &&
+ JAVA_RESOURCE_DIRS+=( "${default_resource_dir}" )
+
+ if [[ "${module}" == junit-platform-console ]]; then
+ local JAVA_MAIN_CLASS="org.junit.platform.console.ConsoleLauncher"
+ local JAVA_LAUNCHER_FILENAME="${module}"
+ fi
+
+ # Invoke the passed function
+ "${func[@]}"
+ local ret="${?}"
+
+ popd > /dev/null || die "Failed to leave directory '${module}'"
+ return "${ret}"
+}
+
+junit5_gen_cp() {
+ echo "$(java-pkg_getjars --build-only --with-dependencies \
+ "${JAVA_GENTOO_CLASSPATH}"):${JAVA_GENTOO_CLASSPATH_EXTRA}"
+}
+
+junit5_module_compile() {
+ if [[ "${module}" == junit-platform-console ]]; then
+ # Unlike other modules that have a src/main/java9 directory, for this
+ # module, the upstream puts the class files built from src/main/java9
+ # in their JAR's top-level directory instead of META-INF/versions/9
+ cp -rv src/main/java9/* src/main/java/ ||
+ die "Failed to merge ${module}'s sources for Java 9+"
+ # Remove for the [[ -d src/main/java9 ]] test
+ # during versioned directory handling
+ rm -rv src/main/java9 ||
+ die "Failed to remove ${module}'s Java 9+ source directory"
+ fi
+
+ java-pkg-simple_src_compile
+ local sources="sources.lst"
+ local classes="target/classes"
+
+ # Collect a list of all compiler input files for building Javadoc
+ local source
+ while read source; do
+ echo "${module}/${source}" >> "${all_sources}"
+ done < "${sources}" ||
+ die "Failed to add ${module}'s sources to Javadoc input list"
+
+ # Handle classes that will go into versioned directories. This will be
+ # no longer needed after https://bugs.gentoo.org/900433 is implemented.
+ local vm_ver
+ for vm_ver in 9 17; do
+ local versioned_src="src/main/java${vm_ver}"
+ if [[ -d "${versioned_src}" ]]; then
+ if ver_test "${JUNIT5_VM_VERSION}" -ge "${vm_ver}"; then
+ local versioned_classes="target/${vm_ver}/classes"
+ mkdir -p "${versioned_classes}" ||
+ die "Failed to create directory for ${module}'s Java ${vm_ver}+ classes"
+ ejavac -d "${versioned_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "${classes}:$(junit5_gen_cp)" ${JAVAC_ARGS} \
+ $(find "${versioned_src}" -type f -name '*.java')
+ "$(java-config --jar)" -uvf "${JAVA_JAR_FILENAME}" \
+ --release "${vm_ver}" -C "${versioned_classes}" . ||
+ die "Failed to add ${module}'s Java ${vm_ver}+ classes to JAR"
+ else
+ # Modules that may hit this branch as of 5.9.2:
+ # - junit-platform-console:
+ # src/main/java17/.../ConsoleUtils.java tries to use
+ # java.io.Console.charset() (available since Java 17) to get
+ # the default output charset. It is fine to not use this
+ # file, even if the built artifacts will be used on JRE 17+,
+ # as src/main/java/.../ConsoleUtils.java still gets the
+ # default from java.nio.charset.Charset.defaultCharset().
+ elog "JDK ${JUNIT5_VM_VERSION} used; skipping Java ${vm_ver}-dependent parts in ${module}"
+ fi
+ fi
+ done
+
+ # Add the current module's JAR to classpath
+ # for the module's reverse dependencies in this package
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":${S}/${module}/${JAVA_JAR_FILENAME}"
+}
+
+src_compile() {
+ local all_sources="${S}/all-sources.lst"
+ junit5_foreach_module junit5_module_compile
+
+ if use doc; then
+ einfo "Generating Javadoc for all modules ..."
+ local apidoc="target/api"
+ mkdir -p "${apidoc}" || die "Failed to create Javadoc directory"
+ ejavadoc -d "${apidoc}" \
+ -encoding "${JAVA_ENCODING}" -docencoding UTF-8 -charset UTF-8 \
+ -classpath "$(junit5_gen_cp)" ${JAVADOC_ARGS:- -quiet} \
+ -windowtitle "JUnit ${PV} API" \
+ "@${all_sources}"
+ fi
+}
+
+src_test() {
+ # Running the JUnit 5 modules' tests (located in each module's
+ # 'src/test/java') has a few obstacles:
+ # - Some test sources use text blocks -- a feature introduced in Java 15.
+ # A JDK at a lower version, e.g. 11, cannot compile them.
+ # - Some test classes depend on JUnit 5 modules that this ebuild does not
+ # include, like junit-platform-runner and junit-platform-testkit.
+ #
+ # Therefore, this ebuild uses a simpler approach to test the artifacts just
+ # built: it uses the artifacts to run tests in examples under the
+ # 'documentation/src' directory. The test coverage will not be impressive,
+ # but at least this approach verifies that the copy of JUnit 5 just built
+ # is capable of running some simple tests launched from CLI.
+
+ local JUNIT5_TEST_SRC_DIR="documentation/src/test/java"
+ local JUNIT5_TEST_RESOURCE_DIR="documentation/src/test/resources"
+ local JUNIT5_TEST_RM=(
+ $(usev !migration-support example/IgnoredTestsDemo.java)
+ $(use !suite && echo \
+ example/DocumentationTestSuite.java \
+ example/SuiteDemo.java \
+ )
+ $(usev !vintage example/JUnit4Tests.java)
+
+ # Need excluded module junit-platform-runner
+ example/JUnitPlatformClassDemo.java
+ example/JUnitPlatformSuiteDemo.java
+
+ # Need excluded module junit-platform-testkit
+ example/testkit/
+
+ # Not necessary for the tests; some files even require extra dependency
+ org/junit/api/tools/
+
+ # Needs dev-java/hamcrest; no need to pull in extra dependency
+ # as the examples already provide ample tests to run
+ example/HamcrestAssertionsDemo.java
+
+ # Makes an HTTP request and expects a certain response
+ example/session/HttpTests.java
+ )
+
+ pushd "${JUNIT5_TEST_SRC_DIR}" > /dev/null ||
+ die "Failed to enter test source directory"
+ rm -rv "${JUNIT5_TEST_RM[@]}" ||
+ die "Failed to remove unneeded test sources"
+ # Test sources expect the working directory to be 'documentation'
+ sed -i -e "s|src/test/resources|${JUNIT5_TEST_RESOURCE_DIR}|g" \
+ example/ParameterizedTestDemo.java ||
+ die "Failed to update file paths in test sources"
+ popd > /dev/null || die "Failed to leave test source directory"
+
+ local test_dir="${T}/junit5_src_test"
+ local example_classes="${test_dir}/classes"
+ local test_classes="${test_dir}/test-classes"
+ mkdir -p "${example_classes}" "${test_classes}" ||
+ die "Failed to create test directories"
+
+ local example_sources="${test_dir}/sources.lst"
+ local test_sources="${test_dir}/test-sources.lst"
+ find documentation/src/main/java -type f -name '*.java' > "${example_sources}" ||
+ die "Failed to get a list of example sources"
+ find documentation/src/test/java -type f -name '*.java' > "${test_sources}" ||
+ die "Failed to get a list of test sources"
+
+ ejavac -d "${example_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "$(junit5_gen_cp)" ${JAVAC_ARGS} \
+ "@${example_sources}"
+
+ local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)"
+ test_cp="${test_cp}:$(java-pkg_getjars --build-only --with-dependencies jimfs)"
+ ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "${test_cp}" ${JAVAC_ARGS} \
+ "@${test_sources}"
+
+ set -- "$(java-config --java)" -classpath "${test_classes}:${test_cp}" \
+ org.junit.platform.console.ConsoleLauncher \
+ --disable-ansi-colors --fail-if-no-tests --scan-classpath \
+ --include-classname='^(Test.*|.+[.$]Test.*|.*Tests?|.*Demo)$' \
+ --exclude-tag="exclude"
+ echo "${@}" >&2
+ "${@}"
+ local status="${?}"
+ [[ "${status}" -eq 2 ]] && die "JUnit did not discover any tests"
+ [[ "${status}" -eq 0 ]] || die "ConsoleLauncher failed"
+}
+
+junit5_module_install() {
+ # It is OK to let java-pkg-simple_src_install call einstalldocs for
+ # each module as long as each documentation file being installed
+ # has a unique filename among _all_ modules; otherwise, some files
+ # would overwrite other ones.
+ if [[ -f README.md ]]; then
+ mv -v README.md "README-${module}.md" ||
+ die "Failed to rename ${module}'s README.md"
+ fi
+ java-pkg-simple_src_install
+}
+
+src_install() {
+ junit5_foreach_module junit5_module_install
+ einstalldocs # For project-global documentation
+
+ if use doc; then
+ einfo "Installing Javadoc for all modules ..."
+ local apidoc="target/api"
+ java-pkg_dojavadoc "${apidoc}"
+ fi
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index cabd0f74f6a2..7836ff026205 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -23,5 +23,5 @@ DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c
EBUILD openjdk-11.0.22_p7.ebuild 8864 BLAKE2B 36030166187064b860ae74f7a11b6ae147e3c43b4251ff4e4e8cdb0136baa0208f2ba825d12f8e9270b0b33dec7a420f51b9f6929561733b685e47a771554fc1 SHA512 7e44978bb48ce996b8603cb5297587c6c3264431bb540b5d7614f4447084464e9bb28460176dd504805d19271b4f4bab3c105c327c21765ebd1dce6968c00c31
EBUILD openjdk-17.0.10_p7.ebuild 9283 BLAKE2B fcdb81446a814cf213988b4278d3ca2d8e1f751754bd134e5e06f02a30ed9c1152a6b28f08064320f4134db9a1df819f23530eb75e5c339525d1c27320a58f3b SHA512 3b5293ccb458d564cd6dd54000edb397aba05c633b4d5ef47fe571d70570e7e4a08af67c76c492f314321ff2ca80775b551bfb3e3a52f8b09a8a6fd6a6863402
EBUILD openjdk-21.0.2_p13.ebuild 9251 BLAKE2B e7fd409656211864689d2040d738a45a132d5e3150fc8fa180d7957255aaac6cff2a44dfb87bbcf0f519791f39f09bb6788bbe730738c70778d5f22c85e9fa00 SHA512 73ff9f0d4034dee508403f2ffc1924294265465629a6c0d9c33c4e5df776a474c6a7fae19eb0b446e7861cb30fc24929970b718b3da69ecb446bac994bb22950
-EBUILD openjdk-8.402_p06-r1.ebuild 7737 BLAKE2B f54978bea72e47f5139c1c739386d8f96a30f65170798405dc2f28e175015b9409eebb0404aacad2993db1299bea68968a019e49c479c9b42968b9e254e4f55f SHA512 bdb7ff068ff1eebb4e484b9774cb2448b42ec411d0c47ce4a852db08dc2f5417c352561db3eb138066117208697e4492cd34711047ad555dccd2eacb87e64ed6
+EBUILD openjdk-8.402_p06-r2.ebuild 7765 BLAKE2B 5bb2c8a2b5dcb5ec3ea1e8f265b7a58fcc6208007fdaa3c28087295bb6de2c5d755b19b52fd0284d1882ddf7fcfd2c9e9fd9e2ee8ed11c28d887129cc12a1ffb SHA512 4d4b83283beca2015421ded2b4320052bed4e52fefb66c5d3a80b2bbff3f5ec669529c2775b3b98e8ee7ca3ed7d43afd5029958907be1f2109f6a29ce28d4a06
MISC metadata.xml 1549 BLAKE2B 5f7caf2330b7d8eb264df12fe6eebbf1e4acf91b04e37a4c6ea6c45101a39f2e84b4d40152d58c93e63a1d2d6fdb5649b096a314f7269d33ce72da263d392c90 SHA512 8fa15bf9544f2665a47185a3701c3a9ce1654ddedf1aebfb344f77f544a71a3bda33c2d4f3c1d5d65d7ea42b6c1f04a6e1dfaaae723c1a5fcaf63ec48d79f3de
diff --git a/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild b/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild
index 902c433e73dd..2b9037da0174 100644
--- a/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild
+++ b/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild
@@ -83,9 +83,11 @@ DEPEND="
x11-libs/libXrender
x11-libs/libXt
x11-libs/libXtst
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/openjdk:${SLOT}
+ system-bootstrap? (
+ || (
+ dev-java/openjdk-bin:${SLOT}
+ dev-java/openjdk:${SLOT}
+ )
)
"
diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index 40d0761d3fd9..f669e0ce75c4 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1,3 +1,3 @@
DIST plexus-classworlds-2.7.0.tar.gz 60221 BLAKE2B 8adbad24c057982dd3da6ce221175cf0b3e6585316de02434214d7d470b24220edaa94f4191cb2febfc4e3006a78cd3be5cc0f793438a5009ee20ef8c602768b SHA512 625d83c1a08a15e0d85984518eaec36bf001e562c49df4d5028e9fec1a9fdc69faa88066441da3cedd803fc20932fcaef9f2e924a485e0a0dcde60a600b32c7f
-EBUILD plexus-classworlds-2.7.0.ebuild 1514 BLAKE2B 0635a4156f91d8c23b996b4ab0c581783cd091d83b263e8e2e724a5979ad905c332072e8da451d885675d94a973d9670ea1cb00f1501f0744bf8d6ee553a2ece SHA512 34d0c6ad19d745b95e2b5e11db58475a72bf305d3338089c1ad7ce50cbd06285b5b2dd4dda78aecf231fed27405e1f92f0af20cfa5b6f2cc26c3deeccba180a1
+EBUILD plexus-classworlds-2.7.0-r1.ebuild 1517 BLAKE2B 7525c671f003f1b2a1f879b3d8aa5c7092b4321aa95f7f7c4d18e4372b281c47c8ae61a9e6a32056886a3d3e3fa16e792a122cc4f3d6962b7d4e02d4d264d9d0 SHA512 ac8e51c32ea3e5fb9c3c18a43e056afac40b7e2a1beaabd02768a39c12bfe0d64cc8d6f8c7021cd8105ab52f8c5d05413ff3bcec63f2de499ecf51e5c28eac31
MISC metadata.xml 336 BLAKE2B 8a6a080ce1eb0fb9a9adb254c3ae535954cff1dd74eac0c2ac469b75398425fa4b2dff2373c04df1cfb57f3234724fe520bbfb3b42e6a941dfd6d60ec9846caa SHA512 3dd3629ddf804686af7d70c202009b5a594ceb0d12efd5e96e2bf6732891c8000c41fea3e2aefaab3037cd81b3129d1fe81deaa3e01005a446a94b221f193e3b
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
index 5d46ae9f6f12..b61697448e9a 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
test? (
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0
dev-java/commons-logging:0
dev-java/xml-commons-external:1.4
)
@@ -41,7 +41,7 @@ src_test(){
# java.io.FileNotFoundException: target/test-lib/xml-apis-1.3.02.jar
mkdir -p target/test-lib || die
java-pkg_jar-from --into target/test-lib xml-commons-external-1.4 xml-commons-external.jar xml-apis-1.3.02.jar
- java-pkg_jar-from --into target/test-lib ant-core ant.jar ant-1.9.0.jar
+ java-pkg_jar-from --into target/test-lib ant ant.jar ant-1.9.0.jar
java-pkg_jar-from --into target/test-lib commons-logging commons-logging.jar commons-logging-1.0.3.jar
java-pkg-simple_src_test
}
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index cc53f586d638..bb6b01768a68 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,3 +1,3 @@
DIST rhino-1.7.14.tar.gz 4694660 BLAKE2B d6ba958265c4ebf881161d0b61f598ac7e82d7be4e6b0fbd6416e7b0af7835058a2744ab5524b6ff698159898e962cc246ac559e9c5db1b4467b147700e894e0 SHA512 f20e8a8f7c78c88d815c53f89f3f18a53c2e86d92a284cd275aa5556c08962d2905f2d4fc829e5cb61d416cd55b13323d9a110f4f492f588a149b4d2105b21a1
-EBUILD rhino-1.7.14.ebuild 3851 BLAKE2B 91be866b8bb6f7fcfe571ea236d9091fdfd503e1b70b785c83fe325eb3c541f4fd1d1e1c4851653c2a0bf5f31e647a1a7929bffb795fc35e6177c9f9e26c1f6a SHA512 b6998a1846346f92fd6b2515ebc2a3cdd30e2ad4989b26c3869c3056cf61a1e669acb39b0713d411a29c0563f938524ff0a44f6730a130b441c74f7614db00ae
+EBUILD rhino-1.7.14-r1.ebuild 3859 BLAKE2B f49af978d2e02d11b66a4ae7a2e05ac07582222b8de0bc041bd87609318842eb5b740e423454742d1e1ff996717f0d6aca88e5c3497bfa176ad7be829df651a3 SHA512 2760ccdfeb55637ff87ad0c348c500de31417d24c10be0f008a1c96adc8035afcbdd383020bbbcd9408bbb0e5fe77a062d22c9e0c514778fe14a37274be9242b
MISC metadata.xml 658 BLAKE2B 95a465da3522f815ddd5576c81bb54e9d8ce55da3ec055cd80568fd919227360a10d86e2134db02a4d5bb669a8f3c34c05f0bb879924a008ccaf7ebd2ccdf3ad SHA512 477809635ecc04713f8d9d5f00d17b298597555a30cc9d6aacd6353ae17c98de41d0f83596a004dc96859799948e9ca813a9825577c2869bc6279ccabf20ba51
diff --git a/dev-java/rhino/rhino-1.7.14.ebuild b/dev-java/rhino/rhino-1.7.14-r1.ebuild
index 0826d783bf62..8676a8e192ab 100644
--- a/dev-java/rhino/rhino-1.7.14.ebuild
+++ b/dev-java/rhino/rhino-1.7.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -30,7 +30,7 @@ RESTRICT="test"
DEPEND=">=virtual/jdk-1.8:*
test? (
- dev-java/ant-junit:0
+ >=dev-java/ant-1.10.14-r3:0[junit]
dev-java/emma:0
dev-java/jakarta-xml-soap-api:1
dev-java/jmh-core:0
@@ -50,7 +50,7 @@ JAVA_SRC_DIR=( "src" "toolsrc" "xmlimplsrc" )
JAVA_RESOURCE_DIRS="res"
JAVA_MAIN_CLASS="org.mozilla.javascript.tools.shell.Main"
-JAVA_TEST_GENTOO_CLASSPATH="ant-junit,emma,hamcrest-core-1.3,jakarta-xml-soap-api-1,jmh-core,junit-4,snakeyaml"
+JAVA_TEST_GENTOO_CLASSPATH="ant,emma,hamcrest-core-1.3,jakarta-xml-soap-api-1,jmh-core,junit-4,snakeyaml"
JAVA_TEST_SRC_DIRS="testsrc"
JAVA_TEST_RESOURCE_DIRS="testres"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 213f5b2fe650..e928213c3115 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,11 +1,8 @@
AUX tomcat-native-1.2.39-slibtool.patch 829 BLAKE2B 2af44125d0ac68f8fa23c4a48456646401608980775d2631f9b82c16b0596222b04ecafd2914d95fa01c6fc460de602a0028ef2d58f0a0d77c95d2c81a0145db SHA512 89bdb82f5cca2a32be8cfa4c72122d0e713eea099d081faa8ac5b4af8127a4d36913ec6a2c172511024b223f34fdfcc6c1d1550859a0e96d71820a6997efc078
-DIST tomcat-native-1.2.39-src.tar.gz 438209 BLAKE2B 499e2221be7a3aac47950530b044242dd308e943cdffd4af29d35121b60bd9b7040a404e8a70320cc853d41e4a06b41cad66a87d665e3692791299a0f16658f4 SHA512 b90c72255406f48552025a2e78dbd8c30a3492be2c283875c86a0b4a0f1f71b0420d4f91fb5ba181ef29d528824b2d5dfc63f51ee68e8d04fe6e67bd89e397f7
-DIST tomcat-native-1.2.39-src.tar.gz.asc 873 BLAKE2B 59976744119c03771b597d3d4f5d84a5a9e5feb81c0efe351e827b5e06e84c8adde8407ef4d27ec3b201763806e74804a51e9a209641c127328d44b79e22351e SHA512 78144c9ce5d5acc9d051b6d41fff2016d37062a11011ecad8ba52569c910efe5bcd5f177e576601ab4e7f7e53ce9dfe54f6a2c42cb87651ca5c2fedcf284eb21
DIST tomcat-native-1.3.0-src.tar.gz 345276 BLAKE2B 73e8433e12bdd88036509f4ffbd2c0ed25b367567728829a56918d082627d43643865c492f4bc8eac4551e2ed82648ada71e6decfb45c173a856ab2fda6e01a5 SHA512 5a6c7337280774525c97e36e24d7d278ba15edd63c66cec1b3e5ecdc472f8d0535e31eac83cf0bdc68810eb779e2a118d6b4f6238b509f69a71d037c905fa433
DIST tomcat-native-1.3.0-src.tar.gz.asc 833 BLAKE2B b7e05447643000ffda0d66143c199192b41843f10ae89874c353d613f612a6d481be3081aa971b640a3bedc6c903be7d052c418e2abc2d7d6db42924c7b3cf91 SHA512 9cfc137cd13086ccf421376a006164e6e6e14844636457db0cf7c0f699a1b1ceab28a52bd80da71dc9e190bdf84676abfdbe07a0cabecfc59b7845ac82a171e5
DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915b1ac5f28e34832edd0750117a5d6b00f9a7fa9e390858d23bfaeeb08ad825d7dcc1e95967c00d4ada96cac83377fca7bea6 SHA512 625b334271494f7c86c06d6a8c6d13c06d9d6094f65cccbdc8d3df13ee2aae4cb42ad326e20bcbf8a8f141240111778991882f9bf87793b09a2920433d6c8c85
DIST tomcat-native-2.0.7-src.tar.gz.asc 833 BLAKE2B 081f40de6fdc5ad819a167e0150a2e03ab8d4fd679be0dbabac9a9f2aabffd2fa36fd6a9c764deefd419576dcda07bc1b22ea2f14c04eddbfa7f94e4834bec7e SHA512 16a96a3c3b55d258ad0820c30392f37643f433c563b74a983109492569d06a399471acc42c7f07b87b50bff8711bc10ed278bfa183807bcdde1355e6b8058605
-EBUILD tomcat-native-1.2.39.ebuild 2225 BLAKE2B 052ce9606a78d102a4416a11d150e430be93fbfe0730846f62f84eb4dbcc4906c799f27ca96418bf9a72097089dac154839a3d7e094ac3dfbc02931208fd53bf SHA512 e375d17ee316fafabba5050d6253d02e75a7b4c583378f07edd6c6a0613b3f895db19d00bd4314f69fc52ef8a1af72b2fe98dd002a539b6f6e91497a7386a53a
-EBUILD tomcat-native-1.3.0.ebuild 2211 BLAKE2B e6710172518cca9f640a26e5fd472ff778ed8caebc6bad829ac3de73f8ef149041bbb732d4519c744b70d942f7693394ca2baf855037c18c949705e61517752f SHA512 0393dce7427863bf3fbc05a66005586dd8f4f42fd8ca7090bc640b52fced01ce4bb7060ad3fb70532dd525811eac9f666b6c62574aa9c2135ba552fbcd9247a6
+EBUILD tomcat-native-1.3.0.ebuild 2210 BLAKE2B 34fe48c4c0fca3aa6c7db823ca2fe2957bf6f664af78ed0107164bfae6eefb2db4697817cb8dc3d7c695573535d905362e32b858715041c0910c0b38db14846a SHA512 f26273200fc7b14db5c71fdf6ff20f19ed802355736bfbba067ab5a02247de93617a67ceed14350ddc62b43a84407144e8194aad7a464dd4cdae7c7e55a6c4e2
EBUILD tomcat-native-2.0.7.ebuild 1964 BLAKE2B 20268866489e1a85e741358b2fea72449b1acb35a00cfaccb8483d8025579450c61762ca4547616148dbdad89a14cfaf7c8457342f4748619cb7a07cb7670170 SHA512 dcca9bd56e243dd7c6d619b0dc2659ffe6d4a2a808e02af06799f5640e6a0fb54d16b01d7744b4d382659c67731dd8db7c7bdca849a1ee643fa19ad9235c8d73
MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
deleted file mode 100644
index e1e3cd36a857..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
- verify-sig? (
- https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
- )"
-S=${WORKDIR}/${P}-src/native
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs"
-
-DEPEND="
- >=virtual/jdk-1.8:*
-"
-RDEPEND="
- dev-libs/apr:1=
- dev-libs/openssl:0/3
- >=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-PATCHES=( "${FILESDIR}/tomcat-native-1.2.39-slibtool.patch" )
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
- mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
- sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
- ../build.xml \
- | sed "s:\${version}:${PV}:" \
- > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
- local myeconfargs=(
- --with-apr="${EPREFIX}"/usr/bin/apr-1-config
- --with-ssl="${EPREFIX}"/usr
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- default
-}
-
-src_test() {
- # Adjusting "String testFile =" path in TestFile.java:29 to match ${S}
- sed \
- -e '/String testFile =/s&test/&../test/&' \
- -i ../test/org/apache/tomcat/jni/TestFile.java || die
-
- JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_doso .libs/*.so*
- dodoc -r ../docs
- ! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "For more information, please visit"
- elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild
index a927ad1ef0ad..d560c27c933d 100644
--- a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
)"
S=${WORKDIR}/${P}-src/native
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="static-libs"