Adding metadata

12 files changed, 249 insertions, 146 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 85bcbb4bda71..37ef43909f55 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1 +1,3 @@
+DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346
 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1
+DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
diff --git a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild
new file mode 100644
index 000000000000..7885a6ab21ee
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:protobuf-java:3.21.12"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/"
+# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
+# And we build artifact 3.21.11 from the 21.11 tarball in order to allow sharing the tarball with
+# dev-libs/protobuf.
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz
+	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+		)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+# Once =protobuf-${PV#3.} hits the tree use it
+# BDEPEND="~dev-libs/protobuf-${PV#3.}:0"
+BDEPEND="dev-libs/protobuf:0"
+
+S="${WORKDIR}/protobuf-${PV#3.}/java"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="core/src/main/resources"
+JAVA_SRC_DIR="core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="core/src/test/proto"
+JAVA_TEST_SRC_DIR="core/src/test/java"
+
+src_prepare() {
+	default
+
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	# https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/pom.xml#L43-L62
+	echo $(sed \
+		-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:-C ../../../../../src \1:p' \
+		"${S}/core/pom.xml") > "${T}/core_proto" || die "echo to core_proto failed"
+	# Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS
+	pushd "${JAVA_RESOURCE_DIRS}" || die
+	jar cv "@${T}/core_proto" | jar xv
+	assert"Copying protos failed"
+	popd || die
+
+	# https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-sources-build.xml
+	einfo "Replace variables in generate-sources-build.xml"
+	sed \
+		-e 's:${generated.sources.dir}:core/src/main/java:' \
+		-e 's:${protobuf.source.dir}:../src:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|echo\|mkdir\|exec/d' \
+		-i core/generate-sources-build.xml || die "sed to sources failed"
+
+	einfo "Run protoc to generate sources"
+	protoc @core/generate-sources-build.xml || die "protoc sources failed"
+}
+
+src_test() {
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar"
+
+	# https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-test-sources-build.xml
+	einfo "Replace variables in generate-test-sources-build.xml"
+	sed \
+		-e 's:${generated.testsources.dir}:core/src/test/java:' \
+		-e 's:${protobuf.source.dir}:../src:' \
+		-e 's:${test.proto.dir}:core/src/test/proto:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|mkdir\|exec\|Also generate/d' \
+		-i core/generate-test-sources-build.xml || die "sed to test sources failed"
+
+	# Remove second exec from the file. Makes trouble here. We run it separately.
+	sed '50,54d' -i core/generate-test-sources-build.xml || die "cannot remove lines"
+
+	einfo "Running protoc to generate test-sources"
+	protoc @core/generate-test-sources-build.xml || die "protoc I failed"
+
+	einfo "Running protoc on previously removed test-sources"
+	protoc --java_out=lite:core/src/test/java \
+		--proto_path=../src \
+		--proto_path=core/src/test/proto \
+		core/src/test/proto/com/google/protobuf/nested_extension_lite.proto \
+		core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto \
+		|| die "protoc II failed"
+
+	# Ignore two failing test cases from CodedOutputStreamTest.java
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testWriteWholeMessage/i @Ignore' \
+		-e '/testWriteWholePackedFieldsMessage/i @Ignore' \
+		-i core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java || die
+
+	einfo "Running tests"
+	# Exclude MapInitializationOrderTest and CachedFieldSizeTest
+	pushd core/src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-wholename "**/*Test.java" \
+			! -wholename "**/Abstract*Test.java" \
+			! -name "MapInitializationOrderTest.java" \
+			! -name "CachedFieldSizeTest.java" \
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild
new file mode 100644
index 000000000000..ef157767a703
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:protobuf-java:3.21.9"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/"
+# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
+# And we build artifact 3.21.9 from the 21.9 tarball in order to allow sharing the tarball with
+# dev-libs/protobuf.
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz
+	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+		)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="~dev-libs/protobuf-${PV#3.}:0"
+
+S="${WORKDIR}/protobuf-${PV#3.}/java"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="core/src/main/resources"
+JAVA_SRC_DIR="core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="core/src/test/proto"
+JAVA_TEST_SRC_DIR="core/src/test/java"
+
+src_prepare() {
+	default
+
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/pom.xml#L43-L62
+	echo $(sed \
+		-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:-C ../../../../../src \1:p' \
+		"${S}/core/pom.xml") > "${T}/core_proto" || die "echo to core_proto failed"
+	# Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS
+	pushd "${JAVA_RESOURCE_DIRS}" || die
+	jar cv "@${T}/core_proto" | jar xv
+	assert "Copying protos failed"
+	popd || die
+
+	# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-sources-build.xml
+	einfo "Replace variables for code generation "
+	sed \
+		-e 's:${generated.sources.dir}:core/src/main/java:' \
+		-e 's:${protobuf.source.dir}:../src:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|echo\|mkdir\|exec/d' \
+		-i core/generate-sources-build.xml || die "sed to sources failed"
+
+	einfo "Run protoc to generate sources"
+	protoc @core/generate-sources-build.xml || die "protoc sources failed"
+}
+
+src_test() {
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar"
+
+	# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-test-sources-build.xml
+	einfo "Replace variables for code generation "
+	sed \
+		-e 's:${generated.testsources.dir}:core/src/test/java:' \
+		-e 's:${protobuf.source.dir}:../src:' \
+		-e 's:${test.proto.dir}:core/src/test/proto:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|mkdir\|exec\|Also generate/d' \
+		-i core/generate-test-sources-build.xml || die "sed to test sources failed"
+
+	# Remove second exec from the file. Makes trouble here. We run it separately.
+	sed '50,54d' -i core/generate-test-sources-build.xml || die "cannot remove lines"
+
+	einfo "Running protoc first exec"
+	protoc @core/generate-test-sources-build.xml || die "protoc I failed"
+
+	einfo "Running protoc second exec"
+	protoc --java_out=lite:core/src/test/java \
+		--proto_path=../src \
+		--proto_path=core/src/test/proto \
+		core/src/test/proto/com/google/protobuf/nested_extension_lite.proto \
+		core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto \
+		|| die "protoc II failed"
+
+	# Ignore two failing test cases from CodedOutputStreamTest.java
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testWriteWholeMessage/i @Ignore' \
+		-e '/testWriteWholePackedFieldsMessage/i @Ignore' \
+		-i core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java || die
+
+	einfo "Running tests"
+	# Exclude MapInitializationOrderTest and CachedFieldSizeTest
+	pushd core/src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-wholename "**/*Test.java" \
+			! -wholename "**/Abstract*Test.java" \
+			! -name "MapInitializationOrderTest.java" \
+			! -name "CachedFieldSizeTest.java" \
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index da8f15e2ad06..746d2c7c6a0f 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -1,5 +1,3 @@
-DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
-DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild
deleted file mode 100644
index 5bf204df801f..000000000000
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.tomcat:tomcat-el-api:10.1.2"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Tomcat's EL API 5.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="5.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-11:*"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-S="${WORKDIR}/apache-tomcat-${PV}-src"
-
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="java/jakarta/el"
-
-src_prepare() {
-	default
-	# remove anything related to "el" or "jsp"
-	find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \
-		-exec rm -rf {} + || die "removing jsp failed"
-
-	mkdir resources || "creating \"resources\" failed"
-	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
-	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
-}
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild
index fc428cd76e48..56e06f95d3d0 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="5.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"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-11:*"
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index da8f15e2ad06..746d2c7c6a0f 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -1,5 +1,3 @@
-DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
-DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild
deleted file mode 100644
index 30e80c0e6e49..000000000000
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:10.1.2"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Tomcat's JSP API 3.1 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="
-	~dev-java/tomcat-el-api-${PV}:5.0
-	~dev-java/tomcat-servlet-api-${PV}:6.0
-"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}"
-
-RDEPEND="
-	>=virtual/jre-11:*
-	${CP_DEPEND}"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-S="${WORKDIR}/apache-tomcat-${PV}-src"
-
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="java/jakarta/servlet/jsp"
-
-src_prepare() {
-	default
-	mkdir -p resources/jakarta/servlet || "creating \"resources\" failed"
-	cp -r {java,resources}/jakarta/servlet/jsp || "cannot copy to \"resources\" dir"
-	find resources \( -name '*.java' -o -name 'tagext' \) \
-		-exec rm -rf {} + || die "removing *.java files failed"
-}
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild
index 4e8a67f38a9a..e43c05b27418 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 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"
 
 CP_DEPEND="
 	~dev-java/tomcat-el-api-${PV}:5.0
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 8c05e2d9dba5..7e2dd26c9767 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,5 +1,3 @@
-DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
-DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild
deleted file mode 100644
index 38370ea2c1d9..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:10.1.2"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Tomcat's Servlet API 6.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="6.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}"
-
-RDEPEND="
-	>=virtual/jre-11:*
-	${CP_DEPEND}"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-S="${WORKDIR}/apache-tomcat-${PV}-src"
-
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="java/jakarta/servlet"
-
-src_prepare() {
-	default
-	# remove anything related to "el" or "jsp"
-	find java/jakarta \( -name 'el' -o -name 'jsp' \) \
-		-exec rm -rf {} + || die "removing jsp failed"
-
-	mkdir resources || "creating \"resources\" failed"
-	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
-	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild
index ad529b04d70d..3a19ce54b1b8 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="6.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"
 
 CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0"