gentoo auto-resync : 21:03:2023 - 12:39:52

30 files changed, 417 insertions, 62 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index acabf00db0d9..90c364adc823 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 7c9ef05e8190..93cae60c6bce 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,7 +1,7 @@
 AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
 AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-DIST commons-logging-1.3.0_pre20230317.tar.gz 184981 BLAKE2B 00d171a8345907dc2686d1eff1130b7fd1ef653c8f2a7c6b5e45e6522f3d195ba695d93371add97a2d459451e3757ef9ec21f483f0cd37a6bcbb98e76e1b446f SHA512 737058214bfa86c11c2d7b450132a15824652c80ffae6208c3a8fc2386e7b2c7c61b39fd2b75008373f611e4bbed26e851f98f910d3e6f33df4f85f35c0a5462
+DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e
 EBUILD commons-logging-1.2-r6.ebuild 4146 BLAKE2B 3d9d1e7121406deb2cfbb50ce274df70a0c165d99870f77a69068447e68588bd43b259b076bd5dc2e853a4d79e2df80844caaebd4d4dfe095701f3c4799a98c6 SHA512 7bee2954d057db0c3bbfd3b8bba6b7c9e1cc2f708b5d85070defde51fb6c9d2f8f10b1be122fcfadabfaffc612d2b63ef355818cc6a14253a9de05b79c0c0dde
-EBUILD commons-logging-1.3.0_pre20230317.ebuild 3369 BLAKE2B c298a74acae56b87096bdf3a4e8303d87af4c0fd8c8da164665cc98d7be8455477a2dbd9a80c3a8cc4ebe36f63299c47aa74cea8ab7d8a6eddb17733012d359c SHA512 61a211ff82b065ae989d6805f6195bc6c7b90c48af6abbf39e5f1046df7f05159eeabf2e0d6144d3850a3a9e9af353c9b8a12ef3426c4cb915a1e11726569543
-MISC metadata.xml 851 BLAKE2B ecaefca5760abab3e9f77eee62efc54ca66a8cf8ea104171d2c33a2aca794ac45ab40b1f6f6c8baf8b738c46fe74eab5922277d139e4c4bfe4ff9d04c76ae98c SHA512 3310b33d391e19e8ade51e7abd76fcbf5874888d7d93a4ce8bd431dca97e20c13b64535da41b9aa55963b65696b588e5f30f4ca7a5f60a4c30e44b9dc485461a
+EBUILD commons-logging-1.3.0_pre20230319.ebuild 4233 BLAKE2B 13ff753003fac3d88cab8e760cb946efa3249d37dc06eaaa05e1f9d14f62014ab6a4e93965e5701e54519a28e690784c3762152f5a0281493781ad13f5aeaac0 SHA512 52a59dff35802c58872d3a79804cc47701e1f152b0de5d356b2aec2f015a235edcebbcb6046ae183af71d242091efe6ae46cbf1346cdbaa49534aa820e307822
+MISC metadata.xml 925 BLAKE2B 4834c919748bbef9b8ac9cbb0545a3b13cdd8c97f0ce6039e09f5fa63522f0506e89ab1749fb273d7cf511414b4d16f661ac156f953dfee1ac3a01f6723b1b99 SHA512 3ea4a17834b877e710c618d6a9669275e76b6305b4c090b4b2462c54a132da20c9f39063c8e9763e712ae21f4c86ca8d02892a47039184dd3ed1680fee8b5849
diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index 3fb433092d18..b478d6426af2 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -5,14 +5,13 @@ EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="commons-logging:commons-logging:1.3.0"
-# Not yet supported, see https://bugs.gentoo.org/839681
-# JAVA_TESTING_FRAMEWORKS="junit-vintage"
+JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems"
 HOMEPAGE="https://commons.apache.org/proper/commons-logging/"
-MY_COMMIT="058cf5ee350cd83d1ab28b000ad6be903ca160c5"
+MY_COMMIT="d376d3128663e53de4af948e161291e7ec0c6ec1"
 SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
@@ -52,7 +51,6 @@ src_prepare() {
 
 	if use !log4j; then
 		rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die
-		rm -r src/test/java/org/apache/commons/logging/log4j || die
 	fi
 }
 
@@ -84,19 +82,40 @@ src_compile() {
 	popd > /dev/null || die
 }
 
-# https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L396-L407
-# src_test() {
-# 	JAVA_TEST_EXTRA_ARGS=(
-# 		-Dtestclasses="commons-logging-tests.jar"
-# 		-Dcommons-logging="commons-logging.jar"
-# 		-Dcommons-logging-api="commons-logging-api.jar"
-# 		-Dcommons-logging-adapters="commons-logging-adapters.jar"
-# 	)
-# 	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-# 	JAVA_TEST_SRC_DIR="src/test/java"
-# 	if use log4j; then
-# 		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
-# 	fi
-# 	JAVA_TEST_EXTRA_ARGS+=" -Dservlet-api=$(java-pkg_getjars javax-servlet-api-2.5)"
-# 	java-pkg-simple_src_test
-# }
+src_test() {
+	# Do not run Log4j tests because these tests use an Appender to verify
+	# logging correctness.  The log4j-12-api bridge no longer supports using an
+	# Appender for verifications since the methods for adding an Appender in
+	# the bridge "are largely no-ops".  This means an Appender's state would
+	# never be changed by log4j-12-api after new messages are logged.  The test
+	# cases, however, expect changes to the Appender's state in such an event,
+	# so they would fail with log4j-12-api.
+	# https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
+	rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger
+	rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger
+	rm -r src/test/java/org/apache/commons/logging/log4j || die
+
+	JAVA_TEST_EXCLUDES=(
+		org.apache.commons.logging.security.SecurityForbiddenTestCase # 2 tests 1 failing
+		org.apache.commons.logging.jdk14.TestHandler # No runnable methods
+	)
+	JAVA_TEST_EXTRA_ARGS=(
+		-Dservlet-api="$(java-pkg_getjars javax-servlet-api-2.5)"
+		-Dcommons-logging="commons-logging.jar"
+		-Dcommons-logging-api="commons-logging-api.jar"
+		-Dcommons-logging-adapters="commons-logging-adapters.jar"
+		-Dtestclasses="target/test-classes"
+	)
+	if use log4j; then
+		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
+	fi
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar
+}
diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml
index c3b68538712d..6d5d06dd2376 100644
--- a/dev-java/commons-logging/metadata.xml
+++ b/dev-java/commons-logging/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://issues.apache.org/jira/projects/LOGGING/issues/</bugs-to>
+		<doc>https://commons.apache.org/proper/commons-logging/guide.html</doc>
 		<remote-id type="github">apache/commons-logging</remote-id>
 	</upstream>
 	<use>
diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest
index 578a4247706a..18b893d3e4ef 100644
--- a/dev-java/coursier-bin/Manifest
+++ b/dev-java/coursier-bin/Manifest
@@ -1,5 +1,7 @@
+DIST coursier-bin-2.1.0.gz 20682614 BLAKE2B 16209943324466bc0e07b139bb17001f4490fde41dc683f4e534290e2394f1182493a63ec55235c42f3bd2fc5bd187c78c84386db3ab97c0c8bb03400f25b3d9 SHA512 f8e9e1cc972fe433ddab325c97d927beb70af0b81c4381e7bd96e10c12e996bc2060ce82406758e48a33f12fe22c086f9c21020afb6e8e99fe8e6d693124b59f
 DIST coursier-bin-2.1.0_rc3.gz 21120545 BLAKE2B 55d4236c408b9883d49fa64ed79f269fc935171abe161c3bef8e92da396f12881c9cf7750dd8e8d5b955c390cfb29304a8406c3db702c3a477219acbf0c0b989 SHA512 1a31d7ced6c8c1137b6e330723c90e12f010a815592a4e11129c7bd5611528edc62166415937c6fa5dc92732b277bce1b971e6dee27f9b1350ac71b4b7afc290
 DIST coursier-bin-2.1.0_rc5.gz 20759374 BLAKE2B 5e44db9b22a1b3febb5e815401249ed4df663efd8dbbfe8a54a05ae8fbb23a4cae6407e5845ef199098ac8f49e01138a3a2ac5c21998ae3e5addec3159093895 SHA512 5c276e13b65b2a3058a1d4010c97b59e28637c3e17e2f448fbb65dd4e97325846add95557836339d5026ee92bcba82ec5c0948a2ad8a31d7b60ce59c0c36160c
+EBUILD coursier-bin-2.1.0.ebuild 670 BLAKE2B afce78b8fb3f3049c7343b13a3dc481684abd2fde0ebfb967db926537b3b403ff34c8819538cf2c037ebe5851a914a8a066813a492d2915edc85f180281f88f6 SHA512 47df75c07d6870a6c5677c20e473036f586ec7bdcc87f3100b602c330902eb1e6ecf5c6f6443e4cbf73bd8fa992220c2c93d6e36b7f72067ac233dcc5944da23
 EBUILD coursier-bin-2.1.0_rc3.ebuild 669 BLAKE2B 64c5e7d805585716260ef0de20153ea5b0c0b2930fbaf50eb8753663394175ae9998e9818a3e515f67fb562f3f62074966c1e5923c5d4df55b94377f4c7be52d SHA512 b95890ce9de7392330b27f14075f235ab5433c6e3fd79b6a2e72c1588c8795b9af2f9da075bd22fa20b303aa9c1cbd3e1252fa6ef56a0da1296e34db555c2d0c
-EBUILD coursier-bin-2.1.0_rc5.ebuild 670 BLAKE2B afce78b8fb3f3049c7343b13a3dc481684abd2fde0ebfb967db926537b3b403ff34c8819538cf2c037ebe5851a914a8a066813a492d2915edc85f180281f88f6 SHA512 47df75c07d6870a6c5677c20e473036f586ec7bdcc87f3100b602c330902eb1e6ecf5c6f6443e4cbf73bd8fa992220c2c93d6e36b7f72067ac233dcc5944da23
+EBUILD coursier-bin-2.1.0_rc5.ebuild 669 BLAKE2B 64c5e7d805585716260ef0de20153ea5b0c0b2930fbaf50eb8753663394175ae9998e9818a3e515f67fb562f3f62074966c1e5923c5d4df55b94377f4c7be52d SHA512 b95890ce9de7392330b27f14075f235ab5433c6e3fd79b6a2e72c1588c8795b9af2f9da075bd22fa20b303aa9c1cbd3e1252fa6ef56a0da1296e34db555c2d0c
 MISC metadata.xml 329 BLAKE2B c2e27cd10921c61cd06ac3d92c90fe1f7bb509d81b1cbdcb3cb51dc2ba6f2097713120f58a28d5750a60e800e7248e9aec3c455b92de9e6c7cc94427876ccc5e SHA512 77d12f0c7125ff3cbaa4cd159a838dbd2bd266c8fa1292533267cdf7e1a858f16b9eadb6efc55218df028426616d556cdc8a6664c7cfc4c9cf482f750bc9587b
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.0.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.0.ebuild
new file mode 100644
index 000000000000..9bf4cb6eb641
--- /dev/null
+++ b/dev-java/coursier-bin/coursier-bin-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+get_orig_coursier_pv() {
+	local orig_pv=$(ver_rs 3 -)
+	orig_pv=${orig_pv/rc/RC}
+	orig_pv=${orig_pv/pre/M}
+	echo "${orig_pv}"
+}
+
+DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
+HOMEPAGE="https://get-coursier.io/"
+SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}"
+
+RDEPEND=">=virtual/jre-8"
+
+QA_FLAGS_IGNORED="usr/bin/coursier"
+QA_TEXTRELS="usr/bin/coursier"
+
+src_install() {
+	newbin "${P}" coursier
+}
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.0_rc5.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.0_rc5.ebuild
index 9bf4cb6eb641..4c77d05f1d13 100644
--- a/dev-java/coursier-bin/coursier-bin-2.1.0_rc5.ebuild
+++ b/dev-java/coursier-bin/coursier-bin-2.1.0_rc5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
 HOMEPAGE="https://get-coursier.io/"
 SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-java/istack-commons-runtime/Manifest b/dev-java/istack-commons-runtime/Manifest
index 8372b86a83de..a9a2719a3431 100644
--- a/dev-java/istack-commons-runtime/Manifest
+++ b/dev-java/istack-commons-runtime/Manifest
@@ -1,3 +1,5 @@
+DIST jaxb-istack-commons-3.0.12.tar.gz 66063 BLAKE2B 7f869d17e78b62eac08b1c7c6bb0b974d9c7a8e4f0ad79ed4d659e3ea672a1e4947cd90fa122ac3d9b3ce902e17e8bfc7eca3d9133332bdbe1ff236d47b3bac5 SHA512 41193fbc20e9332f66754fc4dd52b7e98bd905c4a5dbca8adc46cb9b29f3e5fe39a684d9ca08b38c5ba15e54acb69dc289b72e2885946349bb48f4e9c2e34dfb
 DIST jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz 66161 BLAKE2B 07103ec616d23e14a5f61c4bb7ef9dce042f0df678db44f035b48c74eb7930f251d8b7fd8ce36c9bae7a7ef8ce213c62587dad2547518ba4638faf102ef651cd SHA512 b119b2c3582f5cbbd5793e0eb0a00c199c93119f3c18e34c57f8753b3a7008b9b93de58fd62df94d6cbedd698488616a80c334fda3d5038078e3858229f995cf
+EBUILD istack-commons-runtime-3.0.12.ebuild 993 BLAKE2B eef7078dbc61e67370b20125dd0471d54ccbb37d33158be33e0a61dba69c221dbaa86b7f7ddecae7b8e3aad3170fcafbf7e28749a25fdeeae113b57f302f8ffb SHA512 75b6a6d29c396be07231608d45647b099f5b1f6fdbe17550141b0c5fa98f9a2f104c10886dd342afb9637bda672c67a6d3a1e8a800d2bf03ec8b87a408a3b34d
 EBUILD istack-commons-runtime-4.1.1-r1.ebuild 1568 BLAKE2B 728468bac6561a17fc4261db19d3aa59b28c46a919a574f354a086c0f18b1653cbd44560400b5f4d4b0a4be35e387678c3564c30d416a108965c4bba2ae2cd6c SHA512 1829283da6bf6e67832f18b18e403ba2007529945f1abf5b3c7ac578f8fe5e572570ce664a7ea3f62a95afc7d566ff42afa81b5b83756f0ed075ebaebe5dd687
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild
new file mode 100644
index 000000000000..7928ec12553f
--- /dev/null
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.istack:istack-commons-runtime:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="istack common utility code"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j/istack-commons/"
+SRC_URI="https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/${PV}.tar.gz -> jaxb-istack-commons-${PV}.tar.gz"
+S="${WORKDIR}/jaxb-istack-commons-${PV}/istack-commons"
+
+LICENSE="EPL-1.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# fails if jdk-1.8:* # https://bugs.gentoo.org/857024
+DEPEND="
+	>=virtual/jdk-11:*
+	dev-java/jakarta-activation-api:1
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1"
+JAVA_SRC_DIR="runtime/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="runtime/src/test/java"
diff --git a/dev-java/jaxb-runtime/Manifest b/dev-java/jaxb-runtime/Manifest
index 670d9da27a2d..b2b91831b88e 100644
--- a/dev-java/jaxb-runtime/Manifest
+++ b/dev-java/jaxb-runtime/Manifest
@@ -1,3 +1,5 @@
+DIST jaxb-ri-2.3.8.tar.gz 1734411 BLAKE2B e60a7f78f2bfaf23cc0ce6727ee1b1611facdeebd5b456c207260447a508674dcbf934d2c6343cfbb58b93adf3352c8145caa2a8c77e264ae2403351527ff96d SHA512 73fda68e8d936b681d53ec72153cec0f7608517d0f037b4f140e4fd48e26f3e03a88f5b34bb635d0e6c7701121befd7d18a98aebd019a663e08ed9667a39c535
 DIST jaxb-ri-4.0.0.tar.gz 1739184 BLAKE2B a85a12fdca0b6eff8664894d65e2f82d30491e20050fde2ca828fa3c2c79ce2e158fca5ce6d0ae2cb2a00859abc0c9e9d49321c0943b862fd603a9e732f29dc4 SHA512 766a58d5107a88c19a99014b737b7b14a510b928dd26991adfe902073614923690c1e5a231834ec4a200a10adf9505b27179b8d84cf09dbb09292341c328e743
+EBUILD jaxb-runtime-2.3.8.ebuild 1669 BLAKE2B 1d1acaf357a84b18199594a12668dd1200f57859a7700aa99e1c765caa1cf976c99e99d22e93de437131dc4463c40ade7dbce795dcfae0b1da0e717dea65dbca SHA512 5ac9c990689f393b9f83f67e364d1c68c708e0b6821dfb47740008bec585dce2fb03b3d8158dff71596448b0ff38f6dfdbed265441188b44587a290fa42e00d3
 EBUILD jaxb-runtime-4.0.0-r1.ebuild 2985 BLAKE2B af8937c9a12b2e8f7f95f3b6977e7f70bfc9177c161ccf2effe99fcf7ef8ce2614759d66b8b47a951b720612f87b5de83bbdcc719d67e69f829d62c662c92156 SHA512 0e87d19a371a6a012b7d7e004ce38f34a71b0b2896eecdd55e4dbaa19200e0daad52425c0a05bde26fa3bae414acdff94c223f42464b55dd67fa028518c93b78
-MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
+MISC metadata.xml 302 BLAKE2B c04f1b6c40f598e273d357faeeb149504ff1bbd5fcdb170549ae43314628eb5793da9ccf8c76956ce7a2b565db95090bdccd09fba5bac36fc26a7eb48bb63ef4 SHA512 5c11021d5ec5661435d8d6fca6ca9c0cdb34c859ddfa2a4752bd5de06575a36828f5ec9ad9c21b9c90ab92e693b0ef40b3e14bfa0cf46d9892481b896e19484e
diff --git a/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild
new file mode 100644
index 000000000000..33c8c739e864
--- /dev/null
+++ b/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.glassfish.jaxb:jaxb-runtime:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JAXB (JSR 222) Reference Implementation"
+HOMEPAGE="https://eclipse-ee4j.github.io/jaxb-ri/"
+SRC_URI="https://github.com/eclipse-ee4j/jaxb-ri/archive/${PV}-RI.tar.gz -> jaxb-ri-${PV}.tar.gz"
+S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri/runtime/impl"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	dev-java/fastinfoset:0
+	dev-java/istack-commons-runtime:3
+	dev-java/jaxb-api:2
+	dev-java/jaxb-stax-ex:1
+	~dev-java/txw2-${PV}:2
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+	>=dev-java/jakarta-activation-api-1.2.2:1
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+	>=dev-java/jakarta-activation-1.2.2:1
+"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	# Run this test separately as it prevents a reasonable test summary
+	JAVA_TEST_RUN_ONLY="com.sun.xml.bind.v2.schemagen.XmlSchemaGeneratorTest"
+	java-pkg-simple_src_test
+
+	# The default test selection of java-pkg-simple would omit
+	# "com.sun.xml.bind.v2.schemagen.MarshallingAbstractTest"
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-type f \
+			-name "*Test.java" \
+			! -name "XmlSchemaGeneratorTest.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jaxb-runtime/metadata.xml b/dev-java/jaxb-runtime/metadata.xml
index 75321cfb5598..dbb1a70c5a43 100644
--- a/dev-java/jaxb-runtime/metadata.xml
+++ b/dev-java/jaxb-runtime/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/jaxb-ri</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jaxb-stax-ex/Manifest b/dev-java/jaxb-stax-ex/Manifest
index 2e022127ffa9..e9c9b856658c 100644
--- a/dev-java/jaxb-stax-ex/Manifest
+++ b/dev-java/jaxb-stax-ex/Manifest
@@ -1,3 +1,5 @@
+DIST jaxb-stax-ex-1.8.3.tar.gz 28164 BLAKE2B 992597cf7556221449755f8d20b7695c277e6e28289cc4a60203d9ad5c9b549559ee98092cc03a11220221843eb02e7969ae307fb85924718aecc5a8c4dc9184 SHA512 c7a360c44a0546a2d8b5dac652886d439530049286791e61a4296575dde6b91f2d11e2b2b6d85b72494f8976d1ff15858f1032c880f2e61d24afca24e7f01cd5
 DIST jaxb-stax-ex-2.1.0.tar.gz 28683 BLAKE2B 774f7420f996eb52abc9db56753f0fc492164ed12f4ddffacad8f801ac759666e6dcae85cf24ce1231df4d49d5b5084278d2cac0c5c129302ec973c215408782 SHA512 f81dcb4870800c4799e716254b84e57a15ef36a9e6a8502da7ee2711aad67765595674fccc1c4d9d4e8865c642dfadd694f8849d4e98c4e9f2368cb940deb38d
+EBUILD jaxb-stax-ex-1.8.3.ebuild 861 BLAKE2B ac98e1a351ab41675afc125a06db34e67c89a0d742c154bc4bfeff27385a8ac73922cdb87d055f0993216fea32a2aef32592be51a7974616ae02de1f95ad02dd SHA512 d27b69b036844df47c32db7a2a745c98714f351f571c318ce23c65c7640dbb90a74f5bbca4d3994fe74c52713b7ac07ad71f501f1cdac68da326d6936fd66080
 EBUILD jaxb-stax-ex-2.1.0-r1.ebuild 1055 BLAKE2B b3f7c3622b7668ca78c19eb8bc5dc1813917a619946da7cdacb47e5d7f12dfe9ac0ea4a7b7878bee3a651715d9da29df308294713e6a2c32f58214e7bfdca38a SHA512 e89fe08171d0efe22c26c1e229f1fb44d9695ee516baddddf84a958aa98a4cafeaea66fde1f28335c694bd5f8930596da93f11300ac8643e35f1cbe32b6344cf
-MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
+MISC metadata.xml 307 BLAKE2B 840958b9dae03e35215d38f5415e7ebb855549276943e3a968ee0fb032a7a46384507232c3510ca72851bf3e4e78a482ccd4b9f7f3b712a7688254d113b1c120 SHA512 6cf44eed10944c273565dd6ba3819edf2850976a884f0ac1a4f760363eeee8ccd2f49312f7412eeaceecfe8f80adda0bd67f45366ed0bcd1aa7b5504a6361401
diff --git a/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild b/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild
new file mode 100644
index 000000000000..f05f61ca5422
--- /dev/null
+++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jvnet.staxex:stax-ex:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extensions to JSR-173 StAX API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j/stax-ex"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="EPL-1.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-java/jakarta-activation-api:1
+	dev-java/jaxb-api:2
+	>=virtual/jdk-11:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jaxb-api-2"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jaxb-stax-ex/metadata.xml b/dev-java/jaxb-stax-ex/metadata.xml
index 75321cfb5598..e2010ec6e14e 100644
--- a/dev-java/jaxb-stax-ex/metadata.xml
+++ b/dev-java/jaxb-stax-ex/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/jaxb-stax-ex</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jaxrs-api/Manifest b/dev-java/jaxrs-api/Manifest
index d9ffe669d97c..c66027c253fc 100644
--- a/dev-java/jaxrs-api/Manifest
+++ b/dev-java/jaxrs-api/Manifest
@@ -1,3 +1,4 @@
 DIST jaxrs-api-2.1.6.tar.gz 225315 BLAKE2B bf4f12eadbee605e1141c72ee2a51c64548f3bed2846d1605758bcd994633b1a8f23b2054e0b71503583096a7234f42d12a389b9da031fa8b8c6b313cad84d98 SHA512 b5032ea9905e31b4120761125999a50e6d30229e7174e4a5e087f263030b25c157384a6d31796a90c590fda413e0e66220ec77c809a22fac8827ffa971c4aae7
-EBUILD jaxrs-api-2.1.6.ebuild 1949 BLAKE2B 4cf6a2ce4056132f23f0610b7f02924c64eba7e0e2ea7512b308aee9d139774eef863f10b941ea4b9d7ef768548354bd7926cdee56503e345c91df206ecb4773 SHA512 0cfad4261c6cb1505c9639f25366c5b5e37477ee770b08fcf38569bad9c4fbaf5fca371db8c271ce216a8e75caef5ffe74476fc902b3995407c7f2d90ed232d4
-MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
+EBUILD jaxrs-api-2.1.6-r1.ebuild 1339 BLAKE2B 1b5757638c5ea40ebfe8ab788f45e0f07203f395575e430d844940af4e36143ca9dd041d6b6482d0d7125de63d9dd7585acd1eb9418763855c9fe684a1e7fe59 SHA512 0ee8123d08dab4fbb5be5e6cb26fe8af09cb01ebdbcd700c09eae32155a46261cda9a9bac2d5ce58f99277cd6cf536169670d4b0f00422ee11602e7f24fbc719
+EBUILD jaxrs-api-2.1.6.ebuild 1949 BLAKE2B 67735cda747091333aafa3f24b23e65651656e8a89a07efaab45485d7d727b8c32047b0b20a7fe037b85014e420f9ca4149a32cf9a7f055f7231e5ae709e90ca SHA512 8e97a2216e38b4d0ee2d9b311cfe4e96a739c569e5998765bd086ac3ffad1e19c5f20f771a8119143ffc4aaf15f60e3c02872b5075b390a4d2189860de1222db
+MISC metadata.xml 296 BLAKE2B 0f1aa984297daec83154cabd45ec0d0f950cc198ba8e0ceec8ab299781c7a2bca0857e9a635ef7d98a92ac3d88f979530143ea12d1ec8699d5b42c89a6a04204 SHA512 1d054cbecfacdea17124207b9597f58014b013917ba3e00264589a0ce048b66629417f1d1d4db3a02f762fc2141094e9b1bec59a45aab1207a2a8fb8c63b1444
diff --git a/dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild b/dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild
new file mode 100644
index 000000000000..0d90ff6057d0
--- /dev/null
+++ b/dev-java/jaxrs-api/jaxrs-api-2.1.6-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+S="${WORKDIR}/rest-${PV}/${PN}"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	dev-java/jakarta-activation-api:1
+	dev-java/jaxb-api:2
+	test? (
+		dev-java/jaxb-runtime:2
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jaxb-api-2"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="jaxb-runtime-2,junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	# The default test selection of java-pkg-simple would omit
+	# "javax.ws.rs.core.AbstractMultivaluedMapTest"
+	pushd src/test/java > /dev/null || die
+		local JAVA_TEST_RUN_ONLY=$(find * -type f -name "*Test.java" )
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd > /dev/null || die
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild b/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
index 3390c60bee70..ee1e37e0d661 100644
--- a/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
+++ b/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
diff --git a/dev-java/jaxrs-api/metadata.xml b/dev-java/jaxrs-api/metadata.xml
index 75321cfb5598..45d0d6dea3c6 100644
--- a/dev-java/jaxrs-api/metadata.xml
+++ b/dev-java/jaxrs-api/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jakartaee/rest</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index ebb10ea7b508..0599722f6294 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,7 +1,7 @@
-DIST mill-bin-0.10.10 71059080 BLAKE2B acca082500d69ad87031dda36df363db38a5559188abc5eeea07b928892812063761566d4b909b3176e8a8a1d434540aafebfea0a46f368216c8273543817b34 SHA512 8bd4b3f86d6c85a15ee62c4ab3640d40f0e08232e1954a246915efa4f98f6cc78938cf042180f401daa1a40dad5ba98d7e3a2c4ecf2af6f0d27a3158157b2e0a
 DIST mill-bin-0.10.11 71060980 BLAKE2B 05e0969685a3f2eef84709c8fca97c5b902db46ec2afdeca435a68ac24f99c3b674ed47227d2a13665de38c99b841bfaaf90eeb59577fe7337befbe5363b233e SHA512 bbe63bf68f3cb4c5bf8f4dde2441b10337ee72645e388942dd8d2ea69e16b54c10bfc85a89047ddffbc76a623dd6886c4553be25b2accb97bd69aeb0a03650bc
+DIST mill-bin-0.10.12 72992251 BLAKE2B 9ca6bddcc1e2bc013f1eb6fe60b7b844fa1f7ec0ba53afcabfceb1d3631d754de56167dda650859031c834d95b0a2bd2c6e8776116de6327c990efa23ea1db63 SHA512 4b4db9fe2f84ad5ecea7e00291fc3ac75b543ee48f517fadc2ed8d1671759e5f3a7af51f417f0912d28eddc92ab8e747a749c3f1a48ba691ba3f93fc3a09e54f
 DIST mill-bin-0.10.9 71023828 BLAKE2B 6cd71ad3a293b92957b504b850110103290f0017416c370f6de172247e96a42daffe94f7460325bff89b3136e3890eddb0ff7857418a0166327684e785a8e956 SHA512 494ad57e036180a285e44ff24ab8a7070b1b444e4267eb9ea76823f3717db4ca7bcab17013932764ed04fd7127272d87fef08cb59bc43ae257a76fdd715581e9
-EBUILD mill-bin-0.10.10.ebuild 480 BLAKE2B e21f94640f4e4898397995d6e3e0da843b3add05198fa17f4b78f2ad7e9a25cb9c7abe305858841b785f5257848abd2e38c09468490901f4754aceb8ecf7af19 SHA512 6999a1976f2e503aa16f5b09baef81f032d5358ddd65836efbb4a5e2795cb45810a6b375da786edb3b3119e843c7b1284244824672ad0e263587689d820c9a59
 EBUILD mill-bin-0.10.11.ebuild 482 BLAKE2B 6cc43fe62699888c13dce2200f7f32c0f406bcf8bbb6f18d8105012d3ec8b679e1b1c210eaa07627e10fe93041776ac4ffb3dc3efd946aac12265724f9353184 SHA512 e88f1d81b10528f9198ff3bd4939eb7ea7d04917658039cfb6d55a578cbac50103d8a74e5ba035159b5e71534adbe3cbb8fecb72a955014b83b29fae929d1a2c
+EBUILD mill-bin-0.10.12.ebuild 482 BLAKE2B 6cc43fe62699888c13dce2200f7f32c0f406bcf8bbb6f18d8105012d3ec8b679e1b1c210eaa07627e10fe93041776ac4ffb3dc3efd946aac12265724f9353184 SHA512 e88f1d81b10528f9198ff3bd4939eb7ea7d04917658039cfb6d55a578cbac50103d8a74e5ba035159b5e71534adbe3cbb8fecb72a955014b83b29fae929d1a2c
 EBUILD mill-bin-0.10.9.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
 MISC metadata.xml 462 BLAKE2B 33fc9bc7b46cf529c83a5f554abf0ac46f109b72e9060b45c442aaae815c0845a0d5c8aa799ad369a75b5749e6499458763ca1913e88cae0d07fb6233e6badf6 SHA512 bd8831c79f4f164f509ee6415ef922fee49d40282d655785ec289f06da0e4735f3857041911236f2c7cf319f72458807ee5fb8a008e31774d90f03634161a2d2
diff --git a/dev-java/mill-bin/mill-bin-0.10.10.ebuild b/dev-java/mill-bin/mill-bin-0.10.12.ebuild
index 55bbda799eb5..9a8976de48b3 100644
--- a/dev-java/mill-bin/mill-bin-0.10.10.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.12.ebuild
@@ -8,7 +8,7 @@ MY_PN=${PN%-bin}
 DESCRIPTION="A Java/Scala build tool"
 HOMEPAGE="https://com-lihaoyi.github.io/mill/"
 SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 36c2c47192c0..6f2fd9aadd3b 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,9 +1,13 @@
 DIST scala-cli-amd64-0.1.20.gz 32520802 BLAKE2B b032e7ed3c5e340e03bbddde6b00289da7f7a7017266cd6f6b1500540a5c81d453180a88e11b3590a26e2188cf2206ac6fa4089b9f85cfce5745a7b15a5b44ee SHA512 a08632992fb9bf811f88b267ef587de673a5f59b5ba0e1d6b49aaf4057328cd738519afeb7f76a96ef569376b3d34dc11f4891729b5cbd900b0d8b348a0f3566
 DIST scala-cli-amd64-0.2.0.gz 32589377 BLAKE2B 1eebcf83a12d4aa0f981895b8ae8d5bea3d17ac02282410aff9c02a961cf305d81ebe19422f0d96c5e8246c51d0702c352d23900e690b774550a9720246c3c08 SHA512 50617a5006b738612f234e7acc5be9d7012cb525b2548286585c11d9ac9bad6f8711a41cb1210b50089709f5765ebacce27151420fa5922cd58496fccb9bc11e
+DIST scala-cli-amd64-0.2.1.gz 32642273 BLAKE2B f30dde2a5408032942e5676b0274473fe0db6ccab9e74830c33fa37a8283438cc848fda15d79f076be1eeb45f0463769acc4f82b2e0fc4a1c0e141c9df40d502 SHA512 773206656b35dea9312f8c8a2db6cd98e1a7c0d03840f661185f276b69dcc1dafe699e1db3cdfb9fd2891fec56cc6ad1cf03e7e53761afd9a1f3596fae31e05c
 DIST scala-cli-arm64-0.1.20.gz 32342696 BLAKE2B 54189891dce54d09869e5a0800683cf53e5613bb9ac74c137dbbbbdfea4e06f4a35dad07ec97db81e69a9fd704b1f44bda8b7466bdddaf9fdab07ca0a051d91f SHA512 040d287566f06b4d14a58cd9340ac15d8afa124d536053c0ee13db6d64e463162f7f2556004d593381377cc73b3a9075ee688937de4591fe6aa4a5cfe5121808
 DIST scala-cli-arm64-0.2.0.gz 32460836 BLAKE2B 742848e3125886ffc49d3972efcc8087967457e9fe6a1fead0c12a263136da0da654e30d97e8d59ac9aa3b016126a969e4e70e2824aba628a685baaa82369fbb SHA512 61a3b3a45c73041d210ba483bc8eac19d4aa518de7342d7e96c2cb24cc2e9b22a4fb2da2e65b6dcf0dde8dc4cbef565c607ee8339090e4efa2161e6c5b13b35f
+DIST scala-cli-arm64-0.2.1.gz 32498301 BLAKE2B 6ffd39f37bbcd33a59855e7226435dfea6ae99bc5cf30d182cd6920636e6b2e9ff627bd028b90f7cfbff4ed1829545697fe839290990d2938a24c64784f7e549 SHA512 b6609cb52bdfd4dffe4060343c652b477b5730c1f3f5f7267a39577c13e894b23982bfe80ae065472103bcbd1573675434e91128d31cbf3c83242f9aa60243b1
 DIST scala-cli-non-native-0.1.20 9239916 BLAKE2B 15d45ecd9b20cb5184626bd518b373e4ba12948b6fd14c11a55923118aa0e690ec0ffadd64c613a206555c3e2fbb580339c8b3cf3b9e039aea04551d5ce4f238 SHA512 1f7c8d22ae94bf79cd6d139ecbf4d73e2009a3ad727404051716e531271e01c31b252174e9b039bfcffa997d6ab9f18f0e30de7834de8f92ddbb0ad140a572e7
 DIST scala-cli-non-native-0.2.0 9395272 BLAKE2B 02236a18c380037bbf06649d883cc38af2f0bd4c0428838d6f551dd37a937c58e83c1ca6dc41b4052bb4e146b322d59179e2f81fb9261202003bbfdfb1f5de37 SHA512 fada2760148718d52a8b7b196479a4b5baa37275a525c1fbecc3cb039ef7e81952fc73560abd51fda6fc7a82bdb37ae2b502faf7fe43e406ac4cf7010ab617ab
+DIST scala-cli-non-native-0.2.1 9468051 BLAKE2B 9a9b5694261b769fafa3f3747f5e83869324e341f264dbfa463382e217acd5a2c994fb6e67e9e36175d97520938a40add424f5e9a77c62056eec6a828d4ea61a SHA512 547e9786527b7e7d34f4f912a6b9ae0c8f15eca3aa90f11f704283c63e5105363464f1e81f6dbb363fa71fb17e3e48b4db86e70f3b37b5059c40c02cd47382f5
 EBUILD scala-cli-bin-0.1.20.ebuild 1611 BLAKE2B 03a936018b30454111c132d9abf8ffcf59763d8c6243fdbf5c6dba6666b9f0f4c36c27683eb6566296d7d75a9d155c15c99aba1005163bf0153729ca6605dbce SHA512 59d929209a7735b90e91d3943aff185b7e62da677bc0739e079b6a75bc1773f526b3d4ba15f22ff8bba5f2b03b6168806e7c4c1ecb9cffee3c11a857f22378ce
 EBUILD scala-cli-bin-0.2.0.ebuild 1591 BLAKE2B d80d257a16c998835d352e6f89930d0187ba1c11fbbf2f7f40ad8677a26197ef70ee7d682989f24cff08cd3913c17e2576526019f07419b7ba278817901f63f7 SHA512 0f23b81ba48685446e6595432159d3098f2b492595a75157c99598d58bc331fb93b61375c33490e1d5098cb35037bcf9445561727c37657a0878ddb83734a4a0
+EBUILD scala-cli-bin-0.2.1.ebuild 1639 BLAKE2B 46db29e0562ef1eb9251089fa48d4ece457c6f6e2b18244c5daf4e7f4740812da83e123058121c02a4172a636749bfb33b44663228addba36204ef9d99b3e2d5 SHA512 0bb1b5a141d16d3407133515c8eab9e6476de1ad4a56a02332bf38817478ad31cf67269c3abc2bdcd4ee64b859aaa8aa37042786728e9aa7ddd56f19c748e630
 MISC metadata.xml 398 BLAKE2B b9b93abb74284cfbf4adfdf5d78a62dc6d21fa9e33c36d65842aa225b499f2220fed94648e4422eed5ae9f3c93123aeb68965783f3980a6c046168b3cde3657c SHA512 94e42c3c3b2b4d0b0092dce77a564f5e96617ab74aff3fa1ec89344c4d787f06ea8ff3ab6245440c228aa9c7018c96e2e740417dafc1699124f72b0235aed11c
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-0.2.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-0.2.1.ebuild
new file mode 100644
index 000000000000..7e22bcaded14
--- /dev/null
+++ b/dev-java/scala-cli-bin/scala-cli-bin-0.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="CLI to interact with Scala and Java"
+HOMEPAGE="https://scala-cli.virtuslab.org/"
+SRC_URI="
+	!amd64? ( !arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v${PV}/scala-cli -> scala-cli-non-native-${PV} ) )
+	amd64? ( https://github.com/VirtusLab/scala-cli/releases/download/v${PV}/scala-cli-x86_64-pc-linux.gz -> scala-cli-amd64-${PV}.gz )
+	arm64? ( https://github.com/VirtusLab/scala-cli/releases/download/v${PV}/scala-cli-aarch64-pc-linux.gz -> scala-cli-arm64-${PV}.gz )
+"
+
+KEYWORDS="~amd64 ~arm64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}"
+
+# A JRE is not strictly required if native images of scala-cli are used
+# (amd64, arm64). However we may want a system JRE anways so that the
+# chances are less reduced scala-cli needs to install a local one.
+RDEPEND="
+	>=virtual/jre-11
+	sys-libs/zlib
+"
+BEPEND="!amd64 ( !arm64 ( >=virtual/jre-11 ) )"
+
+QA_TEXTRELS="*"
+QA_FLAGS_IGNORED="/usr/bin/scala-cli"
+
+src_prepare() {
+	default
+
+	if use amd64; then
+		mv scala-cli-amd64-${PV} scala-cli || die
+	elif use arm64; then
+		mv scala-cli-arm64-${PV} scala-cli || die
+	else
+		mv scala-cli-non-native-${PV} scala-cli || die
+	fi
+
+	chmod +x scala-cli || die
+}
+
+src_compile() {
+	for shell in bash zsh; do
+		./scala-cli install-completions \
+					--shell ${shell} \
+					--env \
+					--output "${S}" \
+					> ${shell}-completion || die
+	done
+}
+
+src_install() {
+	dobin scala-cli
+
+	newbashcomp bash-completion scala-cli
+
+	insinto /usr/share/zsh/site-functions
+	doins zsh/_scala-cli
+}
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 5b2ba3462fc1..7a8cff6e3d70 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,11 +1,11 @@
-AUX as-needed-and-flag-fixes-3.6.patch 7761 BLAKE2B aed8b1b1060d8e8b762386eb43f498a498a802bc9dd0c01d25def325552aadceedc07852e0ca9da488d9650b12b1c107f82d76248789dc95048e7e10e396100b SHA512 c28571145d6e4dcaa0fef8ff1c4837d3e6f98060ac71f72ac6693102d43ce1dcff94782185272933e10bea37c81fe086de298ae19a5abd36ba12a7cfcf295b51
+AUX as-needed-and-flag-fixes-3.6.patch 7617 BLAKE2B 263499f0a475a025c4ecee1aafe37bc89396e482e475b65009004b5bbebffd278725277d042556a4c3f5594f091b63c2c26457f1761ce220df5ff949d0c51cf2 SHA512 d8d8ed07e851aba551a671278e4fc027ef8cab7b3d9d07e7c56e27da0959feed9d1eb87ec73963b52705a3087020959d89f61798ce8c474add7c481a1c505a32
 AUX build.xml 458 BLAKE2B 5e37fe8b8428e23f477c2767a2a96b1dc02aa6a8d4caa70b9f900c84d734f72665bb7cfeb7fd24dd6b54189ef4a242b1a6b9ab9d4d0bb0b370d59b491f09d2bd SHA512 49f3a4cc04d4d9cf0609aa97e01fa409a8f2dbb953ab3a52bc9984799d0bf4092d2a63fe665d8ba6ca0428089984b6ef47bc78900c613373ca1a7b588f6c5525
 AUX swt-3.7-manifest 750 BLAKE2B b0182c7e25e66be2443e3dcf0d64be1a92b836b8cd461cd6a92e7b73985a91a0c853fb8a3b784fa1edb70e2261f4a94e7273a505e4b130fcfe7b1c372b41efa1 SHA512 e4f6aa5ce58cdc697c234a2a4be43de0510d3c082a2737627a35df74d378a50edc0f7d3e62221f402eed602fcdc50fa7eff969b12602189fd400e1f1580f0d8f
 AUX swt-3.7.2-gio_launch-URI-x86.patch 4287 BLAKE2B 54c55cd48cb4f4d64deae90769aa84b7d2785c070c2e5b3e647037ca986d152b8ea71bb58c0d9749e8efb50fca53ab3fc9dbb4ae4355a86dc2285f253e74e064 SHA512 c82364b7e7bc255ed592a254201346a4159789ddbf486f22c026fdefce3f0d26bc91b42535228050eee4ec9b4e7a840008b60b2c7cb98896d6b8f1d875b5bef7
 AUX swt-3.7.2-gio_launch-URI.patch 4287 BLAKE2B 45c2655ca657b968b1fa6dc74fee4e30330339da12ffac079eaf616cf1f2e9a3a8e984789d38c43019ade81d9a5a444b0a763df3026732dbc515a3a6b329efb5 SHA512 4954c7464bb2ab7b9c23fd771d3dd49dd826d4a919d3ee85914ca8360708f26d396aaaa6564cc826fcff6ea892d916097e118c4ed0a1ed60cb8217e5c3ebf94d
-AUX swt-4.10-as-needed-and-flag-fixes.patch 2647 BLAKE2B 003a92de886b9c11dcba89f0fc6862ba4211359025f95c07d13e5a68bb151667bd0fa36137a28f144f6bb2b8c2905243a6402dd0136a9d9fe080c5e8d4dfedd5 SHA512 fd39fa82aa63de13904b9b2e535983de1be1129cb471e49fc2f76e0fdf2b3dc45a7bcddfce6c77447a8a5863ee590cffa3d29509fb12b30369dff1360f88493a
+AUX swt-4.10-as-needed-and-flag-fixes.patch 2530 BLAKE2B 7ed3d847cd56b0157e72dd08509d57709778ff08f0936e09e56f1ee2f50a2938c58fdfb1969b0ccfd2558d5d84dce0b55b183d08f05e492c5dae641fcd347703 SHA512 af789458ab106330955c772245aa2603d3fb7b2037ef6bbdfd535361007d9f61dbda9ba81774e8ea0b8e5c14eeb5db3d5bf188feae164141aab0f1ea65410fe5
 AUX swt-4.10-manifest 739 BLAKE2B d70c6bbecc6741cff4889005f13adab95d59ef7ff4604bf0ca4482422cb6d4e6f0766e1a01bd9779c3acab3d5b1d382b193b93c44f00ad37317aa6b9308f1088 SHA512 dba2b208fb925cdc43dd64c0900b5c8e8d2ffdea06a9f4f49648d9aa6625481b8316c654d07a1b059385c9546f4929a747a69107415028b0fa0247a7619538ce
-AUX swt-4.27-as-needed-and-flag-fixes.patch 2697 BLAKE2B b8887e16b23ad4eac3c2f995400c6c27d613c31e309c68526c6f0945dc555fac70071aebd61172c9e074452a9bef41bd72639d30632cbc09f07f838b59729698 SHA512 a18c1dee0a51edbbdd9fa3bc5e5958e3c9c1821542351a4c9be303628434b4cd84c1c7cb973760cd3595858e9b85df36570b39e4706b688982f189d115c82493
+AUX swt-4.27-as-needed-and-flag-fixes.patch 2918 BLAKE2B 9411f03dfbc9dc55fb567385bcb5e87cb949d8babd611d99f6643c2c3e1cd79053433b0c87c0ef5efcabf9a07e31995b74ffad1f7433f40bb8ffaf9170dd5afb SHA512 ee0516dbb759f8981538eb55f2008af29641156a90435e2d24f54598bdc288f5eade58356358c42d404527fafc366e0f878c6fe3ceea0805849bb3d171663b85
 DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0
 DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426
 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
index fba4a36aaf1c..d6cc763ea968 100644
--- a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
+++ b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
@@ -1,5 +1,5 @@
---- a/make_linux.mak	2010-06-08 17:30:58.000000000 +0000
-+++ b/make_linux.mak	2010-08-09 22:48:01.515433721 +0000
+--- a/make_linux.mak
++++ b/make_linux.mak
 @@ -66,7 +66,7 @@
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
@@ -124,8 +124,8 @@
  
  glx.o: glx.c 
  	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- a/make_freebsd.mak	2010-06-08 17:30:58.000000000 +0000
-+++ b/make_freebsd.mak	2010-08-09 22:50:26.173246263 +0000
+--- a/make_freebsd.mak
++++ b/make_freebsd.mak
 @@ -64,7 +64,7 @@
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
diff --git a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
index 09bed21d58f8..cb70122aa411 100644
--- a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
+++ b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
@@ -1,6 +1,5 @@
-diff -Naur a/make_linux.mak b/make_linux.mak
---- a/make_linux.mak	2019-01-07 14:08:00.269147198 +0100
-+++ b/make_linux.mak	2019-01-07 14:10:28.645155241 +0100
+--- a/make_linux.mak
++++ b/make_linux.mak
 @@ -101,7 +101,7 @@
  WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
diff --git a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
index fffbc910c521..c8ea6322f8a1 100644
--- a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
+++ b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
@@ -1,7 +1,6 @@
-diff -Naur a/make_linux.mak b/make_linux.mak
---- a/make_linux.mak	2019-01-07 14:08:00.269147198 +0100
-+++ b/make_linux.mak	2019-01-07 14:10:28.645155241 +0100
-@@ -98,7 +98,7 @@
+--- a/make_linux.mak
++++ b/make_linux.mak
+@@ -98,7 +98,7 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
  WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  
@@ -10,7 +9,16 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  		-DSWT_VERSION=$(SWT_VERSION) \
  		$(NATIVE_STATS) \
  		$(SWT_DEBUG) \
-@@ -130,13 +130,13 @@
+@@ -111,7 +111,7 @@ LFLAGS = -shared -fPIC ${SWT_LFLAGS}
+ 
+ # Treat all warnings as errors. If your new code produces a warning, please
+ # take time to properly understand and fix/silence it as necessary.
+-CFLAGS += -Werror
++# CFLAGS += -Werror
+ 
+ ifndef NO_STRIP
+ 	# -s = Remove all symbol table and relocation information from the executable.
+@@ -130,13 +130,13 @@ all: make_swt make_atk make_glx make_webkit
  make_swt: $(SWT_LIB) $(SWTPI_LIB)
  
  $(SWT_LIB): $(SWT_OBJECTS)
@@ -26,7 +34,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  swt.o: swt.c swt.h
  	$(CC) $(CFLAGS) -c swt.c
-@@ -169,7 +169,7 @@
+@@ -169,7 +169,7 @@ gtk4_stats.o: gtk4_stats.c gtk4_structs.h gtk4.h gtk4_stats.h swt.h
  make_cairo: $(CAIRO_LIB)
  
  $(CAIRO_LIB): $(CAIRO_OBJECTS)
@@ -35,7 +43,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  cairo.o: cairo.c cairo.h swt.h
  	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h
  make_awt:$(AWT_LIB)
  
  $(AWT_LIB): $(AWT_OBJECTS)
@@ -44,7 +52,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  #
  # Atk lib
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ $(AWT_LIB): $(AWT_OBJECTS)
  make_atk: $(ATK_LIB)
  
  $(ATK_LIB): $(ATK_OBJECTS)
@@ -53,7 +61,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  atk.o: atk.c atk.h
  	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -209,7 +209,7 @@
+@@ -209,7 +209,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
  make_webkit: $(WEBKIT_LIB)
  
  $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
@@ -62,16 +70,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  webkitgtk.o: webkitgtk.c webkitgtk_custom.h
  	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c
-# @@ -217,7 +217,7 @@
-#  make_webkit2extension: $(WEBKIT_EXTENSION_LIB)
-#  
-#  $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o
-# -	$(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
-# +	$(CC) $(LDFLAGS) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
-#  
-#  webkitgtk_extension.o : webkitgtk_extension.c
-#  	$(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^
-@@ -229,7 +229,7 @@
+@@ -229,7 +229,7 @@ webkitgtk_custom.o: webkitgtk_custom.c
  make_glx: $(GLX_LIB)
  
  $(GLX_LIB): $(GLX_OBJECTS)
diff --git a/dev-java/txw2/Manifest b/dev-java/txw2/Manifest
new file mode 100644
index 000000000000..ba95ab7503a2
--- /dev/null
+++ b/dev-java/txw2/Manifest
@@ -0,0 +1,3 @@
+DIST jaxb-ri-2.3.8.tar.gz 1734411 BLAKE2B e60a7f78f2bfaf23cc0ce6727ee1b1611facdeebd5b456c207260447a508674dcbf934d2c6343cfbb58b93adf3352c8145caa2a8c77e264ae2403351527ff96d SHA512 73fda68e8d936b681d53ec72153cec0f7608517d0f037b4f140e4fd48e26f3e03a88f5b34bb635d0e6c7701121befd7d18a98aebd019a663e08ed9667a39c535
+EBUILD txw2-2.3.8.ebuild 625 BLAKE2B e3b8cb42756069a1586f5bb8e6f8d46f736f3de05db93ff7821ab1fb6530a6c422dbf454ca2ece63e13182fc4414e9703a95b65968e85cb12df74bbdfb11fce3 SHA512 2da4bddbb7845e96148ed30ed1e437490cd0826f2888703290558bee30575acd865aeb86a7675e555530f3b15d6ec7a73c084afe0102651bc11edf7dd6693e24
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/txw2/metadata.xml b/dev-java/txw2/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/txw2/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/txw2/txw2-2.3.8.ebuild b/dev-java/txw2/txw2-2.3.8.ebuild
new file mode 100644
index 000000000000..a31cd740a9df
--- /dev/null
+++ b/dev-java/txw2/txw2-2.3.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.glassfish.jaxb:txw2:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="TXW is a library that allows you to write XML documents"
+HOMEPAGE="https://eclipse-ee4j.github.io/jaxb-ri/"
+SRC_URI="https://github.com/eclipse-ee4j/jaxb-ri/archive/${PV}-RI.tar.gz -> jaxb-ri-${PV}.tar.gz"
+S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri/txw/runtime"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"