gentoo auto-resync : 03:12:2022 - 21:00:43

18 files changed, 12 insertions, 312 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 40da23f4e26f..e1b6cc5fd7ef 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/felix-main/Manifest b/dev-java/felix-main/Manifest
index bc2aed7b47a1..5083ff2fac9f 100644
--- a/dev-java/felix-main/Manifest
+++ b/dev-java/felix-main/Manifest
@@ -1,3 +1,3 @@
 DIST felix-main-7.0.5.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0
-EBUILD felix-main-7.0.5-r1.ebuild 2248 BLAKE2B 5aacb59647c0f799733e4e4aa6441091d11c4d3cc683688bb7cb989b3ee104256cc2a0f97a8fc1487a15f51c8273baaba5fca39690e035247ac0722bbcb71e5a SHA512 28ed5aca4a8d3252ffeb6f8c2b68ddd50f30b2082fd6bfa05f18dcb50de686cfd0724556b660d56930dd1dee233aa3a2989bcda4a12254eba25be7ea736535f6
+EBUILD felix-main-7.0.5-r1.ebuild 2252 BLAKE2B e4831a0bbe74081db3d5d1de98e235e229a446b5cd8bbbc29b1053c5d75c2cbad58df3af90e2bcf77b5dbb564e763a8838b27d69e1a1ebf0334dcc8b85b37770 SHA512 f816117f1ee1e8203a8c9e621d23afedb5c05d405f9d70d1352dfc5b9c6a020dc917ff5b1614ac56ee5d16effba0106d5f1d088d563df0477f0500ea7a98f217
 MISC metadata.xml 594 BLAKE2B 9ec3f78cd94f82740e506f44a6494d8e60894f09cd655b022886978c41bcf73a01628c9f1850a39a78bb96ed9dc57c04e7e1f6f5193b91bd8f23f1706899ef84 SHA512 1d8fab624036e9eda29d385fd042a0ca6b130dfa943c63c09e2a161ee039c695f215da1fe6135b59ece4a0fec06399dff2f80d0a12ab690805fd718d90cc05f2
diff --git a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
index 57db6f06bc22..60e9162ace4a 100644
--- a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
+++ b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/greenmail/Manifest b/dev-java/greenmail/Manifest
index d23ab8185fdb..ab393a798e9a 100644
--- a/dev-java/greenmail/Manifest
+++ b/dev-java/greenmail/Manifest
@@ -1,3 +1,3 @@
 DIST greenmail-2.0.0_alpha2.tar.gz 969798 BLAKE2B 0e1b00ccc96fac26d453cff5f49937bebc7b62e58ad33c9c287e7edb15de2884620ea52c94e00f5ddb9dc6e8853ed36101c4f7f294d48044d78a2a747146952e SHA512 925762f834d797e5136412520d45e9ce56c7b946f9cf1b7e90b674b12405a426bdceb068c7b459b1d4321d04ed68ff5dfd2d32ea6d5f17e848189596cc9acb17
-EBUILD greenmail-2.0.0_alpha2.ebuild 1838 BLAKE2B 12487b65dc736055eee42dfdb549513c3668fd69038748fc5bc32d05222c391349ead6dba8f404c5eb8b039d8b56cc9d0a458ccad3177c1103ecc5fc22b14c09 SHA512 7843e1484034e1f51ddb9cf1f1ecae173c2062a00629540ef212808a7b0b6af27c116c0e4d133a522f6bf47aeb20de5e6d6adc2e4232f937042761c12b054137
+EBUILD greenmail-2.0.0_alpha2.ebuild 1842 BLAKE2B 2761f18ba3a22f9d78017435846d7355bce6cd32fb2014c1d9352877d5388cdd37856ccdb47858190567e9b398fd7cac867697a5bc6b823ddd8efaf7f583f57f SHA512 fe84f73908719611898d69b4af54b1163a51d9c4de6cf6fb5b51e1fe3fc61741c4e2d9f154f80d42c11d2d7620967136b83a6e55ac93652dbc514ce8c296179a
 MISC metadata.xml 311 BLAKE2B 5ac66bbc1ab39c2c144199584900de8485abc400bd49471961ea2d104284c36e15572bbe97ad2c9b7647c3e07320c1a292516f996fb2381ef1403e4719a69e73 SHA512 dff768a4970226540c20d2abe00b744458e29795f575d0526224d614931f2b789cd01f4bcb11edd7f08ea1230e21caacfc77186e4ba0624db8059e50229a88fc
diff --git a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
index 7f4684b7fd89..564a6c9ca56d 100644
--- a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
+++ b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/greenmail-mail-test/greenmail/archive/release-${PV/_
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jakarta-mail/Manifest b/dev-java/jakarta-mail/Manifest
index a75450b0901c..5cd287f30245 100644
--- a/dev-java/jakarta-mail/Manifest
+++ b/dev-java/jakarta-mail/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-mail-2.0.1.tar.gz 1799232 BLAKE2B 91c8109dee5b1dd5d245df44b905435e59c4f7a888711edf19431bd3e7627d5ba4dbc34e3bd8458507c77c5fb6ed50843f45b2e8b01b7369b660055d8c99739d SHA512 42e9f82cda788b4cf73c06c8c2798a3f886fe714e4f8f4cb0356643b05acd756d46ff382333d2a9e4aaa4ed0dd5d01bc354f7e442c78be9f59cca25d4c23a3ec
-EBUILD jakarta-mail-2.0.1.ebuild 1988 BLAKE2B 80123c2234a004ae5a63a797eceffdd508f1a56cc322ed11831aca37e50a95ae179bce5beddb4de4f695238837357982cbdd65c7a64b6f27796020325eb74c72 SHA512 17d370f8b7c82af8603b03cc5b71a9a039f8163e61f2c9c8e54c2265661aed5dde5536f899c783287714f32562c67e2011f91a2c3b3e95760832b527dd356a83
+EBUILD jakarta-mail-2.0.1.ebuild 1992 BLAKE2B ff7a2e29a3be83a21d1955500f54419e45d024585c2a5e9be554ed442e9c1a2dc7f6cd296598c455af7c7f6d15a89dff6aeac2eeb8952940c304c85bd3b64b20 SHA512 23ad8254cf87528b927ed1d39edc81d27b450cc87dbf693d7dc1876d10564dd603ee4407a6d20ea0fae35ac1b74ce8c76af08bd4641580c34d765e2b73f3852f
 MISC metadata.xml 300 BLAKE2B 59a5cc3d098097693ee38e1552293270505f8d82025e096a6d1c331045451d5782ccc8819a2034a88a89f4490318becb96f10186766db32afad98c1546c956dc SHA512 2d1560717ededf180302c9348d112971e6d24c8745aae17f1ec59c3676ae41bb7fe396bbb57f5c88ef52bd0f7e161aefc22b9d2d5fd006ffc9873dbf42cb2df5
diff --git a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
index 3335992b15cd..2fcf73b3a66e 100644
--- a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
+++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest
index 3af0398607b9..e4ad281213da 100644
--- a/dev-java/jakarta-servlet-api/Manifest
+++ b/dev-java/jakarta-servlet-api/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9
 DIST jakarta-servlet-api-6.0.0-RELEASE.tar.gz 634690 BLAKE2B e48375f6a0b74950a2c50d73f2d50f7c79db96e22d5c845380bff670948cd1a1d1ea98eaf93e7fa02887e94010c8573382ba3f6fb52a8fca6fa98e5915c307f6 SHA512 65285bce3e8b5143eb33d548549ff5653c6c90f55e7a19e8fdb4a7799842d3430cfe0cebe54f7a7d253d9da4c2b6d4d7a08b35846636c11a2ca814b8311cecc7
 EBUILD jakarta-servlet-api-4.0.4.ebuild 935 BLAKE2B 5007e96b0617853577ea6159caa7e587e9316568f5ea620c8366d27c9dbe74b280b646d8b60c2ad9dd37b1ff37556d9c2a5c49f74d918d0d0ec58ad243e2f3ff SHA512 cab6ebbea0966a0be1f785efd65e2af6ff8b80a602101877f8551be26ea945f20208d820743a8be59fc83aff4c84e12d03516cf2dea79b2de9d8e207b0ddf03c
-EBUILD jakarta-servlet-api-6.0.0.ebuild 1275 BLAKE2B c19c344a97153cf4bc5790fd606d22e60d1469d281134159b06a1c138f60f59c5c41776235c6c8cbc921b44ffebd252604c9c8590df8563272a4f6c4ebbeef77 SHA512 663a93796e2cc15ac4e116abac681f93a7a9206bbd2b9251f299d8fcdebe44d2c717346c7a5cebc2998b2307f0817910161c6d24abc23b25eb6f32d2a13f3fa4
+EBUILD jakarta-servlet-api-6.0.0.ebuild 1279 BLAKE2B 2c550b35ce1ae34d29cae494b2499c3f09ba0cef413f81254bdf6a9f026dd12c91d1df3b0ff1f78814e15082c8a557ab62b2f5993a5cc586fe75caeafc1d2566 SHA512 fff2c7ebd8a3e7dd2ce8058ecec2271eae2c888ac09b7b4b1ea061ed9c789307a5d1c69925d52319975ca92d773da04c28d9953489485c0fac0a8a2426b09490
 MISC metadata.xml 332 BLAKE2B b9a06fe2a5573bde0da5b4f0d11a4cdf8c26738b67ac575014c01ed7fadfbc057a63fe2de907942a83d12afe8335933edbf671460b33939969bbb8d2657ffd81 SHA512 4c044f785c3a41116e24cc56b46b8e74327e4fbe29b11a25e1004e18d815023d073465658bb9467afbf80f8490e29815e1e52ce3d5ccde250ae48f0edbf0d380
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
index 18f4251527ea..7fbf152908ae 100644
--- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="6"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-11:*"
diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest
index 2e2473772604..dc8ed417d6c7 100644
--- a/dev-java/logback-classic/Manifest
+++ b/dev-java/logback-classic/Manifest
@@ -1,5 +1,3 @@
-DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
 DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c
-EBUILD logback-classic-1.2.11-r1.ebuild 3257 BLAKE2B d3b412b78a91e56ccc5b91746d6a604fa1450fa6edd04535b75e558e1d25681f4d774485c50ace1848c3cdfab66dd954fb826ccdcf367b2ebf6a87cc789e7ec4 SHA512 0c0f1066c28106101e806eb2564b00f93f7ab15228ec2eb8499e7306347908d63a38cbd76ef804174b29dfd16777c762fd5da5286cd26dd9c3b659918223b3f5
-EBUILD logback-classic-1.4.1.ebuild 4491 BLAKE2B 1e4fac469c556619ff47e216f9cbd18320f17ca5a2ec5fdf39e2cabe6d79ea0fb2e8da6971eb3b8b351fb7afe60a90fe34a3b3f5c35f94db0d33c1423608370e SHA512 8a3c4bdf8b6a15cd80ccad613c93398202fafe22f8db4ab782531c8a1aa70a4f7fc182817d19d8b9ebef70fab2bab701b7bac8664ffc3fa672a1eccb4e37ccc4
+EBUILD logback-classic-1.4.1.ebuild 4495 BLAKE2B 23c85bdf5ad91857ba524590134c7cd82cc85808f544048100f446ee459b1fd8378842642b6d993e8b42a568943904cfcd2b715f2bfffdd18928f8faac2f0942 SHA512 721e9a3d1ee371f9623ae97bd00ae52547bcd582d5aa45aa49fa5df6ecdd0c756a46af0942d8223cda599bd5b8910e1a24a8a8bddb3e0b000c273a31131f26cd
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild b/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild
deleted file mode 100644
index 10c52f8637b1..000000000000
--- a/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,96 +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/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-classic-1.2.11.ebuild
-
-EAPI=8
-
-# No tests, too many dependencies missing
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="ch.qos.logback:logback-classic:1.2.11"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="logback-classic module"
-HOMEPAGE="https://logback.qos.ch"
-SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
-
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# javax.mail:mail:1.4 -> !!!groupId-not-found!!!
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0
-# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
-
-CP_DEPEND="
-	dev-java/janino:0
-	dev-java/javax-mail:0
-	~dev-java/logback-core-${PV}:0
-	dev-java/reflections:0
-	dev-java/slf4j-api:1
-	java-virtuals/servlet-api:3.1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? ch.qos.cal10n.plugins:maven-cal10n-plugin:0.8.1 -> !!!groupId-not-found!!!
-# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# test? com.icegreen:greenmail:1.3 -> !!!groupId-not-found!!!
-# test? dom4j:dom4j:1.6.1 -> !!!groupId-not-found!!!
-# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4
-# test? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
-# test? org.apache.felix:org.apache.felix.main:2.0.2 -> !!!groupId-not-found!!!
-# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4
-# test? org.slf4j:integration:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:jul-to-slf4j:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:log4j-over-slf4j:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
-# test? org.slf4j:slf4j-ext:1.7.32 -> >=dev-java/slf4j-ext-1.7.36:0
-# test? org.subethamail:subethasmtp:2.1.0 -> !!!groupId-not-found!!!
-
-# Restricting to jdk:1.8
-# src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java:20: error: cannot find symbol
-# import sun.reflect.Reflection;
-#                   ^
-# https://jira.qos.ch/browse/LOGBACK-1343
-DEPEND="
-	virtual/jdk:1.8
-	${CP_DEPEND}"
-#	test? (
-#		dev-java/dom4j:1
-#		dev-java/assertj-core:2
-#		dev-java/log4j-12-api:2
-#		dev-java/logback-core:0
-#		dev-java/mockito:4
-#		dev-java/slf4j-api:0
-#		dev-java/slf4j-ext:0
-#	)
-# "
-
-RDEPEND="
-	virtual/jre:1.8
-	${CP_DEPEND}"
-
-DOCS=( ../README.md )
-
-S="${WORKDIR}/logback-v_${PV}/logback-classic"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="dom4j-1,logback-core,junit-4,log4j,assertj-core-2,mockito-4,slf4j-api,slf4j-ext"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/logback-classic/logback-classic-1.4.1.ebuild b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
index 5538d5f55cf6..3c1d932f9dc1 100644
--- a/dev-java/logback-classic/logback-classic-1.4.1.ebuild
+++ b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}/pom.xml
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index 5bad74e39807..857efef90ece 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,6 +1,3 @@
-AUX logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch 799 BLAKE2B 5ed73567f9ef6f6fb08c1f9d6fff43e71a22760a31bddcc454a75c62d26b50bad46510f6c748c019ab90e69e6e6007ee3de2507104f956b4c24b658716a6b6ed SHA512 5214fab891a28e02b6748a307e1741207c16dbf0f9fbfcef86f1303c2ab15714348a1f1750965ee928ed422ffa7261f0bc7340756805ba196fe86dce66039ae5
-DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
 DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c
-EBUILD logback-core-1.2.11-r1.ebuild 3482 BLAKE2B 40590d0ec60cf62a6a4c64e34c68c84077a0917d18aa944dcdb835b97a585d2fc6cc30e80bf8966fb2e046baa1d4172b02576e8d610edf58f1e75a0dbee7e9ae SHA512 8e6a348b53c6b2ae9230dd8958b68f57e8a3dc7f05903f75b0c407c6b700b2e437ac925ef515d35963b33f99d5c1f0ecf576a745cc65ff456a096277276b08f4
-EBUILD logback-core-1.4.1.ebuild 3013 BLAKE2B c05094f75ee198e2a4e19882a707b919d5a2e78448c859b45acb26a321fa95e11f8244879b45d383143c27beb1bc01b42b7397be5cd840b66354f9b9378915d6 SHA512 51be51fb44fd04061c1e73d2101674d31f6ba0de907c9362079f8793f7c0ad1b9027b4790eaa8b0d689176751244e5a17328913975dc42a3d42dd673247e8b3e
+EBUILD logback-core-1.4.1.ebuild 3017 BLAKE2B 789e32d9835ecfc57a299208a24e64d0a02c9af6e41b5ac59ce934eb0207a3eedaa9e9fe3ade07167b920143c52070aae5f14d99ca717de2c93af9d84583cea4 SHA512 244315ad5ebb4f1d854fe41212d875f628b0045a6ded5bd91d9657e2817e92310e67a66f74883f0831f717ba2513cd5280e4349dd033ddd3d2fa5366619b7209
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch b/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch
deleted file mode 100644
index 9423f26e9a1a..000000000000
--- a/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java
-+++ b/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java
-@@ -18,6 +18,7 @@
- import static org.junit.Assert.assertTrue;
- 
- import org.junit.Before;
-+import org.junit.Ignore;
- import org.junit.Test;
- 
- import ch.qos.logback.core.helpers.NOPAppender;
-@@ -281,10 +282,13 @@ public void verifyInterruptionFlagWhenStopping_NOT_INTERUPPTED() {
-     }
-     
-     
-+    // In JDK non started threads can be interrupted
-+    @Ignore
-     @Test
-     public void verifyInterruptionOfWorkerIsSwallowed() {
-         asyncAppenderBase.addAppender(delayingListAppender);
-         asyncAppenderBase.start();
-+        Thread.yield();
-         asyncAppenderBase.stop();
-         assertFalse(asyncAppenderBase.worker.isInterrupted());
-     }
diff --git a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
deleted file mode 100644
index db5f39ce5ef6..000000000000
--- a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,111 +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/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-core-1.2.11.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="ch.qos.logback:logback-core:1.2.11"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="logback-core module"
-HOMEPAGE="https://logback.qos.ch"
-SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
-
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# javax.mail:mail:1.4 -> !!!groupId-not-found!!!
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0
-# org.fusesource.jansi:jansi:1.9 -> >=dev-java/jansi-1.13:0
-
-CP_DEPEND="
-	dev-java/jakarta-servlet-api:4
-	dev-java/janino:0
-	dev-java/jansi:0
-	dev-java/javax-mail:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? joda-time:joda-time:2.9.2 -> >=dev-java/joda-time-2.10.10:0
-# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4
-# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-java/assertj-core:3
-		dev-java/joda-time:0
-		dev-java/mockito:4
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( ../README.md )
-
-S="${WORKDIR}/logback-v_${PV}/logback-core"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,assertj-core-3,mockito-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	default
-	sed \
-		-e 's:org.mockito.Matchers:org.mockito.ArgumentMatchers:' \
-		-i 'src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderIntegrationTest.java' || die
-
-	# Ignore test failing under Java 16
-	# See https://github.com/qos-ch/logback/commit/d6a8200cea6d960bf6832b9b95aed64e87474afb
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" -ge "17" ]] ; then
-		eapply "${FILESDIR}/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch"
-	fi
-}
-
-src_test() {
-	# 67,73 logback-core/pom.xml
-	# <excludes>
-	#   <exclude>**/All*Test.java</exclude>
-	#   <exclude>**/PackageTest.java</exclude>
-	#   <!-- ConsoleAppenderTest redirects System.out which is not well tolerated by Maven -->
-	#   <exclude>**/ConsoleAppenderTest.java</exclude>
-	#   <!--<exclude>**/TimeBasedRollingTest.java</exclude>-->
-	# </excludes>
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-name "*Test.java" \
-			! -wholename "**/All*Test.java" \
-			! -wholename "**/PackageTest.java" \
-			! -name "AbstractAppenderTest.java" \
-			! -name "AbstractPatternLayoutBaseTest.java" \
-			! -name "AbstractSocketAppenderIntegrationTest.java" \
-			)
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd
-
-	# accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" -ge "17" ]] ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-	fi
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/logback-core/logback-core-1.4.1.ebuild b/dev-java/logback-core/logback-core-1.4.1.ebuild
index 7a73216f0f41..ab06f67e0f2f 100644
--- a/dev-java/logback-core/logback-core-1.4.1.ebuild
+++ b/dev-java/logback-core/logback-core-1.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}/pom.xml
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 760d54107f63..f6ed26bd6d19 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/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-api-1.7.36-r1.ebuild 1447 BLAKE2B c98a974f8b80dd9c1f202c3ccfc4be9186fdc67f62ff5410e28f4752e208875682ec25a5d9f7b81c3dcf0456b7833df2f17477173f0acb02ccdf817c4d305a73 SHA512 31546f48158c501ae3acb3a6fdad166d0e585ba2dfb493cb16a50e1060e062ab863570d1f9faab7b6dcfb3ff83f0789a70b79be378b4706e65eb31bba1468dd2
 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-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild
deleted file mode 100644
index cf71aac2aaed..000000000000
--- a/dev-java/slf4j-api/slf4j-api-1.7.36-r1.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="1"
-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
-}