commit: 4f75503ec1714b534e8f932754377133a767e8db Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Mar 15 11:58:34 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Apr 17 09:14:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f75503e
dev-java/fop: switch to dev-java/ant Also move sun-jai-bin and javax-serrvlet-api to CP_DEPEND since these are also needed on runtime. Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35723/commits/19f6a7eabaa33128869a6b2df621a0cfd6642d25 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/fop/{fop-2.9.ebuild => fop-2.9-r1.ebuild} | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9-r1.ebuild similarity index 96% rename from dev-java/fop/fop-2.9.ebuild rename to dev-java/fop/fop-2.9-r1.ebuild index e691baf0a9e9..7d81868091b4 100644 --- a/dev-java/fop/fop-2.9.ebuild +++ b/dev-java/fop/fop-2.9-r1.ebuild @@ -35,15 +35,15 @@ CP_DEPEND=" dev-java/commons-io:1 dev-java/commons-logging:0 dev-java/fontbox:0 + dev-java/javax-servlet-api:2.2 dev-java/qdox:1.12 + dev-java/sun-jai-bin:0 dev-java/xmlgraphics-commons:2 " DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:* - dev-java/ant-core:0 - dev-java/javax-servlet-api:2.2 - dev-java/sun-jai-bin:0 + >=dev-java/ant-1.10.14-r3:0 test? ( dev-java/mockito:2 dev-java/pdfbox:0 @@ -52,6 +52,7 @@ DEPEND="${CP_DEPEND} " RDEPEND="${CP_DEPEND} + >=dev-java/ant-1.10.14-r3:0 >=virtual/jre-1.8:*" DOCS=( NOTICE README ) @@ -63,12 +64,6 @@ PATCHES=( "${FILESDIR}/fop-2.9-FO2StructureTreeConverterTestCase.patch" ) -JAVA_CLASSPATH_EXTRA=" - ant-core - javax-servlet-api-2.2 - sun-jai-bin -" - src_unpack() { if use verify-sig; then verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc} @@ -83,6 +78,9 @@ src_prepare() { } src_compile() { + # while ant could install multiple jar files we only need ant.jar + JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjar ant ant.jar)" + JAVA_JAR_FILENAME="fop-util.jar" JAVA_SRC_DIR="fop-util/src/main/java" java-pkg-simple_src_compile
