commit: 5cc09eb3ba8239c94e5ab8cb93d81eb966f13e90 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Mar 12 20:40:18 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Apr 15 10:15:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc09eb3
dev-java/ant-ivy: switch to dev-java/ant Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35723/commits/8d6551f1f1e71c422722e9353d8b5351772f8979 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> ...ivy-2.5.0-r1.ebuild => ant-ivy-2.5.0-r2.ebuild} | 31 +++++++++++++++------- dev-java/ant-ivy/metadata.xml | 4 +-- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild similarity index 94% rename from dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild rename to dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild index fff42019b905..0158c70768f5 100644 --- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild +++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple java-osgi DESCRIPTION="Ivy is a free java based dependency manager" HOMEPAGE="https://ant.apache.org/ivy/"; -SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz" +SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"; LICENSE="Apache-2.0" SLOT="2" @@ -21,7 +21,7 @@ PROPERTIES="test_network" RESTRICT="test" CDEPEND=" - dev-java/ant-core:0 + >=dev-java/ant-1.10.14-r3:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcomponents-client @@ -31,10 +31,7 @@ CDEPEND=" dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( - dev-java/ant-junit:0 - dev-java/ant-junit4:0 - dev-java/ant-junitlauncher:0 - dev-java/ant-testutil:0 + >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil] dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 @@ -50,12 +47,28 @@ DOCS=( LICENSE NOTICE README.adoc ) S="${WORKDIR}/apache-ivy-${PV}" -JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,httpcomponents-client-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy" +JAVA_GENTOO_CLASSPATH=" + ant + bcpg + bcprov + httpcomponents-client-4 + commons-vfs-2 + httpcore + jakarta-oro-2.0 + jsch + jsch-agent-proxy +" JAVA_MAIN_CLASS="org.apache.ivy.Main" JAVA_SRC_DIR="src/java" JAVA_RESOURCE_DIRS="resources/java" -JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1" +JAVA_TEST_GENTOO_CLASSPATH=" + ant + hamcrest-core-1.3 + hamcrest-library-1.3 + junit-4 + xmlunit-1 +" JAVA_TEST_SRC_DIR="test-src/java" JAVA_TEST_RESOURCE_DIRS="test" JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar" diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml index 91e2ba1cf10c..84db44eaed66 100644 --- a/dev-java/ant-ivy/metadata.xml +++ b/dev-java/ant-ivy/metadata.xml @@ -16,7 +16,7 @@ </longdescription> <upstream> <remote-id type="github">apache/ant-ivy</remote-id> - <doc>https://ant.apache.org/ivy/history/2.5.0</doc> - <bugs-to>https://issues.apache.org/jira/browse/IVY </bugs-to> + <doc>https://ant.apache.org/ivy/history/2.5.0/</doc> + <bugs-to>https://issues.apache.org/jira/browse/IVY</bugs-to> </upstream> </pkgmetadata>
