gentoo auto-resync : 31:10:2024 - 03:04:18

12 files changed, 722 insertions, 4 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e485b38a0ef6..23e044dabfe4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index fd779b041ec1..acb4e9183dab 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,7 @@
 DIST batik-src-1.17.tar.gz 13578640 BLAKE2B c77f994674dd8e8054ad6f753e53304ce6daad9b9eadceef053ede0c746872528ecd1caa6e87064d41892fed0c39f07936779851777208229f817bf84cb529b2 SHA512 0879f298142630e96931f429ade5e7107d2d981c6c3a99b8f2ddca8e26ea4fde1b7c717d06412c57d64759bed6c5f2d056970d59e19e66caafb926cb30078516
 DIST batik-src-1.17.tar.gz.asc 833 BLAKE2B 33836c8f0cbc878410ce8b2738dbbb4dc47d6067c5f58febb3460d836424b1c1d815f369bd7aeb15a8ed9371628e03731c1338aa6524c8a935c48b8092e3bb1e SHA512 513bd3d5c212ce4d98daa911f36e1b00e2f2b7a637e93ea116a2ebe848e20664d722ccf6c8928eac7170fa84d3b38eec86a71c8a0a7e21fd8622c8d475991c60
+DIST batik-src-1.18.tar.gz 13699469 BLAKE2B 003a467b6948b902f56f004bf5c7d41f369bf49520d55fd70af3d3b8edef02d04557fdad5e4da70395a30c755f777791c89714edaa094eaa2964972eb81bdbf1 SHA512 209c6f4c76769cf1db616c5fe43c71d23c92afeb62e11bc7605baaa18bf9177efbb7a91a98bf03c3b4cd917bd7b7bd83e87083d16b11b3e57d3f31beeb8e1d7b
+DIST batik-src-1.18.tar.gz.asc 833 BLAKE2B a779b94a666edcab5b4c69866b4e7388ce6b8d9869d59773b084d870152cffd8c8cfd74df0f2a4ef06e5d598acb3b7bc00ec841871411b379f514b3fe2019765 SHA512 2fe6de9394f89c90e5ad2ede241c57bfbe5da4627b3730d445b2daa06b1ae71945bd65cda0d7a6bd46db536f318f755778a5b5a5b52080872a3143acd0d4677d
 EBUILD batik-1.17-r1.ebuild 6549 BLAKE2B 71b4872efd2dcbad3877e79d17bcb3a93849cb6d0046676615d5af178ae4652c15f1cfef726f19e5b2228cae75d1e00ace5c70ae3e880c94801e5fb26ac1961b SHA512 a2445708cc79786103390a001ff9e9d974b9dc0291eca6409950ce8e38ac9070f1d07ddad15d6784217412e8755eb9232b3f9f520874e1f9790c88d2ebf9baa3
+EBUILD batik-1.18.ebuild 6541 BLAKE2B c19dc5f525f295ec050c669cae6410b8b47cdfb9f61de10ff7120852e0fb410f9a688fe975cfd0aa1052e2650b2a6e2dd7f02278149d981fbb39976e0370f86d SHA512 16667ee9a8733217e40fa437bdc8954633e4a38d78a5c1baa66258b65f72a69fa03773ccb3405f51f87e687f685e4e97d34716d0d9ece2dce38e5173fa9cf221
 MISC metadata.xml 610 BLAKE2B c589c175b595deb71eae6b8fccd46f4d6b82331f636cff28b6074300b6495efb780d157bb1b5b1359070cca7405138fcff719d72f1038023357fc7ab05c52b87 SHA512 73a6bb61c87645d1600ab90ca954599208c8599e967f6e999d973fa80e9693435db8a75ace95c8881486c8e2929d5a201a51e821e5f58763c273b21b5a32c229
diff --git a/dev-java/batik/batik-1.18.ebuild b/dev-java/batik/batik-1.18.ebuild
new file mode 100644
index 000000000000..c37e45435562
--- /dev/null
+++ b/dev-java/batik/batik-1.18.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:batik:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg-utils verify-sig
+
+DESCRIPTION="XML Graphics Batik"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/"
+SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz
+	verify-sig? ( https://downloads.apache.org/xmlgraphics/batik/source/batik-src-${PV}.tar.gz.asc )"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+BDEPEND="
+	app-arch/zip
+	verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik )
+"
+
+CP_DEPEND="
+	dev-java/jacl:0
+	dev-java/rhino:1.6
+	dev-java/xalan:0
+	dev-java/xml-commons-external:1.4
+	dev-java/xmlgraphics-commons:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-batik.apache.org.asc"
+
+DOCS=( CHANGES NOTICE README )
+
+# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar files in the extensions
+# directory, see batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
+# We comment them out but keep them in the mudules list for later.
+# The same for batik-test-old which depends on fop-transcoder-allinone which itself depends on batik.
+# We also don't build batik-shared-resources since we install those resources on global scope.
+# And we don't build batik-all. Instead we install the modules.
+# BATIK_MODULES is the "Reactor Build Order" extracted from the output of "mvn dependency:tree":
+#	mvn -DskipTests dependency:tree \
+#		| sed -n '/Reactor Build Order:/,/Building org/p' \
+#		| cut -d':' -f2 | cut -d' ' -f1 | grep 'batik-' || die
+BATIK_MODULES=(
+#	batik-shared-resources
+	batik-constants
+	batik-i18n
+	batik-test
+	batik-util
+	batik-awt-util
+	batik-css
+	batik-ext
+	batik-xml
+	batik-dom
+	batik-parser
+	batik-svg-dom
+	batik-anim
+	batik-gvt
+	batik-script
+	batik-bridge
+	batik-svggen
+	batik-transcoder
+	batik-codec
+	batik-extension
+	batik-gui-util
+	batik-svgrasterizer
+#	batik-rasterizer-ext
+	batik-rasterizer
+	batik-slideshow
+	batik-swing
+	batik-svgbrowser
+#	batik-squiggle-ext
+	batik-squiggle
+	batik-svgpp
+	batik-ttf2svg
+#	batik-all
+	batik-test-swing
+	batik-test-svg
+#	batik-test-old
+)
+
+src_prepare() {
+	java-pkg_clean
+	java-pkg-2_src_prepare
+	# We drop support for jython due to bug #825486.
+	rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java || die
+	rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreterFactory.java || die
+
+	cat > "batik-squiggle-${SLOT}.desktop" <<-EOF || die
+		[Desktop Entry]
+		Name=Squiggle
+		Comment=SVG browser
+		Exec=batik-squiggle-${SLOT}
+		Icon=init
+		Terminal=false
+		Type=Application
+		Categories=Graphics;VectorGraphics;
+		MimeType=image/svg+xml
+	EOF
+}
+
+src_compile() {
+	# We loop over the modules list and compile the jar files.
+	local module
+	for module in "${BATIK_MODULES[@]}"; do
+		einfo "Compiling ${module}"
+
+		JAVA_JAR_FILENAME="${module}.jar"
+		JAVA_MAIN_CLASS=""
+		JAVA_RESOURCE_DIRS=""
+		JAVA_SRC_DIR=""
+
+		# Not all of the modules have resources.
+		if [[ -d "${module}/src/main/resources" ]]; then
+			JAVA_RESOURCE_DIRS="${module}/src/main/resources"
+		fi
+
+		# Get Main-Class from the module's pom.xml
+		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' "${module}/pom.xml" )
+
+		# Some modules don't have source code.
+		if [[ -d "${module}/src/main/java/org" ]]; then
+			JAVA_SRC_DIR="${module}/src/main/java"
+			java-pkg-simple_src_compile
+		else
+			# This case applies to batik-rasterizer.
+			if [[ -d "${module}/src/main/resources/org" ]]; then
+				jar -cfe "${module}.jar" "${JAVA_MAIN_CLASS}" -C "${module}/src/main/resources" . || die
+			# Else for batik-squiggle (also batik-rasterizer-ext, batik-squiggle-ext)
+			else
+				# Create the JAR file (not possible without adding at least one file).
+				jar -cfe "${module}.jar" "${JAVA_MAIN_CLASS}" -C . README || die
+				zip -d "${module}.jar" "README" || die
+			fi
+		fi
+
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
+
+		rm -fr target || die
+	done
+
+	if use doc; then
+		JAVA_SRC_DIR=""
+		JAVA_JAR_FILENAME="ignoreme.jar"
+
+		for module in "${BATIK_MODULES[@]}"; do
+			# Some modules don't have source code
+			if [[ -d "${module}/src/main/java/org" ]]; then
+				JAVA_SRC_DIR+=( "${module}/src/main/java" )
+			fi
+		done
+
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+	for module in "${BATIK_MODULES[@]}"; do
+		einfo "Testing ${module}"
+
+		JAVA_TEST_SRC_DIR=""
+		JAVA_TEST_RESOURCE_DIRS=""
+		JAVA_TEST_RUN_ONLY=""
+
+		if [[ -d "${module}/src/test/resources" ]]; then
+			JAVA_TEST_RESOURCE_DIRS="${module}/src/test/resources"
+		fi
+
+		# https://github.com/apache/xmlgraphics-batik/blob/refs/tags/batik-1_14/batik-util/pom.xml#L74-L75
+		if [[ "${module}" == batik-util ]]; then
+			JAVA_TEST_RUN_ONLY="org.apache.batik.util.Base64TestCases"
+		fi
+
+		if [[ -d "${module}/src/test/java/org" ]]; then
+			JAVA_TEST_SRC_DIR="${module}/src/test/java"
+			java-pkg-simple_src_test
+		fi
+	done
+}
+
+src_install() {
+	einstalldocs
+	domenu "batik-squiggle-${SLOT}.desktop"
+	newicon -s scalable \
+		batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg \
+		squiggle-${SLOT}.svg
+
+	for module in "${BATIK_MODULES[@]}"; do
+		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' "${module}/pom.xml" )
+
+		java-pkg_dojar "${module}.jar"
+
+		# Add a launcher if the module has a MainClass.
+		if [[ -n "${JAVA_MAIN_CLASS}" ]]; then
+			java-pkg_dolauncher "${module}-${SLOT}" --main "${JAVA_MAIN_CLASS}"
+		fi
+
+		# Some modules don't have source code
+		if [[ -d "${module}/src/main/java/org" ]]; then
+			if use source; then
+				java-pkg_dosrc "${module}/src/main/java/*"
+			fi
+		fi
+	done
+
+	local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy"
+	insinto "$(dirname "${java_policy_file}")"
+	newins - "$(basename "${java_policy_file}")" <<- _EOF_
+		grant codeBase "file:${EPREFIX}${JAVA_PKG_JARDEST}/-" {
+			permission java.security.AllPermission;
+		};
+	_EOF_
+	java-pkg_register-environment-variable \
+		gjl_java_args \
+		"\$gjl_java_args -Djava.security.policy=file:${EPREFIX}${java_policy_file}"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest
index 24e67f0243ee..ba35400cc0f5 100644
--- a/dev-java/caffeine/Manifest
+++ b/dev-java/caffeine/Manifest
@@ -1,3 +1,3 @@
 DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8
-EBUILD caffeine-2.6.2-r1.ebuild 989 BLAKE2B f829ede18705d7a83848386c53f822145031c92752abb1036b2e5b156ab0ec0c97eb571974445881736b6292b3ff1e88dc9238dae0af88ca722686f0f301f422 SHA512 725de09af399ed5e6595992e119431f6c8f3d8cc01f6ffb05650436204d2c67f0e01245816e73bb32aec31c3db1fea79804e4b09b0d20bddeaca35752def18a9
+EBUILD caffeine-2.6.2-r1.ebuild 996 BLAKE2B 3cf43b05e85212de6259dbc8c3da40a109a5f30d82ccf13d672a582c97c8c36c5b5b5ab56aa39dc2035936aabdaabae4df4a3cdcf6c8f78d0232aa3f9a36b233 SHA512 355b2d119e288f84a4a63be1d3ba2dea8645597cc93365f1d11be79a7b2d13afef97026f3d4353b1465742b6405381555c6707e6c78b275cdb7900087f49c381
 MISC metadata.xml 300 BLAKE2B fc46ab992a4cbfe6a697b414e72f7bfa69992f5fdfdfa99c2b94b69643492f8144351125ca0edf4cfb4e8d9e67c6aa026d9e7e4d000f46250ff57716cce65ff0 SHA512 fc4dc1847395e619c603488ca3b18b94fcc96e21461854009d46a0e73ff694066e85478eae5c20f8493eda9203ab159ab3a625ac7df49190f7f2e162dd3418fb
diff --git a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
index c20da083dfbd..600b25a150e4 100644
--- a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
+++ b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/$
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ~arm64 ppc64"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND="dev-java/jsr305:0"
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 919fb7c0a9e5..c868c3853b0f 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,10 +1,15 @@
+AUX fop-2.10-java23.patch 1855 BLAKE2B 46fc64c88f36eded19c2e34bc7e30fc8f9f9428fc933dfb8dbbb90653a43ece2148469300d6a4eda194a6e5bb228e6986a26b0ad1ef3aa2e3e792d443854ac4f SHA512 3151d62e7ebb07e9b4c1df138a913f4ff287e64177379b69b70eeb0e982a2edc589319b08c6872a0cc5c83b41078bf657205cdcdc45800507abe482ff0e202c6
 AUX fop-2.9-FO2StructureTreeConverterTestCase.patch 2546 BLAKE2B b326032751de4c68b388cd6f455809ca72a9bf61b7d1bfcf686d740c80ab0e09012f6a70a1ba6cb230a5658c8070b9d863914021625aa9c8791c1c4d95cc9a66 SHA512 3c495496198cf23271d9f524f3ced425e2ccd1cb15c5dbf470ea767262e7720e28dba6079b1b9c5cbaa72ed634ffdc7bda6e0467d76473bed98bb548ec5dd06e
 AUX fop-2.9-MissingLanguageWarningTestCase.patch 6910 BLAKE2B 14c469b8124aba18485bad6bf8cbdef5291aa29b6aa3cc236984da171000ae5e3f45392a315ebbf64d2f24fc1a26289e8635e455fec0d8a011f6a4a57af9eb0e SHA512 fe7e0ba0d1929d3e347349a5fcc5fea053c8636efcf2a8e035f82bc716b51b0fa0f31079c845ce1220ac843896a41223b7e58af6c7e57ed42d4cfde18afef91c
 AUX fop-2.9-PDFEncodingTestCase.patch 1416 BLAKE2B 23b41f8f6e35a68138cd5d74e49e9a266c23bf71fd9a33275fa2e23e3a744f017aeb57741ebbb0dfa6de7bc4f8f3142403c0b3819f02e96578802e81d52bc7a3 SHA512 476c7ee807ace7abcd3ee0e5833a4ebc741f0889471a1667863a998ac40c4670fc200027c2872c5f3ec201e3a111203ea25cb74d1b150c0e32c522cff4aaba6e
 AUX fop-2.9-PDFToUnicodeCMapTestCase.patch 1789 BLAKE2B e1075047431e5f0f006d8a7f43e53b1eb619452af6f8c28f3c7ba3d963c75ecf8321d87c8c08fd24116a2e166b053dba85e080eadd12657cbb404271ac359c49 SHA512 ddad8897ebd53c5b8fbcca23e00b830912812128194aad6fbafed932f13479148c273bec37ed59b0a295d8359084185e7b28d8290ad741acfe26b0ed988a28e0
+DIST fop-2.10-jars.tar.xz 7696 BLAKE2B aa5db0a4ee8b96e54e7beccccc21bd4559f2f228476ab65a12935fbbd69924e23296c1dfcf6e717b6031b9e21efd3aeed4df130ba5f8717ae47a1b0628013d59 SHA512 7c9d14f71e94e6a706c845d71a95adcbf0c77934618d9ce070dfd677adf8d2f171ab6e16954db684dc1781f91719e194382a629274435ecef3d3fbf0e5c7bae3
+DIST fop-2.10-src.tar.gz 20903590 BLAKE2B 5217edbabc255b2e37c6198ea7cdfb1344db0726c7156f73bdc5ac452c4c233c5280d263e65656cde92ce6aa52c8ea94e346d9d14535ca802fc37fe1475ba255 SHA512 c5ae25be3e3a4da01195e108dec66743ab6017967220db1f4e4300f79594d8144de23876eeac07b2068db75a60e1b25d10ddad48533bd0cd6cb9e110b519fcf6
+DIST fop-2.10-src.tar.gz.asc 833 BLAKE2B 70b200af6f3611b3dcd6da9d8728b12ee9a7bd4882919965c641e822cdd21510669cc98ace5d8caaa42e05347ae0d9b07384365377bbd4c5ca0b1edc07e2ff80 SHA512 ae9628cf9ca84d9c2ac1bfddcb4aec786985d3fdca16c2541e45690c81695ec5361dc1641a30572fc2d95defa69cab61a1992ab0d16843344411acb77835a73c
 DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
 DIST fop-2.9-src.tar.gz 20642865 BLAKE2B 6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a SHA512 d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093
 DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B 284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f SHA512 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc
 DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3
+EBUILD fop-2.10.ebuild 6337 BLAKE2B e1a3a9bee15241ec1c8516549b57c1ffda941720dfc4fcbbf684b58f60e3081e976c0e8001406303c7e87683ad6b3ce7477e70432eed46d1e37238d43d1077c3 SHA512 dca2cfdb7fd530f364b5e1780e7d211963fef74ee9021f1b5c42286e5e8e6667a31f7a084a7ce6854b9508bbb7ad1e1c56d09c1bcf5585e2b1e97648ef94fc0a
 EBUILD fop-2.9-r1.ebuild 6143 BLAKE2B 067dca41e9ec58dd7ea6b0537b2ddb96b1d4b0eaa60a30027c5672db1ca9b45c322370b109a4cc42cd731795acfd97a217dc3ac2a1a0b9c5f53590f7accc6610 SHA512 c1a2e6003079181fcb97f77477e347aaaf4172db349e8803f72a003bdd7e803b1f171825373744e62e10852eb011937610cfb447d438171b578a087cbf304135
 MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4
diff --git a/dev-java/fop/files/fop-2.10-java23.patch b/dev-java/fop/files/fop-2.10-java23.patch
new file mode 100644
index 000000000000..fb3aae334c72
--- /dev/null
+++ b/dev-java/fop/files/fop-2.10-java23.patch
@@ -0,0 +1,52 @@
+From 49e0e9ae69cf96eb4c13527b271c8a70a5f5f843 Mon Sep 17 00:00:00 2001
+From: Simon Steiner <ssteiner@apache.org>
+Date: Mon, 21 Oct 2024 10:10:54 +0100
+Subject: [PATCH] Fix compile on Java 23
+
+---
+ .github/workflows/maven.yml                               | 2 +-
+ .../main/java/org/apache/fop/layoutmgr/KnuthSequence.java | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+# diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
+# index a9c6e0f7eba..d5e426590b5 100644
+# --- a/.github/workflows/maven.yml
+# +++ b/.github/workflows/maven.yml
+# @@ -17,7 +17,7 @@ jobs:
+#      strategy:
+#        fail-fast: false
+#        matrix:
+# -        jdk: ['8', '11', '17', '21']
+# +        jdk: ['8', '11', '17', '21', '23']
+#          os: [ubuntu-latest, windows-latest]
+#  
+#      steps:
+# diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthSequence.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthSequence.java
+# index ce85b686cb4..8f4a6d66c0f 100644
+--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthSequence.java
++++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthSequence.java
+@@ -134,20 +134,20 @@ public void wrapPositions(LayoutManager lm) {
+     /**
+      * @return the last element of this sequence.
+      */
+-    public ListElement getLast() {
++    public T getLast() {
+         return (isEmpty()
+                 ? null
+-                : (ListElement) ListUtil.getLast(this));
++                : ListUtil.getLast(this));
+     }
+ 
+     /**
+      * Remove the last element of this sequence.
+      * @return the removed element.
+      */
+-    public ListElement removeLast() {
++    public T removeLast() {
+         return (isEmpty()
+                 ? null
+-                : (ListElement) ListUtil.removeLast(this));
++                : ListUtil.removeLast(this));
+     }
+ 
+     /**
diff --git a/dev-java/fop/fop-2.10.ebuild b/dev-java/fop/fop-2.10.ebuild
new file mode 100644
index 000000000000..0b0835b224f5
--- /dev/null
+++ b/dev-java/fop/fop-2.10.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:fop:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="XML Graphics Format Object Processor All-In-One"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
+SRC_URI="
+	mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
+	https://dev.gentoo.org/~fordfrog/distfiles/fop-2.10-jars.tar.xz
+	verify-sig? ( https://downloads.apache.org/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
+	test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
+"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="2.8"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
+
+BDEPEND="
+	dev-java/xalan:0
+	verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )
+"
+
+CP_DEPEND="
+	>=dev-java/ant-1.10.14-r3:0
+	dev-java/batik:0
+	dev-java/bcprov:0
+	dev-java/bcpkix:0
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+	dev-java/fontbox:0
+	dev-java/jakarta-servlet-api:6.1
+	dev-java/qdox:1.12
+	dev-java/sun-jai-bin:0
+	dev-java/xmlgraphics-commons:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/mockito:2
+		dev-java/pdfbox:0
+		dev-java/xmlunit:1
+	)
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}/fop-2.9-PDFEncodingTestCase.patch"
+	"${FILESDIR}/fop-2.10-java23.patch"
+)
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	java-pkg_clean
+	default #780585
+	java-pkg-2_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
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
+	rm -r target || die
+
+	JAVA_JAR_FILENAME="fop-events.jar"
+	JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
+	JAVA_SRC_DIR="fop-events/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
+	rm -r target || die
+
+	JAVA_JAR_FILENAME="fop-core.jar"
+	JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml )
+	JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
+	JAVA_SRC_DIR="fop-core/src/main/java"
+	# Code generation according to
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225
+	pushd fop-core/src/main/codegen/fonts > /dev/null || die
+		local fonts=$(find . -name "Courier*.xml" \
+			-o -name "Helvetica*.xml" \
+			-o -name "Times*.xml" \
+			-o -name "Symbol.xml" \
+			-o -name "ZapfDingbats.xml"
+			)
+		for font in ${fonts}; do \
+			xalan -XSLTC \
+				-IN $font \
+				-XSL font-file.xsl \
+				-OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
+		done
+		xalan -XSLTC \
+			-IN encodings.xml \
+			-XSL code-point-mapping.xsl \
+			-OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
+	popd > /dev/null || die
+
+	# Update JAVA_RESOURCE_DIRS with "event-mode.xml" files
+	# produced manually by running "mvn package".
+	# Upstream does this with maven-antrun-plugin, fop-core/pom.xml lines 285-308
+	pushd "${JAVA_RESOURCE_DIRS}" > /dev/null || die
+		jar -xf "${WORKDIR}/fop-2.10-core-event-models.jar"
+	popd > /dev/null || die
+
+#	einfo "Code generation according to fop-events/pom.xml lines 80-92"
+#	mkdir -p test/java || die
+#	mkdir -p fop-core/target/classes || die
+#	local cp=fop-events.jar:"$(java-pkg_getjar ant ant.jar):$(java-pkg_getjars qdox-1.12)"
+#	"$(java-config -J)" -cp "${cp}" \
+#		org.apache.fop.eventtools.EventProducerCollectorTask \
+#		fop-core/target/classes \
+#		fop-core/src/main/java/org/apache/fop/afp/AFPEventProducer.java || die
+
+	java-pkg-simple_src_compile
+
+	rm -r target || die
+
+	if use doc; then \
+		JAVA_SRC_DIR=(
+			"fop-util/src/main/java"
+			"fop-events/src/main/java"
+			"fop-core/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2,pdfbox,xmlunit-1"
+
+	einfo "Testing fop-events"
+	JAVA_TEST_EXCLUDES="org.apache.fop.events.TestEventProducer"
+	JAVA_TEST_SRC_DIR="fop-events/src/test/java"
+	# This jar file was created manually from the output of "mvn test".
+	# Upstream does this with maven-antrun-plugin
+	jar -xf "${WORKDIR}/fop-2.10-test-event-model.jar" || die
+	mkdir generated-test || die
+	mv {target/test-classes,generated-test}/org || die
+	java-pkg-simple_src_test
+
+	einfo "Testing fop-core"
+	pushd fop-core/src/test/java > /dev/null || die
+		# Excluding one test, see https://bugs.gentoo.org/903880
+		local JAVA_TEST_RUN_ONLY=$(find * -type f \
+			-name "*TestCase.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+		local vm_version="$(java-config -g PROVIDES_VERSION)"
+		# these tests would fail with java.lang.NoSuchMethodError if compiled with jdk-1.8
+		if ver_test "${vm_version}" -eq "1.8"; then
+			JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.fop.render.pdf.PDFEncodingTestCase}
+			JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.fop.fonts.truetype.OTFToType1TestCase}
+#			org.apache.fop.render.pdf.PDFEncodingTestCase
+#			org.apache.fop.fonts.truetype.OTFToType1TestCase
+		fi
+	popd > /dev/null || die
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L297-L307
+	# <workingDirectory>../fop</workingDirectory>
+	pushd fop > /dev/null || die
+		JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/fop-hyph-2.0.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-util.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-events.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-core.jar"
+		JAVA_TEST_RESOURCE_DIRS="../fop-core/src/test/resources"
+		JAVA_TEST_SRC_DIR="../fop-core/src/test/java"
+		java-pkg-simple_src_test
+	popd > /dev/null || die
+}
+
+src_install() {
+	local module
+	for module in fop-util fop-events fop-core ; do
+		java-pkg_dojar "${module}.jar"
+		if use source; then
+			java-pkg_dosrc "${module}/src/main/java/*"
+		fi
+	done
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
+	einstalldocs
+}
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index b8729b65196a..3d1940eb8f5d 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -4,6 +4,8 @@ AUX jna-5.13.0-LibCTest.patch 456 BLAKE2B 51dc724df52af7dbc8700dd7adae2d9db32c15
 AUX jna-5.13.0-testpath.patch 5567 BLAKE2B 0c76e603af9ae2a1f3cacde220ec4451d5973f9dab805e20fc5e9bf852928a0489ca742df8277a9c5a47d10064897ea50860d587b21288d605c476d3e7d122ae SHA512 c8c40a6f5ec049641eb3cca2a9b74fd851ebf6264d5a5cc1db10190d645e4bf219f45d5bb68094ce843b32f7079a8ae0ccb1a804f2cc0d066052acf841c96145
 DIST jna-5.13.0.tar.gz 116027625 BLAKE2B 1f2bc7ab28adefa0bbad122957ed2c6ef55ab88e79b30c05f0d2d88e0e05152f7bb5e28097906a7e24f78304dfa2b225587adb0ada205ca3c2ceac1cdbab3f04 SHA512 aefd0becc03bb7fd753e8c5cdcbcb20f6d590125a5fb03048bef0024e826ab0254b750e22a8bb26bea38cc89262ad45e5030b666cb2c857b01b15a6a55379a0f
 DIST jna-5.14.0.tar.gz 116167104 BLAKE2B 3ccb9e53e843690f9c90272c2e94fb2d903dd9bbcb7b6294a6ed3d973d3945c2b3fe5ac5e4c472830a7d07f4f32d84e781bb2ae3bd73cdd1894392331554e2cd SHA512 5758898052b3b099cd8b40046f764813377970a428e66370ba2a7125403661e25379d55fdb0ff75de32d66cbff20f0a05f438b2ca18804cc53f2edf4b1927ff0
+DIST jna-5.15.0.tar.gz 117272793 BLAKE2B e16f507df75715a73d2d9e35d6a31868723effdb14f86ddfdd5c49c2e925f73c6cba8375660d3b89ecd72ab54d58f14bc1347671ccf40dfe32288230629de49b SHA512 b3329138bbdb5040da7a6b305af37e46ffd02948551f5c9fc2815eb7a66946807c3b9152797808b5a171735d6a1a241f25dc0ef95ecacf897926135727d1d533
 EBUILD jna-5.13.0-r1.ebuild 5362 BLAKE2B 45afcd8316679df0621c01f432a11913a367725800fd1705aa095f5b8623ad5e99a824ba3728c03ece164e63e45dc128fa2790d03000f8827cfa02568a1fac73 SHA512 09b768f2cc2b835f6dd466d66a1133f78fc15eb266c3a85cd52779d3d5efb07ea7f8bc3ea2756045971cafcbd46c02c41b14eef5fbe0d247230f135a72e417f8
 EBUILD jna-5.14.0-r1.ebuild 5386 BLAKE2B c57ce74e3f8527748e2a185d04a92a7436c38a07612586fb157c54eea0b6e428171b9b04f636a7638a63b35ecba8833272d6f6170195639f920ae84925fb2451 SHA512 25976ce6100e9c089c963588a859deeb725460476d0cf5905f36310a2b096c30e3db6a16434c3bf717cd7eda9bd8a760c70fd65162cc2bb0a6dd616d087d84fb
+EBUILD jna-5.15.0.ebuild 5396 BLAKE2B 1341e4e0773dbe35b5e0d63d00eeb04f7de05900ee3e6c271fa0de7ae301bf0aa08db4560391f7aeef6139e7d426ca51b2738af10177be19f231546334ae8ef1 SHA512 69c26735cf71dcb2d5791e02423c1260a3b1808d47414b6095ca6aa691dd7499db1b7cf48fdf76aabf98f388481c448d23135a4c7a7a7fabe516a0a1c84e433b
 MISC metadata.xml 334 BLAKE2B 9e55710ddf27995f7f0ea6480a4b2ff6ed38424e5a8de87614715defa4ae9f788932d270df48e78fdadb27851f06f2651d94c0b043816151aea55c08f083c4ee SHA512 b8b0cc53cc447f2811b3e94638de0799efaf99a05f29a0341d3a261b1f0f996ca308a007221f165031e56e60339d8d616ca366f25eda7f7f5d55acfc60a9d695
diff --git a/dev-java/jna/jna-5.15.0.ebuild b/dev-java/jna/jna-5.15.0.ebuild
new file mode 100644
index 000000000000..54ff9fa70c4c
--- /dev/null
+++ b/dev-java/jna/jna-5.15.0.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="
+	net.java.dev.jna:jna:${PV}
+	net.java.dev.jna:jna-platform:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="Java Native Access"
+HOMEPAGE="https://github.com/java-native-access/jna"
+SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+CDEPEND="
+	>=dev-libs/libffi-3.4:=
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	x11-base/xorg-proto:0
+	test? (
+		dev-java/reflections:0
+	)
+	${CDEPEND}
+	x11-libs/libXt
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+DOCS=( README.md CHANGES.md OTHERS TODO )
+PATCHES=(
+	"${FILESDIR}/5.11.0-makefile-flags.patch"
+	"${FILESDIR}/jna-5.11.0-no-Werror.patch"
+	"${FILESDIR}/jna-5.13.0-testpath.patch"
+	"${FILESDIR}/jna-5.13.0-LibCTest.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
+	mkdir -p "res/META-INF" || die
+	echo "Main-Class: com.sun.jna.Native" > "res/META-INF/MANIFEST.MF" || die
+
+	# https://github.com/java-native-access/jna/blob/5.13.0/build.xml#L402-L407
+	sed \
+		-e "/VERSION =/s:TEMPLATE:${PV}:" \
+		-e '/VERSION_NATIVE =/s:TEMPLATE:5.1.0:' \
+		-i src/com/sun/jna/Version.java || die
+}
+
+src_compile() {
+	einfo "Compiling jna.jar"
+	JAVA_AUTOMATIC_MODULE_NAME="com.sun.jna"
+	JAVA_JAR_FILENAME="jna.jar"
+	JAVA_RESOURCE_DIRS="res"
+	JAVA_SRC_DIR="src"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":jna.jar"
+	rm -r target || die
+
+	einfo "Compiling jna-platform.jar"
+	JAVA_AUTOMATIC_MODULE_NAME="com.sun.jna.platform"
+	JAVA_JAR_FILENAME="jna-platform.jar"
+	JAVA_RESOURCE_DIRS=""
+	JAVA_SRC_DIR="contrib/platform/src"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":jna-platform.jar"
+	rm -r target || die
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		JAVA_SRC_DIR=(
+			"src"
+			"contrib/platform/src"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+
+	einfo "Generating headers com_sun_jna_Native.h com_sun_jna_Function.h"
+	ejavac -h native -classpath "src" \
+		"src/com/sun/jna/Function.java" \
+		"src/com/sun/jna/Native.java" || die
+
+	einfo "Building native library"
+	cd native || die
+	local args=(
+		CC="$(tc-getCC)"
+		STRIP=true
+		DYNAMIC_LIBFFI=true
+	)
+	# Using -j1 since otherwise fails to build:
+	# cannot find ../build/native/libtestlib.so: No such file or directory
+	# [Makefile:505: ../build/native/libtestlib2.so] Error 1
+	emake -j1 "${args[@]}"
+}
+
+src_test() {
+	JAVA_TEST_EXTRA_ARGS=(
+		-Djna.nosys=true
+		-Djna.boot.library.path=build/native
+		-Djna.library.path=build/native
+	)
+	JAVA_TEST_GENTOO_CLASSPATH="
+		junit-4
+		reflections
+	"
+
+	JAVA_TEST_SRC_DIR="contrib/platform/test"
+	rm -r  contrib/platform/test/com/sun/jna/platform/{mac,unix,win32} || die
+	JAVA_TEST_EXCLUDES=(
+		# 1) testGetXAttr(com.sun.jna.platform.linux.XAttrUtilTest)
+		# java.io.IOException: errno: 95
+		#         at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:85)
+		#         at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:70)
+		#         at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:56)
+		#         at com.sun.jna.platform.linux.XAttrUtilTest.testGetXAttr(XAttrUtilTest.java:83)
+		# 2) setXAttr(com.sun.jna.platform.linux.XAttrUtilTest)
+		# java.io.IOException: errno: 95
+		#         at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:85)
+		#         at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:70)
+		#         at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:56)
+		#         at com.sun.jna.platform.linux.XAttrUtilTest.setXAttr(XAttrUtilTest.java:53)
+		com.sun.jna.platform.linux.XAttrUtilTest
+	)
+	java-pkg-simple_src_test
+
+	JAVA_TEST_SRC_DIR="test"
+	rm -r test/com/sun/jna/wince || die
+	rm -r test/com/sun/jna/win32 || die
+
+	# 1) testLoadFromJarAbsolute(com.sun.jna.LibraryLoadTest)
+	# java.lang.UnsatisfiedLinkError: Unable to load library '/libtestlib-jar.so':
+	# /libtestlib-jar.so: cannot open shared object file: No such file or directory
+	jar cvf build/jna-test.jar \
+		-C build/native libtestlib-jar.so \
+		-C test com/sun/jna/data || die
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":build/jna-test.jar"
+
+	JAVA_TEST_EXCLUDES=(
+		com.sun.jna.CallbacksTest # Needs to run separately
+		com.sun.jna.DirectTest # Needs to run separately
+		com.sun.jna.NativeTest # Needs to run separately
+		com.sun.jna.TypeMapperTest # Needs to run separately
+		com.sun.jna.UnionTest # Needs to run separately
+		com.sun.jna.VMCrashProtectionTest # Needs to run separately
+	)
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY=(
+		com.sun.jna.CallbacksTest
+		com.sun.jna.DirectTest
+		com.sun.jna.UnionTest
+	)
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY=( com.sun.jna.NativeTest )
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY=( com.sun.jna.VMCrashProtectionTest )
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY=( com.sun.jna.TypeMapperTest )
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default
+	java-pkg_dojar jna.jar jna-platform.jar
+	java-pkg_doso build/native/libjnidispatch.so
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "src/*"
+		java-pkg_dosrc "contrib/platform/src/*"
+	fi
+}
diff --git a/dev-java/pebble/Manifest b/dev-java/pebble/Manifest
index 02c016ee4378..f2d925b93b07 100644
--- a/dev-java/pebble/Manifest
+++ b/dev-java/pebble/Manifest
@@ -1,3 +1,3 @@
 DIST pebble-3.1.6.tar.gz 222475 BLAKE2B 783e999f463820af9ac1c43610e2a257f7921fa46d274a3898496662119f74336e4bf78b42a92847359f8ee4efde7a074cbc57274ec6fb8475eb9c6c1ba9455e SHA512 0963e4c04dd67cb0069aa0b3e0ac33b4bdc524e07cec4074493d56232e31360d629b5f2c2fcbf663a26fd3df97d0e973e842d30edb547ec83b7335818417c9f0
-EBUILD pebble-3.1.6.ebuild 842 BLAKE2B 8bd2f8dcce6c1ae1a98f404666fd662aac08b6c9d13dfe374601bb92b415f87fac9cdd2ef2ba63eacf1ca216c29e620a1a25ef276d57ead815d1dfc01fe1c00c SHA512 47c4e074db98f4922dd704ee80dd6b4e668cd1c85397270824abd44313a7198463fe10656f1d862d3d2e0509b354df574c7e9be538e37c0504df53580b33c20a
+EBUILD pebble-3.1.6.ebuild 849 BLAKE2B 3ee150dfe022d0cc072c98b8c7fc642f73b632cfe68188a428b0476cec58fdf6ea2da2211f126c5184d8af950e97cf97572d282ba7363b53129b799af87636c9 SHA512 f05cdd875fa8a649a9bd3fc2d1fd3dcb40498cbe102d83346bd2569dcfe3ffa3b6dc2448909d2059254f49b3d97735f1a54d4e9263cf6ce96b606059ff6a9f9d
 MISC metadata.xml 304 BLAKE2B bdf44bc9852ee185400a758b3d366880acc3d7dd21af9952c729a90ba5f6fcea675eaca5054d2bda1e17a39d7af6399b46c08f691dfd63925fb7cb4b804e1714 SHA512 ce21c41d9d6ec073be3643d86fc6ac80621d598fdb6c622cfec979e1f6f68170cb992b53a2584c50e1575bc6da08523cadc6c29ebfee94c81ae5701f2dc4a584
diff --git a/dev-java/pebble/pebble-3.1.6.ebuild b/dev-java/pebble/pebble-3.1.6.ebuild
index fdbaef75fa08..41aa36689f2a 100644
--- a/dev-java/pebble/pebble-3.1.6.ebuild
+++ b/dev-java/pebble/pebble-3.1.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 
 CP_DEPEND="
 	dev-java/caffeine:0