Adding metadata

32 files changed, 19 insertions, 611 deletions

diff --git a/dev-java/byaccj/byaccj-1.15-r2.ebuild b/dev-java/byaccj/byaccj-1.15-r2.ebuild
deleted file mode 100644
index ed88c9ebb229..000000000000
--- a/dev-java/byaccj/byaccj-1.15-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A java extension of BSD YACC-compatible parser generator"
-HOMEPAGE="http://byaccj.sourceforge.net/"
-MY_P="${PN}${PV}_src"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-IUSE=""
-
-S="${WORKDIR}/${PN}${PV}"
-
-src_compile() {
-	cp "${FILESDIR}/Makefile" src/Makefile || die
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" -C src linux
-}
-
-src_install() {
-	newbin src/yacc.linux "${PN}"
-	dodoc docs/ACKNOWLEDGEMEN
-}
diff --git a/dev-java/byaccj/byaccj-1.15-r3.ebuild b/dev-java/byaccj/byaccj-1.15-r3.ebuild
index 171ba3fe20e0..9feb822145a5 100644
--- a/dev-java/byaccj/byaccj-1.15-r3.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}${PV}"
 
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index b9b13542b265..97c35db071c4 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,2 +1 @@
-DIST commons-daemon-1.2.4-src.tar.gz 281929 BLAKE2B 877f1c31024a2f3e4796abdd11059bd636444f5c856b998a39761fb0b221467e986586fef43463a4d01b4d4f7a562f9f8c658b94a124cd356b0a70cc185c0030 SHA512 36e9cb3153ca763bfaaa71575a1584610254f1ce4c0f666ff7bbc628311405430536413525c9c777e4364eea62a247fb084750d837e84a62d9fce92a61909d56
 DIST commons-daemon-1.3.1-src.tar.gz 287642 BLAKE2B 02e85a5534af7f804a0374789506ee25ee8313987c68153974aa938b983745ae44d579f17deb362764d1a03b04bc552115bd69ef28b4f7d3bbb06f3bb4199814 SHA512 b810ac152f8296d980a4fb3786eff9d147b234dc2377df5fe1bded0824c694c9e82a7ef50b0a63c3e6432dfc4684a3aa2ce8d583aacb740bd4664c3dfb8b8f16
diff --git a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild b/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
deleted file mode 100644
index 8eb3ed4a1335..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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/daemon/source/commons-daemon-1.2.4-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.2.4.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-daemon:commons-daemon:1.2.4"
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple toolchain-funcs
-
-DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
-HOMEPAGE="https://commons.apache.org/proper/commons-daemon/"
-SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,LICENSE,NOTICE,RELEASE-NOTES}.txt )
-HTML_DOCS=( PROPOSAL.html )
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-
-JAVA_SRC_DIR="src/main/java"
-
-# There is only org/apache/commons/daemon/SimpleDaemon.java
-# which is not even run upstream ( mvn test ).
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-# JAVA_TEST_SRC_DIR="src/test/java"
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	pushd src/native/unix || die
-		./configure
-		emake AR="$(tc-getAR)"
-	popd
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-
-	dobin src/native/unix/jsvc
-}
diff --git a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
index f739750e8965..baa152a4895a 100644
--- a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index b4072c638ca7..63bfb41a2979 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,2 +1 @@
-DIST jackson-annotations-2.13.2.tar.gz 1983139 BLAKE2B 511f62548ad3daa4aad265502e5c5e63cf3d60186b96f96ab2ebb3a904a8cca9e5eadfa31ac2fee1a8ce62c7ba51b4a722e9e46c9bbc390291048b0a852b8f30 SHA512 b024b5bff985a6104a122c58735249f3c3fa8e9ddb678283d876ff3750b72872bac13258456cca18828cda65e03eee85a9ef816f924fdbbec211fd03c7652439
 DIST jackson-annotations-2.13.3.tar.gz 1984205 BLAKE2B c577fcdcb40c44cf1cb08ebe467318ca4e4fff9fdeaf756360ef202275a48b5f5a93135439567261651b5731f523588f0c29a17c05ba6d03fec0f19ed19d9c5b SHA512 c00aec542c8ddea999fb60536cb2cab3edbf4f1d20b29e404d62add54a22546ca195ab7faeda4a2cd1d3a827f10420ccafe1dfb0065742f46aecfc2d00f2c1fc
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild
deleted file mode 100644
index 8b5a3ffeee49..000000000000
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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 https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.2.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core annotations used for value types, used by Jackson data binding package."
-HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( README.md release-notes/VERSION-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_EXCLUDES=(
-	# 1) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: No tests found in com.fasterxml.jackson.annotation.TestBase
-	com.fasterxml.jackson.annotation.TestBase
-)
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
index efcf510776c4..13397eeb87c4 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index 1973cdeaf340..49e736e09bf2 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1,2 +1 @@
-DIST jackson-core-2.13.2.tar.gz 12267420 BLAKE2B 4acaef320fbd08bd3d3ae835eb4a96771b1f25aade7433e4c87beac0f6e365e641eea8c70ed7d3884159bd6990286b80891b57ac967ee292ee639cb2b56b66e1 SHA512 8e424ea255a6cd78c550300b0ff18d5e63945a3608dab2803211da2df5eb99fbd249779b2d051569b421c393e073d88a21b01c02a25b9647bcc8545f2d8cc1ee
 DIST jackson-core-2.13.3.tar.gz 12268319 BLAKE2B 8053988b060cd625670c643d9ba12d9ceae72dffa583bfc78e87044ac723c78bc44dfbdbaca0331098116a43b273dac844721a9e44ba1a536cc457f841d89b56 SHA512 9e7a9ec54073fa6faac36914c496df38bb6c201a37ade2b32306561b71e1b78a0ec4f48b006d4fb10cbde21979a16d117706b59338ada7aedcb593ba5c31ea52
diff --git a/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild b/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
deleted file mode 100644
index d93bfdb9fb35..000000000000
--- a/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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 https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core Jackson processing abstractions (Streaming API), implementation for JSON"
-HOMEPAGE="https://github.com/FasterXML/jackson-core"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	default
-
-	sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
-		-e 's:@projectartifactid@:jackson-core:g' \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
-
-	java-pkg-2_src_prepare
-}
-
-src_test() {
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
-			! -wholename "**/failing**/*.java" \
-			! -wholename "**/testsupport**/*.java" \
-			! -wholename "perf**/*.java" \
-			! -name "*TestBase.java" \
-			! -name "*BaseTest.java" \
-			)
-	popd
-
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-core/jackson-core-2.13.3.ebuild b/dev-java/jackson-core/jackson-core-2.13.3.ebuild
index 657905868708..e25ceed85a1a 100644
--- a/dev-java/jackson-core/jackson-core-2.13.3.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index a1c1ac059d50..c7c82d3053aa 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,2 +1 @@
-DIST jackson-databind-2.13.2.2.tar.gz 48061394 BLAKE2B c67b0a23c5fcff881d91ddec14877a5ec16c13eebfc76b34c1666bc9ebc73f573d279d1951ff2be96c612fa87281e08332047bb6c75df73184249b7ebb552d16 SHA512 0c3550aa3ada1c5fcd2f19076670c7ddffde59542b10fa270d1c7bd54d7866f0f10c256738ed76815af55c8531f7553f8b977c461fe710f759811b0ffa660245
 DIST jackson-databind-2.13.3.tar.gz 48056095 BLAKE2B 04751cd99eae3bbf3c3a30993506f05b47a85782f52e2cf51f50de9bcb5e9c3718d6ba6105667226272d644dcac6aeeb3ce06dc7ae737adf0392a7a7eafef2aa SHA512 785db6cab20ee74ff90815b8a1afedcbf10f13f60c336a61c20513757cbcde80c073d5f4dc60d390a72600a2b5719cca22b4c71220707dd4edd67dd87f6a7ac9
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild
deleted file mode 100644
index 8b602e5bcb47..000000000000
--- a/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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 https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.2.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.2.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.2.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="General data-binding functionality for Jackson: works on core streaming API"
-HOMEPAGE="https://github.com/FasterXML/jackson-databind"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-
-CP_DEPEND="
-	~dev-java/jackson-annotations-2.13.2:2
-	~dev-java/jackson-core-2.13.2:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? javax.measure:jsr-275:0.9.1 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.powermock:powermock-api-mockito2:2.0.0 -> !!!groupId-not-found!!!
-# test? org.powermock:powermock-core:2.0.0 -> !!!groupId-not-found!!!
-# test? org.powermock:powermock-module-junit4:2.0.0 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}"
-#	test? (
-#		!!!groupId-not-found!!!
-#	)
-#"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#	JAVA_TEST_SRC_DIR="src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS=(
-#		"src/test/resources"
-#	)
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
-		-e "s:@projectartifactid@:${PN}:g" \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
index 6a34f6927b74..f6673fd7ebe7 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index fccf770a227e..c3e4606939c7 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,2 +1 @@
-DIST jackson-dataformat-xml-2.13.2.tar.gz 3201222 BLAKE2B c4db7ae5f3f3fc41bb3890337cc2cf6f1fe4dd65e96bff336d0c21e19758ca797497affbd189b731518a164fa8ad7f40c07e1c64ab3250ac438f1d4bf122a6ce SHA512 048550c465a83e0e5b72313d601eace9d817572a7d331d37ac48af51d5e0ef8d52cccadb1412c27d4ebd28b222b7707a0bfba114e10168d233e4c4e9f8d2fd1f
 DIST jackson-dataformat-xml-2.13.3.tar.gz 3201473 BLAKE2B 90f6b98325e3ae43e7ba560b077ee8fc8e5ad5004fd23b7c10a2c2a3ec7a674b700b80766690d2442820f87698fa5e33c440c2aa12cd521b7566e78eca50bbaa SHA512 52e26e1a398d90f75ef61d074ed1d149b9f13555f1878703b3148ed008f29f8802586a6020f3c1427a748a73b9a4ca56d86ffd769cf6cb7317a69e039345eefa
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
deleted file mode 100644
index fc200932a64b..000000000000
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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 https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Data format extension for Jackson"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
-# com.fasterxml.woodstox:woodstox-core:6.2.7 -> >=dev-java/woodstox-core-6.2.7:0
-# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
-
-CP_DEPEND="
-	~dev-java/jackson-annotations-${PV}:2
-	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}.2:0
-	>=dev-java/stax2-api-4.2.1-r1:0
-	dev-java/woodstox-core:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.2:0
-# test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0
-# test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-	test? (
-		~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
-		dev-java/jaxb-api:3
-		dev-java/sjsxp:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( README.md release-notes/{CREDITS,VERSION}-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-3,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
-		-e "s:@projectartifactid@:${PN}:g" \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
-}
-
-src_test() {
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
-			! -wholename "**/failing**/*.java" \
-			! -name "*TestBase.java" )
-	popd
-
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-
-	# The same failure under openjdk-17 occurs upstream (running 'mvn test')
-
-	# 1) testCollection(com.fasterxml.jackson.dataformat.xml.lists.ListAsObjectTest)
-	# com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Failed to call `setAccess()` on Field 'first' due to
-	# `java.lang.reflect.InaccessibleObjectException`, problem: Unable to make field transient java.util.LinkedList$Node
-	# java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge "17" ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
-	fi
-
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
index 2c613fbdaa52..4cf94ba87a41 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index c401d0429c03..30c81f39372f 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,2 +1 @@
-DIST jackson-dataformats-text-2.13.2.tar.gz 3528945 BLAKE2B 5dc38706b714121478e82b2f4bc0b3831fa84708b708c08c20d4744c4fc7130149d8dace5c20437514ce9431b1c39183f4d283717f4ad5876fac3651c53ea096 SHA512 1101aabc4b3b652ff90c23186fada6391db9cb4cb5ec6ba9ff78cd91b73ef3b632f38027e192d739d8e47f7ed2726ac03d8c3a1d20d416dfaac3b50ca11abb67
 DIST jackson-dataformats-text-2.13.3.tar.gz 3528981 BLAKE2B 98593f45e663905c15ab5cb37152c95d69a0121515990fac0c66f640d93af83cd51802e2856a4e8df6b82c0121ac4fcd20774fd6a3841e019e1da56c599ed9a9 SHA512 77fad3e6ab5ad55d3a46ffaee3482e9f0dbfa36ce67d5ad31e0b7cde667536387f1dce5bc8296733a28efb09f423785aca7291d9ba85a67ca2b94ef4c8766d7f
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
deleted file mode 100644
index 9c11a644ec61..000000000000
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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 https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Support for reading and writing YAML-encoded data via Jackson abstractions"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"
-SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
-# org.yaml:snakeyaml:1.30 -> >=dev-java/snakeyaml-1.30:0
-
-CP_DEPEND="
-	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}.2:0
-	dev-java/snakeyaml:0
-"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( README.md release-notes/{CREDITS,VERSION} )
-
-S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_EXCLUDES=(
-	# Upstream's usual exclude pattern: "**/failing**/*.java"
-	com.fasterxml.jackson.dataformat.yaml.failing.ObjectIdWithTree2Test
-	com.fasterxml.jackson.dataformat.yaml.failing.PolymorphicWithObjectId25Test
-	com.fasterxml.jackson.dataformat.yaml.failing.SimpleGeneration215Test
-)
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-
-	sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
-		-e "s:@projectartifactid@:${PN}:g" \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
-
-	# dev-java/snakeyaml-1.30 does not provide module-info
-	sed -e '/snakeyaml;/d' -i src/moditect/module-info.java || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
index 5e75be3da4be..8dd76fc9caca 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 84d8bbcc71bc..709b5d5c0d0d 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,2 +1 @@
-DIST jackson-module-jakarta-xmlbind-2.13.2.tar.gz 2146359 BLAKE2B 242d148b1945745f2578a751cf7aec7764000e3400fbc63d9c4b5b9ee029c77868b97590c922c3900e8b3800271176099d4928f3d63936c6b9e5e2326321616b SHA512 ea8d6a230f736cc0429e8d9a8883609074dc7e723bb01bdecbb49a665fc8f879b3f2da906c1d9816d6675a38479943a8b5e6fa1b67d495bbf882262808bce10b
 DIST jackson-module-jakarta-xmlbind-2.13.3.tar.gz 2145569 BLAKE2B 13864e4272d40e8425232482a67a2bc720ff294e93ec623589bd0b7286e2c63c2b724bc1033eb19437cdea23db0b11142380715fc300c32e8af9dba22eeed407 SHA512 2807a9e1d3531f3553a2ab6bb64e0ece2809ca9d2facae320dbd38efe0797cdc7ab11e9b284122d75a98a50eda9bc0cfb0f098ca0921e3bf67a0e38b5252a14d
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
deleted file mode 100644
index 729776debe50..000000000000
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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 https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Support for using Jakarta XML Bind (aka JAXB 3.0) annotations"
-HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"
-SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have jaxb-runtime:3.0.1
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
-# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
-# jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
-
-CP_DEPEND="
-	~dev-java/jackson-annotations-${PV}:2
-	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}.2:0
-	dev-java/jakarta-activation-api:1
-	dev-java/jaxb-api:3
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}"
-#	test? (
-#		!!!groupId-not-found!!!
-#	)
-#"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( ../README.md )
-
-S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	sed -e 's:@package@:com.fasterxml.jackson.module.jakarta.xmlbind:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.module:g' \
-		-e "s:@projectartifactid@:jackson-module-jakarta-xmlbind-annotations:g" \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java" || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild
index b063ac9c72df..394536c89255 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild
@@ -62,7 +62,7 @@ JAVA_TEST_GENTOO_CLASSPATH="jaxb-runtime-4,junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
 
 JAVA_TEST_EXCLUDES=(
-	# Upstream does not run these 
+	# Upstream does not run these
 	com.fasterxml.jackson.module.jakarta.xmlbind.failing.TestUnwrapping
 	com.fasterxml.jackson.module.jakarta.xmlbind.failing.TestXmlID3
 )
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
index baf70d9cdfe8..b8c68c4cebaa 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have jaxb-runtime:3.0.1
 RESTRICT="test"
diff --git a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
index 0799775bdcb7..cf43149a135d 100644
--- a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
+++ b/dev-java/jai-imageio-core/jai-imageio-core-1.4.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
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Sun-BSD-no-nuclear-2005"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
index b5ed9e69920b..d6111d3e33ce 100644
--- a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
+++ b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.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
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Sun-BSD-no-nuclear-2005"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}-${P}/pom.xml
diff --git a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild b/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
index 088737191965..0a6851c00264 100644
--- a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
+++ b/dev-java/java-diff-utils/java-diff-utils-1.3.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
 
 # Skeleton command:
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/googlecode/${PN}/diffutils/${PV}/dif
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
index 759a268c26fd..24e6a4482fb5 100644
--- a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
+++ b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.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://downloads.apache.org/pdfbox/${PN}/${PV}/${P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index abc917a130ca..cfeed4629d9b 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,2 +1 @@
 DIST jopt-simple-5.0.4.tar.gz 120388 BLAKE2B b9eec360f9399a40fa8fe33f14708c14a45689eb78efcdf99f27d666168d67f2670b4aa5bd6e7f26ddff72565107f1359214c808281918947d66874bde237b86 SHA512 ae4274bb4b3e2584dc6fb4370c4d63f9b95e63ff2cd124f92f8ad6e3a4a3dd91cd9e9b70ac423a560d52039508549a5319bb23035215b4a191c4fdc0f0e082d5
-DIST jopt-simple-5.0.tar.gz 119502 BLAKE2B 975a0d338fa3154963954fd3b218c944dded023b3a2da59ee2671c73450a578dbf1aee8e52b9f715839e15c1937e0a493c4b37518b73038aa017e1d0ec1ca06a SHA512 f440c62cb307aad7cab64f091c82f78e11a117e60aaadf71883c149a622576531272de3d67859f6df093df658bb0bfb435d9bb33bc729bcda24dcc99d27369ff
diff --git a/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild b/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild
deleted file mode 100644
index 71f7f89dab11..000000000000
--- a/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://jopt-simple.github.io/jopt-simple/"
-SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${PN}-01719a6"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-src_install() {
-	einstalldocs
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
index 9081448fc9a2..1ac84e768ee5 100644
--- a/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-${PV}.ta
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/pdfbox/pdfbox-2.0.26.ebuild b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
index 97b9ade34c7d..13e5a7c7f68f 100644
--- a/dev-java/pdfbox/pdfbox-2.0.26.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
@@ -60,7 +60,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="+tools"
 
 PROPERTIES="test_network"