gentoo auto-resync : 16:04:2024 - 12:04:26

2 files changed, 8 insertions, 12 deletions

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 5a73c18df826..29522d86c154 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,3 +1,3 @@
 DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
-EBUILD ant-contrib-1.0_beta6_pre20201123-r1.ebuild 2247 BLAKE2B 07506ad4330f5273f2a7a1ccfe8c1e4bcc2ea27a6ecfbfc0ed279dbf13b1df82c7cfb153cccd528cfcac2e2394612f4b2c1d73449972e509dd488d42078f9006 SHA512 084e1dffb72fd0a13b34506c7f154aeb833a351b07ae1db9dc681e0207a727184355e0d261f688d0cd2fa8a74b50cf6b1aa460d4c9a58ef61334c54278fd112b
+EBUILD ant-contrib-1.0_beta6_pre20201123-r2.ebuild 1981 BLAKE2B 7a68e3b812ea888204ee5656e71675c0c42484a5b6ea07cceaaf4c557782f2ec594355841aab7146a88446d8662f676ae126b7e0ff88e13966b2000d1f667f80 SHA512 0a7889334bc4515981e6cfbd2206cc73e3c34dc12dcf90210dd9dea7c87542c422673c0443b111c65433496ebdbf49466b3f2182090ff4416f954de866c7cb30
 MISC metadata.xml 376 BLAKE2B 9a2a0c2682879b564c70896325934cbc53ec1289781487f4d82b1d053b5e45ed16a3fb9ff228c29f29975e8a2cc3231e9f9a7694ed2e504025f5d909e0a2e89a SHA512 a54fd5353676f4c1cbe28d463e4d245dccc342dd79d5809f1b130a0b93f9eceb2a93aa4addb8de98cfe26b5999c1bc7cb65fd075117a2b0f14ed41d92c2c144c
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
index 38db7e73b27e..172467ec6ed4 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -14,8 +11,9 @@ inherit java-pkg-2 java-pkg-simple
 
 MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
 DESCRIPTION="Ant-contrib tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net"
+HOMEPAGE="https://ant-contrib.sourceforge.net/"
 SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -34,7 +32,7 @@ RESTRICT="test"
 # xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
 
 CDEPEND="
-	dev-java/ant-core:0
+	>=dev-java/ant-1.10.14-r3:0
 	dev-java/ant-ivy:2
 	dev-java/bcel:0
 	dev-java/commons-httpclient:3
@@ -49,20 +47,18 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	>=virtual/jdk-1.8:*
 	test? (
-		dev-java/ant-core:0
+		>=dev-java/ant-1.10.14-r3:0[junit4]
 	)"
 
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.8:*"
 
-S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
-
 #	JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
-JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy-2,xerces-2"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant"
 JAVA_TEST_SRC_DIR="test/src"
 JAVA_TEST_RESOURCE_DIRS="test/resources"