4 files changed, 75 insertions, 56 deletions
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",