gentoo auto-resync : 01:12:2023 - 11:06:48

14 files changed, 98 insertions, 498 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ff3af80a9518..4e59653baffc 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 5aa4417b15c9..b00d4a02b2d5 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,7 +1,4 @@
-DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab SHA512 024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250
-DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03 SHA512 7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea
 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
-EBUILD batik-1.16-r2.ebuild 6537 BLAKE2B d7cdc9483e868ee078b34a4417d30aa15a2256b4f9e7f021e84994e8e2e1c753b9b08546d3e5d650ffb3182ab0a649ef1a699199a9acd2961c2b9cc6fdcaec5c SHA512 a1e77dddd1300e56f5a59ca764e3f426691939e3cbb6ac51b8b849be17f8328a897a40bb12541ed3bbdede1c40dba846b323253982e2aecbd687a7bd079de1dd
 EBUILD batik-1.17.ebuild 6537 BLAKE2B d7cdc9483e868ee078b34a4417d30aa15a2256b4f9e7f021e84994e8e2e1c753b9b08546d3e5d650ffb3182ab0a649ef1a699199a9acd2961c2b9cc6fdcaec5c SHA512 a1e77dddd1300e56f5a59ca764e3f426691939e3cbb6ac51b8b849be17f8328a897a40bb12541ed3bbdede1c40dba846b323253982e2aecbd687a7bd079de1dd
 MISC metadata.xml 610 BLAKE2B c589c175b595deb71eae6b8fccd46f4d6b82331f636cff28b6074300b6495efb780d157bb1b5b1359070cca7405138fcff719d72f1038023357fc7ab05c52b87 SHA512 73a6bb61c87645d1600ab90ca954599208c8599e967f6e999d973fa80e9693435db8a75ace95c8881486c8e2929d5a201a51e821e5f58763c273b21b5a32c229
diff --git a/dev-java/batik/batik-1.16-r2.ebuild b/dev-java/batik/batik-1.16-r2.ebuild
deleted file mode 100644
index e86745d88df5..000000000000
--- a/dev-java/batik/batik-1.16-r2.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2023 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}/batik-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1.16"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-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:2
-"
-
-DEPEND="
-	${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jre-1.8:*
-"
-
-BDEPEND="
-	app-arch/zip
-	verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik )
-"
-
-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 \
-		"-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/felix-gogo-runtime/Manifest b/dev-java/felix-gogo-runtime/Manifest
new file mode 100644
index 000000000000..d2551ea23cf7
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/Manifest
@@ -0,0 +1,5 @@
+AUX felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch 1355 BLAKE2B 3eb7c25a4f25fc764d1da9f315a9dc6a3e6dab28fe4b9e9c488d1f6207db136178f2e60c0ea14940b39438bcd2ce4561c0b1063b40a08347770a1a5a83aa81fd SHA512 29aaf5a89470b4f284b8651ad5b9109b70296afc3e5e958d28ab8c6e749fa3694ce4dda9a0c1979ac3840c9bc7e407fa38d5856bb58c6fbccb05a80db4166e4c
+DIST felix-gogo-runtime-1.1.6.tar.gz 117060 BLAKE2B 5ffbc36688f7f69595c5087910e6b9007b57d4b60a6d18d9adee473987193b5fc478cf241229a32044abebf3e796394591e2626ad5560d1cbde0dfb572d62f7f SHA512 0cf431767506a0ca3f78a4e7c666bb9da7301d9968078653ef67deccc73da80e15e01e19ecd6e499215faa4236d46a4f4179b54798ba4d847cfe8a0d858e44ee
+DIST felix-gogo-runtime-1.1.6.tar.gz.asc 833 BLAKE2B 12ef2c9bf4d5f6e5dee1a10b1d6afcd366805361181f2621ed98f3c4a36db155e7c1b493152e528cd3a8e46ca12e61bda140a2e4c13b133374bb10ec47c4554a SHA512 05b8247508c477ad374f18e7dc22faa9d116c3416b6390173366391b6f7a726cbb604adcaecc013faf51b03cbde57f09d95891a283045d35ed809e01ae7d5dae
+EBUILD felix-gogo-runtime-1.1.6.ebuild 1394 BLAKE2B 830ea7edea6a220e5559eacb3e5ab656b3ae57d1502b91b174c4bc6449492fe29e0398828a246bebcba6f3f8fefb462a36ab16075e936a7e226f8258eff73418 SHA512 11aa371474cc324d405d3bbe90fefb0479d932a45fae3be4bcfe54a6e165cb52b4aaead0dc39f27575b37e40f765aab00a8c003c74e07ed88b8d9396acb1acbf
+MISC metadata.xml 450 BLAKE2B 88a9681a1bf267eff47c2deff0ecf32632135e4ed16e81a751f10c16eb481450a85b4d71f3d85b1ea2f8362623325ef8a3786a4fd72a37f033c75defb504c360 SHA512 6a27bd5801537f43d8b72731891972c4297d97b75aa083d231f8463af1f341f98e367eeedea4f4b7edd6ee1b3b733ff448b37389defc7839f64c57ad569d0ec4
diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild
new file mode 100644
index 000000000000..ce4df3018c1d
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2023 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.felix:org.apache.felix.gogo.runtime:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache Felix Gogo Runtime"
+HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz
+	verify-sig? ( https://dlcdn.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc -> ${P}.tar.gz.asc )"
+S="${WORKDIR}/org.apache.felix.gogo.runtime-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	dev-java/osgi-annotation:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/mockito:2
+	)
+"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc"
+
+PATCHES=( "${FILESDIR}/${P}-skip-tests-non-java-8.patch" )
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_EXCLUDES=(
+	#Invalid test class No runnable methods
+	org.apache.felix.gogo.runtime.TestEvaluate
+)
+JAVA_TEST_GENTOO_CLASSPATH="
+	junit-4
+	mockito-2
+"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+}
diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch
new file mode 100644
index 000000000000..270b01be759a
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch
@@ -0,0 +1,22 @@
+skip tests that fail with java > 1.8 if java > 1.8 is used
+
+we compare here just that the first part of the version is 1
+which is true only for version 1.8, other versions have first number
+like 11, 17, 21 and those fail the condition hence the remaining tests
+are skipped
+we cannot use System.version() here as this is available only since java 9
+
+--- a/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
++++ b/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
+@@ -149,9 +149,10 @@ public class TestParser extends AbstractParserTest
+         assertEquals("def", c.execute("echo def|grep d.*|capture"));
+         assertEquals("def", c.execute("echoout def|grep d.*|capture"));
+         assertEquals("def", c.execute("myecho def|grep d.*|capture"));
+-        assertEquals("def", c.execute("(echoout abc; echoout def; echoout ghi)|grep d.*|capture"));
+         assertEquals("", c.execute("echoout def; echoout ghi | grep d.* | capture"));
+         assertEquals("hello world", c.execute("echo hello world|capture"));
++        org.junit.Assume.assumeTrue("1".equals(System.getProperty("java.version").split("\\.")[0]));
++        assertEquals("def", c.execute("(echoout abc; echoout def; echoout ghi)|grep d.*|capture"));
+         assertEquals("defghi", c.execute("(echoout abc; echoout def; echoout ghi)|grep 'def|ghi'|capture"));
+     }
+ 
diff --git a/dev-java/felix-gogo-runtime/metadata.xml b/dev-java/felix-gogo-runtime/metadata.xml
new file mode 100644
index 000000000000..b2e227e0b6b2
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://issues.apache.org/jira/browse/FELIX</bugs-to>
+		<doc>https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html</doc>
+		<remote-id type="github">apache/felix-dev</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 48466daaf17f..a68e2529f034 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,13 +1,7 @@
-DIST tomcat-native-1.2.38-src.tar.gz 439234 BLAKE2B 603a905db25b86792717023707598abb4da125ad16b7e69e4a48ec0eb9056bc0b566520d4df004566bbc15c8bcfe843992baebb6bd1c86b210ce9f0fc0733ca0 SHA512 973c0dc8d241827aa98f72026d4de67928344c221570abbb7f97380fe56a9ad602b159a5448c6048d88d73fa0ade8c1ab12df293fee513d0e4896847b16206e6
-DIST tomcat-native-1.2.38-src.tar.gz.asc 873 BLAKE2B 6b7ccf31b7b0b7ac9493c4751309c6b62c269332f5fd49a9df391846a140f2797e1587e3c644b4aa65fa6eef8dfea8fe19b7f5714ffb5ddcf836c601f281bc5b SHA512 b6a7c12ac7387c4ee17e5b5d50d588b16470874f70bcb49b96a25159bab8b51ff5a5dc7d33fa73c8eb33e673e2b947aad4b603b1e8755f7e186052763c2575f5
 DIST tomcat-native-1.2.39-src.tar.gz 438209 BLAKE2B 499e2221be7a3aac47950530b044242dd308e943cdffd4af29d35121b60bd9b7040a404e8a70320cc853d41e4a06b41cad66a87d665e3692791299a0f16658f4 SHA512 b90c72255406f48552025a2e78dbd8c30a3492be2c283875c86a0b4a0f1f71b0420d4f91fb5ba181ef29d528824b2d5dfc63f51ee68e8d04fe6e67bd89e397f7
 DIST tomcat-native-1.2.39-src.tar.gz.asc 873 BLAKE2B 59976744119c03771b597d3d4f5d84a5a9e5feb81c0efe351e827b5e06e84c8adde8407ef4d27ec3b201763806e74804a51e9a209641c127328d44b79e22351e SHA512 78144c9ce5d5acc9d051b6d41fff2016d37062a11011ecad8ba52569c910efe5bcd5f177e576601ab4e7f7e53ce9dfe54f6a2c42cb87651ca5c2fedcf284eb21
-DIST tomcat-native-2.0.5-src.tar.gz 539017 BLAKE2B 405a4064bcf49ee04a7670c516adc64b19ebebbbfdc50735952c057d36b475c785bd9976778f491796b3fce5bd5aa158199ec624f20e8adbc65f920974543533 SHA512 03ed1951597bb6a6ade8d715546a0d635d261381737abd27b63aa552c69f9ca49405d0252b6bc2d878bfd64e87439f146ecd84ccbfc82661ba16379c493615a4
-DIST tomcat-native-2.0.5-src.tar.gz.asc 873 BLAKE2B 2e043d011f482ab963088441a37d2cfddec973253f7c909a747afac71393b76bc2e33ff37e9a18e8f9b6caac8ba86ab3a076ea722577416e4b409d8e44d56e24 SHA512 22a87c14c31bc62383cfb227e8dbd106fe017f84d802ec0e4d22d48af6ad4dd0d020bc59bed3a8335e2b4b15e0fd44ec3a4062bf86c73bbf00151c4ff0d12d7c
 DIST tomcat-native-2.0.6-src.tar.gz 539277 BLAKE2B 4a1ee7a87ff72b449a3638d38cdd40185e02ee09aa8ee9ea26ff6cfdc3f54b1e8aec6fb0296b51f8a72a72de7a9c504410d1df4d3547b709deebfb005ebbdd01 SHA512 d714fb96f880d0d565c58d25bb803fa9a144a6d87e825ad8d00aeac833b40a5512f888b94b3109853f8ee28b176b24fde95fb2d2a70ce65181a51ca7fc60cdab
 DIST tomcat-native-2.0.6-src.tar.gz.asc 873 BLAKE2B f78fb9c67632fc6fd6768fb699fa4c875db0364537ef41f6aa8c099eb05260a43ed7e2dd7b0f501c6814aff3b7d0928f318473ba78bfac7bcac3092952c08edc SHA512 6601bb1f731ad3b8ef1dbd6d2522952223d794568d42cce363ed95e05e641b2c742ed696ce65d546fcb3d0f80b362befc9cdaa060d1bd77beb90749c3a417a08
-EBUILD tomcat-native-1.2.38.ebuild 2156 BLAKE2B 13a0d01f3fa040843ddee2a13d865120559ef59bcbd42f221aacd7a572548ebac6be88241be14817add076107d167a90bac66aac8a5c49f67eb76e03e67a2451 SHA512 6ac5f17387791e2f4150ffb4692dddfaa6305744f9ab8579b4af29545da1132d4870aa1d3336988dea7465b6e487439044c9aa7463c672f878559eee5c5be8ac
-EBUILD tomcat-native-1.2.39.ebuild 2147 BLAKE2B 1247c16427ff7aa6b16914b9d29a8579d693fc909b93c6b8491cd7a13b9fcfb11258cb3a2e4cbfb34e793bc4ba7da915bc843c780e46778b786d4af442c9df50 SHA512 88595f1df6f611ca67000677a1f2d3b6acaafb241af3a91efecc8ba1068f7dcb3f92eabf691451fc816bf9815c5b2dcbdd7faa71d08264df72363bf4096b20d8
-EBUILD tomcat-native-2.0.5.ebuild 1974 BLAKE2B 3f2a64806adebb45a3c3530e418ad2bbb92a86ce1c934f5fcd1dd410249fcd01a3c68c3ea9f1194859fcd266c2d74bb6db995efc277aeea890948e66043918fd SHA512 5bf5a104946943de138ff278fac400d636f57571aafd7e8bc9fee240a12d6d83c4c2ee7382a356f4b2b973ef9e8574d443ad28df04c80957e9e05f95f1d79407
-EBUILD tomcat-native-2.0.6.ebuild 1965 BLAKE2B a90285b95c944ac9457dbaeec82c795905e23eb4230a0388fd369a9b589443a91f64a7c78c2366e2fe858f7b7c5a1d4b6801d4091d537f65a11672fbd1efd9a4 SHA512 5db45f7674cf991ac925c0d80f579d2253a090631ea15b8142261851f74f4fd2e3569f68343718f67627d4e69f84fec128499d309f01b0443a324f34d8aade9b
+EBUILD tomcat-native-1.2.39.ebuild 2146 BLAKE2B 9c99bb18856dbd741b1caae954437dcc49e288194fed98af8ac820f862a8ecabd7928222a5447299a9cc18ac2bc1c09ea6fd68345aa4de7427163c1912d97192 SHA512 d19631cd46ded750fce4d76193021408082556feb350e9d79ae4a70f10d4ea5bab33971d5459797d893b107f85ec535196bcc65109a74d8fee9009c6928f6455
+EBUILD tomcat-native-2.0.6.ebuild 1964 BLAKE2B 99aadb668c45fd8d805d32c86f607178ebd05364034e23c88cad331f5f5c7398eb47e7680754d39ca80f1bdc1ad131a52029cdcf77918c506708cd73b4947265 SHA512 4c2bc42abec62e65c67572d4564f2318e4d16b76cfbe4604a5f2d41b5dbc38196d596efcdebb6652de16497d1b81c115afa52ad487405e20922f5acd7649aff6
 MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild
deleted file mode 100644
index 13489020d644..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit autotools java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
-	verify-sig? (
-		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
-	)"
-S=${WORKDIR}/${P}-src/native
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-RDEPEND="
-	dev-libs/apr:1=
-	dev-libs/openssl:0/3
-	>=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
-		../build.xml \
-		| sed "s:\${version}:${PV}:" \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	default
-}
-
-src_test() {
-	# Adjusting "String testFile =" path in TestFile.java:29 to match ${S}
-	sed \
-		-e '/String testFile =/s&test/&../test/&' \
-		-i ../test/org/apache/tomcat/jni/TestFile.java || die
-
-	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso .libs/*.so*
-	dodoc -r ../docs
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
index 171f99f2468b..5d246c6ecdab 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
 	)"
 S=${WORKDIR}/${P}-src/native
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs"
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild
deleted file mode 100644
index 31e7d134cca8..000000000000
--- a/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit autotools java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
-	verify-sig? (
-		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
-	)"
-S=${WORKDIR}/${P}-src/native
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="2"
-IUSE="static-libs"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-RDEPEND="
-	dev-libs/apr:1=
-	dev-libs/openssl:0/3
-	>=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
-		../build.xml \
-		| sed "s:\${version}:${PV}:" \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	default
-}
-
-src_test() {
-	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso .libs/*.so*
-	dodoc -r ../docs
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild
index cdae6f3d9fd3..be927b30c60d 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
 	)"
 S=${WORKDIR}/${P}-src/native
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="2"
 IUSE="static-libs"
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 98a27abfe4b9..b7c946093edc 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,7 +1,4 @@
-DIST xmlgraphics-commons-2.8-src.tar.gz 2243271 BLAKE2B 86456adf4b9610e580b3b4f87c362dc1259c2f2bb4d4abb0dc3d765ee2cc5fb3df54597f5a5fa620a813dee83cd7549771d2b4116d20077103e389f1942903a0 SHA512 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b
-DIST xmlgraphics-commons-2.8-src.tar.gz.asc 833 BLAKE2B d68b6fe36b44764c44b67baca02a50f01644aaf2e8ed6571caeffd7724b6284860bd81d5a2ddcbefde6411bd5c9ed072f853cd178f862541f9f49aea3e023e21 SHA512 6e17a628ddd253c44d62a7f08d615f5a484bb6433482e6e217e794620396150b327f2e89836f62aafde3050ac0677432e0b12b645c57ae74cc11e093d86ac43c
 DIST xmlgraphics-commons-2.9-src.tar.gz 2236891 BLAKE2B 5071418eb2773ade7d48faa00a45834ee392603adb7844ce7b7ffc6ab41f0d655ce29265fc56326093b06b7e2cb1b1f4b95ab5e0f339c05cca4e0eb71d59f368 SHA512 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521
 DIST xmlgraphics-commons-2.9-src.tar.gz.asc 833 BLAKE2B e85533d2509dc49f42346e373a416c8215600ff84a393ca6de545fce6e73d704a8146a257522e66a254248ebdbc6770e0040658223582184e0d8fd71f95bd941 SHA512 e52f02efba535192455b47a4adbb903426e51163083297eb7be83146e2c7ead913f4c0a51345681123afa64fbb3bffcea982a81fd2b92be2aa4c135082ed8e17
-EBUILD xmlgraphics-commons-2.8.ebuild 2264 BLAKE2B a003c8ea14e16015b871d7e70b644e8dceb922c5c64588a887d33c6c26c4111b574544621011d9f557a4bdb9c4812e26d60dd1dde4c6929b629ca01662b94cfc SHA512 9dfe295ed201df01da91c8d10ca146bc1394cbbd74c3ad7fc76f1cbc5926c3f706c97390cd732bed2b37ca9f0c6ca7036adf5caa44bd3e20bbd685b37f44820e
 EBUILD xmlgraphics-commons-2.9.ebuild 1379 BLAKE2B 235b64a724e847a8ee5e858f0453a3b2ad5e4c7aacc3910ed333aedd2b8a2c2ad07662fac86f2f67cea59fbae6c1907693b199d049c12a74ea18e2acd17f803f SHA512 418415feca1d22c3933f069481b90f6048ca69531ecf7c419de6cf1959f4bac81db3224c89a3dedfd3f10f708b40d753cd997de1a007b24dc6d56663569c0bbc
 MISC metadata.xml 328 BLAKE2B 0116b6e35d9f22341807f3da68bd8d38fc43447920207a08508c46796bf1ff9d2634f38002b22139b7142c912e531d27043f629f259ab2e87d12b8e590d4b92a SHA512 74979721cdcb0c26c82a27e23043487990f41691ea1dd6acf87fb4e403dc8a44402c9907d697ac3024d754b3c504c266d51753b3cad1e4e3a16d861758574a61
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild
deleted file mode 100644
index 9ff492354a4c..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/xmlgraphics/commons/source/2.8-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.8.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.8"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="XML Graphics Commons"
-HOMEPAGE="https://xmlgraphics.apache.org/commons/"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CP_DEPEND="
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:2.28.2 -> >=dev-java/mockito-4.8.0:4
-# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/mockito:4
-		dev-java/xml-commons-resolver:0
-	)"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-commons.apache.org.asc"
-
-DOCS=( NOTICE README )
-
-S="${WORKDIR}/${P}"
-
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_EXTRA_ARGS=( -ea )
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver"
-# Some *.{png,tiff,txt,xmp} are misplaced in "src/main/java".
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "src/test/java" )
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 11; then
-		JAVA_TEST_EXCLUDES="org.apache.xmlgraphics.image.loader.CorruptImagesTestCase"
-	fi
-	java-pkg-simple_src_test
-}