Adding metadata

21 files changed, 18 insertions, 317 deletions

diff --git a/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild b/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
index 58a46065d925..1351d0ef7034 100644
--- a/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
+++ b/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/antlr/${PN}/${PV}/${P}-sources.jar"
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: ${P}.pom
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
index 7a0e524f11d2..d8c1170ea8d3 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr/antlr-3.5.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
index a28402ea4c52..6137fcfaa937 100644
--- a/dev-java/antlr/antlr-3.5.2-r2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
index ddc60fbd7cdf..57becae21d2e 100644
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://checkerframework.org/"
 SRC_URI="https://codeload.github.com/typetools/${MY_PN}/tar.gz/refs/tags/${MY_P} -> ${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/commons-lang/commons-lang-2.6-r2.ebuild b/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
index 4e9a61a966be..618ba9751536 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 DEPEND="virtual/jdk:1.8
 	test? (
diff --git a/dev-java/commons-logging/commons-logging-1.2-r4.ebuild b/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
index 9358fff71a26..d32f9e36c65e 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
diff --git a/dev-java/failureaccess/failureaccess-30.1.1.ebuild b/dev-java/failureaccess/failureaccess-30.1.1.ebuild
index b9ddcb94c91c..15e1ef59ea52 100644
--- a/dev-java/failureaccess/failureaccess-30.1.1.ebuild
+++ b/dev-java/failureaccess/failureaccess-30.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/google/guava/failureaccess"
 SRC_URI="https://codeload.github.com/google/guava/tar.gz/refs/tags/v${PV} -> ${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/guava/guava-30.1.1.ebuild b/dev-java/guava/guava-30.1.1.ebuild
index 159cb7ff0be3..8b858ee7d259 100644
--- a/dev-java/guava/guava-30.1.1.ebuild
+++ b/dev-java/guava/guava-30.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/google/guava"
 SRC_URI="https://codeload.github.com/google/guava/tar.gz/v${PV} -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
index 14891ad558a9..0161ba9419d0 100644
--- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/eclipse-ee4j/saaj-api/archive/refs/tags/${PV}.tar.gz
 LICENSE="BSD"
 # Since version 2.0.0, the namespace has changed to jakarta.xml.soap
 SLOT="1"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 CP_DEPEND="
 	dev-java/jakarta-activation-api:1
diff --git a/dev-java/mvel/mvel-2.3.2-r1.ebuild b/dev-java/mvel/mvel-2.3.2-r1.ebuild
index 9299a3c64edb..2fc29e17956e 100644
--- a/dev-java/mvel/mvel-2.3.2-r1.ebuild
+++ b/dev-java/mvel/mvel-2.3.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
index a41a8aff2481..a2a67091ff28 100644
--- a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="test"
 
 # Same test failures as before the revbumps still occur. See https://bugs.gentoo.org/827221
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
index f00831616d3a..acbb09778fb2 100644
--- a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/refs/tag
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
index facb3c26b3c8..27b01afa316f 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	dev-java/antlr-runtime:3.5
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 5fc51e30b7b1..303906b90548 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,10 +1,7 @@
-DIST apache-tomcat-10.0.14-src.tar.gz 6074341 BLAKE2B e6607773aebb5b5279720cbcf667e9f82d752833a323dd611d411bcb48d6b0f42a98b9120d2bf29bb53e563f7f421194e92a41c89dadff76db2f6aaa171af64b SHA512 13614a410ecb7d5d1e4e6cc0e5dab9fe21809a8a70b3f42d5b0f75a2006d098857395858cdfacbe84349f73c1ce7eecca59c1bdeac809f434df8ae3f4cff46c1
 DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.73-src.tar.gz 5973026 BLAKE2B d3d275b7462a3bd2ce9ce03869e09e42ec0da064eb764cf8168b8d003431d075952f15c083b5486e006629ec1f9dade154b0fceb20f2584168b36599c3c5485b SHA512 6190d78e2dd5d478131443807e464821a337c5c6c24ee91953fece377ad1c758339ce1588a7a5e90443ababac239b45e4aaa0422d68cba988d7c3da5fe95d1c6
 DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad
-DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5
 DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild
deleted file mode 100644
index 440d44e0a658..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="5.0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
index df0da8059045..440d44e0a658 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild
deleted file mode 100644
index 8846bfbc900c..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
index b4ed9827ad0c..888295412849 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild
deleted file mode 100644
index f1c865a27bec..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
index 620449873f13..f1c865a27bec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
index 5dd5a5cf1c6e..da5532327d1f 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # Tests don't even compile with that old mockito version.
 RESTRICT="test"