gentoo resync : 08.10.2021

23 files changed, 189 insertions, 130 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 09309a8a066c..f45d82a5fe85 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ecj-gcj/files/ecj-gcj.in b/dev-java/ecj-gcj/files/ecj-gcj.in
index 4f838d5de240..4f838d5de240 100644..100755
--- a/dev-java/ecj-gcj/files/ecj-gcj.in
+++ b/dev-java/ecj-gcj/files/ecj-gcj.in
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 1ecf4e8a8694..74c0d1d29dc8 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -4,4 +4,4 @@ DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc9
 EBUILD gradle-bin-6.8.3.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
 EBUILD gradle-bin-7.1.1.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
 EBUILD gradle-bin-7.2.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
-MISC metadata.xml 468 BLAKE2B 698362b78aa0659fcdb08dff32a683291f3d44f221dd1d3fa965c74cf118c27d07d40463348418f868a95fdea8bca7eb5475ccb88db781725cddd27fa7ca19cb SHA512 177c4394cbb979b83dfc6993178257094bb6282af4e7250ec1acf085debc65067eb75593b718a93622154ed2cb18de477da4ee5abdd558e44f79549918de70ab
+MISC metadata.xml 356 BLAKE2B fa5433b47d358144596ec5c02ea3d766d13561cbf383a2dcb492ca66f9ebae593e12534630edf229ee6e136f336a0ff091dedeb67e155cb43bd219284fd1f4d3 SHA512 d8e58592957b0707bb016273f8209e3ba975a907a691b60d610e8ef4204a62ed89e4475b8b198659afb9f9b654b71c0f52eb3ce7a00e46fa17831da69dc24470
diff --git a/dev-java/gradle-bin/metadata.xml b/dev-java/gradle-bin/metadata.xml
index e5267d55b26e..a16401d9805a 100644
--- a/dev-java/gradle-bin/metadata.xml
+++ b/dev-java/gradle-bin/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="person">
     <email>flow@gentoo.org</email>
     <name>Florian Schmaus</name>
   </maintainer>
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index e466d9493111..7d608340d2da 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,4 +1,6 @@
 AUX htmlcleaner-2.24-fix-tests.patch 1351 BLAKE2B 995c788b1e33d1997ee9e0f72f417d8d3c69e2f9b4e71ee666b62db40b0207c816af50a7af833974a22bebd6c4624723e5b3de9e13716043049737987b304499 SHA512 071f7f30a12e0d7a9f7e50b1412852efb030e6a076816606711935e2f79b9df0ce48a8197f1c0b4d294378de4af055f9cd829b28a6cf243524bfc9983a96dce0
 DIST htmlcleaner-2.24-src.zip 413806 BLAKE2B 26ac6d150607c3ee00a8afcf58fed313ac570178f84c52a0fe43b0d324e3b32bb60f63db9ae5f171e7a6a7517799c633f85abfeb64e3f7421d655842bb5a5610 SHA512 beb16e383b6d43d0dfd4697b919a30c1a74eea824976521475c458bdda6c5f0eb22f299eddae033cb190a2af4fafde7e7f2c8ab1378bd82f15842a3ca8ebaaff
+DIST htmlcleaner-2.25-src.zip 414193 BLAKE2B e840b65665b23a6c55eda49a522994208b7178ddf924e60bdca9304c58df9bde343b31bbd4b7491db7bfd4fe0930283f9019d9213450618e0d50036563cced86 SHA512 fb49f0298b05008a727e7ba97a3444c6f8c31f65a9962e42bae63e1dab76fc7302f282daa45177daffcadbb73565685735f44b57107c62819bafa0db030c5ea3
 EBUILD htmlcleaner-2.24.ebuild 1671 BLAKE2B 150e6f7606158b72df11ab119df62d4760bb291807360df18bef0c5314d75262fb5c213a961f6d1e0b18e12e39d12a03657ffd1370c00165b316b0781777cfff SHA512 56aec335f34b873113c5c5547eb551b376bdce7b6d12100692980f74b59b0ef0dde6099453ec7523ab0e43c722cc702dc6559551ddc599bd26e26236323268bf
+EBUILD htmlcleaner-2.25.ebuild 1677 BLAKE2B 5d60d3be5fe87752064d2b846004b02f153206f98359ef56441fd8b3abb6243dd4eea9804dcb3666a720b10ca9757e3b9fba46c8673412187412f46670a9ecc2 SHA512 0ac5c9349bedf40ef5b03757bfd782a87172ccc595c1cf1ac922b22b1efec72e2236ce7ce777b465e25b817ad41a2745c4a789b3bd95fb42b0eaf1e52493efec
 MISC metadata.xml 957 BLAKE2B b3efa9952daa1c7027db845d6a7f8c079240c2128d8bb454490990722f2cf66c0f6ebfca4795bd0d166d45e6b4dc764c0ad6bdb53b95945043cf864b6e9d0f22 SHA512 b804e88d45556cddf4a6e2da621a8eb971935370b82c875a9e0dda0772bb23b94a874214d1727335b3ca358f5d10bd363723ba8629413f9169dbf28dd0ef588d
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
new file mode 100644
index 000000000000..e4d64cd88b02
--- /dev/null
+++ b/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task"
+HOMEPAGE="http://htmlcleaner.sourceforge.net/"
+SRC_URI="mirror://sourceforge/htmlcleaner/files/${P}-src.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-java/jdom:2"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	dev-java/ant-core:0
+	test? ( dev-java/junit:4 )
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="
+	app-arch/unzip"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="jdom-2"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.24-fix-tests.patch"
+)
+
+src_prepare() {
+	default
+	# Don't require default.xml to be in the current directory.
+	sed -i "s:\"default\.xml\":\"${JAVA_PKG_SHAREPATH}/default.xml\":g" \
+		src/main/java/org/htmlcleaner/ConfigFileTagProvider.java || die
+}
+
+src_configure() {
+	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core)
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-ant-task
+	java-pkg_dolauncher ${PN} --main org.${PN}.CommandLine
+
+	insinto "${JAVA_PKG_SHAREPATH}"
+	newins example.xml default.xml
+}
+
+src_test() {
+	local DIR="src/test/java"
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+
+	local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "Abstract*")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 0403c3d1a9d1..0f0b2518e385 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,3 +1,5 @@
 DIST apache-maven-3.8.2-bin.tar.gz 9338426 BLAKE2B b39c9c87b6d05d633172152598496b6cb9b82c64c0572426c6a612ecfcc6d087085d58fdcaef0b61f5554c2b58e90b47bb0e6844dacc88c95bfb72ffc618e355 SHA512 b0bf39460348b2d8eae1c861ced6c3e8a077b6e761fb3d4669be5de09490521a74db294cf031b0775b2dfcd57bd82246e42ce10904063ef8e3806222e686f222
+DIST apache-maven-3.8.3-bin.tar.gz 9042049 BLAKE2B 2709a47fddca340d9ddaa1f716990e5a4580667169552cedcda2f2017b190cacfc545e2d5b0d5aaae5f95172fb49201eefc4edaff1009f855fb93065e0de6919 SHA512 1c12a5df43421795054874fd54bb8b37d242949133b5bf6052a063a13a93f13a20e6e9dae2b3d85b9c7034ec977bbc2b6e7f66832182b9c863711d78bfe60faa
 EBUILD maven-bin-3.8.2.ebuild 1372 BLAKE2B e31f57f1f30b411ae889b6b210cb0689c2b800e99f97de192648e828d78700201391269f4c9ac62c276699e1fe987a5e0421ff694aaed9299e65656d1e7ac704 SHA512 f742703fc9096acbd3f7edafa2040cafe74d2a6c4f0de7cbdafc1f07d4a57a60657f6a293e8523fb6678be9bc61e306d398b33e91f7af74319bc0da5a4455a30
+EBUILD maven-bin-3.8.3.ebuild 1374 BLAKE2B a6f0026867f2142587b626b74bde23dd7b3d8079538b48644452ba633d26fc6e925d7fb5d9be4608728250619d6865125580236877dcd4ea2bef4d4175061dcc SHA512 160579460a6c14784bab62d786b45c55998ef836a8172c0366f95d25548fbe918563082483a5cd383d165aa7a189765378060ed2bc6a385969fd05ae140c1239
 MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.8.3.ebuild b/dev-java/maven-bin/maven-bin-3.8.3.ebuild
new file mode 100644
index 000000000000..3d422db02a49
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.8.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.8"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+QA_FLAGS_IGNORED=(
+	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index f7f778fe81db..e3da1c3c042a 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,6 +1,6 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
+AUX openjdk-bin-17.env.sh 496 BLAKE2B ccfd99807b5b5990381c8be464d5084159bde9a39872b468eb00acc1832a465cc0ad70bb1e9c97e7632e86ae9854a7f2557f8994e18219c52f281908e975151c SHA512 3591f5b574ab0eff5b414a9414f114c1bc863427144847229041ee0fbab22a925c24b8c3b7b057a6c3d34dce4a9b5aff0c60caeb1dd6d709ddd63aebe870e336
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
-DATA 2 3604 BLAKE2B 0849e85bae2bdd6a583fda88f0b3ae1dd4c8700eb3578e6abd6834131940302af402d633749204a173b36dd484486b9a697c5d7d50a90d81956b6ac591906650 SHA512 c11400ae1db514019262a9768ce68fb3536338755d2dde118bd19e6ff5f4f23ae101ce0b0d5b18111ca3aab6778f13ed4ae8d10dfbf6e6b1ffe1c55c4d318249
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz 189549576 BLAKE2B 9eb55593643911573dbb7aa0f69169cf63c0cd8d0a4b4d3a4bf42131f2dfa51305c55c26e802f07fddd70911dba20c4d7b57983782aa2da61fa730f12258a94c SHA512 f2aa4514bad0a4116d0b703adef866f420b1bf264781b58d4075c54747856a657ec7fd1ef622712419823f76a87b9965426f59e5c66b21dbc073387e66f949a9
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz 189702606 BLAKE2B 110b03fdc85f9456b253569caa6f6be119045cbecb8e13cd1ecc1566236a9ad860dddad9d46ba88c46396a16f27f080364909bf1587f5bdc96e72c9d0ba0b165 SHA512 c6122bae7269143638e43191505e9ea2265280d039de89b7bc2a79aa89eaa3a1658765d8490c4e363e7e7982575bd309f7e6ac18c4fc7bb915dca2b27e7a6a3f
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz 180784025 BLAKE2B c15ae126f1c2bb00f97571d4bb3316ecf5ee36a18895eefb48db616996dcdf363acbbd8ac17ecb6a507cc0f3a811f476cd72993b42e0a0b857b82c3e2d4d5279 SHA512 33cdc99dcf119a3f5161cdc08853ed1b8a1630f884577b6a167cf79621b0fa6f87ec652452fce0e27ee550b63952fcf75a3a6bd70c61564faafc0e8e1c74c0bf
@@ -11,6 +11,11 @@ DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz 192792051 BLAKE2B b11a093
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz 192983830 BLAKE2B 4d97711e37b72bb24e9feb14b4902378d02e7bc4fa1f12dd40a277957ebb4b36efb115666124337331bb95a1f53ae3b13ffeededee8c3c0eda66ba9abf937bcc SHA512 73b7c430d4095fd518191a9d85eebb2749d4940eb64a95cca8f3c6fe2392a71239e264b47f4f74b433c488aa0a80cca610c87a49bbc143da1c15b45fb491c62b
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz 186275966 BLAKE2B 09c54989a7d1c4989946bd1afe26c3254e2a0294ed4a8ae92e1e3e62f7e53eff7e30739b362d8a07cfe601633850efa4ad91445d474e1de196fd5b88d4e14338 SHA512 04bd14301bc9e1601096141c4c8d8b1637a8a99f8bf66d60081e5a36360440d6eb87d595df6b4b34fb44446746681774b2761fe837f3353a4e5bd5669182a09e
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz 191257594 BLAKE2B f747b108b51f09d6e15ca009291a5f5d81f46d55357c2d80351b3d20b459c37995fe434ffb2d666d64e1311ddc510a5a73a49f0d19c00767dc4749e06e432cd4 SHA512 e38bf5a31c3e453784d4067601b3f2125d528f8d210d3a80910c66fc70b5a5beca56dbc0328ee3add99776bdd6d6284506803e553540ae434c438f2dd706e268
+DIST OpenJDK17-jdk_aarch64_linux_hotspot_17_35.tar.gz 188907472 BLAKE2B 7159e03fe2a9ae79bea6130574b484e9f1ecc0549065d31e019f9d90c299be4b4f4a09bea85e6ebb13eabb5eace3db0283f00f19d7bdf362e52849aeb476adf5 SHA512 1daec8504962c06cbafeb3265edf5e220adb75e7b9d11e8f92b784ee273623b770bb38182dbbab2ffd8751254667d972c99f3d859620751f94c9c1d1b603546d
+DIST OpenJDK17-jdk_arm_linux_hotspot_17_35.tar.gz 188807831 BLAKE2B 55e0d944f5d2f7f09ce9a6bd87d6d432f9b086083f906fa9aa6f85f0e006cf15bb88cc6433ce41d6840ab2d7bc6d07223b51a1855ceb937aff6d0142c3f87c63 SHA512 a20c0de63ea404653e54b7eb30fd9c8c66cf6aae43845fefc7a67edbfc60e777fc4bf1a16a7958a56b36a868a8b4ce75e065b78ccb74a8ff26efc61a90d6e498
+DIST OpenJDK17-jdk_ppc64le_linux_hotspot_17_35.tar.gz 187664371 BLAKE2B c12df4a24cd14fb57e6757056931da69b067576d22fdc9493c3d8eee34cace10718dc234b4f1cf6b525ee082752cdc7de9e1bc6467f2ecfffd5fa391095662e6 SHA512 c1f3ce3d8d7e33dbf1a838fee054741cf1aa6133fe375ec8c8508072b9da78158bcbbe633f4cdd3b1b8dae4915418b26de2fd218354ae2264a3694aad5fc9cd9
+DIST OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz 192014376 BLAKE2B 6707451ca3aaa22f232592f6497899f4751a67cfce5c539a275806b551d3494c686905dd91c03ba6de64afc65841d1e9836a1dead4ce55d99df3da4a077aecb4 SHA512 9af1945e46a1b444cb49ec8e58e14650098266e29973688c2a25b3707d23bf90b0a1287ad0ea5c467425f959354359fcdf1eaa8bd68e784399a6780298b22a44
+DIST OpenJDK17-jdk_x64_mac_hotspot_17_35.tar.gz 192417649 BLAKE2B 53fdd3f71b9c3860231451eb0f59414c03a863944c9b7f2106490c1d39a8b94715d1743bab10959fe513277f5fa9a4d397c76c464680f9b1f35d879e7c82ff05 SHA512 ebe2f1f936c93150f2bd5e2bb9b07b572eb14abd71ad7446dd0f5c511c8b6debc882d6ec69376b55a50b964c9a2b8efb52db96de1041dd2aa857bcdb64915494
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz 102111219 BLAKE2B 0af54c05957c3f56c495cc83baf68f27fea4773ab4577b212e8abd19e7c7be123c067cb614fb42a320a865c3ab96c9e6ae663d96f79346f73282d99ea8aba5e6 SHA512 43e74f8029cb0d0ea48c6af4e2b8f00c4664264a51803acf0f539efb117be2dadf4c6a216ecf81c86e24152e6f87933f7a9e97bf4ba526eb01557bf561c2cc22
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz 98376195 BLAKE2B 55ae7181b8e4aa5d3097bee40a5acfaee48a2f208e4362e74cdec1647460770efe49b774b22188c78ca6816716ef20173471b881ce3f75b0d90e95740049f4c7 SHA512 d2c88712a95bcc96172b6b589493038d8e721eb7ec4ae546dd998d82a5148dd5ada6e22c92bacaec2ef88e47a75761d283d1f73983f1848a631e00c5833901ee
@@ -22,7 +27,8 @@ DIST OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz 102954777 BLAKE2B 8df9f811f
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b201478dbd439603e19df2c0b699cbceb679dd2fae14f72a19550c78cf52e7932f4816491bd04ec6556e157b7010518d1ffde4a3e99fcd9e183a721 SHA512 044ffada083a0ca32209513d7bb4ad51af9667611635a2a343e01b0d07d30257493ec1439ed104b094ef88844c1ed69671e3a8f413b51468e15f6172220747ae
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u302b08.tar.gz 107303398 BLAKE2B 0eda36bfe60a870d7389eef6f5babc96e7777896c3a3fe584cc713db962175aeb504ec3b69c4a8f126568596b81ad3df855097d5c179dbada10545bee3771cab SHA512 a0bd5d487ddd1d0370b20879249b63981b9739455d280c3e7d9a13d62e5f255a7f9cc34e892c45bcc2f8dce0e29c9f93842a99ab909b63432e194eeaf3ec494b
 EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3622 BLAKE2B 2406f9ed451ea6433bbb399d3b6d141876192abbfd79199361a3254206644e0dd7dc310b7859dd594568052df8aa75330d2603073627c81c02c94d5bf63542af SHA512 cb02764cdca39c3dbd525d2604378e4593919c2a94b16deca5a34cdba00932d370ecc295a09697bd4fe81dee0e47c16408c2805a6c3cebbc37a8fb1a6aeea73c
-EBUILD openjdk-bin-11.0.12_p7.ebuild 3619 BLAKE2B 2ac588ad46b86ae162b8455572b49f7e81feb4945fafa227a63ede23b2be2e30fecc8af1b612528fff5cd962c5b33397bc8472407569bc9454776c0da0c5eef8 SHA512 8fdd4eafb58786e1ab086d0712272d8af2f820a64ec5c638c02719d4fa43fb05954e9c03f08c6cf19caf944a1c10cdf21348edea7e0ae1c5746f8ed02bd8583b
+EBUILD openjdk-bin-11.0.12_p7.ebuild 3618 BLAKE2B 7ea41f851fd51bdea387e959721f4a2c5843785460f5897eba27e0a088cfbb52ae953941a8e3a64dfe18ef052a3ab293ed58bc6ac2c70f55037e4d3de7c61f65 SHA512 9fe249b28a686b596e45c4d904cf54abe8eb2940783f9701eda0bb234dd19cd9cf249f1fa16cf2f43be3b810322900b10a86d4f5d8e85567918e9246bc3c4c4c
+EBUILD openjdk-bin-17_p35.ebuild 3629 BLAKE2B 7004f68a190ecd65b005fb402a10f2121e437beef6056393afa7f4189d5e4f5ed6c2c27719f6eb797397b418221b898d4754dbb5f2c28b51ef842aefd5f153a1 SHA512 c8e9ca7a10d8a0bdf69e1957d080c696a4451e8bf8633633a095e1585a13d7234435d7a4532ff55f994f34ad8bb18da534183670295a027a00c38ef1fd823a48
 EBUILD openjdk-bin-8.292_p10.ebuild 3052 BLAKE2B 65641297f9bd53fcc2db687520cadf650e8e342e6920694507c1bcb2e7356c8d849f90b1946098ab40339b26810f369aa7cc3ea55ab9fef809de3365d225e877 SHA512 ce12ff1d1f36f2ac0c44fde0c35af334d4a43e76a217f1f943261e2971ad41539bfb933ff7ab584826b096d16e13c1ee0a3447e3b22a65361cf1a400bcc29387
-EBUILD openjdk-bin-8.302_p08.ebuild 3049 BLAKE2B 28da8ff195565c8ed06235ce2ef9ead6fa21d4edae4a1c8b172f8723dddbf72e17ee812afc970cdca9a56ea2d473d76abeceb7a1d7c4da6c8e289c71ea00a6bb SHA512 7cb3b13cd6dcadec23f6a890fff894718890542e66d1a564d936d1887c1348beae8c7320b4653293f25e5f1e6f090a9800a5d1272e40606a019172622956d2f5
+EBUILD openjdk-bin-8.302_p08.ebuild 3048 BLAKE2B 7c5b1f0dc83fe6c27feb67a4268fc5353ec08556486b1be745aca38d259d7cea632a452a6808eb56d4b43f0bc728d71ca3b545a45fb58a783824db46ac468d23 SHA512 df1ec46275ab1cdf8fc091da0ea1901c1231bdb1a002a49fbeddd3de09268cd69917ebc3f4707c83a93a823db52d59bef897ce6fac9b9934172ca6c55a744bab
 MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
new file mode 100644
index 000000000000..6dc16a10bff2
--- /dev/null
+++ b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
index 6bd34d6f19ac..6c91078ca3a6 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/2 b/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild
index e12c387ddb3d..e7f747915308 100644
--- a/dev-java/openjdk-bin/2
+++ b/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
 		*-solaris)  os=solaris  ;;
 	esac
 	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
 		)"
 }
 
@@ -20,6 +20,7 @@ MY_PV=${PV/_p/+}
 SLOT=${MY_PV%%[.+]*}
 
 SRC_URI="
+	$(abi_uri arm)
 	$(abi_uri aarch64 arm64)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
@@ -124,12 +125,12 @@ pkg_postinst() {
 	if use gentoo-vm ; then
 		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
 		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
+		ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
 	else
 		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
 		ewarn "will not be recognised by the system. For example, simply calling"
 		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
 		ewarn "absolute location under ${EPREFIX}/opt/${P}."
 	fi
 }
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild
index c5ca96ab59bf..f76e6a2e0cb0 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild
@@ -34,7 +34,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 4ba13e902aef..2044f1f0520d 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -36,7 +36,7 @@ DIST openjdk-langtools-8.302_p08.tar.bz2 2401910 BLAKE2B 64e1d65121bfc75314b0f42
 DIST openjdk-nashorn-8.292_p10.tar.bz2 2849397 BLAKE2B d875dea02ec8a3a3cba49f173f42ad7d73d15492cb86a15b095063ad327655ab9c260571c8a8ed35daf4078d52eb24d58b04125d3cea148bbc9e3fe924375c45 SHA512 4b707059bc6b217bdae2d9ea685c18b9cc3759180d5dcb5e51ad4eb00e6e660ca6181a68427f1e53c81b9636a323c1229e19de35b51e14a5d599cb64412ae11f
 DIST openjdk-nashorn-8.302_p08.tar.bz2 2848729 BLAKE2B 75cb7e04c0b398f7b5443738b08473a4a806ffbd416828dfa9d7696e11c4ed28337330a4ba19794394689d571a05e6dd95ffbb047482b744cf25ac9551e94100 SHA512 c0634948d4d35271c27009108c322779ee67cdc764c3e49aeaa0bf9e59729486bdaf7f54dcd5289e82fd0e83f03f68a04597d187d37ccb4aa5b2e93f30111a06
 EBUILD openjdk-11.0.11_p9-r1.ebuild 7792 BLAKE2B e56b763df2fd4006fb19f4ee4fcbc661bd7e2cb30bba2ccf203685bb7e194540d9cc39d53c6e1f7b8f19353a9dbf964a47d43b816d45cfbf22a339a373e3e28b SHA512 e11ee803045f9fd994ccf4ee617aceb31a527a64b568290a46f7f36a260c2a0587dc65c1104780a54d4d73110027d83dc077e2c1703ec2e932ca090b54390db4
-EBUILD openjdk-11.0.12_p7.ebuild 7794 BLAKE2B 253760c7359b3b9f984286fcb94752fa2bc704bf3a532cd833608180afa1d602a1d5f2e617a8da9cd84607ca06404e4b64e34229de584e52d4e6c4dc2299b33f SHA512 f59e09544e0b9f58733f65bec6751d670fc6b6a69d0645930889f4ae521a75ec5c62ca804d1dee15d5467f901e26c86e1a41ba1c2e06a9ba94b647615262e6c0
+EBUILD openjdk-11.0.12_p7.ebuild 7793 BLAKE2B e6c81ae0203613ff9151c388c7f706e9cb314a113501a2d8707e14026ba7dde339e9522d611dd9cdfa0339f2c6a90b4a403a7e293181f3db4479ab75121255c8 SHA512 da62cee1d726339b8555d1db5826a5ef2263a54f29958b26405c261ffa365345a87cb8ec05b0acf78b87e2d9800ec5fe2133dad69b0125c6226966a0816cc394
 EBUILD openjdk-8.292_p10.ebuild 7313 BLAKE2B 1c5db4f660ab13a3bdd21e009900fd6f4f7b79005f89da8c802e611cb325929f42eb60f59c88220fc2d865fa5554d0b88c09846767e907c11d787a9433b6cee1 SHA512 eb35e875c863ba47d1a1b6de1f493ff2efdd5bc82a82be775f9977ffc46cb64854f9576498aba8cf424bdb78003c1301efae487c7223b4ef138f1efbe7e51b2b
-EBUILD openjdk-8.302_p08.ebuild 7316 BLAKE2B cf7c98fcb4500366b67dc47dc33d44a967ede29f7ccd8fda721d54a2ff45b964f6617441c3f2e86a19601137289fb953a804941469c41d2e9c8982f07bb57eb7 SHA512 a2ec7e179ff71e05b77f9017f20f979a8833554cc4a566be7242f7fa47fff61d9562f5fccc89e0ea88c957c48d10d79bd802427a348d8424254777e239775399
+EBUILD openjdk-8.302_p08.ebuild 7315 BLAKE2B e3c1fa880c236700019e5ffe4d63767c3b4a20ecd5e4b31905d60b079e4b8326058cac97a4db5970a3fc30dfe42f682937e45a8731a6b3f4468598c955d8e12f SHA512 a494bcb6e77f7e00691df22eda50f1028aef090c83102e6d01b8fe351674e1373d3ef4799ad9db4e188deed7401f95c64883983a6a01a0dc10f6b3ea8e7c1e95
 MISC metadata.xml 1433 BLAKE2B f1c32727711519e4f3ecbaf9f9be6c025b467d93e2423bb5e6d9f3644242ad8f356204e7a804b0fccb56a3df5b9283cce305e82b19659a1c39bffc6b65676316 SHA512 cee169279a8c13fd3bfbc89eb1e0ecdda9a34214d001cf941f08abf89516f224e1532e916bbdb6597c56bd6a1df18ede2c4bb18e54c5e4ad67be70250f836fb5
diff --git a/dev-java/openjdk/openjdk-11.0.12_p7.ebuild b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
index f96a8a2c0e7a..29fdbe9c1a1a 100644
--- a/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://openjdk.java.net"
 SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ~ppc64"
 
 IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
diff --git a/dev-java/openjdk/openjdk-8.302_p08.ebuild b/dev-java/openjdk/openjdk-8.302_p08.ebuild
index 61e3e894524f..e358542ca062 100644
--- a/dev-java/openjdk/openjdk-8.302_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.302_p08.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
 
 COMMON_DEPEND="
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index aa790920bdb8..2421ac15c1ae 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -3,28 +3,26 @@ AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
 DIST apache-tomcat-10.0.10-src.tar.gz 6032784 BLAKE2B f73d2b0d549d773a13a8adcc76a87713f0f146d80bca2d2ba633ce3145d69505fb7172eac0f04bb6d10fd9f9abb0cbbca7fb6d5b4608e2f6f07df88e5e661d70 SHA512 6241a62d01dcbf37e4745803c77dfbc4307d43c884e8e4c78c33b10d45a9b42e0103ef94acaff19790fa4876bdb369e9aca4974a4dae2622cedfa56b3fbe0658
 DIST apache-tomcat-10.0.11-src.tar.gz 6065513 BLAKE2B e734a3f5086d94dd49886a1fc7e1fddc1b500240837ccba945dc0d10ad5aaaf580d1b9e2c78aca8af474c4312d723bc4095ec8e90a14f0bd7f292b9333bc554f SHA512 c06f4069c1664483f176231dd9fe132c89e7c66f845d82b41d6c962ea2d2ba2d3c6004b6a875388925ba295761f533ced416fc91261ecb97d11219a87940db2b
-DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B 86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948 SHA512 c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c
+DIST apache-tomcat-10.0.12-src.tar.gz 6066701 BLAKE2B 24acb9e10de923c9d6443c956cd6e6c5b5463f4f6af72d89445c7d635731449afc9b7050c95af3cbd3653168c073840f02472dd01bde65c1bcbdfcba41814117 SHA512 753d36edb5ce873e346856305d6a7f40d762ae8fb9ecd20406ed9ff400e9e1261f66d4549fc98f20a05b01136ff4beaacb462147e84a306858e2acc7fcd98d5b
 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.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
 DIST apache-tomcat-8.5.70-src.tar.gz 5939095 BLAKE2B 9a2bf14c9b9f551af15ebf2b95ffede140b3accdb9fc1b9836c980169b597e8c796d5aa59df28cd42ccff67dbda83c7b7ced8b0ac2954a40214a0767ad8b90ce SHA512 fe752c4196d12496a3dcb4e6b59df30da10cd52b8642f9273de7158dcf6dd16d2443675744db0033e6dc5c1cf0aeaf0125c9921e1e36ceb8dea9ba58328a4133
 DIST apache-tomcat-8.5.71-src.tar.gz 5945776 BLAKE2B b7a5b344dbe09ef88ee046dcce701ea65d8587f1d8c2f980c67fff5466979d15dea019a9abae6d48a45797a989ebddb4dbdbc5196c8740cde9ebc45041b857ef SHA512 df99749d7ef387e29c1d2976c584dc219fc8764f618a004a646564315ab3f00a71ca94408d1fbaff20c3bab3911c82af4f7cf2ec02f0408d9e829c27f8aabdba
-DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
 DIST apache-tomcat-9.0.52-src.tar.gz 6110883 BLAKE2B 8d2d4e3640fdc43a3b20d9722a73a8756de7ad71b2f05e8b2090bc712811cfcf6f8e79eeded039291b9306d1c49aec46fe8c7e347aab10384ca293894984ab27 SHA512 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d
 DIST apache-tomcat-9.0.53-src.tar.gz 6142608 BLAKE2B 71f45e04ac01221cbfc6e730066e1aa7f5d65d31a497a775a3147180591f23799f0b47db3a1dd4a86936c40f624795cf4fd1d3dd44d4d39633aeb0733f4f9f26 SHA512 f72b9abff6af24d486a1e3dd3cd8b6cb44feab811efb74a3469502676e661bdb4cfed0fe44f38b7f5a6f74a6776ae1c0c732504d26609b88280e0b0da6710b27
-EBUILD tomcat-servlet-api-10.0.10.ebuild 3016 BLAKE2B b563cd01c61d47c69bcd01167d6c03fd08c06d57440cab0c4217e43c2238a3c710adfe0ee1af3c0587bb2dd3838f6922b797a33989936849cd49e294c7bda1a5 SHA512 2acb50d16f6527dd1ff4db00191d07128cd8ff37ce2bb701e34978fee9c3d549a7fc663178b203d33b1f6d5c416525b3b41cb2e68c74dce60acab930f381e07c
+DIST apache-tomcat-9.0.54-src.tar.gz 6132613 BLAKE2B 5d37359ac9cac2a1387675a095aa0bea3e2bc74740d761a13fb2313aaca8ddb14f10922a8edc0932c9139c04b4df7f5735b067a71ac75ebbfe16ff6066311993 SHA512 e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b
+EBUILD tomcat-servlet-api-10.0.10.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
 EBUILD tomcat-servlet-api-10.0.11.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
-EBUILD tomcat-servlet-api-10.0.8.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
+EBUILD tomcat-servlet-api-10.0.12.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.69.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
-EBUILD tomcat-servlet-api-8.5.70.ebuild 3003 BLAKE2B b8bbaaed51e3d2d25497f6a5f4ba493cd249edef833ac72171d5f8e19c83c11ce00928ceff8ff1348842ea85c3196791103608fc3b7ceca184519a6eaa2e8364 SHA512 68ae1a904dc5c9cf2824db5fe7ef4ce1a07b41becbb69ea14f3717cc02b0f8d5ced6c860bac740c78a4ee80c5862811465850772d741841e4b4dd9d91e55edb5
+EBUILD tomcat-servlet-api-8.5.70.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-8.5.71.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
-EBUILD tomcat-servlet-api-9.0.50.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
-EBUILD tomcat-servlet-api-9.0.52.ebuild 3010 BLAKE2B f9496cb27b626b16eff3d2e3c0358dce807ae34089cd205ccabe66172632b9555145a4109daa4f1ea9d3b3d951afb3234c534ee0a0f526d25c151e04c86f584b SHA512 739edfe11422094aeea69f57e0c22ac31d05ab1b996d237956a9596d7e4c36db91e1ae8cb558ea0e28f325e9e00fbc0704d57dc8f185d55c0dae525740632386
+EBUILD tomcat-servlet-api-9.0.52.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
 EBUILD tomcat-servlet-api-9.0.53.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
+EBUILD tomcat-servlet-api-9.0.54.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild
index c5339740e594..e360880764ab 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.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-10.0.8.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.12.ebuild
index e360880764ab..fb739b89bf7a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.8.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.12.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.69.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild
deleted file mode 100644
index 8846bfbc900c..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.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.70.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.ebuild
index d5d3aa1096eb..8846bfbc900c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.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.52.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild
index b008bbac0cd2..4811db9874c5 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.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/tomcat-servlet-api/tomcat-servlet-api-9.0.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild
index 4811db9874c5..4a8d22d12869 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.50.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.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:*"