Adding metadata

32 files changed, 597 insertions, 94 deletions

diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index a5959914cdf3..f0802ea1f788 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1 +1,2 @@
 DIST checker-framework-3.43.0.tar.gz 8306595 BLAKE2B bcabe8e5a0de20615980048780528b6fcb1946f8793b9cd7c3b12afeb4688c6eb91724fd111419a243801b1456537cd40994d062f2ac341e904c93c285c530ad SHA512 73f6d6d45cf926b23160fc6089596f27b33b1ae6b8489aa3a2c2e0d8330331c331ce87d0826de8f512432d469f96330e77a4323082b3db4af5f5abf81ba06295
+DIST checker-framework-3.47.0.tar.gz 8335232 BLAKE2B 4b6d8f5bb055402e6b368640eb42e4e13173dc847a4b8145e7c306856cab2151c17bfbd2c3a645708e9b7525a1e3f73d4c28c3ae24d038ac0c3119d8fcf671df SHA512 17188ab83ee8c91fb112ed0f750611c7fb5fc17f80a0bbd9b19f1514902770c2a227cf879fb581c8c915fa9827febaa8e67a0188c70df625268118344a281fbd
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild
new file mode 100644
index 000000000000..026febee0f73
--- /dev/null
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.47.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.checkerframework:checker-qual:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for type-checking by the Checker Framework"
+HOMEPAGE="https://checkerframework.org/"
+SRC_URI="https://github.com/typetools/checker-framework/archive/checker-framework-${PV}.tar.gz"
+S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
index b892008977f0..612bc76ff406 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
@@ -14,8 +14,8 @@ HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt"
 SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="4.20"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 BDEPEND="app-arch/unzip"
 COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
index 0a750385f6ab..beb7971b8347 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -15,8 +15,8 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="4.26"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
index 5b3748f2682d..6042718d196f 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
@@ -17,8 +17,8 @@ HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt"
 SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 SLOT="4.27"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 BDEPEND="app-arch/unzip"
 COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
index b87cee1c3b1a..fb20056ada16 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
@@ -14,12 +14,12 @@ DMF="R-${PV/_rc/RC}-202312010110"
 
 DESCRIPTION="Eclipse Compiler for Java"
 HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt"
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar"
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar"
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 SLOT="4.30"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
index 44e5c0c826be..d7601e8396e0 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.31.ebuild
@@ -18,8 +18,8 @@ SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${P
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 SLOT="4.31"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 BDEPEND="app-arch/unzip"
 COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild
index 3eefeac04654..1b686c4f4bff 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild
@@ -18,8 +18,8 @@ SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${P
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 SLOT="4.32"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 BDEPEND="app-arch/unzip"
 COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index f1084eef66fc..d5fc2fa612b3 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1 +1,2 @@
 DIST error-prone-2.27.1.tar.gz 2826681 BLAKE2B 8f848a89e97ea939dc4b81751a40d7b6bec64807ddca0d078bc02599bb663fa8a8d10d566536c33c4d50b3af21cf613bb282ac3403fe5345a20361627e116e5a SHA512 54d288dd5d5f23ae052eacc92ce304b2743aa56a524ad1b235ecd35cc4ecd72b44ec0c3fee319076466b8e90c20095fd5191d59b9c48cbe5bd940e189b1a073e
+DIST error-prone-2.32.0.tar.gz 2856245 BLAKE2B 129347be0a1e9ae450c03b47c088962efd7f156dfd5f7343fc17837cb4b64e1787c325ea4d6021570559a09310688a378555c5ab0e1df4996f21e88a73487212 SHA512 ae6286f9cd4d75fb0165d9788a7a2c588a05eef5a4f714a6deb9623d6d8cf4a2173bb44a8faee058f2496dd31124b40570a91a359a8f735a88abf59eea05f39e
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild
new file mode 100644
index 000000000000..4f6b1d2395ad
--- /dev/null
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.32.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.errorprone:error_prone_annotations:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for the Error Prone static analysis tool"
+HOMEPAGE="https://errorprone.info"
+SRC_URI="https://github.com/google/error-prone/archive/v${PV}.tar.gz -> error-prone-${PV}.tar.gz"
+S="${WORKDIR}/error-prone-${PV}/annotations"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index 909dfaa7631a..85db383245eb 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,2 +1,3 @@
 DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466
+DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
 DIST truth-1.4.2.jar 275487 BLAKE2B 9c0dce92648f734ab88a0faf1a1e5328d747efffd29aa8f12b7ed2b2c87036ce18bf3195348f9ffce848842a240179fa60e9625c6997439a4cedce6aac6c2b77 SHA512 5f29cb259f2cf63e8a908061d2a58b28ecf12366a03564c8e63c33cdbdb21935ac95ed7b68437b015a2bd055732c88ec8ca1e55b45b99a2cb3e9dd53cb0b87cc
diff --git a/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild
new file mode 100644
index 000000000000..c005039e87d3
--- /dev/null
+++ b/dev-java/guava-testlib/guava-testlib-33.3.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.guava:guava-testlib:${PV}-jre"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="A set of java classes to assist the tests for Guava itself"
+HOMEPAGE="https://github.com/google/guava"
+# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz
+	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )"
+S="${WORKDIR}/guava-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	>=dev-java/error-prone-annotations-2.32.0:0
+	~dev-java/guava-${PV}:0
+	dev-java/jsr305:0
+	dev-java/junit:4
+"
+
+DEPEND="${CP_DEPEND}
+	>=dev-java/checker-framework-qual-3.47.0:0
+	dev-java/j2objc-annotations:0
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="checker-framework-qual j2objc-annotations"
+JAVA_SRC_DIR="${PN}/src"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}/test"
+
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		CHECKREQS_MEMORY="1024M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_env
+}
+
+pkg_setup() {
+	check_env
+	java-pkg-2_pkg_setup
+}
+
+src_test() {
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.4.2.jar:testdata.jar"
+	JAVA_TEST_EXTRA_ARGS="-Xmx${CHECKREQS_MEMORY}"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index bd3ef1d79f18..a0da1bd1de4a 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1 +1,2 @@
 DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466
+DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
diff --git a/dev-java/guava/guava-33.3.0.ebuild b/dev-java/guava/guava-33.3.0.ebuild
new file mode 100644
index 000000000000..c24a36ec75a2
--- /dev/null
+++ b/dev-java/guava/guava-33.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:guava:${PV}-jre"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	>=dev-java/error-prone-annotations-2.32.0:0
+	dev-java/j2objc-annotations:0
+	dev-java/jsr305:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=dev-java/checker-framework-qual-3.47.0:0
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
+JAVA_CLASSPATH_EXTRA="checker-framework-qual"
+JAVA_GENTOO_CLASSPATH_EXTRA=":futures/failureaccess/src"
+JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/jeromq/Manifest b/dev-java/jeromq/Manifest
index 015d1b539992..cecc2a3c6361 100644
--- a/dev-java/jeromq/Manifest
+++ b/dev-java/jeromq/Manifest
@@ -1 +1,2 @@
 DIST jeromq-0.5.2.tar.gz 422673 BLAKE2B f244ef95bff70de8eb184e6eda8e292c54488435b8c9e000dbff5f1d6cb7b2b3066061bcb1fa678d2756117a52c39df795dae84071b544b0f577a331aecc8516 SHA512 49a3e9f7ff6b54dcde03958a84e72b8d4b44fb150fc980e9f1ea4ba9e258dcb0a0730d006550a3eb33e9f241e6d89cdc0ee2155213ddd309e255d606d1fa567b
+DIST jeromq-0.6.0.tar.gz 467854 BLAKE2B 65b5b8cf676965a07d4bc26898a6db6739a1b5431678c16c0c182eee5d0c69c86a01b17ad1055caacec78149816ddc0c9468fec577f2ab82c681b7822858ee17 SHA512 2e140d456bf6a7f566b3cd563a7697d08c96b004ae70cdc37e427e4526cf8db83e5df6a492e63887f3dba639e3c29384fc46ee9e9e4a6a800e3c2c2446a65695
diff --git a/dev-java/jeromq/jeromq-0.6.0-r1.ebuild b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..30abb471818b
--- /dev/null
+++ b/dev-java/jeromq/jeromq-0.6.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.zeromq:jeromq:0.6.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Pure Java implementation of libzmq"
+HOMEPAGE="https://github.com/zeromq/jeromq"
+SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+DEPEND="
+	>=dev-java/jnacl-1.0-r1:0
+	>=virtual/jdk-11:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( AUTHORS {CHANGELOG,CONTRIBUTING,README}.md )
+
+JAVA_CLASSPATH_EXTRA="jnacl"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_compile() {
+	JAVA_JAR_FILENAME="org.zeromq.${PN}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	# maven does it with jnacl not providing module-info
+	# need to figure out how jdeps could do so - we simply add one to jnacl
+	jdeps \
+		--module-path "$(java-pkg_getjars --build-only jnacl)" \
+		--add-modules com.neilalexander.jnacl \
+		--generate-module-info \
+		src/main/java \
+		--multi-release 9 \
+		"${JAVA_JAR_FILENAME}" || die
+
+	JAVA_JAR_FILENAME="${PN}.jar"
+	java-pkg-simple_src_compile	# creates the final jar file including module-info
+}
diff --git a/dev-java/jnacl/jnacl-1.0-r1.ebuild b/dev-java/jnacl/jnacl-1.0-r1.ebuild
new file mode 100644
index 000000000000..2b78a0000a35
--- /dev/null
+++ b/dev-java/jnacl/jnacl-1.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.neilalexander:jnacl:1.0"
+# JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Pure Java implementation of NaCl: Networking and Cryptography library"
+HOMEPAGE="https://github.com/neilalexander/jnacl"
+SRC_URI="https://github.com/neilalexander/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# We don't have fest-assert
+RESTRICT="test"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_compile() {
+	JAVA_JAR_FILENAME="com.neilalexander.${PN}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	jdeps --generate-module-info \
+		src/main/java \
+		--multi-release 9 \
+		"${JAVA_JAR_FILENAME}" || die
+
+	JAVA_JAR_FILENAME="${PN}.jar"
+	java-pkg-simple_src_compile	# creates the final jar file including module-info
+}
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index bbe137ffaa16..4fb9d99fa973 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,3 +1,2 @@
 DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
-DIST apache-maven-3.9.8-bin.tar.gz 9083702 BLAKE2B c636ea861d1c96938490453600cac513caf54843ffc26f45e22a655e737af93689d492e3b3055b184a33a1975aaa50a681a29412ebfd036dfd8e2c61043f6291 SHA512 7d171def9b85846bf757a2cec94b7529371068a0670df14682447224e57983528e97a6d1b850327e4ca02b139abaab7fcb93c4315119e6f0ffb3f0cbc0d0b9a2
 DIST apache-maven-3.9.9-bin.tar.gz 9102945 BLAKE2B a705f18a1e7bdfd5d9ba8c38da02245ed5754fe749416ccc715dcdae21d8a41026778dfb912e3ea3e89e8358aede13d29ce3081ac71b16191e53d5cac557e643 SHA512 a555254d6b53d267965a3404ecb14e53c3827c09c3b94b5678835887ab404556bfaf78dcfe03ba76fa2508649dca8531c74bca4d5846513522404d48e8c4ac8b
diff --git a/dev-java/maven-bin/maven-bin-3.9.8.ebuild b/dev-java/maven-bin/maven-bin-3.9.8.ebuild
deleted file mode 100644
index 16060561ede9..000000000000
--- a/dev-java/maven-bin/maven-bin-3.9.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-HOMEPAGE="https://maven.apache.org/"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="3.9"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
-	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
-	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" "${EPREFIX}/usr/bin/mvn-${SLOT}"
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index 9f645d5aee76..69a4f55fe8b4 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -1 +1,2 @@
+DIST metainf-services-1.11.tar.gz 5364 BLAKE2B 35c02791b4874a4806b9886c5d1d25e68ea0fbbd2e2e34c716e87e5043b56416c00e32e53f31e5ede0a4c9d466a64bb1e882ec9fff1ca0771ac9ae534c666394 SHA512 ccbe31a061c29ce45d1f86efee40675b89d328ad40b717abf28b9b7b62c678b584281b2d99848ff41992c7ff38941e5f9b93aac8e967605e2221d4bd02019490
 DIST metainf-services-1.9.tar.gz 5353 BLAKE2B a2d72b886169f6697033c56fa581e4fed9f69236a335397b0480111959e87e1d25ee16b96c6449b37b467aa68f0b4997873346416d8a09e3b14b911ffe37ffd4 SHA512 6d666c2582944e824cc66dd58c09474775e475146af7f8edcb4abce45eff6573481f550d8c37b854addd81825201207be7855b9bbc21f539559395a63e9fa261
diff --git a/dev-java/metainf-services/metainf-services-1.11.ebuild b/dev-java/metainf-services/metainf-services-1.11.ebuild
new file mode 100644
index 000000000000..d03e2e80adf5
--- /dev/null
+++ b/dev-java/metainf-services/metainf-services-1.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generates META-INF/services files automatically"
+HOMEPAGE="https://metainf-services.kohsuke.org/"
+SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 25258df079e6..b7c6f2420178 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,8 +1,9 @@
-DIST OpenJDK-jdk_aarch64_linux_hotspot_24_8-ea.tar.gz 212736873 BLAKE2B 19b1e544e8bb70a2377f9aeb85241ed807167795742e96829dccf8fa5e6ea8d8512fd85f781d40e1428f415775b6ab77c4bdbec4e3ad66b05010665e535d2a8e SHA512 5c7daf6d12bb4acc031ce17dc429f4e3bd2e7bb74ca9b8f3ef90598ef69fd017bd3c73589d64d23919344328869465c3551832d2095311f3b6208c2e62fcc4b1
-DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_8-ea.tar.gz 214372109 BLAKE2B 891f3b1a16fa9ea1ec247a9c68d84fabbe67c9052584580626f67d2cd87504f7eaaf008bfbf59b6250c63b348d6b1cb734b75d7aa0ad334f9738b8f624c0d874 SHA512 d9756fcd2e02f4317c6be0c97e163c6d836c07dcf83f272ca97920433f596bbda01beac6c302a425bed3ca0fb628bc919a2e33ebe754b8bd9672787f1be9d255
-DIST OpenJDK-jdk_riscv64_linux_hotspot_24_8-ea.tar.gz 210709698 BLAKE2B a612df8e357a930ae1bc6f54a5f0f0c55f8fec279ce7ea7f52ff45a097badd1a848dbdad5778adf2a13e622c7ff63b6c10b6feb7e3f8de75016eb9bf404f03d4 SHA512 1c4d93def2a92de4e1a1a8f6ab624de542c4fc177b9d66815d50b1cac823ca6295a4a702402ae09b8b9662ea40c56da836d6a962af8a2fbd7bf6576a3036187e
-DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_8-ea.tar.gz 215051746 BLAKE2B b58ad14f0faa0940621245eeca212ed6112352c9e52833fc5dd2aa740956bce85d69f8d30aa923bc0fe0a0d81ed8dc4d4c9d8cfea5132de03d34d6c40bb7f3c8 SHA512 610a2bc5df2670a214ce39ec426428c3dfca47e5c4c04ed3bfe92fe48ec944324208f4edbb242842508a1964b97bf1085aaadec14d5fe8c4cf7bde57e20d505b
-DIST OpenJDK-jdk_x64_linux_hotspot_24_8-ea.tar.gz 214855714 BLAKE2B 4230cd14375499463872f9c9e879b27ffcff602ca2401634fa0ae1dbfbc9a7aabff67f6f99b7a2e5ce409eabef962775706785268b8bdce8cd3f40dc76042b83 SHA512 55ff9c22d61815e7b4cdf8bdadc75d6ab16c0a6d6a559a71bb11ae9ac3236e4305b9928981d489ca71078e64bb647f8731534d093e1c81249e32d7c168cc9df3
+DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_24_15-ea.tar.gz 212878116 BLAKE2B 1e5768eb0d900c7234049173dd2f76a9d1bd1661f8c5a2070400bf26fcb3d4550803b7e91b851152375b7344f164e86d6f33a82c28ee2e8bc4497029030c2281 SHA512 c8646b3f727ca48f7950327c621a8625931965b0a0b1ed4c5811a77d8b189f5295060d51ce3d7b3fa5fee714f44e6513d6fad69ae5cdf9fee314f1d8ee7397d8
+DIST OpenJDK-jdk_aarch64_linux_hotspot_24_15-ea.tar.gz 212847823 BLAKE2B b3986bd7038734c713a85177c2c87870b58c82f721a3b7328c80fdaba764589b6561d1b0ce7ca8d67a744b6e5acd15a9f51c206db0e06ab789005d44463cd511 SHA512 ece9e3cd2c88bb5455f67bbc185ff5e17f3b2f00c10ab7206a4062baa7852bf8b43abe6bc71f5eb797e87db25c3f4e199e6fd612c5f77c8ef9f58f167ce468da
+DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_15-ea.tar.gz 214453128 BLAKE2B 4a99153ca3bcdf94ef8d4fc96b66a80307f09626f63fe0f70451208362d4e4ae6759e0769528041d6c5d629057c10dfb3a173eed8f6ee289fadbd52587163e9c SHA512 80ccf9398534d025e42c44d21a9c3dfb389c6b376c96724e6b086b361fdda1e20880e00ad3f74715068ec69add527f9f2ba363759ac9edb25997096316ddd128
+DIST OpenJDK-jdk_riscv64_linux_hotspot_24_15-ea.tar.gz 210831983 BLAKE2B a8603cdc69b8a6608e06dd92d233db8867c633403f976ec62be3bf9d04296e56d89910a38ccae1a130abceedb1122a03eda03f7432abdc2f0f64cc1deeeb72ea SHA512 61e25536620880c5d39df44f740e349ff96075f9208bf6ccde5b4905cddbb0bda793cbcac4875b75e8116a7e443dd28fe9cde2de3d18367a10860a0d5bb55d20
+DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_15-ea.tar.gz 215189640 BLAKE2B 9eb9f839f7e581ed54647c9a2542c36495b0ba8357422a128e57655ee59518d67f28986889a654a41d50bfc2470e2ef14a91b5aff14c34197c0ee669f1919199 SHA512 3d41bbf1bdef408244eb953463c8f3758700edbd2c348af4cf5f2b854116452d70fffaff4d6cb7195764b6d07a429c0daf125b2761d0069a571fb084eb814bf3
+DIST OpenJDK-jdk_x64_linux_hotspot_24_15-ea.tar.gz 214963834 BLAKE2B 67ef16f4f8471dc307dfa4ad6a1ac6fa4a22d6f643804be928d134202db9196a1cba78bf44cd3bbd872421520c4a96b0df0ee838b9404418cc82e115443e9ffd SHA512 7eb11bc44260e0a6f807593b1c16eff8088c4329ccb9e2a72c5face45383540f59644363c3f9840325eacf23aed7b3ee2a6a4d5998adf92200df0d1912ba2136
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz 192087968 BLAKE2B 12659ef10cf2728ca5eba2b4eed5f592a5bbff5065f33309498e7a465661957e0e8191bb691a89934a8221e26ae7265f0aca059ba59731b5d9a80e7f6cc55206 SHA512 84dbb810134199cb2f0278ccbcfca2d1abe32bf65bbb399e99c2ea9a027e21c2ace5685adae98930be4a185970640626b5bbbf822d499f815d803fa4485134f7
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz 182800065 BLAKE2B 50158e8e84637ab841226da590f53ef3d0f18aa2dc4ce5c2fabc2260d864a1de65a3021e380fa9a1af1aec92177c2618790ced8c7f12f449fd7ab4851bf37ac0 SHA512 893ab22f39f102724e7b77b7a06e09b33ee0551b166c0154ce19d4e6abd7e346d0a8314fe2e675e102febf93e001679a1c7c665f6b131c04a453cfbfbabb5003
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz 177494491 BLAKE2B acc6c4893a57250284b7be0fe98d6ea3b44f42227174050ac3d035ff68e482a61aeb32b38f1404f597c47dc3090fa49aa27401c6903367cc938b1f4041cb714b SHA512 88d8e3eee4af1f3578ee001516fd9a2a71af6317af404e39b64365ac780f89455dbbac1eccf50aa6d09cb879a79da88e720c344cc527d7313d6abfb8b148c3ae
@@ -22,6 +23,12 @@ DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz 207691025 BLAKE2B 5413
 DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz 203854772 BLAKE2B acecfba0619cd5856f2e2c835240729f5d70a1f4fc373c99e7dec2aadc701d5779c8b42b804337653d6e8b99089fcd1622f48232a9a36bd25b4e4b7016ce68e6 SHA512 92a12dad45b80ee25b555b26456a592db65e5cf2373984e7102ee0527a923cc1d015fba0a75177f3f0063c5d1843f4999fb6627b506cd506571b9625871dc892
 DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.4_7.tar.gz 208015131 BLAKE2B b143b83ff40affffd0be90cc19fec59777a80f783c6a4d9d1161d5205dee9a50f88d89fc21e402a14a1849d2dfefb780935acb47b7366b8fb07a3cd10f9ca65b SHA512 9cf65b7ea2cc4e7a21c5832c3522211c53b55fb6f0d4ec4deecb94744dafbf1412c17508ed1c21cb06b03c5bcf8212a0e5d6f2804663833735a1ac2f77dae7a2
 DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz 207789015 BLAKE2B da61c96f082f18bbb64e543b96972d0cf812cbd64ac970a45000506e41f9f54628453d4a24b4090271dc267e21bfe285a04173c106259e67dc72246c43edbe32 SHA512 7675079ac1ed0c0428f806908b21c58549df7fc18043d26c011e063b58772ddb1c1c9648a46ab7d5204d47c2af5d3f08eace30028113d64e09cadc69c4fd0def
+DIST OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23_37-ea.tar.gz 212329941 BLAKE2B c323d26d43f7d629a45098739e7a3ae32a7391c7246f818dcfb9db3c49ecc1e1a4ef1e60873a76e7dcfcc74e9e6310f4d29ecaf9aa3a1a1863e374e8b23f0d4e SHA512 692b818864b4c3c91e850b77b711d5fc1548f2c75630016689ac33fe25fe8602f89d52b046e3c213f9fdb66215e74dba4422b3e1d24133d991e7563c05dcd4cd
+DIST OpenJDK23U-jdk_aarch64_linux_hotspot_23_37-ea.tar.gz 212322868 BLAKE2B 10b4c3a135ae8e92faf0f1137a502660632f4fda3a85ca4d69fd15c7b380a483adf2d97ba35501fa75550f4afedf0a59531cc72fef558c71fc495aa90f1d09bb SHA512 e66dbccd7e90b2282805a27478f72f3c9e62f1f25be57569a40c2a8b3a99f1cdd1b994ee58b83b20e6ad3a30c218082e845466457fc659cc742d8bfc6594e564
+DIST OpenJDK23U-jdk_ppc64le_linux_hotspot_23_37-ea.tar.gz 213924750 BLAKE2B b6d7158d2fac60a7187edaae129b986ad1977766731c89823ffe222803281adc8980f42dba6c7502403ed39fe0d5e178c858ff252c16bbbd7b05803edc6bf978 SHA512 f05c593681fc5c8048fa5e452a10ecae10aae06ee405c82db99748ecc252d9ec2ef553649765d4c01255f87039209d4dee26c25f9885531327477d95a5b4081c
+DIST OpenJDK23U-jdk_riscv64_linux_hotspot_23_37-ea.tar.gz 210224273 BLAKE2B 027e55a567d75f596d1e53c0cf010d44ad025b03344292169003b09f070a2885be0e8d0df24130d8a6da49ac8617ea17f644ebde0dcbc70c9410d0a01260ab41 SHA512 82bcd987bace91ee57fbbb6ebf92b111ffbc3e524d3a76b9e716ea7469bfa40f5ba26e9a842a7676f1c93b0947296b10240a053039dfe04f01362bfb1f9564af
+DIST OpenJDK23U-jdk_x64_alpine-linux_hotspot_23_37-ea.tar.gz 214601112 BLAKE2B f5413519769574e39cec93228dcdb21d003ecebf9a7b03bf19356bd151809b1e4541174292622d03a829510c5e937be9f21f64315fa3ac7618fac75c003362de SHA512 9894d9bd787b8ba4d5ed70cdf467b0c07bffec28d6d6149733eb7bafe9cef62fcb612fb94d1b90682ae4152c8cab2e403502f874ca9013df0c2c498da33c93e6
+DIST OpenJDK23U-jdk_x64_linux_hotspot_23_37-ea.tar.gz 214424735 BLAKE2B 667c76acff5c9980aeb1e0eb5cc6915961327d51a15c529a9a973c0e75c0eebedb877cec8678cc60d0859f21589b887c1bddd400c36470684eb5509b1ae34f74 SHA512 7dbb7d7dc391323287fb0a010735153b70b42f31755a4dee27de45c7fea170cf692e8cce98e9637dc57bba0bca1aa003e1bc1b896e1e48d3039ecaa87fc85c0f
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz 102132553 BLAKE2B b59a2d99f9999f86eac2ab15617ee7c58d179a7db2e3606b3296b4bee8bbfaaee2f3cd1f441d90b7462ef9a502f4f351bdb4acc8e723d6b16f208827b813e8a7 SHA512 3856d2e711fd0f93f5efb73ffe5dc115d03dbd0cd015e903b7c2d02b6a3940b10793243edd6a372d7f84306f10c7a41cf13d7b787a33d525f1e86e9975453d06
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz 98342561 BLAKE2B e34d6c959a2100b7c1817ad0fa213331e1cca75229edccf68ed4fcbd3b9bdeb0852dfdf59dac3e9cdae0179af38edc64ff7329af9f44fadcfaa7cf301f8f4e13 SHA512 a667d531b3318e7f75d3d4d9a32248c5c9ae7c1d4bd9bfcbcb5f11418016c1faa179ed748c3eae09c8693885a9401a80de8f3530891883b9f6e9de0b50002ed5
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz 100533202 BLAKE2B b83b926e5bf0fe45bce9a79489422b96c6ab321227a56d8b3c683a26e5b71cbf9ec80a4dc2706aa4853095a4ee3174591cba8725b9e1b645f4c275137a97abee SHA512 e345de1325f9807d1cc3e4b043d650d655ad8a3672edec304023af54c7dd1d8fea0e671781ed46e6d7459909afedb2458c1b45966b55957389ec62449aec6469
diff --git a/dev-java/openjdk-bin/openjdk-bin-23_p37_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-23_p37_beta.ebuild
new file mode 100644
index 000000000000..2d005d919140
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-23_p37_beta.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2024 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$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV1}/"
+	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$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV2//+/_}.tar.gz
+		${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+MY_PV1=${MY_PV/_beta/-ea-beta}
+MY_PV2=${MY_PV1/-beta/}
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri aarch64 arm64 musl)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
+	$(abi_uri riscv64 riscv)
+"
+S="${WORKDIR}/jdk-${MY_PV%_beta}"
+
+LICENSE="GPL-2-with-classpath-exception"
+#	SLOT=$(ver_cut 1)
+SLOT="23"
+#	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+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="*"
+
+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-24_p8_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-24_p15_beta.ebuild
index 72e3e2f5c768..0d6bc9a78d7a 100644
--- a/dev-java/openjdk-bin/openjdk-bin-24_p8_beta.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-24_p15_beta.ebuild
@@ -34,6 +34,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 SRC_URI="
 	$(abi_uri aarch64 arm64)
+	$(abi_uri aarch64 arm64 musl)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
 	$(abi_uri x64 amd64 musl)
diff --git a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
index fdf4cbbec3a1..777fecd885e4 100644
--- a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
@@ -163,11 +163,6 @@ src_configure() {
 		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
 	fi
 
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
-	fi
-
 	# Work around stack alignment issue, bug #647954.
 	use x86 && append-flags -mincoming-stack-boundary=2
 
@@ -233,6 +228,11 @@ src_configure() {
 		fi
 	fi
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
+	fi
+
 	if use !system-bootstrap ; then
 		addpredict /dev/random
 		addpredict /proc/self/coredump_filter
diff --git a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
index 46a240264a9a..90f9a664d446 100644
--- a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
@@ -177,11 +177,6 @@ src_configure() {
 		export JDK_HOME
 	fi
 
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
-	fi
-
 	# Work around stack alignment issue, bug #647954. in case we ever have x86
 	use x86 && append-flags -mincoming-stack-boundary=2
 
@@ -242,6 +237,11 @@ src_configure() {
 		fi
 	fi
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
+	fi
+
 	if use !system-bootstrap ; then
 		addpredict /dev/random
 		addpredict /proc/self/coredump_filter
diff --git a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
index 2d2f4a5ddf98..bb3ad26ff08a 100644
--- a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
@@ -175,11 +175,6 @@ src_configure() {
 		export JDK_HOME
 	fi
 
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
-	fi
-
 	# Work around stack alignment issue, bug #647954. in case we ever have x86
 	use x86 && append-flags -mincoming-stack-boundary=2
 
@@ -246,6 +241,11 @@ src_configure() {
 		fi
 	fi
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
+	fi
+
 	if use !system-bootstrap ; then
 		addpredict /dev/random
 		addpredict /proc/self/coredump_filter
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 166e78f0c03c..c5cc743a6940 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -15,3 +15,6 @@ DIST swt-4.31-gtk-linux-x86_64.zip 4039479 BLAKE2B 6f7e434acf57cd03dd5e938b1b1c5
 DIST swt-4.32-gtk-linux-aarch64.zip 3991281 BLAKE2B 99fece9547e801661bb65f699780eb95cb626efd78e1bd79dec15d5fb63e03805ab6c6f75b98648cfad194d800c11cbe6a3c23250f4c4084072aea2aa4cde10c SHA512 adf5d207ba35bfa43fad2c4c64d72a4b56e8830efa0f817b158ad0bd4508eca9c83c43ebebb843c4fb75cb33835a6490b8b0b2a993bfa3507b62fba50345607a
 DIST swt-4.32-gtk-linux-ppc64le.zip 4028301 BLAKE2B 1ed2590ffe01836dc9209b8323db25204c157a829f4af10f20509c30f268c88e89a9e252aebd9a4a0d3337fa20b1a3d76040b768918f7a2f7c8a6313314d14b8 SHA512 713f762fab2d5eea125844912fafdc3eb42bfb76c2caac5612972714e07b66de0e2a71ae29a51c86b2ad76c32761842ad209f8b59c931ea727dc03b2161b40f2
 DIST swt-4.32-gtk-linux-x86_64.zip 4011746 BLAKE2B 5d2784f9a18684d539ea576560bb5fecbbf59960cbd8ce901c9b152df087decb2db28ebf9fbf12c710f6dde71583e9002ca0ac85d5ca7a7ce17286ad1666c5c8 SHA512 f4d511595cccf104cda35c6f314e3689508e18e5da85bb2e8bdd408d9b8d4ab3371e851b3b96ba0f835b3ff0a079c4ed887661e586ab0ce06a52abf69ba243be
+DIST swt-4.33-gtk-linux-aarch64.zip 3929090 BLAKE2B 60cc67c7b197cb31c68622c2d78090a50b4d3eca9c8c5f919b230ebed8f65a588c941f32e89ed0126d5bb5558b664a61661535b158bc7b26928556768f83fb5c SHA512 5a01ffd19c62de4fc1d0df4dae7c93ba8235af7e00713f49cf9cb591843f891bb8151a33dd51bca45c31b068edf65b59a1826cec1a1f3b9d14366d30e7efd430
+DIST swt-4.33-gtk-linux-ppc64le.zip 3966353 BLAKE2B 0ab4a75ac1efdedfcacdd235f45b1b0de04ab762cf64957ca1761e2f6a7e1571e106b26ab08b9ecd600ddf89f2abcd151dcd236c303bfe7d8cfabbce2910b2b4 SHA512 8f54cce4e5ac9e0043c8e3861aeed193f919b7bc4291f5812a568fcf4206cf4875d14d9cd7836235414cbde6a837fe38a2a6380c7d50ca04d3aa366dab733d81
+DIST swt-4.33-gtk-linux-x86_64.zip 3950557 BLAKE2B 6cf4f48e32bcfa40082c08a78dd8d64e9454db3859533696c7cc7cd37639ac7df980d9cfd13abaa80e95e44ad619b96944387363d2fb93d7de34f5f25052bd54 SHA512 3211a5480b886c542f99e29b715b5b1221ba679b572f1de6ca68bdb7b06eec6863c68fbddb9b70d74f13e501c3d76a220c7c8b466031b6c0a25bba5c011f8a63
diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml
index 4b2e9636590c..85c5844f1593 100644
--- a/dev-java/swt/metadata.xml
+++ b/dev-java/swt/metadata.xml
@@ -12,7 +12,7 @@
 	</longdescription>
  <upstream>
   <bugs-to>https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Platform%38component=SWT</bugs-to>
-  <doc>https://wiki.eclipse.org/SWT</doc>
+  <doc>https://wiki.eclipse.org/SWT/</doc>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/swt/swt-4.29-r1.ebuild b/dev-java/swt/swt-4.29-r1.ebuild
index 6dbc30c768f9..140b2c69263a 100644
--- a/dev-java/swt/swt-4.29-r1.ebuild
+++ b/dev-java/swt/swt-4.29-r1.ebuild
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
 
 MY_PV="${PV/_rc/RC}"
-MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202309031000"
+MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202309031000"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="GTK based SWT Library"
diff --git a/dev-java/swt/swt-4.30-r2.ebuild b/dev-java/swt/swt-4.30-r2.ebuild
index 61d849831270..3f0934da1e12 100644
--- a/dev-java/swt/swt-4.30-r2.ebuild
+++ b/dev-java/swt/swt-4.30-r2.ebuild
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
 
 MY_PV="${PV/_rc/RC}"
-MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202312010110"
+MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202312010110"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="GTK based SWT Library"
diff --git a/dev-java/swt/swt-4.33.ebuild b/dev-java/swt/swt-4.33.ebuild
new file mode 100644
index 000000000000..444346927d00
--- /dev/null
+++ b/dev-java/swt/swt-4.33.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202409030240"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="https://www.eclipse.org/swt/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
+S="${WORKDIR}/library"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.33"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="cairo opengl webkit"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+COMMON_DEP="
+	app-accessibility/at-spi2-core:2
+	dev-libs/glib
+	x11-libs/gtk+:3
+	x11-libs/libXtst
+	cairo? ( x11-libs/cairo )
+	opengl?	(
+		virtual/glu
+		virtual/opengl
+	)
+	webkit? (
+		net-libs/webkit-gtk:4.1
+	)"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-17:*[-headless-awt]
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst"
+# error: pattern matching in instanceof is not supported in -source 11
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-17:*
+	x11-libs/libX11"
+
+HTML_DOCS=( ../about.html )
+
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../src"
+
+PATCHES=(
+	"${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch"
+)
+
+src_unpack() {
+	default
+	unpack "./src.zip"
+}
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	# .css stuff is essential at least for running net-p2p/biglybt
+	unzip ../swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die
+	java-pkg_clean
+	cd .. || die
+	mkdir resources src || die "mkdir failed"
+	find org -type f -name '*.java' \
+		| xargs \
+		cp --parent -t src -v \
+		|| die "copying resources failed"
+	find org -type f ! -name '*.java' \
+		| xargs \
+		cp --parent -t resources -v \
+		|| die "copying resources failed"
+	cp version.txt resources || die "adding version.txt failed"
+}
+
+src_compile() {
+	append-cflags -fcommon # https://bugs.gentoo.org/707838
+
+	local JAWTSO="libjawt.so"
+	IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
+
+	for libpath in "${ldpaths[@]}"; do
+		if [[ -f "${libpath}/${JAWTSO}" ]]; then
+			export AWT_LIB_PATH="${libpath}"
+			break
+		# this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10
+		elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then
+			export AWT_LIB_PATH="${libpath}/$(tc-arch)"
+			break
+		fi
+	done
+
+	if [[ -z "${AWT_LIB_PATH}" ]]; then
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	export SWT_PTR_CFLAGS=-DJNI64
+
+	# Bug #461784, g_thread_init is deprecated since glib-2.32.
+	append-cflags -DNO__1g_1thread_1init
+
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)"
+	${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	if use webkit ; then
+		einfo "Building WebKit component"
+		${make} make_webkit
+	fi
+
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	java-pkg_sointo "/usr/$(get_libdir)/swt"
+	java-pkg_doso *.so
+}