gentoo auto-resync : 14:09:2022 - 11:10:10

59 files changed, 2842 insertions, 22 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ecf68d43a7a3..df4f8c28b8c6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/aqute-bnd-annotation/Manifest b/dev-java/aqute-bnd-annotation/Manifest
new file mode 100644
index 000000000000..fea6d18d37ef
--- /dev/null
+++ b/dev-java/aqute-bnd-annotation/Manifest
@@ -0,0 +1,3 @@
+DIST biz.aQute.bnd.annotation-6.3.1-sources.jar 50600 BLAKE2B 6ace86a803c378be17b4ecfb658eb17e9c95f4f8797cdf22cbb9a5acb2a382fe0ee6791ad0280a2de9d9e85fbe2732487e693b2c93f08145b3633810f480f8b9 SHA512 751855a173e6d5f9d09f6d63775b97d971cebbfc019053988ec7fe144d0f49b4d09b9a2339d63bb43cea51d09d7d766554255f727cad8d73d9c196097e58d0fd
+EBUILD aqute-bnd-annotation-6.3.1.ebuild 1616 BLAKE2B a72e705175ffa59add0e5e847924989c1e5ac614e4d04b4489f41bcef7ddafff95980c37e4883e6c0b25cc16cf1c6e51253dc2f5a420f7543f31786337f5516d SHA512 4561f5e8ab5796fa0bfb92ce03fe0b9e43ba6018b5a164feb0f3afd2cf2ca71bf4bd7087938b185b1ab87e8eba3346854ef8406a04df5c734ed90eb96e3de2e7
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
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
new file mode 100644
index 000000000000..c8d4fe406d41
--- /dev/null
+++ b/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom biz.aQute.bnd.annotation-6.3.1.pom --download-uri https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.3.1/biz.aQute.bnd.annotation-6.3.1-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild aqute-bnd-annotation-6.3.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bnd Annotations Library"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/${PV}/biz.aQute.bnd.annotation-${PV}-sources.jar"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Common dependencies
+# POM: biz.aQute.bnd.annotation-${PV}.pom
+# org.osgi:org.osgi.resource:1.0.0 -> !!!artifactId-not-found!!!
+# org.osgi:org.osgi.service.serviceloader:1.0.0 -> !!!artifactId-not-found!!!
+
+CP_DEPEND="dev-java/osgi-annotation:0"
+
+# Compile dependencies
+# POM: biz.aQute.bnd.annotation-${PV}.pom
+# org.osgi:org.osgi.namespace.extender:1.0.1 -> !!!artifactId-not-found!!!
+# org.osgi:org.osgi.namespace.service:1.0.0 -> !!!artifactId-not-found!!!
+# org.osgi:osgi.annotation:8.1.0 -> >=dev-java/osgi-annotation-8.1.0:0
+
+DEPEND=">=virtual/jdk-1.8:*
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+JAVA_CLASSPATH_EXTRA="osgi-cmpn-8,osgi-core"
+JAVA_SRC_DIR="."
diff --git a/dev-java/aqute-bnd-annotation/metadata.xml b/dev-java/aqute-bnd-annotation/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/aqute-bnd-annotation/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/browserlauncher2/Manifest b/dev-java/browserlauncher2/Manifest
index 5f6100577e4b..dabc32484460 100644
--- a/dev-java/browserlauncher2/Manifest
+++ b/dev-java/browserlauncher2/Manifest
@@ -1,3 +1,4 @@
 DIST BrowserLauncher2-all-1_3.jar 186442 BLAKE2B b26509cf9a6700bd7261423b387479fde852f55735ddf6fb419e717c454b398a0a8c0c8acbd4be2e59aca6bd36837c0329f3a635482863273a1e9a389806bcdd SHA512 529195a94b757578afb3863c6b53cf16584097c659c576167fcbf86897cc484d80092c8d6e409ba1fdec69cb4f4a42b65c89c881663ae64bbc0a0a496309da5f
 EBUILD browserlauncher2-1.3-r2.ebuild 1294 BLAKE2B 789c14125250f2024cac56d60b8fa5a2c6dadc112e87a7a770829e20d744ac6e9bcf41694f3405c6f99eba257bbb1e732ca16e89ab7c10ef63b21fa20f26b434 SHA512 17fbf84450123015100fb1b61f8150169ad248fd83c44df5e88488e44231712fd7d88917f3eadd9dcd3337ad04b12734a3d5871b99edf79363edfa5ec4ff12ee
+EBUILD browserlauncher2-1.3-r3.ebuild 912 BLAKE2B 517c79c4f7871dd56485f6010c1e94b4d6411c753d45adb542dba5c455110d6b71c0cba647ba794edb52b24f4b789f2d960567ff1366381e1ed2da236fe9339c SHA512 77ad8d21d443a027495a787a6bfc6bf29ad859d3792b33386fead555a7e521414e56e08350fd4cad18ee6bd592aa31b4e06e3d75915ea13a1e2ae01ca5050bdd
 MISC metadata.xml 629 BLAKE2B 4d109ca0bbc1fd0cc46d0d5ba54b90c71c26d40429cd70d446dfe56a9275f1f209499dde79431874d26ea314ce926d67c72bb3d5e543649f59ab17e37b4da323 SHA512 ea72552c1a9d53a1470c73416318785f501debf3b93d3e97d7a7d82fab8280bd0c5dec9230b6833438ac5a17690002ecd9c6eb23b0a3885296eb2a15f0bb54d1
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild
new file mode 100644
index 000000000000..a20e47279bc6
--- /dev/null
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library that facilitates opening a browser from a Java application"
+HOMEPAGE="http://browserlaunch2.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/browserlaunch2/browserlauncher2/${PV}/BrowserLauncher2-all-${PV//./_}.jar"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="source"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_MAIN_CLASS="edu.stanford.ejalbert.testing.BrowserLauncherTestApp"
+JAVA_ENCODING="ISO-8859-1"
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	cp -r source resources || die "Cannot create resources dir"
+	find resources -type f ! -name '*.properties' -exec rm -rf {} + || die
+}
diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
new file mode 100644
index 000000000000..3b5d68daf0cd
--- /dev/null
+++ b/dev-java/cdi-api/Manifest
@@ -0,0 +1,4 @@
+AUX cdi-api-4.0.1-skip-tests.patch 2530 BLAKE2B 6b4fac604f1b3692ce4150b2e6f29d60a32004dd61a7cd4f12e092bb43e8bed6a1ddc33ad711e0f3025ec95f37a8aba11c305e9df23b3f11e29021baa3808e17 SHA512 0d7d99baea9cbc21e9bc435118f793c6a11d802968b24aed20a65b337b3cebb7d50e37a493084deaa7961c64bfd4f2b96f0750897b0589586b3e89077edf364e
+DIST cdi-api-4.0.1.tar.gz 280719 BLAKE2B 9c4cf34f1b0c096a3097bed658ba4c13ab6fa655cd8233b82b13a788dd047e1be89bcde69b3c69665c0987c4f62cd5e4596e51f6235c95db5239daf403dea4e9 SHA512 7f3e9ca45e0708b3c998ff6f743975a9995309d1fb93fde64ca8a0fca73e16ea653085ca743c921d52385f0fbcbdab10b45fd8b6e8b27c2e058871febbbeeb1e
+EBUILD cdi-api-4.0.1.ebuild 2656 BLAKE2B 94be08c74e1b0d7c65b0155abf6efe6d3484af29a844b9d7396a69588cda67c98281802ffb907f266b48c5a21927f929b5a5f044d47c639102f4e834f6915b46 SHA512 556caf9a175b234ee61b7a94a6bf5cdd1d03686fa8e081a644e36063b3581c29b70071c5666db3bc8492c9844e3c6cc2699b957680e72e8b94f55d6cd9668f18
+MISC metadata.xml 295 BLAKE2B 349f4209d0a1dac5a43b3cc197c78aadf3263cfb1e6ddfa39b4ea54bf5b4883a80e800b600720b745a86ee6defe57304736910fc4bb42ee1c1f57f35a3936ea0 SHA512 6f7bf9a1c0e9418a7a0d3cc2baa8f6cbbcf1b4a7abf7f4501d718355d778966b3a16f56bd30c5136d7fb96597d3377e61cbb9a9d840b53fa4da26e00cb3d72e1
diff --git a/dev-java/cdi-api/cdi-api-4.0.1.ebuild b/dev-java/cdi-api/cdi-api-4.0.1.ebuild
new file mode 100644
index 000000000000..b96c2cce0208
--- /dev/null
+++ b/dev-java/cdi-api/cdi-api-4.0.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom api/pom.xml --download-uri https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild cdi-api-4.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1"
+JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="APIs for CDI (Contexts and Dependency Injection for Java)"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.cdi"
+SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DEPEND="
+	>=dev-java/injection-api-2.0.1:0
+	>=dev-java/jakarta-annotations-api-2.1.1:0
+	>=dev-java/jakarta-el-api-5.0.1:0
+	>=dev-java/jakarta-interceptors-2.1.0:0
+	>=virtual/jdk-11:*
+"
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( CONTRIBUTING.adoc {NOTICE,README}.md )
+
+PATCHES=(
+	# https://bugs.gentoo.org/856412
+	# org.jboss.cdi.api.test.se.SeContainerInitializerTest # Tests run: 4, Failures: 1
+	# org.jboss.cdi.api.test.CDITest # Tests run: 11, Failures: 5
+	"${FILESDIR}/cdi-api-4.0.1-skip-tests.patch"
+)
+
+S="${WORKDIR}/cdi-${PV}"
+
+JAVA_TEST_GENTOO_CLASSPATH="testng"
+JAVA_TEST_EXTRA_ARGS=( -DserviceDir="target/test-classes/META-INF/services" )
+JAVA_TEST_SRC_DIR="api/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="api/src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# Tests run: 1, Failures: 1
+	org.jboss.cdi.api.test.privileged.CDIPrivilegedTest
+)
+
+src_prepare(){
+	default # https://bugs.gentoo.org/780585
+}
+
+src_compile() {
+	JAVA_CLASSPATH_EXTRA="
+		injection-api
+		jakarta-annotations-api
+		jakarta-el-api
+		jakarta-interceptors
+	"
+	JAVA_SRC_DIR="lang-model/src/main/java"
+	JAVA_JAR_FILENAME="lang-model.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":lang-model.jar"
+	rm -r target || die
+
+	JAVA_SRC_DIR="api/src/main/java"
+	JAVA_RESOURCE_DIRS="api/src/main/resources"
+	JAVA_JAR_FILENAME="cdi-api.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":cdi-api.jar"
+	rm -r target || die
+
+	if use doc; then
+		rm lang-model/src/main/java/module-info.java || die
+		JAVA_SRC_DIR=(
+			"lang-model/src/main/java"
+			"api/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_install() {
+	java-pkg_dojar "lang-model.jar"
+	java-pkg_dojar "cdi-api.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "lang-model/src/main/java/*"
+		java-pkg_dosrc "api/src/main/java/*"
+	fi
+}
diff --git a/dev-java/cdi-api/files/cdi-api-4.0.1-skip-tests.patch b/dev-java/cdi-api/files/cdi-api-4.0.1-skip-tests.patch
new file mode 100644
index 000000000000..f62b64b3d450
--- /dev/null
+++ b/dev-java/cdi-api/files/cdi-api-4.0.1-skip-tests.patch
@@ -0,0 +1,72 @@
+--- a/api/src/test/java/org/jboss/cdi/api/test/se/SeContainerInitializerTest.java
++++ b/api/src/test/java/org/jboss/cdi/api/test/se/SeContainerInitializerTest.java
+@@ -48,7 +48,7 @@ public class SeContainerInitializerTest {
+         SeContainerInitializer.newInstance();
+     }
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithOneGoodSeContainerInitializer() throws Exception {
+ 
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+@@ -79,4 +79,4 @@ public class SeContainerInitializerTest {
+         Assert.assertTrue(SeContainerInitializer.newInstance().getClass().equals(DummySeContainerInitializer.class) ||
+                 SeContainerInitializer.newInstance().getClass().equals(DummySeContainerInitializer2.class));
+     }
+-}
+\ No newline at end of file
++}
+--- a/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
++++ b/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
+@@ -59,7 +59,7 @@ public class CDITest {
+     }
+ 
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithOneGoodCDIProvider() throws Exception {
+ 
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+@@ -90,7 +90,7 @@ public class CDITest {
+ 
+     }
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithTwoGoodCDIProvider() throws Exception {
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+         fw.write(DummyCDIProvider2.class.getName());
+@@ -101,7 +101,7 @@ public class CDITest {
+     }
+ 
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithTwoGoodCDIProviderReverse() throws Exception {
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+         fw.write(DummyCDIProvider.class.getName());
+@@ -111,7 +111,7 @@ public class CDITest {
+         Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
+     }
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithTwoCDIProviderOneWithNullCDIAndOneGood() throws Exception {
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+         fw.write(DummyCDIProviderWithNullCDI.class.getName());
+@@ -122,7 +122,7 @@ public class CDITest {
+     }
+ 
+ 
+-    @Test
++    @Test(enabled = false)
+     public void testWithThreeCDIProviderOneWithNullCDIAndOthersGood() throws Exception {
+         FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+         fw.write(DummyCDIProviderWithNullCDI.class.getName());
+@@ -163,4 +163,4 @@ public class CDITest {
+         ClosableCDIProvider.closeContainer();
+         CDI.current();
+     }
+-}
+\ No newline at end of file
++}
diff --git a/dev-java/cdi-api/metadata.xml b/dev-java/cdi-api/metadata.xml
new file mode 100644
index 000000000000..5445151724ee
--- /dev/null
+++ b/dev-java/cdi-api/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jakartaee/cdi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/injection-api/Manifest b/dev-java/injection-api/Manifest
new file mode 100644
index 000000000000..fe1046610044
--- /dev/null
+++ b/dev-java/injection-api/Manifest
@@ -0,0 +1,3 @@
+DIST injection-api-2.0.1.tar.gz 15277 BLAKE2B e1a575ce9705636e0e176e63684c3c4ddd3e7932f2fcf36af86e00e4ebb9888151d64019dea8339c80951d40d3f588bcb6857943c2e3a501e68ad7702a73c643 SHA512 21037c1b9b9687210663ee32b40c7ab897a27812591e38af2f840421488029d1b90f0528570940499142a7ec21ebd1f0fc4506872d9667a066b4ce84d38428e5
+EBUILD injection-api-2.0.1.ebuild 880 BLAKE2B 1655ef7f745bb9a864fb423758c775d9c2feb4f7a7d60f7b5101211e317dd4f14246ad027bb9b862f81edffeccef64b4295a0b72101990b2e41441f8bd51ab1d SHA512 22a5f7e82f56a9ba7582539e7304e1d51f01922727bfa12ed354244aa6ccc221072aa21d45950fbff86058243a14a1ca00ea8aea5ff2f99c8d1a7e6ead1ff6bf
+MISC metadata.xml 309 BLAKE2B 46b50966c86b4944fdfc31a17697afd2829665f5ee5cdf2c25449c04e42fd529ed66e18beba65c388b0de9dd5ee6962ef400a59981c7869f27c5a1190f751ca0 SHA512 67295ffb8287cd8065adae08efd325cc06b12bc3068142c29aec1c34dbdf3e6eb0ef93fb8177a22e2951afa562049753588d29eaa011cc277dda1b2d06b22c50
diff --git a/dev-java/injection-api/injection-api-2.0.1.ebuild b/dev-java/injection-api/injection-api-2.0.1.ebuild
new file mode 100644
index 000000000000..8a12cfcc6d64
--- /dev/null
+++ b/dev-java/injection-api/injection-api-2.0.1.ebuild
@@ -0,0 +1,29 @@
+# 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/eclipse-ee4j/injection-api/archive/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild injection-api-2.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.inject:jakarta.inject-api:2.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Dependency Injection"
+HOMEPAGE="https://jakarta.ee/specifications/dependency-injection/"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE}.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/injection-api/metadata.xml b/dev-java/injection-api/metadata.xml
new file mode 100644
index 000000000000..4c37da7799c7
--- /dev/null
+++ b/dev-java/injection-api/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+			<remote-id type="github">eclipse-ee4j/injection-api</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jakarta-el-api/Manifest b/dev-java/jakarta-el-api/Manifest
new file mode 100644
index 000000000000..21f5600635d4
--- /dev/null
+++ b/dev-java/jakarta-el-api/Manifest
@@ -0,0 +1,3 @@
+DIST jakarta-el-api-5.0.1.tar.gz 148830 BLAKE2B 408d71576bc2f4de8bae9f54ddd10373d5f6674280a06e89cbda005a34c1574d6602f51a22c221a4aecc8a65848b40aa7e25781b0043cf6426c7b48f364e1136 SHA512 ddbaa201c354f79d99df9b6470eac3bca31207137eae3e5a6ac1b16bcd2ec382239aa64765d485c488ebd925b72b4023c6724bafd726557b9828a3c085982d24
+EBUILD jakarta-el-api-5.0.1.ebuild 1206 BLAKE2B 89c4f16c914263dc6ee89c2641c7e3fba10b9f43399fca1b388e7692221b5e8d38ace278af7c1aee139c5d52d3abe19d0432939a9dfab0a35a222e00f5241c1b SHA512 2e65eff1b4c094cdf8cce9ef1978f236658818324dffca53f370060ced9c1656a87ee9b225844fc8184583e1a8a48db0252cf7de53f58637f817e0701ba05c19
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jakarta-el-api/jakarta-el-api-5.0.1.ebuild b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1.ebuild
new file mode 100644
index 000000000000..e0c226accf69
--- /dev/null
+++ b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom api/pom.xml --download-uri https://github.com/jakartaee/expression-language/archive/5.0.1-RELEASE-api.tar.gz --slot 0 --keywords "~amd64" --ebuild jakarta-el-api-5.0.1.ebuild
+
+EAPI=8
+
+# No tests since we don't have junit-jupiter
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.el:jakarta.el-api:5.0.1"
+# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Expression Language defines an expression language for Java applications"
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DEPEND=">=virtual/jdk-11:*"
+# <release>11</release>
+# https://github.com/jakartaee/expression-language/blob/5.0.1-RELEASE-api/api/pom.xml#L143
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/expression-language-${PV}-RELEASE-api"
+
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jakarta-el-api/metadata.xml b/dev-java/jakarta-el-api/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/jakarta-el-api/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jakarta-interceptors/Manifest b/dev-java/jakarta-interceptors/Manifest
new file mode 100644
index 000000000000..c0a4320135eb
--- /dev/null
+++ b/dev-java/jakarta-interceptors/Manifest
@@ -0,0 +1,3 @@
+DIST jakarta-interceptors-2.1.0.tar.gz 85830 BLAKE2B 044fa06fa189a7b5dc73c1a33a04939bd895f488acabecae5564cea32419f213e75a3064578ffd462fcbf6de9212178bc389912f15f5ab0f63de729c4b6acc4d SHA512 e3a72bc181101fa550088a1ea7b284d693a4222de97a4a91e0c56d8fe1a3c50da1b56d692da73c5cfc4c36ea3bcbe15d0fa8321c8e521ea7c241a48151125bc6
+EBUILD jakarta-interceptors-2.1.0.ebuild 1032 BLAKE2B 0f2f771b5d1b8d4963227a915ef8380efe4d3dbcbb3d58296f997717f7c5dd32c7677cc31ca86337792e29b0ec79e32e08a73e01ff078a05619759619c7fc8d0 SHA512 f52a21f487e575d9dec05fe561f9fba2a2d9d057a6927e3b22354af7e1c2a60e0f1a6a2dfa3ddc8c75171bd02c79acee13b744b0d98e2ac2a78090dea010fced
+MISC metadata.xml 572 BLAKE2B 4b3e55f3d7710a96a423082bd60992faf4f20d954cc49b324f816cc206ad479aa799d813fb3e6e16c1c170f35520420dc1148b0f0887d4c9df9f15e4407a8f50 SHA512 f79eb626db19b5965084d6f03b3195d80f4268f0852bc7bba5e221afc5476830e54ecb414c1f5044a9ec45be37eb2e3417b71e7e47098d31a08e543979d38070
diff --git a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
new file mode 100644
index 000000000000..2c0e2121ec2b
--- /dev/null
+++ b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom api/pom.xml --download-uri https://github.com/jakartaee/interceptors/archive/2.1.0-RELEASE.tar.gz --slot 0 --keywords "~amd64" --ebuild jakarta-interceptors-2.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.interceptor:jakarta.interceptor-api:2.1.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Interceptors"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.interceptors"
+SRC_URI="https://github.com/jakartaee/interceptors/archive/${PV}-RELEASE.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DEPEND="
+	dev-java/jakarta-annotations-api:0
+	>=virtual/jdk-11:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/interceptors-${PV}-RELEASE"
+
+JAVA_CLASSPATH_EXTRA="jakarta-annotations-api"
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jakarta-interceptors/metadata.xml b/dev-java/jakarta-interceptors/metadata.xml
new file mode 100644
index 000000000000..7be8f07ef964
--- /dev/null
+++ b/dev-java/jakarta-interceptors/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Jakarta Interceptors defines a means of interposing on business method invocations and specific events—such as lifecycle events and timeout events—that occur on instances of Jakarta EE components and other managed classes.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jakartaee/interceptors</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest
index ee6fe1336366..7d07b5fad6f6 100644
--- a/dev-java/jakarta-servlet-api/Manifest
+++ b/dev-java/jakarta-servlet-api/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9
-EBUILD jakarta-servlet-api-4.0.4.ebuild 934 BLAKE2B 1d6817f3f37a874b38895c0fa30abefdffa34d0405ffa4943f89f7884f1837ba1c35d9cf080a9e5d7c26124c1e6e62a3ec3ca6cf1d99b94b11a4a63c8e0ac68b SHA512 68b69e97b713745480ee703f24aee2d0b1e1e5505aaa0271f1e6c7538c076789a20ab9bd8fd1f89e6db8131a705e8bee3eeca0e85a0fe1a6304762827f55bd95
+EBUILD jakarta-servlet-api-4.0.4.ebuild 939 BLAKE2B 1fe921708f4607a19425174f0c89e32854d8d5aae19b61ad7792d2aa258aec6d43451ed8d5f1da20766bcf0fe85e44d5380fbfb28861f17bff2b02929a78b05b SHA512 d2560d62f14496380384fdec3797f875505eb1ae021d97401987a35afea59dad91e988b3e4317f9f56e809e2ab534872e14228101b44c44b33639351e2000609
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
index 5debc2369cba..0ed4e93cbabd 100644
--- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${
 
 LICENSE="|| ( GPL-2 GPL-2-with-classpath-exception )"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index e7d861d07c7a..236890f7af08 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,3 +1,5 @@
 DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69 SHA512 6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7
+DIST jakartaee-migration-1.0.3-sources.tar.gz 38243 BLAKE2B e1c05c05dd16ec6d54f0eb3523aed14a3fcbc9c0999b54e7c240c5ebfbb968a8cc3025855485318c19f0e85931ea239f4f08efbd0d042c7ad163c1fe5d3819f9 SHA512 79947fe47d55e4e93a417118e7a41fd79614b3fe3bfad967bfdcc865121c9247f92ecd99231e08abb2187036cdb1dceb85b8f2bc695c5bd2ecbf48a84bdd3b2a
 EBUILD jakartaee-migration-1.0.1.ebuild 2945 BLAKE2B 707735f243f9021cfa0644817e496391e4e0307fd47a3a374dad9c80ab0d45637636d90e8a0040f26549d1b160dca13c59496c3a04a3dc97c5dd5c48ec36cb77 SHA512 ec2915116456bcc77d5fcc4e2f9594ac9b8424d4a7a753dd28bd4e68aba01bfa64bdf7f1845b8eb3518bd91ea7a079a4ff1d2b1c56a872848beac0f0cbff99bb
+EBUILD jakartaee-migration-1.0.3.ebuild 2946 BLAKE2B 131cd4feffc4f743ed2dc6be035de46974c7ae817fa0a29d91e1db52d202b1f0cf26ee1a00771315a7a6228691b3285895a5991e1760998e4c307e0a423052ad SHA512 7e8025d263574a89b70c010da01d170e6d83a1c14b742109f7560039a91641c34316b45c5120a1f26a18f637bc38ab2304e315cf27de7d8712f0cf2970d7e94c
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
new file mode 100644
index 000000000000..ad63fdea59bb
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
@@ -0,0 +1,92 @@
+# 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://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.3/source/jakartaee-migration-1.0.3-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
+HOMEPAGE="https://tomcat.apache.org"
+SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
+# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
+# org.apache.commons:commons-compress:1.20 -> >=dev-java/commons-compress-1.20:0
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/bcel:0
+	>=dev-java/commons-compress-1.20:0
+	dev-java/commons-io:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
+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=(
+	"org.apache.tomcat.jakartaee.TesterConstants"
+)
+
+src_prepare() {
+	default
+	sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
+}
+
+src_test() {
+	# we need to create jar files for the tests the same way as it's done using pom.xml
+	local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
+	mkdir -p target/test-classes/META-INF || die
+	pushd target/test-classes || die
+	echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
+	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
+	jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
+	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
+	jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
+	for enc in rsa dsa ec; do
+		cp hellocgi.jar hellocgi-signed-${enc}.jar || die
+		jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
+	done
+	popd
+
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 635c0c03b182..8f78f64ddaf3 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,3 +1,5 @@
 DIST javassist-3.29.0.tar.gz 1290728 BLAKE2B 21543fe4d81cc46fa8d6530e8b5b821df64af31404831d15255fe7d362fe40de39451f4e6a264986ce7b8fdb16116c3266a522caf24a2df6a91cc7203354e070 SHA512 9487d4b6e1d7981360f768f2ebe7e8313c103752cc458eb454fffcf6714f62952cc772e920ee663e89cd51cd6a2669993f5595e682ec74313799eff32144541c
+DIST javassist-3.29.1.tar.gz 1291658 BLAKE2B 4064401ad01c1e1c9aa4a219a81f0fc2e67b1d4cb85cb98b4a996dd2bf789ee1feb790e5bb332205ef2fafe1c7ac0ea82e5e25afff4d9960c54dfe2cb895d0fd SHA512 5788a4a50b803b2a4520340ceae9fd47466d2004cce4138fd861b57fd760109c61c375a28bd907bb9dfeb56bd44734f003ddd1b550571f101a7d1bc04096b5f8
 EBUILD javassist-3.29.0-r2.ebuild 1919 BLAKE2B 21202b1fc59b585ed2e079627dcfad10e65f785319673829d90df723b900a0a6faf3101e26e17dd38e12340f9b3b557602f2c48836d783ee3dd17642e4122466 SHA512 5e1e997c9d9605bc9004672c699b936c4f0349c05960330f40141476099dba2359c2d4f34e4d9332d396688c3b39dec09ea63f3f2cd5fc368b8b222601b41dd8
+EBUILD javassist-3.29.1.ebuild 2076 BLAKE2B f126eb8b1744e5cc1953e64da0dd9b2068d37c9a6e7dbc8e40ca38197dc8308f0b57255ccf2e517a4c0db44dbe1be3f24e0cd387ae4a7fe11d5cb629a730e59d SHA512 f436cc307858a95c487b93f15b43f8d70f50bbdf5b80f281b754f9b71bd9b0291dd30079e336a113b0dc7d7058b91c7381679345e5b172dfacdc117f8c5ab500
 MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/javassist-3.29.1.ebuild b/dev-java/javassist/javassist-3.29.1.ebuild
new file mode 100644
index 000000000000..d9a588f78267
--- /dev/null
+++ b/dev-java/javassist/javassist-3.29.1.ebuild
@@ -0,0 +1,68 @@
+# 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/jboss-javassist/javassist/archive/rel_3_29_1_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.javassist:javassist:3.29.1-GA"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A class library for editing bytecodes in Java."
+HOMEPAGE="https://www.javassist.org"
+SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Tests run: 431,  Failures: 6
+# Cannot solve those test failures. Using "mvn test" they all pass.
+# https://bugs.gentoo.org/856364
+RESTRICT="test"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:[4.13.1,) -> >=dev-java/junit-4.13.2:4
+# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
+
+DEPEND=">=virtual/jdk-11:*
+	test? ( dev-java/hamcrest-library:1.3 )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( Changes.md README.md )
+HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} )
+
+S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.javassist"
+JAVA_MAIN_CLASS="javassist.CtClass"
+JAVA_NEEDS_TOOLS=1
+JAVA_SRC_DIR="src/main"
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4"
+JAVA_TEST_SRC_DIR="src/test"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# https://github.com/jboss-javassist/javassist/blob/rel_3_29_0_ga/pom.xml#L166-L168
+# <include>javassist/JvstTest.java</include>
+JAVA_TEST_RUN_ONLY="javassist.JvstTest"
+
+src_prepare() {
+	default
+	java-pkg_clean javassist.jar
+	sed -e 's:\.\./\.\./::' -i src/test/javassist/JvstTest{4,Root}.java || die
+}
+
+src_test() {
+	default
+	einfo "Testing"
+	JAVA_PKG_WANT_SOURCE=11
+	JAVA_PKG_WANT_TARGET=11
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jaxrs-api/Manifest b/dev-java/jaxrs-api/Manifest
new file mode 100644
index 000000000000..965d58b44a31
--- /dev/null
+++ b/dev-java/jaxrs-api/Manifest
@@ -0,0 +1,3 @@
+DIST jaxrs-api-2.1.6.tar.gz 225315 BLAKE2B bf4f12eadbee605e1141c72ee2a51c64548f3bed2846d1605758bcd994633b1a8f23b2054e0b71503583096a7234f42d12a389b9da031fa8b8c6b313cad84d98 SHA512 b5032ea9905e31b4120761125999a50e6d30229e7174e4a5e087f263030b25c157384a6d31796a90c590fda413e0e66220ec77c809a22fac8827ffa971c4aae7
+EBUILD jaxrs-api-2.1.6.ebuild 1941 BLAKE2B d2a31169f10999600a3075670d9b6a93188f989d887e1c63b3b67e34b1b39000e6a11a8eb1a01e526c127a4ca244f578e5ffe1e95d7e6cbd86c90cc71534a974 SHA512 be448adce83483da5c14f0a79e275436bb3fbbba46be380ec3d74f0680897bd5598c6f14f0af7086ae434d83b14521f6e7353d49674aeaf5c33b890cb9255e79
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild b/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
new file mode 100644
index 000000000000..dbd9649763f2
--- /dev/null
+++ b/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jaxrs-api/pom.xml --download-uri https://github.com/jakartaee/rest/archive/2.1.6.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxrs-api-2.1.6.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.ws.rs:jakarta.ws.rs-api:2.1.6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta RESTful Web Services API"
+HOMEPAGE="https://github.com/jakartaee/rest"
+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"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# jakarta.activation:jakarta.activation-api:1.2.1 -> >=dev-java/jakarta-activation-api-1.2.2:1
+# jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 -> >=dev-java/jaxb-api-2.3.3:2
+# POM: ${PN}/pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.glassfish.jaxb:jaxb-runtime:2.3.2 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:2.22.0 -> >=dev-java/mockito-4.4.0:4
+
+DEPEND="
+	>=virtual/jdk-11:*
+	dev-java/jakarta-activation-api:1
+	dev-java/jaxb-api:2
+	test? (
+		dev-java/jaxb-runtime:4
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/rest-${PV}/${PN}"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jaxb-api-2"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="jaxb-runtime-4,junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+# "mvn test" -> Tests run: 34, Failures: 0, Errors: 0, Skipped: 3
+# 1) testSerializationOfJaxbLink(javax.ws.rs.core.JaxbLinkTest)
+# javax.xml.bind.JAXBException: Implementation of JAXB-API has not been found on module path or classpath.
+JAVA_TEST_EXCLUDES=(
+	javax.ws.rs.core.JaxbLinkTest
+)
diff --git a/dev-java/jaxrs-api/metadata.xml b/dev-java/jaxrs-api/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/jaxrs-api/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index 97e41e7fb237..9e1d16cf93f1 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD logback-core-1.2.11-r1.ebuild 3481 BLAKE2B 8264024829aa34aa5ee066b7131d2ffc705396982d98988dc1b8aed532b2c73633d6901cc102aaffeafc97eea9ed8720d8230d9e4555c68ce07ec81326e2d047 SHA512 ca3ec00a4ced4fb84aef763d318aa11ff92eee71a1dbf35d1cb756586b9ea5a76f8dbe660e830f6b7dab088ee47ed59201754bb569a552f601c77cd7353789ac
+EBUILD logback-core-1.2.11-r1.ebuild 3486 BLAKE2B 1e3e93c9ff5023e4655e84c0938ed48506fb8034183640baeed41dd3f706cdbef30808aaa86eeb6ce9a9f84e59552a621a26a837edd2e6391fd61bf780c140d3 SHA512 d840f923583e522e1456a1d58fdab3814a3403c79f76118e83ffc94dfb19695a9b9ea6a298a667e9c879d8783f040701cdb0f467952c9a8debcf3836e8d00f35
 EBUILD logback-core-1.2.11.ebuild 3571 BLAKE2B 1a57d13feba258d96db96f632056abe972f464cf2194a996b8550681a7b09896c8e80ddec34b660cd9239809567a360b53b6ebc7d6e7ef284785a673dff364af SHA512 f45a45c16eb7297b9f15bd68233715c36ec4c683e672d8c74ce3ff2c9457a1aacef857661506e60752cf6dde6ad35156684b5483c5b679ff89238b9ec4e52b2c
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
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
index 37cc37e0f7e5..f214fcd20181 100644
--- a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
+++ b/dev-java/logback-core/logback-core-1.2.11-r1.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: pom.xml
diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
index 714a90d27e66..0f29b19227ea 100644
--- a/dev-java/msv/Manifest
+++ b/dev-java/msv/Manifest
@@ -1,3 +1,5 @@
+DIST msv-2022.7.tar.gz 2594951 BLAKE2B fce006f4b845efcd930b7999ac00eaab06c404888eb73a6eeab6cfad616b4922271d2d682abc82f3be4c4f6a791aa14681f6e6bfebd2118ac3aa2bcba41fd1f8 SHA512 315342628f79c561883be0d966211dd81daae66a414dcc9bb5a87d86f97121d38b5835e9a6d1ac7c21ccff46040e53d3cabd32e9ea677c9ca4335a86c5259949
 DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
 EBUILD msv-20130601.ebuild 1417 BLAKE2B 31e1f539d89c0c831d68bf983c7ea8fc7073969742dfba4c25275a3b18e9f879e0878f375daf18f663ff4ce030fa6efcca6d54be6e786aafaeb651d76e19711a SHA512 46a52e0e6769fd968f94143635282f7f5b758cae3ba6ccb38180f4bd954f4ad48c6cc3c27b013a76003d757ee942658dc60263edd64ef7c26fee98cfd275c676
-MISC metadata.xml 402 BLAKE2B 183580e666df7bb2193670fcd9124b4f0a5e145ee753ef358178d55300c0b98da38d3ca354639feafb266968e1cd0a2d7c3f298bbb2c38ebbbfcd2ed5034830c SHA512 b7572f0eec97ab9efd709c4dd93911e36f3adb07b473b539986ed1933cbf598b6ee99b62a41a3aebc53fca6b2454a1a5cb68e45d67ae38d83315c2cba4722946
+EBUILD msv-2022.7.ebuild 2118 BLAKE2B a17219c243e143f41d940c57f2a357357b28f29bdccdbd338db9e69bd45326d01a0b1663bd852d669f36428dc9678122d6810f24ccf530869467486733f10e5f SHA512 08372ec42aa705bb7d8289c4b2f9f19339fb2e0233492b551631ed8dd7a15a652b49271518d5615d6cca15b4820f28a597657654361dd00b9bd09b1f53ec443e
+MISC metadata.xml 487 BLAKE2B e36790ebf85cccdda4aa092426060129c94c9b01032199e37811ea2b9debeb70013db2e6d34b132d9e9ef6ca14f5a03c3e1b66993ceba5620b68072787329aaa SHA512 8cef0d9e71f5e992dd4a33e020fbd4661d026d0230f7c9f99438c6f0fd6e431a20179842ba94527823264c166476d9cf64c9d7abb92b14316a65ee6a4efbfbfe
diff --git a/dev-java/msv/metadata.xml b/dev-java/msv/metadata.xml
index a12324e097b7..d52f73b93e44 100644
--- a/dev-java/msv/metadata.xml
+++ b/dev-java/msv/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-<longdescription>
-The Sun Multi-Schema XML Validator (MSV) is a Java technology tool
-to validate XML documents against several kinds of XML schemata.
-</longdescription>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Sun Multi-Schema XML Validator (MSV) is a Java technology tool
+		to validate XML documents against several kinds of XML schemata.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">xmlark/msv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/msv/msv-2022.7.ebuild b/dev-java/msv/msv-2022.7.ebuild
new file mode 100644
index 000000000000..300997bdee20
--- /dev/null
+++ b/dev-java/msv/msv-2022.7.ebuild
@@ -0,0 +1,70 @@
+# 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/xmlark/msv/archive/msv-2022.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild msv-2022.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.java.dev.msv:msv-core:2022.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Multi-Schema Validator Core package"
+HOMEPAGE="https://github.com/xmlark/msv/msv-core"
+SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# isorelax:isorelax:20030108 -> !!!groupId-not-found!!!
+# net.java.dev.msv:xsdlib:2022.7 -> !!!suitable-mavenVersion-not-found!!!
+# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
+# xerces:xercesImpl:2.12.2 -> >=dev-java/xerces-2.12.2:2
+# xml-apis:xml-apis:1.4.01 -> >=dev-java/xml-commons-external-1.4.01:1.4
+# xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
+
+CP_DEPEND="
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0
+	dev-java/xerces:2
+	dev-java/xml-commons-external:1.4
+	dev-java/xml-commons-resolver:0
+	dev-java/xsdlib:0
+"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/msv-${P}/msv"
+
+JAVA_MAIN_CLASS="com.sun.msv.driver.textui.Driver"
+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_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	# Selection according to pom.xml#L182-L210
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -wholename "**/*Test.java" \
+			-o -wholename "**/*TestCase.java" \
+			-o -wholename "**/*TestCases.java" \) \
+			! -wholename "**/*\$*" \
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 3c8cb25ce0b1..5d681a13326c 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,24 +1,45 @@
 AUX openjdk-bin-8.env.sh 607 BLAKE2B 447575fc213003930ba6d6bbbd7cda0d53f53b16e3679fcb13d219cccf3525c7dfda755c79826b4d3c7b238502ed5ecaf4c8514971e576c756f4fc168fd9a0d2 SHA512 4cfbe2dddc89408824621bbd2036afa2966d550e6e189a8835f78b46fe91305221d8fa46219e9c53c83c9f73d83cdb1208bc78a46b9115041511b97b70abbf1b
 AUX openjdk-bin.env.sh 398 BLAKE2B b83d85e2a4e0dbeb24b8c21fb442a8964e55eaf01125cd52f5c930cd67b95b7d1744362cbefe436e4f4115f0b7600860200d8f134b241b6b60ffae6b807b476b SHA512 2c2f753a05154d17a7c324e61d3e4513119050f44d2a8d0aea5c6e2542e9989a955689a97d47fc1d5c710a056f2ccc7b239e3eed3b2d516df6b2aa7450c44613
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz 189998414 BLAKE2B 6cf30a34a8a3e040895763fbf740e370469ecb9f71ab0d10d7b3c313f922981dfdf2eddaa64badac92d45db1a9945ed1389f1794a434b366034d43af263bf57c SHA512 51a2fc7ddff7d64eadfb7e2f496c33176dbfceea2cdcd479528195ce00454d3d9bb5ad82714e59bdae8cf2cf7f75ce9f1dcb9c5d62aeffda9d1ec9ff0262e04a
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.16.1_1.tar.gz 190493431 BLAKE2B 22e11711048b1e3e45eabd298c4ad25b2162e794561a4aa704ca2cf9612282b40203a6f16337416d16e065ec4764051a199af5b20803aab1c29c3aea6c2e39c3 SHA512 e61529d6782adcb9ccb78b0f3996bd2927b41a199210e6abec969880763e1b2234ddf04fe254110cc332df499616d67156a3b8376012cd3e6640f37e52ef132d
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.15_10.tar.gz 181012868 BLAKE2B b52d2330291ae8f8d74ba98b4679414e86c9018ad364bb27f09b5f192369c0b934654e5b4d8a07027e001da96fb89bd62a18ab5c1acea3c2cea2cc31e20a1481 SHA512 abe8469f5fa4f46f71e35785c6972b2901f003e311086352df6eff6911393c31c01ff965c74772656e2255e0bbb15eee6b761db472c886b60a8cda046fb46764
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz 181437038 BLAKE2B d87e38a9600e2f4289637f9b54044bb25777cd7a434eae89800945515ecb3965eae8f4660d18e96f1fb95e2401133e6630d98b3b23d826425bff5bd88e5b99b8 SHA512 72e2846718fc2e2a85a23cb97f49acf9314b7da78a79d3fe9cd0a91d34867bb2a3b6ace359b366caf564bb5d026f19400564e31064691016e9827a450b5e1a6a
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz 175250283 BLAKE2B 4b4fe6a5018cfa40ac71cfcf41c261887890e339d9e5f57aac55f494abb7a4e99263db151d85698690513caf670acfef29a83616e49d6f845e02cef024624fd6 SHA512 98adf9689782aa78d61f485e671c434cfdfae7ba92a7ce0c2401164250b7def2f881e201835e1ca2ab56a3ae4967c0923f4856171c2a4918f7190adf4b5e0bca
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.16.1_1.tar.gz 175833123 BLAKE2B c027ac3c128ee8cc6e62e375c66a642931a9344bd7d06cad6025094a8569d135a2982ead3057da7841ebcc5a02fc8c8db653f8aa09bcc8179122e1c1e6018be0 SHA512 f3af5dc335d0573ed89037a6227e96e75ec2031af6653f3a034b2d5e0737f1edc875aa883050783c6d556ce5a55ce4f9cd7859b574915b994b58fb26d906fbfd
 DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.15_10.tar.gz 193336087 BLAKE2B 0f61aba6b76b019ef7271dd92cd4b6db432318d629b5485e2f85a9ca586f1ce6b6d3e2c48486a4f3d90f8730e3fc7dd4f0975849f7c0f820812625556331db87 SHA512 360a349b34f2194498d0800145b54e5532b8a2137d7526a692a855a036d1cb6ef185bdeffaff63bb8cce71c7a0b10fee6acfb1024db8d2ec0cd485baa0683304
+DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz 192644240 BLAKE2B c7e77e1b620f6df33d63656a09203bd3d700579a8730141ea4a20424f844c6afc09f4c6681fa66c3fabab0cc9505293cdeed04fa16b0accc49209e0ea4877ba6 SHA512 457df026841f11a424e8f8fe789ba4968d60b0a06deef01a69911ec2084fd4f14ae5dfae543bb646881ce8e4e34665c65670943a43cb2a83c6923122801de468
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz 193245074 BLAKE2B 0a559bd0513984c2bc93e31ab7afcb8f5fc152c9984d957359bf1901e46b25b25ddee81c4c8fc0f560e65b343f74e39c55a1af61526fceec0eb530309eb65383 SHA512 85b21da3ff777b6239df5534ee3539b256a1de5d02abf4f537bca38d2cbf8006b4130d8bde2e24835a8da7a651fc8852df2c5060d26b9d594927f4d609912554
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz 193754645 BLAKE2B 5ab76378de497da3e59b5c33025322aacfa67edfa9766fbee346399f8dca71309aa9e6c6ad43a59c2bc7033fc01806b045832ee6b57f08956a2d696e760c247d SHA512 38aa02b8ab14b678b226891ffb2d2ab1248202d595e8c37ded3479d3d0a210355df75cabb62b03ccfae5369965e80ab4872cf7f530d0ddbc4cbf4c9a0f922e37
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.15_10.tar.gz 186328533 BLAKE2B 72f662e4aed529de853e47b848b46c15fade1a8c120f83b3409492801084114724f1d3875fedf1607133192ef5a612dbab828e578bff98adf1605fd990a24b21 SHA512 af69ea99e3d3b7ae84405190a12f788348162fd235aa5df8ce7ea3127d961e015b51cf70277aefa0e29a434ba10876812e997a063c5aaedafa460fc5451783c7
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.16.1_1.tar.gz 186335152 BLAKE2B ce97404fe164c89cc43d053e14a4abd596c104a6dfa355cc011de274aa5e1b9d2d5cb881299fad7877fd0b49bf1f738672eb565d4c543720d059663b34fd5da6 SHA512 6ccbbf271e23d6d2315ac62e5ea574991e728a4298cbf217aa7fffb3717c6a13cd82a467d15a0be9699e7b9e9a062ed0f10772165a40604f2f3c8e02729a6eaa
 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.3_7.tar.gz 190142132 BLAKE2B e6b0fb199ba788a31b6238d3bc458216baf37f1517a449be63668c412dfe7662d644ffdb312194533d4af089ac2753c164059978d65eddd951bb98bfc108da87 SHA512 f406ae289659e902dd3314d40485c1f3b04915451794c2bebfb1eeda7c83dbf051c26461aec7fe07c1a43f5319f80044aefc99c9177e2a9ca0a31a9c9f06c157
+DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.4.1_1.tar.gz 189797923 BLAKE2B 8732ba8ce23d8ebdcac7fbb2c6035c3cafd11eda4853b948327c6c9839a88294d5c89a03006d542c8ab797b3d4d570aefc6289ff97338d68089387d0ed742d3c SHA512 d2bcf2b766e3135320f28de1df47c3d3f9012281501390ffb6a4c01f59c72fccd348139f4eeb0a9bcce747ed8cfb04f2c8d78161dda2f2f6e0728993f8953061
 DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.3_7.tar.gz 177467402 BLAKE2B 38b8508e81bcbaf90a1db9bfe3f804da9838cc43b6043c328d19523c83dc5d953465a1018a9054979163140a28f5e213815634005cf096f6932407e8f7ccf9a6 SHA512 0433dc839a98b810cad9fe0d98c46cabccec5ceb44fd5bc67fff0c27962f183a3814b9aab521768b578d8f11bda97934629bf9fce5c010cdc93c685b842566e7
+DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.4.1_1.tar.gz 177121101 BLAKE2B bfbbdfdf77e5f52bdef3bc9ab387590f2d02ed7f039ab49b15127b9a09430b0a9cfadde04cdb70668812d68ed4279dce3fceee6183d469e0ff4b37f43bff60cb SHA512 36403f81c06c4d7bb76058bae6a4e5c94d3c134f9b6ff9ec4b9f8ab9437195f0e2e2c2770cea4d765a182a0b2fdfc4b7fc4343fa5170af5720343d3fe0302e02
 DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.3_7.tar.gz 188309462 BLAKE2B e47b98ebcb661631732e3238ce3cd1630a0a2103d7e32beabb49d1a0ff216c34c0c39fac11a848474a36dd2c98f6724c58900e3026d04cb7e4f7f00adbe1fe18 SHA512 9158821b22633177866ac0a5c4ffd774d2d750adea2de2adce661060ab7d28cf67fc703eb9e0e200149fa03eb040a05dc45ac944dacd140e0d0fa06515584795
+DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz 187944772 BLAKE2B 6e04360ff4abec1bb76d5e73bc21716a935224ccd799ab4ee09f989a996ba4684677cd28545f90ef9a5d53e1ecb46a0e1d641c6c41aa93f74992b53cc19ece5e SHA512 850a0241ee1c67b5f8c2350432de82d3d264015cad7455f98d392b5bf32bc0b44aeaf1fc9b42035a2a13f157f57e833667329970e61f4626b88bbb4fcfd39482
 DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.3_7.tar.gz 190898839 BLAKE2B b5188190ab30393ff789724ca99ce89232d8a4d81c22205111da4cc60cc258fe5bee47a5550cf032937542d7fb677af0de9aebbe39fe20b4af223a6d7d3211e5 SHA512 e1f1ade72f12c21eef9d34d05e2a4a8228320138d0c626c4eb31431ac9d5e5123ec8ef24c168005e3bb3508537c826399122461a0ce8de1310ccab40d8d21145
+DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz 190474121 BLAKE2B ac8b741cf29816960de615999d5030f03677fc3a370c0c430d408802535cbbb2b304aa18d036529d29c1939c2d43ff84bdddeb15dde5a22bbda7c807ddc900db SHA512 04c9182fc503369b7dcf53729e3c5e7f16828477e168d279806c7968482588ee5a04b1c31407c2baa1c1d24468592e1e416a9ea2115391113b83e792457e31b1
 DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.3_7.tar.gz 191298712 BLAKE2B abcb97374d38cb7457139865617d7570627d390c0db47ed572048dbb9f35b7cf6cf1a7d973684607ce3f7477f9b03b85ba43b8b4447b04f9fe1bfe419a18d190 SHA512 4e69597c134f37db83b44fd86e13c25ded20d8a1b2d8e959b6ddee29e5cc8c2a7bfd449636399f2d7bf030d93b2a29236e614a1578f9bbd37ca7e12249dc80bc
+DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz 190514211 BLAKE2B 07f802438dffcd54b07ea5342ee78fcfecaf51bac90666aadce34c871f25df6e21a30565e17952dd13fc5da9f032eaa931b66a725f416c98bcbcad0a1d584ad0 SHA512 927a83458e89ff8acd82a443cfe08d6cd93e73bec3311661d2bd4e09eba151088e0d1f40206f50c681586d6629a02c4549fc97df043edacb255e841ea17c83f4
 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz 191514138 BLAKE2B 3e2d64cdf15c63f2f50148576bc8ed085ec808a28a07113910f7b04c5729a1a56840751da627d8012751a7b533f6730c3a9bb99914382caf82f63e5a65dad40a SHA512 144f1e1c0f9558bd0be0536b48b89081579d1232d75c00fcfb7be2460475a4eaf3a6ae89007e683fd6148b4ebf33c2d9492419db96090e07f4ae52afc71df861
+DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz 191174859 BLAKE2B e6552e71279ca4a6d04a6e6d5a1707720fa7900c03fb31e312dfacf44d4dd699f657fe2f672881783a1918bac1598a99b4c56d90bb42b2c28a75762ea647f2c3 SHA512 db61842d4482da4fd5b86aee5b1c7f7c28218a58d73850513f272153a1ab09374462cd0d6f631b69f30204e5cfaca44357fa481dc4ebc67a50eda5b71a761082
 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7.tar.gz 187277835 BLAKE2B 2a6766ae47281222a570485bbb67b10b78b2d17399a2fd76e254be3d30808a09002fe6fcf5814be044c4a95c3f791af4b45df9320cea5ec212f9db38329b1630 SHA512 00cb5c5628ef2fcbc44ffcb2f81b8cae8c57107df8c456b4f3bf6897269daebdbd9ce0fe78af686cebedbd2426fa85095b198d47578828404a1b046eb0cbca60
+DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.4.1_1.tar.gz 186906753 BLAKE2B e86da7cb28aa43fde9ab947fbe886ed2ce4985d15a3aabf846f5bfc647203fe330f5333c9a7bf30936b2b566424c695c83b246baeda10b32de1b59a118414fb4 SHA512 b4911f006af320acf7ce18ae981a3a29d72d6fc1190bf4a0cd47f389d415de4980f65a0007a7cdcd8f15b7434b2e0e772acf4dcb3b76daa32841c7b4016e9458
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u332b09.tar.gz 102003248 BLAKE2B 75eb1dc4e09f868ca1a5f0ccc275e36992414e250c2815ab2a6e879942dfdd57a069d6d2cc79aee967c8d2077cecef6d65285cf870e70d22aebef607e906dbec SHA512 cf716f9a614932ccffeb8a7a2ee3a2f10543b31b8f6953933ba4785f386873fe00fee69061c70c26b55a6db13f26ba529f9953d7f3fce9b42172fe3b4e0eee52
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u345b01.tar.gz 102022940 BLAKE2B 40b14e0399de76c6dd2bdc9cd6b3aba7d62cddbb636a2b11a905dc432b0aa91ad62d415203f3f83c0ba82c3667f83a485ec57e71077c26c8eaf35c0f08edd713 SHA512 d932f0a0101fdce350e48a4a79754477478b6c345bdd66bd63be53a10fe6e613b89028d4ebb03d48e85284d5a1caca7f128690765e91968e01420f5fbc08ce48
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u332b09.tar.gz 98261468 BLAKE2B 7fe2b5c6178af88ebf390352f67acca7216af23d6015beb8e94215d1af82b41c2b8e8790c00b5fbf363837a98ddb051a6ebede5fe78f471f09331c1014bd85ec SHA512 17c9bdc892dc479bd7c5bef2ab3a6637cc499e1c257d6ddd541e7f372d6737d644920538e0c39e8aa7c905f0f1172429cc171d608bd337e872be7b399733b25e
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u345b01.tar.gz 98273349 BLAKE2B 71556f01bcd6f513af963fc9c9b2269460faa9f23ad85429fefddc169038aa1c98fb505184aa216f08b96a31d5d8e10d831ef65d7f9dba9499783eafca08b824 SHA512 8e9a5155cd8f769c25b79863ccfa8956cfd252278eca7f105d7179cca9ec2035580d959a5662aa263d852699000478344fab816301a809961cb2d1d5ccaed758
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u332b09.tar.gz 100484069 BLAKE2B 7e3b0186947f19094d88140304e756b7b2728560299f330c84ed8f9ac77c40fb046c2731d22c5d30e5d2837b878caccb19e8f1174f272c2fb29905db15500640 SHA512 adcfa446254c7de8b80f040e7f9960625c0314dabc8b457dee9d95216050f9aedc0c59528c29f7f1bc950c3ed0b713f3234dd9f9fb2a5bab7e706dbdb2eef42d
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u345b01.tar.gz 100474631 BLAKE2B 32c98c9b0c97b427b880589c26002fa67f90980b099090a8b43a0c4b3d71319617126b55da7102abe9d15b0b3569fdd7f4288936607258a278fe805e875d469e SHA512 37501b2c3ebe224404c34a847ed643a95ebf85aa6b8412bc3405ff3afdbecb9a69b2324b774d96d9cb5ba44170d84f6ac0026ea66c1074c13ef06c330952c9fb
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz 102918585 BLAKE2B 55d7ef116ee28f37ab1a96cb8ffe021d1784b208ad248e78d6f0a7f22429364364e00ef17fe6159fac2fde6a0765a20125db6ce17694992dbc9e3b3e054adddf SHA512 9f387fb8b872b65fc6a545151c185b9ad1aaac7ad7cffac4d2b936dedbca116a7d74e56754353ffa4caed394497ca659852f0e5e3803ead10f8fa95d562e28a8
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz 102925260 BLAKE2B ce4e79c98f5f3b2119fafd0ad43ca64bc823ff9adf20cd76e4e8c0de34ddc11cce7311d0ffc1cdcaab70632b3c18dca5b57c916a01230b22fcc74c4e8e08e3c9 SHA512 92bafba262a269ec3be7d83d8ca36468ad69d850d44b373c04c92a14c74a9aa89314f2aa68a6565c41b302c60fb8d19f1cf0f3075924a497e8be05e8a08ce95d
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u332b09.tar.gz 107924497 BLAKE2B f1f283b33f2e81a15f6ba01b7c2c63093b8a12dd0c9853ff9a2cea8d5352b6994266e8653135574f59a24da7294e602c5dd2fb3524065aa53e21b8313d3b0d33 SHA512 c7474e6a81d9e44e7c48388917de87733bfcb13c99a6d253ba180ac8b826ec79f1871d57dcc3e2edb4929f2687541156770c7568162a95389cdf1606d8e65397
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u345b01.tar.gz 107934646 BLAKE2B 766fc30b428283a5c4bebad76043e0d6fbdc31c747a09ce4f9440ef1493b4127dd7c0a9d0bf04ca0a6fe9215556224d157355b7cf14e685ed3791b6ca5d226fc SHA512 3a70f6587c858b675adce10063197fa97683157b4e3506dcae2649edeffe32ff8914bddee63a6856c3390c91f97fb79a11ed799f95a73526f48fb96cb92be26b
 EBUILD openjdk-bin-11.0.15_p10.ebuild 3174 BLAKE2B 0b8853c57d4526e116d72e690c0d6e0e9187a8230a64ab03f3e6c4a92b629bae8072bee50f78fd2061d7e49624e140fd3ff1c3230486c5e510dc2ae7203d2f39 SHA512 2558eb3aba44ee55dc3594352ef9236b4c2d31ffd06e6202551a3ab012481a5277bdf5c3dbea9069a2cbc57bfc415c3200f7855c74533b98d93ac1ff105bec23
+EBUILD openjdk-bin-11.0.16.1_p1.ebuild 3177 BLAKE2B a990f8e900b381650c86991efc235ccb0348b05f79615449e1c2f60490ac62eac381d24721a35428844a9636196e62befba3c88362aefe381fe847a2f80b298f SHA512 2701854ab8ca343ada8011b7eab57adaa913c147f503bdc89cea247c259d42acc98f5a68cabaa0cf25eb905dcc36919e215a68a498b155292739ff1cb23319e9
 EBUILD openjdk-bin-17.0.3_p7.ebuild 3234 BLAKE2B 33af600b0c89a48e6d230ac33f8638592b21884f1fe43084c5accb962846d7e8fde3d726892a7316521c96777563008f4247996053afd72148c0f1b50ecd4d82 SHA512 9bfb031cb553df1ec7d685c427c45d41c0370da05523a969f2e37f4f9ef015aec144361e3e1a7f9d05e82d32ffd66fdd9d7b4033c85fa2698fe61851ed0b76ba
+EBUILD openjdk-bin-17.0.4.1_p1.ebuild 3209 BLAKE2B 21ffb6b32e87406df846f23ed4542851c5850e09741b7311b20ff0321c097dd2e3618c978d9e55fa94a88a72766bf54fedb121a9bfc08cf4b2f677f8beb83e04 SHA512 9d1f22bd3c40d526e14c4622a5cc2e7a51a44edfa7b500425a4a438bd7889244239afbbb018e380778f775a03263e6e156bac56c555efa171232abdce48ac535
 EBUILD openjdk-bin-8.332_p09.ebuild 3033 BLAKE2B 80676ac6890b24143dd2cdd49f0f308921dcfaed61b4ac89fad69125aa7e3c51b73400bd32411d62805a170ab494511e35e444e30608cc726ac602a4404010b1 SHA512 6555e6b3dd707622012f14bf96576d493e150ea8a2f9c0eb75bd90d1f4d4319e8d9e4ebde6b0f785be538c1fac85a76fd11d24dd9b3debbb353e8decfffd5636
+EBUILD openjdk-bin-8.345_p01.ebuild 3036 BLAKE2B ba10729eea66777aa72eaadc366f72caf4a34e435f559279d6d5b48761e75f51d4145701853152e95b7d68a3293734ee97f0945e7b19fde82a47fbf67fa3221e SHA512 5dde101ef57ad6d632bd6475c447be193e07b7bc60b4a4fb42b567b3b9b98f894e8744027db7b3ba9d4eb624e945b7122946659562c87c62cbfefa4727f28bdc
 MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.16.1_p1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.16.1_p1.ebuild
new file mode 100644
index 000000000000..1e11ae065419
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.16.1_p1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+	local musl=
+	local os=linux
+
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+
+	if [[ ${3} == musl ]]; then
+		os=alpine-linux
+		musl=true
+	fi
+
+	echo "${2-$1}? (
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+		${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+	$(abi_uri arm)
+	$(abi_uri aarch64 arm64)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 x64-macos)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		media-libs/harfbuzz
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_unpack() {
+	default
+	if [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# Not sure why they bundle this as it's commonly available and they
+		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+		# also has an explicit dependency while Oracle seemingly dlopens it.
+		rm -vf lib/libfreetype.so || die
+
+		# prefer system copy # https://bugs.gentoo.org/776676
+		rm -vf lib/libharfbuzz.so || die
+
+		# Oracle and IcedTea have libjsoundalsa.so depending on
+		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+		if ! use alsa ; then
+			rm -v lib/libjsound.* || die
+		fi
+
+		if use headless-awt ; then
+			rm -v lib/lib*{[jx]awt,splashscreen}* || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild
new file mode 100644
index 000000000000..10cf917bc189
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+	local musl=
+	local os=linux
+
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+
+	if [[ ${3} == musl ]]; then
+		os=alpine-linux
+		musl=true
+	fi
+
+	echo "${2-$1}? (
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+		${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri arm)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
+	$(abi_uri aarch64 arm64-macos)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 x64-macos)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		media-libs/harfbuzz
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_unpack() {
+	default
+	if [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# Not sure why they bundle this as it's commonly available and they
+		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+		# also has an explicit dependency while Oracle seemingly dlopens it.
+		rm -vf lib/libfreetype.so || die
+
+		# prefer system copy # https://bugs.gentoo.org/776676
+		rm -vf lib/libharfbuzz.so || die
+
+		# Oracle and IcedTea have libjsoundalsa.so depending on
+		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+		if ! use alsa ; then
+			rm -v lib/libjsound.* || die
+		fi
+
+		if use headless-awt ; then
+			rm -v lib/lib*{[jx]awt,splashscreen}* || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.345_p01.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.345_p01.ebuild
new file mode 100644
index 000000000000..7834a4a17075
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.345_p01.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	local os=linux
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
+		)"
+}
+
+# they have different tarball names for different arches...
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT=$(ver_cut 1)
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+	$(abi_uri arm)
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 x64-macos)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+
+IUSE="alsa cups examples headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		>=sys-libs/glibc-2.2.5:*
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		arm? ( dev-libs/libffi-compat:6 )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+	)
+"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}"
+
+src_unpack() {
+	default
+	# 753575
+	if use arm; then
+		mv -v "${S}"* "${S}" || die
+	elif [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# this does not exist on arm64 hence -f
+		rm -fv jre/lib/*/libfreetype.so* || die
+
+		if ! use alsa ; then
+			rm -v jre/lib/*/libjsoundalsa.so* || die
+		fi
+
+		if ! use examples ; then
+			rm -vr sample || die
+		fi
+
+		if use headless-awt ; then
+			rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+				{,jre/}bin/policytool bin/appletviewer || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 3f190521a608..f61c0f1d9664 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -2,12 +2,18 @@ AUX openjdk-jre-bin-8.env.sh 573 BLAKE2B 02f032b60578e95a5f370afce4bec7aef12262b
 AUX openjdk-jre-bin.env.sh 342 BLAKE2B 194a81416378ac4729fc333f40c210bb33dea66cfc2b6a5341aab048c63f2c7c9a7bf9c45f10f5d23e2d7dd99cde80b03e79a79c30d08b6be90d6d8d6e850ec2 SHA512 6690285c5fa3866731ef28e0ff2153395e94a3e37837bf334ebea8fb132915a37002d70457810dbddbcaff78d5404f14818735ab6a722456780add4ad9efdafd
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.15_10.tar.gz 42471028 BLAKE2B a88fa041ffdcedabbcdadbb1eb4a0052456666ba779eb0f82bc27ea7f2923a1b2e538d14d5f615869e456b1bce48859211134c6bd9d31c2c082068686b68fd59 SHA512 a8a8a9c9f243aaf9b051bd0c35009ec96a28dcf47b53139dd59891a5ff2ced590e56961edb093cf67b8239d92a4b407f631b389fdff986fdb746316f420abf34
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.16.1_1.tar.gz 42705612 BLAKE2B 02b0239a613f0738c7980105cd8595c0bbf456ba13f669dd11071313260d1fdbe1bc0c91e9fc9252cb04078ec7da36fdb4cf8a3408d1afdb7298f88bb75a75d8 SHA512 21af841b9e14ea32e13dd45fb2e693c0dfcbf65e99ebaaee44f14188c8b30c2cd76de816dc184b7bc9f376b26ab6bb9741be84f37bb99bec4dc381aa7ce9ada9
 DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14
+DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.4.1_1.tar.gz 45941557 BLAKE2B 877a194672bfb950203d466191c1c220fffcca86559c0179c573e85152b9e63d253891989ed825181f3e034dd9d6f5cfba10986cf1c019e7faf73ad9a89bee48 SHA512 0bea14d42df99771e8e02f705f9233fc666904667607ca66e47be57fb09131b0a9d70b7bd4cc5b322805cc09cb14ad711db60348e9d17f9714884006185a928c
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u332b09.tar.gz 41336220 BLAKE2B 52eb9aa2623335bca7be71d1aca6b4292a029554ef9f9e0e1209a7fa0892931c37b670f9f90586d4ff3cd35540a3a7cb230f20789481836d20f04d4cfcc56596 SHA512 c62002aa1a28547b0b0cefea3f83af2cf6507002bf296b1b83bd04406f4c362f4c74940209ebbd3803513395bec7503882aac7f8d35dcbf6a6e02e9155a53cdd
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u345b01.tar.gz 41336188 BLAKE2B 05c1ff3f0561410dafb88f1ce1486decbe56f528cebde4f5d05d589e5a7c706e84bf23f89cda68b19212dbd9b109546a7b78b407a8453c9f040b9e95f5f9c35f SHA512 15cb0be04c9a516476405107fc472470b4576b3893aca8f926b8f007fcb21b6eba1d87a52a806ec698cb3a8b17bae8f557445e9201be2f2d7246a67e28df0be4
 EBUILD openjdk-jre-bin-11.0.14_p9-r1.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
 EBUILD openjdk-jre-bin-11.0.15_p10.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
+EBUILD openjdk-jre-bin-11.0.16.1_p1.ebuild 2002 BLAKE2B 143d1ded658c5d98145ef185d859152e60f648f79c22803d5c0c6d9250892ee3964f9fe3cc99553aef1e863cd9068b19b290162b63d0ebef8fdf15f001f1cbbc SHA512 a89e0a80bfe0f7142d4167a88f7331075d202253bde9fbb294c9173f39ab3b3492e3094679d545339eb6ac221fc1ede3299104871a127b7e16eb90a73f020cfe
 EBUILD openjdk-jre-bin-17.0.3_p7.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
+EBUILD openjdk-jre-bin-17.0.4.1_p1.ebuild 2002 BLAKE2B 143d1ded658c5d98145ef185d859152e60f648f79c22803d5c0c6d9250892ee3964f9fe3cc99553aef1e863cd9068b19b290162b63d0ebef8fdf15f001f1cbbc SHA512 a89e0a80bfe0f7142d4167a88f7331075d202253bde9fbb294c9173f39ab3b3492e3094679d545339eb6ac221fc1ede3299104871a127b7e16eb90a73f020cfe
 EBUILD openjdk-jre-bin-8.322_p06.ebuild 1832 BLAKE2B 31dd2783dad44148857303b74c82b556d1360338b80747f36fc19052c5091ba7106837777b6bfffb088b5c31fc4072529cdea994cfc35b4f56bc032d5830a000 SHA512 df9a819e9673d952422d9dcee7d1f901cde3982dae1e64ce4ddce39b28ae7eae96d1598718c311412d9727a977ad4ed1233e43c933564ef0e9afd7fc97817d56
 EBUILD openjdk-jre-bin-8.332_p09.ebuild 1832 BLAKE2B 31dd2783dad44148857303b74c82b556d1360338b80747f36fc19052c5091ba7106837777b6bfffb088b5c31fc4072529cdea994cfc35b4f56bc032d5830a000 SHA512 df9a819e9673d952422d9dcee7d1f901cde3982dae1e64ce4ddce39b28ae7eae96d1598718c311412d9727a977ad4ed1233e43c933564ef0e9afd7fc97817d56
+EBUILD openjdk-jre-bin-8.345_p01.ebuild 1833 BLAKE2B 3a7cf0e521421f430068e35e9e5817b7f50ea8036c8b2ef5f7708096f40baeed4d6eb9df93538c8eb3d949d477c553e8ce886409ee4581513c4e935fb672d29c SHA512 06250bf0e366cece0d0782a9f66b129990699819a7e6a1bdd4b6ca7fc8e1268ed26d4015f1c925ffb899d87226f8c7ae22787e08851e00a9e3050836ec44e70c
 MISC metadata.xml 896 BLAKE2B db8489d7738bb5444ee789ae0dc516941ece1b814ce4c4d0e12284e4027315aa20b141027ca6db8aae7ab6580d881e79bcb1b4dffa8a890f75da6d7177c7c279 SHA512 8833e637b8b935247972eaf7afbf3787cc17013080d9747defad4784ea89c2b147d0f2284327e9ade30100594a0d1e638f0ecd01f0375101372028dbfd0b31a3
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.16.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.16.1_p1.ebuild
new file mode 100644
index 000000000000..43ec32db6c4d
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.16.1_p1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.4.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.4.1_p1.ebuild
new file mode 100644
index 000000000000..43ec32db6c4d
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.4.1_p1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.345_p01.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.345_p01.ebuild
new file mode 100644
index 000000000000..d4b6279fcfac
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.345_p01.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v lib/*/libjsoundalsa.so* || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
+			bin/policytool || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index e29b3fe2a05d..317561df68a1 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -4,9 +4,13 @@ AUX openjdk-8.env.sh 687 BLAKE2B 4bb851545955fafa6a4b08f2589fa9a5441ef37484eb21a
 AUX openjdk.env.sh 432 BLAKE2B 8779a373af2f9e52473cb5e3bc2bbcb7fa83c6d09382d498466888dd322299adc1b736c6e3723fa68e92a80067599228b3511cc2826e1ebc3c5845a7a2f62fa3 SHA512 e6604a88fb857945a618e4b7735d49dbc23bdd4c6fb70fc5753470e9c1047825208a40fe25107bcde95f290656b44f92e1667ebc414454cbae2e71f16fec5fbd
 DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650 SHA512 32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d
 DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B a2dabad415a92765d548b19261e22e2cd483a17b478c8ef98342b44e88b39b23d89d31aecc80f93b27fce8df50ba41f4e6e5f10b66035bbfc1e0c03fc4707a40 SHA512 9d9e631046769d3ad95229172f392649ef4162161eb2d6fa7371665619600a04db440e1b3d30c580e283ad2b6bd7580d1199fc854fad3cb962d79f18b2347c67
+DIST openjdk-11.0.16.1_p1.tar.gz 123134756 BLAKE2B 727294bb9d07193bb74b01a3e3e35f491b54be4cf3b6230e59df56ea7a9166b0b138f82b3d3c302c32b21efa8e9ac71437ca430a68a9ad8b69a7755d289bde17 SHA512 c694a8e6b0ff664b2c6a43ef3445d98e3b4ddf59c7fe94a21390b2d7756870ea7c7e34cb99d40bd66708ecaee93ffeb4dfc9ab7e2162bd6fc19479f23963560d
 DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 9b2036493a485a1e245230488a5985af4f5d5c6a85912d73d8a712742fdfc26d5eb08ca8e69dac04f0d516fb361e6ed057c95a3839b04639d129581cf00f0620 SHA512 692b5e39e5c6eb1222f25c3012e9a73366d9c98f5c29c2f2d35f41991cdcb026a644398b6f3fdd8c9d8368b4b1f5dc4d89b3dbd594a2e7751de96a140551d445
 DIST openjdk-17.0.3_p7.tar.gz 104797560 BLAKE2B 025ff6be360c74288990622bce31769e5780f3f326b0eed2b78a776cc4df8bdf8cb99dfb0d7dd3f03f8558ca9a66acc5c5bd04b227ba4dffe18f8586a287b74b SHA512 3bebaaf0469cd6558a3f033b768005e880ec95d5bb2a24b8929d2f6a05f18ca9977b291ad49b220a904f661cf6b47780a1cfd776109ed11d4e34d5345be8f66c
+DIST openjdk-17.0.4.1_p1.tar.gz 104892822 BLAKE2B e5c4ae7e59b7f078c3927ca74cdff4fe1f378da874eca45a7655fa7419c9abac6b9f81632c104614b7f1d6c20fbc5ee7f4b0a8e2aaef39a66f31377543e926de SHA512 33396f9d8101db605aac0b064d518a800194421b211f0d903d681968beab58540367e53293fa26d4751e4bd1f459a0d07bb08b2010ac64ea5438717ea1517f76
+DIST openjdk-17.0.5_p5.tar.gz 105040319 BLAKE2B 658df2630e1938d7787031e498474c347a10770a133d4d8234cb7450777264c07441ca56a1b09f368b837a182627d3a104848aa5e521d95b1b58e1f21f4645b1 SHA512 19b2466339db697a8564e44423878b5c5ed310478bf56aa7ace90d34458912c5f544fcea2c31eaba559c2fff33f818745e8160376eae8f6c3c694090aed7de09
 DIST openjdk-8.332_p09.tar.gz 88130953 BLAKE2B 9c7419851588dfbca92610f8fbb8b74fa7516282f82e8c7c37af88c776ba0c83a22fb3d4a1c2c2b98d44e394025217d095cff9c79fba53f9c5a32a43eb91ad70 SHA512 f6a717f77cc0e85bc2eb3c3c599d09e06a4004e4987a2caf0773b1197336722469e2abcca9d39c1f4c534d15cd77408d6405c9ee6edb3815bccd8e4872571aaa
+DIST openjdk-8.345_p01.tar.gz 88173976 BLAKE2B f0eca11f4fcb532a8fd156a74ff6629ea2d948c5d29d9b9638b526c57598618f5c3782ace26654be61f8d9ab229f44aa46112234c2d2e8a9bdc367c1071b6e53 SHA512 bb01156f751a0ba25290d1337356f9dd78121373220e2e2df07a4536e2ab31390865ab63d628901de7983d1679dd6dfd4bc3c6304911e6c76fe4c616bdf07eab
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
 DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
 DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64
@@ -14,7 +18,11 @@ DIST openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz 116557680 BLAKE2B d20e45a5a76e30e
 DIST openjdk-bootstrap-17.0.1_p12-x86.tar.xz 111479904 BLAKE2B 17d33f8ee81c2846f417d8e7cd1429eb611e916a6b375c76127179dc6afc55b0254248360c892ce37a178fd553934d952ec8955ff5d0613eb66678b8ecefe917 SHA512 094bcc960801e5fd7e1c966c8101c195ac7fa5e222d9c8e79ca64f8a3e6812613c17a0356211e7dd831325fa11af88cc22ed56c434d65504f18dd4f4ceaedfdf
 DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab078085f094bbcc65448458d98a0f521e3b754c5118b1b4f957cfa00c24e896c811c2a477822c469ffcfe0de1ad6a8d0b7db23b0b09ae3b459eaf8c4fc8 SHA512 e30acd6c64a0095f4203129ecf2cff4c6b4293bc017457465d3abb746d280a2f5d89028eed22f7f3d236890d047149c7aa257e3b49593d7a6ab4dd6b777a7c26
 DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f
-EBUILD openjdk-11.0.15_p10-r1.ebuild 8089 BLAKE2B 2a0923de32ada4c7d18a4b27eaf6ae069ec732a82d220e944728f06aced1511fcc70b418e2f47209d1f7fd7f74e4aaa2d8553d39d56e767124a46653a8d726b5 SHA512 e7c1c9896d697105add1830d0652f516f13d0d242fe601fbf8041ed6454d1bd582c976a5e3dd9a1fc5069ae8b095272514b9f427ebd1c400e6792e25585cd959
-EBUILD openjdk-17.0.3_p7-r1.ebuild 8841 BLAKE2B 7a269f82275db2f1ae6ae01b598e30d3340b15ee7fe78227104864987c8fafba141f5a8d4d1aa4e9493f0eef2464074c2cb25b7df971ef6834f4cf05ac64da00 SHA512 723e76e909b231b2154770f98a644afb2a9ae4863a1631b6d03d1077caf0f7ed7ea70e7eb102b0239ecc7203ea1635f1e52a8f75ca5871dcf429d39cd4a9f539
-EBUILD openjdk-8.332_p09.ebuild 5854 BLAKE2B a769adb453189ebfa6befc3927152b134da1b2619f27d3d967d6c9db2f1ce64e24e175c2de7b0dd00c0804853df6580a78929f0f43ab515d3442828659a53aaf SHA512 5341416b0c67668ac713373cdbbe2dc7869e9b816175ff357ac086ead1495c89826662a3b662720923f6222b8051677a70a23df2150b9f48831f25a6005e9b5c
+EBUILD openjdk-11.0.15_p10-r1.ebuild 8425 BLAKE2B 71dd261987e7a0690b685211b645b9ac53f3b8e01cba388f82893b4bb4afc2ba69c7c4a8fd2095d097f0f0cce613d7ef9b9f080a010e30a72746990a11745747 SHA512 e1d242e838f10210c9bfaef0b2ec70f59f38bafca7c1d22c2bdc7df46c22fcc3d48f27468a02488f415fe765e5c418279cee320e55fe6eb13cbcfddaa92ae098
+EBUILD openjdk-11.0.16.1_p1.ebuild 8429 BLAKE2B 8d4f3e16513d52f5a92a917057c0e46283b29c17853f40c08f81939cef0e5f1aa7e2c99535d776be13f37df6e9e5f51762a861c48d2bec9c6bda6d6a99e0cfed SHA512 f4598d99b1e26d1f08cc7c9aa5a8f93424665e18bbc913562460a080738b5ca9d990618dd47206b161f81908efdfcb3cc6444341753c1b5dec83645156a58b60
+EBUILD openjdk-17.0.3_p7-r1.ebuild 9182 BLAKE2B b398b29f7dc72d8e5afcfd76552879699de72e748a288ea44cfdcea86703f764bcabf3e4dcd585d62186bdabb47ff7b3f3fc529b1beff3ad19f1bf0ec223e5a8 SHA512 6498f31530c69a7b2129748d2056cac6f4a0420566af27ef1a8f5918a4c2973eac9c162acb646314f7599cbcf9d825acfdba06af39ee2fc6db578d62c2353ebf
+EBUILD openjdk-17.0.4.1_p1.ebuild 9154 BLAKE2B ccc6bac4d4c63214a437ba3ed651f2e8e4173688e545c05c3e787fbf9830c3606f2f5d9836bc70e1975ce5c44f4694b04b8907f34eb9663a7a16cb6b3ab350ff SHA512 57ca676d402ca6ae80fe9b8efae50099496d5a82df497aef5aba55031108527c535e4461be4d4a95438435bad8d25c861b1c1dff1a39a5816e66fc5ed78d946c
+EBUILD openjdk-17.0.5_p5.ebuild 9090 BLAKE2B 3694f3ce329e0aa41e1913da37d6bdd0d0aebf743a16973b2b9116b8760eb113fa4842ab62c03badaed55268bbe7945b1f3a5aad8487430a2b90bee065ea8fe9 SHA512 6b2f9dc62ea02c9637a83c0f952af85b1400993c82d03a131f08bef4e008981771832f2993c795afe8c76e0fa549f1b6d35e4b8d82964427b3fba1a99bcc787b
+EBUILD openjdk-8.332_p09.ebuild 6183 BLAKE2B e1519d397a5bbb99c91485181af982d1ef6ed674a51e0dff54426eaf1a1222cf38d2a4b30990f33cb868a6385ce4d433fa6b18e9b41db381259d2bfc5e421db8 SHA512 ca2653a9f7f74bb057f8c0023fa7a7b7ab9b367d8571bf5db7f2532939a0bcf7500c062628cc5055d1ee58e28a666999e0df5da5351c2a1c609509a0a74c272a
+EBUILD openjdk-8.345_p01.ebuild 6187 BLAKE2B 4a46442662eacfe3eb99348863592a7b40515f91aab59556ce16e70fb004b7b57d4401072dae4a6e4951054497ac91970a4209611895935ba05d1c218778a8db SHA512 0fc74381d7e3dcc658366bbb9e04ffcfabcb403d109b9145d12f8f9427451af3b99885fcfab0d2296ad8044e9c36aa4db5826d9b5a8959d8c5568f9b3a3bf4dc
 MISC metadata.xml 1506 BLAKE2B d56098f4ba9acb9bd5891247f5165beea69a802ae4fe57f6c0e4b54875efd73d3dafaa78f5c182e640028e31840aa6b9d16bafade717a469b4a43ccbe37cbef6 SHA512 84aa8b3bef355e93fea678612e9512ca2ce5df77efbf4f055589ff67387f0571e43eb5308b8c575eb09bf52b68e5fcc68fdd819a6781080755c3f6c24d6eb77d
diff --git a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
index 4b7612e1259b..feaa4c78cbc9 100644
--- a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
@@ -5,6 +5,12 @@ EAPI=7
 
 inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
 # we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
 # set build version properly
 MY_PV="${PV%_p*}-ga"
@@ -30,7 +36,7 @@ bootstrap_uri() {
 }
 
 DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
+HOMEPAGE="https://openjdk.org"
 SRC_URI="
 	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
 		-> ${P}.tar.gz
diff --git a/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild b/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild
new file mode 100644
index 000000000000..055cb96bc4a9
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
+# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
+# set build version properly
+MY_PV="${PV%_p*}-ga"
+SLOT="${MY_PV%%[.+]*}"
+
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
+RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
+X86_XPAK="11.0.13_p8"
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
+# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
+bootstrap_uri() {
+	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+	local suff="tar.xz"
+	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+	local ver="${2:?${FUNCNAME[0]}: version not specified}"
+	local cond="${3-}"
+
+	# here be dragons
+	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
+}
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.org"
+SRC_URI="
+	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+		-> ${P}.tar.gz
+	!system-bootstrap? (
+		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+		$(bootstrap_uri riscv ${RISCV_XPAK})
+		$(bootstrap_uri x86 ${X86_XPAK})
+	)
+	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
+"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
+
+REQUIRED_USE="
+	javafx? ( alsa !headless-awt )
+	!system-bootstrap? ( jbootstrap )
+"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	media-libs/harfbuzz:=
+	media-libs/libpng:0=
+	media-libs/lcms:2=
+	sys-libs/zlib
+	media-libs/libjpeg-turbo:0=
+	systemtap? ( dev-util/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	javafx? ( dev-java/openjfx:${SLOT}= )
+	system-bootstrap? (
+		|| (
+			dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
+			dev-java/openjdk:${SLOT}[gentoo-vm(+)]
+		)
+	)
+"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	[[ ${MERGE_TYPE} == "binary" ]] && return
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	if use system-bootstrap; then
+		for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+			if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
+				java-pkg-2_pkg_setup
+				return
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	use riscv && eapply "${WORKDIR}"/openjdk-11.0.14-riscv.patch
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	if ! use system-bootstrap; then
+		local xpakvar="${ARCH^^}_XPAK"
+		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+	fi
+
+	# Work around stack alignment issue, bug #647954.
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Work around -fno-common ( GCC10 default ), bug #713180
+	append-flags -fcommon
+
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
+	# Enabling full docs appears to break doc building. If not
+	# explicitly disabled, the flag will get auto-enabled if pandoc and
+	# graphviz are detected. pandoc has loads of dependencies anyway.
+
+	local myconf=(
+		--disable-ccache
+		--disable-precompiled-headers
+		--enable-full-docs=no
+		--with-boot-jdk="${JDK_HOME}"
+		--with-extra-cflags="${CFLAGS}"
+		--with-extra-cxxflags="${CXXFLAGS}"
+		--with-extra-ldflags="${LDFLAGS}"
+		--with-freetype="${XPAK_BOOTSTRAP:-system}"
+		--with-giflib="${XPAK_BOOTSTRAP:-system}"
+		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+		--with-lcms="${XPAK_BOOTSTRAP:-system}"
+		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
+		--with-libpng="${XPAK_BOOTSTRAP:-system}"
+		--with-native-debug-symbols=$(usex debug internal none)
+		--with-vendor-name="Gentoo"
+		--with-vendor-url="https://gentoo.org"
+		--with-vendor-bug-url="https://bugs.gentoo.org"
+		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+		--with-vendor-version-string="${PVR}"
+		--with-version-pre=""
+		--with-version-string="${PV%_p*}"
+		--with-version-build="${PV#*_p}"
+		--with-zlib="${XPAK_BOOTSTRAP:-system}"
+		--enable-dtrace=$(usex systemtap yes no)
+		--enable-headless-only=$(usex headless-awt yes no)
+		$(tc-is-clang && echo "--with-toolchain-type=clang")
+	)
+	! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
+
+	if use javafx; then
+		# this is not useful for users, just for upstream developers
+		# build system compares mesa version in md file
+		# https://bugs.gentoo.org/822612
+		export LEGAL_EXCLUDES=mesa3d.md
+
+		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		if [[ -r ${zip} ]]; then
+			myconf+=( --with-import-modules="${zip}" )
+		else
+			die "${zip} not found or not readable"
+		fi
+	fi
+
+	if use !system-bootstrap ; then
+		addpredict /dev/random
+		addpredict /proc/self/coredump_filter
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		NICE= # Use PORTAGE_NICENESS, don't adjust further down
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images product-images)
+	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	cd "${S}"/build/*-release/images/jdk || die
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	# must be done before running itself
+	java-vm_set-pax-markings "${ddest}"
+
+	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/images/docs/*
+		dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
index c79922b35711..9f355b7b9030 100644
--- a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
@@ -26,6 +26,12 @@ bootstrap_uri() {
 	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
 }
 
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
 MY_PV="${PV//_p/+}"
 SLOT="$(ver_cut 1)"
 
diff --git a/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild b/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild
new file mode 100644
index 000000000000..2ed126279a79
--- /dev/null
+++ b/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+ARM64_XPAK="17.0.2_p8" # musl bootstrap install
+PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
+RISCV_XPAK="17.0.3_p7"
+X86_XPAK="17.0.1_p12"
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
+# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
+bootstrap_uri() {
+	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+	local suff="tar.xz"
+	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+	local ver="${2:?${FUNCNAME[0]}: version not specified}"
+	local cond="${3-}"
+	[[ ${cond} == elibc_musl* ]] && local musl=yes
+
+	# here be dragons
+	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
+}
+
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
+MY_PV="${PV//_p/+}"
+
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.org"
+SRC_URI="
+	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+		-> ${P}.tar.gz
+	!system-bootstrap? (
+		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
+		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+		$(bootstrap_uri x86 ${X86_XPAK})
+		$(bootstrap_uri riscv ${RISCV_XPAK})
+	)
+	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz )
+"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
+
+REQUIRED_USE="
+	javafx? ( alsa !headless-awt )
+	!system-bootstrap? ( jbootstrap )
+"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	media-libs/harfbuzz:=
+	media-libs/libpng:0=
+	media-libs/lcms:2=
+	sys-libs/zlib
+	media-libs/libjpeg-turbo:0=
+	systemtap? ( dev-util/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	javafx? ( dev-java/openjfx:${SLOT}= )
+	system-bootstrap? (
+		|| (
+			dev-java/openjdk-bin:${SLOT}
+			dev-java/openjdk:${SLOT}
+		)
+	)
+"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-17.0.3-fix-nullptr-cast.patch )
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	[[ ${MERGE_TYPE} == "binary" ]] && return
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+}
+
+src_prepare() {
+	use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	if has_version dev-java/openjdk:${SLOT}; then
+		export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
+	elif use !system-bootstrap ; then
+		local xpakvar="${ARCH^^}_XPAK"
+		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+	else
+		JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
+		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+		JDK_HOME=${JDK_HOME#*/}
+		JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
+		export JDK_HOME
+	fi
+
+	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Work around -fno-common ( GCC10 default ), bug #713180
+	append-flags -fcommon
+
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
+	# Enabling full docs appears to break doc building. If not
+	# explicitly disabled, the flag will get auto-enabled if pandoc and
+	# graphviz are detected. pandoc has loads of dependencies anyway.
+
+	local myconf=(
+		--disable-ccache
+		--disable-precompiled-headers
+		--disable-warnings-as-errors
+		--enable-full-docs=no
+		--with-boot-jdk="${JDK_HOME}"
+		--with-extra-cflags="${CFLAGS}"
+		--with-extra-cxxflags="${CXXFLAGS}"
+		--with-extra-ldflags="${LDFLAGS}"
+		--with-freetype="${XPAK_BOOTSTRAP:-system}"
+		--with-giflib="${XPAK_BOOTSTRAP:-system}"
+		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+		--with-lcms="${XPAK_BOOTSTRAP:-system}"
+		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
+		--with-libpng="${XPAK_BOOTSTRAP:-system}"
+		--with-native-debug-symbols=$(usex debug internal none)
+		--with-vendor-name="Gentoo"
+		--with-vendor-url="https://gentoo.org"
+		--with-vendor-bug-url="https://bugs.gentoo.org"
+		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+		--with-vendor-version-string="${PVR}"
+		--with-version-pre=""
+		--with-version-string="${PV%_p*}"
+		--with-version-build="${PV#*_p}"
+		--with-zlib="${XPAK_BOOTSTRAP:-system}"
+		--enable-dtrace=$(usex systemtap yes no)
+		--enable-headless-only=$(usex headless-awt yes no)
+		$(tc-is-clang && echo "--with-toolchain-type=clang")
+	)
+
+	use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
+
+	if use javafx; then
+		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		if [[ -r ${zip} ]]; then
+			myconf+=( --with-import-modules="${zip}" )
+		else
+			die "${zip} not found or not readable"
+		fi
+	fi
+
+	if use !system-bootstrap ; then
+		addpredict /dev/random
+		addpredict /proc/self/coredump_filter
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		NICE= # Use PORTAGE_NICENESS, don't adjust further down
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images product-images)
+	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	cd "${S}"/build/*-release/images/jdk || die
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	# must be done before running itself
+	java-vm_set-pax-markings "${ddest}"
+
+	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/images/docs/*
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk/openjdk-17.0.5_p5.ebuild b/dev-java/openjdk/openjdk-17.0.5_p5.ebuild
new file mode 100644
index 000000000000..191467d5a34c
--- /dev/null
+++ b/dev-java/openjdk/openjdk-17.0.5_p5.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+ARM64_XPAK="17.0.2_p8" # musl bootstrap install
+PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
+RISCV_XPAK="17.0.3_p7"
+X86_XPAK="17.0.1_p12"
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
+# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
+bootstrap_uri() {
+	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+	local suff="tar.xz"
+	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+	local ver="${2:?${FUNCNAME[0]}: version not specified}"
+	local cond="${3-}"
+	[[ ${cond} == elibc_musl* ]] && local musl=yes
+
+	# here be dragons
+	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
+}
+
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
+MY_PV="${PV//_p/+}"
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.org"
+SRC_URI="
+	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+		-> ${P}.tar.gz
+	!system-bootstrap? (
+		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
+		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+		$(bootstrap_uri x86 ${X86_XPAK})
+		$(bootstrap_uri riscv ${RISCV_XPAK})
+	)
+	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz )
+"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
+
+REQUIRED_USE="
+	javafx? ( alsa !headless-awt )
+	!system-bootstrap? ( jbootstrap )
+"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	media-libs/harfbuzz:=
+	media-libs/libpng:0=
+	media-libs/lcms:2=
+	sys-libs/zlib
+	media-libs/libjpeg-turbo:0=
+	systemtap? ( dev-util/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	javafx? ( dev-java/openjfx:${SLOT}= )
+	system-bootstrap? (
+		|| (
+			dev-java/openjdk-bin:${SLOT}
+			dev-java/openjdk:${SLOT}
+		)
+	)
+"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	[[ ${MERGE_TYPE} == "binary" ]] && return
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+}
+
+src_prepare() {
+	use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	if has_version dev-java/openjdk:${SLOT}; then
+		export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
+	elif use !system-bootstrap ; then
+		local xpakvar="${ARCH^^}_XPAK"
+		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+	else
+		JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
+		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+		JDK_HOME=${JDK_HOME#*/}
+		JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
+		export JDK_HOME
+	fi
+
+	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Work around -fno-common ( GCC10 default ), bug #713180
+	append-flags -fcommon
+
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
+	# Enabling full docs appears to break doc building. If not
+	# explicitly disabled, the flag will get auto-enabled if pandoc and
+	# graphviz are detected. pandoc has loads of dependencies anyway.
+
+	local myconf=(
+		--disable-ccache
+		--disable-precompiled-headers
+		--disable-warnings-as-errors
+		--enable-full-docs=no
+		--with-boot-jdk="${JDK_HOME}"
+		--with-extra-cflags="${CFLAGS}"
+		--with-extra-cxxflags="${CXXFLAGS}"
+		--with-extra-ldflags="${LDFLAGS}"
+		--with-freetype="${XPAK_BOOTSTRAP:-system}"
+		--with-giflib="${XPAK_BOOTSTRAP:-system}"
+		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+		--with-lcms="${XPAK_BOOTSTRAP:-system}"
+		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
+		--with-libpng="${XPAK_BOOTSTRAP:-system}"
+		--with-native-debug-symbols=$(usex debug internal none)
+		--with-vendor-name="Gentoo"
+		--with-vendor-url="https://gentoo.org"
+		--with-vendor-bug-url="https://bugs.gentoo.org"
+		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+		--with-vendor-version-string="${PVR}"
+		--with-version-pre=""
+		--with-version-string="${PV%_p*}"
+		--with-version-build="${PV#*_p}"
+		--with-zlib="${XPAK_BOOTSTRAP:-system}"
+		--enable-dtrace=$(usex systemtap yes no)
+		--enable-headless-only=$(usex headless-awt yes no)
+		$(tc-is-clang && echo "--with-toolchain-type=clang")
+	)
+
+	use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
+
+	if use javafx; then
+		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		if [[ -r ${zip} ]]; then
+			myconf+=( --with-import-modules="${zip}" )
+		else
+			die "${zip} not found or not readable"
+		fi
+	fi
+
+	if use !system-bootstrap ; then
+		addpredict /dev/random
+		addpredict /proc/self/coredump_filter
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		NICE= # Use PORTAGE_NICENESS, don't adjust further down
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images product-images)
+	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	cd "${S}"/build/*-release/images/jdk || die
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	# must be done before running itself
+	java-vm_set-pax-markings "${ddest}"
+
+	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/images/docs/*
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild
index a375e49ff167..e2f8f421b145 100644
--- a/dev-java/openjdk/openjdk-8.332_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild
@@ -5,14 +5,19 @@ EAPI=7
 
 inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
-# we need latest -ga tag from git, but want to keep build number as well
-# as _p component of the gentoo version string.
-
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
+# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
+# set build version properly
 MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
 SLOT="${PV%%[.+]*}"
 
 DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
+HOMEPAGE="https://openjdk.org"
 SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-java/openjdk/openjdk-8.345_p01.ebuild b/dev-java/openjdk/openjdk-8.345_p01.ebuild
new file mode 100644
index 000000000000..0981ff23ed4e
--- /dev/null
+++ b/dev-java/openjdk/openjdk-8.345_p01.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
+# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
+# set build version properly
+MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
+SLOT="${PV%%[.+]*}"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.org"
+SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	sys-libs/zlib
+"
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/icedtea-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+		dev-java/icedtea:${SLOT}
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
+
+PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# new warnings in new gcc https://bugs.gentoo.org/685426
+	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
+		hotspot/make/linux/makefiles/gcc.make || die
+
+	chmod +x configure || die
+}
+
+src_configure() {
+	# general build info found here:
+	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
+
+	# Work around stack alignment issue, bug #647954.
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Work around -fno-common ( GCC10 default ), bug #706638
+	append-flags -fcommon
+
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
+	tc-export_build_env CC CXX PKG_CONFIG STRIP
+
+	local myconf=(
+			--disable-ccache
+			--disable-freetype-bundling
+			--disable-precompiled-headers
+			--enable-unlimited-crypto
+			--with-boot-jdk="${JDK_HOME}"
+			--with-extra-cflags="${CFLAGS}"
+			--with-extra-cxxflags="${CXXFLAGS}"
+			--with-extra-ldflags="${LDFLAGS}"
+			--with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
+			--with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
+			--with-giflib=system
+			--with-jtreg=no
+			--with-jobs=1
+			--with-num-cores=1
+			--with-update-version="$(ver_cut 2)"
+			--with-build-number="b$(ver_cut 4)"
+			--with-milestone="fcs" # magic variable that means "release version"
+			--with-vendor-name="Gentoo"
+			--with-vendor-url="https://gentoo.org"
+			--with-vendor-bug-url="https://bugs.gentoo.org"
+			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+			--with-zlib=system
+			--with-native-debug-symbols=$(usex debug internal none)
+			$(usex headless-awt --disable-headful '')
+			$(tc-is-clang && echo "--with-toolchain-type=clang")
+		)
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		CONFIG_SHELL="${BROOT}/bin/bash"
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		NICE= # Use PORTAGE_NICENESS, don't adjust further down
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images images)
+	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	cd "${S}"/build/*-release/images/j2sdk-image || die
+
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	# build system does not remove that
+	if use headless-awt ; then
+		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
+		{,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/docs/*
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+	einfo "JavaWebStart functionality provided by icedtea-web package"
+}
diff --git a/dev-java/osgi-cmpn/Manifest b/dev-java/osgi-cmpn/Manifest
new file mode 100644
index 000000000000..653a03c48717
--- /dev/null
+++ b/dev-java/osgi-cmpn/Manifest
@@ -0,0 +1,3 @@
+DIST osgi-cmpn-8.0.0.jar 1897102 BLAKE2B efc22960e4f56e85c2ab5dd392c3793c69055e4c1fe19522f00863c59ebc27be817fffe678ebff876be114ae38cd09c561eb6efba3c25a5ebda96732330eec3b SHA512 194ce255a42c04f6515bfe982ea4685dbcfa6227a07572d17ead7fd0e5b07ca4c29a1cec7edf61a5d4e99fbd1bfadecdbf5a2128f73ace3812092ef9e310b727
+EBUILD osgi-cmpn-8.0.0.ebuild 979 BLAKE2B 687a5c985e834a3c17b84543d9db212567b7e6a5b2ef94714ed5c401c26dc13dbe63fd1c161e011dfb688eaf22015034dd877ccb81173635a2d1f3edeeb23268 SHA512 f0238cc14ba83194d09899db97161a24306bdd73030f644f60ebab3c8b3d831a25393acae34a3aa7f6decde0327a77e22e310acfbdcead1cb1864a47e618dafb
+MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/osgi-cmpn/metadata.xml b/dev-java/osgi-cmpn/metadata.xml
new file mode 100644
index 000000000000..4221e170cbc0
--- /dev/null
+++ b/dev-java/osgi-cmpn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild
new file mode 100644
index 000000000000..e1921b4fe336
--- /dev/null
+++ b/dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.osgi:osgi.cmpn:8.0.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Service Platform Compendium API (Companion Code)"
+HOMEPAGE="https://docs.osgi.org"
+SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+CP_DEPEND="
+	dev-java/cdi-api:0
+	dev-java/glassfish-persistence:0
+	dev-java/jakarta-servlet-api:4
+	dev-java/javax-inject:0
+	dev-java/jaxrs-api:0
+	dev-java/osgi-annotation:0
+	dev-java/osgi-core:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+src_prepare() {
+	default
+	java-pkg_clean org
+	sed \
+		-e 's/javax\(.enterprise\)/jakarta\1/' \
+		-i OSGI-OPT/src/org/osgi/service/cdi/*/*.java || die
+}
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
index 9ed980eb1f4e..d8e6a129ed3d 100644
--- a/dev-java/relaxng-datatype/Manifest
+++ b/dev-java/relaxng-datatype/Manifest
@@ -1,3 +1,5 @@
 DIST relaxng-datatype-1.0.zip 74033 BLAKE2B 15b488e914cab28fb9ade71b491d961ffa4f683f66759e96cd53dcf69edd39d423b5562831698bb3e03191396c86a2a93369f14d278f3c55a90728031d1921d3 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79
+DIST relaxngDatatype-20020414-sources.jar 11666 BLAKE2B b2505d61dc36a12d7b31ad84db6813dbfac04aedd6805568103a310ee88586995cc98dbeecc38744bd767f8dd2ced5257400365aaab859b05676949abd187316 SHA512 6d3335d08b620a1b5d401871b1e92dbbea6b9d954e5c7eba1a4f535afe8c6ddf51a5f07db69805409525f4dfdbe34d13cc3392acd8e7e16b100f7e708cee0380
 EBUILD relaxng-datatype-1.0-r3.ebuild 758 BLAKE2B 726072e839e86eca4f30a3724bcffed7ce847f303225d2470cb6402924e8f7c1f259bfb6112602e80f8398fb20c2d7cade39e4d7ada6585f7ca10e7812f9050b SHA512 62dffd6aeedcaefc42206eec82649577a52bcfb2b3fe094ddab4adeda5ec35d88d6b755bb819afe78c921c0d84012c7aa02464eca67932e71c1dcc7814b85657
+EBUILD relaxng-datatype-20020414.ebuild 687 BLAKE2B 0ce6ed591683ee74b79bc6b28528adde44305e42a0bf3fc318106430cceb13e5984fce36bc3bc6f5581caadd3f261e510da62c08f8e93cbb8b6cc6ce4bd695e3 SHA512 4754f81dcb447c0f65f7b13423094cd74c5633ff420dd946ce5ebe9f72f06004d0ca1ca0ed525fcc20f13dd9e6f5993555d0532f5c8927f23fe481c8a53f4a2d
 MISC metadata.xml 314 BLAKE2B 3c7bd8a6004758af05fccf02d2636fa62e2dea9e653c89600b37ce223d10c6f24b03df605db96ab55a5177994ee1eddca450df7a1d6e9fc86c50573c7da9e4a6 SHA512 eaa99aa2ba88d8a70bc38924266c1e33a264274ab13dbb88d9a73d278c03c872a56d8ed122cc4a44e84ef9436e6c016310c38ad05fa9976300018472b43780b8
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild
new file mode 100644
index 000000000000..ce360acaf11e
--- /dev/null
+++ b/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="relaxngDatatype:relaxngDatatype:20020414"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
+HOMEPAGE="https://relaxng.org/"
+SRC_URI="https://repo1.maven.org/maven2/relaxngDatatype/relaxngDatatype/${PV}/relaxngDatatype-${PV}-sources.jar"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
diff --git a/dev-java/woodstox-core/Manifest b/dev-java/woodstox-core/Manifest
index d8cea9441c1a..717ee82b8de2 100644
--- a/dev-java/woodstox-core/Manifest
+++ b/dev-java/woodstox-core/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD woodstox-core-6.2.8-r1.ebuild 3010 BLAKE2B 3d26fc576b274efadbbb614c0b75309d5339dc6fa7eab5f467401365aeccd39c6dbc7ae625d1cfe0c4f9aac9baaa7407bcc98015ac0a6917476b5e05809676ca SHA512 23b4ce56d445aa7a47c6f4aa4be55e58170ec334c17466634601c0bf68a69d50327700803c6bc23af5260ff26e988f1c53b6aab57b9780fe0301a7063364377e
+EBUILD woodstox-core-6.3.1.ebuild 2842 BLAKE2B 8f26ee31e67632b664242cfadd381b1aa12b1a1c96bfcb191fab340a46c16f2812fe8bf2b496128f73856dd3f8c8e52a61ca53f0105cb1ff6e37fe17156472e1 SHA512 609fb828f765eb936cd4ddf5ca8686f8c52c2111b71ae75c61e3c5adb91965578ca9f52149f8832f1b67892e952c97eae28ad9c5d838f632d1ffef20f9040523
 MISC metadata.xml 308 BLAKE2B f2c06b12854fb8659cf5b265400a53de6b0b10753da1438362a410f7831cab326887b09fb23b9678fe4939a7d33480fcdc6f2295c975e4fed021e2597e5349ce SHA512 9cc92aafb6c2e2c0226d2f59675a381f311028d149a731c5dbbb388d7174a9f69d6b47fc49d3ed60f8fc7af84b0b999c4dea5eb13477c21024f75e90736ca0a3
diff --git a/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild b/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild
new file mode 100644
index 000000000000..38d187e1a69c
--- /dev/null
+++ b/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild
@@ -0,0 +1,89 @@
+# 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.3.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild woodstox-core-6.3.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.woodstox:woodstox-core:6.3.1"
+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"
+
+# Common dependencies
+# POM: pom.xml
+# net.java.dev.msv:msv-core:2013.6.1 -> >=dev-java/msv-2022.7:0
+# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-2022.7:0
+# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
+# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
+
+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
+# biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1 -> >=dev-java/aqute-bnd-annotation-6.3.1:0
+# org.osgi:osgi.core:5.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*
+	dev-java/aqute-bnd-annotation:0
+	dev-java/osgi-core:0"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
+
+S="${WORKDIR}/woodstox-${P}"
+
+JAVA_CLASSPATH_EXTRA="aqute-bnd-annotation,osgi-core"
+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"
+
+# https://github.com/FasterXML/woodstox/blob/woodstox-core-6.3.0/pom.xml#L229-L243
+src_test() {
+	pushd src/test/java > /dev/null || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -wholename "**/Test*.java" \
+			-o -wholename "**/*Test.java" \) \
+			! -wholename "failing/*.java" \
+			! -wholename "**/Abstract*.jav" \
+			! -wholename "**/Base*.java" \
+			)
+	popd > /dev/null
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
+
+src_prepare() {
+	default
+
+	# src/moditect/module-info.java:33: error: cannot find symbol
+	#    provides org.codehaus.stax2.validation.XMLValidationSchemaFactory.dtd with com.ctc.wstx.dtd.DTDSchemaFactory;
+	# https://bugs.gentoo.org/858302
+	sed -e '/com.ctc.wstx.shaded.msv/d' \
+		-e '/org.codehaus.stax2.validation/d' \
+		-i "src/moditect/module-info.java" || die
+}
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
index 8dd8dad280f0..5aa690c71197 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -1,3 +1,5 @@
+DIST msv-2022.7.tar.gz 2594951 BLAKE2B fce006f4b845efcd930b7999ac00eaab06c404888eb73a6eeab6cfad616b4922271d2d682abc82f3be4c4f6a791aa14681f6e6bfebd2118ac3aa2bcba41fd1f8 SHA512 315342628f79c561883be0d966211dd81daae66a414dcc9bb5a87d86f97121d38b5835e9a6d1ac7c21ccff46040e53d3cabd32e9ea677c9ca4335a86c5259949
 DIST xsdlib-2013.6.1-sources.jar 274740 BLAKE2B 356c3e6005c26a1b63ea016a523140d93bb8c6a4c1952d60f5a881c92dd013e1691451be96e31b7c96c48e1f182e0224bceb712e230bb008ad97732a8e9ffdb6 SHA512 a4e308fae6a1116158ddbebfad0570f6cf1f840acb72de8bdd9414b363da78edf6aea2349f4ac7511b774a494f9e4c17c309f86aefc39b30421a1c86945302b0
 EBUILD xsdlib-2013.6.1.ebuild 916 BLAKE2B 9ebcd72e2473378b10ff552c20cd81f45b247d0805bfb6b1699aa39ebce4cb719d765de563255f2357af459915a47f3fe0d629c6f9dca077fb1d4f881f4e8899 SHA512 3e74a7762cb9c45874406d255b119642e0ee0eb7e8e73ff3bb6e742aa3fd320374fd0a402e50762ece98642c5161df1e39d317bf8bd4bdb481f654f3d106b0c4
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
+EBUILD xsdlib-2022.7.ebuild 1993 BLAKE2B 6b8f006705a2a0fe88f930fb5eaa8f47d97d7c7a2a72777e341bf85e5ce04a8ab7105d1dd576de85ec57954bc565987b5cdc5bdbc950635fecd47f2d743336bf SHA512 679f786a423ad6ee8b20d4fb48b0e7b4e65aa55b30d4adcacd61b88547d9138402776309c90eb358ed28828700a2eeb68270b09a620b88411d22676a63b72c16
+MISC metadata.xml 312 BLAKE2B fdf01de30bc8afcb14e04b660bc640ebe9ac26c764dda429615f5648357a119eff9d04abaa67c7afb112a29b3d83e6734f39ed7431e5478428ef4fe5fbfb737f SHA512 5fff6a60300076895c0ada9117e863a6ae69ae0e03f53404b15154b42d9097d3773ca5ebf9c9435732190cb739f696fdc33fd6e45486ba20c5ea200d4472eab7
diff --git a/dev-java/xsdlib/metadata.xml b/dev-java/xsdlib/metadata.xml
index 4221e170cbc0..a2eeb0a46ec6 100644
--- a/dev-java/xsdlib/metadata.xml
+++ b/dev-java/xsdlib/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">xmlark/msv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/xsdlib/xsdlib-2022.7.ebuild b/dev-java/xsdlib/xsdlib-2022.7.ebuild
new file mode 100644
index 000000000000..66c89422937a
--- /dev/null
+++ b/dev-java/xsdlib/xsdlib-2022.7.ebuild
@@ -0,0 +1,73 @@
+# 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/xmlark/msv/archive/msv-2022.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild xsdlib-2022.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.java.dev.msv:xsdlib:2022.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Schema datatypes library"
+HOMEPAGE="https://github.com/xmlark/msv/tree/main/xsdlib"
+SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: pom.xml
+# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
+# xerces:xercesImpl:2.12.2 -> >=dev-java/xerces-2.12.2:2
+
+CP_DEPEND="
+	dev-java/relaxng-datatype:0
+	dev-java/xerces:2
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# test? org.jdom:jdom2:2.0.6.1 -> >=dev-java/jdom-2.0.6.1:2
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/jdom:2
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/msv-msv-${PV}/xsdlib"
+
+JAVA_MAIN_CLASS="com.sun.msv.datatype.xsd.CommandLineTester"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,jdom-2"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	# Selection according to pom.xml#L156-L184
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -wholename "**/*Test.java" \
+			-o -wholename "**/*TestCase.java" \
+			-o -wholename "**/*TestCases.java" \) \
+			! -wholename "**/*\$*" \
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}