commit: 3d1925ec6763f68571ad8ebafd5712ded2102d2a Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Mar 12 21:21:03 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Apr 16 07:48:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1925ec
dev-java/ant-contrib: switch to dev-java/ant Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35723/commits/5bd77e9d5ae28d7598f1cda12969f7d8962999cb Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> ...ild => ant-contrib-1.0_beta6_pre20201123-r2.ebuild} | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) 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 similarity index 76% rename from dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild rename to 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"
