gentoo auto-resync : 02:12:2022 - 20:57:16

21 files changed, 16 insertions, 294 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ea0e31b941a4..c6f290577193 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jul-to-slf4j/Manifest b/dev-java/jul-to-slf4j/Manifest
index a3091c7e1cc5..1cc1774ffdfa 100644
--- a/dev-java/jul-to-slf4j/Manifest
+++ b/dev-java/jul-to-slf4j/Manifest
@@ -1,3 +1,3 @@
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
-EBUILD jul-to-slf4j-2.0.3.ebuild 1406 BLAKE2B f7f0a0ad18fd4a9416c0b4bb636bc53cc2cf236066823cf073c4fd63ed2ba6046187a9b8b9e6f03bccdaa3e0d5bb3e63a32693793daee79972606e84b0771d7c SHA512 c051ceba0f53f49286f9d2c1e022637d0c41695463eabd8051ac94d143f878e4073749266c98cfc7aadaf2df5c2c4f3b7c430b683f8c510afb188183e10d170d
+EBUILD jul-to-slf4j-2.0.3.ebuild 1410 BLAKE2B 7acf6b74c1f7a35152f1a9c3f3b7962ef2ec85926758021e933a1cf4a2446e50cf2b6df435716997cb4b326bad3a1f9a938efc43d96ac917cb31ffaea5f420d7 SHA512 329c532a3b2b2560b8d23221e0a757048029cb88b2cc12dae871a53be86b23c4e5cf57bd88aef1aca3f9724d8919144ccfb40df9caf0e27bb2b6b1f9fd0c9015
 MISC metadata.xml 421 BLAKE2B f091647af09be4aa28bb7deb4223b2e65ce5479c14036a72c9c8e28f4cc76280671574a6adf08df28d7bcbf65069610e99dcf4abd33d19b3e244de4c1d852b0f SHA512 e91d223b9290e0c5bcb5bca5a88896836cd5006df4815d3c7acef731cac3e00e1e102c21852598ded5d3c1b549f0ed5b27daadbdda8ddc5b7719fc91dca7740f
diff --git a/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild b/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild
index 7645e3ae5e6d..cf9d0c136c29 100644
--- a/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild
+++ b/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/log4j-over-slf4j/Manifest b/dev-java/log4j-over-slf4j/Manifest
index 3b29917b27a5..db1bd29b0979 100644
--- a/dev-java/log4j-over-slf4j/Manifest
+++ b/dev-java/log4j-over-slf4j/Manifest
@@ -1,3 +1,3 @@
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
-EBUILD log4j-over-slf4j-2.0.3.ebuild 1574 BLAKE2B 99be64be60a2d2c675dcd5e9955c2394049269d06baf7d9ade0cc44811d6d2fe37318e70eb1b0882ed51e74d94424834b835e0670ec18a968bc5041f945fe71f SHA512 a39fac6de51b409f248c4a2335500688a29129774c5feddded9b8ccfb00749e61cb92ef6d9d482390ec0d4712387001711cfbfee6e09cba3e0fedfe2bf1f59fa
+EBUILD log4j-over-slf4j-2.0.3.ebuild 1578 BLAKE2B 98b5420d0e04d1b6aea013f61a33b072e8b721b2238fd3e98d4ec48c04bad4c222f3d08ea33bbd52cc0708186953e5096c1f23163e46120c1ca33af4ab10a14a SHA512 8ca9f4f054856b8b62a896a73410d954b4370a964b2127c867417fbafb2b559535564ddf20a1b82a233099a4c7a496b9f33d6235e6c2cd20762e19756f087ea1
 MISC metadata.xml 421 BLAKE2B f091647af09be4aa28bb7deb4223b2e65ce5479c14036a72c9c8e28f4cc76280671574a6adf08df28d7bcbf65069610e99dcf4abd33d19b3e244de4c1d852b0f SHA512 e91d223b9290e0c5bcb5bca5a88896836cd5006df4815d3c7acef731cac3e00e1e102c21852598ded5d3c1b549f0ed5b27daadbdda8ddc5b7719fc91dca7740f
diff --git a/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild b/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild
index adcf47826a9d..d71e64f91321 100644
--- a/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild
+++ b/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/reload4j/Manifest b/dev-java/reload4j/Manifest
index b8dd2332d71a..592ee14199dd 100644
--- a/dev-java/reload4j/Manifest
+++ b/dev-java/reload4j/Manifest
@@ -1,3 +1,3 @@
 DIST reload4j-1.2.22.tar.gz 574985 BLAKE2B f3dc5c360665de8eacf49ab34e684becbe80882db3675045a2bd971f03c32352a958e0ca4d5b5c92d18835320409832dcc14fc49c6f67eef487dfb9ee2ff4dfe SHA512 542e935cf55c0008a2d49c20e8a30f072090999168f5bcc056e67e306e2ddf87bf864fbb1fe9c3e03f436e8dcc6a0f22135f82d9a33706282bd9f3caace0f1f5
-EBUILD reload4j-1.2.22.ebuild 3130 BLAKE2B ec947284aa83ac60409c0d9283349dcf5eab89e5fe2f19166505d545103db894bbb505f4e66a8d71aba62721bfaaeef82a390c869520642c1ef162ca5abec1fe SHA512 8e47b8e0741a8a40ea54125482e4612a8889692e278b06b687160d75327d467728466724a4d99bb3583f6b0ab9dff21a4e4d1e5a40d9a90853d95a312c298da6
+EBUILD reload4j-1.2.22.ebuild 3134 BLAKE2B adf0c74671b460b1f7235f9f79718abe725920bedd471ecec729e6a280b59c7642d7106385997882ce6e291bb54abe419f1b8e2b79e43f92644d13654eff1b9f SHA512 80cc5777d25c58ff40645c3dd2b079343dae10bdb1afc6e8860b5d416ff0f991fbd29ea0e3d840fc86339146b30849ed0853e3b5276434115da3e92376353830
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/reload4j/reload4j-1.2.22.ebuild b/dev-java/reload4j/reload4j-1.2.22.ebuild
index 18e1a14ad3f0..d4ca0f965bc3 100644
--- a/dev-java/reload4j/reload4j-1.2.22.ebuild
+++ b/dev-java/reload4j/reload4j-1.2.22.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/reload4j/archive/v_${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # There are unresolved test failures
 RESTRICT="test"
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 098b0c073923..760d54107f63 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,6 +1,5 @@
 DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
 EBUILD slf4j-api-1.7.36-r1.ebuild 1447 BLAKE2B c98a974f8b80dd9c1f202c3ccfc4be9186fdc67f62ff5410e28f4752e208875682ec25a5d9f7b81c3dcf0456b7833df2f17477173f0acb02ccdf817c4d305a73 SHA512 31546f48158c501ae3acb3a6fdad166d0e585ba2dfb493cb16a50e1060e062ab863570d1f9faab7b6dcfb3ff83f0789a70b79be378b4706e65eb31bba1468dd2
-EBUILD slf4j-api-1.7.36.ebuild 1447 BLAKE2B 2c0aba11678aa3a33b53580825da11dc3d45e27771fce1c57342d40047fd264d3b23b66ac3b31c681e4800a385c1c7d51500be269057f00f39c5652987f6cd8a SHA512 2255a6b81d7359000ecae352d6c03e4b6bc178c9b865d42ed74946fc483312e7738d7851d951f6b3b4d5099a10dc9f4cff4dab42e1151ac5d2d5ab90bb0c1ad3
-EBUILD slf4j-api-2.0.3.ebuild 1144 BLAKE2B 7aa6df6010d21d816e5b2550cbaad743aa441bb2ff84f21dd5da2678ae0e0909c5a11785304c0f5638d1c6ffe7fbd41c91952552129808f4f4dd7a091a83feb6 SHA512 c2ba9064ac2e1b1ad57ee7ddf3ae62c0e94c4dd9045562e4ea4b3f7fceccdc7b298196e5187775daf9533b583f864b53acc2be7d1966a2ba0bcad9001a8d137f
+EBUILD slf4j-api-2.0.3.ebuild 1143 BLAKE2B 9efb53125e882873ecc2b8dd6c02082ed43705b47ad436616416ae205ca93ed278e87de8c67aa8d922789cf2c2158859e02103a6a588d939d7a8aa37bd196402 SHA512 fa52b1b7337b7b8bb8afeb65a80dd6db3c78f9e565f4d1b455b3de5feffa26c9317ba4c5bca1f34c0254cbb22aac3a2caf974f1c1f6fb7e8b50cff41a4c553f1
 MISC metadata.xml 369 BLAKE2B 9192191ce858eb2aae3d3600cf8214bcff21f386895b1a554c688d2e0e5d2632daec9e853afee31383819df09915f29bd6a5458aa888672c77a2c683258d1b94 SHA512 80db3e0ebb417b64355f1d8c72de25dceda46fe80d5614e255b6e59c0d5751207e9ade961dbe1f065e3cf162ca402e67d2b8ce597e0a4253a7eedfc27d35ae00
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
deleted file mode 100644
index 06699464f97d..000000000000
--- a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
+++ /dev/null
@@ -1,62 +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/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.36.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-api:1.7.36"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The slf4j API"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-BDEPEND="app-arch/zip"
-
-DOCS=( LICENSE.txt ../README.md )
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-JAVA_TEST_EXCLUDES=(
-	# java.lang.InstantiationException - not run by upstream anyway
-	"org.slf4j.helpers.MultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# remove org/slf4j/impl/ from the jar file
-	zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/slf4j-api/slf4j-api-2.0.3.ebuild b/dev-java/slf4j-api/slf4j-api-2.0.3.ebuild
index c3c40616757b..db91290c8a95 100644
--- a/dev-java/slf4j-api/slf4j-api-2.0.3.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/slf4j-ext/Manifest b/dev-java/slf4j-ext/Manifest
index 29ef394acbe4..b45025c425ad 100644
--- a/dev-java/slf4j-ext/Manifest
+++ b/dev-java/slf4j-ext/Manifest
@@ -1,5 +1,3 @@
-DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
-EBUILD slf4j-ext-1.7.36.ebuild 1885 BLAKE2B 2c2a73ab02c8d1aae8cd883b68020a6ce156dd8ee39bf456fed56131a3bfca476334fb1641e605b8d7c9b6be70103a8bf0e61ad8fc281d379afa94c0882c7066 SHA512 12cd4f52ca331c0c09b25c4ad1e4f6bf0f615bf04b8b6e49253e2307a361c3251e6acb2f0f49175d8c23d81a50db3eb81f8e901de83cf59cc50101c0e9693f83
-EBUILD slf4j-ext-2.0.3.ebuild 1609 BLAKE2B 051c66eee41101aa10c68fcf4ac750d7992f652acb7593c3e0f53065da787886394d5a4d2905dfe4ec562cebe8627baad04341b885caaf68250f1779403c2a15 SHA512 74a020f3f8b3762da655322dd108a6e81b0aef1a751b97a8278ca08a3c4dd3db2de077a558d006808d0e608f13fc91f412dada8eb3203b4a8e3980e264b715e9
+EBUILD slf4j-ext-2.0.3.ebuild 1613 BLAKE2B 86236e1bbd06c83141c974b60b44d3880d68312072ed6106a050a6a6e9c8fc2a0ea4f335ef42c56f8bf839445b900fad6172b11b3b09c5c5dab1ea833b835a30 SHA512 e38731eb03bd7031167df28ac9a60f949ff0ea8ae7ae6a57cb90263ba61272730eb2b28e838e345efd542f2936a63dff2a106dc80261a991f60dea8f870d8568
 MISC metadata.xml 369 BLAKE2B 9192191ce858eb2aae3d3600cf8214bcff21f386895b1a554c688d2e0e5d2632daec9e853afee31383819df09915f29bd6a5458aa888672c77a2c683258d1b94 SHA512 80db3e0ebb417b64355f1d8c72de25dceda46fe80d5614e255b6e59c0d5751207e9ade961dbe1f065e3cf162ca402e67d2b8ce597e0a4253a7eedfc27d35ae00
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild
deleted file mode 100644
index 9f498c036e19..000000000000
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild
+++ /dev/null
@@ -1,74 +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/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-ext-1.7.36.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.slf4j:slf4j-ext:1.7.36"
-# 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/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: 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.36 -> >=dev-java/slf4j-api-1.7.36:0
-
-CP_DEPEND="
-	dev-java/cal10n:0
-	dev-java/commons-lang:2.1
-	dev-java/javassist:3
-	~dev-java/slf4j-api-${PV}:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
-# test? org.slf4j:slf4j-reload4j:1.7.36 -> !!!artifactId-not-found!!!
-
-# slf4j-reload4j has further dependencies which are not available in ::gentoo.
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( ../LICENSE.txt ../README.md )
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!artifactId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-# JAVA_TEST_RESOURCE_DIRS=(
-# 	"src/test/resources"
-# )
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild b/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild
index dbc7e9961412..103d621e2584 100644
--- a/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index 01b912e575de..7be879557794 100644
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/Manifest
@@ -1,5 +1,3 @@
-DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
-EBUILD slf4j-nop-1.7.36.ebuild 1286 BLAKE2B 6346ef5189911c399c21b1c863312cad47a9dfa86f16e23ca88ac8caa080ab2c35e5d6e17a7feeb33ff8f08cd13672baa17a9158d3e412dd53f68935c6596cf9 SHA512 bb4c6217030d88f56151f254b89ca86fb1ee64f3c4935c86b8386306a68c4d251976997a76f674815f07f0af6bc5aa7a293a19d722ac2463345048ed1f7e2cd4
-EBUILD slf4j-nop-2.0.3.ebuild 1150 BLAKE2B df0b612eec0e1235f97eef90478b4e7a131ad84b5eadb164ca7b3e32048fe63addaa7fc5a3691998a80cb7528dbf7fb7313bd4894e0f9be07ee0e1bce532bcac SHA512 df2cdea519990ba7b12bc122b41329a229c287353b46a7505c0a54b48dd51c8704d8c06c5f9d8d67e87b117093da7e78c05b61ebcaf7ba1c1bb38a586675d0d3
+EBUILD slf4j-nop-2.0.3.ebuild 1149 BLAKE2B 506810ab25f4bc30a8548788b24484ef5f762522a963c01801c863b591a772d0066a53498d5b8ab7b0da34a00821823cd08e225d5b856527a28f58cabd4f1771 SHA512 88be145b9d602b3b45702345dbb17699f790f4f37efcf40a1fd6fa2e668771272255c5ff73695f26bc29c198764029eee3f5798059dcda996b00307a41b3584d
 MISC metadata.xml 369 BLAKE2B 9192191ce858eb2aae3d3600cf8214bcff21f386895b1a554c688d2e0e5d2632daec9e853afee31383819df09915f29bd6a5458aa888672c77a2c683258d1b94 SHA512 80db3e0ebb417b64355f1d8c72de25dceda46fe80d5614e255b6e59c0d5751207e9ade961dbe1f065e3cf162ca402e67d2b8ce597e0a4253a7eedfc27d35ae00
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
deleted file mode 100644
index 967f7b6557b8..000000000000
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
+++ /dev/null
@@ -1,58 +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/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-nop-1.7.36.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-nop:1.7.36"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J NOP Binding"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
-
-CP_DEPEND="
-	~dev-java/slf4j-api-${PV}:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( LICENSE.txt ../README.md )
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild b/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild
index dc1dbd5e3cf4..26720b1c7adf 100644
--- a/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-reload4j/Manifest b/dev-java/slf4j-reload4j/Manifest
index 0e93bcfcedfa..959950b78043 100644
--- a/dev-java/slf4j-reload4j/Manifest
+++ b/dev-java/slf4j-reload4j/Manifest
@@ -1,3 +1,3 @@
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
-EBUILD slf4j-reload4j-2.0.3.ebuild 2346 BLAKE2B b501de00b19ab0266dd59340132c81f40806d05980693ec96a1c5b9f5887fdaddf010836321d24096ae5429b76add63722826f4290685a35de085508823f6c11 SHA512 d0a8453bf6a407305c79de9fd8d8ab5b2535e85442d7e11e7a94d5d49ca0cc352d3e23a8c8444d497c6121d18b44323db600184c3e8564c53a7e09549834eb34
+EBUILD slf4j-reload4j-2.0.3.ebuild 2350 BLAKE2B 8221e483945cfd3c122a1e37b691e3d82796f32c235f875a0972b6a71b3f19edfcfd5560b3a5cca1b79ec35de405e6cdddfe77f61fc996bb197c7608e2a56a5c SHA512 a1443efd704a0e05efae4d5132bf1fe8878adef078732625fcc9a1667c74ca7df20562a4ffff2256f64450eb2c0eb16d30a53304299f09da3b2118db96cb44cb
 MISC metadata.xml 369 BLAKE2B 9192191ce858eb2aae3d3600cf8214bcff21f386895b1a554c688d2e0e5d2632daec9e853afee31383819df09915f29bd6a5458aa888672c77a2c683258d1b94 SHA512 80db3e0ebb417b64355f1d8c72de25dceda46fe80d5614e255b6e59c0d5751207e9ade961dbe1f065e3cf162ca402e67d2b8ce597e0a4253a7eedfc27d35ae00
diff --git a/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild b/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild
index e1d1af7da79c..088248c1ea08 100644
--- a/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild
+++ b/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
index cdb3e418f2ea..18f237795ac7 100644
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@@ -1,5 +1,3 @@
-DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
-EBUILD slf4j-simple-1.7.36.ebuild 1956 BLAKE2B de4bebdde308395ad74beeea4f015ea695f059822aac4eaf193c1d8fb47c45f35684734dff86d82d735c5475f12c0ffccfe3befee5e25d452be4c492dd726bd8 SHA512 39e26c863baa0ff2bd103f1cee42d2211abb8968539bfaf6a486d21b35a166fec083b7ce3cef6e7f36f3d666f79185f7910c929edea2c989c5625ab5541d53e9
-EBUILD slf4j-simple-2.0.3.ebuild 2089 BLAKE2B f1491dc2f5ca27e1bc3438bc2e1095035d1250cbe6a375d62016172a0f1c9fb013dc44ca78157a8937af07ab6346f008e9f2768060c32e598846aae3964f7e5c SHA512 215172a25aab3d71824de5234dc289dee8f5deb1f8346b958c9b9f9ba1980d63cc21065b1af839d98908ee82a11d2d84b07db181b58de7c47067e315eee87f12
+EBUILD slf4j-simple-2.0.3.ebuild 2088 BLAKE2B 1b36180cbfa495d895287b8c9abbec850dcdf51e4038a86202e22909f71eef9392791ffa0d8e41807009c6480dfe748e2097c8d30794a84dfaad1961b312b575 SHA512 056d2b29fb225933423359725db1131efe0aa3798e6f6881aa455f4ec7c88c1f599f381805a954bb7647d721fbc0b406c072d9bfd8bac93661bb0c0fd6909ed3
 MISC metadata.xml 369 BLAKE2B 9192191ce858eb2aae3d3600cf8214bcff21f386895b1a554c688d2e0e5d2632daec9e853afee31383819df09915f29bd6a5458aa888672c77a2c683258d1b94 SHA512 80db3e0ebb417b64355f1d8c72de25dceda46fe80d5614e255b6e59c0d5751207e9ade961dbe1f065e3cf162ca402e67d2b8ce597e0a4253a7eedfc27d35ae00
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
deleted file mode 100644
index 7be81d79f166..000000000000
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
+++ /dev/null
@@ -1,77 +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/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-simple-1.7.36.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-simple:1.7.36"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J Simple binding"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
-
-CP_DEPEND="
-	~dev-java/slf4j-api-${PV}:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
-# test? org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		~dev-java/slf4j-api-${PV}:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( LICENSE.txt ../README.md )
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# java.lang.InstantiationException
-	"org.slf4j.helpers.MultithreadedInitializationTest"
-
-	# java.lang.AssertionError: 1284 < 1263+16
-	"org.slf4j.helpers.SimpleLoggerMultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-	cp {../slf4j-api/,}src/test/java/org/slf4j/helpers/MultithreadedInitializationTest.java || die
-	cp {../slf4j-api/,}src/test/java/org/slf4j/LoggerAccessingThread.java  || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild b/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild
index 27a4d59a5ec5..09826fff2c44 100644
--- a/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml