Adding metadata

25 files changed, 569 insertions, 64 deletions

diff --git a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
index fc9d45438186..3b658b7e1137 100644
--- a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
@@ -29,7 +29,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 DEPEND="
 	>=virtual/jdk-1.8:*
 	dev-java/findbugs-annotations:0
-	dev-java/jna:4
+	>=dev-java/jna-5.10.0:4
 "
 
 RDEPEND="
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
index feb8e35e94a2..625007115eaa 100644
--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/qos-ch/cal10n/archive/v_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
deleted file mode 100644
index a333844f35d0..000000000000
--- a/dev-java/jacl/jacl-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,52 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${P//-}"
-
-DESCRIPTION="Jacl is an implementation of Tcl written in Java"
-HOMEPAGE="http://tcljava.sourceforge.net"
-SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="doc"
-
-CDEPEND=">=dev-lang/tcl-8.4.5:*"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CRDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	rm -rf src/{Test.java,empty,tests,janino} || die
-	java-pkg-simple_src_compile
-	mv src/jacl/tcl src/ || die
-	java-pkg_addres "${PN}.jar" src/ -name "*.tcl"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher jaclsh --main tcl.lang.Shell
-	dodoc README ChangeLog known_issues.txt
-}
diff --git a/dev-java/jacl/jacl-1.4.1-r2.ebuild b/dev-java/jacl/jacl-1.4.1-r2.ebuild
index 52961e1a7d22..f1cd44ee2aaa 100644
--- a/dev-java/jacl/jacl-1.4.1-r2.ebuild
+++ b/dev-java/jacl/jacl-1.4.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/tcljava/jacl/${PV}/jacl${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="doc"
 
 CDEPEND=">=dev-lang/tcl-8.4.5:*"
diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest
new file mode 100644
index 000000000000..b25cc96111ea
--- /dev/null
+++ b/dev-java/janino/Manifest
@@ -0,0 +1 @@
+DIST janino-3.1.6.tar.gz 1730264 BLAKE2B a4e15b7b9a9d17b8762f5964171a01da3ce6f1045b8830c9a6e9a0d35c5096376fd667103360791f6848c762177f48f858e4e6233205fb6ff8258e6582211b89 SHA512 6e729733f74e0cc24db56c4030de8751c131c94b3abf0519288cc7539b5dda45de8c33e8dd37d8e70565ad0c3a3122cac7c73d77bc5f92a16db0b0f7ea7436d3
diff --git a/dev-java/janino/janino-3.1.6.ebuild b/dev-java/janino/janino-3.1.6.ebuild
new file mode 100644
index 000000000000..46a2e534172d
--- /dev/null
+++ b/dev-java/janino/janino-3.1.6.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom janino/pom.xml --download-uri https://codeload.github.com/janino-compiler/janino/tar.gz/v3.1.6 --slot 0 --keywords "~amd64" --ebuild JANjanino-3.1.6.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.codehaus.janino:janino:3.1.6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An embedded compiler for run-time compilation purposes"
+HOMEPAGE="https://janino-compiler.github.io/janino/"
+SRC_URI="https://codeload.github.com/janino-compiler/janino/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: janino/pom.xml
+# org.codehaus.janino:commons-compiler:3.1.6 -> !!!groupId-not-found!!!
+
+# Compile dependencies
+# POM: janino/pom.xml
+# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
+# POM: janino/pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/ant-core:0
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}/janino"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+	JAVA_SRC_DIR="../commons-compiler/src/main/java"
+	JAVA_JAR_FILENAME="commons-compiler.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":commons-compiler.jar"
+	rm -r target || die
+
+	JAVA_CLASSPATH_EXTRA="ant-core"
+	JAVA_SRC_DIR="src/main/java"
+	JAVA_RESOURCE_DIRS="src/main/resources"
+	JAVA_JAR_FILENAME="janino.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":janino.jar"
+	rm -r target || die
+
+	if use doc; then
+		JAVA_SRC_DIR=(
+			"../commons-compiler/src/main/java"
+			"src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+	JAVA_TEST_SRC_DIR="../commons-compiler/src/test/java"
+	JAVA_TEST_RESOURCE_DIRS="../commons-compiler/src/test/resources"
+	java-pkg-simple_src_test
+
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default
+
+	java-pkg_dojar "commons-compiler.jar"
+	java-pkg_dojar "janino.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "../commons-compiler/src/main/java/*"
+		java-pkg_dosrc "src/main/java/*"
+	fi
+}
diff --git a/dev-java/janino/metadata.xml b/dev-java/janino/metadata.xml
new file mode 100644
index 000000000000..b068159c3355
--- /dev/null
+++ b/dev-java/janino/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+  <name>Java</name>
+ </maintainer>
+ <longdescription>
+		The "JANINO" implementation of the "commons-compiler" API: Super-small, super-fast, independent from the JDK's "tools.jar".
+	</longdescription>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest
new file mode 100644
index 000000000000..fd3f6cd22f0b
--- /dev/null
+++ b/dev-java/logback-classic/Manifest
@@ -0,0 +1 @@
+DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
diff --git a/dev-java/logback-classic/logback-classic-1.2.11.ebuild b/dev-java/logback-classic/logback-classic-1.2.11.ebuild
new file mode 100644
index 000000000000..3730e822309e
--- /dev/null
+++ b/dev-java/logback-classic/logback-classic-1.2.11.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 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="http://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"
+
+# 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:0
+	dev-java/reflections:0
+	dev-java/slf4j-api:0
+	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/metadata.xml b/dev-java/logback-classic/metadata.xml
new file mode 100644
index 000000000000..a3dd20fb053c
--- /dev/null
+++ b/dev-java/logback-classic/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+ <upstream>
+  <changelog>https://logback.qos.ch/news.html</changelog>
+  <bugs-to>https://logback.qos.ch/bugreport.html</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
new file mode 100644
index 000000000000..fd3f6cd22f0b
--- /dev/null
+++ b/dev-java/logback-core/Manifest
@@ -0,0 +1 @@
+DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
diff --git a/dev-java/logback-core/logback-core-1.2.11.ebuild b/dev-java/logback-core/logback-core-1.2.11.ebuild
new file mode 100644
index 000000000000..1b3d8d366547
--- /dev/null
+++ b/dev-java/logback-core/logback-core-1.2.11.ebuild
@@ -0,0 +1,107 @@
+# 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"
+
+# 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/javax-mail:0
+	dev-java/janino:0
+	dev-java/jansi:0
+	java-virtuals/servlet-api:3.1
+"
+
+# 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:2
+		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-2,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
+}
+
+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" \
+			! -name "**/All*Test.java" \
+			! -name "**/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 )
+	fi
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/logback-core/metadata.xml b/dev-java/logback-core/metadata.xml
new file mode 100644
index 000000000000..a3dd20fb053c
--- /dev/null
+++ b/dev-java/logback-core/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+ <upstream>
+  <changelog>https://logback.qos.ch/news.html</changelog>
+  <bugs-to>https://logback.qos.ch/bugreport.html</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/netty/Manifest b/dev-java/netty/Manifest
new file mode 100644
index 000000000000..8338d35bb737
--- /dev/null
+++ b/dev-java/netty/Manifest
@@ -0,0 +1 @@
+DIST netty-4.1.35.Final.tar.gz 2447958 BLAKE2B 133adc2b37d3e681d11ac2e0187c0f79bb7aeeb6c622a1bf6e66a35bb78cd5730eeeffccfb960948f2e1df5dfadaa44f62b6f354c03065493ae43e1399a5ba2e SHA512 c3ba4e34ae9d309118ff3517467ffc218136789b06287d747b57df08be84779dacf5e29b19157afecd759a3516bc346e434295291b3dd546f80c4ae7c3f0a3ca
diff --git a/dev-java/netty/metadata.xml b/dev-java/netty/metadata.xml
new file mode 100644
index 000000000000..babeaab3b1e1
--- /dev/null
+++ b/dev-java/netty/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+  <name>Java</name>
+ </maintainer>
+ <longdescription>
+		Netty is an asynchronous event-driven network application framework for rapid development of maintainable high performance protocol servers and clients.
+	</longdescription>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/netty/netty-4.1.35.ebuild b/dev-java/netty/netty-4.1.35.ebuild
new file mode 100644
index 000000000000..93c2ad37726c
--- /dev/null
+++ b/dev-java/netty/netty-4.1.35.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom common/pom.xml --download-uri https://codeload.github.com/netty/netty/tar.gz/netty-4.1.35.Final --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild netty-4.1.35.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="io.netty:netty:4.1.35.Final"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="https://netty.io/"
+SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# We do not build the full range of modules provided by netty but only what
+# was available before in netty-common, netty-buffer and netty-transport.
+# Further modules might be added to the array.
+NETTY_MODULES=(
+	"common"
+	"resolver"
+	"buffer"
+	"transport"
+)
+
+# Common dependencies
+# POM: common/pom.xml
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
+# org.apache.logging.log4j:log4j-api:2.6.2 -> >=dev-java/log4j-api-2.17.1:2
+# org.jctools:jctools-core:2.1.1 -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.21 -> >=dev-java/slf4j-api-1.7.32:0
+
+# "Failed to load class org.slf4j.impl.StaticLoggerBinder"
+# Using slf4j-simple instead of slf4j-api solves it.
+# https://www.slf4j.org/codes.html
+CP_DEPEND="
+	dev-java/commons-logging:0
+	dev-java/jctools-core:0
+	dev-java/log4j-12-api:2
+	dev-java/slf4j-simple:0
+"
+
+# Compile dependencies
+# POM: common/pom.xml
+# test? ch.qos.logback:logback-classic:1.1.7 -> !!!groupId-not-found!!!
+# test? io.netty:netty-build:25 -> !!!artifactId-not-found!!!
+# test? io.netty:netty-dev-tools:4.1.35.Final -> !!!artifactId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.logging.log4j:log4j-core:2.6.2 -> >=dev-java/log4j-core-2.17.1:2
+# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3
+# test? org.javassist:javassist:3.20.0-GA -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:2.18.3 -> >=dev-java/mockito-4.4.0:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/javassist:3
+		dev-java/hamcrest-library:1.3
+		dev-java/logback-classic:0
+		dev-java/log4j-core:2
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/netty-netty-${PV}.Final"
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,javassist-3,junit-4,logback-classic,log4j-core-2,mockito-4"
+
+# There were 12 failures:
+# 1) testCompositeDirectBuffer(io.netty.buffer.ByteBufAllocatorTest)
+# java.lang.InstantiationException
+#         at java.base/jdk.internal.reflect.InstantiationExceptionConstructorAccessorImpl.newInstance(InstantiationExceptionConstructorAccessorImpl.java:48)
+#
+# FAILURES!!!
+# Tests run: 10015,  Failures: 12
+
+# There was 1 failure:
+# 1) initializationError(io.netty.channel.BaseChannelTest)
+# org.junit.runners.model.InvalidTestClassError: Invalid test class 'io.netty.channel.BaseChannelTest':
+#   1. The class io.netty.channel.BaseChannelTest is not public.
+#   2. Test class should have exactly one public constructor
+#   3. No runnable methods
+#
+# FAILURES!!!
+# Tests run: 10277,  Failures: 1
+
+JAVA_TEST_EXCLUDES=(
+	"io.netty.buffer.ByteBufAllocatorTest"
+	"io.netty.channel.BaseChannelTest"
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:verifyZeroInteractions:verifyNoInteractions:' \
+		-i buffer/src/test/java/io/netty/buffer/UnpooledTest.java \
+		-i transport/src/test/java/io/netty/channel/CompleteChannelFutureTest.java || die
+
+	# transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java:262: error: reference to assertEquals is ambiguous
+	#         assertEquals(1L, channel.readOutbound());
+	#         ^
+	#   both method assertEquals(long,long) in Assert and method assertEquals(Object,Object) in Assert match
+	rm transport/src/test/java/io/netty/channel/PendingWriteQueueTest.java || die
+}
+
+src_compile() {
+	local module
+	# We loop over the modules list and compile the jar files.
+	for module in "${NETTY_MODULES[@]}"; do
+		JAVA_SRC_DIR=()
+		JAVA_RESOURCE_DIRS=()
+		JAVA_MAIN_CLASS=""
+
+		JAVA_SRC_DIR=(
+			"$module/src/main/java"
+			"$module/src/module"
+		)
+
+		# Not all of the modules have resources.
+		if [[ -d $module/src/main/resources ]]; then \
+			JAVA_RESOURCE_DIRS="$module/src/main/resources"
+		fi
+
+		JAVA_JAR_FILENAME="$module.jar"
+
+		einfo "Compiling netty-${module}"
+		java-pkg-simple_src_compile
+
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
+
+		rm -r target || die
+
+	done
+
+	if use doc; then
+		JAVA_SRC_DIR=()
+		JAVA_JAR_FILENAME="ignoreme.jar"
+
+		for module in "${NETTY_MODULES[@]}" ; do
+			# Some modules don't have source code
+			if [[ -d $module/src/main/java/io ]]; then \
+				JAVA_SRC_DIR+=( "$module/src/main/java" )
+			fi
+
+		done
+
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	local module
+	for module in "${NETTY_MODULES[@]}"; do
+		JAVA_TEST_SRC_DIR="$module/src/test/java"
+		JAVA_TEST_RESOURCE_DIRS=()
+
+		# Not all of the modules have test resources.
+		if [[ -d $module/src/test/resources ]]; then \
+			JAVA_TEST_RESOURCE_DIRS="$module/src/test/resources"
+		fi
+
+		einfo "Testing netty-${module}"
+		java-pkg-simple_src_test
+	done
+}
+
+src_install() {
+	einstalldocs # https://bugs.gentoo.org/789582
+
+	local module
+	for module in "${NETTY_MODULES[@]}"; do
+		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
+		java-pkg_dojar $module.jar
+
+		# Some modules don't have source code
+		if [[ -d $module/src/main/java/org ]]; then
+			if use source; then
+				java-pkg_dosrc "$module/src/main/java/*"
+			fi
+		fi
+	done
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
index df8fd42a18eb..a1b75f2207b4 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV/
 
 LICENSE="MPL-1.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 CDEPEND="
 	dev-java/xom:0
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
index bcb039f3fd97..06699464f97d 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.36.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-1.8:*
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild
index 4018905b473b..9f498c036e19 100644
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.36.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-nop/slf4j-nop-1.7.36.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
index 813378abbbd7..967f7b6557b8 100644
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.36.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-simple/slf4j-simple-1.7.36.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
index e64c99255999..7be81d79f166 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.36.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/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
index 5ed928878473..8e150d3d2590 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
index c6359840b613..9aed30f65a2e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-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:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
index 09fffd263372..c53c20eb8511 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.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:*"
diff --git a/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild b/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild
index 06610489010c..d547050265ff 100644
--- a/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild
+++ b/dev-java/woodstox-core/woodstox-core-6.2.8.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