gentoo resync : 07.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-07 01:33:16 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-07 01:33:16 +0100
commit: c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (patch)
tree: 3ee550255947da075650f1a551dcc278f9a1b7f8 /dev-java
parent: a978c074e4272bb901fbe4a10de0a7b2af574f17 (diff)
55 files changed, 94 insertions, 601 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b0beeebdfb2c..1f7e15771fcd 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/asm-analysis/Manifest b/dev-java/asm-analysis/Manifest
index 631ab030f332..e529375b0cdc 100644
--- a/dev-java/asm-analysis/Manifest
+++ b/dev-java/asm-analysis/Manifest
@@ -1,3 +1,3 @@
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
-EBUILD asm-analysis-9.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82
+EBUILD asm-analysis-9.1.ebuild 740 BLAKE2B 7572ed77471724a907ddd36d146ab5e911f743ea2837cda38a4ba93852d21e408108791aeb6c76d19b38a351dcde62e7ebbd9c75a9f33bde94f4621dddeaf1fd SHA512 f741334e33572f21bcbf46cc7573ebf80504e4d13c385dcac203a38427bce384782b6bdc2a205d459bd8bf9d3073fb53e41db7e3c47176102a884f50cee7b088
 MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-analysis/asm-analysis-9.1.ebuild b/dev-java/asm-analysis/asm-analysis-9.1.ebuild
index 75683d81ab30..4fbdb6554d9e 100644
--- a/dev-java/asm-analysis/asm-analysis-9.1.ebuild
+++ b/dev-java/asm-analysis/asm-analysis-9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-analysis:9.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/asm-commons/Manifest b/dev-java/asm-commons/Manifest
index 967fc4b9e46c..eae3fcf4ad73 100644
--- a/dev-java/asm-commons/Manifest
+++ b/dev-java/asm-commons/Manifest
@@ -1,3 +1,3 @@
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
-EBUILD asm-commons-9.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6
+EBUILD asm-commons-9.1.ebuild 808 BLAKE2B 35ccd30ac59d1a044520502bd206608c67e55b0fc6cb9d8add8377f6c60137c23f30d0bd3f9764bd5388daff9122fca67fd4743eecd7f9c3f75e5dc0ffc8d612 SHA512 f5b82ce78db28ae2dcceee8e07cb2fa816a9a24878ff58d1de7c6232bf19a86f5ccd0b1fb837b59bfa0494fd4efba87176d54bc8a3b79e4435b8cddefbae906e
 MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-commons/asm-commons-9.1.ebuild b/dev-java/asm-commons/asm-commons-9.1.ebuild
index 47ceb6a135cd..66b8a6ec335e 100644
--- a/dev-java/asm-commons/asm-commons-9.1.ebuild
+++ b/dev-java/asm-commons/asm-commons-9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-commons:9.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/asm-tree/Manifest b/dev-java/asm-tree/Manifest
index 740f5ad7fa01..31cc4ed777f7 100644
--- a/dev-java/asm-tree/Manifest
+++ b/dev-java/asm-tree/Manifest
@@ -1,3 +1,3 @@
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
-EBUILD asm-tree-9.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472
+EBUILD asm-tree-9.1.ebuild 698 BLAKE2B fbf8fcd6062226e8081c205c4180199bd3ed7bba439dfe9c6d38ee38c91858d34858b075416d257c50ea57f5d0641179ecbfc6f2b5551a1a1e0acd8335d14c2d SHA512 300f307d92b369bb9306e251e2e09edb8dd660726b78cb398f50620701c5fd726a20ccccbc329760949a3b2ac4ebe0797d36f9eb8aac1f3e4fde30b9fc3d0513
 MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-tree/asm-tree-9.1.ebuild b/dev-java/asm-tree/asm-tree-9.1.ebuild
index 2bfd7ac66a44..01e3400a43ae 100644
--- a/dev-java/asm-tree/asm-tree-9.1.ebuild
+++ b/dev-java/asm-tree/asm-tree-9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-tree:9.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/asm-util/Manifest b/dev-java/asm-util/Manifest
index 275767a305b9..19829856faaa 100644
--- a/dev-java/asm-util/Manifest
+++ b/dev-java/asm-util/Manifest
@@ -1,3 +1,3 @@
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
-EBUILD asm-util-9.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a
+EBUILD asm-util-9.1.ebuild 793 BLAKE2B 95991d7c4a603bb8831bcc798625ca86a39ec7ba7c431b79795069016498201a11e72ea386ef5ec19ba229bfe965f43192a70aa93ba7fc60807ba632148a50cd SHA512 b1eed72c60ce1f075f83745b0903b41b1041924eea78a626f9f956534fea87c14110d6a894141a1fe629267801b4534fdd86c8718d1475e48a82462c96aac329
 MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-util/asm-util-9.1.ebuild b/dev-java/asm-util/asm-util-9.1.ebuild
index ab7c52e86c38..8986257ddeec 100644
--- a/dev-java/asm-util/asm-util-9.1.ebuild
+++ b/dev-java/asm-util/asm-util-9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-util:9.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index df82369ddb7f..5c3fe8c5facd 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -2,5 +2,5 @@ DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f2
 DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
 EBUILD asm-5.1-r1.ebuild 1281 BLAKE2B 4b96ddb02de5c1fddf23646db0133774464554bf2957161e1d83c3bab9c3c9bc8fdbeeec67c04b2e2d83438fee807f44d8fb535baf750e6e4e413410a5045582 SHA512 fccc9bd86fe9e41469e2002c2c5ff9cb3bd53b6ba3d935195d92bb8ab771091290b3db0bfa3ce5a685480511a364d3c17a0f74ee08f6be16a1779b6e25f081df
-EBUILD asm-9.1.ebuild 564 BLAKE2B 26b31a92001b6a04925ab4fcccd999d86c17a2623aa91ccf587ec04f0f0b70da39a6f18dfb9f0889535ddd24fdaa171f8b32a8ce94cb9bc856f15cc66e9b5366 SHA512 dbfbeb8921791c282faedeaabda397a08c3967749eb4191d654a2140682d1372eb01258a52996045235338f561cbdcd561aac9b3773e102c9ff108cd436c6f46
+EBUILD asm-9.1.ebuild 595 BLAKE2B 784a00c90d2ac3acb2fdd667bcf9f1f4979e25dc98966d63b7330211ed8aa9b3a1ad018654163cdf6ba96617198987b663f34b122346145b5e91eca117a09189 SHA512 562c2c83bc2604c2f064256aa5fbb25c6a86a4db784cc32a1582d2bdce01271fecff910eaadf70c21a212d5ce6bbf4b4b214eb36b8d05d2587a856a9a5a7bee3
 MISC metadata.xml 1230 BLAKE2B a71da4c461c9ba0e7092f9c16916b0a72359fa198654c7ddabd4544efa0eb17c52378712dfe4bad27f5dcd14b289999d899dac0e89a7fd19350afe951de27839 SHA512 91a6876a431249ac794c998ab741eb4c8e3bef302e090402fd7b84dd6ebfb7734a4dfcf85fdd1ab3cedbf1d746f60ec7aa4444be44a8e316e01b8d1d45fcee5d
diff --git a/dev-java/asm/asm-9.1.ebuild b/dev-java/asm/asm-9.1.ebuild
index 671695dc8120..f4ae85d5b7d8 100644
--- a/dev-java/asm/asm-9.1.ebuild
+++ b/dev-java/asm/asm-9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm:9.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/cal10n/Manifest b/dev-java/cal10n/Manifest
deleted file mode 100644
index 95a9abe478fa..000000000000
--- a/dev-java/cal10n/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cal10n-api-0.8.1-sources.jar 35685 BLAKE2B 949bfb049d51ee4789200a9e9f6141551a648b2be70abfe56fdb0e7ef7bdce432d482cb2a79ea1a9aad0d7738500e1d217954d9e3ee60ceba0262dceffc46a16 SHA512 b6bb8ee7744fb878da1968a6524fa2b95d55c55e0f5e7413e7afd854eae226050cd4209e7489ce4f1fae6f2adb501781048f75ddcb2ad8c6b69595ff053422a7
-EBUILD cal10n-0.8.1.ebuild 668 BLAKE2B 20c7015258585817a7a3db1abc363a5b0c921a7967c767ad85154e6027db60a75151704bab725f594d6d228f43755c8bcca5b4f65ee2fe23968b3cb0c31adb9e SHA512 101150c6193848ec4312aa2edc7c1129558e5f2f54519c81d07ec82ac41b0faa88758356cacbdd11835475e30a7b22d4ce71d64ac5bee462a32534343a26d0c1
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
deleted file mode 100644
index 5966408f191f..000000000000
--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="ch.qos.cal10n:cal10n-api:0.8.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="java library for writing localized messages using resource bundle"
-HOMEPAGE="http://cal10n.qos.ch/"
-SRC_URI="http://repo1.maven.org/maven2/ch/qos/${PN}/${PN}-api/${PV}/${PN}-api-${PV}-sources.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	mkdir -p "${S}"/target/classes || die
-	mv "${S}"/META-INF "${S}"/target/classes || die
-}
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 2f933ba17f6e..123edbc39886 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,5 +1,5 @@
 DIST commons-codec-1.15.tar.gz 423639 BLAKE2B 5d9d3dd44fda7eee77048eaa1e28f54f9baff7ad276f7e718f4a4d6c5b26605914809db538e9832bf06b1468a65432645ef9de74aec9f9af9973668a82bd996f SHA512 dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce
 DIST commons-codec-1.7-src.tar.gz 291251 BLAKE2B b8fecdb9b88a21ceb3106a13332493617ecd2c8064c84a1514dec1c1c254e18116ff4926f7445bef4171000ba77da411efd6a93fe80a4795e887832035373e10 SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6
-EBUILD commons-codec-1.15.ebuild 1368 BLAKE2B 35f84a9e9d3d92f6d9ca6c57060eba3f64881b9b366004e6360f66851ba3439f5473f0703a1ebab16f4ab0030a40e217bd6305177f16380a95b072e38c32c49e SHA512 87cca5998d46ab126a72a015320374f972bb848f1c8e364aa0b99f4b0365e934768f6bf42010a4768e889ece41c3c9012e2d331829c2ca130874695f50df0faf
+EBUILD commons-codec-1.15.ebuild 1367 BLAKE2B 8543341062ccf924560573600273bd34a989f62a65fbac2fa09ab1eca097994c683af80542c28691f5ba97c8c4cc2736ad129bef4c2d12a0975d7a120c1e9327 SHA512 1bb458fea0f4dd10f6f4f777ca7a0389204bd083c4a9986a68f16d7392030db67fece5b5c0e9df9a31e09cbc08fe7cb83f5bbe88ba821e2d752899fd7ab92a9a
 EBUILD commons-codec-1.7.ebuild 908 BLAKE2B 54d95f6e45fb34815077188bd9ba7b0370d565ab9a2175715e8e90f2b0d3fffcdb4d0fbe547b68bea1e70e996716bf7187dd06dc6510e5873b0a1309aaa08ec5 SHA512 8f0fd884b856b8c1796fcb6c905b70869fee94d753f442f94531045fa39f4f32ff30dc9aadbdba24135139b59c9bc6e5b6d618b335563149e22e7ee05d6e6c8e
 MISC metadata.xml 1360 BLAKE2B 5e996a35877486521352b61fdb44872970caab9497267c9d95d1364bd299838486f1853b46f35ec140259d33e7158bca7224488f21c388caa4fa9e7a153006bb SHA512 d16f70860d4880e50d25e6297823fb71955c147eedd115ca7eda0a0bf6c4cbc6121bf8b12062241192facd4583f10df56a838c84940b5914f75d13f10c96e9ae
diff --git a/dev-java/commons-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild
index a8a171d01424..8ab0f3bb6464 100644
--- a/dev-java/commons-codec/commons-codec-1.15.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.15.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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 # Compile dependencies
 # POM: ${P}-src/pom.xml
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index e6205ee455ef..3ca373c74bc5 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -2,6 +2,6 @@ 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-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
 EBUILD commons-collections-3.2.2.ebuild 1378 BLAKE2B ca87bc67d684eae78f9816803456c1ef52cc0d3571514dba7cf2d8017f9ce72bddd35a0de681b4c33b0db1bb9e37f3e5a85cc4620819c8bcd98a70f308fc38a0 SHA512 ba6ec8a82736e39dfd41681e87e6587edd163be81ea5f80b56a37e529b7d681292627a308373ac8d2330bfd69206dd54fe1c04c34b4e63cd6255bef712042d2b
-EBUILD commons-collections-4.1-r1.ebuild 1270 BLAKE2B ee4a69564f0ad2d4f979759965d7ca0970417c905321793fec8556180e24f171f1e24fa22cef2887ca784c2c3cde2ecd6444ac96ef9634752da2f823a68e5ecc SHA512 3670396e8c20eb9e7ec040ad4b926f805279fcdd002dbfe441742cedadbad0dbb81c81544056381bcd96d3c6fef40be08197744b422bd92685eec90e4a2d41ea
+EBUILD commons-collections-4.1-r1.ebuild 1269 BLAKE2B d041b1fa76158cab26bf507dccaf3bbf7b18b236116efe33ee40cc2e5c01856feeb937b570d5a5eac4fa7b1081cc663dacfa328eb7f046d9fb3921c1cf4afa62 SHA512 484d1a0dcb1a7a17a245768cbd31930bcf6cdf755df380a77193f4999166d53a4374ad756748e5551bc5ca1f16c4105490807bf11ce20cdf821cc488057f58a2
 EBUILD commons-collections-4.1.ebuild 1261 BLAKE2B f307b979f9614cefe6d4f5eea916abb9591b277f16118b6cdc76a9425eda268845f8cc7860f990d0007449b9ca5d19fbeaf560569a814ace95f79297bfce5f40 SHA512 ef8287e70b9d9995365f24db5f98232207e21c05726eaf27cdd223dc1da52c154addbd0c2bd7bb1f79b2c79a5d90748fa7c2af3ff9e236dc0d1664f5e4039a99
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
index 1f0821a89031..32f0472c33a4 100644
--- a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extends the JCF classes with new interfaces, implementations and ut
 HOMEPAGE="https://commons.apache.org/collections/"
 SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 3d2004e42b1e..a58fe775813d 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -2,5 +2,5 @@ AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc280
 AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
 EBUILD commons-logging-1.2-r1.ebuild 2200 BLAKE2B 00edbc2be3dbf082669f84234fb6e198f6f0209e3b668e227294e25632eafafdc242fce9b56d6cde269bfa2bab3e9110ee5d5d8dd99d268ad11257e144cfd095 SHA512 e3501a786040b5db5d6b323edfc80e8bfab2b9347a8dd3303fe874ad4f05e62ce7f27e723aeec8f25dedf7e5525a6cabd1f43f6169f0efe58b8366c917121e4b
-EBUILD commons-logging-1.2-r3.ebuild 2354 BLAKE2B 2bfce6d3dca66c44422ca1ea371d7216c90e0746b0406fc5061dd876c44a3c0369cca7dab77fa136f3fd37b14c44b70e27104c7efba11efdcb5c1a8664733c3b SHA512 cbaf947feba2d6193fff5c2db8f7c873d62621e0a693e62ea83cf0721175f335f8a887f00591e31299f9e2d21d6768366d098810ff7e8407d48a928ee87cc1cc
+EBUILD commons-logging-1.2-r3.ebuild 2353 BLAKE2B 6d9d08371ee42a3707b8aea82abe37a994038dd0f4790330aaf099aa506803fac9e67aa0cb0d96ff20c56f997a4734c8bc5a4e4f74a2c006d7bd076ab56b8e68 SHA512 6c883de9c872c96bc33c8d1b5d0772603524f7d8905388c4c6871df6ddd1f4dd4aaf79bd3f7876f5156490b69457ce51028a39cb4b031f3dc6335ab866abc218
 MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index 8abf39696e22..0b487ad920db 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index dd0d2c65be0d..75cfbcf7c271 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,3 +1,3 @@
 DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
-EBUILD commons-math-3.6.1-r1.ebuild 738 BLAKE2B 91836d98a7bdec31cc38f27520014510532db67e56d8824cad0dc3ee8df3db6d879776e31076255d2bdb4707dca61e37a073d0612fe2b61113ab63ea2e7daf84 SHA512 458aa4fc88756016a6e52d534cea586336ad4df2c47f5a41dab41dfd792a5b9bf5dd804c70222dcf4ea4ca024fbaf4595eb1ad76ee4764ff1178e09e0187dd77
+EBUILD commons-math-3.6.1-r1.ebuild 737 BLAKE2B 7356804ac820438617cd44edf4c4b2fb71355973277471b36eef8eac9f65807513e252f8f22bd66886ba4d5048938f1e1a1c1a970dec27baf461d9156613784a SHA512 373c0ed90b28d739005641a564fe6c07f0d5694ae11cadd6caacd87aa86145a2425c35c532643a913c87ba88f474bbd57fcf0bcc74304897bc70b3a2bf713fc2
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
index 676842894be4..fd1f6c61c92c 100644
--- a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
@@ -21,4 +21,4 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index 17e6c6bed909..10c6ca7c66be 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,4 +1,4 @@
 AUX jackcess-4.0.0-fix-tests.patch 665 BLAKE2B 6e2cc60406b84c64e896478dbed520834b193749121241abd97ea1d54079a1faed4830347ab4d99623244e344ae502a10e8cadcdd4dbd1ffce83fdd273af3e33 SHA512 70a1325cbf955b032fada56a05635175f285e722c4c2a4c0a3d59401fec2b8261ff8c4717cf3e4c05cdbe53517a142ce348bd6309883334519fcf05e37afccce
 DIST jackcess-4.0.0-sources.tar.gz 12140889 BLAKE2B 44bdd0ba74e9e462364506e563b2e5db8a6581686a0b1ab7d9995d2dfce164593eb533986ac666a7f79180478a8a16ccc8ef57a7af08045cb671a3a5269f84a6 SHA512 514ecf235943183e0b3813550adf801cc4ab1734137ae0b131f5e3dca9f774f2a866bec397ccc8d37d65e9c3f0c4c995baee091480eb8e2bb91e85894c2a27e6
-EBUILD jackcess-4.0.0.ebuild 1993 BLAKE2B 7c8ff43075e2a443cc3e46d7f5add73c7805e2361f5a55b034133bfee0cc6c4a617f23ff3102429f2ca270896e6194b64883d5df1e06c063901b4ab2b448d2b9 SHA512 037fffd468c3b27c9a3ac90bf284f3efeb5671dcb9541c9dd01c4880e1e3685354ddbf7ac435771e549cc355e660b29fa8aebd587081a6b81884cc3e80ec25e1
+EBUILD jackcess-4.0.0.ebuild 1992 BLAKE2B f7fd903c96a66293b3b38fed51f2b7bfbe2de4db849c895602aedc19c81c1b61f714071f8c29cc8bad443d07a2422f35709f4923b9bda255d504390d4e02b14d SHA512 b96c338a634bb0b5881e8f9f7e88dd69d5781c90b5bfa9c8284513608c9ce78a84d9b60194d07341e9f8b5b6c24dddde079516ec3c19e899e7dac6e75e19542f
 MISC metadata.xml 314 BLAKE2B 0a48c521ff5b9916de7132a86ece393d4c01e648eadfc633bc0e5cea8fe64cc4a1163258b36c0c1e35743fac87224101f5661255bc6c8ca2ba31c59325d75c44 SHA512 84fc5b3b58171d3e96ab9cd24fad7df6ad3181e8099d1e597ad2c5e08e390fc598e5c7d210d05f722c001e4939a73052781c76322e52612d3ff4df126e5c4460
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
index d73cbac271a1..eead7d280ca6 100644
--- a/dev-java/jackcess/jackcess-4.0.0.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 1dfef32ec829..f3f87fa7bc68 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,6 +1,6 @@
 AUX jffi-1.2.8-junit-4.11.patch 700 BLAKE2B 4533e3a8d6a5921b1e39ea20c9b4dcbbc66d08a3d0ce2494ed22e5af753f0cbfbc5fa064f19877816e2cc44c666c48aa5a1f8be44fe8dcc7a9368f033acf8828 SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9
-AUX jffi-1.2.8-makefile.patch 1443 BLAKE2B 9accbdcd70c1c76e3f94a2131728fa83f7c988b5ce52aa7874d012700cfa4ed1cf3c3c2a281ce18c74776639e653f5a18e9c4b1d86baeaa9d10e577ca067e8eb SHA512 02f28b00e1ca6d16046c5f25c38268f78a41b5b202c4f284e8dac10dc245ad150f4639849c0af8c20f50dc3e7cf715bee6dfd2f1edc48496f822d78aaef01b39
+AUX jffi-1.2.8-makefile.patch 1451 BLAKE2B bd6ae6ba8f509880e33e603eb98d8a8dca2786c2440bea6cc27c736caaf26170cfb4cd17af83d72d2c09c8ec70e65ef820bc990e9617c14fa5979e9e571e7d19 SHA512 b31031f4039cbd5ff7083321c17e8d5459c56b01c6cc2be3a45b81b2a3ee8f40b1ac0a2bd5df390887fae2026b4c87c1be060d0b01a3b2acf28950f1a06cd253
 AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7
 DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
-EBUILD jffi-1.2.9.ebuild 3091 BLAKE2B f671ee59386574ed2077375d717b95afa54919e36b8455c3f825b5d02bb647cd7fb291fc54043f545389cfa03ea74f5a1d53f7e2946df3f25dd241670670757d SHA512 67cb052c57447ed866a85299a7ecd6a59d894bf1b4a8e26947699d4aacc8fe88492431c60db9d82cb1fde33db57779933c0dc7c3ed2a2fef63adad8805995927
+EBUILD jffi-1.2.9-r1.ebuild 3003 BLAKE2B cc6f67a1b539172dd951f084571cc5f308429e1189e613e3700875817556f384d1bd3d27d17c8c66e97ad98c6dc2fe0889358ba8a0201bcb4e327a1f6545a5bc SHA512 a94628868e81d3c1ad2ebea77b9ee4b462d9851d9852f80faaa4ef11030696a95ba1fc9b26f53716dd877213a623bd461415588f56ac1709f63da3e7cd000f47
 MISC metadata.xml 319 BLAKE2B 999865e43b7f7ecf6784131fc903f80f208bf39dc54e96f6f80bd991998ab9694fb92ce8cd5e998a2e0800b64e47068859a7c63d46ea74294f1da77f1a18c46a SHA512 ed411e700c518b64ce76a437771c3a4779ebf47207d839924220ae6174ab7fd9cde92cd347c93b1916849cc2fb7fd4a5e5c29911420bc3485cb2916034d3f71b
diff --git a/dev-java/jffi/files/jffi-1.2.8-makefile.patch b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
index 7f9f07a500c5..cdc28a662b51 100644
--- a/dev-java/jffi/files/jffi-1.2.8-makefile.patch
+++ b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
@@ -1,5 +1,5 @@
---- jni/GNUmakefile
-+++ jni/GNUmakefile
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
 @@ -41,6 +41,7 @@
  JFFI_BUILD_DIR = $(BUILD_DIR)/jffi
  
@@ -37,8 +37,8 @@
  
  ifeq ($(OS), darwin)
  build_ffi = \
---- libtest/GNUmakefile
-+++ libtest/GNUmakefile
+--- a/libtest/GNUmakefile
++++ b/libtest/GNUmakefile
 @@ -44,8 +44,8 @@
  # Compiler/linker flags from:
  #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild
index 4eff1caf02bb..6c6b7d259e42 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit epatch java-pkg-2 java-ant-2 versionator
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="An optimized Java interface to libffi"
 HOMEPAGE="https://github.com/jnr/jffi"
@@ -18,16 +18,18 @@ KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 CDEPEND="dev-libs/libffi:0="
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
+# java 1.8 is needed because javah is called which is not in newer jdks
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	virtual/pkgconfig
+	virtual/jdk:1.8
 	test? (
 		dev-java/ant-junit4:0
 		dev-java/junit:4
 	)"
 
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.8-makefile.patch
 	"${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch
@@ -35,10 +37,10 @@ PATCHES=(
 
 RESTRICT="test"
 
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+src_prepare() {
+	default
 
-	epatch "${PATCHES[@]}"
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
 
 	# misc fixes for Darwin
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -59,7 +61,7 @@ java_prepare() {
 			jni/GNUmakefile || die
 	fi
 
-	find "${WORKDIR}" -iname '*.jar' -delete || die
+	java-pkg_clean
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
@@ -71,9 +73,9 @@ src_compile() {
 		package com.kenai.jffi;
 		public final class Version {
 			private Version() {}
-			public static final int MAJOR = $(get_version_component_range 1);
-			public static final int MINOR = $(get_version_component_range 2);
-			public static final int MICRO = $(get_version_component_range 3);
+			public static final int MAJOR = $(ver_cut 1);
+			public static final int MINOR = $(ver_cut 2);
+			public static final int MICRO = $(ver_cut 3);
 		}
 	EOF
 
@@ -92,7 +94,7 @@ src_compile() {
 		SRC_DIR=jni
 		JNI_DIR=jni
 		BUILD_DIR=build/jni
-		VERSION=$(get_version_component_range 1-2)
+		VERSION=$(ver_cut 1-2)
 		USE_SYSTEM_LIBFFI=1
 		CCACHE=
 		-f jni/GNUmakefile
@@ -114,7 +116,7 @@ src_install() {
 	local libname=".so"
 
 	[[ ${CHOST} == *-darwin* ]] && libname=.jnilib
-	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname}
+	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
 
 	# must by after _doso to have JAVA_PKG_LIBDEST set
 	cat > boot.properties <<-EOF
diff --git a/dev-java/jnr-a64asm/Manifest b/dev-java/jnr-a64asm/Manifest
new file mode 100644
index 000000000000..eb8bc312a01a
--- /dev/null
+++ b/dev-java/jnr-a64asm/Manifest
@@ -0,0 +1,3 @@
+DIST jnr-a64asm-1.0.0.tar.gz 29247 BLAKE2B d5b2dbdbee3d50e466d164a7b5f62ad5ea99eeb810c38bacbd5ec21f8ba57d28ed442846903e85ef771e2a4ca80c77f2beb558fb03b1b6996384e26f69731474 SHA512 16ab336e60d6bf5e6478ed4fd8144c7e1eb1aa23089927e34adcbd2f0b3fdaedfc0e5026545bfd69d8a6a030479342088fcb86657a007e9ac9ba7a08830aa858
+EBUILD jnr-a64asm-1.0.0.ebuild 850 BLAKE2B bd0b46a49c6ce66de7e6ee4026b8bcd3f5075a7cb131b1df21c9f99101a2594d5e901833bfda878e4f92780e91227677a735cc93e2aae65054826be70c1da3f1 SHA512 32256fefe5dba346d72649fa221d0d7111b9480ad64ae80230e2e083fd9581aeaaf3f3c3028a64a9855d39ea804290e6db52a21b0a4a12fb3bceacc01b28511d
+MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
new file mode 100644
index 000000000000..a1c6f07ac18e
--- /dev/null
+++ b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
@@ -0,0 +1,32 @@
+# 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://github.com/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-a64asm-1.0.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.jnr:jnr-a64asm:1.0.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A pure-java A64 assembler"
+HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm"
+SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/cal10n/metadata.xml b/dev-java/jnr-a64asm/metadata.xml
index 952a4b9b605c..0d49beafc75d 100644
--- a/dev-java/cal10n/metadata.xml
+++ b/dev-java/jnr-a64asm/metadata.xml
@@ -3,6 +3,5 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
-		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-java/jnr-x86asm/Manifest b/dev-java/jnr-x86asm/Manifest
index 4542e39d183b..8bee7b450b18 100644
--- a/dev-java/jnr-x86asm/Manifest
+++ b/dev-java/jnr-x86asm/Manifest
@@ -1,3 +1,3 @@
 DIST jnr-x86asm-1.0.2.zip 180046 BLAKE2B f346357dadaf4727e061ae4f11cb4a2fcb0aac7056c1ddc902c1779a0aa323ed47a90b7a7fef1148e4aefba2f003853d10718ae01ddcaffeb2b5b6d80d362b83 SHA512 e77124b7f0074dcd8b17ba200a1c99350827e6a3c641d6caa33b6bd900c95af9140f8ab716a5299bc591969f295158709b381f9b45faddbd6b75355949e4f463
-EBUILD jnr-x86asm-1.0.2-r1.ebuild 537 BLAKE2B d5955497f995098f3fec5f70093cc5d1b060eaa2d8fa4e7fc502bce9b5e76e8e4ac54c89aaa757b7a2adef67e156787eb5b3e830069266a10625e8100c3f9fa6 SHA512 03108db31e9dff342ce7017f19675267193790d16d8a9a6e707bf8187e98392ff72fd3908617568049a7a8887ba45050f1fec2f836bcf4b59573b3918377b185
+EBUILD jnr-x86asm-1.0.2-r1.ebuild 577 BLAKE2B becf1dd79bcf6986973721edfc415ae50b54d57001923f2ae12b4230ae43e80b2a9373845aa813c34db393ae1f495b9b238bf797f33067257fea997fed990741 SHA512 ae6ce3fdc502bffa25a2444976f29e90c069135fccbaa1a7912fbc3adc2cca37785d021b84f42dfbb1e7a422fce3eb539bb4b1fe3bd97ed7aab76501a298f802
 MISC metadata.xml 325 BLAKE2B 15dc0d2912dbb73aa35654c7eb159708abfc72b6f2e5426c6d21849984eb89f89ed5095a0e5f9a32dccbbd28722b0cbfab1291342a10eb04e51abcd7ef553a51 SHA512 9340b2600f4e4131177b0cb89acefc78c9d580bcadb3e69bb73ea536b36b7c81d7ba880f78df917ef6061c09b2da5da5a7d22a5497fa61bc8815f01359a95617
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
index 304b608ca557..4cf9bc564824 100644
--- a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.jnr:jnr-x86asm:1.0.2"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 3349a2fc5370..b86ee5df4590 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,9 +1,5 @@
 DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
-DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
-DIST junit4-r4.13.1.tar.gz 1072560 BLAKE2B d7a8ecf804f83461c281a494c1ad85e6797af64fd1344ba41a919a2783c28fc7c36b6c85984aaff66d41a99fde0141532be2e9bb00f3f53ae467f6dbde937f4a SHA512 a4c284f756916077100181af1dd8c0febdc855e21ea600366e5fda3904919ec2c4a5e828961c322f080f177eb53485c9ad01bfc65c7489a741be63c96cd472bb
 EBUILD junit-3.8.2-r2.ebuild 842 BLAKE2B 01cc39cca58291852a2bd71b97283ce344656648c741792013e7daaf50cccad14551e4d0885d9fa4c3dfe52cfccd18c0943a55c0d479cd49b1d182eaa8252f75 SHA512 25a498140852340c429d965b8770a1844fdcff906164fcdf873e32cd303871b446d80d88fef2772c765254c7396fdd6a3688e9b253f04cf02c289c5a85e99ebe
-EBUILD junit-4.12-r1.ebuild 1477 BLAKE2B 92482da40156f07c657f3f9463f7e9763330ad496032b74199084f8fb4bd521e236332050c461a06270b3574086d5dd2b3413f55cbf9c6361c171e31aafccdbb SHA512 418decaf336841e80eb82a8905d99fb897155fc2bc1ec45f7be72324f03cc63e6f07b9e1ecd3b12e9d8149291970ab2f27b0c482a96e48d1bc7e8301e8190f35
-EBUILD junit-4.13.1.ebuild 1559 BLAKE2B 3446879568e259253e7c9d8048ce3eb5d9fe0ace907e550dc6efc6b8ac6145d53250f32d0a14eff559664530cfba699eb912b17084224a976f0ed618d64b02fb SHA512 7e6cd806937252998eb5fbd39eb0fa8562435bd0fb15d2310113453fcfff8fa83ff8dc5997a425aea1dae8cca86584310e2dc9a3dc4b68bac0f803f66f3c93f7
-EBUILD junit-4.13.2.ebuild 1962 BLAKE2B c744aa8a38662b22f7adc9d3cff01bbf453179572ac46709c59d288963a4aca7d275c338f9a5084f5b8efb833db3a0c90333485e418e734de2886ed80483dbd4 SHA512 5369aa803cf5ce518293995c70764068e218f81197421bb0e8efcebfadab005619b5c9bb0f3962d461ffa614c7a6a577e7ecbb167e7bf275e860ab11cf5dab75
+EBUILD junit-4.13.2.ebuild 1958 BLAKE2B 189157168b0cb45ba9361a43c1b69b43f2232434d821a76b6d16942ac28eb1979350a8b5de75d38b4d64240332f03d2df7bfb4a11fca026e2b1a8f77ca5e272f SHA512 0345e9627cade52ba1234cc2a09f3519409ec8b30d8b8db2b6b4ad8fbcd30944fde224339f185d2a02d19bd92a1f0130922e60b7a8a200a4f8f4d9cfad2f2401
 MISC metadata.xml 368 BLAKE2B 8461f82cd98863df6643a7727fdef984d30f6cd8f9cf7cb37453fbae186896b2845bda742864eadaab1fc932604a48957b0c7f7b80ecfa8ca107276287abc602 SHA512 f9bf527c63c7c4cfb4c0967918b23e6c2abe6c9239d2a873bf2ccefe31be8224c38d4062c71b6ee2692f5b36a27c348e3fc24d48279bc392a9efae2a8d17e077
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
deleted file mode 100644
index 3f19ad05eede..000000000000
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="${PN}${PV%%.*}"
-MY_P="${MY_PN}-r${PV}"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="junit:junit:4.12"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
-HOMEPAGE="http://junit.org/"
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-CDEPEND="dev-java/hamcrest-core:1.3"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
-
-java_prepare() {
-	rm -v lib/*.jar || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc {acknowledgements,{LEGACY_,}CODING_STYLE,NOTICE,to-do}.txt {CONTRIBUTING,README,doc/ReleaseNotes${PV}}.md
-	use examples && java-pkg_doexamples src/test/java/org/junit/samples
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
-}
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
deleted file mode 100644
index 471d0ae7d575..000000000000
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}${PV%%.*}"
-MY_P="${MY_PN}-r${PV}"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="junit:junit:4.13.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit5/"
-SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-CDEPEND="
-	dev-java/hamcrest-core:1.3
-	dev-java/hamcrest-library:1.3
-	"
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
-
-src_prepare() {
-	default
-	rm -v lib/*.jar || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc {acknowledgements,{LEGACY_,}CODING_STYLE,NOTICE,to-do}.txt {CONTRIBUTING,README,doc/ReleaseNotes${PV}}.md
-	use examples && java-pkg_doexamples src/test/java/org/junit/samples
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
-}
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild
index e710a4bf5827..a11c549f9673 100644
--- a/dev-java/junit/junit-4.13.2.ebuild
+++ b/dev-java/junit/junit-4.13.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz ->
 
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: ${PN}4-r${PV}/pom.xml
diff --git a/dev-java/objenesis-test/Manifest b/dev-java/objenesis-test/Manifest
index ff4be4234786..8f1870667b22 100644
--- a/dev-java/objenesis-test/Manifest
+++ b/dev-java/objenesis-test/Manifest
@@ -1,3 +1,3 @@
 DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
-EBUILD objenesis-test-3.2.ebuild 874 BLAKE2B 97c2b626baa3e5722d89c46da067dcd622c04e82353d3af35068521ba6f52d81ed439a649ac25b2463d3b91bde2157d9afcdccd43b594e4bb3f64efcba169fbb SHA512 be987d2000f36e26bc456f24422c19d5b17b2f3b75d3575e510e6759ab3373a62b6912cd68f8051960f2933361a1fe740cecda9a1b702e92b072c73104bce3b1
+EBUILD objenesis-test-3.2.ebuild 871 BLAKE2B 07f8bf1132db0ea5c4a6029db31a09858e16b0b9d4b94caf4cb955b0337f8d79e101f50d2a9b6c7288210b4dca24307551afdb9c144ae30e062d56d1deb41357 SHA512 554f86111bdc3ca361e267b1028efb0672ad82045fc30b6b251a9c4445bcea8b7fb5875ebddbb6cca2a1ab8c594b4b99e981d03642ea409469c11087a47ddf40
 MISC metadata.xml 385 BLAKE2B 21b4ff5cdc9b66726d00f32aec998bd89bff2a75929eb15bed2aa688bfe1a04ac5a5df209ad2e732c0b168f0af0124fa7e74512721222a94fe5d155bd8a48d4c SHA512 51de98336149b818cfd1ba47b9a7ee5d09cba8669273f673db5491aa1d9e9b675cbcabae43a4bb4061ca2654f03ff998d01480b71e741ebe7cdaead2f786710a
diff --git a/dev-java/objenesis-test/objenesis-test-3.2.ebuild b/dev-java/objenesis-test/objenesis-test-3.2.ebuild
index 0bc4aa01ca67..d3ef97a3bf1a 100644
--- a/dev-java/objenesis-test/objenesis-test-3.2.ebuild
+++ b/dev-java/objenesis-test/objenesis-test-3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/easymock/objenesis/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index 573e3181c74a..2f66dbc0fa3a 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,5 +1,3 @@
-DIST objenesis-1.3-bin.zip 287452 BLAKE2B d3f6cce9ad46d8578e24077df8a19fcdf2f9456ef732f73fe234ae688c9ceca7277e5376657efcdaba1a7b5a80ddf106aff52f291a6b2f698a010a288e961e33 SHA512 48f838e00cfe0d12c6c73fb3d1d8482ccd8de71742a86c3afbba832c6b73e1f7b1604f8c209386e00f7751cd568e9ef4d61b543db66c927f3d61f9e6ee0a4193
 DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
-EBUILD objenesis-1.3-r1.ebuild 649 BLAKE2B 12ba0512f6eaa5327d423b69d7ef4c98dd0a3fa6d3aae8b6cf786495714dc9ae41bf43bf283010f7bdd5edfff5f22737e1da13021ab9392220f2d052003fd2bf SHA512 8ff4f36ef08630a495091a48752d570a777545222fdd3c0ad939677ba41a4136598d9509f84044b9db5ddd691406341133baab6d2124349b75cccfd52a188f27
-EBUILD objenesis-3.2.ebuild 1217 BLAKE2B 3a0f85790da3164e27ef7110d9f724d987a0f3d98dedc204e7f3bd7420b7348a1463f3cfca829ba5fcdd49f34f8d259c2c4f7163eba2cbd7ceffeeb196b9f228 SHA512 bb767ddf276919f78c3b9df4712c904d0876a7175298b6159a398d96b0138c8309aa82c7741337cde6a5ab70bb01155c2fe130d9a9baf8eb40a900cfd8d7f692
+EBUILD objenesis-3.2.ebuild 1214 BLAKE2B fa8ce944f4e5af256cc4a66791a5d1863184f3c794e698ebf3554e438156df12cac745de878c52510d729babeb7f062194a5fe559979a8f2da1e6a9918233159 SHA512 f5b19271aed8002d501b467f4234b5eb69cfb627f08c9ef818197a9532141bac8032d0eccdea1fa966f0e2672b7a2f0c636e0b33f503427c3b696ce70189cf34
 MISC metadata.xml 385 BLAKE2B 21b4ff5cdc9b66726d00f32aec998bd89bff2a75929eb15bed2aa688bfe1a04ac5a5df209ad2e732c0b168f0af0124fa7e74512721222a94fe5d155bd8a48d4c SHA512 51de98336149b818cfd1ba47b9a7ee5d09cba8669273f673db5491aa1d9e9b675cbcabae43a4bb4061ca2654f03ff998d01480b71e741ebe7cdaead2f786710a
diff --git a/dev-java/objenesis/objenesis-1.3-r1.ebuild b/dev-java/objenesis/objenesis-1.3-r1.ebuild
deleted file mode 100644
index 83197bba73a8..000000000000
--- a/dev-java/objenesis/objenesis-1.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A small Java library with one purpose: To instantiate a new object of a class"
-HOMEPAGE="https://objenesis.googlecode.com/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}-bin.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE=""
-
-BDEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
-	unpack ${A}
-	unzip "${S}"/${P}-sources.jar -d "${S}"/src || die
-}
diff --git a/dev-java/objenesis/objenesis-3.2.ebuild b/dev-java/objenesis/objenesis-3.2.ebuild
index ce6d04ce8dc8..87362be1d570 100644
--- a/dev-java/objenesis/objenesis-3.2.ebuild
+++ b/dev-java/objenesis/objenesis-3.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/easymock/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: ${P}/main/pom.xml
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index 19f1d918f203..a816e798b3f8 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,3 +1,3 @@
 DIST poi-5.0.0.tar.gz 111429369 BLAKE2B b29e754fb709d01ff4d68e9227f4c4739384bd02934b6860e8a0e96552d9e9ff1c5c665bc0b701f79226505fd98373fe6ad160c72735903eae388f0cd6618337 SHA512 e79d15b42d8ec389fd15b7714faf7b49b9fb4d57014cb341fff0f061393f4ea7dfcbd3810a6ec19539eabddbb1d0690aa56de4a1a412d05a527e11797047023a
-EBUILD poi-5.0.0.ebuild 1951 BLAKE2B b59a6ea1ce24694423774923d2858f98d94535829c0c6178e93e029a437b3df629399bb31c0f796327aa4f6aedb87dc344b1631406c05b49675e2cd746336591 SHA512 4b797b7c977bf0d9fb921661a0c1fd90c5f9d8d276be2fa55f4ee9e47b17af9f38f5ac914a0bc838907728b4b719e3ebf72aa00b49dccd2d418741d34d0c2f69
+EBUILD poi-5.0.0.ebuild 1950 BLAKE2B 11ced0830c3e72de700b95d10235efa998dddbb4a713ce479afe6ad40f81c3c8f494b5dd18d01d46db05ecdf17e97a453c8bdec0c797b55b64777726f2a0d5f0 SHA512 f9a60017946cf2145e9243f5304dcdd28aa2e00732540aebbc66488e48e189947e817950b878c7b39b6e9dd65640a9ff29e9ab716d70081da4b55866191654c1
 MISC metadata.xml 428 BLAKE2B 3c635a18242ab2a097c37707bc6ce85d05144fe8142b6b2fed764f785ca9885171d84bc2c8422160eaa0b8d868180295f49de953ada22c26d85a72b39e11e3ff SHA512 f43292d507ae9a54941544ac52d678907440c5c663a50131cd170b97159f2d8045f38a5f9dda418a518c6ab711a77c600062416438fcf802ee03cd69801252bc
diff --git a/dev-java/poi/poi-5.0.0.ebuild b/dev-java/poi/poi-5.0.0.ebuild
index dbbddd8ed6b0..afdf198efed6 100644
--- a/dev-java/poi/poi-5.0.0.ebuild
+++ b/dev-java/poi/poi-5.0.0.ebuild
@@ -16,7 +16,7 @@ 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 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 
 # Common dependencies
 # POM: ${P}/sonar/main/pom.xml
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 64510d8351e3..4b71c2c8def7 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -19,6 +19,6 @@ EBUILD protobuf-java-3.15.4.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1
 EBUILD protobuf-java-3.15.5.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
 EBUILD protobuf-java-3.15.6.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
 EBUILD protobuf-java-3.15.7.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
-EBUILD protobuf-java-3.15.8.ebuild 1479 BLAKE2B 0b0d29422b63396fcaf19acd989294dfc2fd516adc5b43481b65529180f7fa9b954d1f306533d55e0a6c07d3dbb7b24a51b08f949eeda820f81e734fa56287b0 SHA512 edcebe15e9e41d0d8cb624d36f2930ff80c0212fc9dfa610c2ca763ac3dc7dc80f3bb47afe5082cd98c70eef3b8c5a121de888d9666d76cd7fa572d50752e07e
+EBUILD protobuf-java-3.15.8.ebuild 1478 BLAKE2B d617e38efc90574bd768311d74fa430c3b63e16b4c52c0f73e8ae22eed797822d1dd6e03fd89960762d3eef6c40c1d6adbf4592c03ccc3f9fcc3c087e97e9880 SHA512 2377ca511591d13fd9dd600b460d55481e80e086578e3d5d278cc8304d609d8869d02b608e65d33310d4efc9b884f23e026e54630c38c6a56be775c5a0072932
 EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B 2b9a19943db37248fefd4fe65c15e2a3ced5748a5340f572108e3b0f9013aa46982421d3e7a4b044a0949742b90dd9014045486761ee2d8654c70fa605c06e14 SHA512 c4f6d08af080dcb0c93c5f03242bca8662db069aeebd0d42c06dc80386c17867021db7f67104405d9d58a71659a94c3fbcef8bd5463d44c647e2f21bdcdb976d
 MISC metadata.xml 549 BLAKE2B 3b081008d6ff92b24f670c1b8861400871454e96c5f0ca170c3825d6dda8d356f341fbfad7b5a9f330a7f9891d0e3b91a9f4842c480ee8a74f6aaf371884dcc2 SHA512 37ecf8aa151f5d08443a07c40188ec7061947a06453e39d07fa9b0da0cbeb2ccb76e517e7e2c2e3a2afe07874c817cf644dcd8775ad78f18b5f55496bc198b72
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
index 2186254f699e..198c4df6bd5b 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/slf4j-ext/Manifest b/dev-java/slf4j-ext/Manifest
deleted file mode 100644
index b3b059507e22..000000000000
--- a/dev-java/slf4j-ext/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 1.7.5-build.xml 4262 BLAKE2B b234c7a2bef328485ec3213bb7af1d1403a8dffa8f4d4b5187a6cbf4b2ab52ad1c3e10295f160d3393c9220f1426b6429a76cb63d3d2775655986019cc091685 SHA512 06b9f3342928c58b10b0dfc70b1f990209da58e14b6293b2d7b7add6db0463698b473d33c305d2469dc96f3d9c8b5cac98e931ddbdcc2c100c82a30c26fa6547
-AUX 1.7.7-build.xml 4262 BLAKE2B b234c7a2bef328485ec3213bb7af1d1403a8dffa8f4d4b5187a6cbf4b2ab52ad1c3e10295f160d3393c9220f1426b6429a76cb63d3d2775655986019cc091685 SHA512 06b9f3342928c58b10b0dfc70b1f990209da58e14b6293b2d7b7add6db0463698b473d33c305d2469dc96f3d9c8b5cac98e931ddbdcc2c100c82a30c26fa6547
-DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
-DIST slf4j-1.7.5.tar.gz 2862186 BLAKE2B b594581435ed4a0aca8730e248cee1f41d6cd36ead03fb0744edb6c2ef42d6dc99e4c7851a212350487fd64db648675ab484c05124cf7f22249d09d4c031b07f SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7
-DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
-EBUILD slf4j-ext-1.7.30.ebuild 1948 BLAKE2B 42b89c9bb03e813f02759e9ba98988a688b4c8fc651dd1e753495ad831136d23e4cc7fb45866087fb011fc1eb32740fa1b7c208849f6fd66578ecbd82d6bc8ab SHA512 0c9a012187bff4a7f284e802dfed67c550580de627acab73b4ee128666f3cb476bdb989e296ff6453820190d78fd20333bc7198176e8960388028f1b39f395a8
-EBUILD slf4j-ext-1.7.5.ebuild 1129 BLAKE2B 4f9db88e1ffc85cb0a83a096ade025551008c09a0a08d8b10ba40a5f729b6617e26eb6e1d16111f5030ddef1f265caa852f60f042425a4f03cc3535f96159d59 SHA512 9a4d0f93acf858157d59207d6f1e5fc9678a2ec24056743fe57d9d89c3fdda2908cfe125763d05f9b0dde5cfbf8218e01058d71f020117757515d9ab20e47de2
-EBUILD slf4j-ext-1.7.7.ebuild 1133 BLAKE2B 01611669345b83168180d8291a72bd1556d9793c9d13d3edcc3df2c83f0949973f5ec4e497c91cf506cf65506b2c8f1f0b875f93a5a6629d6ef4cd7dbb2853fb SHA512 bf5435e1cca6dc861477cf81489753e59b470694e85d21351abb44ab2d1f9133997e2d896f005b50d50cccaabe4524a8efa0ee4f1f7c952077423635d8aa0e7c
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/slf4j-ext/files/1.7.5-build.xml b/dev-java/slf4j-ext/files/1.7.5-build.xml
deleted file mode 100644
index 0e118338196e..000000000000
--- a/dev-java/slf4j-ext/files/1.7.5-build.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="slf4j-ext" default="jar" basedir=".">
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="${ant.project.name}" />
-	<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.repo.local" value="${user.home}/.m2/repository" />
-	<property name="maven.settings.offline" value="false" />
-	<property name="maven.settings.interactiveMode" value="true" />
-
-	<path id="build.classpath"/>
-	<path id="build.test.classpath" />
-
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${maven.build.dir}" />
-	</target>
-
-	<target name="compile" description="Compile the code">
-		<mkdir dir="${maven.build.outputDir}" />
-		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="false" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${maven.build.srcDir.0}" />
-			</src>
-			<classpath refid="build.classpath" />
-		</javac>
-		<copy todir="${maven.build.outputDir}">
-			<fileset dir="${maven.build.resourceDir.0}" />
-		</copy>
-	</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="false" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${maven.build.testDir.0}" />
-			</src>
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="test" depends="compile-tests" 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="**/AllTest.java" />
-					<exclude name="**/PackageTest.java" />
-				</fileset>
-			</batchtest>
-			<batchtest todir="${maven.test.reports}" if="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/${test}.java" />
-					<exclude name="**/AllTest.java" />
-					<exclude name="**/PackageTest.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</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>
-
-	<target name="jar" depends="compile" 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>
-</project>
diff --git a/dev-java/slf4j-ext/files/1.7.7-build.xml b/dev-java/slf4j-ext/files/1.7.7-build.xml
deleted file mode 100644
index 0e118338196e..000000000000
--- a/dev-java/slf4j-ext/files/1.7.7-build.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="slf4j-ext" default="jar" basedir=".">
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="${ant.project.name}" />
-	<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.repo.local" value="${user.home}/.m2/repository" />
-	<property name="maven.settings.offline" value="false" />
-	<property name="maven.settings.interactiveMode" value="true" />
-
-	<path id="build.classpath"/>
-	<path id="build.test.classpath" />
-
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${maven.build.dir}" />
-	</target>
-
-	<target name="compile" description="Compile the code">
-		<mkdir dir="${maven.build.outputDir}" />
-		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="false" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${maven.build.srcDir.0}" />
-			</src>
-			<classpath refid="build.classpath" />
-		</javac>
-		<copy todir="${maven.build.outputDir}">
-			<fileset dir="${maven.build.resourceDir.0}" />
-		</copy>
-	</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="false" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${maven.build.testDir.0}" />
-			</src>
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="test" depends="compile-tests" 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="**/AllTest.java" />
-					<exclude name="**/PackageTest.java" />
-				</fileset>
-			</batchtest>
-			<batchtest todir="${maven.test.reports}" if="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/${test}.java" />
-					<exclude name="**/AllTest.java" />
-					<exclude name="**/PackageTest.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</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>
-
-	<target name="jar" depends="compile" 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>
-</project>
diff --git a/dev-java/slf4j-ext/metadata.xml b/dev-java/slf4j-ext/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/slf4j-ext/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.30.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.30.ebuild
deleted file mode 100644
index 2c2711ced4b1..000000000000
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.30.ebuild
+++ /dev/null
@@ -1,71 +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 slf4j-v_1.7.30/slf4j-ext/pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.30.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-ext-1.7.30.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-ext:1.7.30"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Extensions to the SLF4J API"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}-sources.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-# Common dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# ch.qos.cal10n:cal10n-api:0.8.1 -> >=dev-java/cal10n-0.8.1:0
-# commons-lang:commons-lang:2.4 -> >=dev-java/commons-lang-2.6:2.1
-# javassist:javassist:3.4.GA -> >=dev-java/javassist-3.18.2:3
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
-	>=dev-java/cal10n-0.8.1:0
-	>=dev-java/commons-lang-2.6:2.1
-	>=dev-java/javassist-3.18.2:3
-	>=dev-java/slf4j-api-1.7.30:0
-"
-
-# Compile dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
-# test? org.slf4j:slf4j-log4j12:1.7.30 -> >=dev-java/slf4j-log4j12-1.7.30:0
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? (
-		>=dev-java/slf4j-log4j12-1.7.30:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="cal10n,commons-lang-2.1,javassist-3,slf4j-api"
-JAVA_SRC_DIR="slf4j-v_${PV}/${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"slf4j-v_${PV}/${PN}/src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-log4j12"
-JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"slf4j-v_${PV}/${PN}/src/test/resources"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild
deleted file mode 100644
index 5aef8e47489b..000000000000
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/slf4j-api:0
-	dev-java/javassist:3
-	dev-java/cal10n:0
-	dev-java/commons-lang:2.1"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${P/-ext/}/${PN}"
-
-RESTRICT="test" # causes loop with log4j:2
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="slf4j-api,javassist-3,cal10n,commons-lang-2.1"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
-	find "${S}" -name "*.jar" -delete || die
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/target/${PN}.jar
-	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
-	use source && java-pkg_dosrc "${S}"/src/main/java/org
-}
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
deleted file mode 100644
index a28025766e7d..000000000000
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-COMMON_DEP="dev-java/slf4j-api:0
-	dev-java/javassist:3
-	dev-java/cal10n:0
-	dev-java/commons-lang:2.1"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${P/-ext/}/${PN}"
-
-RESTRICT="test" # causes loop with log4j:2
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="slf4j-api,javassist-3,cal10n,commons-lang-2.1"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
-	find "${S}" -name "*.jar" -delete || die
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/target/${PN}.jar
-	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
-	use source && java-pkg_dosrc "${S}"/src/main/java/org
-}
diff --git a/dev-java/sparsebitset/Manifest b/dev-java/sparsebitset/Manifest
index 7b70957455c0..560b70881e29 100644
--- a/dev-java/sparsebitset/Manifest
+++ b/dev-java/sparsebitset/Manifest
@@ -1,3 +1,3 @@
 DIST sparsebitset-1.2.tar.gz 1669439 BLAKE2B abfd88fb21f72d22bbb1f7bff11bd2a9b4e2af84689cbe8013f27f1f138512ecf843a60b8c5c196b622d024614e7f197b349a6cd510eb1c17bd757f7c1a0d90d SHA512 0c7c182556240886e0732626561401aa8695fd46ba90e5e95c5b28c90abaf5f6fd4c3b791171cdde71f61111c6b08ae8f56de105779f71d0448635cbe3b0b247
-EBUILD sparsebitset-1.2.ebuild 1048 BLAKE2B ea084644f3f3206d025cf1509be612f5fce41b6b74e5bfed25f7357b47ef4a7be79a2d1fda58d097b27ac75d710257c8ca0075c0c8e17e855129813bcbfcfa3e SHA512 b17658632de742c2ec00d14a28ceccea8c5c1305a1fb4875ce0964c07409a0f02af70f7da499cbf79ba0e0902dc1352afc49b8a186a8e58a25939eab7acbff72
+EBUILD sparsebitset-1.2.ebuild 1047 BLAKE2B 0bb635cd768502e0516aca43525c6b8c8ec1ff18eeba8d3d2e45c4626fac49e56e453a36b086eb3c54345e77dbc0f47b0c4310a46bd602544a0a0713922e93b3 SHA512 48c4dd2b14ae75f50f8ffe306b769167a179204e9a04437871535f39132f7209f087bffea224b67c6e70d5ba9dcdba1e5ee6159c741c7ae51bd4a97233486b80
 MISC metadata.xml 385 BLAKE2B 7c290911ac6a6ab2657efba2c525b9b5f72cdb730f3612f452ac97d635a51784421e43c64a601fd7c5a73a25642c7c7c2cd550553de34d6bf6d2888571a4c395 SHA512 74d05d5f3c3595a9a686e5d807910ed1d73ff29c4bcf875dc08ec2e05c7e0495b48208d81e075f8fe7d0ca9de6420acb506684ac5e673e33086e0f7276d1d940
diff --git a/dev-java/sparsebitset/sparsebitset-1.2.ebuild b/dev-java/sparsebitset/sparsebitset-1.2.ebuild
index 5e8549ea0ab3..1b2f2ecf1264 100644
--- a/dev-java/sparsebitset/sparsebitset-1.2.ebuild
+++ b/dev-java/sparsebitset/sparsebitset-1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/Spars
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index ef4b240b214a..cfbfe18281ac 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -23,6 +23,6 @@ EBUILD tomcat-servlet-api-7.0.108.ebuild 2987 BLAKE2B 58215b6b83dd299746d8a57bb9
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2990 BLAKE2B 08f62ce9a014e01926a2d2eaac5daf393e8df8f2dff737d1215b5304b9ab8bc92f794bd00a3bb6f2fd17b00b921b3445d86c44743a5e915a8e4fb33c762ac81f SHA512 c4db6d1df1fedf89adbbb90e8197dde37c5f656034e3629420096ad40af1e50644de527b0eab432e20463d811192ff889a06a72fe949084168bcbcc3e5ea5b79
 EBUILD tomcat-servlet-api-8.5.64.ebuild 3003 BLAKE2B b8bbaaed51e3d2d25497f6a5f4ba493cd249edef833ac72171d5f8e19c83c11ce00928ceff8ff1348842ea85c3196791103608fc3b7ceca184519a6eaa2e8364 SHA512 68ae1a904dc5c9cf2824db5fe7ef4ce1a07b41becbb69ea14f3717cc02b0f8d5ced6c860bac740c78a4ee80c5862811465850772d741841e4b4dd9d91e55edb5
 EBUILD tomcat-servlet-api-8.5.65.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
-EBUILD tomcat-servlet-api-9.0.44.ebuild 3176 BLAKE2B 2d46d2a1415c0f9630753640566fe9b48a7eb328313b74a485f3aff1ba6fb96639db988c4e46da715e0dbd7500140d6a882c23309a368c3104d6ee9574ac6e28 SHA512 065a69a32047c890e49c4f09ad620d024364b8bd39591f0c451a8ef0b08a1a19b4738e2e71ece9491ed69625b834a1c1424a5b2dceb089ce5d503849e06120dd
+EBUILD tomcat-servlet-api-9.0.44.ebuild 3175 BLAKE2B 996c4285297fa2560227d87381d06be9c7120cce6d802ee9ada2387e7589726be83c76d57c5a6cbfbcf42dd5670194ced0de72268ff237861ce900959eef9b40 SHA512 dca2fac51ed5a98f4004c9536a9623dab69e38f5b7e02edc98dd1365a98321caeb78ea03a9e68a0db517cdc559a253a394e812b2e03306944d9c73718d30d53b
 EBUILD tomcat-servlet-api-9.0.45.ebuild 3178 BLAKE2B b2d3652b91c3e8acc96b387ffb6375cf013694f4ffce215d2f1138b006befac9eff922bc25cf717d00bd0f65f6922256a6aa5f4eb643a37656b0026c1e829289 SHA512 5bf275389da0c1dccb3605cc66eeb416416dc8a65e34252d0f7f321c938b4ef02e9c2accb1eafc3fc349fb58d2b4c1418ff10f31146cf5b7086f4afb9daf6a32
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
index da566ddf7e37..12c59541c7f8 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-07 01:33:16 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-07 01:33:16 +0100
commit	c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (patch)
tree	3ee550255947da075650f1a551dcc278f9a1b7f8 /dev-java
parent	a978c074e4272bb901fbe4a10de0a7b2af574f17 (diff)