gentoo auto-resync : 23:01:2024 - 10:47:12

28 files changed, 1874 insertions, 57 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6dfe7174c5a9..ea05d17ca988 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 553a47f503ea..802d440a5863 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,5 @@
 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-core-1.10.14.ebuild 492 BLAKE2B efd3433d6ac8bc8cf80fb975011e41b4b211db0f7b74d99619ba05253501d0e45d2132f400ffb5abfb60c6c498b9820b629f05515eb08dcc04b4cb9af441c095 SHA512 6934e175b4ada6979a3410f7edb0522c35636882fe5b2ba77555c0717b777dbb596b00afea5b55854f82a9a09df83e8033fd1668329de07d55c21758c168a6fa
 EBUILD ant-core-1.10.9-r5.ebuild 4049 BLAKE2B 4bba71206ec27d44129187e60bb36023a7692e43e48a442a0e8ddfc2cf82bba6520ede091484429bf7cf80ad5fb16d4290bd12b6facad18749a387250fd8fa62 SHA512 e6d97d8b3b3147c40840a803e02bfdaf5a7119e4341fbad58a532ef9a14552b54dff10e523925d366329e3c15d723778d04b83313e24bf25423ba53921a5f537
 MISC metadata.xml 434 BLAKE2B f6e80b35f9e2744a724af5869f1c1ca894e2a5b1732ea39ab3025dff60928612df0a582f958df34402d365f32c14b452be62a07328df6e6b13f4de534936f8a0 SHA512 db54bd8fcf1763471b4fba7bc846f27b1049d85bf242fedf4428be1c1c91eab34c7686f26b7c730e795739e95bedea7174f3579871ecc94f5cae634dfaef68a7
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild b/dev-java/ant-core/ant-core-1.10.14.ebuild
new file mode 100644
index 000000000000..be672e0f7aa2
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="Compatibility link to ant-core for >=dev-java/ant-1.10.14"
+HOMEPAGE="https://ant.apache.org/"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DEPEND="
+	~dev-java/ant-${PV}:0
+	>=virtual/jdk-1.8:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_compile() { :; }
+
+src_install() {
+	java-pkg_regjar /usr/share/ant-core/lib/ant.jar
+}
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index d95aa7015f3e..12dd8d4c086e 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,2 +1,11 @@
+AUX 1.10.9-launch.patch 11661 BLAKE2B 89a6e01e2c6ed217ab4efaaa58659a228bcf23446fe6002ca06978ef4d951d906fbb792f704ceb33e4ecd84d7edb1e59f0e3d669d1aafe84c43a1acd1f3bd701 SHA512 f1a55cce03603d149eb2610affee0e6884b192e4d6c1bcac9f537e3e67e2eda51e4f5c53a98dd9b9c2c9a8bd65acf0a0c511dcb8f02856439caf4f1e96f0b62a
+AUX ant-1.10.14-AntTest.patch 1067 BLAKE2B ee6ec236c6298089c71cdfc642a82bf9ac2c55e91f0e3fb8f27827782a9c5b78a5691842f76242e66b9ad6530dbf30f066cf5f69244bb7dfe85c6e4f24c83fa0 SHA512 b1f6bc7e6e7e0c0c0d088fc651d3c4e7b2b6df102c2e1dc6875a9126ae1aea4297cb386a9b7b01ee3947c3027e33d7ee3e21641bfd697fee7b3cb1376d67cb9a
+AUX ant-1.10.14-AntlibTest.patch 2067 BLAKE2B d385e3032664fc37eae14dae6580c688521047350383e3ed950513ace427494e9f8439ef86b090ef88ac280df3db4dcbfb5b99cc69c8d60c14e9db60823a99d7 SHA512 a8c6070ec0036ea63162e3581166c9bf0e055cbaa9e50e8d381c54b0ded4880235a4a6830ad8113295e97553230762860c0c816c8d9bb0925acfce154ab0dd48
+AUX ant-1.10.14-JavaTest.patch 22828 BLAKE2B 407a601ed5eb9acec63642444cf9b763234b55bd669037c2561b0aa4f0caf09ff7c79a73af078c8ef67d817ce727edf17c2a15fb8a1f0384333f875227fc12e3 SHA512 d060205e9c51c5cd25f984bff3f50b8a9a2568ad39bcf575b8ff44e200b1d1fe13b0872214b16c4fc073dd08142b6d45b3535cc4a14f5f3fc418c6dea93d6f88
+AUX ant-1.10.14-LinkTest.patch 4329 BLAKE2B d4165d378dd63cab2a9d813c9d26c1ef7404f01ba7798f41062d0df633675fa341ed925e278d5230c9cc170f1f950ea6a86fcfe616bc94e8e66148b2ed6e6cf3 SHA512 271d9eaffa3f3f17411062bda4d71519db72bc66856058086778c79d2cb1eab6021bdddbd1c92ddb0207786617914b83dc3394aa9fdb789c6f5211500e445a50
+AUX ant-1.10.14-PathTest.patch 1114 BLAKE2B 870f35f250b4cd31317972c09f4a90eb26b71a8f198d1e96a085f99e0d6e41fd06c0598bcdae35c400aa8ba9b65e52b7dc0d7119308c60c8573a185907f2b7ba SHA512 9847fb3f6f3c2a37ac1e483ca7ac5685cc3d296b92ae35816fc4c58bb4de57d89196c50fabfa546efbec2303ea360066658507be0b4bdaeae3d5ff00e023f498
+DIST apache-ant-1.10.14-src.tar.gz 4692736 BLAKE2B b07a2e61fecd4f10056ca2688615ccf02c551bba0f5749f50c2be710e90306e8044b7c557359300654d93971d94520e92f593da44b1c20626db4701d499cddff SHA512 435f97a276d88a86022c5f0680f3c2a16dc36be95adac3d797a2609d96921840a57393c8f5ef8313193146115bd6a87bd4790a4a272c44f7beec892fd6528c10
+DIST apache-ant-1.10.14-src.tar.gz.asc 833 BLAKE2B d9a4b4b3cb22762f25b34651dc81c2f13af38e73fdca27bc2de562539cd8f1692744ac5ccf535a2c61d3035a129f30bafac133872f9ba0ed7b259393b0f4cdf6 SHA512 ff2e79c991f68a5c38c0b47556ca5f5301c1a8be219a9eddf8d2e17b09eed7f0426770c2dc18114ea432f0200ac824d71da633ad7881025692ce5ad4baa899ee
+EBUILD ant-1.10.14.ebuild 12334 BLAKE2B 33f2a5b1825df1c58cecb89567520c5d6fcb01d1bd4dd85e4183616705baf77bb3c5c1a331a0eee66f839ef7eb792cd8818df7e430f70f45a6250c254f8bbc49 SHA512 9077501818a92b8ed1c85bbe37a01ab0e9c1107fa3e99ff35c1d1fb8ddf4ecbab29e5fb8cb3ac4e4533fcd9b75c43c64cc33f3e60542adfe18f9b530b72f71f6
 EBUILD ant-1.10.9.ebuild 1586 BLAKE2B d88da0b36e9dfb92586b1701f2535a96c1ec9857db67ed7c8d148f24f609c784dedec1820ee4dd3d69910d37455f82e1dd7eb5f95dc5535c96312d052b9bd77c SHA512 9df6451a03b308dac45fa8d11ea18c5ff842ec6da245f39a2804b9788877cac2af65088d833787bf51406841703bc5f0823bdf037358cdc6f0be21c89df2aec4
-MISC metadata.xml 1746 BLAKE2B d4a06485314c1092e0eaf597b8eaa4f7049aed47f4ebeeeebfa8cd5310a79d2b3feb138ce15837ffbba138bb121ec2e394ab649af4d10ab8bcac42d1d79be2bf SHA512 085fe1fd5e9829dc25eda0f6ea102306beea978be27337d0dc00211c088d0639c7b6dc52a93c134adf948858a666c5b1da532c11866388782f898556703f54ec
+MISC metadata.xml 1871 BLAKE2B 506545257db2a93e15fa3c36105453c6efa3c6505dff98d558bea9434637676df7fbf8a4db6e9a6fe04a54c913ad012226ce5e7eb682a8732f140fd6f676c194 SHA512 807240f5312ffa9c7ae789697c4f2ef481ec8819bd800eaa83639129f5bff16ab7c7e80cbe07a57c171faf5efa439c3d45d8e26514418c32ca1764e2c4163b36
diff --git a/dev-java/ant/ant-1.10.14.ebuild b/dev-java/ant/ant-1.10.14.ebuild
new file mode 100644
index 000000000000..57167d57a761
--- /dev/null
+++ b/dev-java/ant/ant-1.10.14.ebuild
@@ -0,0 +1,369 @@
+# 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_PROVIDES="
+	org.apache.ant:ant:${PV}
+	org.apache.ant:ant-launcher:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig prefix
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+SRC_URI="mirror://apache/ant/source/apache-${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/ant/source/apache-${P}-src.tar.gz.asc )"
+S="${WORKDIR}/apache-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch junit junit4
+	junitlauncher log4j oro regexp resolver testutil xalan xz"
+
+# At least 10 test cases would fail without network
+PROPERTIES="test_network"
+RESTRICT="test"
+
+REQUIRED_USE="
+	junit4? ( junit )
+	test? ( bsf )
+	testutil? ( junit )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )"
+# jdk-11:* because it needs java/util/spi/ToolProvider, available since Java 9.
+DEPEND="
+	>=virtual/jdk-11:*
+	bcel? ( dev-java/bcel:0 )
+	bsf? ( dev-java/bsf:2.3 )
+	commonslogging? ( dev-java/commons-logging:0 )
+	commonsnet? ( dev-java/commons-net:0 )
+	jai? ( dev-java/sun-jai-bin:0 )
+	jakartamail? ( dev-java/jakarta-mail:0 )
+	javamail? ( dev-java/javax-mail:0 )
+	jdepend? ( >=dev-java/jdepend-2.10-r1:0 )
+	jsch? ( dev-java/jsch:0 )
+	junit4? ( dev-java/junit:4 )
+	junit? ( dev-java/junit:4 )
+	junitlauncher? ( dev-java/junit:5[vintage] )
+	log4j? ( dev-java/log4j-12-api:2 )
+	oro? ( dev-java/jakarta-oro:2.0 )
+	regexp? ( dev-java/jakarta-regexp:1.4 )
+	resolver? ( dev-java/xml-commons-resolver:0 )
+	test? (
+		dev-java/antunit:0
+		dev-java/bsf:2.3[javascript]
+		dev-java/bsh:0
+		dev-java/hamcrest-library:1.3
+		dev-java/xerces:2
+	)
+	xalan? (
+		dev-java/xalan:0
+		dev-java/xalan-serializer:0
+	)
+	xz? ( dev-java/xz-java:0 )
+"
+PDEPEND="~dev-java/ant-core-${PV}:0"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( CONTRIBUTORS INSTALL NOTICE README WHATSNEW )
+PATCHES=(
+	"${FILESDIR}/1.10.9-launch.patch"	# reusing this patch since the script has not changed
+	"${FILESDIR}/ant-1.10.14-AntlibTest.patch"	# skips  1 of  6 tests
+	"${FILESDIR}/ant-1.10.14-AntTest.patch"		# skips  1 of 32 tests
+	"${FILESDIR}/ant-1.10.14-JavaTest.patch"	# skips 12 of 38 tests
+	"${FILESDIR}/ant-1.10.14-LinkTest.patch"	# skips  4 of 67 tests
+	"${FILESDIR}/ant-1.10.14-PathTest.patch"	# skips  1 of 33 tests
+)
+
+JAVADOC_SRC_DIRS=(
+	ant
+	ant-launcher/src/main
+)
+JAVA_TEST_GENTOO_CLASSPATH="
+	bsh
+	hamcrest-library-1.3
+	junit-4
+	xerces-2
+"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/etc/testcases"
+	"src/main"
+)
+JAVA_TEST_SRC_DIR="src/tests/junit"
+
+# $1 ant-apache-bsf (source directory)
+# $2 bsf-2.3  (classpath of external dependency)
+taskdeps() {
+	if [[ ${task} == $1 ]]; then
+		JAVA_CLASSPATH_EXTRA="${2}"
+		JAVADOC_CLASSPATH+=" ${2}"
+		JAVADOC_SRC_DIRS+=( "${task}/src/main" )
+		JAVA_RESOURCE_DIRS="${3}"
+	fi
+}
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean ! -path "./src/etc/*" # keep test resources
+
+	eprefixify "src/script/ant"
+
+	ANT_TASKS=(
+		ant-antlr # no dependencies
+		$(use bcel && echo ant-apache-bcel)
+		$(use bsf && echo ant-apache-bsf) # REQUIRED_USE for tests
+		$(use log4j && echo ant-apache-log4j)
+		$(use oro && echo ant-apache-oro)	# ORO is retired - replace with java.util.regex?
+		$(use regexp && echo ant-apache-regexp)
+		$(use resolver && echo ant-apache-resolver)
+		$(use xalan && echo ant-apache-xalan2)
+		$(use commonslogging && echo ant-commons-logging)
+		$(use commonsnet && echo ant-commons-net)
+		ant-imageio	# no dependencies
+		$(use jai && echo ant-jai)
+		$(use jakartamail && echo ant-jakartamail)
+		$(use javamail && echo ant-javamail)
+		$(use jdepend && echo ant-jdepend)
+		ant-jmf	# no dependencies
+		$(use jsch && echo ant-jsch)
+		$(use junit && echo ant-junit)	# REQUIRED_USE for junit4 and for testutil
+		$(use junit4 && echo ant-junit4)
+		$(use junitlauncher && echo ant-junitlauncher)
+		# depends on "com.ibm.netrexx:netrexx:2.0.5" which is
+		# available on https://www.netrexx.org/downloads.nsp and states:
+		# "IBM's last NetRexx release, suitable for JVM versions 1.5 and below [...]"
+		# $(use netrexx && echo ant-netrexx) # src/etc/poms/ant-netrexx/pom.xml
+		ant-swing # no dependencies
+		$(use testutil && echo ant-testutil)
+		$(use xz && echo ant-xz)
+	)
+
+	# defaultManifest.mf
+	sed -e "s:\${project.version}:${PV}:" \
+		-i src/main/org/apache/tools/ant/defaultManifest.mf || die
+
+	# version.txt
+	local mydate="$(date '+%B %d %Y')"
+	echo "VERSION=${PV}" > src/main/org/apache/tools/ant/version.txt || die
+	echo "DATE=${mydate}" >> src/main/org/apache/tools/ant/version.txt || die
+
+	# src directory for ant.jar
+	mkdir ant || die "cannot create src directory for ant"
+	cp -r {src/main/,ant}/org || die "cannot copy ant sources"
+
+	# resources directory for ant.jar according to lines 317-325 src/etc/poms/ant/pom.xml
+	local INCLUDES=( $(
+		sed -n '/<resources>/,/<\/resources>/p' \
+			src/etc/poms/ant/pom.xml \
+		| grep org \
+		| sed -e 's:.*<include>\(.*\)</include>:\1:' || die
+	))
+	cp -r {src/,ant}/resources || die "cannot copy ant resources"
+	pushd src/main > /dev/null || die "pushd src/main"
+		cp --parents -v "${INCLUDES[@]}" ../../ant/resources || die "CANNOT"
+	popd > /dev/null || die "popd"
+
+	# Remove sources according to lines 158-187 src/etc/poms/ant/pom.xml
+	# We don't remove anything from src/main/org
+	local EXCLUDES=$(
+		sed -n '/<excludes>/,/<\/excludes/p' \
+			src/etc/poms/ant/pom.xml \
+		| grep org \
+		| sed -e 's:<exclude>\(.*\)</exclude>:ant/\1:' || die
+	)
+	rm -r ${EXCLUDES} || die
+	# Remove one more file directly, could not get it with sed.
+	rm ant/org/apache/tools/ant/taskdefs/optional/ANTLR.java || die
+
+	# Same handling for everything between <testExcludes> </testExcludes>
+	# Removing non-existing files is not possible: We ignore them ( grep -v ).
+	local TEST_EXCLUDES=$(
+		sed -n '/<testExcludes>/,/<\/testExcludes/p' \
+			src/etc/poms/ant/pom.xml \
+		| grep org \
+		| grep -v CommonsLoggingListener \
+		| grep -v Log4jListener \
+		| sed -e 's:<exclude>\(.*\)</exclude>:src/tests/junit/\1:' || die
+	)
+	rm -r ${TEST_EXCLUDES} || die
+
+	# Prepare a separate JAVA_SRC_DIR directory for each jar file to be created.
+	einfo "Copy source files of ant-tasks"
+	local task
+	for task in ant-launcher "${ANT_TASKS[@]}"; do
+		# "${task}/src/main" will be JAVA_SRC_DIR
+		mkdir -p "${task}/src/main" || die "mkdir ${task}"
+		# Read from pom.xml the file names which can still contain wildcards
+		local INCLUDES=( $(
+			sed -n '/<includes>/,/<\/includes>/p' "src/etc/poms/${task}/pom.xml" \
+			| grep org \
+			| sed -e 's:.*<include>\(.*\)</include>:\1:' || die
+		))
+		local sourcefile
+		# Resolve wildcards in file names using find and copy the files to the corresponding
+		# "${task}"/src/main directory
+	#	echo "${INCLUDES[@]}"
+		for sourcefile in "${INCLUDES[@]}"; do
+	#		einfo "${task}: ${sourcefile}"
+			# Parameter substitution % to remove trailing slash from ${sourcefile}.
+			# Applies to ant-jdepend and ant-junitlauncher where find would otherwise fail.
+			find  \
+				-path "./src/*/${sourcefile%/}" \
+				-exec cp -r --parents "{}" \
+				"${task}/src/main" \;
+		done
+	#	tree "${task}"
+	done
+
+	# JAVA_RESOURCE_DIRS for ant-junit
+	mkdir -p ant-junit/src/resources/org/apache/tools/ant/taskdefs/optional/junit/xsl \
+		|| die "junit resource dir"
+	cp src/etc/{junit-frames,junit-noframes,junit-frames-saxon,junit-noframes-saxon}.xsl \
+		ant-junit/src/resources/org/apache/tools/ant/taskdefs/optional/junit/xsl \
+		|| die "junit resources"
+}
+
+src_compile() {
+	einfo "Compiling ant-launcher.jar"
+	JAVA_JAR_FILENAME="ant-launcher.jar"
+	JAVA_MAIN_CLASS="org.apache.tools.ant.launch.Launcher"
+	JAVA_SRC_DIR="ant-launcher/src/main"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":ant-launcher.jar"
+	rm -r target || die
+
+	einfo "Compiling ant.jar"
+	JAVA_JAR_FILENAME="ant.jar"
+	JAVA_LAUNCHER_FILENAME="ant"
+	JAVA_MAIN_CLASS="org.apache.tools.ant.Main"
+	JAVA_RESOURCE_DIRS="ant/resources"
+	JAVA_SRC_DIR="ant"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":ant.jar"
+	rm -r target || die
+
+	local task
+	for task in "${ANT_TASKS[@]}"; do
+		einfo "Compiling ${task}"
+		JAVA_JAR_FILENAME="${task}.jar"
+		JAVA_MAIN_CLASS=""
+		JAVA_RESOURCE_DIRS=""
+		JAVA_SRC_DIR=""
+
+		JAVA_SRC_DIR="${task}/src/main"
+		taskdeps ant-apache-bcel bcel
+		taskdeps ant-apache-bsf bsf-2.3
+		taskdeps ant-apache-log4j log4j-12-api-2
+		taskdeps ant-apache-oro jakarta-oro-2.0
+		taskdeps ant-apache-regexp jakarta-regexp-1.4
+		taskdeps ant-apache-resolver xml-commons-resolver
+		taskdeps ant-apache-xalan2 xalan
+		taskdeps ant-commons-logging commons-logging
+		taskdeps ant-commons-net commons-net
+		taskdeps ant-jai sun-jai-bin
+		taskdeps ant-jakartamail jakarta-mail
+		taskdeps ant-javamail javax-mail
+		taskdeps ant-jdepend jdepend
+		taskdeps ant-jsch jsch
+		taskdeps ant-junit junit-4 ant-junit/src/resources
+		taskdeps ant-junit4 junit-4
+		taskdeps ant-junitlauncher junit-5
+		# $(use netrexx && echo ant-netrexx)
+		taskdeps ant-xz xz-java
+
+		java-pkg-simple_src_compile
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":${task}.jar"
+		rm -fr target || die
+	done
+	use doc && ejavadoc
+}
+
+src_test() {
+	# Avoid "--with-dependencies" as used by JAVA_TEST_GENTOO_CLASSPATH.
+	# dev-java/antunit has a circular dependency with dev-java/ant[test]
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only antunit)"
+	# according to line 115 src/etc/poms/ant/pom.xml
+	jar -cvf src/etc/testcases/org/apache/tools/ant/taskdefs/test2-antlib.jar \
+		-C src/etc/testcases taskdefs/test.antlib.xml || die "cannot test2-antlib.jar"
+
+	JAVA_TEST_EXCLUDES=(
+		# according to lines 1956-1964 build.xml (abstract classes, not testcases)
+		org.apache.tools.ant.taskdefs.TaskdefsTest
+		org.apache.tools.ant.BuildFileTest
+		org.apache.tools.ant.util.regexp.RegexpMatcherTest
+		org.apache.tools.ant.util.regexp.RegexpTest
+		org.apache.tools.ant.types.selectors.BaseSelectorTest
+		# according to line 1970 build.xml (helper classes, not testcases)
+		org.apache.tools.ant.TestHelper
+		# lines 2097-2102 build.xml (interactive tests)
+		org.apache.tools.ant.taskdefs.TestProcess			# 1. No runnable methods
+		# 1) testAll(org.apache.tools.ant.taskdefs.InitializeClassTest)
+		# /var/tmp/portage/dev-java/ant-1.10.14/work/apache-ant-1.10.14/
+		# src/etc/testcases/taskdefs/initializeclass.xml:24: Java returned: 1
+		# 	<pathelement path="${build.tests.value}"/>
+		# 	<pathelement location="${java.home}/lib/classes.zip"/>
+		org.apache.tools.ant.taskdefs.InitializeClassTest	# Tests run: 1,  Failures: 1
+	)
+
+#	tests with patches to be revisited
+#	JAVA_TEST_RUN_ONLY=(
+#		org.apache.tools.ant.taskdefs.AntlibTest			# Tests run: 6,  Failures: 1 test2-antlib.jar?
+#		org.apache.tools.ant.taskdefs.AntTest				# Tests run: 32,  Failures: 1
+#		org.apache.tools.ant.taskdefs.JavaTest				# Tests run: 38,  Failures: 12
+#		org.apache.tools.ant.taskdefs.modules.LinkTest		# Tests run: 67,  Failures: 4
+#		org.apache.tools.ant.types.PathTest					# Tests run: 33,  Failures: 1
+#	)
+
+	# according to lines 276-297 src/etc/poms/ant/pom.xml
+	JAVA_TEST_EXTRA_ARGS=(
+		-Dant.home="${ANT_HOME}"
+		-Dbuild.classes.value=../../../target/test-classes	# needed for org.apache.tools.ant.taskdefs.SignJarTest
+		-Dbuild.tests.value=target/test-classes
+		-Doffline=true
+		-Dant.test.basedir.ignore=true
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar ant.jar ant-launcher.jar
+
+	# Compatibility symlink, should be removed after transition period.
+	dosym -r /usr/share/ant{,-core}/lib/ant.jar
+
+	for task in "${ANT_TASKS[@]}"; do
+		java-pkg_dojar "${task}.jar"
+		java-pkg_register-ant-task --version "${PV}" "${task}"
+	done
+
+	dobin src/script/ant
+
+	dodir /usr/share/ant/bin
+	for each in antRun antRun.pl runant.pl runant.py ; do
+		dobin "${S}/src/script/${each}"
+	done
+
+	insinto /usr/share/ant/etc
+	doins -r src/etc/*.xsl
+	insinto /usr/share/ant/etc/checkstyle
+	doins -r src/etc/checkstyle/*.xsl
+
+	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+	doenvd "${T}/20ant"
+
+	einstalldocs
+	if use doc; then
+		java-pkg_dojavadoc target/api
+		docinto html
+		dodoc -r manual
+	fi
+
+	use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/ant/files/1.10.9-launch.patch b/dev-java/ant/files/1.10.9-launch.patch
new file mode 100644
index 000000000000..7babe6740fa9
--- /dev/null
+++ b/dev-java/ant/files/1.10.9-launch.patch
@@ -0,0 +1,361 @@
+diff --git a/src/script/ant b/src/script/ant
+index 81107b5..a501081 100644
+--- a/src/script/ant
++++ b/src/script/ant
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+ 
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+ # contributor license agreements.  See the NOTICE file distributed with
+@@ -15,6 +15,10 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
++#   Edited for Gentoo Linux
++
++EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
++
+ # Extract launch and ant arguments, (see details below).
+ ant_exec_args=
+ no_config=false
+@@ -83,9 +87,9 @@ if $no_config; then
+   usejikes=$use_jikes_default
+ else
+   # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set)
+-  if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
+-    if [ -f "/etc/ant.conf" ]; then
+-      . /etc/ant.conf
++  if [ -z "$ANT_HOME" -o "$ANT_HOME" = "${EPREFIX}/usr/share/ant" ]; then
++    if [ -f "${EPREFIX}/etc/ant.conf" ]; then
++      . "${EPREFIX}"/etc/ant.conf
+     fi
+   fi
+ 
+@@ -106,69 +110,23 @@ else
+   fi
+ fi
+ 
+-# Setup Java environment in rpm mode
+-if $rpm_mode; then
+-  if [ -f /usr/share/java-utils/java-functions ]; then
+-    . /usr/share/java-utils/java-functions
+-    set_jvm
+-    set_javacmd
+-  fi
+-fi
+-
+-# OS specific support.  $var _must_ be set to either true or false.
+-cygwin=false;
+-darwin=false;
+-mingw=false;
+-case "`uname`" in
+-  CYGWIN*)
+-    cygwin=true
+-    ;;
+-  Darwin*)
+-    darwin=true
+-    if [ -z "$JAVA_HOME" ]; then
+-      if [ -x '/usr/libexec/java_home' ]; then
+-        JAVA_HOME=`/usr/libexec/java_home`
+-      elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
+-        JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+-      fi
+-    fi
+-    ;;
+-  MINGW*)
+-    mingw=true
+-    ;;
+-esac
+-
+-if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ]; then
+-  ## resolve links - $0 may be a link to ant's home
+-  PRG="$0"
+-  progname=`basename "$0"`
+-
+-  # need this for relative symlinks
+-  while [ -h "$PRG" ]; do
+-    ls=`ls -ld "$PRG"`
+-    link=`expr "$ls" : '.*-> \(.*\)$'`
+-    if expr "$link" : '/.*' > /dev/null; then
+-      PRG="$link"
+-    else
+-      PRG=`dirname "$PRG"`"/$link"
+-    fi
+-  done
+-
+-  ANT_HOME=`dirname "$PRG"`/..
++export WANT_JAVA_CONFIG=2
+ 
+-  # make it fully qualified
+-  ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd`
++# Always get JAVA_HOME from java-config, unless ANT_RESPECT_JAVA_HOME is set
++# Use GENTOO_VM to change which VM is used instead.
++if [[ -z "${ANT_RESPECT_JAVA_HOME}" || -z "${JAVA_HOME}" ]]; then
++	export JAVA_HOME="$(java-config -g JAVA_HOME)"
+ fi
+ 
+-# For Cygwin and Mingw, ensure paths are in UNIX format before
+-# anything is touched
+-if $cygwin; then
+-  [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath --unix "$ANT_HOME"`
+-  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
++if [ -z $JAVA_HOME ] ; then
++  echo 'Error: No JDK found!'
++  echo "Try using java-config script to set your JDK"
++  echo "Remember that you need a JDK not a JRE"
++  exit 1
+ fi
+-if $mingw; then
+-  [ -n "$ANT_HOME" ] && ANT_HOME="`(cd "$ANT_HOME"; pwd)`"
+-  [ -n "$JAVA_HOME" ] && JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
++
++if [[ -z "${ANT_HOME}" ]] ; then
++	ANT_HOME="${EPREFIX}"/usr/share/ant
+ fi
+ 
+ # set ANT_LIB location
+@@ -176,14 +134,7 @@ ANT_LIB="${ANT_HOME}/lib"
+ 
+ if [ -z "$JAVACMD" ]; then
+   if [ -n "$JAVA_HOME" ]; then
+-    # IBM's JDK on AIX uses strange locations for the executables
+-    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+-      JAVACMD="$JAVA_HOME/jre/sh/java"
+-    elif [ -x "$JAVA_HOME/jre/bin/java" ]; then
+-      JAVACMD="$JAVA_HOME/jre/bin/java"
+-    else
+       JAVACMD="$JAVA_HOME/bin/java"
+-    fi
+   else
+     JAVACMD=`which java 2> /dev/null `
+     if [ -z "$JAVACMD" ]; then
+@@ -200,88 +151,61 @@ if [ ! -x "$JAVACMD" ]; then
+   exit 1
+ fi
+ 
+-# Build local classpath using just the launcher in non-rpm mode or
+-# use the Jpackage helper in rpm mode with basic and default jars
+-# specified in the ant.conf configuration. Because the launcher is
+-# used, libraries linked in ANT_HOME/lib will also be included, but this
+-# is discouraged as it is not java-version safe. A user should
+-# request optional jars and their dependencies via the OPT_JAR_LIST
+-# variable
+-if $rpm_mode && [ -x /usr/bin/build-classpath ]; then
+-  LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
+-
+-  # If no optional jars have been specified then build the default list
+-  if [ -z "$OPT_JAR_LIST" ]; then
+-    for file in /etc/ant.d/*; do
+-      if [ -f "$file" ]; then
+-        case "$file" in
+-          *~|*#*|*.rpmsave|*.rpmnew)
+-          ;;
+-          *)
+-            for dep in `cat "$file"`; do
+-              OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
+-            done
+-          ;;
+-        esac
+-      fi
+-    done
+-  fi
+-
+-  # If the user requested to try to add some other jars to the classpath
+-  if [ -n "$OPT_JAR_LIST" ]; then
+-    _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"
+-    if [ -n "$_OPTCLASSPATH" ]; then
+-      LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH"
+-    fi
+-  fi
+-
+-  # Explicitly add javac path to classpath, assume JAVA_HOME set
+-  # properly in rpm mode
+-  if [ -f "$JAVA_HOME/lib/tools.jar" ]; then
+-    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
+-  fi
+-  if [ -f "$JAVA_HOME/lib/classes.zip" ]; then
+-    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
+-  fi
++if [ -z "$LOCALCLASSPATH" ] ; then
++  LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
++else
++  LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
++fi
++
++# if ANT_TASKS is not set, default to "all"
++ANT_TASKS="${ANT_TASKS:-all}"
++
++# if ANT_TASKS is set to "all", get the tasks list from /usr/share/ant/tasks/
++if [[ "${ANT_TASKS}" == "all" ]]; then
++	ANT_TASKS=""
++	# but only if it exists
++	if [[ -d "${EPREFIX}"/usr/share/ant/tasks ]]; then
++		ANT_TASKS="${ANT_TASKS} ${EPREFIX}"/usr/share/ant/tasks/*
++	fi
++	if [[ -d "${EPREFIX}"/usr/share/ant/tasks-1.8.2 ]]; then
++		ANT_TASKS="${ANT_TASKS} ${EPREFIX}"/usr/share/ant/tasks-1.8.2/*
++	fi
++# if set to "none", make ANT_TASKS empty list
++elif [[ "${ANT_TASKS}" == "none" ]]; then
++	ANT_TASKS=""
++fi
++# otherwise ANT_TASKS defines explicit task list
++
++# construct the tasks list separated with commas to pass to java-config
++TASKS_LIST=""
++for task in $ANT_TASKS; do
++  TASKS_LIST="${TASKS_LIST},$(basename $task)"
++done
++TASKS_LIST=${TASKS_LIST#,}
+ 
+-  # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be
+-  # user CLASSPATH first and ant-found jars after.
+-  # In that case, the user CLASSPATH will override ant-found jars
+-  #
+-  # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
+-  # with ant-found jars first and user CLASSPATH after
+-  if [ -n "$CLASSPATH" ]; then
+-    # merge local and specified classpath
+-    if [ -z "$LOCALCLASSPATH" ]; then
+-      LOCALCLASSPATH="$CLASSPATH"
+-    elif [ -n "$CLASSPATH_OVERRIDE" ]; then
+-      LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
+-    else
+-      LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
+-    fi
++# get the classpath for optional tasks and their dependency .jar files
++if [[ -n "${TASKS_LIST}" ]] ; then
++  ANT_TASKS_CLASSPATH="-lib \"$(java-config -dp ${TASKS_LIST})\""
++  ANT_TASKS_LIBPATH="-Djava.library.path=\"$(java-config -di ${TASKS_LIST})\""
++else
++  ANT_TASKS_CLASSPATH=""
++  ANT_TASKS_LIBPATH=""
++fi
+ 
+-    # remove class path from launcher -cp option
+-    CLASSPATH=""
+-  fi
++# determine where to get tools.jar from
++if [[ -n "${ANT_RESPECT_JAVA_HOME}" ]]; then
++	TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
+ else
+-  # not using rpm_mode; use launcher to determine classpaths
+-  if [ -z "$LOCALCLASSPATH" ]; then
+-    LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
+-  else
+-    LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
+-  fi
++	TOOLS_JAR="$(java-config --tools)"
+ fi
+ 
+-if [ -n "$JAVA_HOME" ]; then
+-  # OSX hack to make Ant work with jikes
+-  if $darwin; then
+-    OSXHACK="${JAVA_HOME}/../Classes"
+-    if [ -d "${OSXHACK}" ]; then
+-      for i in "${OSXHACK}"/*.jar; do
+-        JIKESPATH="$JIKESPATH:$i"
+-      done
+-    fi
+-  fi
++if [[ -n "${TOOLS_JAR}" ]] ; then
++  LOCALCLASSPATH="$LOCALCLASSPATH:${TOOLS_JAR}"
++elif [[ $(java-config -f) != apple-jdk-bin* ]] ; then
++  echo "Warning: Unable to determine tools.jar location."
++  echo "  If build fails because sun.* classes could not be found,"
++  echo "  Make sure you are using a JDK, not JRE as your user/system VM."
++  echo "  and that you have java-config version 2.0.30 or above installed."
+ fi
+ 
+ # Allow Jikes support (off by default)
+@@ -289,29 +213,6 @@ if $usejikes; then
+   ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
+ fi
+ 
+-# For Cygwin, switch paths to appropriate format before running java
+-# For PATHs convert to unix format first, then to windows format to ensure
+-# both formats are supported. Probably this will fail on directories with ;
+-# in the name in the path. Let's assume that paths containing ; are more
+-# rare than windows style paths on cygwin.
+-if $cygwin; then
+-  if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null; then
+-    format=mixed
+-  else
+-    format=windows
+-  fi
+-  [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath --$format "$ANT_HOME"`
+-  ANT_LIB=`cygpath --$format "$ANT_LIB"`
+-  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
+-  LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
+-  LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
+-  if [ -n "$CLASSPATH" ]; then
+-    CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
+-    CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
+-  fi
+-  CYGHOME=`cygpath --$format "$HOME"`
+-fi
+-
+ # Show script help if requested
+ if $show_help; then
+   echo $0 '[script options] [options] [target [target2 [target3] ..]]'
+@@ -326,49 +227,20 @@ if $show_help; then
+   echo '                         launch script'
+   echo ''
+ fi
+-# add a second backslash to variables terminated by a backslash under cygwin
+-if $cygwin; then
+-  case "$ANT_HOME" in
+-    *\\ )
+-      ANT_HOME="$ANT_HOME\\"
+-    ;;
+-  esac
+-  case "$CYGHOME" in
+-    *\\ )
+-      CYGHOME="$CYGHOME\\"
+-    ;;
+-  esac
+-  case "$JIKESPATH" in
+-    *\\ )
+-      JIKESPATH="$JIKESPATH\\"
+-    ;;
+-  esac
+-  case "$LOCALCLASSPATH" in
+-    *\\ )
+-      LOCALCLASSPATH="$LOCALCLASSPATH\\"
+-    ;;
+-  esac
+-  case "$CLASSPATH" in
+-    *\\ )
+-      CLASSPATH="$CLASSPATH\\"
+-    ;;
+-  esac
+-fi
++
+ # Execute ant using eval/exec to preserve spaces in paths,
+ # java options, and ant args
+ ant_sys_opts=
+-if [ -n "$CYGHOME" ]; then
+-  if [ -n "$JIKESPATH" ]; then
+-    ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\""
+-  else
+-    ant_sys_opts="-Dcygwin.user.home=\"$CYGHOME\""
+-  fi
+-else
+-  if [ -n "$JIKESPATH" ]; then
+-    ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
+-  fi
++
++if [ -n "$JIKESPATH" ]; then
++	ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
+ fi
+-ant_exec_command="exec \"\$JAVACMD\" $ANT_OPTS -classpath \"\$LOCALCLASSPATH\" -Dant.home=\"\$ANT_HOME\" -Dant.library.dir=\"\$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"\$CLASSPATH\""
++
++ant_exec_command="exec \"${JAVACMD}\" ${ANT_OPTS} -classpath \"${LOCALCLASSPATH}\" \
++	-Dant.home=\"${ANT_HOME}\" -Dant.library.dir=\"${ANT_LIB}\" ${ant_sys_opts} \
++	${ANT_TASKS_LIBPATH} org.apache.tools.ant.launch.Launcher \
++	${ANT_TASKS_CLASSPATH} ${ANT_ARGS} -cp \"${CLASSPATH}\""
++
+ if $ant_exec_debug; then
+   # using printf to avoid echo line continuation and escape interpretation confusion
+   printf "%s\n" "$ant_exec_command $ant_exec_args"
diff --git a/dev-java/ant/files/ant-1.10.14-AntTest.patch b/dev-java/ant/files/ant-1.10.14-AntTest.patch
new file mode 100644
index 000000000000..2e2e7fe38d96
--- /dev/null
+++ b/dev-java/ant/files/ant-1.10.14-AntTest.patch
@@ -0,0 +1,28 @@
+There was 1 failure:
+1) testAntCoreLib(org.apache.tools.ant.taskdefs.AntTest)
+java.lang.AssertionError: found ant.core.lib in: /var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/target/test-classes
+        at org.junit.Assert.fail(Assert.java:89)
+        at org.junit.Assert.assertTrue(Assert.java:42)
+        at org.apache.tools.ant.taskdefs.AntTest.testAntCoreLib(AntTest.java:377)
+
+FAILURES!!!
+Tests run: 32,  Failures: 1
+--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
+@@ -33,6 +33,7 @@ import org.junit.After;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+ 
+ import static org.hamcrest.Matchers.containsString;
+ import static org.junit.Assert.assertEquals;
+@@ -369,7 +370,7 @@ public class AntTest {
+         assertEquals("dadctb", buildRule.getLog());
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testAntCoreLib() {
+         // Cf. #42263
+         buildRule.executeTarget("sub-show-ant.core.lib");
diff --git a/dev-java/ant/files/ant-1.10.14-AntlibTest.patch b/dev-java/ant/files/ant-1.10.14-AntlibTest.patch
new file mode 100644
index 000000000000..d45925272beb
--- /dev/null
+++ b/dev-java/ant/files/ant-1.10.14-AntlibTest.patch
@@ -0,0 +1,40 @@
+There was 1 failure:
+1) testAntlibResource(org.apache.tools.ant.taskdefs.AntlibTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/antlib.xml:43: Problem: failed to create task or type mytask2
+Cause: The name is undefined.
+Action: Check the spelling.
+Action: Check that any custom tasks/types have been declared.
+Action: Check that any <presetdef>/<macrodef> declarations have taken place.
+
+        at org.apache.tools.ant.UnknownElement.getNotFoundException(UnknownElement.java:506)
+        at org.apache.tools.ant.UnknownElement.makeObject(UnknownElement.java:438)
+        at org.apache.tools.ant.UnknownElement.maybeConfigure(UnknownElement.java:166)
+        at org.apache.tools.ant.Task.perform(Task.java:349)
+        at org.apache.tools.ant.Target.execute(Target.java:449)
+        at org.apache.tools.ant.Target.performTasks(Target.java:470)
+        at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+        at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+        at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+        at org.apache.tools.ant.taskdefs.AntlibTest.testAntlibResource(AntlibTest.java:67)
+
+FAILURES!!!
+Tests run: 6,  Failures: 1
+--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java
++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java
+@@ -24,6 +24,7 @@ import org.apache.tools.ant.Task;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertNotNull;
+@@ -61,7 +62,7 @@ public class AntlibTest {
+      * can collect several antlibs in one Definer call.
+      * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=24024">bug 24024</a>
+      */
+-    @Test
++    @Test @Ignore
+     public void testAntlibResource() {
+         assertNotNull("build.tests.value not set", System.getProperty("build.tests.value"));
+         buildRule.executeTarget("antlib.resource");
diff --git a/dev-java/ant/files/ant-1.10.14-JavaTest.patch b/dev-java/ant/files/ant-1.10.14-JavaTest.patch
new file mode 100644
index 000000000000..1c291c71e5f3
--- /dev/null
+++ b/dev-java/ant/files/ant-1.10.14-JavaTest.patch
@@ -0,0 +1,370 @@
+There were 12 failures:
+1) testExcepting(org.apache.tools.ant.taskdefs.JavaTest)
+java.lang.AssertionError: 
+Expected: a string containing "Exception raised inside called program"
+     but: was "Could not find org.apache.tools.ant.taskdefs.JavaTest$ExceptingEntryPoint. Make sure you have it in your classpath
+	at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:141)
+	at org.apache.tools.ant.taskdefs.Java.run(Java.java:892)
+	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:232)
+	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:136)
+	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:109)
+	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+	at org.apache.tools.ant.Task.perform(Task.java:350)
+	at org.apache.tools.ant.Target.execute(Target.java:449)
+	at org.apache.tools.ant.Target.performTasks(Target.java:470)
+	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+	at org.apache.tools.ant.taskdefs.JavaTest.testExcepting(JavaTest.java:246)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:61)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.rules.ExternalResource$1.evaluate(ExternalResource.java:54)
+	at org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:258)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runners.Suite.runChild(Suite.java:128)
+	at org.junit.runners.Suite.runChild(Suite.java:27)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
+	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:77)
+	at org.junit.runner.JUnitCore.main(JUnitCore.java:36)Java Result: -1"
+	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
+	at org.junit.Assert.assertThat(Assert.java:964)
+	at org.junit.Assert.assertThat(Assert.java:930)
+	at org.apache.tools.ant.taskdefs.JavaTest.testExcepting(JavaTest.java:247)
+2) testRedirect1(org.apache.tools.ant.taskdefs.JavaTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:244: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1046568457.out:
+"${redirect.out.contents}" expected "foo"
+	at org.apache.tools.ant.taskdefs.Exit.execute(Exit.java:162)
+	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+	at org.apache.tools.ant.Task.perform(Task.java:350)
+	at org.apache.tools.ant.Target.execute(Target.java:449)
+	at org.apache.tools.ant.Target.performTasks(Target.java:470)
+	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+	at org.apache.tools.ant.taskdefs.JavaTest.testRedirect1(JavaTest.java:331)
+3) testRedirect2(org.apache.tools.ant.taskdefs.JavaTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:244: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1723720155.out:
+"${redirect.out.contents}" expected "foo"
+	at org.apache.tools.ant.taskdefs.Exit.execute(Exit.java:162)
+	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+	at org.apache.tools.ant.Task.perform(Task.java:350)
+	at org.apache.tools.ant.Target.execute(Target.java:449)
+	at org.apache.tools.ant.Target.performTasks(Target.java:470)
+	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+	at org.apache.tools.ant.taskdefs.JavaTest.testRedirect2(JavaTest.java:336)
+4) testRedirect3(org.apache.tools.ant.taskdefs.JavaTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:324: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect325879668.out:
+"${redirect.out.contents}" expected "foo"
+	at org.apache.tools.ant.taskdefs.Exit.execute(Exit.java:162)
+	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+	at org.apache.tools.ant.Task.perform(Task.java:350)
+	at org.apache.tools.ant.Target.execute(Target.java:449)
+	at org.apache.tools.ant.Target.performTasks(Target.java:470)
+	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+	at org.apache.tools.ant.taskdefs.JavaTest.testRedirect3(JavaTest.java:341)
+5) testResultPropertyZero(org.apache.tools.ant.taskdefs.JavaTest)
+org.junit.ComparisonFailure: expected:<[0]> but was:<[1]>
+	at org.junit.Assert.assertEquals(Assert.java:117)
+	at org.junit.Assert.assertEquals(Assert.java:146)
+	at org.apache.tools.ant.taskdefs.JavaTest.testResultPropertyZero(JavaTest.java:273)
+6) testResultPropertyNonZero(org.apache.tools.ant.taskdefs.JavaTest)
+org.junit.ComparisonFailure: expected:<[2]> but was:<[1]>
+	at org.junit.Assert.assertEquals(Assert.java:117)
+	at org.junit.Assert.assertEquals(Assert.java:146)
+	at org.apache.tools.ant.taskdefs.JavaTest.testResultPropertyNonZero(JavaTest.java:279)
+7) testRunSuccessWithFailOnError(org.apache.tools.ant.taskdefs.JavaTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:205: Could not find org.apache.tools.ant.taskdefs.JavaTest$EntryPoint. Make sure you have it in your classpath
+	at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:141)
+	at org.apache.tools.ant.taskdefs.Java.run(Java.java:892)
+	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:232)
+	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:136)
+	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:109)
+	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+	at org.apache.tools.ant.Task.perform(Task.java:350)
+	at org.apache.tools.ant.Target.execute(Target.java:449)
+	at org.apache.tools.ant.Target.performTasks(Target.java:470)
+	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+	at org.apache.tools.ant.taskdefs.JavaTest.testRunSuccessWithFailOnError(JavaTest.java:306)
+8) testSpawn(org.apache.tools.ant.taskdefs.JavaTest)
+java.lang.AssertionError: log file exists
+	at org.junit.Assert.fail(Assert.java:89)
+	at org.junit.Assert.assertTrue(Assert.java:42)
+	at org.apache.tools.ant.taskdefs.JavaTest.testSpawn(JavaTest.java:326)
+9) testFlushedInput(org.apache.tools.ant.taskdefs.JavaTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:422: Java returned: 1
+	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:114)
+	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+	at org.apache.tools.ant.Task.perform(Task.java:350)
+	at org.apache.tools.ant.Target.execute(Target.java:449)
+	at org.apache.tools.ant.Target.performTasks(Target.java:470)
+	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+	at org.apache.tools.ant.taskdefs.JavaTest.testFlushedInput(JavaTest.java:430)
+10) testExceptingFoe(org.apache.tools.ant.taskdefs.JavaTest)
+java.lang.AssertionError: 
+Expected: (an instance of org.apache.tools.ant.BuildException and exception with message a string containing "Exception raised inside called program")
+     but: exception with message a string containing "Exception raised inside called program" message was "Could not find org.apache.tools.ant.taskdefs.JavaTest$ExceptingEntryPoint. Make sure you have it in your classpath"
+Stacktrace was: /var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:135: Could not find org.apache.tools.ant.taskdefs.JavaTest$ExceptingEntryPoint. Make sure you have it in your classpath
+	at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:141)
+	at org.apache.tools.ant.taskdefs.Java.run(Java.java:892)
+	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:232)
+	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:136)
+	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:109)
+	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+	at org.apache.tools.ant.Task.perform(Task.java:350)
+	at org.apache.tools.ant.Target.execute(Target.java:449)
+	at org.apache.tools.ant.Target.performTasks(Target.java:470)
+	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+	at org.apache.tools.ant.taskdefs.JavaTest.testExceptingFoe(JavaTest.java:260)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:61)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.rules.ExternalResource$1.evaluate(ExternalResource.java:54)
+	at org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:258)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runners.Suite.runChild(Suite.java:128)
+	at org.junit.runners.Suite.runChild(Suite.java:27)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
+	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:77)
+	at org.junit.runner.JUnitCore.main(JUnitCore.java:36)
+
+	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
+	at org.junit.Assert.assertThat(Assert.java:964)
+	at org.junit.Assert.assertThat(Assert.java:930)
+	at org.junit.rules.ExpectedException.handleException(ExpectedException.java:271)
+	at org.junit.rules.ExpectedException.access$000(ExpectedException.java:111)
+	at org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:260)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runners.Suite.runChild(Suite.java:128)
+	at org.junit.runners.Suite.runChild(Suite.java:27)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
+	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:77)
+	at org.junit.runner.JUnitCore.main(JUnitCore.java:36)
+11) testRedirector1(org.apache.tools.ant.taskdefs.JavaTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:353: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1692380328.out doesn't exist
+	at org.apache.tools.ant.taskdefs.LoadResource.execute(LoadResource.java:142)
+	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+	at org.apache.tools.ant.Task.perform(Task.java:350)
+	at org.apache.tools.ant.Target.execute(Target.java:449)
+	at org.apache.tools.ant.Target.performTasks(Target.java:470)
+	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+	at org.apache.tools.ant.taskdefs.JavaTest.testRedirector1(JavaTest.java:346)
+12) testRedirector2(org.apache.tools.ant.taskdefs.JavaTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:353: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1822175330.out doesn't exist
+	at org.apache.tools.ant.taskdefs.LoadResource.execute(LoadResource.java:142)
+	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+	at org.apache.tools.ant.Task.perform(Task.java:350)
+	at org.apache.tools.ant.Target.execute(Target.java:449)
+	at org.apache.tools.ant.Target.performTasks(Target.java:470)
+	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+	at org.apache.tools.ant.taskdefs.JavaTest.testRedirector2(JavaTest.java:351)
+
+FAILURES!!!
+Tests run: 38,  Failures: 12
+--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
+@@ -42,6 +42,7 @@ import org.junit.AssumptionViolatedException;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.rules.ExpectedException;
+ 
+ import static org.hamcrest.Matchers.containsString;
+@@ -241,7 +242,7 @@ public class JavaTest {
+         buildRule.executeTarget("testRunFailFoeFork");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testExcepting() {
+         buildRule.executeTarget("testExcepting");
+         assertThat(buildRule.getLog(), containsString("Exception raised inside called program"));
+@@ -253,7 +254,7 @@ public class JavaTest {
+         assertThat(buildRule.getLog(), containsString("Java Result:"));
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testExceptingFoe() {
+         thrown.expect(BuildException.class);
+         thrown.expectMessage("Exception raised inside called program");
+@@ -267,13 +268,13 @@ public class JavaTest {
+         buildRule.executeTarget("testExceptingFoeFork");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testResultPropertyZero() {
+         buildRule.executeTarget("testResultPropertyZero");
+         assertEquals("0", buildRule.getProject().getProperty("exitcode"));
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testResultPropertyNonZero() {
+         buildRule.executeTarget("testResultPropertyNonZero");
+         assertEquals("2", buildRule.getProject().getProperty("exitcode"));
+@@ -301,12 +302,12 @@ public class JavaTest {
+         buildRule.executeTarget("testRunFailWithFailOnError");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRunSuccessWithFailOnError() {
+         buildRule.executeTarget("testRunSuccessWithFailOnError");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testSpawn() throws InterruptedException {
+         File logFile = FILE_UTILS.createTempFile("spawn", "log",
+                 new File(buildRule.getProject().getProperty("output")), false, false);
+@@ -326,27 +327,27 @@ public class JavaTest {
+         assertTrue("log file exists", logFile.exists());
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRedirect1() {
+         buildRule.executeTarget("redirect1");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRedirect2() {
+         buildRule.executeTarget("redirect2");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRedirect3() {
+         buildRule.executeTarget("redirect3");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRedirector1() {
+         buildRule.executeTarget("redirector1");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRedirector2() {
+         buildRule.executeTarget("redirector2");
+     }
+@@ -397,7 +398,7 @@ public class JavaTest {
+         assertEquals("foo", buildRule.getProject().getProperty("input.value"));
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testFlushedInput() throws Exception {
+         final PipedOutputStream out = new PipedOutputStream();
+         final PipedInputStream in = new PipedInputStream(out);
diff --git a/dev-java/ant/files/ant-1.10.14-LinkTest.patch b/dev-java/ant/files/ant-1.10.14-LinkTest.patch
new file mode 100644
index 000000000000..23075707fb9b
--- /dev/null
+++ b/dev-java/ant/files/ant-1.10.14-LinkTest.patch
@@ -0,0 +1,87 @@
+There were 4 failures:
+1) testLocalesInAttributeAndNested(org.apache.tools.ant.taskdefs.modules.LinkTest)
+java.lang.AssertionError: Verifying that image has access to locales specified during linking. expected:<0> but was:<1>
+        at org.junit.Assert.fail(Assert.java:89)
+        at org.junit.Assert.failNotEquals(Assert.java:835)
+        at org.junit.Assert.assertEquals(Assert.java:647)
+        at org.apache.tools.ant.taskdefs.modules.LinkTest.verifyLocales(LinkTest.java:289)
+        at org.apache.tools.ant.taskdefs.modules.LinkTest.testLocalesInAttributeAndNested(LinkTest.java:330)
+2) testLocales(org.apache.tools.ant.taskdefs.modules.LinkTest)
+java.lang.AssertionError: Verifying that image has access to locales specified during linking. expected:<0> but was:<1>
+        at org.junit.Assert.fail(Assert.java:89)
+        at org.junit.Assert.failNotEquals(Assert.java:835)
+        at org.junit.Assert.assertEquals(Assert.java:647)
+        at org.apache.tools.ant.taskdefs.modules.LinkTest.verifyLocales(LinkTest.java:289)
+        at org.apache.tools.ant.taskdefs.modules.LinkTest.testLocales(LinkTest.java:306)
+3) testNestedLocales(org.apache.tools.ant.taskdefs.modules.LinkTest)
+java.lang.AssertionError: Verifying that image has access to locales specified during linking. expected:<0> but was:<1>
+        at org.junit.Assert.fail(Assert.java:89)
+        at org.junit.Assert.failNotEquals(Assert.java:835)
+        at org.junit.Assert.assertEquals(Assert.java:647)
+        at org.apache.tools.ant.taskdefs.modules.LinkTest.verifyLocales(LinkTest.java:289)
+        at org.apache.tools.ant.taskdefs.modules.LinkTest.testNestedLocales(LinkTest.java:315)
+4) testIgnoreSigning(org.apache.tools.ant.taskdefs.modules.LinkTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/link.xml:1119: exec returned: 1
+        at org.apache.tools.ant.taskdefs.ExecTask.runExecute(ExecTask.java:675)
+        at org.apache.tools.ant.taskdefs.ExecTask.runExec(ExecTask.java:699)
+        at org.apache.tools.ant.taskdefs.ExecTask.execute(ExecTask.java:527)
+        at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+        at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+        at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+        at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+        at org.apache.tools.ant.Task.perform(Task.java:350)
+        at org.apache.tools.ant.Target.execute(Target.java:449)
+        at org.apache.tools.ant.Target.performTasks(Target.java:470)
+        at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+        at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+        at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+        at org.apache.tools.ant.taskdefs.modules.LinkTest.testIgnoreSigning(LinkTest.java:901)
+
+FAILURES!!!
+Tests run: 67,  Failures: 4
+--- a/src/tests/junit/org/apache/tools/ant/taskdefs/modules/LinkTest.java
++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/modules/LinkTest.java
+@@ -46,6 +46,7 @@ import org.junit.Assume;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.rules.ExpectedException;
+ 
+ import org.apache.tools.ant.BuildException;
+@@ -297,7 +298,7 @@ public class LinkTest {
+             + "not specified during linking.", 0, exitCode);
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testLocales()
+     throws IOException,
+            InterruptedException {
+@@ -306,7 +307,7 @@ public class LinkTest {
+         verifyLocales();
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testNestedLocales()
+     throws IOException,
+            InterruptedException {
+@@ -321,7 +322,7 @@ public class LinkTest {
+         buildRule.executeTarget("locales-nested-missing-name");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testLocalesInAttributeAndNested()
+     throws IOException,
+            InterruptedException {
+@@ -896,7 +897,7 @@ public class LinkTest {
+             1, nonLinkCount);
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testIgnoreSigning() {
+         buildRule.executeTarget("ignoresigning");
+         verifyImageBuiltNormally();
diff --git a/dev-java/ant/files/ant-1.10.14-PathTest.patch b/dev-java/ant/files/ant-1.10.14-PathTest.patch
new file mode 100644
index 000000000000..022377ecc4d7
--- /dev/null
+++ b/dev-java/ant/files/ant-1.10.14-PathTest.patch
@@ -0,0 +1,30 @@
+There was 1 failure:
+1) testDirSet(org.apache.tools.ant.types.PathTest)
+java.lang.AssertionError: expected:<1> but was:<0>
+        at org.junit.Assert.fail(Assert.java:89)
+        at org.junit.Assert.failNotEquals(Assert.java:835)
+        at org.junit.Assert.assertEquals(Assert.java:647)
+        at org.junit.Assert.assertEquals(Assert.java:633)
+        at org.apache.tools.ant.types.PathTest.testDirSet(PathTest.java:585)
+
+FAILURES!!!
+Tests run: 33,  Failures: 1
+--- a/src/tests/junit/org/apache/tools/ant/types/PathTest.java
++++ b/src/tests/junit/org/apache/tools/ant/types/PathTest.java
+@@ -29,6 +29,7 @@ import org.apache.tools.ant.taskdefs.condition.Os;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.rules.ExpectedException;
+ 
+ import static org.hamcrest.Matchers.endsWith;
+@@ -570,7 +571,7 @@ public class PathTest {
+         assertEquals(project.resolveFile("build.xml").getAbsolutePath(), l[0]);
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testDirSet() {
+         DirSet d = new DirSet();
+         d.setProject(project);
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
index 927b0498a3da..fbae5fba582e 100644
--- a/dev-java/ant/metadata.xml
+++ b/dev-java/ant/metadata.xml
@@ -13,6 +13,7 @@
     <flag name="commonslogging">Enable commons-logging Ant tasks</flag>
     <flag name="commonsnet">Enable commons-net Ant tasks</flag>
     <flag name="jai">Enable JAI (Java Imaging) Ant task</flag>
+    <flag name="jakartamail">Enable Jakartamail Ant task</flag>
     <flag name="javamail">Enable JavaMail Ant task</flag>
     <flag name="jdepend">Enable Jdepend Ant tasks</flag>
     <flag name="jmf">Enable JMF (Java Media Framework) Ant tasks</flag>
@@ -26,6 +27,7 @@
     <flag name="resolver">Enable Apache Resolver Ant tasks</flag>
     <flag name="swing">Enable Swing Ant tasks</flag>
     <flag name="testutil">Enable optional test util classes</flag>
+    <flag name="xalan">Enable Apache Xalan2 Ant tasks</flag>
     <flag name="xz">Enable XZ Ant tasks</flag>
   </use>
   <upstream>
diff --git a/dev-java/antunit/Manifest b/dev-java/antunit/Manifest
index 6ed8cce72c62..313cbc9db568 100644
--- a/dev-java/antunit/Manifest
+++ b/dev-java/antunit/Manifest
@@ -1,5 +1,5 @@
-AUX antunit-1.4.1-AntUnitTest.patch 1551 BLAKE2B 3eef2af4de3719691dfb38314e5ca74000c68ea2194752acd0d5e2b3379f6ff82ab1693b7c605e545aa42c865ff57672ff3913fcbf2c13dbc948969eaf76fd0a SHA512 fca661ff94c53c35d55758df4eb815b655d3ff8ab5a5aa698324e877f024b5e9c7ffc3338f600b7926fb2bf5789edad684d3d7b8e739d505a4ff32b0ee28eea9
+AUX antunit-1.4.1-gentoo.patch 2994 BLAKE2B 186a5508a798728e1fa2bbee3eacacf6333d28f52792cf13434b1c52d8dde3c7ec22d7ee2a6a61deb6ae0c90119c099eda1d3a1d2728335a183dc454ce7afaf0 SHA512 831ac5a462465d8c0f00240073a7d5ac7cdd8ff40148341fd4e7bdbeca6f751b20e1793babb8252268cd7b26562504ea94e5c762d56e35e436e29fea18e7a0f1
 DIST apache-ant-antunit-1.4.1-src.tar.bz2 125017 BLAKE2B 2c092d22eaf716c52bd6c6ce43d1e33c1f599621ee383303c97553f9dc2d0708cf58420338184f8877cd2b0fc053c9742b04cd869583db7b2fc2dedfb4a2dddd SHA512 7c59f0e918f5ec8edbf10bdbcdca1c9bd2ba2a7b27ade69aa4ca92c0c058c434be517799ce795309c0f1c00726a1c77650101b0d1cbe189db5379b15d29ad305
 DIST apache-ant-antunit-1.4.1-src.tar.bz2.asc 224 BLAKE2B c56e3d8005b1a39e42b85fad3c542aa4dd894d9e6cc61a8ea34bce33a8fb3f56d142cb77372fd4d664d46427365d24078b7429480f689245eb31d771c525f90e SHA512 3ad2cca4240e2714d7c435828b3a3d3cbe1e57647400237ce2a96a714d877605199ccf54a2266ff35081ed9f3e23ca46306b30293c1981e55ccbbc61591ad760
-EBUILD antunit-1.4.1.ebuild 2084 BLAKE2B 64070674b02046c36080a02776edd9caa33645d019f8999a779269f6376bb6c4f2d98d2fe48d00bcf6beee616d10c8620f1b9aa96503fd016f391ed775afc6fd SHA512 451c3cd8279f003852e8a958c72ab0402259ebfea1a710f689f60b8a722bf9d1903f92b05ee257750cff5a09e3816215ca99642cee41722bd73cd8fe1a4cca1b
+EBUILD antunit-1.4.1-r1.ebuild 1581 BLAKE2B a67411bd7c8531fdfd348b814601d9c6ddfb7e90a6477823099ce39106847eddc1e0ae1f04b4a3463495c7d80bb0f2cf98e947f9026da1245136354ea9a135f4 SHA512 f720a435c65d464c253f153439cee3058cda79564bf7951b651768afabbdfd9e5b709ef8c75f609b40b45e63ba925d87d3db6b968253408aafdc0e4e6647ab41
 MISC metadata.xml 308 BLAKE2B 00785073a5aa0526b627017e78ce8919f900d9d7e1c32fa867234bab84b8adcaeb9db4e4732463b97425e69d0a8162ac0c3bf07ed7d07200ac44e4eeb22b52d5 SHA512 2ceea54bc7a6dbe1ac891fb7064068dc7622bee3bfe2d726d04a90cf0462aca38f378143e472bc1222df70289d1f1c193057981bfe51eb7cd610747e53a4e7d4
diff --git a/dev-java/antunit/antunit-1.4.1.ebuild b/dev-java/antunit/antunit-1.4.1-r1.ebuild
index 3439a7908dbe..4f346ef201ab 100644
--- a/dev-java/antunit/antunit-1.4.1.ebuild
+++ b/dev-java/antunit/antunit-1.4.1-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
@@ -17,53 +17,38 @@ S="${WORKDIR}/apache-ant-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )"
 # reset to ant-core:0 when ready
 CP_DEPEND="
-	dev-java/ant-core:0
+	>=dev-java/ant-1.10.14:0
 	dev-java/junit:4
 "
 DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-testutil:0
-	)
+	test? ( >=dev-java/ant-1.10.14:0[junit,testutil] )
 "
 RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
 DOCS=( NOTICE README WHATSNEW )
 HTML_DOCS=( README.html )
+PATCHES=(
+	# Some tests expect classes in "build" instead in "target" directory.
+	"${FILESDIR}/antunit-1.4.1-gentoo.patch"
+)
 
 JAVA_RESOURCE_DIRS="res"
 JAVA_SRC_DIR="src/main"
-
-JAVA_TEST_GENTOO_CLASSPATH="ant-testutil"
+JAVA_TEST_GENTOO_CLASSPATH="ant"
 JAVA_TEST_SRC_DIR="src/tests/junit"
 
 src_prepare() {
+	default #780585
 	java-pkg-2_src_prepare
+	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
 	mkdir -p "res/org/apache/ant/antunit" || die
 	cp {src/main,res}/org/apache/ant/antunit/antlib.xml || die
-
-	# Some tests expect classes in "build" instead in "target" directory.
-	sed -e 's:build\(/classes\):target\1:' \
-		-i src/etc/testcases/assert.xml \
-		-i src/tests/junit/org/apache/ant/antunit/AssertTest.java || die
-	sed -e 's:build\(/test-classes\):target\1:' \
-		-i src/etc/testcases/antunit/java-io.xml || die
-}
-
-src_test() {
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 21; then
-		eapply "${FILESDIR}/antunit-1.4.1-AntUnitTest.patch"
-		# java.lang.UnsupportedOperationException:
-		# The Security Manager is deprecated and will be removed in a future release
-		JAVA_TEST_EXCLUDES="org.apache.ant.antunit.junit3.EatYourOwnDogFoodTest"
-	fi
-	java-pkg-simple_src_test
 }
diff --git a/dev-java/antunit/files/antunit-1.4.1-AntUnitTest.patch b/dev-java/antunit/files/antunit-1.4.1-AntUnitTest.patch
deleted file mode 100644
index 896ccfee3d24..000000000000
--- a/dev-java/antunit/files/antunit-1.4.1-AntUnitTest.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-There was 1 failure:
-1) testSystemIoHandling(org.apache.ant.antunit.AntUnitTest)
-/var/tmp/portage/dev-java/antunit-1.4.1/work/apache-ant-antunit-1.4.1/src/etc/testcases/antunit.xml:84: Tests failed with 0 failures and 1 error
-        at org.apache.ant.antunit.AntUnit.execute(AntUnit.java:231)
-        at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
-        at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-        at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-        at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-        at org.apache.tools.ant.Task.perform(Task.java:350)
-        at org.apache.tools.ant.Target.execute(Target.java:449)
-        at org.apache.tools.ant.Target.performTasks(Target.java:470)
-        at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-        at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-        at org.apache.ant.antunit.AntUnitTest.testSystemIoHandling(AntUnitTest.java:103)
-
-FAILURES!!!
-Tests run: 126,  Failures: 1
---- a/src/tests/junit/org/apache/ant/antunit/AntUnitTest.java
-+++ b/src/tests/junit/org/apache/ant/antunit/AntUnitTest.java
-@@ -91,7 +91,7 @@ public class AntUnitTest extends BuildFileTest {
-         executeTarget("testNewProject");
-     }
- 
--    public void testSystemIoHandling() {
-+    public void noTestSystemIoHandling() {
-         PrintStream savedErr = System.err;
-         PrintStream savedOut = System.out;
-         try {
diff --git a/dev-java/antunit/files/antunit-1.4.1-gentoo.patch b/dev-java/antunit/files/antunit-1.4.1-gentoo.patch
new file mode 100644
index 000000000000..7aeccf662bc7
--- /dev/null
+++ b/dev-java/antunit/files/antunit-1.4.1-gentoo.patch
@@ -0,0 +1,62 @@
+--- a/src/etc/testcases/antunit/java-io.xml
++++ b/src/etc/testcases/antunit/java-io.xml
+@@ -30,7 +30,7 @@ under the License.
+   <target name="testTaskHandlingOutput">
+   	<java classname="org.apache.ant.antunit.AntUnitTest$HelloWorld" 
+   	      outputproperty="propertyToSet"
+-  	      classpath="build/test-classes"
++  	      classpath="target/test-classes"
+   	      failonerror="true" 
+   	/>
+     <au:assertEquals expected="HelloWorld" actual="${propertyToSet}" />
+--- a/src/etc/testcases/assert.xml
++++ b/src/etc/testcases/assert.xml
+@@ -156,28 +156,28 @@ under the License.
+     <au:assertDestIsUptodate
+       src="../../main/org/apache/ant/antunit/AssertTask.java"
+ 
+-      dest="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++      dest="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+   </target>
+ 
+   <target name="assertDestIsUptodateFail">
+     <au:assertDestIsUptodate
+       dest="../../main/org/apache/ant/antunit/AssertTask.java"
+ 
+-      src="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++      src="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+   </target>
+ 
+   <target name="assertDestIsOutofdatePass">
+     <au:assertDestIsOutofdate
+       dest="../../main/org/apache/ant/antunit/AssertTask.java"
+ 
+-      src="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++      src="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+   </target>
+ 
+   <target name="assertDestIsOutofdateFail">
+     <au:assertDestIsOutofdate
+       src="../../main/org/apache/ant/antunit/AssertTask.java"
+ 
+-      dest="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++      dest="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+   </target>
+ 
+   <target name="assertFilesMatchPass">
+--- a/src/tests/junit/org/apache/ant/antunit/AssertTest.java
++++ b/src/tests/junit/org/apache/ant/antunit/AssertTest.java
+@@ -137,11 +137,11 @@ public class AssertTest extends BuildFileTest {
+     }
+     public void testDestIsUptodateFail() {
+         testFail("assertDestIsUptodateFail",
+-                 "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../build/classes/org/apache/ant/antunit/AssertTask.class'");
++                 "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../target/classes/org/apache/ant/antunit/AssertTask.class'");
+     }
+     public void testDestIsOutofdateFail() {
+         testFail("assertDestIsOutofdateFail",
+-                 "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../build/classes/org/apache/ant/antunit/AssertTask.class'");
++                 "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../target/classes/org/apache/ant/antunit/AssertTask.class'");
+     }
+     public void testFilesMatchFail() {
+         testFail("assertFilesMatchFail",
diff --git a/dev-java/apache-rat/Manifest b/dev-java/apache-rat/Manifest
index 7cc2dcdcd3b1..47c3dc4a7566 100644
--- a/dev-java/apache-rat/Manifest
+++ b/dev-java/apache-rat/Manifest
@@ -1,5 +1,6 @@
 AUX apache-rat-0.15-fix-tests.patch 1751 BLAKE2B b4c55855c289db6c9f43dc5e5d28fc565abf448c38f21bf8169560580a4c6b3c6cc05d48bc93990d1b6b42d9f121f6951beb0650806189f4a9b2783f4c9631c7 SHA512 0791827f7e1aa738c9ce3239cf04cc826eddf9cf413d2c046df4eab29b8f3c7b538867ae25e4ef232d1ef762ac515a6ff12e69d2d0f3c066605dbd58ea0832a6
 DIST apache-rat-0.15-src.tar.bz2 203040 BLAKE2B 0727fb932cfbab7080eba5115bee69e5c46155a231509109a5c7aecf40ed539d4357f2d9b31342717306221891e4a411e01077ae55a0988abe4926e40f1fafc4 SHA512 7f9fb219a5ce0b95909f006140b20e7621d9f5ce583c42a57e2783ec40fd842e75b546843ab033a99bf5108d0d8369a0ab1aac80e33af9685f651fed3dd603ee
 DIST apache-rat-0.15-src.tar.bz2.asc 833 BLAKE2B b87e059a5a83d3d728c28c25926129743fdfb6a5c7cf2e258892d86711e7f5890d140ca1cfa5fc1012d56b6321ec2c93903ec30854bd3536216c8f1fd269f504 SHA512 f5abcb3df5d23834deab8c3c1a476100324452cba88e9185fb398dd6118c3c8ff8dc00c4c9f8166245833d6e602c51bc8cdf20361813bbe1e720022766412b8d
+EBUILD apache-rat-0.15-r1.ebuild 2940 BLAKE2B 9bbabf48b8c39c23e6c56de5159ce440673d05fe99542d7eeb92f623e3b7aed8aa1e8ce9360d297a52ff938528b691998d272d0f3095b9f6c1dc0ca549d90f07 SHA512 b766e7135d9f7621517380c371cd37496ea1211a2a0a68daf6ee68aeead1994dafc4d2455a74891cf4f0bc9219ac6de7000bcc1ed5577d0f540f403efa71fe03
 EBUILD apache-rat-0.15.ebuild 3348 BLAKE2B ac1deecf106f5fac049b5abf7ea17aee0a472ccbb45e6e39f3bbc8d9ff69d4bd8a6c52515c1653cfc3f6a02751d7b8bf98d8d5aa20e34266f61a053794d969ed SHA512 e881328a8061367fce6fda69b3894513d26cc302283dc8350d8f316962059820c11d2afbaa3ed6fe67f99d54395be9520f2f11d0467325ca6512d0e2c1ef80c5
 MISC metadata.xml 320 BLAKE2B 9451f2f8ba85ed8d1fba22da8fa3c905d4079c068d5e6e16af4296b5789b6ea2e2cdcf1d63ec5e275ede7b34ff49ff3bd41680a0bdda238ceb0d56103ef8f5fd SHA512 190d5b038f8962873e882f89d25f7532ad7c6144e6d8ea1337d7daaf1243d140fa98b6cde1604e138637b0eb50ae613097a23e6048291f275e0e6ec894360a50
diff --git a/dev-java/apache-rat/apache-rat-0.15-r1.ebuild b/dev-java/apache-rat/apache-rat-0.15-r1.ebuild
new file mode 100644
index 000000000000..4551262f6e9c
--- /dev/null
+++ b/dev-java/apache-rat/apache-rat-0.15-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# javadoc is broken for java 17, see https://bugs.gentoo.org/914458
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="
+	org.apache.rat:apache-rat-core:${PV}
+	org.apache.rat:apache-rat-tasks:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache Rat is a release audit tool, focused on licenses"
+HOMEPAGE="https://creadur.apache.org/rat/"
+SRC_URI="mirror://apache//creadur/${P}/${P}-src.tar.bz2
+	verify-sig? ( https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2.asc )"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	>=dev-java/ant-1.10.14:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:4
+	dev-java/commons-compress:0
+	dev-java/commons-io:1
+	dev-java/commons-lang:3.6
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( >=dev-java/ant-1.10.14:0[junit,testutil] )"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-creadur )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/creadur.apache.org.asc"
+
+DOCS=( NOTICE README.md README.txt RELEASE-NOTES.txt RELEASE_NOTES.txt )
+
+PATCHES=( "${FILESDIR}/apache-rat-0.15-fix-tests.patch" )
+
+JAVADOC_SRC_DIRS=(
+	"${PN}-core/src/main/java"
+	"${PN}-tasks/src/main/java"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	einfo "Compiling apache-rat-core.jar"
+	JAVA_JAR_FILENAME="${PN}-core.jar"
+	JAVA_RESOURCE_DIRS="${PN}-core/src/main/resources"
+	JAVA_SRC_DIR="${PN}-core/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-core.jar"
+	rm -r target || die
+
+	einfo "Compiling apache-rat-tasks.jar"
+	JAVA_JAR_FILENAME="${PN}-tasks.jar"
+	JAVA_RESOURCE_DIRS="${PN}-tasks/src/main/resources"
+	JAVA_SRC_DIR="${PN}-tasks/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-tasks.jar"
+	rm -r target || die
+
+	# javadoc is broken for java 17, see https://bugs.gentoo.org/914458
+	JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
+	use doc && ejavadoc
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="ant,junit-4"
+
+	einfo "Testing apache-rat-core"
+	cp -r "${PN}"-core/src/{main,test} src || die
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	java-pkg-simple_src_test
+	rm -r src/{main,test} || die
+
+	einfo "Testing apache-rat-tasks"
+	cp -r "${PN}"-tasks/src/{main,test} src || die
+	mkdir -p target/it-sources || die
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "${PN}-core.jar"
+	java-pkg_dojar "${PN}-tasks.jar"
+	java-pkg_dolauncher "${PN}" --main org.apache.rat.Report
+
+	use doc && java-pkg_dojavadoc javadoc
+
+	if use source; then
+		java-pkg_dosrc "${PN}-core/src/main/java/*"
+		java-pkg_dosrc "${PN}-tasks/src/main/java/*"
+	fi
+}
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index ee312efdd1e4..10802d8f66d1 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,4 +1,6 @@
 AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294ef11924310e2e63865018843faf199521f619e0859cc2c857d8a9fb038fbc44d88b06cf2df44b05cc6891c9e9d1bba5898071a873fc0dd774427afb0a2de2 SHA512 af18eeb48d8da55fc63526a528b88f626d9fad2369a6a8f570fe2dfee76384a5d86a9bab4883e557a1acd0a866859c4bd075476f9cfaff8e8465de6db0f2848d
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
+DIST commons-httpclient-3.1-src.tar.gz.asc 189 BLAKE2B 44661748db96429682a82d8dba5ad71d0d1fc2aaf03e2f1dda059985757547a78ab04dff38863ca421e65d13100a68c8cb909ed4c34e0a66a837b6fdb91baf63 SHA512 3832c90048de4db1f96efecd2f467153f0bdce1ebd533b848b8fc78a92da0bba3ba8bb3447e6c8d34f4c1c731a5b41ab941754a1509728ff4ea96e238927ab09
 EBUILD commons-httpclient-3.1-r2.ebuild 1709 BLAKE2B 73b08779a549b7f3ba8e5961e9db672aa69ebdd89e7998f389763fe8c70a57f40ec8bd83b343f17670e1934038a4699ae443451071b4b24f21ff6b33118dbbc5 SHA512 9b5a9f39c2e2856e1778cb04db68d12211d1d0bd789f94d7ac3dfb5eeec1803d5ede3b93087a0af092824fea3e916aad5d05b3e606c02e2994318cdac615d4a0
+EBUILD commons-httpclient-3.1-r3.ebuild 1401 BLAKE2B 0fdeb5ba8856a29cdfd849473ce025963ce923be397f9d9f78c6ea79db3e3fba51d54d79535e3d995b45e95918ddd0dc2374628cd410b0beab345cf3b7e56c9c SHA512 f29a578422e337702e6aa7a54387b1a09ca76a965ef7dc4210bd778655f71c913767d8756c5713ce09c79ad118b516d1a3e523765148460cb64654e798a1898d
 MISC metadata.xml 457 BLAKE2B aa9b78ee94c6ac0cd435c142183612524e588138764dcf4ea6b2474925f5238983ebbcf75ba32d78e42b62f3751e042785291f00cd9a6453c9711b4110ce04a5 SHA512 46da6fef35f122be653de8ff6f87048475dae83e8853a05210e403f239ce3823caafca0e26aa503377ccfd9c5616f4f69d4d3b483b9adb7b512351d85be5f531
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
new file mode 100644
index 000000000000..57e0fcc103ec
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -0,0 +1,54 @@
+# 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-httpclient:commons-httpclient:3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="The Jakarta Commons HttpClient library"
+HOMEPAGE="https://hc.apache.org/httpclient-legacy/"
+SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/httpcomponents/commons-httpclient/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Tests run: 2036,  Failures: 91
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpclient.commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons-httpclient )"
+DEPEND="
+	dev-java/commons-logging:0
+	dev-java/commons-codec:0
+	>=virtual/jdk-1.8:*
+	test? ( >=dev-java/ant-1.10.14:0[junit] )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README RELEASE_NOTES )
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_CLASSPATH_EXTRA="
+	commons-logging
+	commons-codec
+"
+JAVA_SRC_DIR="src/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	rm -r docs/apidocs || die "clean apidocs"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use doc && docinto html dodoc -r docs
+}
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index a97f5b7256db..ce86db61e400 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,4 +1,5 @@
 AUX cpptasks-1.0_beta5-test-classpath.patch 1070 BLAKE2B eacc916610026d4eb25fe7a217ce23e6ca485400e9f90c8ac37a4fb614fd0ac59d622161f79854b664db0e1cc48d047655479d817fcade448952d4c231d33860 SHA512 4ce1d06f6cb1a32ff8807f9e9ad8deddef26d4ea6ed6b2826d80e3ca16c491ecefb0c850ad9a958fdae3cdbd764852ab3a5f0ad66464b928f4c12061e3cb3e73
 DIST cpptasks-1.0b5.tar.gz 902930 BLAKE2B 02cc20ea8e4316f7d0572cd147868219f1cfa326fd87d2edbea8a9b81c88f83173a373a88149bc2da55099bb9a0ac4d1f8927a6c708e6a5640b56220dbdba006 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c
 EBUILD cpptasks-1.0_beta5-r1.ebuild 1302 BLAKE2B ae0c062ef9ccbcb1c9af7ad35cd31a48e5c925d1dc7a2557d3cd2eff4ecabcaf0b052d181ed0f5810a3cd6ed1aa97daa3e273ed9f0212e4477c3b97d0978111e SHA512 e194312ce4f012548907e6d95d65eb261fe2d3a5f92fcaa68cd1bd76ce340ab04d485c156e79bdc59d975ddbdd375c5a3575fa1e9fe85ab0d8505764677d804d
+EBUILD cpptasks-1.0_beta5-r2.ebuild 1310 BLAKE2B 7a8707cb2e3249e17e7098051cae379ee1289f27ffe71c79905c7413af94540a1853e48104212aebc679ea66ac98d9f37a75911c3a6d98adcd4e375603b21351 SHA512 9c3c8f3cf1eabc7f52e543b9c6dfc1208587e6674cc7973c7c510173b74820ea2c53f8dd44eadca2ea422ca6d57caf29ebaaf45aba742bc6e85b2aedb4db7d61
 MISC metadata.xml 318 BLAKE2B 53f5719585c7a4f0479017c4410975aefadcedd17db45949c351329e28761f05ebd89ef0557505a9a3ae03967b9baefe3e2c5b1edf0116a10434755a8d76fbe3 SHA512 b89f13a465ae0f1cad3352319206dc922badf513f63af878b118577e1f6da322b824dd14ca9220cf10aa5c5463c30399f001395a36c45c3b69228a375be379ee
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild
new file mode 100644
index 000000000000..151d4b64841e
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild
@@ -0,0 +1,64 @@
+# 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="Ant-tasks to compile various source languages and produce executables"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
+S="${WORKDIR}/${P/_beta/b}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+CP_DEPEND="
+	>=dev-java/ant-1.10.14:0
+	dev-java/xerces:2
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		>=dev-java/ant-1.10.14:0[junit]
+		dev-java/junit:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+
+EANT_BUILD_TARGET="jars"
+EANT_TEST_TARGET="run-tests -Djunit-available=true"
+EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
+
+src_prepare() {
+	java-pkg_clean
+	use test && eapply "${FILESDIR}/${P}-test-classpath.patch"
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/lib/${PN}.jar
+
+	java-pkg_register-ant-task
+
+	dodoc NOTICE
+	use doc && java-pkg_dojavadoc build/api
+	use examples && java-pkg_doexamples src/samples/*
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 35ca21d6e659..e1ce6c2b5e29 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,4 +1,5 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
 EBUILD javacc-5.0-r4.ebuild 1414 BLAKE2B 71b2f49568204c15af879bbed88c0c887f7c77e2439928e2b337baa35f278ac1ed8a6b88e0c1726220908043d4d50568b9c47d6059659f0a0ed02be4584690cc SHA512 2a9ce39a8d89771dafd05fe269ac64dc868b7069ccfcacf7d8b931d6cca888ae43bbc6c57d1ee7db6509cad96bc8274e8b3026e44bb41731bc0f2cfe472ca49a
+EBUILD javacc-5.0-r5.ebuild 1379 BLAKE2B e22b095d48b77985d0cc7dd9a7cb6d5a0e9811d7767b4049adeb25e7d977bf082ff7a0c178d844138eadb570ef38c9f8cc408112f8ded090f9d36b8e69256c4b SHA512 2558b58dc2e6b3eecb7dd4168096e2bf3e709a5da326fa99c55cc1679d990e6a235c74f3a49a99fbeb5eaf15019304ed0e85539d308a2346e137b10bfb9e995a
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/javacc/javacc-5.0-r5.ebuild b/dev-java/javacc/javacc-5.0-r5.ebuild
new file mode 100644
index 000000000000..0fd23fe4c7b9
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0-r5.ebuild
@@ -0,0 +1,73 @@
+# 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"
+
+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/snappy/Manifest b/dev-java/snappy/Manifest
index 21ad48931456..0228490ec471 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -6,5 +6,6 @@ AUX snappy-1.1.10.1-unbundle-snappy.patch 1928 BLAKE2B cc67a38e53dcd08d208b33796
 AUX snappy-1.1.10.5-SnappyOutputStreamTest.patch 1215 BLAKE2B 34005766546b28012ffbd86927b37d9368eab212b3fc2252492f2c49f7b639519cdf5bd197fb7dce3769108bab1175414f0b9287cf4893d41ad784e9f27ae8c0 SHA512 3c65030686fcdd1177c6865894510081ba41631db9c3945c52aeef921ccf049fa65083225af9f022a1537814e8a50de2ad0740292b9d6d8e8ee900176ff69267
 DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B 66582661a1832cc54493fc9dcea9076eb0e3f4e974a7d24d593e8fff2b9e2a3a82ed6eb4587f23523473aecc35d2a15de2ad81b2617c1bdac50847149cdeb6a8 SHA512 f1fb439a5853b04e9e771ec4e80e1ed078494ecfaa741abe065936fc1c26b5369fdd4e8082f4da59c1a3a7a5c025beaa14a68c38dc772e81499f83a3cb91717b
 DIST snappy-1.1.10.5.tar.gz 3917442 BLAKE2B 0632fa7ba4d0a863801e88ced22098c3bc228c1f3e188c67cb9ff62807f9454b580b49fff15c7deee1e790db51f4664c50a6546259439eda18597097a5128329 SHA512 f84778f59635eb97c0072489766904a16208be4f41b28151b14eecd0fe84f3f04a44c18d452b9d79e752b22d5e5b9ab5b36064cc8aeec8de655d7635132093ea
+EBUILD snappy-1.1.10.5-r1.ebuild 2918 BLAKE2B 3ce78e3debceffa76f8404f2ffa9e8928bb0f8de57527d1d390fcd2edceab3da824ba9e471a79d72311c61bc7cfb19e9a59d76f3a2d480a078d2a7a01b85da89 SHA512 b84cc8f2a0bf00602c428c9be1ab32baa7f988d4cdc4ea6e2891b2d392807c09dcf7cdbd3f0bdc32b08a3cac259c95dd668ec84c8449d0c064d9d87ac032dcec
 EBUILD snappy-1.1.10.5.ebuild 2915 BLAKE2B 789ae836022ac3430754a204ed4eba3559bf33f59cd8547b625180f1f24eb73ee1dfa87a324077be4af1d40e0234c3c6a667d7ee9b048ac5a78f9da5978e4bb0 SHA512 b9c0374c40592c2cda78fce8984a7e3b12f9d6f3b564206b7c939805806deb5d54a03db6f47d7159f2f28c491f205d72daacb5537ad1b96b4ab7744d7a66e2dc
 MISC metadata.xml 320 BLAKE2B 5e3039edeec0b66e6b896158777909fdfed881f06def61b5e3424baeb51ea898cb3cb273e6ddc939b7efea88860a945b5f29da513be22ee6b601551a6e02170a SHA512 c2e9282ce950b419588d080145e85e63e6491500edce141678a4aaae65a43d945694ad992dd4d485c94748e26ac225e58177fcff11db3430035b837741ec45af
diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
new file mode 100644
index 000000000000..a5c51f55f8ce
--- /dev/null
+++ b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
@@ -0,0 +1,125 @@
+# 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="org.xerial.snappy:snappy-java:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
+
+DESCRIPTION="Snappy compressor/decompressor for Java"
+HOMEPAGE="https://github.com/xerial/snappy-java/"
+# ::gentoo does not have hadoop-common packaged. Currently we bundle the binary version.
+# It's used for testing only and does not get installed.
+HCV="3.3.5"
+SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar )"
+S="${WORKDIR}/snappy-java-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+CP_DEPEND="dev-java/osgi-core:0"
+
+CDEPEND="
+	app-arch/snappy
+	dev-libs/bitshuffle
+"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	${CDEPEND}
+	test? (
+		>=dev-java/ant-1.10.14:0[junit4]
+		dev-java/commons-io:1
+		dev-java/commons-lang:3.6
+		dev-java/plexus-classworlds:0
+		dev-java/xerial-core:0
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}
+	${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/1.1.7.8-java-version-target.patch"
+	"${FILESDIR}/snappy-1.1.10.1-unbundle-snappy.patch"
+	"${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
+	"${FILESDIR}/1.1.7.8-gentoo.patch"
+	"${FILESDIR}/snappy-1.1.10.5-SnappyOutputStreamTest.patch"
+	"${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch"
+)
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	commons-io-1
+	commons-lang-3.6
+	junit-4
+	plexus-classworlds
+	xerial-core
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		CHECKREQS_MEMORY="2560M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_env
+}
+
+pkg_setup() {
+	check_env
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+	# remove pre-compiled sofiles
+	rm -r src/main/resources/org/xerial/snappy/native || die
+	rm -r src/test/resources/lib || die
+}
+
+src_compile() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		JAVA_SOURCE="$(java-pkg_get-source)" \
+		JAVA_TARGET="$(java-pkg_get-target)"
+
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/hadoop-common-${HCV}.jar"
+	JAVA_TEST_EXTRA_ARGS=( -Xmx${CHECKREQS_MEMORY} )
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		java-pkg-simple_src_test
+	else
+		einfo "Tests need jdk-17 to pass."
+	fi
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	local jniext=.so
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		jniext=.jnilib
+		# avoid install_name check failure
+		install_name_tool -id "@loader_path/libsnappyjava${jniext}" \
+			"target/libsnappyjava${jniext}"
+	fi
+	java-pkg_doso "target/libsnappyjava${jniext}"
+}
diff --git a/dev-java/xmlunit/Manifest b/dev-java/xmlunit/Manifest
index 25da7ffe9e2f..4e2b00b6701f 100644
--- a/dev-java/xmlunit/Manifest
+++ b/dev-java/xmlunit/Manifest
@@ -1,3 +1,4 @@
 DIST xmlunit-1.6-src.zip 830899 BLAKE2B 74bc5238667444fac0a6780090a76cf9c2a6fa4f0536bdde36858190cbd0528873b14b5ee05e098840be1b01e0ccfa3d2243ef63f92dae6cbfef1d84732f1f33 SHA512 a7d15905d959ab5bfeb1807c80eab3e0aa58d501a2136335961da842b9571b95b4aab18189e9a21e59afac960ea83f9a2d32e3af398f63c0f839587b60b9f96b
 EBUILD xmlunit-1.6-r1.ebuild 1254 BLAKE2B eaf9f1ef3a4be14c59193fbae95b2fb88e4be48444c512acff67adfe0d95126a092ce676e9300f5c00657f203182db752912924e60727d471e6e8c8c86d563b1 SHA512 ab660a8f6d0c159b0359f80dbb532bbf83f09b328d141d9745cad3c5df76df6e316dec703be5022b3ca560b7c6df531d3aebb81f2c60469b7fd6f20665006688
+EBUILD xmlunit-1.6-r2.ebuild 1046 BLAKE2B b7b8ac55372ece7bf5c176689480bedcc8a47823768ea760d989ade0eb3d3f032f084d036f0c7d5991fb0ebb7e00831248640f00ab531a33604956fd6e7ed6f9 SHA512 df227fb1944189cad016477069f72d62d588d6e5358c8e32773abaded94e99985b8cac40aa9aba3d2145d39cc9305a5dca82b7eaae2241d1acf3bcf8ce41d755
 MISC metadata.xml 314 BLAKE2B 163bb6e09dcedea6c61c6d6c433b282f69bb76d13623e3386d5068be39db821005028b3dc03b44ae4be8966a57a8ab39a5c241b950ef2267f5c5c63b058c3edf SHA512 8041ce046f9cee5f27744e7d8c39aa39aa82e3e37502b4702b50957bab45560c2da3c4af9ba7c7cd1b0ede5ec464f707c1394c7844fd3d46aeaf69ca5714f1b3
diff --git a/dev-java/xmlunit/xmlunit-1.6-r2.ebuild b/dev-java/xmlunit/xmlunit-1.6-r2.ebuild
new file mode 100644
index 000000000000..8a68f91459c6
--- /dev/null
+++ b/dev-java/xmlunit/xmlunit-1.6-r2.ebuild
@@ -0,0 +1,43 @@
+# 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="xmlunit:xmlunit:1.6"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML"
+HOMEPAGE="https://sourceforge.net/projects/xmlunit/ https://www.xmlunit.org"
+SRC_URI="mirror://sourceforge/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%20${PV}/${P}-src.zip"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="dev-java/junit:0"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	doc? ( app-text/docbook-xsl-stylesheets:0 )
+	test? ( >=dev-java/ant-1.10.14:0[junit] )
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/java"
+JAVA_TEST_EXTRA_ARGS=( -Dbasedir="." )
+JAVA_TEST_RESOURCE_DIRS="tests/etc"
+JAVA_TEST_SRC_DIR="tests/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	if use doc; then
+		docinto html
+		dodoc -r userguide
+	fi
+}