Adding metadata

6 files changed, 29 insertions, 28 deletions

diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9-r1.ebuild
index e691baf0a9e9..c9268c877d7d 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9-r1.ebuild
@@ -31,19 +31,19 @@ BDEPEND="
 "
 
 CP_DEPEND="
+	>=dev-java/ant-1.10.14-r3:0
 	dev-java/batik:1.16
 	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
 	test? (
 		dev-java/mockito:2
 		dev-java/pdfbox:0
@@ -63,12 +63,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 +77,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
diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r2.ebuild
index 58580490d2fc..17d1b99fd468 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -10,6 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="JFlex is a lexical analyzer generator for Java"
 HOMEPAGE="https://www.jflex.de/"
 SRC_URI="https://${PN}.de/${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -17,7 +18,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 IUSE="examples test vim-syntax"
 RESTRICT="!test? ( test )"
 
-CDEPEND="dev-java/ant-core:0"
+CDEPEND=">=dev-java/ant-1.10.14:0"
 
 RDEPEND=">=virtual/jre-1.8:*
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
@@ -29,7 +30,6 @@ DEPEND=">=virtual/jdk-1.8:*
 
 PDEPEND="dev-java/javacup:0"
 
-S="${WORKDIR}/${P}"
 JAVA_SRC_DIR="src/main/java"
 
 src_prepare() {
@@ -59,17 +59,19 @@ src_configure() {
 		JAVACUP=$(echo lib/java-cup-*.jar)
 	fi
 
-	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjar --build-only ant ant.jar):${JAVACUP}"
 }
 
 jflex_compile() {
-	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
+	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} \
+		--skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
 	java-pkg-simple_src_compile
 	java-pkg_addres ${PN}.jar src/main/resources
 }
 
 src_compile() {
-	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
+	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} \
+		-parser LexParse -interface src/main/cup/LexParse.cup || die
 
 	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
 	# jflex. We have patched jflex to fix it but we have to run the
@@ -77,8 +79,8 @@ src_compile() {
 	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
 	use arm && local JFLEX_ARGS="-Xint"
 
-	# First compile (without doc/source) using the bundled jflex.
-	JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
+	# First compile using the bundled jflex.
+	jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
 
 	# Then recompile using the fresh jflex.
 	jflex_compile -cp "${PN}.jar:${JAVACUP}"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 10c371cdcac3..a6aad9e84b1e 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -12,4 +12,5 @@ DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab07808
 DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f
 DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc76362dae766f8b598fd56085051418075d4c426293e6431b441ea38a2d2e4676fc89173d10324e3aafac52c97a5d9459bb0199168a07807e16 SHA512 cbd3992450c44764373c25313f6ce32f0c8a47abec557e4a10f7f8517435bf450ba5ac9fa9c8cdfb41f1536b55829d733426dc12dc2b5a2eebf5a94e9094752a
 DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c
+DIST openjdk-bootstrap-8.402_p06-ppc64.tar.xz 34476368 BLAKE2B 1f896772f5e40a2793c5d9294e65e429c94204f91e91bfd76ff780e1d6318741c2052c3f20e59abcfb7018924983b5c9f386f14f912660e3e86296185f348482 SHA512 7bace068c5ac7604ad9db3ed655a52a4a90195efbf2fc342389cf7929d82d3f7b861fe700c16f513599bf9c064a87c9aa5966d7bd45aa7ed5e55ec317667be6a
 DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c158c7e7d9fae9741112230dcd6e314163911921d63e3222cd3f4ab9d08bbaacbf6d9bfce9a1a9336e21088fba6396613489a701b30797 SHA512 fe5719e0bbf9bcd6eb9790ebd4da34e7f6c99fe4b7d41de2b5d00b20ebe76a77d857c726d1a71b7f40657ca2a9aa08eaa9efc1ab4be60016f66af95530b454b5
diff --git a/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild b/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild
index 2b9037da0174..84a8a1eeb9d6 100644
--- a/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild
+++ b/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild
@@ -18,6 +18,7 @@ SLOT="${PV%%[.+]*}"
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
 X86_XPAK="8.402_p06"
+PPC64_XPAK="8.402_p06"
 
 # Usage: bootstrap_uri <keyword> <version> [extracond]
 # Example: $(bootstrap_uri x86 8.402_p06)
@@ -40,12 +41,13 @@ SRC_URI="
 		-> ${P}.tar.gz
 	!system-bootstrap? (
 		$(bootstrap_uri x86 ${X86_XPAK})
+		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
 	)
 "
 
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
+IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r4.ebuild
index 9f0982c09a7e..cf1dc1eeb7d5 100644
--- a/dev-java/qdox/qdox-1.12.1-r3.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r4.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
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
-CDEPEND="dev-java/ant-core:0"
+CDEPEND=">=dev-java/ant-1.10.14-r3:0"
 
 DEPEND=">=virtual/jdk-1.8:*
 	dev-java/byaccj:0
@@ -52,7 +52,7 @@ src_compile() {
 	# create jar
 	mkdir -p build/classes || die
 
-	local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
+	local cp="$(java-pkg_getjars --build-only ant,jmock-1.0)"
 
 	if use test ; then
 		cp="${cp}:$(java-pkg_getjars --build-only junit)"
@@ -74,7 +74,7 @@ src_compile() {
 }
 
 src_test() {
-	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
+	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant,junit,jmock-1.0) \
 		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
 }
 
diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/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)
 }