Adding metadata

34 files changed, 493 insertions, 176 deletions

diff --git a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild b/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
index 5185ad646ee1..0ec922b091fb 100644
--- a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
+++ b/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/$
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: biz.aQute.bnd.annotation-${PV}.pom
diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
index 1c46d8b11186..ca054b493d33 100644
--- a/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 EL_API_SLOT="5.0"
 
diff --git a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
index 4be5fb2c26c7..6b0b692be230 100644
--- a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm arm64 ppc64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild b/dev-java/easymock/easymock-2.5.2.ebuild
index b1a4c88ddd5d..db85a81b0e5a 100644
--- a/dev-java/easymock/easymock-2.5.2.ebuild
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm arm64 ppc64"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
index cba95f677738..6e6fa63d3b52 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm arm64 ppc64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/felix-main/Manifest b/dev-java/felix-main/Manifest
new file mode 100644
index 000000000000..91eadc1ce506
--- /dev/null
+++ b/dev-java/felix-main/Manifest
@@ -0,0 +1 @@
+DIST felix-main-7.0.5.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0
diff --git a/dev-java/felix-main/felix-main-7.0.5.ebuild b/dev-java/felix-main/felix-main-7.0.5.ebuild
new file mode 100644
index 000000000000..ce90f0bb76dc
--- /dev/null
+++ b/dev-java/felix-main/felix-main-7.0.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.main-7.0.5-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-main-7.0.5.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.felix:org.apache.felix.main:7.0.5"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open source OSGi framework by Apache Software Foundation"
+HOMEPAGE="https://felix.apache.org/documentation/index.html"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Common dependencies
+# POM: pom.xml
+# org.apache.felix:org.apache.felix.framework:7.0.5 -> >=dev-java/felix-framework-7.0.5:0
+
+CP_DEPEND="~dev-java/felix-framework-${PV}:0"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+DOCS=( DEPENDENCIES NOTICE )
+
+S="${WORKDIR}/org.apache.felix.main-${PV}"
+
+JAVA_MAIN_CLASS="org.apache.felix.main.Main"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+	# 58,91 pom.xml
+	cat > src/main/java/module-info.java <<-EOF || die
+		$( sed -n '/<moduleInfoSource>/,/<\/moduleInfoSource/p' pom.xml \
+			| grep -v moduleInfoSource )
+	EOF
+
+	# according to pom.xml, line 91
+	local add_opens="$( sed -n '/<Add-opens>/,/<\/Add-opens/p' pom.xml \
+		| grep -v Add-opens | tr -s '[:space:]')" || die
+	mkdir src/main/resources/META-INF || die
+	echo  "Add-opens:${add_opens}" >> src/main/resources/META-INF/MANIFEST.MF \
+		|| die "creating MANIFEST.MF failed"
+
+	# no idea what to do with felix.log.level=${log.level} here, but ...
+	sed -e 's/{dollar}//' -i src/main/resources/config.properties || die
+
+	# bundling some classes from felix-framework according to 78,94 pom.xml
+	# if we don't bundle compilation of module-info would fail
+	cd src/main/resources || die
+	jar xvf "$(java-pkg_getjar --build-only felix-framework felix-framework.jar)" \
+		default.properties org/ || die "felix-framework.jar does not exist"
+}
+
+src_install() {
+	dodoc -r doc
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/felix-main/metadata.xml b/dev-java/felix-main/metadata.xml
new file mode 100644
index 000000000000..f53b6566b80f
--- /dev/null
+++ b/dev-java/felix-main/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>java@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+		Apache Felix is a community effort to implement the OSGi Framework and Service platform and other interesting OSGi-related technologies.
+	</longdescription>
+ <upstream>
+  <bugs-to>https://issues.apache.org/jira/browse/FELIX</bugs-to>
+  <doc>https://felix.apache.org/documentation/</doc>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
index ef19a29e18ef..67b44b029672 100644
--- a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
+++ b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm arm64 ppc64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/felix-utils/felix-utils-1.11.8.ebuild b/dev-java/felix-utils/felix-utils-1.11.8.ebuild
index 51201309615f..a71d531d58b9 100644
--- a/dev-java/felix-utils/felix-utils-1.11.8.ebuild
+++ b/dev-java/felix-utils/felix-utils-1.11.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.felix.utils-${PV}-source-release.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm arm64 ppc64"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/greenmail/Manifest b/dev-java/greenmail/Manifest
new file mode 100644
index 000000000000..5def750177c9
--- /dev/null
+++ b/dev-java/greenmail/Manifest
@@ -0,0 +1 @@
+DIST greenmail-2.0.0_alpha2.tar.gz 969798 BLAKE2B 0e1b00ccc96fac26d453cff5f49937bebc7b62e58ad33c9c287e7edb15de2884620ea52c94e00f5ddb9dc6e8853ed36101c4f7f294d48044d78a2a747146952e SHA512 925762f834d797e5136412520d45e9ce56c7b946f9cf1b7e90b674b12405a426bdceb068c7b459b1d4321d04ed68ff5dfd2d32ea6d5f17e848189596cc9acb17
diff --git a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
new file mode 100644
index 000000000000..8f25de201a2e
--- /dev/null
+++ b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
@@ -0,0 +1,57 @@
+# 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/greenmail-mail-test/greenmail/archive/release-2.0.0-alpha-2.tar.gz --slot 2 --keywords "~amd64" --ebuild greenmail-2.0.0_alpha2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.icegreen:greenmail:2.0.0-alpha-2"
+# No tests, dependencies are not packaged
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="GreenMail - Email Test Servers"
+HOMEPAGE="https://greenmail-mail-test.github.io/greenmail/"
+SRC_URI="https://github.com/greenmail-mail-test/greenmail/archive/release-${PV/_alpha/-alpha-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Common dependencies
+# POM: pom.xml
+# com.sun.mail:jakarta.mail:2.0.1 -> >=dev-java/jakarta-mail-2.0.1:0
+# jakarta.activation:jakarta.activation-api:2.0.1 -> >=dev-java/jakarta-activation-api-2.1.0:2
+# junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.36:0
+
+CP_DEPEND="
+	dev-java/jakarta-activation-api:2
+	dev-java/jakarta-mail:0
+	dev-java/junit:4
+	dev-java/slf4j-api:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? org.assertj:assertj-core:3.19.0 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.hamcrest:hamcrest-core:2.2 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.hamcrest:hamcrest-library:2.2 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.slf4j:slf4j-log4j12:1.7.32 -> !!!artifactId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( ../README.md )
+
+S="${WORKDIR}/greenmail-release-${PV/_alpha/-alpha-}/greenmail-core"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/greenmail/metadata.xml b/dev-java/greenmail/metadata.xml
new file mode 100644
index 000000000000..a63267abaf71
--- /dev/null
+++ b/dev-java/greenmail/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>java@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/injection-api/injection-api-2.0.1.ebuild b/dev-java/injection-api/injection-api-2.0.1.ebuild
index 39bae5bb3a52..149141f12301 100644
--- a/dev-java/injection-api/injection-api-2.0.1.ebuild
+++ b/dev-java/injection-api/injection-api-2.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
index cce29251c314..9147cace3d1f 100644
--- a/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
+++ b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://projects.eclipse.org/projects/ee4j.el"
 SRC_URI="https://github.com/jakartaee/expression-language/archive/${PV}-RELEASE-api.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 SLOT="5.0"
 
 DEPEND=">=virtual/jdk-11:*"
diff --git a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
index 1cbcafa9f8c4..894a7f0f3b5f 100644
--- a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
+++ b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jakartaee/interceptors/archive/${PV}-RELEASE.tar.gz
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	dev-java/jakarta-annotations-api:0
diff --git a/dev-java/jakarta-mail/Manifest b/dev-java/jakarta-mail/Manifest
new file mode 100644
index 000000000000..720158c77d99
--- /dev/null
+++ b/dev-java/jakarta-mail/Manifest
@@ -0,0 +1 @@
+DIST jakarta-mail-2.0.1.tar.gz 1799232 BLAKE2B 91c8109dee5b1dd5d245df44b905435e59c4f7a888711edf19431bd3e7627d5ba4dbc34e3bd8458507c77c5fb6ed50843f45b2e8b01b7369b660055d8c99739d SHA512 42e9f82cda788b4cf73c06c8c2798a3f886fe714e4f8f4cb0356643b05acd756d46ff382333d2a9e4aaa4ed0dd5d01bc354f7e442c78be9f59cca25d4c23a3ec
diff --git a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
new file mode 100644
index 000000000000..f30f380214ae
--- /dev/null
+++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
@@ -0,0 +1,75 @@
+# 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/jakartaee/mail-api/archive/2.0.1.tar.gz --slot 0 --keywords "~amd64" --ebuild jakarta-mail-2.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.mail:jakarta.mail:2.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of the Jakarta Mail API"
+HOMEPAGE="https://github.com/jakartaee/mail-api"
+SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Common dependencies
+# POM: pom.xml
+# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
+
+CP_DEPEND="dev-java/jakarta-activation:2"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/mail-api-${PV}/mail"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_EXTRA_ARGS=( -ea )
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default
+	mv src/main/{resources,java}/jakarta/mail/Version.java || die
+}
+
+src_test() {
+	pushd src/test/java || die
+		# Selection according to 137,138 pom.xml
+		# This one does not run because of
+		# "java.io.IOException: Permission denied"
+		# excluding it costs 141 tests.
+		# 1) com.sun.mail.util.logging.MailHandlerTest
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -wholename "**/*TestSuite.java" \
+			-o -wholename "**/*Test.java" \) \
+			! -name "MailHandlerTest.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jakarta-mail/metadata.xml b/dev-java/jakarta-mail/metadata.xml
new file mode 100644
index 000000000000..a63267abaf71
--- /dev/null
+++ b/dev-java/jakarta-mail/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>java@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild b/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
index ca05dd1b8f3c..3390c60bee70 100644
--- a/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
+++ b/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jakartaee/rest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: ${PN}/pom.xml
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 98f8bdf7eb84..b9610a0ad9ec 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"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 # Common dependencies
 # POM: pom.xml
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 55dbe6b13024..825b287bee30 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"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest
index fd3f6cd22f0b..a23eb48ef032 100644
--- a/dev-java/logback-classic/Manifest
+++ b/dev-java/logback-classic/Manifest
@@ -1 +1,2 @@
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
+DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c
diff --git a/dev-java/logback-classic/logback-classic-1.4.1.ebuild b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
new file mode 100644
index 000000000000..f7e6e144bddb
--- /dev/null
+++ b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom logback-classic/pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-classic-1.4.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="ch.qos.logback:logback-classic:1.4.1"
+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"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# ch.qos.logback:logback-core:1.4.1 -> >=dev-java/logback-core-1.4.1:0
+# jakarta.mail:jakarta.mail-api:2.0.1 -> >=dev-java/jakarta-mail-api-2.1.0:0
+# org.codehaus.janino:janino:3.1.7 -> >=dev-java/janino-3.1.7:0
+# org.slf4j:slf4j-api:2.0.1 -> >=dev-java/slf4j-api-2.0.3:0
+
+CP_DEPEND="
+	~dev-java/janino-3.1.7:0
+	dev-java/jakarta-mail-api:0
+	~dev-java/logback-core-${PV}:0
+	>=dev-java/slf4j-api-2.0.0:0
+"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# jakarta.servlet:jakarta.servlet-api:5.0.0 -> >=dev-java/jakarta-servlet-api-6.0.0:6
+# POM: ${PN}/pom.xml
+# test? ch.qos.logback:logback-core:1.4.1 -> >=dev-java/logback-core-1.4.1:0
+# test? ch.qos.reload4j:reload4j:1.2.18.4 -> >=dev-java/reload4j-1.2.22:0
+# test? com.icegreen:greenmail:2.0.0-alpha-1 -> >=dev-java/greenmail-2.0.0_alpha2:2
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.felix:org.apache.felix.main:5.6.10 -> >=dev-java/felix-main-7.0.5:0
+# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
+# test? org.dom4j:dom4j:2.0.3 -> >=dev-java/dom4j-2.1.3:1
+# test? org.mockito:mockito-core:4.3.0 -> >=dev-java/mockito-4.8.0:4
+# test? org.slf4j:jul-to-slf4j:2.0.1 -> >=dev-java/jul-to-slf4j-2.0.3:0
+# test? org.slf4j:log4j-over-slf4j:2.0.1 -> >=dev-java/log4j-over-slf4j-2.0.3:0
+# test? org.slf4j:slf4j-api:2.0.1 -> >=dev-java/slf4j-api-2.0.3:0
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+	dev-java/jakarta-servlet-api:6
+	test? (
+		dev-java/assertj-core:3
+		dev-java/dom4j:1
+		dev-java/felix-main:0
+		dev-java/greenmail:2
+		dev-java/jul-to-slf4j:0
+		dev-java/log4j-over-slf4j:0
+		dev-java/logback-core:0
+		dev-java/mockito:4
+		dev-java/osgi-core:0
+		dev-java/reload4j:0
+	)
+"
+
+# Runtime dependencies
+# POM: ${PN}/pom.xml
+# com.sun.mail:jakarta.mail:2.0.1 -> >=dev-java/jakarta-mail-2.0.1:0
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+	dev-java/jakarta-mail:0
+"
+
+S="${WORKDIR}/logback-v_${PV}/logback-classic"
+
+JAVA_CLASSPATH_EXTRA="jakarta-servlet-api-6"
+JAVA_GENTOO_CLASSPATH+="jakarta-mail"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	assertj-core-3
+	felix-main
+	greenmail-2
+	jul-to-slf4j
+	junit-4
+	log4j-over-slf4j
+	mockito-4
+	reload4j
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+JAVA_TEST_EXCLUDES=(
+	# Invalid test classes, "No runnable methods"
+	ch.qos.logback.core.testUtil.EnvUtilForTests
+	ch.qos.logback.core.rolling.testUtil.ScaffoldingForRollingTests
+	ch.qos.logback.classic.util.TestHelper
+
+	# Test failures:
+	ch.qos.logback.classic.net.SMTPAppender_GreenTest # 14 tests
+
+	# 1) versionTest(ch.qos.logback.classic.util.EnvUtilTest)
+	# java.lang.AssertionError
+	# 	at org.junit.Assert.fail(Assert.java:87)
+	# 	at org.junit.Assert.assertTrue(Assert.java:42)
+	# 	at org.junit.Assert.assertNotNull(Assert.java:713)
+	# 	at org.junit.Assert.assertNotNull(Assert.java:723)
+	# 	at ch.qos.logback.classic.util.EnvUtilTest.versionTest(EnvUtilTest.java:17)
+	ch.qos.logback.classic.util.EnvUtilTest
+
+	# 2) testSmoke(org.slf4j.test_osgi.BundleTest)
+	# junit.framework.AssertionFailedError
+	# 	at junit.framework.Assert.fail(Assert.java:55)
+	# 	at junit.framework.Assert.assertTrue(Assert.java:22)
+	# 	at junit.framework.Assert.assertTrue(Assert.java:31)
+	# 	at junit.framework.TestCase.assertTrue(TestCase.java:200)
+	# 	at org.slf4j.test_osgi.BundleTest.testSmoke(BundleTest.java:41)
+	org.slf4j.test_osgi.BundleTest
+)
+
+src_test() {
+	# Tests need dom4j:1 on classpath but without dependencies:
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only dom4j-1)"
+
+	# package ch.qos.logback.core.contention does not exist
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":../logback-core/src/test/java/"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index fd3f6cd22f0b..a23eb48ef032 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1 +1,2 @@
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
+DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c
diff --git a/dev-java/logback-core/logback-core-1.4.1.ebuild b/dev-java/logback-core/logback-core-1.4.1.ebuild
new file mode 100644
index 000000000000..9f0319afadce
--- /dev/null
+++ b/dev-java/logback-core/logback-core-1.4.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom logback-core/pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-core-1.4.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="ch.qos.logback:logback-core:1.4.1"
+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"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# com.sun.mail:jakarta.mail:2.0.1 -> >=dev-java/jakarta-mail-2.0.1:0
+# jakarta.mail:jakarta.mail-api:2.0.1 -> >=dev-java/jakarta-mail-api-2.1.0:0
+# jakarta.servlet:jakarta.servlet-api:5.0.0 -> >=dev-java/jakarta-servlet-api-6.0.0:6
+# org.codehaus.janino:janino:3.1.7 -> >=dev-java/janino-3.1.7:0
+# org.fusesource.jansi:jansi:1.18 -> >=dev-java/jansi-2.4.0:2
+
+CP_DEPEND="
+	dev-java/jakarta-mail:0
+	dev-java/jakarta-mail-api:0
+	dev-java/jakarta-servlet-api:6
+	~dev-java/janino-3.1.7:0
+	dev-java/jansi:2
+"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# test? junit:junit:4.13.1 -> >=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:4.3.0 -> >=dev-java/mockito-4.7.0:4
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+	test? (
+		dev-java/assertj-core:3
+		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="junit-4,assertj-core-3,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	# 83,88 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>
+	# </excludes>
+	rm src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java || die
+	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" \
+			)
+		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/osgi-cmpn/osgi-cmpn-8.0.0.ebuild b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild
index f3252d2f738e..a82fc2274850 100644
--- a/dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild
+++ b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P
 
 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="8"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/cdi-api:0
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 86f5dda32428..3d5ef69736a1 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,3 +1,2 @@
 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1
-DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
 DIST protobuf-3.21.9.tar.gz 5112917 BLAKE2B 1788652e89ccb77feeaf2a3f4ce8e8554b29c1bccf3f58d79c66f3e5f080659a9b7eb4f2b4a07ce640549749f376deaf725d20e19674348b5bce9168aad5d095 SHA512 d54843a4ed66edf6cab7262849216b909313d70e9758aa7f00d02902c576396f0a77bb224fe2ce408da37aefaf7da9f568dea7bda4e397fc1e3666c8aaf9cb0f
diff --git a/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
deleted file mode 100644
index 594aff5cf66f..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/30"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
index c393a3769bea..e5030982cadf 100644
--- a/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/woodstox-core/Manifest b/dev-java/woodstox-core/Manifest
index df08ed0f3b78..4bf6f9a20850 100644
--- a/dev-java/woodstox-core/Manifest
+++ b/dev-java/woodstox-core/Manifest
@@ -1,2 +1 @@
-DIST woodstox-core-6.2.8.tar.gz 5250255 BLAKE2B 69e45da9c7e09652ffc45b366359ae12954ad0450157d8639833d41600958d10ff1203502c926f0f23cd3e3d03dbc83378a9614e5eb19367fb60fad1232f4dd8 SHA512 c5af386891ab63fb2efc8510353e35c20fa157048631c809ed3d7e070b377ef5c21ffb1b7a0f9e597113db714ebc778951ac8a8e049c3d8291a89c3a0e7a044e
 DIST woodstox-core-6.3.1.tar.gz 6029586 BLAKE2B 04fcd7fd958cd3efa8a1e864786b88a1f8c3f0d6d6faecb5eb91a7cf755da4cef2664c0583702bf21dde741632638242131f0d46acb8f1b91bd00bf4c9a7af5b SHA512 fee1d8dc33aa2e3617b451fab285dbc91154738765eb9d93e8c1809a70f09ccb2f1cf2b70f57f836323d0a80bd5caeae0f5a4c5e2cee609c2a9d30106bf42acb
diff --git a/dev-java/woodstox-core/woodstox-core-6.2.8-r1.ebuild b/dev-java/woodstox-core/woodstox-core-6.2.8-r1.ebuild
deleted file mode 100644
index 53a600676959..000000000000
--- a/dev-java/woodstox-core/woodstox-core-6.2.8-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/woodstox/archive/woodstox-core-6.2.8.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild woodstox-core-6.2.8.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.woodstox:woodstox-core:6.2.8"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs"
-HOMEPAGE="https://github.com/FasterXML/woodstox"
-SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# net.java.dev.msv:msv-core:2013.6.1 -> >=dev-java/msv-20130601:0
-# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-20090415:0
-# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
-# relaxngDatatype:relaxngDatatype:20020414 -> !!!groupId-not-found!!!
-
-CP_DEPEND="
-	dev-java/msv:0
-	dev-java/relaxng-datatype:0
-	dev-java/stax2-api:0
-	dev-java/xsdlib:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.felix:org.osgi.core:1.4.0 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-11:*
-	dev-java/osgi-core-api:0"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
-
-S="${WORKDIR}/woodstox-${P}"
-
-JAVA_CLASSPATH_EXTRA="osgi-core-api"
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# Upstream: Tests run: 864, Failures: 0, Errors: 0, Skipped: 0
-	# "No tests found in ..."
-	wstxtest.vstream.BaseValidationTest
-	wstxtest.BaseWstxTest
-	stax2.vstream.BaseStax2ValidationTest
-	stax2.BaseStax2Test
-	stax2.wstream.BaseWriterTest
-	org.codehaus.stax.test.BaseStaxTest
-	org.codehaus.stax.test.wstream.BaseWriterTest
-	org.codehaus.stax.test.stream.BaseStreamTest
-	# "... has no public constructor"
-	wstxtest.stream.BaseStreamTest
-	wstxtest.wstream.BaseWriterTest
-	stax2.vwstream.BaseOutputTest
-	org.codehaus.stax.test.vstream.BaseVStreamTest
-	org.codehaus.stax.test.evt.BaseEventTest
-	# Upstream does not run these:
-	failing.TestBasicSax
-	failing.TestExtLocationInfo91
-	failing.TestRelaxNG
-	failing.TestW3CDefaultValues
-	failing.TestW3CDefaultValues
-	failing.TestW3CSchemaComplexTypes
-	failing.TestW3CSchemaTypes
-	failing.TestW3CSchemaTypes
-)
-
-src_prepare() {
-	default
-
-	# We do not bundle any shaded (aka relocated) classes.
-	sed -e '/com.ctc.wstx.shaded.msv/d' \
-		-e '/org.codehaus.stax2.validation/d' \
-		-i "src/moditect/module-info.java" || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild b/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild
index ef9510cb15ab..3a6b3c2a149a 100644
--- a/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild
+++ b/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild
index b613a58dbeee..12401f22f2c5 100644
--- a/dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/luben/zstd-jni/archive/${MY_COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"