gentoo resync : 07.01.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-01-07 22:48:01 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-07 22:48:01 +0000
commit: c3bc61051d7f12b4c682efa7a5460bbc8815649e (patch)
tree: b6d19e96ba3c397fb8278eeb9b68170db92630ba /dev-java
parent: 3517852e3b8a68d1e997770fc0650c5053bafc6c (diff)
91 files changed, 473 insertions, 666 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 2be4e3ff31f2..baa05a2e8122 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index af2af1d3b9c1..e47e1b9d293d 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,8 +1,4 @@
 AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
-DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
 DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
-DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
-EBUILD ant-ivy-1.4.1-r2.ebuild 1760 BLAKE2B 042c11aee2720ffaf77877ab6f903026833db5600c98ea4fc70f0534fe33d478ab01d337b4dfcbfb2218a916ee06bbab42a3afffc29b8b60d663e4e51dec8bed SHA512 926b90f406b1be28920cf56b1463765b676fa00c01ddb4fa7d8a7f3b60b99ea009cad9591015fe65dae636827717390a3d4c5c00118c141f65e4e842f7599e2f
-EBUILD ant-ivy-2.3.0-r3.ebuild 2206 BLAKE2B 81ecc8890da54bcda84c4d74e3125e01a0f390264e1e243172c35cfec6629f00d2deee6441a3dce2d1e2e3dda1148cf63d8dab013f556a02705af0eee15fc8b2 SHA512 2405021491feb8fb173f0d7da0333debdb53f260a6de1b58178d3f2440ecebb21430333c733bc0ee0c298152d5cef34ab77ffb5842d3ccc8e632eb9a1f55435e
-EBUILD ant-ivy-2.5.0.ebuild 8496 BLAKE2B 8e10ef67d8e600974ca477ea53274efb96c37735de6575e8a03705db40d74a4ca5a5b809373216f860612cd6ec51bb9892a2b974962f2c3e2394fc8cd562b6df SHA512 6ea2eb0b486529cb9efd683d1d009748f92fa4efae8805073c10a403bda443d231dbf3a8c6acd60aa6c5d259fa87c1548398dc8686adff086b3518408730b42f
+EBUILD ant-ivy-2.5.0.ebuild 8495 BLAKE2B a78606e6844fe8c7c584695aec2f8c4d1a2d5a7d60fbba7e4e097a2715be9d1ec5cea5d282a0b95c3ae4fb0a06f5aea9768111c48d0d8e17f283c27db9efdc77 SHA512 95b72255d71bbb6e0d773f5d519f19ed8bcaaff2f907052f28d3cd7f7cd848e550c5b8d4c39537c61df14d5d51895f4dead1f4c9707c4629f45ad4970e1974e5
 MISC metadata.xml 853 BLAKE2B deb1f7bed1e2828ff976d7a325fdd193fd099d911849bb53320e2093dd9030056b71858ad24bad3308570bf8ef6cf9c4a1d542ce47417683d484327de3a76d0c SHA512 960bc190397b3b2264dbd62b6487c383d11bbe73460ba76791d720fe4f78713158917b45b7e437707ef63dd87c0863caa333b0a9089b66b521792748a52085a1
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
deleted file mode 100644
index 62198fb29dc1..000000000000
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Registers as split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Rewrites examples otherwise... bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN##*-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEP="
-	dev-java/ant-core:0
-	dev-java/commons-cli:1
-	dev-java/commons-httpclient:3
-	dev-java/commons-vfs:0
-	dev-java/jakarta-oro:2.0
-	dev-java/jsch:0"
-
-BDEPEND="app-arch/unzip"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )
-	${COMMON_DEP}"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/1.4.1-javadoc.patch"
-)
-
-src_prepare() {
-	default
-
-	# init-ivy expects existing ivy.jar, but we don't need actually it
-	sed -i -e 's/depends="init-ivy, prepare"/depends="prepare"/' build.xml \
-		|| die
-
-	rm -v src/java/fr/jayasoft/ivy/repository/vfs/IvyWebdav* || die
-	java-ant_rewrite-classpath
-	mkdir lib
-}
-
-EANT_GENTOO_CLASSPATH="
-	ant-core,commons-cli-1,commons-httpclient-3
-	commons-vfs,jakarta-oro-2.0,jsch"
-
-EANT_BUILD_TARGET="offline jar"
-
-src_test() {
-	# TODO: find out why a couple of these fail
-	java-pkg_jar-from --into lib junit
-	ANT_TASKS="ant-junit" eant offline test
-}
-
-src_install() {
-	java-pkg_dojar build/artifact/${MY_PN}.jar
-
-	use doc && java-pkg_dojavadoc doc/ivy/api
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/java/*
-
-	java-pkg_register-ant-task
-}
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
deleted file mode 100644
index 17350b9fc443..000000000000
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Register this as a split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Don't rewrite examples, that's bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="apache-ivy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
-RESTRICT="test"
-
-# SLOT to use for all bc dependencies.
-BC_SLOT="1.50"
-
-# There may be additional optional dependencies (commons-logging, commons-lang...)
-CDEPEND="dev-java/jsch:0
-	dev-java/bcpg:${BC_SLOT}
-	dev-java/ant-core:0
-	dev-java/bcpkix:${BC_SLOT}
-	dev-java/bcprov:${BC_SLOT}
-	dev-java/commons-vfs:0
-	dev-java/jakarta-oro:2.0
-	dev-java/commons-httpclient:3"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# This stuff needs removing.
-	local CLEANUP=(
-		doc/reports
-		test/triggers
-		doc/configuration
-		test/repositories
-		test/java/org/apache/ivy/core/settings/custom-resolver.jar
-		src/example/chained-resolvers/settings/repository/test-1.0.jar
-	)
-
-	rm -rf "${CLEANUP[@]}" || die
-
-	java-ant_rewrite-classpath
-	mkdir lib || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	jsch
-	bcpkix-${BC_SLOT}
-	ant-core
-	bcpg-${BC_SLOT}
-	commons-vfs
-	bcprov-${BC_SLOT}
-	jakarta-oro-2.0
-	commons-httpclient-3
-"
-
-EANT_BUILD_TARGET="/offline jar"
-
-EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
-
-src_test() {
-	java-pkg_jar-from --into lib junit
-	ANT_TASKS="ant-junit" eant "/offline test"
-}
-
-src_install() {
-	java-pkg_dojar build/artifact/jars/ivy.jar
-	java-pkg_register-ant-task
-
-	if use doc; then
-		java-pkg_dojavadoc build/doc/reports/api
-		java-pkg_dohtml -r doc
-	fi
-
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
index 36f2a11d943f..4e3633fe3296 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-java/aopalliance/Manifest b/dev-java/aopalliance/Manifest
index 395e8f648909..295c792fa62f 100644
--- a/dev-java/aopalliance/Manifest
+++ b/dev-java/aopalliance/Manifest
@@ -1,3 +1,4 @@
 DIST aopalliance-1.0-gentoo.tar.bz2 4203 BLAKE2B 193ef51f8670a0e659ff7d43e909629168c3840f205368ab31a00b07e1e0bd81c8fec2a0429dd4d2932dd7bc6f582c54708c4f118ad697b4f3b41ab999a322c7 SHA512 6761933b9c127af9773f518df89a905fd67696964837b8cb841664f16564bc879dcfbd5f47dcf85e999d4dd64561a3b46edac1c639471d3ee9be3237d9064187
 EBUILD aopalliance-1.0-r2.ebuild 895 BLAKE2B 200a570504d976e00e71628347e07de347e910a7d24819722216eca6cc3838ffad2698544a63374793575a971c5179aa5e0883778799a35e772260889303242b SHA512 586f72046802e5cb7f05409771d0278a637754d12351b3a927c0bd9b8191a3886b60a56276c3813e8b6f3e840a64117fa57cf77bed9de870a8de9a9848be107f
+EBUILD aopalliance-1.0-r3.ebuild 912 BLAKE2B 1e2ed6550659bb5dc08a0ddb2fd9c04b7d6972be722ff5296dbdf20a78abc48f7241f3685d5c2dc194a1a139f83aaa6a0f3e22df8d1ea96630b251446c68c01b SHA512 c567f707b29a49c00ef1656611116e21f5f4730fa79e5c69e3c00677fb0310622f93c15bf354647ef4b42f390ee536d99b46d0a5f3f6aa614705cee00d017f22
 MISC metadata.xml 318 BLAKE2B 8f8307ee22954f2e845092c05b3552d9320a1ccb8421787a5373cbc0123e76ce2dacc93cfd6b83cec87b85927c95a674b28b81811ebd2223b78a1988c7904e4c SHA512 4307e863e3fabedc9971ae68ad8f1c46c2bef00e7daea5fc928c623caeb09424150b1f724dda149d755a7af1ddf22db065160e3dd11dc86b51ec32f6846d4d8d
diff --git a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
new file mode 100644
index 000000000000..bff2fa46d712
--- /dev/null
+++ b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Aspect-Oriented Programming (AOP) Alliance classes"
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+# Tarball creation:
+# cvs -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login
+# cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r interception_1_0 aopalliance
+# tar cjvf aopalliance-1.0-gentoo.tar.bz2 aopalliance
+HOMEPAGE="http://aopalliance.sourceforge.net/"
+LICENSE="public-domain"
+SLOT="1"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main"
+
+src_prepare() {
+	default
+
+	rm build.xml || die
+}
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index b5234a5c7a08..a8d83dd5a4c2 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,6 +1,3 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
-DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6
-EBUILD bcpg-1.50-r1.ebuild 1515 BLAKE2B 25e57aba985350e8922eb0edf9f6a12dbc8f5a2750e4d45c1cb9eb0df0b9ba909ac1eb8d2aa151bdaaa123e7e6accce4eb6182fdd9105c39a2414de9eda46c07 SHA512 eddecb8d3365fe745bf132119d52a46d12a835973e5c9e3e0121822f53b525e8ee24a2b3a6c98920082c24cdc7daf2da6d9d27784abcc424dc41dfbd6a185558
-EBUILD bcpg-1.50-r2.ebuild 1536 BLAKE2B 00122a19f7a787b43507a1a73ae345bd1783efca518818511ea8d8717b42706a2c30f9af202811be5ca60317e3e18250459aa9dd82564daff4e7cd27e36207af SHA512 ad42a74689b4012041e201121ccd134af357b6296f32a4bcba1faad79b03c4ed17579e0e514bdd8c9bcf7f628ad9602a1d8de0f0ff52841a984c408f3ed858cb
 EBUILD bcpg-1.69.ebuild 1415 BLAKE2B b4c064bdad6b5c2a2d9102f3fec361a71a9b52f29ee0d78be6839dc9ba4b89de9eb4a0b272dad84041e1910ed58a8c6c852094f965b1c32ba1e89ea407a09508 SHA512 f52fc87fec7482ba4e6206cda2f52200b4c00228031ebfe482a56b32f76aaa813ca6ea491b040d8ac424432cb7934e78e98f6deab6c844605c7cc226f761f17d
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/bcpg/bcpg-1.50-r1.ebuild b/dev-java/bcpg/bcpg-1.50-r1.ebuild
deleted file mode 100644
index b895d1674885..000000000000
--- a/dev-java/bcpg/bcpg-1.50-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.50"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
-# Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
-RESTRICT="test"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		local RM_TEST_FILES=(
-			org/bouncycastle/openpgp/test
-			org/bouncycastle/openpgp/examples/test
-		)
-		rm -rf "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	local cp="${PN}.jar:bcprov.jar:junit.jar"
-	local pkg="org.bouncycastle"
-	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
-	grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcpg/bcpg-1.50-r2.ebuild b/dev-java/bcpg/bcpg-1.50-r2.ebuild
deleted file mode 100644
index 6a89f6e93494..000000000000
--- a/dev-java/bcpg/bcpg-1.50-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.50"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Appears to need older version of bcprov; but
-# since bcprov is not slotted, this can cause conflicts.  Needs further
-# investigation; though, only a small part has tests and there are no tests for
-# bcpg itself.
-RESTRICT="test"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-src_prepare() {
-	default
-	if ! use test; then
-		local RM_TEST_FILES=(
-			org/bouncycastle/openpgp/test
-			org/bouncycastle/openpgp/examples/test
-		)
-		rm -rv "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	local cp="${PN}.jar:bcprov.jar:junit.jar"
-	local pkg="org.bouncycastle"
-	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
-	grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
-	einstalldocs
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 260a95b6585f..92ec3d9465c8 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,5 +1,3 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
-DIST bcpkix-jdk15on-1.50-sources.jar 401716 BLAKE2B 7a656218b96da46027c82a023404c32b92a640aa0ed5a1256213139e8dc54f9ef07453478dcc66372a0a49562b92165148f18a5063c24f7569a3e40f649494ba SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c
-EBUILD bcpkix-1.50-r2.ebuild 719 BLAKE2B 96642caf10144d1b4d24a4680e3ff2bad09eb12b6c5646d1e12878dcc5d71316a4807aa955df410aebb41092d4560e7ae4ec8a97a6a054ee081002a7de829e42 SHA512 98a55dac21d68a1d529d3d239a531d4d4856a68dad8b2f2f8ab4ce42ade8938863ab63f1ffc9fc77eff0cd9f4f6aab060742dc7e09bd09b1a40b66e20ad5e97e
 EBUILD bcpkix-1.69.ebuild 2556 BLAKE2B 842dfda2673810899cc1a164924b97f142214ab7f34164a87bfc2b16360e688a082a5bc09aca36765086d2b42b0f6e499fd10c2f31e8a63d72742a4afeb7859a SHA512 fdff8b61adafbf1eff91ff020c8042c0f332f53e66be300e73eadb9efe30cf57f28468a64a9a9b13842305db4219757a9d6349e2fae26b98dd9611ed7ba7f89e
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
deleted file mode 100644
index a1a5de24b451..000000000000
--- a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}-jdk15on"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
-
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD"
-SLOT="1.50"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="org"
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index f3ad92168300..aaa1cc15f6eb 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,6 +1,3 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
-DIST bcprov-jdk15on-150.tar.gz 4629743 BLAKE2B 7ab18e83f90db38b9af9530246806b4d413718531ce4b34b7aefa7189e28ade8a2afd5d3b3dc25c8cb2d5ef23a8c7f8157ac947ae7d0a46356b00ea7dd6d5f76 SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e
-EBUILD bcprov-1.50-r2.ebuild 1345 BLAKE2B 6e0103ebcfa6a52bdba02bb40f7085d0361b988e0087ae2d07be9980c2d28825b0014595151cfa23bb24e8f6af2af55b518c64c349b0c6539b97ee3b8a9117b5 SHA512 ad7a4d8cb6ee19336768ffb8eed5ed9f44110fccc0dcd3768ea06419cbbad05de344f2a832333f686f2f00ffaed1f33e1cca9b948be87883208434d77bc5e286
-EBUILD bcprov-1.50-r4.ebuild 1326 BLAKE2B dbd3892976d4eaff7e3af566e13c5f38d5b74bf27cbb3290f3846d560dd0393156c41e6fd92f435ca6bf6609692c195c75743f6c87698bf99cb843369ad7ee92 SHA512 7dfed9b2cae7ea3914278b7be298e517796d8623a33109dbb62ddc87b6d284bcaadf4f4b88d890a1bb8d9447c3b6dfdc80239bdf0b3d5b74e3b96bf99a9485f2
 EBUILD bcprov-1.69.ebuild 2754 BLAKE2B 189ff7bfda398f16df34cfc644024a5287dd51fa2c5e2c0919ed4cc2ae2df9083d7c0efb604402156e58292589ef6c8eb631ade1d497db9943623178155a8689 SHA512 72828c651c1deaf67721d0515feab2821876810fe29554bf0cadb09a5274115f10ba2df1f3b4b2bb93ab205dfb6e7182275dbccd19931902186c84464abb8324
 MISC metadata.xml 482 BLAKE2B 0afc6ceb6e81b57040e44020b919d226bd8d9ae3eb64bb4955a31c23f929712db16c0c2245dad2dbd7750ec20d0794af53ba05fc7411cf19445daee331b1f21d SHA512 1c342946be63fe9caf6905074d8590b60c1044ef8a6b89714a33b8e97f3ab70409748a697453d23f7b8d3c27ccf14dc8f3be84fb36cc5f810c30b54ce6118b06
diff --git a/dev-java/bcprov/bcprov-1.50-r2.ebuild b/dev-java/bcprov/bcprov-1.50-r2.ebuild
deleted file mode 100644
index a2a400806d60..000000000000
--- a/dev-java/bcprov/bcprov-1.50-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.50"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}"
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.50-r4.ebuild b/dev-java/bcprov/bcprov-1.50-r4.ebuild
deleted file mode 100644
index dce87d213ba8..000000000000
--- a/dev-java/bcprov/bcprov-1.50-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.50"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest
index fb228ddf67f4..ab424ac72398 100644
--- a/dev-java/bndlib/Manifest
+++ b/dev-java/bndlib/Manifest
@@ -1,3 +1,3 @@
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
-EBUILD bndlib-2.1.0-r1.ebuild 1631 BLAKE2B f3c81a45577ace8f44c44ccff352855cf225933a8d57218d75c59d81e5a029b8b707cd283ba5806e3c2902ea2e2b9d0a32b1da3bcf9b09ab481e0f401bad41e2 SHA512 ef287e8346c3bdd88535f9b1b7ff0653bb428c5b2b6f73e694dc3cf8e65db820488719696192bc5df32d941cba7654e1e8ea3ed0948cdada4ea385df3bd42986
+EBUILD bndlib-2.1.0-r1.ebuild 1643 BLAKE2B 98b1872ba1f16616da9c5559a99b9c672f8cf9f2da19fdc740ead5ab5a18e7bb46743939d9d39a3e0572e66971c829d443036668a04a44d9360c1ebe5992c4f1 SHA512 3df940c0cc59eabc1f96ffdf3b6847a36f5c124670c53f6138d7a959d3d5b9ed75b7d184021ffbacd4e8428381669ca0901c4ac9a53c278694bbc501f3346539
 MISC metadata.xml 324 BLAKE2B 4abc17608a568a12af96dc0ddb7b82d55341ad891537e120633fd8517e09a339d805325988f3208050cde9b20aeb0a4dcab95e55ba13c66854a0d90b0e54551c SHA512 e9e23c794433024b0888c2d5859120c0ef39cd6b55df99035c3ea1761280bd4287fdeb4aaf8ff067bab1bea80dcdcc9060f74b43b1a6a004bad87eb69a9bd3c3
diff --git a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
index d8ef87b2b91e..553e5e626d54 100644
--- a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
+++ b/dev-java/bndlib/bndlib-2.1.0-r1.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 CDEPEND="dev-java/libg:0
 	dev-java/osgi-compendium:0
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 1ebcedc97a0e..36555c76964f 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,3 +1,3 @@
 DIST commons-codec-1.15.tar.gz 423639 BLAKE2B 5d9d3dd44fda7eee77048eaa1e28f54f9baff7ad276f7e718f4a4d6c5b26605914809db538e9832bf06b1468a65432645ef9de74aec9f9af9973668a82bd996f SHA512 dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce
-EBUILD commons-codec-1.15.ebuild 1364 BLAKE2B c672f1bd6d6ef10613ce90e077d50956f1a253aaabebbcb51e8d9315f04459db6b8262ceee4c4cd8daadd0b3ebb2ee08f661ed0a88c1cfb9f4554fe694700273 SHA512 e12d1b08bb1aaa5d17d5ab3193f8453ad57f1a7439766fc7d9ac24e894f1ff310c3b93e6ce4918519d85804cad25f822dc984aa4535da84970aed9c1be37c6fe
+EBUILD commons-codec-1.15.ebuild 1369 BLAKE2B df61c7883f36aa5caef0f3c7cb2be1bcf5acb10936f13e412be92f1b90515b5bc7dcfb4660857947af3ea5b4ada6fcb7e4b162920aef6e08fbabc3fea93fdebe SHA512 18b143f79137db9d1279d7c637d3f37ab1189c7af3b640f8c9afa34538b2cd4fa5b11f48622776f896ad1361f454735b72d05e23264c7c9027e8bc3d52cc858d
 MISC metadata.xml 1361 BLAKE2B b73337d1547879b37b5c97ab5365258989ac49f45ec1e0c10b835a849ad804e0da7f737f0e67e660a34f3ff1c2a66876f1878a98680b0e86740e84b9eaa16e9f SHA512 50d46b0c3607e8181f516ffc198c5cb2640b7c1182c7242f3e10b8671d85b12fa9708847148b937fe824b990b89f25bee4a95722b86742edd6554c39d4768262
diff --git a/dev-java/commons-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild
index 92af3cd6ce23..88e15404828e 100644
--- a/dev-java/commons-codec/commons-codec-1.15.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.15.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
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 # Compile dependencies
 # POM: ${P}-src/pom.xml
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 804c52da40b2..596730d607d9 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,6 +1,8 @@
 AUX commons-collections-3.2.2-fixes.patch 9913 BLAKE2B 0582b3c2e06275ddc75fdaf051ef5fec6cb6c95b3ffae77b08bd093e3b3e7a140e040c20a9be24e06d03a492325db94c21e69a4ae9fcb4e8099ee7bc30059b70 SHA512 88850bd1db483348d5c35c593e79f38de46f362aa124dea91e47940b9eeadef7d9ae9e7d34978d55bc4e51091c34ae862b33ca4710c71ffdc92840c2429b05f1
 DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
+DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
-EBUILD commons-collections-3.2.2.ebuild 1378 BLAKE2B ca87bc67d684eae78f9816803456c1ef52cc0d3571514dba7cf2d8017f9ce72bddd35a0de681b4c33b0db1bb9e37f3e5a85cc4620819c8bcd98a70f308fc38a0 SHA512 ba6ec8a82736e39dfd41681e87e6587edd163be81ea5f80b56a37e529b7d681292627a308373ac8d2330bfd69206dd54fe1c04c34b4e63cd6255bef712042d2b
+EBUILD commons-collections-3.2.2.ebuild 1390 BLAKE2B 5ac882bdfc9217661bb1b0fb6ee29d9098b5106113226d93e38b0c5896c8659e39938f402d3b7c9e560266b8258996162480426be59bbac4ef75728303f0958a SHA512 a1405eaddbcb95664550eb5961581c92292606616181374b8f3c9e9d287d08f20cabbb1e86c07da2907f903c71c1487a6e3ea53c5c4b2731f872591555a21f94
 EBUILD commons-collections-4.1-r1.ebuild 1267 BLAKE2B 9183580e99a30c85c61ad045bde305a5e43ede963c38aa0b33bb7ab052e240291845a3ebdbc9553228ff58d5432122879ebd7b6f4af2e9a2c05666061c85adcd SHA512 2218be50d5e2d00e1a2c1783d46b9ac159c7f72dabffa506d50df8f0ed4e669a908544fb7afaa4b0404867cf931cea14960ce7cc28a769afe6a2c736e71307bf
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
+EBUILD commons-collections-4.4.ebuild 2067 BLAKE2B 202afbbdbc645dcec318d99cbb8e8a1db304dc17334e7c37537f44c97c3e8f85b21d646612062fbf83ae375202ffce08facfa1db314dfc3919270f04d2cee2e4 SHA512 c3f36ada36f4547ad4ffa61c6e0e7eba4e43885d81ffd6fb643393f0ba2f6304dec6c20fb62cf8fb2c6e8ceeb1a117b24eeb5b1cc823ae94ec04f1c851122deb
+MISC metadata.xml 388 BLAKE2B 11018df0e1c7417ebbc68b44642701ad88c8add20c233cceafb84c41b56cd7e3d2f0004406ba6286babd78493dda13171c1c3b0a1a7b563289d2c4c58921bda6 SHA512 28a72920d0c97f0caae41ba74a55602e25c953d2c510e0e4d72a8c7482abe7855b587fa85efbc51c9262472b90ae35a88732d33744a101d288ec8afa8fff4ae2
diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index 6d32a5a18a44..e205323f6cdc 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
new file mode 100644
index 000000000000..994cf13e94df
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-collections4:4.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
+SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/easymock:3.2
+		dev-java/commons-lang:3.6
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+S="${WORKDIR}/commons-collections4-${PV}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	# https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550
+	pushd src/test/java || die
+		local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java"  ! -name "Abstract*.java" ! -name "BulkTest.java")
+		TESTS="${TESTS//.java}"
+		TESTS="${TESTS//\//.}"
+	popd
+
+	JAVA_TEST_RUN_ONLY=( "${TESTS}" )
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index 6ef2d50cf07e..62a57c23950f 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index d0e859069a84..81b79f7a03bb 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,5 +1,5 @@
 DIST commons-daemon-1.0.15-src.tar.gz 291128 BLAKE2B af874e6a0852c2dc5c84fcbf5e1e443fb880a306b19054263d06e8d83a9b0866a52f2950c457315d80031a58250ec75284fc7839df82b7555b1ff3bd92e67810 SHA512 f20cc8796978fb09b6ecc8d99bb3c8b271b097d74c1f99b286cde213631e7f50a4104f5db2c354f9624ba8b037502d81e327c581b38253b9b216aa2172016e40
 DIST commons-daemon-1.1.0-src.tar.gz 298028 BLAKE2B 5e8a0719467523438559472270ac7038ecce040f2a5a8ea8704e181557df726b9c09267b57336d9659dcb3528fecb8ac61937ef3d56e5cb12b562b88b5f6f218 SHA512 a370085a991cd6b121fcfb49822660dfc0aac19f164677dd2e6373750c1a526ef5a10334a8e075fd965c038198f6638b9e9130b5b13256f4a23a6c5a29959701
-EBUILD commons-daemon-1.0.15.ebuild 1255 BLAKE2B 7dba8b76b4d39cdf13269a5e55babb479aa3bb0645a3d83ec8b80d870834aec80f8245fb5c9a7d8caadb23ac3d660b3db30305d93da18674fd0469a7b8fe23e7 SHA512 9f6b2160da39f474dddeb165397c523764069f1ed4123de817c279ce41ab0b0be3aa8396741f1dd201dff28577d5e39acd18431d94e75f27316b315330606524
-EBUILD commons-daemon-1.1.0.ebuild 1220 BLAKE2B 2a5594e81db8f11198acc5091c2ce4730e024c85896abb2508bcef2829f52a89cd7605e6129bd3589265745ae5dc54496eb7fdc1ca5a18aaf2ad179d57882f28 SHA512 7878e1fca1c91acbc7ff5d8b35c091deb1632f2e9e7fe560fdc3a9591304fbdb1e12b21b799403cb88a0f75b84baab96d1e74b0e816aedac2a390b8d17e0ec17
+EBUILD commons-daemon-1.0.15.ebuild 1232 BLAKE2B 78bc104748e2134d37d137570be7cc16191060ea0c4df790563219de67e085a89e5d4bce0b0b5b6ea30bce39afc57066bae8c56451faf1c265228bd3e998e397 SHA512 05a543c150095c0125c3651632884945439f26d4959ff9dbbc503be461615362f3b9e24208c2b2faef72c73ffac6c848884478e8b7f2b2c8dcb4665196f03c83
+EBUILD commons-daemon-1.1.0.ebuild 1197 BLAKE2B fc07b31feb931246022a5633b253407d9cb9f8e9ae00b7f11b62b4efa4435ad9ed2ac430fb76f5955386d8d9f99419e107e37af7be2f9021c136732231936784 SHA512 60a4f508609fc201099ef8b8341c384ab1a5411ef4c6e9fda6e2586b87cc901eb83341154c5b7c9ad63f26861382aaa7a0eb520858236f74037322b7dea399a8
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
index 1b467fb6bde5..e97f26dfb42d 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,6 @@ HOMEPAGE="http://commons.apache.org/daemon/"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="kernel_linux"
 
 CDEPEND="kernel_linux? ( sys-libs/libcap )"
 
diff --git a/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
index 6949a3798a39..e7677061981d 100644
--- a/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,6 @@ HOMEPAGE="https://commons.apache.org/daemon/"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="kernel_linux"
 
 CDEPEND="kernel_linux? ( sys-libs/libcap )"
 
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index efe13758080d..c7ea3554c0b8 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,6 +1,6 @@
 AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294ef11924310e2e63865018843faf199521f619e0859cc2c857d8a9fb038fbc44d88b06cf2df44b05cc6891c9e9d1bba5898071a873fc0dd774427afb0a2de2 SHA512 af18eeb48d8da55fc63526a528b88f626d9fad2369a6a8f570fe2dfee76384a5d86a9bab4883e557a1acd0a866859c4bd075476f9cfaff8e8465de6db0f2848d
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
 DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
-EBUILD commons-httpclient-3.1-r2.ebuild 1680 BLAKE2B 39796278c783e63835011467992fc9d8891bd2c691924078b909d409cd5567a8ebe505a834bfe65617936b4196cc99bcd12770e6a0462c237b5a5ff0f33cef11 SHA512 c1c327018aa78ccadd57a06845771ce12eef99106092823763eb7285d9bee587aa654b3fafcfabc7e725d36a5db7cda5e276bc6c6c7c291bf19bfbb553116244
-EBUILD commons-httpclient-4.5.13-r1.ebuild 2222 BLAKE2B c76899701077772f6f4b3022c354f007cb21fa86aa0b1a5ba5c374a51edfcf887b3e40e3f81164465b1cc8c0f5db1480d0c801947ebc868db449b62f1f633d2b SHA512 fd6ac61fccb261dc986abb06b48a4ea89764d2b21b46316a3ce3e75d6294a29e968619c9ca7838685d23dcb4be4f8ea2143aafa72af963d83fdbce6c53bc6493
+EBUILD commons-httpclient-3.1-r2.ebuild 1692 BLAKE2B 387a399a8cdda70f20c5fed073db09f3657d6850734d24707b3707ef8881dd34d2280936251dfff137f45e2c1ce62923799885bfe4da92bc0549a5edba1179ec SHA512 8099177fb45a52f9f1e6acde6b1063a1ac1e6f235ca3efb0f8599cd2e28daf96080c24ebea8fa5659585819d2571baa6057dd08c732850d48bbaf52799225a21
+EBUILD commons-httpclient-4.5.13-r1.ebuild 2234 BLAKE2B 193917142633805b8663f25a95b103ebe7fd498fd640cf51e5e70828786e92dcb7d6e3f4da100cd0485dca2f57bc78dc4ef0668e7d44d1485c907313f9d8ced1 SHA512 137bca4b83f20d955b4c0c90edd2ab4896c3a10c8d22db9d082246479400a1429f2d4d2dcc8fa96568e33d6386241e3e45e4a4c21b63d84ac257052749c3fd90
 MISC metadata.xml 457 BLAKE2B aa9b78ee94c6ac0cd435c142183612524e588138764dcf4ea6b2474925f5238983ebbcf75ba32d78e42b62f3751e042785291f00cd9a6453c9711b4110ce04a5 SHA512 46da6fef35f122be653de8ff6f87048475dae83e8853a05210e403f239ce3823caafca0e26aa503377ccfd9c5616f4f69d4d3b483b9adb7b512351d85be5f531
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
index 5921250be5ee..f74e7fa80a51 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-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
@@ -13,7 +13,7 @@ HOMEPAGE="https://hc.apache.org/"
 SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # doesn't work with IBM JDK, bug #176133
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
index 004ca865dbdb..38274be97d07 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.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
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Common dependencies
 # POM: httpcomponents-client-${PV}/httpclient/pom.xml
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index e6bdcfff9152..006eb3322112 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,3 +1,3 @@
 DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
-EBUILD commons-math-3.6.1-r1.ebuild 736 BLAKE2B ee236d80c075b8472ae2770b2c21b8d9910854ee6a6de20409f5c031c6bbbea88693fd3cadaf305f2d8488220b4b8f2bb9149e1c4b4699e9020e66f86c644b25 SHA512 ede63024c1a18b9ccacd1de71182d17a60eeccdeeab86adc28777fea29a61ef3f8c43bd8eaa5f78c7f83f51f518e7b5b6d54dbba95727236d10171327ec24bea
+EBUILD commons-math-3.6.1-r1.ebuild 741 BLAKE2B cddab31becc324b2e4fd262d6de490542cd5f482a1b29dd9a59d8b0139c1e7112545b59349ed9cee2519ddc56d80ee6feba6e65ef5dcb21bb9f1ea3305306f84 SHA512 97a2384bf11b39cea6aab1c041acf2236491d766c799f13342cd4c567b86d4a85cbc1ed500d3c7460bcaacf5565008fc9471af60babb85e3bdfe0f85e0082da7
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
index 3ef7e38716d8..45de2587390c 100644
--- a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r1.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
@@ -21,4 +21,4 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 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"
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 328ae72bc651..9e42d28a8090 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,3 +1,3 @@
 DIST commons-net-3.8.0.jar 437325 BLAKE2B 92bdbf2f95cc54f6a791a9de0a56878fe12b6d956d47a4116ae21df35f3dcc4d7b10f5c03c081fc7012a06416f5f9f6555060784bfe22ec9c8d70b17ee7ea215 SHA512 a16ed8c2966541cc052fe963338efcc6f9c42ccd6fefe246547e66d9f46c35cf42bc6d13cb983a1829a378ebd7a676bcb812acbc3aa0ed30e6fa206748dae620
-EBUILD commons-net-3.8.0.ebuild 640 BLAKE2B 9551309c89010c570a6d939d2824cc3623dda84c1ad57304f26219eccb18bac37433126dd46ed7cf33f971b73f7f37b114be03235d406caa939f9ec8cd93a6d2 SHA512 b66c31e251eb3f31ccca4893e30d941404fe5533d226d4e09bd78524c719e6711c0d9f583389635fd125335e3cd487805aca1cef683869a2b9e27a9eb1fc4c45
+EBUILD commons-net-3.8.0.ebuild 652 BLAKE2B a6e45b2383a1e7344939503ba537e1119a0ce66706444bf15845949ead7ff02ee6d891f886ce4a363996c303f1750924c22c0f882c9fe28c253b9704821521e8 SHA512 8249536d1f4becf5a089a65bc1389b84e6c13bf1b0bf48d320edbd5785ff7aa7b6cd981eb489916965ea5bfb3b890aeda05777eae62316ed1e1b6d9f74e84ea4
 MISC metadata.xml 393 BLAKE2B 344ccb7c8387f2d977c30219cefde70b31255c859898f243ecfde94643641474047299f2438a4067f70cd77ace99fb754ff6dfc2ccdedd2772081870f1444d8f SHA512 75b957e0f6a08377b402e23f49b081ed9add10ff7b3a5d9f52009d48ef4f8d49bb78f48310b93a579b29857562af2d5261f5b4fe4405edd566c1f320ec729046
diff --git a/dev-java/commons-net/commons-net-3.8.0.ebuild b/dev-java/commons-net/commons-net-3.8.0.ebuild
index 73e3ed4a5df3..6fdab25bad01 100644
--- a/dev-java/commons-net/commons-net-3.8.0.ebuild
+++ b/dev-java/commons-net/commons-net-3.8.0.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
@@ -18,4 +18,4 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 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"
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index 028348321c33..fd527fe8866e 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -1,7 +1,5 @@
 AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c903aa919f0426a699051e6b2a3060a46f87ee33f26579de7b3cdf822f749712234dd1b6482130d3f195b77d606a1e SHA512 a8ec511906b80562ac3f8a8c791703ce06f6fd0861ea5a29684e60716a2dff67ec5f497e11959a3f989fcc538f6c3f6dfebfa0fdaeb316965a2c30ee50001eab
 AUX commons-vfs-2.0-incompatibility.patch 2323 BLAKE2B d14a91d06c0b831026260f348c17c82b2725ffcbe00125146f0268d0ec5a95e87175ed23e35143c73654cfa5b14a34930adf01a48f9fc8c280cb3233308f9a77 SHA512 46287b86d2ba9b6d1a9aa3fb90fc0a64724e3862cbb534bdea39c384d4733f037ebf764ea3e6a8ffaccabe343af99097cbe9ba5eb115fef5029757b78cd4e98d
-DIST commons-vfs-1.0-src.tar.gz 278588 BLAKE2B a92be28e02758bd271d7bf76f8b90c741dad0f1c15c71ab3624e16c6c30a47bbe189ef93c99b1f413034c47dbfdefbc155a526abf9897b85cb7352d1a92b4bef SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
-EBUILD commons-vfs-1.0-r1.ebuild 962 BLAKE2B a14b7e3b69aac36f0c3f99d4b3ef842e48d2997193b74be6610df3e885ff1f4d19a4faa2bd9e69310327a4e20115a7c07d7a91f87e629ecd96ec786fec96cb07 SHA512 02230fc7312f024e751e3873ded62d30c1bde28a36a2ee62f425118b582c3d7cd4cef931f235a8459f0b11975096fe325b7405bd15781f1ef03d2203002b4acd
-EBUILD commons-vfs-2.0-r2.ebuild 1628 BLAKE2B 87a68a6d0eb7e52c980c4aa5c8ed99485973f02721a83c4d916f274b3abd957cf1c2ba94f2e9fa58f51224db5f7df3f661bbee58eab81cf6cff94d58c6ec9390 SHA512 c17ee3fd292ffcc8eb4c4fb3be14905d127db8e179141aa95d15567a7d27374891ad926723e8add61165c9be1037659422cbf6b0a9db9e50a83bd72a992af601
+EBUILD commons-vfs-2.0-r2.ebuild 1636 BLAKE2B 1072b8df885429082c5ab3636b26a798e4c1ee312659b36b56e2896368e7947381d22aec088e02d4c894ae87db64e533600943f565a5247e5c07dc2899a7cd4b SHA512 3890e9a204479f47289aed252dd6a1f184258e5fe5554d735bdf8133b4d16df1f283b16b03bd6addad6cd3d7bb29aab9d4b8a8adc88a60508d432d919ba22dd7
 MISC metadata.xml 523 BLAKE2B c4cba3c890c33ac78a1266a0127d5ff394be884b99d243bcd2eff5516abdb2aefe861f244ffa741b30211c3527be774b3c15ae86c93aee6caf9bc60fe2e7b2de SHA512 c647d90719e4581dfefbf7dfb215136ab94e0b25a069e222dbfe50e90c5ad06ac7052a0ccfc41d82ad423c3d0fe2e410b1473ffd396e833d5581e44176e2b233
diff --git a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
deleted file mode 100644
index acc513af4c25..000000000000
--- a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-vfs:commons-vfs:1.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A single Java API for accessing various different file systems"
-HOMEPAGE="https://commons.apache.org/vfs/"
-SRC_URI="https://archive.apache.org/dist/${PN/-//}/source/${P}-src.tar.gz" # Not on Apache mirrors.
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-RESTRICT="test" # Some failures, can't figure them out.
-
-CP_DEPEND="
-	dev-java/ant-core:0
-	dev-java/commons-collections:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0
-	dev-java/commons-net:0
-	dev-java/jsch:0
-"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}"
-
-S="${WORKDIR}/${P}-src"
-JAVA_SRC_DIR="core/src/main"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc {NOTICE,RELEASE_NOTES}.txt
-}
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
index 983692cd82f3..b51818e45eb5 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-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
@@ -8,12 +8,12 @@ JAVA_PKG_IUSE="source"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A single API for accessing various different file systems"
-HOMEPAGE="http://commons.apache.org/vfs/"
+HOMEPAGE="https://commons.apache.org/vfs/"
 SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND="
 	dev-java/ant-core:0
diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest
index ad6c871a7561..d748f861feb3 100644
--- a/dev-java/glassfish-persistence/Manifest
+++ b/dev-java/glassfish-persistence/Manifest
@@ -1,4 +1,4 @@
 AUX glassfish-persistence-1.0-python2.7-sax-parser.patch 286 BLAKE2B 49667ba4e41eadfea73fc8b53cf61f5fafd4654292ecd1b2e2b653411d252b1ff8bc40e6c9e0cd8fdd1375ba86a358495415a68ff1466f857d96cfd90ce5605a SHA512 ba7c32d86991407d45a86d640d95007cc47dcd28c74f441e38840206093653dc31e4824d4986cd9cd60d44fba0c1f4365f9348a9362529531fa9410e9fd5cad1
 DIST glassfish-9_0-b48-src.zip 35162972 BLAKE2B ff96f2135c6bbdc60eadab6a6bd60b623ac1a3635e4465591ee75f6c1229e83f9f6424b46e42eb333eb6edd3ba1aba51897ab80ca5bd5c754e516a27a03381d9 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48
-EBUILD glassfish-persistence-1.0-r2.ebuild 822 BLAKE2B 23d93d2db91d21c8b24f6eecbdd7277a74f8d92883638c8eb3412176ae12877412dacfb43f8e6325fb81d6c5d506e1349a1190e6ec6531a1ff12b553001c4041 SHA512 f635bb3b7f22b27b648c0080d7d89b601757dd8cf268904c3799780b0d7b49facb098c3612372d7a92fd7640c9fe7f8c91bf0438fbc5ad4eb72deb02c027c009
+EBUILD glassfish-persistence-1.0-r2.ebuild 834 BLAKE2B 033850b92e9bbe0d2bba4352fa6fbb36076b92129f9eb3ae1b425d96dc21362587a0730782032f170fe2778ff6ec3e369c6d48d943aa6867729bd52ec8fdd098 SHA512 fe6c03a0d33f9fc0f7edce144dddb058b2319425d62f3f9cfa5004016264552cc09286d161ab71991bbc83e3f5de0a5e38c50a51c3d11048af3c4e798592970b
 MISC metadata.xml 215 BLAKE2B 869610e21e1baac019fc79b7072721c201f4e3f0c6a65712d93e69131505f6ee0aab3ed48890073238645280b22edf2078b56dd4ba7edb593952f9ee2b2ff1e0 SHA512 aa3da8e5bf0b257d555c610b3dee82560e6fce192024e99eb63932511f25aceb24e3541f01c495771f3f54c299286c35672c8658cd5e577d6ae5927486a125a2
diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
index 3b0fcc4a64ba..ec68669476a5 100644
--- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-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
@@ -11,7 +11,7 @@ SRC_URI="https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 918678249403..5b51e9e18fa4 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,5 +1,5 @@
 DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d42064c53f7284778b1b7217c8bc7abeb7e14350e19d838af1d94f78c5c38aca6de0f37674b022f0e528ed65eef803c3f1 SHA512 f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5
 DIST gson-parent-2.8.7.tar.gz 391617 BLAKE2B 2c0fa3927d44c4a5c961518955dfbe6fee60dd61026002d0152d25d6f22dd4ac08b4323256af1053d0f17ef5d9f2a2a3ee86cedebd52a112d258e8c8c37e545d SHA512 044032b24ec1198d054807ccbfd91301307992b6e7d03a2e8578be79a2cdb28ba0ba57a954f11ad43022ec696c1522d242ed6b1045f831c9a370e0621e674fe0
 EBUILD gson-2.8.7.ebuild 1119 BLAKE2B e66e3e74c3fe71e4592e98295c72bc2b5a01b278a9a7ea181f952eac17561e5e0e14d4c8ccfcb39bacf65be8bb92b9134431b2282dd7e59569d88b1a467ee5ff SHA512 00b338365151df1f0312b32b9544a57a1f8660e4cd821706e595f2bf3d794b606c2c12c5e42d63866e21de4d1797ab131d39c8da47c171a423cae457a5f0a99a
-EBUILD gson-2.8.8.ebuild 1545 BLAKE2B 47fda7d8d7dfac09575292eb3d4a864b63348720691a66779abe023f88ce7eabf7c0d00dfb6cc1fbc59cde279720f139f6bf616001baf9ec90332f50f45a49ae SHA512 c77ed166187d3a63e92d7689b69b21f56f0c59b97777e4087024fc5684b4bafd6d40c4c57c3227c3af52b6c5ac2da45794d0c4eec0d42a56c536cd126441e043
+EBUILD gson-2.8.8.ebuild 1557 BLAKE2B 3fbbb41510c29d69da762d743b281a2351c7daaf3301152d03931462e8940d2f9e528162f85e401434c848117c2fc7d3fb1931a9f7a2f5514ba482a71930226a SHA512 f1bd31abc3a3e3bd0b9497b65ab19dc4fe5ab039cdd534d9fb4320ab0cb2e38cf2df3299a53539f38f10f6cd582063b3fd8c0ae3ad562cc79cc07d9dcede835e
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.8.8.ebuild b/dev-java/gson/gson-2.8.8.ebuild
index d8e2d41c9241..b01f741b2d88 100644
--- a/dev-java/gson/gson-2.8.8.ebuild
+++ b/dev-java/gson/gson-2.8.8.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
 
 # Skeleton command:
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/google/gson/gson"
 SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Compile dependencies
 # POM: ${PN}/pom.xml
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 2ea097374fe9..4a280ebe0343 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -3,5 +3,5 @@ AUX hamcrest-core-1.3-java-11.patch 886 BLAKE2B eb6e3a1f3cd47d067987a436d947ab89
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
 EBUILD hamcrest-core-1.1-r4.ebuild 815 BLAKE2B cdffa29ff20d6b06b31d603bc2c55bfc5d5c492eb7e6cb778b0287b6d6f11acaab57a17f31640a94972f68c3c57afa8c83cb613de3e258ff35e7dcd6628befd1 SHA512 b77edf3f90c512774e0b959a6792b99380bd8a467c3251652f95f98d65ca134d429b06dffdacb8fb4b2b14c3a8bcf384b3373603733ad6c0566092f9ce63b4a0
-EBUILD hamcrest-core-1.3-r2.ebuild 1470 BLAKE2B f2074cbedbed6df3c8e9e32414d12902bdbfef2712f7906f2c10363f15ba441bf7275faff766f483063a8395d33f7f3ffac4aadaa8949fb1f1b75f8e860393fa SHA512 0fefd10c40fe3cd900a4c512ab91feefa554ed286c69df21143733c6a5c6e2d4833c25e92c9deb5d9a1e7d0561b4c869515981c344b97f763d1dd23b2d0bda8e
+EBUILD hamcrest-core-1.3-r2.ebuild 1431 BLAKE2B 574f974933f7b3bfa4ba1c5838d3e0e338d57da71f75ce869d93128e32264593ab6f00ff9d4ccf2791f69fde0b9610d7a782e324f6650162c898b1f140fff1ea SHA512 85d31dbf825c5cac7a7a2c4b690dcb167b9a3a1b21c4aa75ef26d20c58641aa8198d66179b9431e143f267372565d7a42edc39c0dff9502be70edbf2f55afd34
 MISC metadata.xml 311 BLAKE2B 7b18e98cbbc5347a4fec2cc99c965e9ae8403f351c89a869dafcc194dc9e65adf898cc43d30eaf6665c700cbb08ba282e08000145c167acde6cf29a0b1048c23 SHA512 d6bdaac2484cf4baf46037b4476fa9bc1974bc629a503e678f65e6cf0a3fecfdcf45b54fa4f69557652fe92d61187c6b5ba1ee87c4eac63af3444a2b5b75e870
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
index 627607d45aa2..a8ef97c4a000 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-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
@@ -20,9 +20,7 @@ LICENSE="BSD-2"
 SLOT="${PV}"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
-DEPEND=">=virtual/jdk-1.8:*
-	userland_GNU? ( sys-apps/findutils )"
-
+DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
 
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index e4cb79a855b8..8d1a80cd2b50 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1,4 +1,4 @@
 AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-generator-1.3-r3.ebuild 1302 BLAKE2B 1b0aed94fe4697b23d56fdb5a331880bfdfd275686b15fd54714e9d28220fcb8d3f3843f989a6bfef9a4e7ec988275659ba67de614836fdc8d708bafd9165e53 SHA512 ab8c36a45c6d18ffda071a6106541026faeca61bb1f1ad9ab3784eed2d3b82987eb9cdd64fc21d131b414a42ecc2e7240c72908aa0387535289309b71ada1307
+EBUILD hamcrest-generator-1.3-r3.ebuild 1264 BLAKE2B 5995afbb47b6b2fd169de7c843502eeb4d3bc714ba82b302eef7b4b80362fb8e8fbdccaede33094a3e1094e844a29e920ca192ed1a72b0344921cfad108b025e SHA512 e337e7048f7fe2fb57631ec6bbc114a7bb224ff4307a4d6cb82d70b1f05b71214878aa8e3de4a8c9544bb4dffba3a1861d9467eaee159a2506f9a17797c72389
 MISC metadata.xml 364 BLAKE2B 53ba1f3714a307f1a2b4fc604b54b22ee35ef9bc2b9ac3b7640898f0b0f79f68a4deebe5fb55c06ae24aa425728a1a0cdab03c9ce15ee21d7a1f084595b8e068 SHA512 9438e55f425ce2cb2f3e1b9c2c8603a3e5ad6cb6de362aa3af3741f82335a210689dbd9b32b2d51204fc2b09e1113808498d8e11be52b481ca95bd7e22566140
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
index 7afc1760f6b2..bed740f60fbe 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.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
@@ -22,7 +22,6 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 CDEPEND="dev-java/qdox:1.12"
 
 DEPEND=">=virtual/jdk-1.8:*
-	userland_GNU? ( sys-apps/findutils )
 	${CDEPEND}"
 
 RDEPEND=">=virtual/jre-1.8:*
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 6c46e8efc382..f296d8588f3f 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,4 +1,4 @@
 AUX hamcrest-library-1.3-java-11.patch 2323 BLAKE2B 6a16d58c3aadfbb7b6447b68f5d89ec17f82639b530f331e29276d1ebe947daa0c572e874efa328c03397058884ad6cc523c1ded08086fcfa42d1902624c948e SHA512 827966cf7ca175287df5005e35527575427986367013745ef49a7b1719fc3c6a0c7dd5697158726ff7d04122bc6e558bc402b71b6f2e9b932b87b61b5f71cecf
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-library-1.3-r2.ebuild 1535 BLAKE2B ece7a5fb55b5bf39c89c9eb98fcf49aef36fb403d44fa61f4561d4b2ee58faa7bc9a0cf40689b970c3d5faf9de9a5065886040b4d8747aaa2bedf8f3aa3e28b3 SHA512 76ed07eb45f29a0658627f12dc3db76dc212d16a71d6e8e4dd81565e331dacb41c9a24f2dba415416102fcc2c26c3d0c22e3ed2b31d0f8fd7ae02494f1c4e898
+EBUILD hamcrest-library-1.3-r2.ebuild 1497 BLAKE2B 0b60108a6f3c48220a765b09a317db9bc0157b86c8fdd73b50edc9c178b263c7a02016a7fca1e4d848111b9089c9ad86b04e9dbfac5372caa36220ee18949fac SHA512 a3a594d61c5d7c8b3a4ed301b59e884ce9e04a30287f18b8a07d3870dc5e475bc85bac8100496f3c5549820481121caf5973b771e95e612e3fcac14162cba91f
 MISC metadata.xml 311 BLAKE2B 7b18e98cbbc5347a4fec2cc99c965e9ae8403f351c89a869dafcc194dc9e65adf898cc43d30eaf6665c700cbb08ba282e08000145c167acde6cf29a0b1048c23 SHA512 d6bdaac2484cf4baf46037b4476fa9bc1974bc629a503e678f65e6cf0a3fecfdcf45b54fa4f69557652fe92d61187c6b5ba1ee87c4eac63af3444a2b5b75e870
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index afa5bc55ca58..3ab303aebbcd 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-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
@@ -21,8 +21,7 @@ SLOT="${PV}"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="dev-java/hamcrest-core:${SLOT}
-	>=virtual/jdk-1.8:*
-	userland_GNU? ( sys-apps/findutils )"
+	>=virtual/jdk-1.8:*"
 RDEPEND="dev-java/hamcrest-core:${SLOT}
 	>=virtual/jre-1.8:*"
 BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest
index ef1ff04462e7..c5a64cc37d6b 100644
--- a/dev-java/httpcore/Manifest
+++ b/dev-java/httpcore/Manifest
@@ -1,3 +1,3 @@
 DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713
-EBUILD httpcore-4.4.14.ebuild 1589 BLAKE2B 9246b0de46ea669d2238eafa92d93f7095d5e89d6ab201415f81dabcff3686574b1e536309985036e8bfde131f24b438ea8d1e659fe1b0e727e95e76bdeeef14 SHA512 acd7ed62dbfa45cbcdecaee08f1c2fca337c719baceaa093a94e634569f03c54f54244fe862e6d13124f961d1177c7305cc3eca1a2749568638ceff151178935
+EBUILD httpcore-4.4.14.ebuild 1601 BLAKE2B 385c593a8ae32fdcb2e01482e5cb7b3fd9709cc99bd8702e0233006a127a3f0ce26b9f5624a1b9f04726b0d93ae4c6a403ad433ce9f3f619947686f7add35991 SHA512 d7d15735c8a3a0cb7f8991fc9f9bee6f3c80a362937f3e4503de81416bd16acb452ad00e47f2246054afd1e8048483e0a339938396439bc0a6d2c84f93a8ac15
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
index c208cb1c3702..016fad82327b 100644
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ b/dev-java/httpcore/httpcore-4.4.14.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
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: httpcore/pom.xml
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 32c9cdb6f576..5b3089c9e719 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -1,8 +1,9 @@
-AUX jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch 674 BLAKE2B 1d3275a45d9f472f7541a9d8b0d8726b411f633423e546f9f486cf46d3941884dd31c82d1afb14db13bd667d9eedea47f36f6516628dd61a14aee890975e4a30 SHA512 e6b078903c2b50db451a491a48deb515d983537994211d57f16c5259bfb8bda8bd245ceb3a24b355edf430623ff4f38c8e8d2e41580d48de8f5b90f8f328f2be
-AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 696 BLAKE2B e888cacb419050b6bf412ecd70df42ea13a11937bcf00d7e716e36e1842003a2a53626179a6e642ab2df7aec84a2c7f9bc660754456e0ba4ad4912ea80dc1ffd SHA512 ab32fefc4f24d422eab5c399355e4188c0f8b7171e0e1ad9cacb5d031e1cee01ff3312d0df47cccc15a949d374e7c07749e5dc020a7e6d1e9fab7a86289d0d19
+AUX jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch 678 BLAKE2B a240957e24b0e0961d680b4868dafe0fc4b337cb96a6eaed9bd0a23099d4e5d47757a846776abee196941514b329de5b08ef42219edbb8f2ae4b26f210efbd04 SHA512 00e7e1e102f3d518a6c0ed088ba286b84ae5991a73fe01bdc353fe0550289a95b69f7fc69b46b1423f6b42ea51e4b38b02d266bd9abb6663881a53223dd6cb9a
+AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 700 BLAKE2B f3c54de43be927bf53c07bf29af744449864b43684e8e32bc8f6e7c40efd4cd5b6cb09b953d83c02147e96dd4548d2b285b3658f7ec3edeaac62c33e49d40f9c SHA512 f7f26b207be3f9fc19a1226ed01e5774de7411fe440a450459dbfc20b19db77e29e40adb3e5e18f72b637c51774baae4a26d024d43ea785715c0c89b91c1c46e
 AUX jackrabbit-webdav-2.10.1-build.xml 17644 BLAKE2B c878975d2f1ffe74752b36873d0625c73605469e5d8a1287568b461fe402e4a91ea0f2c6334514d526a011dbe4311b0b49439d508c9ea99e127cad49abe6ebee SHA512 5b22661e3d36d227edb618b553671964be14f34dd245f1749caf9b6f3c9981fdc9fad11659ae98cdd5fb3b343b6bc450478d3655054b055f7ffb3663378b7a8a
 DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
 DIST jackrabbit-2.21.7-src.zip 13532529 BLAKE2B ea3ebf687e29b58e75840d6f5665da8abcb474dbaa353c0caf6a8d1cb1de6c6347830cbe0b6c91259fd496eeff834278874b64306da85a7e0c82ab71dd0b1c34 SHA512 254e151ed7e814ff8b4df985814ace12316a9dc56e87f4ba6236986ac2364936d3b15327f50ebc1b9fa7ac9bbed067924148436cc8ac31a7ef91d11faecb4678
-EBUILD jackrabbit-webdav-2.10.1.ebuild 1263 BLAKE2B fddbde6b2343b28371d93ccfb6e193b4dfae02505c39ab85de707111a4e4e52bfa00a12debf26e1486a04859a3eecda55c4475bf2658572ffe049ffd2da19ced SHA512 c19c14a0a1fac37995395cb9d84944dcc24491df4e61b5a0c5d14a4d02d3c816f431afdb6b0d86af40b31a5b56ff16189d848e50534c735f8fd39567d5212eac
-EBUILD jackrabbit-webdav-2.21.7.ebuild 2070 BLAKE2B e2a992e5c7968de0a79cdd37dc958f585f0c5aac075680a4f1ebba24362228d5a302cc14ffed547abe0fd7f68e22531bc09e6b6422eb1d8bbf296274b8bd4b9e SHA512 7dbc419a37e14c424396ccd8ce65e180d333d12a97d37e6418d16c5e0ef2d702191774c2e32591db043fcf1ab74d3e83ddd88ec6e1f242cac21d768df9458831
+EBUILD jackrabbit-webdav-2.10.1-r1.ebuild 1286 BLAKE2B baa4addf5b9f6f476cd4188676756df7a5e688e4f0943649bc366550fe7e0f465a32cc69329f7bc02b06d80a4ed69a45a2ff064e14f6ac8326ca7b04cf27be5f SHA512 eddf6393b3ba679a1410b31a88d8bd8ee55fd5aefadff80330b2add888288526a4ce95f285408defc1d1efd64f2e4cda8afe51617ff0b23798ab61c8d960db2f
+EBUILD jackrabbit-webdav-2.10.1.ebuild 1279 BLAKE2B 1d2eb70b66d3ce9f30ab90467af0a78ed6a251559c581a19ce74d4846b8c21eddace72fdb0aba0e1b919563180d040c9b70f16b0c66d7597274fbdcde027f8cf SHA512 09aa64702b82c18b124f7f41eb5de6480dffcfc7e6503877a428c4dbc40ecae72a1d1e41c5b7aeb3cf50185aa918716432128a092929a184af5421253145da00
+EBUILD jackrabbit-webdav-2.21.7.ebuild 2075 BLAKE2B 68e90450e3f9f5ea9e93dcb1bbf93b42e9a12c456b08acbe64b592b9196e69c0a43f18cfe574e8839e1adc0c86180d391f85d45a3467d0ed5b7a671f4060b557 SHA512 11571376f7c2951c783a5c3c7ad5654deaed7501d4b7afc7f7cc6c21f1b5ea9282eeba01e3d77fcc9acd7561ffa1112e174702c8e849c140bb4e1987ca954387
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
index 4c1f286339b8..8417f31cfceb 100644
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
+++ b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
@@ -1,5 +1,5 @@
---- src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java.orig	2015-07-03 09:36:45.804000000 +0000
-+++ src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java	2015-07-03 09:36:59.498000000 +0000
+--- a/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java.orig	2015-07-03 09:36:45.804000000 +0000
++++ b/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java	2015-07-03 09:36:59.498000000 +0000
 @@ -281,6 +281,18 @@
          public void removeAttribute(String name) {
  
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
index d9a2315f19a1..9f132b817a12 100644
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
+++ b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
@@ -1,5 +1,5 @@
---- src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java.orig	2015-07-03 09:26:48.578000000 +0000
-+++ src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java	2015-07-03 09:27:34.109000000 +0000
+--- a/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java.orig	2015-07-03 09:26:48.578000000 +0000
++++ b/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java	2015-07-03 09:27:34.109000000 +0000
 @@ -40,6 +40,13 @@
              public void setHeader(String name, String value) {
                  assertTrue(Long.parseLong(value) > Integer.MAX_VALUE);
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..70c88912c147
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="${PN/-*/}"
+
+DESCRIPTION="Fully conforming implementation of the JRC API (specified in JSR 170 and 283)"
+HOMEPAGE="http://jackrabbit.apache.org/"
+SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
+
+CDEPEND="dev-java/bndlib:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-nop:0
+	dev-java/commons-httpclient:3
+	java-virtuals/servlet-api:2.3"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	bndlib
+	commons-httpclient-3
+	servlet-api-2.3
+	slf4j-api
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-OutputContextImplTest.java.patch
+	"${FILESDIR}"/${P}-CSRFUtilTest.java.patch
+)
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+EANT_TEST_GENTOO_CLASSPATH="
+	${EANT_GENTOO_CLASSPATH}
+	slf4j-nop
+"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
index 1c182599a97d..2f95946aa570 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.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="5"
@@ -25,7 +25,8 @@ CDEPEND="dev-java/bndlib:0
 	dev-java/commons-httpclient:3
 	java-virtuals/servlet-api:2.3"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.6
 	${CDEPEND}
 	test? ( dev-java/ant-junit:0 )"
 
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
index a16fdc022650..327150492a77 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.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
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 9e070b31c75b..6df87f82d765 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,4 +1,5 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
 EBUILD javacc-5.0-r3.ebuild 1402 BLAKE2B 3357b3e97b8d5cbafb588809e6c1e7faafa54f35ab9f910771e0870b2be425998efa2a7ab5376b0f5f0ff67a8822b2f88cf4e6a41ea0a1b5a02d95972839c169 SHA512 74fdbc40ff51b8302639a242e31dd03320832705d7566524ee27be7039ec7974b94625788f4569b45ded38467c6675085ff2b0db3f239d82554fb4af7dd39ebe
+EBUILD javacc-5.0-r4.ebuild 1410 BLAKE2B 11eed861cb1f38d44bf799d3228598245fff56933fa5a04a95910ecfa0b880aaa6fdad56e7f8e59e74edeaeee1549ad3e4c9403444895e1ac6cb0d7c83f52013 SHA512 0ebf0b87a9a7e97784d987a60a1737ffc6a2b50230d3e2314a8fb59ad8c5e2f583530571582ef43083abecfde758e0db3d46610de4a8b082fce7a10f77bdf0c8
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/javacc/javacc-5.0-r4.ebuild b/dev-java/javacc/javacc-5.0-r4.ebuild
new file mode 100644
index 000000000000..dac3ebd544ec
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.java.net/"
+SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+CDEPEND="dev-java/junit:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? (	dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-javadoc.patch
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="junit"
+
+src_prepare() {
+	default
+
+	rm -v lib/junit*/*.jar || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "bin/lib/${PN}.jar"
+
+	if use doc; then
+		java-pkg_dohtml -r www/*
+		java-pkg_dojavadoc doc/api
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc || die
+	doenvd "${T}"/22javacc
+
+	echo "export VERSION=${PV}" > "${T}"/pre || die
+
+	local launcher
+	for launcher in javacc jjdoc jjtree; do
+		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+	done
+
+	einstalldocs
+}
diff --git a/dev-java/javax-inject/Manifest b/dev-java/javax-inject/Manifest
index 976af55f15d3..b390f0cc6e66 100644
--- a/dev-java/javax-inject/Manifest
+++ b/dev-java/javax-inject/Manifest
@@ -2,4 +2,5 @@ DIST javax-inject-1.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a161
 DIST javax.inject-1-sources.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
 EBUILD javax-inject-1-r2.ebuild 578 BLAKE2B 060433c8a619ebb3d2538115922820f85a1c63d19998a345160a83d07bc1afde5593de92f60f165acab4bd61d9f60f3281e11a9b29b202a2ac54da905e3853de SHA512 411f1bec81aaf28f8f94fdc42325a71c30bf33a57c872b3fd34184a5603866b15c8f17cfce7727f623e8223086babed3654860449e8ed73dadd1555d05f503b5
 EBUILD javax-inject-1-r3.ebuild 561 BLAKE2B 2d942cf2b7fee90f64e4a633b0abfcf9224ddf01fb264a182b0ac7e6abefb22458a294ac9e50cc068a09439d0e668bdd1cb8b320a7795a9587b643019d10877b SHA512 828cadc3ee982ab376e5854f100b2fd5fc170987b269ea11fb7f0482ea41a896887b4cb2ba8193e605036f287d47b047d52601262eaef45f0de385142ce26bdf
+EBUILD javax-inject-1-r4.ebuild 567 BLAKE2B b9e8c89d7378830a7d2743b394523024fff0e9151ba670a58f72dd15ee4f203a5a0aff99aab1038bd8e1c517f14931bb9786c7cc6bab595dc93587b31448d487 SHA512 82a11764249859cb14fc2ca3dddc4cca474c9f5afa795a07a8779112c5a19ac7192800efbebab0569710d4331c461f3958ef845f82ce3832485276efb197d697
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/javax-inject/javax-inject-1-r4.ebuild b/dev-java/javax-inject/javax-inject-1-r4.ebuild
new file mode 100644
index 000000000000..2b17e6fb0452
--- /dev/null
+++ b/dev-java/javax-inject/javax-inject-1-r4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Dependency injection for Java (JSR-330)"
+HOMEPAGE="https://code.google.com/p/atinject/"
+SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest
index 84a85b09efd3..986cea368111 100644
--- a/dev-java/jcommander/Manifest
+++ b/dev-java/jcommander/Manifest
@@ -1,3 +1,4 @@
 DIST jcommander-1.48.tar.gz 64544 BLAKE2B 29ed81d5f9a7e4ec193c8fa03cdd67481e9904898bee2730c585be6b6beb2e0ec37b31634513095b660655b8202c42077361318a83c1e016c9450d7d7ff30244 SHA512 1304bb14ecb89f9945e8219f3229941e556c7cccef52a2eb4e4663da9dbf9fa5ecec4914275a743fb7d90ca301153284dc76dd380903aac93db1507894d72a6e
+EBUILD jcommander-1.48-r1.ebuild 571 BLAKE2B 376eb664ff832f999f2284664fdff8844b1ef3b833ba0e3afcdf0c81cb5b4fa197b7ffc20aba0616b39ebf46d16c96b12e15481c4f08023de60b51fde61505bf SHA512 277b578a9af404ed7d2377960a51d1493c2b0757650d225abd559f17267ccbe284f789764854a765636ef95b45d7ed159b55aa4912853e5e6078072f6d1e5f7a
 EBUILD jcommander-1.48.ebuild 556 BLAKE2B 767fc257eb5f199fe390b870cb6b790276575e036b0e64aa5d0db28e79ad40b4195e33b183ee2ecbc23ce95ed431858fea64560e0cc8a8a08b07a7c891a707d2 SHA512 3380f05ba85da50799d30f7c2f906196ea54ec92d3672c7436272d4683c6d7701c0ee92fa4d1eae560927989512ca073abe5ecab795428ba863135b0b5e068ff
 MISC metadata.xml 329 BLAKE2B 35efab95ec95b721d53463b4fe8d98358c632a76476f1648e2e1f33f7432b2fbf9d00199e4e53c047a91c90ac9e86e733089bf1c9dc69a9f2961d7cc8266b710 SHA512 c83a4611485d806ca1c1848db6605a8d4956956dd521e5b6171d98027324236e51a13c9032e76b462168d07bb74dc105fb9587ab91bd554845d733e668c9df32
diff --git a/dev-java/jcommander/jcommander-1.48-r1.ebuild b/dev-java/jcommander/jcommander-1.48-r1.ebuild
new file mode 100644
index 000000000000..a6f99b1114f2
--- /dev/null
+++ b/dev-java/jcommander/jcommander-1.48-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Command line parsing framework for Java"
+HOMEPAGE="https://github.com/cbeust/jcommander"
+SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	rm -rf src/test || die
+}
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
index e341d6d89c77..97e89a6e9aad 100644
--- a/dev-java/jmh-core/Manifest
+++ b/dev-java/jmh-core/Manifest
@@ -1,3 +1,3 @@
 DIST jmh-core-1.21.tar.gz 615305 BLAKE2B 1a5cfe9784efe0cd7706382eaa89c8bcce0efcce3c2b802ce0772992dd16f0c6900a47d70b72d1c556584adb8afda442f49267ad4e0b53d04c20026979787210 SHA512 ac51d58d9b746157842a3bc9c4828bbff52c5882582e123e04b5ab6c4bfc1ff3cad1f6023ab1fe1eccfa68c73ffbd21b34388547bba544626af87092852ec166
-EBUILD jmh-core-1.21.ebuild 885 BLAKE2B b5ab688fae4c7af12e0cfd2f5df1d578eb289ef2f2cf8a447749c6a21f840af6a88538773a9589785cc7aca78d90a2b2aadcba45921a4dd70371a0dfc30aa125 SHA512 542c21c157bb7b3c4b05b9ae50fccf42ddd0c6a279a3da4850e65e9f6c441d8e19d51cbd5234b55e7fa9006067c043129bcffd627a257caa5d3be10dc48ac6d3
+EBUILD jmh-core-1.21.ebuild 897 BLAKE2B a7de5cd923a099a67571036ba80dabf0fe70d403f063da74a978842bc0bbf1bf830e0a62abfa3da6780997ce3bbaf556c0ccb1d2e0574ae9b8f8b472d5e81781 SHA512 d93df911230fb602667d69cc50f4ce688c6fc84f4d08f578a36a16dd3bc8b36005e7652f910321b247028c1bf44fbbf6e403f236a728c3ceb5d521fa0ff6f2d9
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jmh-core/jmh-core-1.21.ebuild b/dev-java/jmh-core/jmh-core-1.21.ebuild
index ad044bba454e..42c501e08dd6 100644
--- a/dev-java/jmh-core/jmh-core-1.21.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh"
 SRC_URI="https://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 # jopt *must* be 4.6, see https://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
 CP_DEPEND="
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index 0608a0871b91..57d0d24bb6d3 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,5 +1,5 @@
 DIST jopt-simple-4.6.tar.gz 107082 BLAKE2B 622144647b24049861398cc99ca3cc268baae045f8ca23cdd5bddb2e656bc97d17397ae752ca9a6edc91b8486e1e55ce19ba335d2afadf6c6df4f858faf43a1e SHA512 c2f467521f6419f91206f6036d420671b02106beadff3fc51d1893e6f3f6302b8fcbb31957327b9e40cbfd7a7d55030e0c999d9570d7e29fe7a4375bab10ed76
 DIST jopt-simple-5.0.tar.gz 119502 BLAKE2B 975a0d338fa3154963954fd3b218c944dded023b3a2da59ee2671c73450a578dbf1aee8e52b9f715839e15c1937e0a493c4b37518b73038aa017e1d0ec1ca06a SHA512 f440c62cb307aad7cab64f091c82f78e11a117e60aaadf71883c149a622576531272de3d67859f6df093df658bb0bfb435d9bb33bc729bcda24dcc99d27369ff
-EBUILD jopt-simple-4.6.ebuild 645 BLAKE2B c13723071a5b22bb69aa309832ad929cca1bc53ed98a52e96cf3e8a46b5479ad5f3be2a4ca225ab9f95d1d274a6134491adab2eaec2cb8cb47709357da4764c2 SHA512 dca4886b9b353edb9fcb197726cc1aafdb828edf1fa125b1c7b037dc3794f92933391ccb0a092056458cf3bace76928944cfa50246bfb07470395d1730114046
+EBUILD jopt-simple-4.6.ebuild 654 BLAKE2B 0a19b2700df2a68f66a1506f7d877592154af4a11c645919b49078ba316f6e2fd1cf8ef76fdaf3ebfa340eb54611d4168ca5af778caba88dd5da91c21a6acf0a SHA512 d541d7380cb483c18d99fe5048a05952d8afad088f26783e1cfaa0968369d6deec10031abc180feb3e7d154b811bbf78df44d0d126e1f891cde5dabe31ee50dc
 EBUILD jopt-simple-5.0.ebuild 648 BLAKE2B 137db3a025327e0e9cc2c57c465f9f8734f523e350ad91263f33ffb3edb761ac99c9f84a897a60387694a61d5cb46c67dd12579dd68dca8321b5e70428ac1934 SHA512 3c2863dbcc4613fe33bdf4e3afac16d8f006e0c958315ad35cfbfb4428a519cf743a2532f8a831c37fc0a5bad7608daecd2aac27fc23588e4d8a95bdcf51903a
 MISC metadata.xml 321 BLAKE2B 1165369ebb01fa6f8d30370de45e8b6dbfb6bd57687593395213e2772bdd379a0f4adefa0901f23e79262c6803ea3544b0127fc1e5f5f2a00e3523ef26ad2ce9 SHA512 9306c4766bac17556a01b019139fcdbebdb08ee1f0b56adcf4ffb25805075ae2d5d5007659e897418da012ee05157cec8cdc119715bf88abd8a00a6a7661b89e
diff --git a/dev-java/jopt-simple/jopt-simple-4.6.ebuild b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
index 197957670e4c..91899dcea876 100644
--- a/dev-java/jopt-simple/jopt-simple-4.6.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://pholser.github.com/jopt-simple/"
 SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="4.6"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index 5a288fe56eef..9f5c058a3d6d 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,3 +1,4 @@
 DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
+EBUILD jsch-0.1.54-r1.ebuild 1234 BLAKE2B f6a4146afce8d015bb762ba9c023ea866f5c6379ff295a7dc279693c397432c516dbfdb6fbf0b80657d6cc800d5890bc96daa1293c9ccf264dc78decd43336fa SHA512 e6876ac8e6adc5a4bcf4b1333e5a45f8f6b57992fa4dd0a1e8abedcb60c98b09c9bc73c0b4173a09f95309b4250b4746c767eaae706a44cec5125c94c1c10930
 EBUILD jsch-0.1.54.ebuild 1202 BLAKE2B 118bff8b932f70f9fb70f2aab5c934870e89a806c3c8620554093735a2a5c0f6b7341737edbe0784fb215a8c8a18649d26aec29da1c3485b4d7d0621df0d49a2 SHA512 b0b9e7253f695136afbddf241a8690aba1790301dc849eb30f3fd3dd5d319efc1f8e3395f8da6eeed6764b55e72669f08dceef009eaa83196496c5046b30b3fa
 MISC metadata.xml 311 BLAKE2B a694ea0db3a5ed039fa56b939a9473672f07c927a6a9ca818ebe826b3a388edf16dfab642179044114bf6b0e7274a959b18361097d72207da5fba4a724781efa SHA512 7dfed16685de8168719b2874d46624ca519933aed410c451d77caf0811dee59391c5fcf05e390dd32f7bf4a1829d5bc8b810b7b7d993fa807d897c86961592d9
diff --git a/dev-java/jsch/jsch-0.1.54-r1.ebuild b/dev-java/jsch/jsch-0.1.54-r1.ebuild
new file mode 100644
index 000000000000..99d5d3657c76
--- /dev/null
+++ b/dev-java/jsch/jsch-0.1.54-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source examples"
+MAVEN_ID="com.jcraft:jsch:0.1.55"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="JSch is a pure Java implementation of SSH2"
+HOMEPAGE="http://www.jcraft.com/jsch/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+CDEPEND="
+	zlib? ( dev-java/jzlib:0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="
+	app-arch/unzip
+"
+
+EANT_BUILD_TARGET="dist"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_compile() {
+	if use zlib; then
+		EANT_EXTRA_ARGS="-Djzlib.available=true"
+		EANT_GENTOO_CLASSPATH="jzlib"
+	fi
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-osgi_newjar dist/lib/jsch*.jar \
+		"com.jcraft.jsch" "JSch" \
+		"com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
+		com.jcraft.jsch.jcraft;x-internal:=true"
+
+	einstalldocs
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index d8ab80acf707..911d6c0e530f 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,3 +1,3 @@
 DIST jzlib-1.1.3.tar.gz 139424 BLAKE2B cae5f0f6ac8efd99cc916e8cc087280be84e1a2a8b43b8932dc68e2393ac5f1848e4dac1759aa75a54123adba63956463719aaa469ed88cf0c609eaa63647e16 SHA512 d78ed3feaded0bde62b3e2c6fb17b5051a6637bcf12e7fe0f5b1855922358b54b440b05bdba7328c5d2cb9f972bc68195f8f0570ce5d49de9251d7060018d88d
-EBUILD jzlib-1.1.3-r2.ebuild 1312 BLAKE2B f010a9c7dc70ff37c862c44a922e6106cae46b7cd5e84f5a2e3f0cbbafde1e361f610f6a58a60b3918f5bbe0eae6bd3f69f0a2ad21c3f8ef91efabedb0e29747 SHA512 77250bd8531793c7774bf2d47be9bf10a0364c8ad7d344266796c73ff3434adbae943714f2ba5cfce8931e836bc846c148a334edf628ea7c6b57dc100b317ad9
+EBUILD jzlib-1.1.3-r2.ebuild 1324 BLAKE2B cfcb86f96a0f49687e8d2c9bcda9488640d2c88c7dd053ca0bdcdefa8238668101e1cb8862f6bdbc7771b88fc21374f93944d0e2cc9f639908e137138fcb86bf SHA512 101d00a501904b1cd151dee8617fb8b4cbfd0858db905dbd93086148700e75bd3cbd0b543fcd0737d9c564a372af3b9c19da9852c3dc53469a2d5d6df0fae378
 MISC metadata.xml 322 BLAKE2B 6222cc2cd2fa5edb23a097bd254a7b7d8f7a4bba7dcda28b0435f1053aa990293d224851143662f2c9cbca6d48bb3576c40d357746cae77c02bd60404ce25c7b SHA512 d775e95ea730463fa57323f5cc0b00488790de6bb13e4aeb0941660573c385c1bf2045fa765b350e00fcba2f6f2035a6871b717399616bbc184222ae6b8fcc93
diff --git a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
index 615a5512fc00..1cc6a85d66ad 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 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"
 
 RDEPEND="
 	>=virtual/jre-1.8:*"
diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest
index 25c991fc2fbb..bf348eb2b409 100644
--- a/dev-java/libg/Manifest
+++ b/dev-java/libg/Manifest
@@ -1,3 +1,3 @@
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
-EBUILD libg-2.1.0-r2.ebuild 1375 BLAKE2B 9ccb7da11acb6c878b7acc0251fbcc17c6d8e0ccc597703fe8cb5b0525b2356d7cd57a28e1d295fb1310f9a15bf02549431b84508543226a3ecfd96f72ebb0f6 SHA512 d28cb25d96dc3254db85dbc57e90dd228ab00f3cda5fc0da74ddca641cb7544492d524d2db44eaf295b8bf33a3e7fa06213086e02e05fc16c9e9dcdd7c8f20c6
+EBUILD libg-2.1.0-r2.ebuild 1387 BLAKE2B 3e3d381476db88d4326d40afd08b0bf595562a5a8da9e0fc2ac818cdad263964eeb60f66e6e0dd3b0dbe99194db3be0b0ff0c6017d869b8f91968f3eebb3e1a1 SHA512 96af4abc40ea4d213c086ee85a73bc2f2e6a1b35fd287a70d5f8acc36d85b04bd3c19d4ef106241043c436c12a3fb9b0e1f1b8bf7f242d1390dbb02d37388792
 MISC metadata.xml 324 BLAKE2B 4abc17608a568a12af96dc0ddb7b82d55341ad891537e120633fd8517e09a339d805325988f3208050cde9b20aeb0a4dcab95e55ba13c66854a0d90b0e54551c SHA512 e9e23c794433024b0888c2d5859120c0ef39cd6b55df99035c3ea1761280bd4287fdeb4aaf8ff067bab1bea80dcdcc9060f74b43b1a6a004bad87eb69a9bd3c3
diff --git a/dev-java/libg/libg-2.1.0-r2.ebuild b/dev-java/libg/libg-2.1.0-r2.ebuild
index 2093ba30d738..b5305fd26da6 100644
--- a/dev-java/libg/libg-2.1.0-r2.ebuild
+++ b/dev-java/libg/libg-2.1.0-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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Tests depend on biz.aQute.junit, which depends on biz.aQute.bndlib, which on
 # its own turn again depends on aQute.libg again; we can temporarily assume that
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 70ed201b937f..ee58d0068d41 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,5 +1,5 @@
 DIST 0.9.10-assembly 63268137 BLAKE2B a87553608f9269e529227b4bb13bfca32cf82f3feb7b947dd849d66e86721f390d1862df897184306d84251b635ecd089e1e817244ee6e241a7ebab6c60fe1fc SHA512 dd551aac47b99d7a33f7900f80ac16eba60d1a93f68c87329f3faee8d219102424e19de899b78619568e55f09f2b081948bd21356179d608847c722157a55208
 DIST 0.9.11-assembly 63268510 BLAKE2B 2594800c42d23d3a91ec5b676e968200bb0a5f8e26a4163f05e6badd1377b593fa3b091f63bfca2b7cf3263fefa9d9bace5882b9a1061631f71ba647b65edeeb SHA512 3d6e67e1a301761209a83f3a12fbd692f5589af919ef4e30fe9017ef49a3ba5ff66a00ee372c184ab1d35932f014513c7fd4c7221463ecbc878efea0323c2920
-EBUILD mill-bin-0.9.10.ebuild 463 BLAKE2B 76b3ea412b568cc70308b150c92a97792c3eb49cf9c94caa850d92732f658de051633ad228cd9292a5bea24106340bf1a1306f8517e62d7384d4273d5e6a6d99 SHA512 93dfb789423caa0d06876350adcd789b48e79ad2b6722972f509c67366eb03f69010f6700b629d0632b3cdaf0c813776dabcf13e1c1be2274aceb6ba246c58dd
+EBUILD mill-bin-0.9.10.ebuild 462 BLAKE2B 0b33b8aea299741600f108c52c46408ec29442b91cc81716a5c7d7c07face2135d51a9ba107e71711528f9971588d2bd1959aceeeb44ba68b477a7008d027c88 SHA512 de66509bb517bbdb36f1b1fb6c9f64871ace3a859e7d33b552a27685f341ffb95ae3360830ece8fdea7521a2dcf6fbdbba7a1f88aff65eb01644e40fe558f2a3
 EBUILD mill-bin-0.9.11.ebuild 463 BLAKE2B 76b3ea412b568cc70308b150c92a97792c3eb49cf9c94caa850d92732f658de051633ad228cd9292a5bea24106340bf1a1306f8517e62d7384d4273d5e6a6d99 SHA512 93dfb789423caa0d06876350adcd789b48e79ad2b6722972f509c67366eb03f69010f6700b629d0632b3cdaf0c813776dabcf13e1c1be2274aceb6ba246c58dd
 MISC metadata.xml 246 BLAKE2B efcbb4db7ac6eb97dc4625930f11c2d780be8fb04e89f2a6d7ef4a853f07b59b3058542d61769f3185b626f35bbe09bd6ee9e34323cef4239f1241dc3ff160ca SHA512 92d34b6d6b6116064cbdd8c79bba97e2f60f56a078c70efbbe87c9cd90cb96bf4522fcf437075bf30417e2ef20f696e6cd4e586203e85a00269aca13f1fb23be
diff --git a/dev-java/mill-bin/mill-bin-0.9.10.ebuild b/dev-java/mill-bin/mill-bin-0.9.10.ebuild
index abd33534fe99..bface58632d1 100644
--- a/dev-java/mill-bin/mill-bin-0.9.10.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.9.10.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
@@ -8,7 +8,7 @@ MY_PN=${PN%-bin}
 DESCRIPTION="A Java/Scala build tool"
 HOMEPAGE="https://com-lihaoyi.github.io/mill/"
 SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-java/osgi-annotation-versioning/Manifest b/dev-java/osgi-annotation-versioning/Manifest
index 8b56fdb98d32..4f6600b1e5c5 100644
--- a/dev-java/osgi-annotation-versioning/Manifest
+++ b/dev-java/osgi-annotation-versioning/Manifest
@@ -1,3 +1,3 @@
 DIST osgi-annotation-versioning-1.1.1-sources.jar 5301 BLAKE2B 3c45fc25bda97a3b98e8db1d725f64a4e237300251a3414daed8ddcb54c5d8a68aa4c603e57a3831a34761c4cbfa0d544b1ed345e26ca1a1a1b4d4fa5bf2f9dc SHA512 39b208b4f72a33cb9a8c2dff1a4c52e07b32a553bcf2d7cb014ae50935c6b8ff26b67961117019fb5222e99c59ab4ec6e73788124f309dac86defeeb212d407b
-EBUILD osgi-annotation-versioning-1.1.1.ebuild 1007 BLAKE2B 73e1742a988762302953c9885558c46ac62f51db55f9b11118b7be774faeb2c128ab9ec01474346d32066d13c919f9169e236d29add7dc0d8c5d57c5ba683b2e SHA512 5b3ff22b2af62d5c4e576742c88ce7de6312f35e2d94ccdaab848311302bfe419b3de6dce075414a40bd5557964cbb563c235c6413c4ca6d61a6ee59acb50fe3
+EBUILD osgi-annotation-versioning-1.1.1.ebuild 1019 BLAKE2B 7da557ee880c7492d0e37a8ba77306e41bde8c97e9b13a437f606b1db980525a99ab126fc679be0857174be7d076c29cb4906f9c9c777f7fd6348764d638ded8 SHA512 0dbf4b39804fc8b3160fcb5d4d849eeae82730defbf4bd10aeae2e90ffcc628862d2ba8ead2cac4bb1d4b01cd3d278d5cda0979611a8bdd720c98c253b3e06ae
 MISC metadata.xml 291 BLAKE2B c85b76df77fc86b1590849e2ddbd23981924ae4172b592d72c45845212691f01cddcdd91ee9a079d977455ac6fdb1a7c4eafe6b507cef45cf28418e78092aafb SHA512 13c78a573ef594b87860d0c0a1b0f7eef9418fcaf5554995c5149cb42b434c6e81816e70ad8af6e35ecbd9fe12931700c9a2ade5a303e88b266922f4ffe0ff76
diff --git a/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild b/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
index 77bfddf47524..5e7e31472bdb 100644
--- a/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
+++ b/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.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
 
 # Skeleton command:
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
index 6b1cfb8a354f..37577ca094dd 100644
--- a/dev-java/osgi-compendium/Manifest
+++ b/dev-java/osgi-compendium/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.cmpn-4.3.1.jar 741615 BLAKE2B 6f6058c07fd7744f0369d05cdf607b4d4fe51bbdf567c6a6c951413b0627eb1dbb6e56f65641a8472198d0aedca378da4715c26ebe05aa4e7ef80adb1020175f SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9
-EBUILD osgi-compendium-4.3.1-r2.ebuild 860 BLAKE2B 5268e77b1579bfe2a97a0c7ac435d7e77fc114baf29b15aa771d046e50edfdc6b3e1bef68c773a3550143d2bb68fd976e108e070eaee79276b532fcad801ac12 SHA512 10c0242f83daae53fc8221860693f3edd0129beed889cc2b39f0d95bb7c68c17b74f740104262e81bee9a50bdeabe8706e2765b50317129fb38c20d92f40580b
+EBUILD osgi-compendium-4.3.1-r2.ebuild 872 BLAKE2B adcd9909d248dccb67615dab778134bd3ec6b6999edae6c20bc303818dd5b96d04216cb39b45a774a0a56c3321767bf54925d7739b3c95d65803e7ead505e5d3 SHA512 536371356cab02647e7cc8996423d690789c73f084bb25562d1b24594d9f075744686616cc4bbf1df83deaf1cb14f44ba70ec00f7159cd1cddee02a2585e0575
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
index 27f307819b4b..63e95eae4bce 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1-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
@@ -13,7 +13,7 @@ SRC_URI="https://osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 CDEPEND="dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index cfe62c037af6..051d7e92702d 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -1,3 +1,3 @@
 DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
-EBUILD osgi-enterprise-api-5.0.0-r1.ebuild 802 BLAKE2B ddd7446ae82b03dd6858f316e89746dedbcff66da00bd73fdfafacf4360d0be3f987e0cc55ea1e34494660d213a44581a3612da1fc23b25e0b5b07216a55695b SHA512 7dbcef851a9f495ae15a5822cd2093d29db94f7f925494401e0017dfa65cf5a88ebfc6187044f79fd54b08147b44cffff6721f8b896cca023c2b0149a96570ef
+EBUILD osgi-enterprise-api-5.0.0-r1.ebuild 814 BLAKE2B ade66d78374c79bcbd01781d46b72b4eef258ad0430a3b0a28b2f31858e25e24a192e678d0e648aa730618a5f85b71fc1f3a98fc075f2ebdd6fe274daca24330 SHA512 a51d571a1029e805b3cbab7b4772697daec48a87c917b37bad7747463b194855688045e419bd6c88f2f11d8735ad31d7fa11c178e7c68fee2e68be7307d3939e
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
index 0de462009ebe..9bfed594de55 100644
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.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
@@ -13,7 +13,7 @@ SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 RESTRICT="bindist"
 
diff --git a/dev-java/osgi-foundation/Manifest b/dev-java/osgi-foundation/Manifest
index 3e1daac8dd38..006d90a7b4d3 100644
--- a/dev-java/osgi-foundation/Manifest
+++ b/dev-java/osgi-foundation/Manifest
@@ -1,4 +1,4 @@
 AUX osgi-foundation-1.2.0-build.xml 9886 BLAKE2B aacff8e000b02c742ee7e5d03d2c057b6baf56bce9cc1b9cd0031c39550e9ef07bcf85a7d89dd265cc523d638063e425b1553f146b5ce6af107440b1e0d61d43 SHA512 5f106bd612a65033e35beb4fb635d07199e10b69e692db5949424ecf7a8baf2bd6af0f35898bd465334356333d82d5c4941ef6ce7ce16c3939f425f4e58c6fcc
 DIST osgi-foundation-1.2.0.tar.xz 45176 BLAKE2B 4b5432dfaad9134f402b5f448a8d7ba5f626a7b160bbc953914352a28f745725da851b6c5f2122f820b52f2fd8ad463c2df5c8ae3e2b46ef8bb9d56d89d90f1b SHA512 6523dd6b4cd8205aa3359fae4640ff6b17a1944aec6bf23acf0d6e4eb33839a9b9049e8df0c55a4f35013b40b1df2391a53ed68df682a317c35dca504e9b996b
-EBUILD osgi-foundation-1.2.0-r2.ebuild 647 BLAKE2B 2a8f2c552cf27e078bace0f33b9483a6bff7095bea08e7e380bd709994a8d4081cd5b8e3cb408f6b76452ba4c63d092d261f713ff99f18ddd163852ed804fe6d SHA512 94989d0d58d0c94c499b7ee3059b0e8075d32d8c048b434e47c86112b412304b023d0d1b4dd174a51e166ed646311ed25708e9cee647ae51c7b0dcbef89b32ec
+EBUILD osgi-foundation-1.2.0-r2.ebuild 659 BLAKE2B e5b83bbe67320a8b1dddb67e29f781044f8be21c518c7a5e6609d3f2730d7e91f1d706528c414eb2be206a95e48358cb10f6b56bb33c3269dbcacbdceefcf939 SHA512 4c5ff5adeaafcb26b28da354278be9af19d88e9d93c084acdc2b2afffa6f8f73db4219d1133c061e341813414d9d2e617ff6b783db27597a4c1a11178f5d943c
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
index 595cf9d6e49b..455bcca5e202 100644
--- a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
+++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0-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
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index 9c02a85efdb5..c8dfda750cbc 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -4,7 +4,7 @@ DIST resin-4.0.27-src.zip 17990178 BLAKE2B 2da8c4bae7328f0a39fc7cc84c2d7a25408a8
 DIST resin-4.0.46-src.tar.gz 32564716 BLAKE2B 6f600cb52ab6f56271a7f75832f300af56d1a2d3a868f5fda208271bd93838e31e49b5f843b668b36a237ced363dd551cf6e8d82fcd70e58c1857667b2b9646a SHA512 649b7204c18e7d3a2144130f07590f2d5af29f3b0567acddd4a8d83caebc45a9dea10a671edebd1ff32df304d7a9f1ce44b0b86fdc0ba353fe01b26d900bd368
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
 EBUILD resin-servlet-api-3.0.25-r1.ebuild 809 BLAKE2B 3abb178b156dff27a40a39ad9764b9ae1b13cef98b5bc87ec66455e4bffa386e2d787ee07bce268cc7993f3095502addec8684b3bf75e87d0eeb597d480ecc04 SHA512 14afa86b24af0a961600a50904f02cf2fca0b8d87456265e77868c749228140a481eab377ee229abd37c79886ddb31c44f2d799c6a8d6159eeee43982759bf63
-EBUILD resin-servlet-api-4.0.27-r1.ebuild 1063 BLAKE2B e94b0bf2467dd09bb70f35ea2f53515a55dd4664ca1ee7d667d38a7c11e1993f0308dd17ffa47ca238a7d852fd10681dee7fbcc2f08594be0f7fa7a69cc7a269 SHA512 3f95b347a8dcc1b33a201ad9210188f1cb133ac946598fdfeb468c7aa19cd607d340feb4676e4497ec21ed8d9afdbc97058e959333dff67bc26c250dc7682c20
+EBUILD resin-servlet-api-4.0.27-r2.ebuild 1063 BLAKE2B 742020b2f3abef7af58a7a76322760ce12649ad31b63218cd4b505d931c0925fe6deb9ecfc5eba7932a731bc0d45f18612f391d615576db391b1fcbb9dfb8a1d SHA512 e96ca44533e321901b733621da9d24251589a83f0e7f34c4dcff10caeca2d4380658d6f43a188bbd28cef2ec45145a69cb7f57c54fa2d1081c13b6cabe9ccd0f
 EBUILD resin-servlet-api-4.0.27.ebuild 1127 BLAKE2B ef2e0779a6ba6ec6bc211fdbffb138aa6dc2442b8c556120e3d3b73abe79942851c3ddc19b560e26037ac04c4e900aaf0e6ea25147237586b7fc14a8260730b1 SHA512 c76c4f45a84e7b1806bdd2b0348e7251e84f4e571ad4c3651a42c5a49672257939a7e9e4a70230d63be6c240d1a4b79d291da5fa7bd94743cbb07332294083db
 EBUILD resin-servlet-api-4.0.46-r1.ebuild 1063 BLAKE2B e94b0bf2467dd09bb70f35ea2f53515a55dd4664ca1ee7d667d38a7c11e1993f0308dd17ffa47ca238a7d852fd10681dee7fbcc2f08594be0f7fa7a69cc7a269 SHA512 3f95b347a8dcc1b33a201ad9210188f1cb133ac946598fdfeb468c7aa19cd607d340feb4676e4497ec21ed8d9afdbc97058e959333dff67bc26c250dc7682c20
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r1.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
index 4e73714c0d20..e0bc4f832070 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r1.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-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=8
@@ -12,7 +12,7 @@ HOMEPAGE="https://caucho.com"
 SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="3.1"
+SLOT="3.0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index 28c13cfd6672..e8a6913018fa 100644
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/Manifest
@@ -1,3 +1,3 @@
 DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
-EBUILD slf4j-nop-1.7.30.ebuild 1432 BLAKE2B 074c5051999ae6c2d11ef083ae5db626f54180cf18464952663f6796223406c1dff385fba375ca22341165a5eb838669d4bf529a349e138dd7b06c6dcc55bfbe SHA512 adcd49eaff11a1a3a9d9fe2136b0843f7c56042ed72cc8e16e90f8bca6d24549a157201b8fa42dce514e36883572da9b45bcfd0a304507cc4676562116f329aa
+EBUILD slf4j-nop-1.7.30.ebuild 1437 BLAKE2B 653e4cf4692273839bef1fd7660d7e34250f3425ecaf710ecfc479f52df8b8b3cc360af22ca5551ebbf4f7a291135b224791fa0c19b35372cb8308d4bab81c93 SHA512 ae23fec76971365baf682fcef61c508e5cc29f1887e56d3fe5c49dd46debc29fb462bf24caaaf2ff2d4c1a39c6e794f07d70571522087126bf9b3d91dc535ff5
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
index 97c5dc067abb..d20cb0d8c7b6 100644
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.30.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
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Common dependencies
 # POM: slf4j-v_${PV}/${PN}/pom.xml
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index c1b64c1a1693..c88b52888380 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -16,8 +16,8 @@ DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39e
 DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8
 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
 DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
-EBUILD swt-3.7.2-r3.ebuild 4364 BLAKE2B 8c238643fbcdbb8c3536a6ba3b931ddca6dcf1593cd987893f71f025ca90f8fb539b2a20b9d06e0a984e49966c368d8be51f8a7e1483cf4365a5e90aca840083 SHA512 f78cb150abf666a4b48ee5a1f926c36c88db2cefc69a02151b49ee0a9b31f22bbf635594e28168483a7691e8b4a53f57c7bad689d8c8f90d850e34434e2520ec
-EBUILD swt-3.8.2-r3.ebuild 4167 BLAKE2B 9ecd08f8b5604aacc7d662e221bfac8b40267957dc1d61ea6da93efe4fd94a8de9799842f59d32a872a5706f84ffce8f1f5300e9f604fcb27991a1124a724b58 SHA512 ed61b6ad2899efe069df78d6b798efc755c78bfdef9dc1939346dbf6c110e6b8719c173a2480a55a2df52fa88cd130e7d77f72e6c905e4a00a7438d9b4319682
-EBUILD swt-3.8.2-r4.ebuild 4161 BLAKE2B f49d7e6ffed9da09772c8ae6a3a9588c21e405ee7963cd0ee32562b4b62bac16fb497e559fc1d99bab5c495bb285737aabaa042038dc0bcd47aabc8b6c977f84 SHA512 60bdc6cdcf9f6bf230ca1482e4f65c1d6843c65b02ac008bf970b80f4f900b0cbba74a27fc4591b50e4dd891f319a2484f318fff18db9239dde0431132320c37
+EBUILD swt-3.7.2-r3.ebuild 4284 BLAKE2B 4f28f089ffd3e884f6c40c586bf49c7753498dc2f11d08cdbf5da5b30515365ea9f960f8d5ab9b43f7ac2465483d44c52c911a365d755dabb94d3a768b1d23ea SHA512 f22b5af349663407b65fe224dc0f3d993d31ca78de3a591fe506e85749d6442cfa47e46b9378f350b1e8fca64614fb9182211de364073d0bbd88576bfc5640dd
+EBUILD swt-3.8.2-r3.ebuild 4087 BLAKE2B 0407cc0b85e48c2aa97addb67d6b49b06b2d5a721a738cafe8846e69cb4bbed1718a6e398336574b7b37dcef3f33ce390fc12ffb86ea59320fd50ad3779bafa5 SHA512 fb0b2de757edc6e83368b191e0ad44379a9577d13a9e7f95666df91fe2ca2c3a6c46cfc76236ffe861fce7b3603a68ce215dc404496b95f3692f815b3d52cf4a
+EBUILD swt-3.8.2-r4.ebuild 4081 BLAKE2B d1d27cbe0ec2f322443349e570726e317b8aef89cc74cc8cae46d6284eabdf91713b96c3fe680ffa7cc514ccd0e06c8475f27d827103925b3ff7557e0e359552 SHA512 d05a019017a4bb774238833826003fc472685fc5838c515275233c18df1ef10fe18bd38ee542a347833893b3f03cfeac043a7342f00a74d5fe86d6ebf67c663f
 EBUILD swt-4.10-r2.ebuild 4527 BLAKE2B 9f2d0c3eb9bf1903c9f14376a31d4e7e9e7dd0122dc4f8938f4bc38bf8bec5aaeb9257d90c3259257f666f48257176f9a98dd5ea10201a793a6c36a4b305ac61 SHA512 1aa4bba24a5dabcc1173cea8bf930a380eabab23ac26b89a564e683d711287fd6811bdfa7b114480951c914f4a533b4c8c9fda4db6f7377ee2074b1764e3c06c
 MISC metadata.xml 519 BLAKE2B 5c132bb4b8d9fbacfae3262a550e34932088ecbd204c3a8c2c13d782b0b0fa37a3b255bc84c388ee13f874b427a87a4321e605d0c614308300c18715c9631ab5 SHA512 ef81d6d7cc9f8e2309dcb8bdd78ea942a7a300ba4ed8506a93f12150c9142a5f62a153c0d77e3000f78637d5523367b7fce1186bbac01cafae10d4d0af6c959d
diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild
index 12ccd36700f1..c00026ba19cc 100644
--- a/dev-java/swt/swt-3.7.2-r3.ebuild
+++ b/dev-java/swt/swt-3.7.2-r3.ebuild
@@ -15,8 +15,7 @@ SRC_URI="
 	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
 	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
 	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
-	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="3.7"
@@ -144,7 +143,6 @@ src_compile() {
 src_install() {
 	swtArch=${ARCH}
 	use amd64 && swtArch=x86_64
-	use x86-fbsd && swtArch=x86
 
 	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
 	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
diff --git a/dev-java/swt/swt-3.8.2-r3.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild
index 604916b2de09..31af30f456c6 100644
--- a/dev-java/swt/swt-3.8.2-r3.ebuild
+++ b/dev-java/swt/swt-3.8.2-r3.ebuild
@@ -15,8 +15,7 @@ SRC_URI="
 	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
 	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
 	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
-	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="3.8"
@@ -135,7 +134,6 @@ src_compile() {
 src_install() {
 	swtArch=${ARCH}
 	use amd64 && swtArch=x86_64
-	use x86-fbsd && swtArch=x86
 
 	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
 	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild
index 341e66a35938..8bca8e212541 100644
--- a/dev-java/swt/swt-3.8.2-r4.ebuild
+++ b/dev-java/swt/swt-3.8.2-r4.ebuild
@@ -15,8 +15,7 @@ SRC_URI="
 	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
 	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
 	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
-	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="3.8"
@@ -138,7 +137,6 @@ src_compile() {
 src_install() {
 	swtArch=${ARCH}
 	use amd64 && swtArch=x86_64
-	use x86-fbsd && swtArch=x86
 
 	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
 	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index b448d89de714..faa34fff9d77 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -12,9 +12,9 @@ DIST apache-tomcat-9.0.55-src.tar.gz 6136319 BLAKE2B ac49abc3198bcc2fed1310839d0
 DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5
 EBUILD tomcat-servlet-api-10.0.13.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
 EBUILD tomcat-servlet-api-10.0.14.ebuild 3018 BLAKE2B 27dd8444f63e6842aa42a05fc47f9e5af713ff0dce2bf027d86525b0d268ce8853e666cbc80048673b6cd8d7fc0d6c65b5fb042ba1304ed81e13efd5369bf627 SHA512 8fc3ebd3ca8082de85d97af1bfd67771893f50fbf33d74a5a6251051825efd70836e8cdefe184a31f587fa65aaccdebfc4a9e57a9c9e671b522ac53d8de264e6
-EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
+EBUILD tomcat-servlet-api-4.1.40.ebuild 1008 BLAKE2B 982a481d22749c6b7a68688ae81a12235bc3eee0a2a54fe0afc1791970c30186342f1541d080102fe06fbbc58305ed5ce86b4ed3458fdc2218c23503294e022e SHA512 26c604a85510835c146df1ed62ac97de9e9721388692f8e818949bdc9907e4d76b2077c785ae45b04774d493a147411d9ab1fb529a39c6c71b9b68970e468cb2
 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-6.0.53-r1.ebuild 962 BLAKE2B 25cca0a5612b56c0c2999c574f3ae6b00f5940eca3d39e6378e5d2686d8fc6a75b728d0609dc3443a38a3edef641825c8862f17693b2920403369eb99d4c2371 SHA512 033a9bbd48a76792d9c00f5bda4c32d9c808484cde33c62206d2753b665f6d99c7668b95f2cf3e4337bcbbd00478de78d98623443be50e84c67e3d9382f44e1d
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.73.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-9.0.55.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
index bd2584d3f9a2..354e5da5621a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 S="${WORKDIR}/${MY_P}/servletapi"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
index 3a00b7cfd701..5eabc891630d 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.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
@@ -14,7 +14,7 @@ SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
author	V3n3RiX <venerix@koprulu.sector>	2022-01-07 22:48:01 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-07 22:48:01 +0000
commit	c3bc61051d7f12b4c682efa7a5460bbc8815649e (patch)
tree	b6d19e96ba3c397fb8278eeb9b68170db92630ba /dev-java
parent	3517852e3b8a68d1e997770fc0650c5053bafc6c (diff)