commit: e473e6ed0539154efda1a19e9d3f19b7bc5186d9 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Mar 14 05:52:14 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Apr 17 09:09:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e473e6ed
dev-java/saxon: switch to dev-java/ant Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35723/commits/c0ae1b279d7cc6745a4870fbf0936bb1d747a36d Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../saxon/{saxon-9.2.0.6-r3.ebuild => saxon-9.2.0.6-r4.ebuild} | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r4.ebuild similarity index 93% rename from dev-java/saxon/saxon-9.2.0.6-r3.ebuild rename to dev-java/saxon/saxon-9.2.0.6-r4.ebuild index f1e4921e2821..af456c471e68 100644 --- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild +++ b/dev-java/saxon/saxon-9.2.0.6-r4.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 @@ -10,13 +10,14 @@ inherit java-pkg-2 java-ant-2 DESCRIPTION="A XSLT and XQuery Processor" HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/"; SRC_URI="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip" +S="${WORKDIR}" LICENSE="MPL-1.0" SLOT="9" KEYWORDS="amd64 ~arm arm64 ppc64 x86" CDEPEND=" - dev-java/ant-core:0 + >=dev-java/ant-1.10.14-r3:0 dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 @@ -32,8 +33,6 @@ DEPEND=" BDEPEND="app-arch/unzip" -S="${WORKDIR}" - # prepare eclass variables JAVA_ANT_REWRITE_CLASSPATH="yes" JAVA_ANT_CLASSPATH_TAGS="javac javadoc" @@ -73,7 +72,7 @@ src_prepare() { src_compile() { local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)" - gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)" + gcp="${gcp}:$(java-pkg_getjar --build-only ant ant.jar)" eant -Dgentoo.classpath="${gcp}" jar $(use_doc) }
