gentoo auto-resync : 23:08:2022 - 20:45:29

38 files changed, 29 insertions, 690 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index af03342fbc4e..b0cf88450576 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index dd2273829040..cc5245598f26 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,4 +1,3 @@
 DIST commons-codec-1.15.tar.gz 423639 BLAKE2B 5d9d3dd44fda7eee77048eaa1e28f54f9baff7ad276f7e718f4a4d6c5b26605914809db538e9832bf06b1468a65432645ef9de74aec9f9af9973668a82bd996f SHA512 dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce
-EBUILD commons-codec-1.15-r1.ebuild 1414 BLAKE2B 906332a4c55b087f41c1d29eb6b62ec68b7a7822a07504a0e8ec25675fb461f76f68c12c54abf48a3d029409c510aae592585e35f56dab6591385dc966283d05 SHA512 a729d97c766f02083ff0cc7bd56d519896e73b581d001b201189abd3e24635c200ce0e8d759abbcb0e06a56eaf97043ccedc38651edd1da37c8face24a2f4775
-EBUILD commons-codec-1.15.ebuild 1369 BLAKE2B df61c7883f36aa5caef0f3c7cb2be1bcf5acb10936f13e412be92f1b90515b5bc7dcfb4660857947af3ea5b4ada6fcb7e4b162920aef6e08fbabc3fea93fdebe SHA512 18b143f79137db9d1279d7c637d3f37ab1189c7af3b640f8c9afa34538b2cd4fa5b11f48622776f896ad1361f454735b72d05e23264c7c9027e8bc3d52cc858d
+EBUILD commons-codec-1.15-r1.ebuild 1410 BLAKE2B 15e92f35b907c56a8dcf8e90d878b67a81c1c2a2068d8e3d41370addda2df55f650ad707116144fab60ec29e0298a2f1e80cf7525e0b34f48e624e87635c061c SHA512 458add7d92399e802b0db1acb1288eb4634b64474247aa36f8adc17c0524b4aebeb92dac8c13c3fa860783d38393fd48fdeade0593ea2d44824bfe353d3f3c2d
 MISC metadata.xml 1361 BLAKE2B b73337d1547879b37b5c97ab5365258989ac49f45ec1e0c10b835a849ad804e0da7f737f0e67e660a34f3ff1c2a66876f1878a98680b0e86740e84b9eaa16e9f SHA512 50d46b0c3607e8181f516ffc198c5cb2640b7c1182c7242f3e10b8671d85b12fa9708847148b937fe824b990b89f25bee4a95722b86742edd6554c39d4768262
diff --git a/dev-java/commons-codec/commons-codec-1.15-r1.ebuild b/dev-java/commons-codec/commons-codec-1.15-r1.ebuild
index e611ee200c7c..95a9ec2ab516 100644
--- a/dev-java/commons-codec/commons-codec-1.15-r1.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.15-r1.ebuild
@@ -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 ~arm ~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-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild
deleted file mode 100644
index 88e15404828e..000000000000
--- a/dev-java/commons-codec/commons-codec-1.15.ebuild
+++ /dev/null
@@ -1,50 +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 commons-codec-1.15-src/pom.xml --download-uri https://apache.osuosl.org/commons/codec/source/commons-codec-1.15-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-codec-1.15.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-codec:commons-codec:1.15"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Implementations of common encoders and decoders in Java"
-HOMEPAGE="https://commons.apache.org/proper/commons-codec/"
-SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-# Compile dependencies
-# POM: ${P}-src/pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
-# test? org.apache.commons:commons-lang3:3.8 -> >=dev-java/commons-lang-3.11:3.6
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		>=dev-java/commons-lang-3.11:3.6
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"src/test/resources"
-)
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 87f0aa1eb855..28be0e3bffd2 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -2,6 +2,5 @@ AUX commons-collections-3.2.2-fixes.patch 9913 BLAKE2B 0582b3c2e06275ddc75fdaf05
 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
 EBUILD commons-collections-3.2.2.ebuild 1389 BLAKE2B 1190300af0c8b7dfca7edb662a7c9314111a95ab56de0eaaa93fd0f26e21475181befd7fc41dc3b064c41e85c17ab95562afa6170ab53c4e288903caaaedf2f0 SHA512 a1881fd133e1efba964a2fd3d60575fbe88da634b0e41d8ba3244e306ad63c54db5be60e284cfb0ff34a72067bbe73a11ed2aaab60468896afc9c10172559196
-EBUILD commons-collections-4.4-r1.ebuild 2128 BLAKE2B bf81a99e43a39365f1911cd22eb1c210e8ff454adc01b94c3a46bfc4dc1c02087a101125419b23ced87a90c73649305e7a390df8d05865e587ab60a173533e69 SHA512 edf0730197db410f01bff4cfee54ebd471086473f5b9a3d1b5dea03e89a6373c8d69dbb77f469fbd063558f4e6d4793b0566437a25538623b6e527174f828e2d
-EBUILD commons-collections-4.4.ebuild 2063 BLAKE2B 76df1c1b3ed4906d090b37e85e121b17c940874e6202db0a5af683349cc1113e8de23429a1fd79924dbdcef6e2e1e832329ec16340a6a91d255d34f8fc4db8a6 SHA512 1eda617730964949d02621787efa47a87652f7d757b4678b00e05cca4cc4ba10266eeb62209db63ce5ec745502110dd6e9ec1e1a801f49ccfcf6065b68d8a248
+EBUILD commons-collections-4.4-r1.ebuild 2124 BLAKE2B 41cc425a652be762750ed3ac35c443d63ed985d11bca139d597f8331efbd023b81c21538da33349ddecaf63de3b9d08e4b27d478eee7254e55f300090b282ba9 SHA512 db49866e4991a9ffa8857ca6caebcfc2ffdb8c86b8da1978cf6ef54d632e28ca58b5c4a338dc1963485fd1e2f4301bfe2bac0ba558013c2914e9bdcdf2d1dcc3
 MISC metadata.xml 388 BLAKE2B 11018df0e1c7417ebbc68b44642701ad88c8add20c233cceafb84c41b56cd7e3d2f0004406ba6286babd78493dda13171c1c3b0a1a7b563289d2c4c58921bda6 SHA512 28a72920d0c97f0caae41ba74a55602e25c953d2c510e0e4d72a8c7482abe7855b587fa85efbc51c9262472b90ae35a88732d33744a101d288ec8afa8fff4ae2
diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
index c55d0bb19796..5c4b6e0ebaee 100644
--- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
deleted file mode 100644
index b843e427b13b..000000000000
--- a/dev-java/commons-collections/commons-collections-4.4.ebuild
+++ /dev/null
@@ -1,67 +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/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-io/Manifest b/dev-java/commons-io/Manifest
index 913aaba6063b..ba11a0d0ccec 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,4 +1,3 @@
 DIST commons-io-2.11.0-sources.tar.gz 498841 BLAKE2B e45ae4400246d7469e8628f08d2f647ea670b994360c1150fe1f414beee5177e7af7c94589a5c81ce6996f2fb755441f29080ca9b69b98cb5ae1ad897f8f00b5 SHA512 e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3
-EBUILD commons-io-2.11.0-r1.ebuild 1879 BLAKE2B c348641cc0dbd80cf3a080fabe9a1169831ed82cc6a8313db136051c40a1a281f3656ab4549851faa312943f781e4fa5f8bc0319d0691199b3a7bb34476e99c8 SHA512 5a131e0da771c8a7aa1ed6bc32a15e73a79ba5e7ecb4192acfa6dbb37f90a4fb2c0a0d80e9574086e3f74addefa68a76e19beeea812b76899c1891191a3df372
-EBUILD commons-io-2.11.0.ebuild 1829 BLAKE2B 9752da4af980cd2a649eb50802af49560f0b1cb2db6ba2716222bf53e1ce7650954accf2c68551034428eb939ada28e406a1320b01045772a158b4b6394b7f8e SHA512 6cf2465163855384be4bb0f542f86fc1efe0c99a13c1d476d871478307c073cc83be815018fa77aa4a0d63fa714b11dc1acc5b6b7e306cc269a582139d790d0a
+EBUILD commons-io-2.11.0-r1.ebuild 1875 BLAKE2B 6b96012c7f10741f0dd66c68c381ee5593335e1ac715182a57d60dd2472576a83ac97b604370b563c48126186320581489378dc226053a4ce61e0061c2e682f2 SHA512 d17bca4bf055a2bb75d691fd46f2fa4cef3568941f8d01db3a1e5babf7254c29d73dafcc46fdcabf7a94ca57d640542e316cbd72c0b72b93ee5bd88ff61ec5db
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-io/commons-io-2.11.0-r1.ebuild b/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
index 73150451cd28..222c0ad697b9 100644
--- a/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
+++ b/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-io/"
 SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/commons-io/commons-io-2.11.0.ebuild b/dev-java/commons-io/commons-io-2.11.0.ebuild
deleted file mode 100644
index f6f4b5f8feb0..000000000000
--- a/dev-java/commons-io/commons-io-2.11.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 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://mirror.dkm.cz/apache//commons/io/source/commons-io-2.11.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild commons-io-2.11.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-io:commons-io:2.11.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
-HOMEPAGE="https://commons.apache.org/proper/commons-io/"
-SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.google.jimfs:jimfs:1.2 -> !!!groupId-not-found!!!
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.junit-pioneer:junit-pioneer:1.4.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter:5.7.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-inline:3.11.2 -> !!!artifactId-not-found!!!
-# test? org.openjdk.jmh:jmh-core:1.32 -> !!!groupId-not-found!!!
-# test? org.openjdk.jmh:jmh-generator-annprocess:1.32 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		>=dev-java/commons-lang-3.12.0:3.6
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-# some test dependencies are missing
-RESTRICT="test"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-lang-3.6"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"src/test/resources"
-)
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index 90b1bf9dedad..41c990777f61 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,5 +1,3 @@
 DIST commons-math3-3.6.1-sources.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
-DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
-EBUILD commons-math-3.6.1-r1.ebuild 741 BLAKE2B cddab31becc324b2e4fd262d6de490542cd5f482a1b29dd9a59d8b0139c1e7112545b59349ed9cee2519ddc56d80ee6feba6e65ef5dcb21bb9f1ea3305306f84 SHA512 97a2384bf11b39cea6aab1c041acf2236491d766c799f13342cd4c567b86d4a85cbc1ed500d3c7460bcaacf5565008fc9471af60babb85e3bdfe0f85e0082da7
-EBUILD commons-math-3.6.1-r2.ebuild 774 BLAKE2B 23b4d26fbd92105105b7b590c1fc1080e478b0b31f7b8e61267974e1a5f837f5bdec9fdccba3218f1adc801107ef07482dd7e78ac017fe8edd3f3da9e13476cd SHA512 e06e385c03281343f8e35786d40f3ea79e2f112830d919225588d8b7aeba05eb5b4fdf02eeb766c84c072d3ae766bbb9db7d84e52252ecf9780a33bedf8ab057
+EBUILD commons-math-3.6.1-r2.ebuild 770 BLAKE2B b1d1d0d0e0ac61dc4a19f72f8554f2ccfd9e62919fd819246e8ca6284d64f9376514c50d89d778caa591e0ab7d2676ce285eafaed55ea4c53670afe98f1f3213 SHA512 fe220f8d89605acc6a8f06bfbd012b7f04e5427906baa4851b81c44b6dae370cb54f5ece58e153bf35f4a3d9971515bf6c90a07106d1126c06acfce3460bd420
 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
deleted file mode 100644
index 45de2587390c..000000000000
--- a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source"
-MAVEN_ID="org.apache.commons:commons-math3:3.6.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
-HOMEPAGE="https://commons.apache.org/math/"
-SRC_URI="https://repo1.maven.org/maven2/org/apache/commons/${MY_PN}/${PV}/${MY_P}-sources.jar
--> ${MY_P}.jar"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-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-math/commons-math-3.6.1-r2.ebuild b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
index 0c33559066fe..d77cb259350a 100644
--- a/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
@@ -20,6 +20,6 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 JAVA_AUTOMATIC_MODULE_NAME="commons.math3"
diff --git a/dev-java/fastinfoset/Manifest b/dev-java/fastinfoset/Manifest
index 947eb2222d83..e6eec68074d9 100644
--- a/dev-java/fastinfoset/Manifest
+++ b/dev-java/fastinfoset/Manifest
@@ -1,3 +1,3 @@
 DIST fastinfoset-2.1.0.tar.gz 304643 BLAKE2B 07d571d46dd31bbd1fb9a4aac457b7a2b3e9278a41a9b072790a2da56adccbba92cdfd7dde95d976d92c7fa38476448c3dd6e77366338fdce3e63f334e5823d4 SHA512 807926fe90f97a72e5d6f8abcbad8639b424d7938ab2afc7dc8107070db216167aada859acd041ba17566a33e277330d9ee51bdc10d16aa19a6ea07d4ae858aa
-EBUILD fastinfoset-2.1.0-r1.ebuild 1208 BLAKE2B 07031c4dce4caed0ec2abcac2648403a59c7ae6b830fcced02f6f5dd5a3e1ef5c5f12779754e82344f183b1484b8e0b19a512c40716de9ff24a4a596016c2424 SHA512 43c2d2c5f8d5e51f6a09d8e35870f3f9bfc9079fa1eb14c67f9b1a16beff4c1a677111a1f8b860cccf582019da01852d469f970c0f65e973b85b5bd6cc49b961
+EBUILD fastinfoset-2.1.0-r1.ebuild 1204 BLAKE2B 4e15618b30d29ff058157b9b5c5f2197840b55c0f9d2065c2446ae1fdc03391cd4a91b6b95a753f05869237d82e4bd705fc71d8a7ed7a53997a68fbbfe07901a SHA512 d3191042775e8a02555b733f985039d08401dc2e27de19e0e10af339b8ee5933b7f8337e7d77066c41caa86d886db7faefa567811e11f23080fc251819b1eb6c
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
index 7f4e952e82bf..011a70f41489 100644
--- a/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
+++ b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-fi/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0 EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-11:*
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 73709f34d1b4..831e71ac78b4 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,4 +1,3 @@
 DIST jackson-module-jakarta-xmlbind-2.13.3.tar.gz 2145569 BLAKE2B 13864e4272d40e8425232482a67a2bc720ff294e93ec623589bd0b7286e2c63c2b724bc1033eb19437cdea23db0b11142380715fc300c32e8af9dba22eeed407 SHA512 2807a9e1d3531f3553a2ab6bb64e0ece2809ca9d2facae320dbd38efe0797cdc7ab11e9b284122d75a98a50eda9bc0cfb0f098ca0921e3bf67a0e38b5252a14d
-EBUILD jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild 2887 BLAKE2B d9bb5e20dc00fdb7ca4e1bf21411b58f811ae111ba81dc12fe529ba574afa35e26acaf4193f1b8842bc26afaa8dcad54093b1252b544b5b052a516eae37c99a4 SHA512 25169f33ff9bbc6a71f38061e7bf3104956f7580f61265262e4782b826cb3fedf5521f417141e62e23f73bda7548aa57cad8399bca7b1ee44140b1aa9e3453af
-EBUILD jackson-module-jakarta-xmlbind-2.13.3.ebuild 2764 BLAKE2B 3578793a466d23ce53a544473448cd07af8e8b11f0fcf1c46064cb5157ab32db0b1ff14319e556fcc9f8e94209086c9ce2e9033ee4c5abe09a2be3e6d12f0295 SHA512 71ff738d7f4002890519c4f9c768da1c777691ca2a9b115a65b0291f22e22931add058df89a0f1a0d7f3748d9a4166fc248080ce2025cb28b36e4c098339e4c7
+EBUILD jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild 2883 BLAKE2B 6e7d8a279484b1a7f05b161ed31b008527d8d7e6c5c2ca6574dd3e172bde39a02aee6f88116efbff79d8e581b2153bc0eef65f68d01c964f9249156eda2f582b SHA512 2ff9cffc503d756e7867e156b4b78fb50379ca41de648db4f7635587b4e161252e0800b56c94fe00adf5078ee61638b74c15a43cdd55cd9044357b85543476c5
 MISC metadata.xml 506 BLAKE2B 4e62bddea5ad8f7e6b73de9a173dbc8416b309caf4e4f9801496712f1cc88bdab646d237e48c3f55c99d95c198056b6642cf19070805f694b3a8e996e9bd0528 SHA512 96825b1a8ec0808f4dfa4a2482a1c184acab23d624ab178be8df496c67ff3ca5cd7cf012e6e7017721a3355a6ff3265d6f76734a655bfb261d3530781825f5d5
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 394536c89255..3bb5e6e244e1 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
@@ -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"
 
 # Common dependencies
 # POM: pom.xml
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
deleted file mode 100644
index b8c68c4cebaa..000000000000
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
+++ /dev/null
@@ -1,81 +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.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.3.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.3"
-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.3 -> >=dev-java/jackson-annotations-2.13.3:2
-# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3: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}:0
-	dev-java/jakarta-activation: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}"
-
-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/jaxb-runtime/Manifest b/dev-java/jaxb-runtime/Manifest
index add8ed089b35..670d9da27a2d 100644
--- a/dev-java/jaxb-runtime/Manifest
+++ b/dev-java/jaxb-runtime/Manifest
@@ -1,3 +1,3 @@
 DIST jaxb-ri-4.0.0.tar.gz 1739184 BLAKE2B a85a12fdca0b6eff8664894d65e2f82d30491e20050fde2ca828fa3c2c79ce2e158fca5ce6d0ae2cb2a00859abc0c9e9d49321c0943b862fd603a9e732f29dc4 SHA512 766a58d5107a88c19a99014b737b7b14a510b928dd26991adfe902073614923690c1e5a231834ec4a200a10adf9505b27179b8d84cf09dbb09292341c328e743
-EBUILD jaxb-runtime-4.0.0-r1.ebuild 2989 BLAKE2B c11dcc38dfb8a2f584b34a10ffac8d8bb23c1499e3faa442d76f37aa997d6bd0bf87d05bc627dcb5a892bb1659bef93cc84b8b3d2e2ef4520cb380f8d0d9548f SHA512 601617a2d6801029c9fb36e64a8bb665eff04cd1dffb8fd7f812be07c13ac228e853ce0282ea3c3886c806a266bf683e800909672cd608051b65ce39add35a50
+EBUILD jaxb-runtime-4.0.0-r1.ebuild 2985 BLAKE2B af8937c9a12b2e8f7f95f3b6977e7f70bfc9177c161ccf2effe99fcf7ef8ce2614759d66b8b47a951b720612f87b5de83bbdcc719d67e69f829d62c662c92156 SHA512 0e87d19a371a6a012b7d7e004ce38f34a71b0b2896eecdd55e4dbaa19200e0daad52425c0a05bde26fa3bae414acdff94c223f42464b55dd67fa028518c93b78
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
index 586a6dc6e5e1..f5011e99962c 100644
--- a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
+++ b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-ri/archive/${PV}-RI.tar.gz -> jaxb
 
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=dev-java/fastinfoset-2.1.0-r1:0
diff --git a/dev-java/jaxb-stax-ex/Manifest b/dev-java/jaxb-stax-ex/Manifest
index 7542fd420c4b..2e022127ffa9 100644
--- a/dev-java/jaxb-stax-ex/Manifest
+++ b/dev-java/jaxb-stax-ex/Manifest
@@ -1,3 +1,3 @@
 DIST jaxb-stax-ex-2.1.0.tar.gz 28683 BLAKE2B 774f7420f996eb52abc9db56753f0fc492164ed12f4ddffacad8f801ac759666e6dcae85cf24ce1231df4d49d5b5084278d2cac0c5c129302ec973c215408782 SHA512 f81dcb4870800c4799e716254b84e57a15ef36a9e6a8502da7ee2711aad67765595674fccc1c4d9d4e8865c642dfadd694f8849d4e98c4e9f2368cb940deb38d
-EBUILD jaxb-stax-ex-2.1.0-r1.ebuild 1059 BLAKE2B 0f74fdf68fc817b822e6f6462832157beb235a70c6a45c3a94666c31e0a64fd14b076cc441666bf6140b1535505f6ee73941ac8cd7cdd1d75f66f0000988aebd SHA512 ba01a4ddfcad5697d95a759013e8f657a829db482b0ccf076cd56269e5a96119fc4c8d4d3166289ff87435288b3ce87e9983c46d7ba86e10bb64a6d64807ce15
+EBUILD jaxb-stax-ex-2.1.0-r1.ebuild 1055 BLAKE2B b3f7c3622b7668ca78c19eb8bc5dc1813917a619946da7cdacb47e5d7f12dfe9ac0ea4a7b7878bee3a651715d9da29df308294713e6a2c32f58214e7bfdca38a SHA512 e89fe08171d0efe22c26c1e229f1fb44d9695ee516baddddf84a958aa98a4cafeaea66fde1f28335c694bd5f8930596da93f11300ac8643e35f1cbe32b6344cf
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
index e7cfb9f464e5..d5300cd9e6ee 100644
--- a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
+++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	dev-java/jakarta-activation-api:2
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 9bb4112b1f42..990a609a2bd0 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -8,6 +8,6 @@ DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb11
 DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
 EBUILD jffi-1.2.9-r1.ebuild 3008 BLAKE2B 1a6a1edc45678bdc3f8593a09fe1083988248f1b254b420bc1bed913b49626d6fff2023dbbe3481d7ac572b7bd73132593b9b3e0ef714821f2aaa22de537a0a6 SHA512 b7921f24dec2f0b18a44dbd57eef94deb4cd55d759d62b45f6d3a42004b3e7b82d4531f3a98a983936738d8576451a21ea4f849bcdaf46d945d6bf0747786a41
 EBUILD jffi-1.3.6.ebuild 2454 BLAKE2B 0e988a67b31d18e96b6c0d8f550770c14bcefe22732ad989e567fa39bfc96e06f07d00771fc6228f3d3f0e122c1c06a4ea3d2a5ec45b74ab0b79ba3800ea24f0 SHA512 5314575e00a311389ccd290b20fe73852dd46769777de3278c748d2ec39c79ded428f157b36339273220d503e7ca810c15dfa3661b9ef778550c747a549847fb
-EBUILD jffi-1.3.9-r1.ebuild 2480 BLAKE2B d4060112121d322de470a7ae171e5c619f9977f073cf5b31b7fd45c7a64bca00207e6ecd33e06845c327a840dc023393eab73fe85f758e4314f1e1323c327aed SHA512 76f4ed8ceb9d921a0015fc629d2a32a8cc15b9cb230f79138ecf63b4e4d4bc27f297756a96b270cc7289b211d62dee881b0e554997065bf4badea2873ee26626
+EBUILD jffi-1.3.9-r1.ebuild 2479 BLAKE2B ce3036a908e6cd2a9133c5d97119766528c80eadb5a9397bf2d3d0c3474b6389c32a125a2a842980de52215b9010389bab8566fdb65146ccb8d3abb3a2c60202 SHA512 5cb99670f1c5c0a73278da755569a6727d0e5a5f51c59c9f7f3cfd026004fce9fd120844a053fc7e2cb2f333d5ba027740a07b4a54615ab4923ffc91766a3416
 EBUILD jffi-1.3.9.ebuild 2417 BLAKE2B c8bacff9935a8e6b44a857486c3b605a4c0a3210c50a0e309161593707654a930e68dbce87fe190bd2678c0576ae6e24078ed0f0af501c95c9ea446650705a3a SHA512 8b6ce9c691dd7f99c33a37999c9d12de082d3d64c1239cae7bf0f16308ec9a9dd4c014e8e203fc4c74dfc694f2b84d389d8cb34c3a634bc6d53b0ef4dcfafaf6
 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9
diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild b/dev-java/jffi/jffi-1.3.9-r1.ebuild
index 0655be95b313..2909d6af8cd8 100644
--- a/dev-java/jffi/jffi-1.3.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.3"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*
 	>=dev-libs/libffi-3.4.2-r2:="
diff --git a/dev-java/jnr-a64asm/Manifest b/dev-java/jnr-a64asm/Manifest
index ea7694b0a350..c78384456422 100644
--- a/dev-java/jnr-a64asm/Manifest
+++ b/dev-java/jnr-a64asm/Manifest
@@ -1,3 +1,3 @@
 DIST jnr-a64asm-1.0.0.tar.gz 29247 BLAKE2B d5b2dbdbee3d50e466d164a7b5f62ad5ea99eeb810c38bacbd5ec21f8ba57d28ed442846903e85ef771e2a4ca80c77f2beb558fb03b1b6996384e26f69731474 SHA512 16ab336e60d6bf5e6478ed4fd8144c7e1eb1aa23089927e34adcbd2f0b3fdaedfc0e5026545bfd69d8a6a030479342088fcb86657a007e9ac9ba7a08830aa858
-EBUILD jnr-a64asm-1.0.0.ebuild 852 BLAKE2B 62db7f20a4189145eee35fbe77d2673afe85c8744dc270417cfbc7783574768385ef491c1e5d1c45f220757e3b4578fe30a55f6a2208ceba063b3e32d9d4053d SHA512 8dc70ff0e183cec19e4e90633df9d7f976a4a9bd9f85768f41b43076952ce6a91d2753e83784447bc116f536bed57405dd282a89bea40996e221f85eb3778a72
+EBUILD jnr-a64asm-1.0.0.ebuild 851 BLAKE2B 70f8cc2272b9676d88533489555a200a71edfbe125c607be31b277eff5f6357654daad07c6dd34dd6b940fb6b4bf0ce304dd0425dc30bd3b69e59a0608281d9b SHA512 a2433e05c876a5a43110ec938ea99ce6a5785ab681247b402775b2bcf9583c40dba6a94b2d856156b210740787a6736d5da65732062b2ef80ee23f409652cbbc
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
index b9856b27e0ee..998ea27aa3f3 100644
--- a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
+++ b/dev-java/jnr-a64asm/jnr-a64asm-1.0.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://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index c2c2b597d1dc..5d0cf34e4622 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -3,5 +3,5 @@ AUX jnr-ffi_maven-build.xml 11211 BLAKE2B 94c92f033d7cb90db11123846cffb1e7532d19
 DIST jnr-ffi-2.0.2.tar.gz 170707 BLAKE2B fc4f1dcea51939b6098b980b4962380e58ba590ea9d4cdba7823c1372bd645d985ae25d8ebf1f0b575a0e4b5c192e5595094076d3cd44e4bb3c077dd838c170f SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0
 DIST jnr-ffi-2.2.12.tar.gz 285324 BLAKE2B 32e866654b901ded7cdc82999d79873d49bd9d3599d265e9d029e7cf8ce1895f9e830a1af75b8c149c3debc5f3d256f6241d706ecbd94277ce1fa49a2868885c SHA512 420adb647c5d0547f0b18e4f8a21096da9aaebbdf0e50761ec1fd6be64ad29649c7af4d6daf0a8c4c38e02a05e0df836de6fdb7776f10c02d8bfd447a11882b3
 EBUILD jnr-ffi-2.0.2-r1.ebuild 1479 BLAKE2B 10de36e96180e2943bcf200bc49961c5258cb7dabcaf1536e79bdb2c0c5f58cc023d0c09e591746c889fc86e012c1337ef8a66c6ee8c181e1415a30ebc8869c0 SHA512 0d18e65d626dbcdd69c6f47d21e7505112e3ff98633137c3035d6e5e32536a5a36aed2a333a1f3d34e7da58b4f0e6a2225a6d7f88c3c58a23640170f4a48c9c3
-EBUILD jnr-ffi-2.2.12.ebuild 1194 BLAKE2B 7be4c141653d10a73ba094287ea631f7c4d81a996ac28663253812fbcaabef5a356e3cf267fabc09b152cfb332fcd4fee55e142d63fd0b47db9fd842f7a6f0e5 SHA512 68499cf6632bc7f1f3a25f0baad8a3bc8ed015c7ee0d982197f65e5acd39093414bd5c870e9ef5b45cf91284fc9671c93b13db476a6b2e97e676ad654a3464bc
+EBUILD jnr-ffi-2.2.12.ebuild 1193 BLAKE2B 6f1750bfc3c70e2cb5273ee4f5ec50479ffe044b0b8af1c3c056cfd97bc640e12d465c28cf569bcbe2cbd0e10e08e041991fa74315162baed56da65157701215 SHA512 394416355ced0f87b1f240faeb7b25c5e2b0b3bffff935b8334cb2a651f53973b1cba50a15ffe0d538ea9c289c104add204d483d6982a822e49ee8c6b069e672
 MISC metadata.xml 323 BLAKE2B 377b6cae0335bb1d1160c22d684541576023a02984183c468689418ea3a1b2c6520a95ec7d18e86ea1b6c426d44d40bf6debea926c03c9c321d82dfc8874ee6e SHA512 f7503b3bbfc40eeda0e00cacd5a84723f17fdae5657594b8f44c9b7e7e059b6eeb23d034baab20aaeb554e35721a73ad1c0cac30aa67845a4e842f30348b79d6
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
index aec229af6305..454c556a3aa5 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/asm:9
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index ab80f05cf9ae..f41b682fd308 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -1,6 +1,3 @@
-AUX jnr-netdb_maven-build.xml 9637 BLAKE2B 0ee947467fc1c8e07d2b98fb29a70de5244e4a92895018f8eb4860413a2c96ab6d5599f1eb39a45f4c43a09e1d6d0c7c1737416f7afbd205d397da17a257d3e5 SHA512 befe514fd332f5eb6495404b0f0d8edc428be34a1745b16dd2a20d2b859d251670e549036099884a810e3b5da0c6a4d311b6b0691409cae1b6c14d20ee763d24
-DIST jnr-netdb-1.1.4.tar.gz 648347 BLAKE2B 08953f93fe4a6146dfc77c463e07a8b9f6e784ffc26165d7409a623756733a7598b4d0a3fa55302b5f9b01c870cee3062f310c74e20f6a8a11ff1b41d38a0d7a SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195
 DIST jnr-netdb-1.2.0.tar.gz 649059 BLAKE2B 660074d3a0d201784bddb259796ee4bb87a3579d6ffffcb5c3bf171d34e525c768c8c9282d8a99c250282d108011c0cf4bc9b8cf32dc7f3edc7e0a2b1cbaf9d4 SHA512 6eeb21d42b1eb7c0beed4f263c3440c7e5ae15f76365fb189fc8727c824e01d92662564ae641e1233ec0df68f6761c3c31a8a61891de59a524c213959bd32856
-EBUILD jnr-netdb-1.1.4-r1.ebuild 1150 BLAKE2B 6b00dfe46c10602181bfeebd86b05cc1b0846f4c56703585c2e815be7d10cce09f3b8ded293f5cb9438164b846db13db993b9cc04a63b697f46b2a8f435f060a SHA512 af5c04260d6bcf0aac9e4f236c3b2a5bab0dbb457f12abee4c5f009c8545ba7104b6c8561daa6ac885c6b84527e43faa042791a2099f6fb0fabc8fa50fc8ac10
-EBUILD jnr-netdb-1.2.0.ebuild 848 BLAKE2B 276fcbd57b00142e429eeaae6e240ab92a45d1975b6983cbe27064920d46c1aef09152f442e71e92a6695e19f7e8acc129cb8b8fba14ad20dfab3b31dfcb2569 SHA512 d2a3ee67d086dab3e1e5e33c393fec41557e7610acfb376b0d1897ebf7c1583f65fff70b080eb7bb74bcd0821e6edf1593e971eafccd1ce089cc90e4e830e6af
+EBUILD jnr-netdb-1.2.0.ebuild 847 BLAKE2B 72befc91b370263ef133ed9dbb026130bf203a2ff35271667ab05c2e7abe3b70228b0e5168077f1716653aaca7950860066a4e5c430386a4dcddc9255a6c31f0 SHA512 d97d6aa8345756e921123397f1413c30545b07c70dcaf76b211579efb1fbb4a9e854d863146941ec7212d1d062b927ef117b2580fe0d8f53875c57914dcbdbca
 MISC metadata.xml 662 BLAKE2B 64087950d504c3f16ef8466aaae35c567e2fdb1547346e99e537dd9ac1535c4ad209af80425993dce4a52287ad9960dfac6dbc923faa66e5ebc3328b9ccaae70 SHA512 458c722c132eb5b69a970dffe25ab6bc3e71f7d9fc77639d5b46dcb37aff851a2cffed0a62fdce6ce2192fb3da52d6781597367fb95d1fd794935a4e469b86f6
diff --git a/dev-java/jnr-netdb/files/jnr-netdb_maven-build.xml b/dev-java/jnr-netdb/files/jnr-netdb_maven-build.xml
deleted file mode 100644
index 9f4dfef15335..000000000000
--- a/dev-java/jnr-netdb/files/jnr-netdb_maven-build.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/28/12 5:31 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jnr-netdb-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jnr-netdb"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-  </path>
-  <path id="build.test.classpath">
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.1" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.1" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-  </target>
-
-</project>
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
deleted file mode 100644
index 2a7af0818eb5..000000000000
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Network services database access for java"
-HOMEPAGE="https://github.com/jnr/jnr-netdb"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-COMMON_DEP="
-	dev-java/jnr-ffi:2"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8:*"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-src_prepare() {
-	default
-	find -name '*.jar' -exec rm -v {} + || die
-
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="jnr-ffi-2"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
index 03d46d9a7634..23bbacedb948 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/jnr-netdb/archive/jnr-netdb-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/jnr-ffi:2"
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index a8499ad79c4b..59dc5d6db8fc 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,5 +1,3 @@
-DIST poi-5.0.0.tar.gz 111429369 BLAKE2B b29e754fb709d01ff4d68e9227f4c4739384bd02934b6860e8a0e96552d9e9ff1c5c665bc0b701f79226505fd98373fe6ad160c72735903eae388f0cd6618337 SHA512 e79d15b42d8ec389fd15b7714faf7b49b9fb4d57014cb341fff0f061393f4ea7dfcbd3810a6ec19539eabddbb1d0690aa56de4a1a412d05a527e11797047023a
 DIST poi-src-5.2.2-20220312.tgz 117042913 BLAKE2B ef2ab433158ac51fc163e9bfa65268d246a686c7892234cdd2332bef526c69b59dd0959bdabc6a486a99e20dfcc144ff6aff775a6412136112bb6a36f10968d3 SHA512 858d6c1af8a29a22aa24bef0422b3c8329141ff026131b8354a97c87acc31ef06c91f1b9cabeb71738b3687ddc8283f19b2ac42865b7e98e91cb0d5aa6b89b40
-EBUILD poi-5.0.0.ebuild 1952 BLAKE2B 92ad38903362045d539e01fe2d62bc95325e87c1224cbf1a08a9c80e61aeb195f0f388b0ab47b6def950d2b095d02b98a369f52c010f34b1fdb398012ef4cafa SHA512 c5fff618b8dcea6970b1ccc3adf52631ee731ec78b762f17896efe0f2bee907b6ad9d0fd197183a3cb9e175290915d388d014d326555bf3d2aeb8b1a4ecc1f6c
-EBUILD poi-5.2.2.ebuild 1775 BLAKE2B b003d210e4939ca6c921bfdadc7f7737d61e533be2ebee48653e2428d7b8192ea49c065aa43a3242378bf6f810372e2d3579eb1db9f5ff3b384b17c09af40f2b SHA512 07868b3094e921647e533dff18bb4e67e792b4892afa0f61baa8471f80d5881286fc7b13b7849814f89d8ec4b08e418f71d112c7638f892072d912856ea6d25d
+EBUILD poi-5.2.2.ebuild 1771 BLAKE2B 86316563c399935d856b4dde69f9c157769e21d830ef001e324a309eea6852aa67caa557d0d248c5c7c38be9a17f4587e69c6278af51d3a4d15ea8588be8f1b0 SHA512 e26b994b3a99b03926be315cffd47da711a4f844139e5b87fad3e84e57a8218ffb969d1607c0143ad30fc430abef838a1cff6c7a72c3eb19e9fb3c912afbbeb9
 MISC metadata.xml 429 BLAKE2B 5de897522625a2c4ff05fcbd8f1ffc1e58bf734febe26f28a23e9f1a3a93d3acb1d099d9cc50d329c14bf9c586e15b74bfe061ccab493ce1627161ebce46a845 SHA512 a8b3da8273c10239b9bde465b67dd818d74910bb9303462b68df5ee9487aaeefbfec324bd0492601c75adb4e9fa163bf99ca7ececf2684f4778a61041a98e75c
diff --git a/dev-java/poi/poi-5.0.0.ebuild b/dev-java/poi/poi-5.0.0.ebuild
deleted file mode 100644
index 2996e53accbc..000000000000
--- a/dev-java/poi/poi-5.0.0.ebuild
+++ /dev/null
@@ -1,64 +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 poi-5.0.0/sonar/main/pom.xml --download-uri https://archive.apache.org/dist/poi/release/src/poi-src-5.0.0-20210120.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild poi-5.0.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.poi:poi-main:5.0.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Maven build of Apache POI for Sonar checks"
-HOMEPAGE="https://poi.apache.org/"
-SRC_URI="https://archive.apache.org/dist/${PN}/release/src/${PN}-src-${PV}-20210120.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: ${P}/sonar/main/pom.xml
-# com.zaxxer:SparseBitSet:1.2 -> >=dev-java/sparsebitset-1.2:0
-# commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.11:0
-# org.apache.commons:commons-collections4:4.4 -> >=dev-java/commons-collections-4.1:4
-# org.apache.commons:commons-math3:3.6.1 -> >=dev-java/commons-math-3.6.1:3
-# org.slf4j:jcl-over-slf4j:1.7.30 -> !!!artifactId-not-found!!!
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-#	CDEPEND="
-#		!!!artifactId-not-found!!!
-#		>=dev-java/commons-codec-1.11:0
-#		>=dev-java/commons-collections-4.1:4
-#		>=dev-java/commons-math-3.6.1:3
-#		>=dev-java/slf4j-api-1.7.30:0
-#		>=dev-java/sparsebitset-1.2:0
-#	"
-CDEPEND="
-	>=dev-java/commons-codec-1.11:0
-	>=dev-java/commons-collections-4.1:4
-	>=dev-java/commons-math-3.6.1:3
-	>=dev-java/slf4j-api-1.7.30:0
-	>=dev-java/sparsebitset-1.2:0
-	dev-java/commons-logging:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="sparsebitset,commons-codec,commons-collections-4,commons-logging,commons-math-3,slf4j-api"
-JAVA_SRC_DIR="src/java"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
diff --git a/dev-java/poi/poi-5.2.2.ebuild b/dev-java/poi/poi-5.2.2.ebuild
index 64e978e351b3..d5068b84b33d 100644
--- a/dev-java/poi/poi-5.2.2.ebuild
+++ b/dev-java/poi/poi-5.2.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://apache/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=dev-java/commons-codec-1.15-r1:0
diff --git a/dev-java/typesafe-config/Manifest b/dev-java/typesafe-config/Manifest
index 21bd40eeda0d..07eb10187b09 100644
--- a/dev-java/typesafe-config/Manifest
+++ b/dev-java/typesafe-config/Manifest
@@ -1,5 +1,3 @@
-DIST typesafe-config-1.3.0.tar.gz 257311 BLAKE2B 6df016ef84f8e3f717ac22ea3a8a66ad54ab378645e853fbb5fbb3316dde56e4cf6ba7a256f38d8912514321060290a92c412ad9753c0244b35c20bb0a9e4950 SHA512 e8c0e3100b9e7c50ddd19285a3e33cc708711d0007719bb191012d88ddbd0286529172fce54a369c0dd86ced1c61807f40d5334a69b2c8bc6865a8b65740798e
 DIST typesafe-config-1.4.2.tar.gz 278098 BLAKE2B 65e3ffb4e9a4a7c33344c7f26ac28f6321c83621865db7812c09e7908e10f110bcfab4eca66577d6495f94da6a11b8877920e87afa6976c25852c5ec08aa1148 SHA512 85bc28987a6998a5ce6e0bb0996d853b534fc870e44abaeb3df31e53a2da39a350aecbd8f8849f4d4340a7e5da1c44882eb8c8ba58233c9af2a0e575f2c2c6db
-EBUILD typesafe-config-1.3.0-r3.ebuild 512 BLAKE2B 13f33e7248c0d8d7f15f1bca2e1b63c47bce646602508ac90cd06302fbbbea7c6f39b80c9e05c62fdd89c2ad8563535e36be573bfdfe58b0beacf37bc5abaa5f SHA512 6634d02248b9f9c802d284a6030fab70e1dd9a8e0100ea60e7e840e73e3e74745b7cff0eafbfa10fb02fabb07be6fe002d40364c1c0b951f2106206dbe661b10
-EBUILD typesafe-config-1.4.2.ebuild 902 BLAKE2B 032387a7d2b6029b6d272f431e95a77b7a8f1605913bd7758d310b71a8e327b9fba4fa2877ed8d0ba9a61c7e0cfc8f0da6276a413e8076c2f6f13e5fc3c2f446 SHA512 3629a153e8b82d63a60ddea58e68812b7fd58acd92d46a29aed64b442b7550df62a16c99c6c645bebb92ab6e5b6bf11dc3dd5ac043a6bb81c1399ddda8b05b7c
+EBUILD typesafe-config-1.4.2.ebuild 899 BLAKE2B 2ce4203a676d153a66df5a109e3524a218c452a456955511e94ccc05f903a2f0124a51969e0ec048e7323bb8d4e58826127ec53f571ee32c8877b7a8f16a3e11 SHA512 b2a5ff0b0886c103b4afd929af0fe7f59d3c418ae10acc5625d6e37e06ac4de8e2ef4d0696b615a21f4be80787a2c71de0da458e19e5b085f91eadf2ed82013a
 MISC metadata.xml 330 BLAKE2B 15d72bc4f4449579e0bc922932f2f6e9249683176213f8dc7e3b20c65d6eaa67f09bedcb87b58c66cce197e0e1f4e65bcb465f2946005ecdf9efe5a33923d3bc SHA512 601bef4eb1b817811252290e3a62e6ec51a2dc0d82c5b6fcdbbe7eb21c25b690168bdaa9952e4d3faa8dd1e97f18daa429cd9514e6d8995009621c83e3f311ed
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild
deleted file mode 100644
index af9df09e8936..000000000000
--- a/dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,21 +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 library of arguably useful Java utilities"
-HOMEPAGE="https://lightbend.github.io/config/"
-SRC_URI="https://github.com/lightbend/config/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="doc source"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild b/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild
index e9aedc5756a7..a1bf736882f7 100644
--- a/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild
+++ b/dev-java/typesafe-config/typesafe-config-1.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lightbend/config/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc source"
 
 RDEPEND=">=virtual/jre-1.8:*"