gentoo auto-resync : 08:12:2024 - 02:07:28

31 files changed, 791 insertions, 12 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f04dcde804db..ba97a61b040c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bnd-annotation/Manifest b/dev-java/bnd-annotation/Manifest
index 502252057d83..9320223925f9 100644
--- a/dev-java/bnd-annotation/Manifest
+++ b/dev-java/bnd-annotation/Manifest
@@ -1,3 +1,5 @@
 DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
 EBUILD bnd-annotation-7.0.0.ebuild 709 BLAKE2B bc5315922dd31d8c3dacbb86aa025bc76d0337d18c01ee184f4c2109fc8602b520f49bcaf6fe0c0f72f6d1bf2706c11ae7345ba1bdf33ade7b4250682f41236e SHA512 4e17dc24443df7255a8eb04effce1ed831996eed7fc9c0ddca52086cd33f694e1f21a64c94beecdbc4a93bd127971ad9d9176cdaa8ae7e3c0e28ab9df86df3d5
+EBUILD bnd-annotation-7.1.0.ebuild 728 BLAKE2B 31456b15c307e14a697c724b522ea5a8d65dde1e2fb36d3ddb6ce9b8fe2043c84f5d3492aba5cb85f4156ffe8a30886e17c1d51555b3beef8ead02691d165729 SHA512 3a720d83e659be5fce3f28a828da9d814de60d86799c226c02372020771bacac463154defa4b0364953a242d91b19ba950e55f5342f5fd2d29ba596ef702fb7e
 MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild
new file mode 100644
index 000000000000..939ae99fc8ea
--- /dev/null
+++ b/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild
@@ -0,0 +1,29 @@
+# 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="biz.aQute.bnd:biz.aQute.bnd.annotation:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bnd Annotations Library"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV/_rc/.RC}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+	dev-java/osgi-cmpn:8
+	>=virtual/jdk-11:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.annotation"
+JAVA_CLASSPATH_EXTRA="osgi-cmpn-8"
+JAVA_SRC_DIR="biz.aQute.bnd.annotation/src"
diff --git a/dev-java/bnd-ant/Manifest b/dev-java/bnd-ant/Manifest
index 9f85d4208a49..81f8ef990b63 100644
--- a/dev-java/bnd-ant/Manifest
+++ b/dev-java/bnd-ant/Manifest
@@ -1,3 +1,5 @@
 DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
 EBUILD bnd-ant-7.0.0.ebuild 1004 BLAKE2B 7c06c6ae3c28807e04290f3781ad2107d71517c3f3b050608cf27baeb948150c15442597e8f85c0c84e87f81d6ccbbfba77de44f3a8e06e03deda80d05be9acf SHA512 cab9b38c384de1ec7a7b0b37d461167cdd475f3828fc427fdf3bd0cc13a90e73e3b42b0461067455079d599e0d7af97105f8873dfd5d65a2f1e9d57b950a7758
+EBUILD bnd-ant-7.1.0.ebuild 1021 BLAKE2B cfdbf402542339729b477efbacec623f8b86cf5e961f721024cada6edd788445fb6cd53d8b0b97f9fbd95371b2f08afff527e481007776160c8b2f3246bdbd00 SHA512 9750cfb571ab49c7af0324b0ee23aa9af08fad733904cf470bfdc44013b585e6544bf365209d9ddbf8c6d481c8eaf9b1d8210bb5285fdbad568d617de03c5249
 MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild
new file mode 100644
index 000000000000..4dac2056cc13
--- /dev/null
+++ b/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild
@@ -0,0 +1,46 @@
+# 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="biz.aQute.bnd:biz.aQute.bnd.ant:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bnd Ant Tasks"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV/_rc/.RC}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+DEPEND="
+	dev-java/ant:0
+	~dev-java/bnd-${PV}:0
+	>=virtual/jdk-17:*"
+RDEPEND=">=virtual/jre-17:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.ant"
+JAVA_CLASSPATH_EXTRA="
+	ant
+	bnd
+"
+
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="biz.aQute.bnd.ant/src"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	mkdir res || die
+
+	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+	pushd biz.aQute.bnd.ant/src > /dev/null || die
+		find -type f \
+			! -name '*.java' \
+			| xargs cp --parent -t ../../res || die
+	popd > /dev/null || die
+}
diff --git a/dev-java/bnd-util/Manifest b/dev-java/bnd-util/Manifest
index 49b6015d1873..b4331f8838fd 100644
--- a/dev-java/bnd-util/Manifest
+++ b/dev-java/bnd-util/Manifest
@@ -1,3 +1,5 @@
 DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
 EBUILD bnd-util-7.0.0.ebuild 902 BLAKE2B 5828699ef139ae7afc7889f081d60cfad6b752f2b138a30e7471f5ea156044bea80154e2ace332bffdad7764245d6b90332b4dda1ee0135d71551e958df4a034 SHA512 e07042a97ffcf9a558750e21f232adb5372966e554a24c0a18ed0249b41031044591d7f2bf8c99b876ea0414b168f803df282e1274eb928257b31e7b574d3a8a
+EBUILD bnd-util-7.1.0.ebuild 914 BLAKE2B da2ea11e530a2a6221e0df0f6a90f1c8b59b985f1e6e22f538c5f568044380a4a27ade4767c699e7618e848e8609304351065efc3cbeb85d29de371b5349902a SHA512 a0abdf65dfb588961133792409833fa1d9bda58c262fae2e93d314fddf90f1d2cff4024cf99fe4ad36ab0c6f1a88d827b340d0deb3a4f65d856f05bff3ebf02f
 MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/bnd-util/bnd-util-7.1.0.ebuild b/dev-java/bnd-util/bnd-util-7.1.0.ebuild
new file mode 100644
index 000000000000..2ba4cf1dd138
--- /dev/null
+++ b/dev-java/bnd-util/bnd-util-7.1.0.ebuild
@@ -0,0 +1,43 @@
+# 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="biz.aQute.bnd:biz.aQute.bnd.util:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="AQute Bnd Utilities"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV/_rc/.RC}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+CP_DEPEND="dev-java/osgi-annotation:0"
+
+DEPEND="${CP_DEPEND}
+	~dev-java/bnd-annotation-${PV}:0
+	~dev-java/libg-${PV}:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-api:0
+	>=virtual/jdk-17:*
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-17:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.util"
+JAVA_CLASSPATH_EXTRA="
+	bnd-annotation
+	libg
+	osgi-cmpn-8
+	osgi-core
+	slf4j-api
+"
+JAVA_SRC_DIR="biz.aQute.bnd.util/src"
diff --git a/dev-java/bnd/Manifest b/dev-java/bnd/Manifest
index 5e78433452fb..a0eb80f173f3 100644
--- a/dev-java/bnd/Manifest
+++ b/dev-java/bnd/Manifest
@@ -1,4 +1,6 @@
 AUX bnd-7.0.0-aQute.bnd.main.bnd.patch 1092 BLAKE2B 46df1673fb5e6a8e456aa7e66974333d0680bd7a8e2332e4d3d39c92d9f8fc2e3ffb0fa7fc6127f7d9747858f46f0f984a92ebed7beee9af9110d7df9c9c29ac SHA512 abd5bf36d6dc02562b9f209f85f96eb6e2a14797372a38d1e64aa76bb8e2c1b625707895e8ec9e05359de182d71e025d025bbaf00a372bbe29b9663a090d2588
 DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
 EBUILD bnd-7.0.0.ebuild 2261 BLAKE2B 2623347cf25af4e20592046bf08048955364d87900646a98d78fc3b685606af16fefdf3d0a77c18b5fa7e60c59227f4f2dc9a5764bcff791671c562a4ca1011b SHA512 a5cde6a5e974d47c7f21861523e7cfc98393bdf984fec596863ebdbc52b428b83c8b541f62ebc42c426d3e5be0518e242b13fa990e4214f54183b69169e5ca6b
+EBUILD bnd-7.1.0.ebuild 2278 BLAKE2B 4cebc01e21a23986e14824b7c1ba7ba07a53168246bf61fa6b622b6ffdf663be8333fa6d3070281a814fc939ae28c2dc40617e4acf94f2540652858e4006d33e SHA512 d4c4728c6d7af3406619b545b229f92e26aa679f172caae6075310327931b0fa11224567cdb6b229cc34251015196a6affd674d4ba44123701e0db614a702138
 MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/bnd/bnd-7.1.0.ebuild b/dev-java/bnd/bnd-7.1.0.ebuild
new file mode 100644
index 000000000000..8a0cc65df29a
--- /dev/null
+++ b/dev-java/bnd/bnd-7.1.0.ebuild
@@ -0,0 +1,100 @@
+# 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="biz.aQute.bnd:biz.aQute.bnd:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/${P/_rc/.RC}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="app-arch/zip"
+
+CP_DEPEND="
+	~dev-java/bndlib-${PV}:0
+	dev-java/felix-resolver:0
+	dev-java/guava:0
+	dev-java/javaparser-core:0
+	dev-java/jline:2
+	dev-java/jtwig-core:0
+	dev-java/osgi-annotation:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-simple:0
+	dev-java/snakeyaml:0
+	dev-java/xz-java:0
+"
+
+DEPEND="${CP_DEPEND}
+	dev-java/commons-lang:3.6
+	dev-java/eclipse-jdt-annotation:0
+	dev-java/felix-gogo-runtime:0
+	dev-java/slf4j-api:0
+	dev-java/jtwig-reflection:0
+	dev-java/osgi-service-log:0
+	dev-java/osgi-service-subsystem:0
+	>=virtual/jdk-17:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-17:*"
+
+PATCHES=(
+	"${FILESDIR}/bnd-7.0.0-aQute.bnd.main.bnd.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd"
+JAVA_CLASSPATH_EXTRA="
+	commons-lang-3.6
+	eclipse-jdt-annotation
+	jtwig-reflection
+	felix-gogo-runtime
+	osgi-service-subsystem
+	slf4j-api
+"
+JAVA_MAIN_CLASS="aQute.bnd.main.bnd"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR=(
+	"biz.aQute.bnd.exporters/src"
+	"biz.aQute.bnd.reporter/src"
+	"biz.aQute.bnd/src"
+	"biz.aQute.remote/src"
+	"biz.aQute.repository/src"
+	"biz.aQute.resolve/src"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	mkdir res || die
+
+	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+	pushd biz.aQute.bnd/src > /dev/null || die
+		find -type f \
+			! -name '*.java' \
+			| xargs cp --parent -t ../../res || die
+	popd > /dev/null || die
+}
+
+src_compile() {
+	# There is another version of osgi-service-log in osgi-core-0
+	JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only osgi-service-log)"
+	java-pkg-simple_src_compile
+
+	# remove classes which are not in upstream's jar file
+	zip -d ${PN}.jar \
+		"*/remote/agent/*" \
+		"*/remote/embedded/*" \
+		"*/remote/main/*" \
+		"*/remote/plugin/*" \
+		"*/remote/test/*" \
+		|| die
+}
diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest
index da3f2d6af95a..27fe52f10dae 100644
--- a/dev-java/bndlib/Manifest
+++ b/dev-java/bndlib/Manifest
@@ -1,3 +1,5 @@
 DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
 EBUILD bndlib-7.0.0.ebuild 1264 BLAKE2B a149e5bb7c43a6052497faa732d161370c8b416671190255d0a5b775dd539ec18e8d34894d01683f124233479cd1d0e9a215630abf2cc3ade5bd7633cafecc03 SHA512 d9ab1865b7a9da3b587bde18af310d5ed563c2f48936da06fe065e3deaa8a8d0ae64e3bb38c11344cd8b30470ed3422c14009819123d278d613270d97f1b52f7
+EBUILD bndlib-7.1.0.ebuild 1276 BLAKE2B 4e63c3188023a228b5ad0a660d84731313b5f42ac646c9917764efa8df170ff596c0a0d4eb42033b66249e7cb63d1902139cf5bea44698253048c4d3cdcf193a SHA512 725d0536dcccb3b2a5993b59fd4e7c8c1ccbf71afa582960777b9bf063b40814853a43f4b4dced1c7f92465c232b4bbb4135515ae07d6e1e2b6e7f88a6e8fc0d
 MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/bndlib/bndlib-7.1.0.ebuild b/dev-java/bndlib/bndlib-7.1.0.ebuild
new file mode 100644
index 000000000000..532ebab39fd4
--- /dev/null
+++ b/dev-java/bndlib/bndlib-7.1.0.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"
+MAVEN_ID="biz.aQute.bnd:biz.aQute.bndlib:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV/_rc/.RC}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+CP_DEPEND="
+	~dev-java/bnd-annotation-${PV}:0
+	~dev-java/bnd-util-${PV}:0
+	~dev-java/libg-${PV}:0
+	dev-java/osgi-annotation:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-api:0
+"
+
+DEPEND="${CP_DEPEND}
+	dev-java/osgi-service-log:0
+	>=virtual/jdk-17:*
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-17:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bndlib"
+JAVA_CLASSPATH_EXTRA="osgi-service-log"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="biz.aQute.bndlib/src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir res || die
+
+	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+	mv biz.aQute.bndlib/img	res || die
+	pushd biz.aQute.bndlib/src > /dev/null || die
+		find -type f \
+			! -name '*.java' \
+			| xargs cp --parent -t ../../res || die
+	popd > /dev/null || die
+}
diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest
index ba35400cc0f5..7aefbe6067c2 100644
--- a/dev-java/caffeine/Manifest
+++ b/dev-java/caffeine/Manifest
@@ -1,3 +1,5 @@
 DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8
+DIST caffeine-2.9.3-sources.jar 730835 BLAKE2B 5864ead593cb46caa23aac18fb424429009dbe5f9a70bb95bd16d73181f57ec5cd8ce1110af6e8766e757e5ea8a546c8eef4d4c26dced12722ff05f7278e0939 SHA512 e9b479ce30d4fc6337fef3a03a149c5fb2bfa48dbe0845374baf62e9b91049b8badbc5543d135b3473cf0c7bfd2b3717254376b55005ca301ce804537f879c48
 EBUILD caffeine-2.6.2-r1.ebuild 996 BLAKE2B 3cf43b05e85212de6259dbc8c3da40a109a5f30d82ccf13d672a582c97c8c36c5b5b5ab56aa39dc2035936aabdaabae4df4a3cdcf6c8f78d0232aa3f9a36b233 SHA512 355b2d119e288f84a4a63be1d3ba2dea8645597cc93365f1d11be79a7b2d13afef97026f3d4353b1465742b6405381555c6707e6c78b275cdb7900087f49c381
+EBUILD caffeine-2.9.3.ebuild 1072 BLAKE2B 3d75a0674ba44698e7b9e95b1159f25b37a7aff725655bdfd0844ab24062556ca911bc6846b5a4fd19300a49a17c6cc90deb3ac7d52cae963a1a301954c29fb2 SHA512 84fb3c34832e549f7fd2003a1ae9bd4f13556e790219bdd394b41d0f0cc6bb53361010620c8fe8df4b6ae55869c172293f9421ce2d3fc61e0f9e0596b8c5453c
 MISC metadata.xml 300 BLAKE2B fc46ab992a4cbfe6a697b414e72f7bfa69992f5fdfdfa99c2b94b69643492f8144351125ca0edf4cfb4e8d9e67c6aa026d9e7e4d000f46250ff57716cce65ff0 SHA512 fc4dc1847395e619c603488ca3b18b94fcc96e21461854009d46a0e73ff694066e85478eae5c20f8493eda9203ab159ab3a625ac7df49190f7f2e162dd3418fb
diff --git a/dev-java/caffeine/caffeine-2.9.3.ebuild b/dev-java/caffeine/caffeine-2.9.3.ebuild
new file mode 100644
index 000000000000..12549520678d
--- /dev/null
+++ b/dev-java/caffeine/caffeine-2.9.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A high performance caching library"
+HOMEPAGE="https://github.com/ben-manes/caffeine"
+SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar"
+# Compiling from Github tarball would require to be packaged at least
+# package com.squareup.javapoet
+# package MethodSpec
+# package TypeSpec
+# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# S="${WORKDIR}/${P}/caffeine"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="
+	dev-java/jsr305:0
+	dev-java/checker-framework-qual:0
+	dev-java/error-prone-annotations:0
+"
+# min java 11 for bug #919464
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine"
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index f50f265bf7a9..0f4d27570655 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,3 +1,5 @@
 DIST checker-framework-3.47.0.tar.gz 8335232 BLAKE2B 4b6d8f5bb055402e6b368640eb42e4e13173dc847a4b8145e7c306856cab2151c17bfbd2c3a645708e9b7525a1e3f73d4c28c3ae24d038ac0c3119d8fcf671df SHA512 17188ab83ee8c91fb112ed0f750611c7fb5fc17f80a0bbd9b19f1514902770c2a227cf879fb581c8c915fa9827febaa8e67a0188c70df625268118344a281fbd
+DIST checker-framework-3.48.3.tar.gz 8345833 BLAKE2B 6c3f2c641414a7cb388ee2ed672a572ca40157e89976f472c58d1a04d74ec2e24893421757fea1bbaee9791e7fbb6d617cba1c5cdda284debd87250299820518 SHA512 a0a41e7bd70d85b8dcb23d358c0a6f10884f4e119e5ae5e1d17c283beab02ba4183f56b4a07d88e9e30bb4b25ebbd003bde2ecf399bf647d23e46869d414e2d6
 EBUILD checker-framework-qual-3.47.0.ebuild 660 BLAKE2B 14490f050de37909cfb5c89273f4e40b0529bf6bc091edbcbfbd63d7f504db85a4b7329ce9be7ebb8245210c31030cb4cdc054e84be5bcf5b8f639627ddddd66 SHA512 6b9b6103eccc354fc015e98add9caf9a00ebcf6120071d5cd454d1e9ff39a15c7ba0b980f43176a5f655102c64c127a8f17201fd71fe28e80f1e55c4cc086527
+EBUILD checker-framework-qual-3.48.3.ebuild 663 BLAKE2B 8eed550471ced2264370632c49d4e11f9ed9d788a175bbeda2340f844270fcf7f3e1169c22fd68db9a6a6e10322a6689f019244e4f30ff12dfc460fcb5274c5a SHA512 febfa9fd31a1e747f65bef9047c8b45b8e1ba48cdefcff72b05ff7b16cff725f87d0829c147d01ef730ae230fcc6338c209844657e4cd0ae1aabc47323c01c81
 MISC metadata.xml 651 BLAKE2B 2c53d072eaaaa7d09e5d185281efc9c897d1c8008dcbeb791c6b737614aa13f1091bda90b7fea33ff083c32dbd60dec180414af016af94850dee8b2bda8e865a SHA512 3428b96b3eac8b7416aabe2201af09c9bc4c444240ae682750573187a5ba137644aed7cfbcacb3a1162780a9eeb8544b0d6500cefc8f6e62f700271fe185a4d1
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild
new file mode 100644
index 000000000000..5444f35ed4dc
--- /dev/null
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.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 ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index ae8d2893257b..d7eb748b3114 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -12,6 +12,7 @@ DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469c
 DIST ecjsrc-4.31.jar 2347993 BLAKE2B edb1a525646fc3152661a6583ab5c50a1dd7f06dac0b7cdae0913843e0ed6ef2c9862889351557857140c79c479505aeca154958b649d05ace6a5b83f6ccac45 SHA512 3e72ae5e5209dd80f7b3f208aeb0a6eece28ab416c56eedd590c67724c6a905b39b8f27a41394e3cf6a96acc16a9c7dd91d12df9651bc289839648036ac2d430
 DIST ecjsrc-4.32.jar 2357386 BLAKE2B f6c440b13eb3cd014f317d9232a7db713621b3bcb902bc385561fc4ce68711c9fde021920b535fafb4db7e93d515e23c9d57ac3506539915e1ba33ce37a4570a SHA512 e45cfe0df73f5ec83efeeb12785c2efab9977e927de8766507668f104fea4fefeaa59695988d977734fee4ccd43da43da798976177bb3b15a87ca2966e448d9e
 DIST ecjsrc-4.33.jar 2361539 BLAKE2B 1bfd2f7d8e9f79bceebec337ddff651a42d133015be8749076d6a67f60d7fbf8e56e658b1535f52fe7f736b6e59eff6187ee94c6c260b399145c1018ae388e35 SHA512 48823264ff18b666b6d350c58e8b3b7d0429d2c5de061cee4c88894da2d44049bf0fcf13ca20d848797ef0591fccd028ac687ec072b8eb02deb5f57b7e560677
+DIST ecjsrc-4.34.jar 2369991 BLAKE2B 61ab2deff1753864b1b69eafb7ed99134a15d0e467ad91bc9ca8a74ca607ae2f3831b8e5af11fa2a584232302b7af510d043445e86bd327e09153666e8f0103e SHA512 6bf4f7c1630d81901ff8ed2345371cadcaf7f62c4edc7ade3211c0c254a2099c4e9506563c27c49be966765899f447fc280ff4ca411e636e269fca0f687a502c
 EBUILD eclipse-ecj-4.20.ebuild 1586 BLAKE2B 4a406a5afc6fd37ec9ba5a85b2c96c31f298909e39cdbdec36334715a164b8a0afcafc079bbc5a0e86fc9fca960f2bb720d9139a07e917d924e1eea0eda84f14 SHA512 b292d5434ddb2f869ad664fab1b83cd9a92b2e5497ce21def5de33168238dd69fe46bf5a976f9195c67ed5de7bffcd3163e439c0afc9c4f3ea29b02dc9c5205c
 EBUILD eclipse-ecj-4.26-r2.ebuild 1815 BLAKE2B 30ae45173d751a21946399256a77cc689b51b8b63e10fc0d54c71194bd35d6463a5f8705eb5d1db2c33aa1ca185583b982872cd7263d603c3a1e6bd3785ee5a3 SHA512 fbc12e64919bd7b18fc81e8beacec04c2c1f172a64e120a371699f82e92cc294845d98c83386d0912e99daead3988e7d59d6f100ac9d66e823d4db489e2b8bfc
 EBUILD eclipse-ecj-4.27-r1.ebuild 1831 BLAKE2B 2ec6beff8e7a0b793144a1b2e0f48837b6ed5243207ef59ca83927fce94da556aaba146eea2ce7c92d51fd7a2beeec562278ef503463a31188df0a90e91e3542 SHA512 0a8b3c30686e045c11f1cf139cb80c6497dc617c38404b77e9a70ce102d1a7aedc8dde0a1482dab5b4faf98c87eadb7a7ec2fc1432887e2e405084555b96efe7
@@ -19,4 +20,5 @@ EBUILD eclipse-ecj-4.30-r1.ebuild 2289 BLAKE2B e6e134de6a204e9025877cd8823e2108e
 EBUILD eclipse-ecj-4.31.ebuild 2092 BLAKE2B a5221fcd5199c791686c15261156140b93c915183e66147cbbf40b171a7deaf01cb49eb308fef8256fcce61897d2d45e1a0b9f2eba4dc89501f87a6bfd6bfac2 SHA512 6cc2bc6cf6e538f9cfee5d50108a6dbfbf621a787ce46afd35fa9fe863b350bcf6d3068570ed8af44f25cfde5d9154e031c675c022a83100cd7b34f2969d107b
 EBUILD eclipse-ecj-4.32.ebuild 2022 BLAKE2B f6b46490d34cd4ff34f051c3d8c5513cde66225c9828e39c8acbfb28b58e5c7d87517f3e48578ac9b3c342da72657c58b9957228ee5ff65ca74b373ece3e8905 SHA512 081a619ab3cc0337175eeb97c7e5629be5c678dcfc79bb6af2a19c48f2c5a60957b1b8550a562006f38864a91c2d8586a0497cbe125743e02355f2afd7bb8abe
 EBUILD eclipse-ecj-4.33.ebuild 1668 BLAKE2B a89013df97fe0ffdab083c08c7e9b7ab9ef7f04cb4fe5a9a7423511f9fababe9d9b39caee13ac198fac6d10f006bcb09cc8a791b52ecd6dcc1c87824caddc65d SHA512 fbf6fd8266ab783396e5cc2ac08d8020f682e75c58cad514e6ac72ebe5990284119172586b0ab385c09f5639a40e63654110ccac188d467d0d6f8b02d105e923
+EBUILD eclipse-ecj-4.34.ebuild 2223 BLAKE2B 980e5d375ff45d5d7f087017ba775b7a35bc4c900e1247f2ae8be279e23e6d0fc80b680524ef2cc36a695015f64366db09a3a611ef849895ab3a7de43874faf3 SHA512 50025d20184eff1f42f3d7e91d06d3f7eed2fa3313089a5b0a4e4c5dd37d93cb638330c23dc7d783e5aaea924f75859f131c9a2a5da8b31999ab5d6b25a12279
 MISC metadata.xml 637 BLAKE2B fd8214d9377a8a4101b3fd5041e17fbed9c6f5ffc8586b328db92120fc780c16d4b1152d4137a2e5554f77f60e9fe24ea3d133fc3469a4e78da7e84244bcb951 SHA512 0a0f6d8bcac2bef3a74e6328a65ecab490fcd437e8107fd1087d17ca158da29d1044d9e06d05e2781e97df88e6aec30db185c97bb9b2bdbd9b257332ce0232e0
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.34.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.34.ebuild
new file mode 100644
index 000000000000..40075b629d91
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.34.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+# 3.38.0 according to
+# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_32/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
+MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.38.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DMF="R-${PV/_rc/RC}-202411201800"
+
+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"
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+SLOT="4.34"
+# KEYWORDS="~amd64 ~arm64 ~ppc64" # Seems to depend on higher jdk which is not LTS
+
+BDEPEND="app-arch/unzip"
+
+# restrict to >=virtual/jdk-23:*
+# ./org/eclipse/jdt/internal/compiler/apt/model/ElementsImpl9.java:347: error: cannot find symbol
+#     public DocCommentKind getDocCommentKind(Element e) {
+#            ^
+#   symbol:   class DocCommentKind
+#   location: class ElementsImpl9
+DEPEND="
+	>=dev-java/ant-1.10.15:0
+	>=virtual/jdk-23:*
+"
+
+# restrict to >=virtual/jre-21:*
+# ./org/eclipse/jdt/internal/compiler/lookup/TypeBinding.java:722:
+# error: unconditional patterns in instanceof are not supported in -source 17
+# 	return isRecord() && components() instanceof RecordComponentBinding [] components && components.length > 0;
+# 	                                  ^
+#   (use -source 21 or higher to enable unconditional patterns in instanceof)
+RDEPEND=">=virtual/jre-21:*"
+
+DOCS=( org/eclipse/jdt/core/README.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+JAVA_JAR_FILENAME="ecj.jar"
+JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
+JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
+	rm META-INF/ECLIPSE_* || die
+
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	find -type f \
+		! -name '*.java' \
+		! -name 'package.html' \
+		! -path '*/grammar/*' \
+		! -path '*/OSGI-INF/*' \
+		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index 684be7f1b43a..a7f41f19870a 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,3 +1,5 @@
 DIST error-prone-2.32.0.tar.gz 2856245 BLAKE2B 129347be0a1e9ae450c03b47c088962efd7f156dfd5f7343fc17837cb4b64e1787c325ea4d6021570559a09310688a378555c5ab0e1df4996f21e88a73487212 SHA512 ae6286f9cd4d75fb0165d9788a7a2c588a05eef5a4f714a6deb9623d6d8cf4a2173bb44a8faee058f2496dd31124b40570a91a359a8f735a88abf59eea05f39e
+DIST error-prone-2.36.0.tar.gz 2887918 BLAKE2B 8478d23214681f887607c10339a554f839f84a1f6c80d2fda0c35463c405673e50301a0fb2f450a22ee12ef1b8c84ff904721f4184004bb35e28f567df760a0f SHA512 a9e8c78119ecfc99d064ed1a1748a7ca9931a9391f241b0d36886268dd1294623368a5f703bee5b5008fb4f20008be5a0073f2c1078a7086bc34adb4c6cdf5bd
 EBUILD error-prone-annotations-2.32.0.ebuild 653 BLAKE2B 68ec32a8b6f23664b0689909a4db6f010892a6fe647ecb5c5f3e1d9372dcff6bd9d87f970e84565c5cc87f2e9fe40ec3a99d43db56c17dd5256c68b338d5dc3a SHA512 dbfeb7ef52b3c5749dadda69885c38db74580f7d05fe9bf7c3fd096a50220812d76789b7df548f4c4e7647cf31b6366f479fa66aa34ff2301f829b99ac4197ca
+EBUILD error-prone-annotations-2.36.0.ebuild 656 BLAKE2B 6f698d82d6ec5e718bd10eb774816ae6222348b27d9ddc98ca6890b59fcdc6cc2cebb70d593b9e5b616ac60d696a10945dd3641048a56d020372e55e25950940 SHA512 2831c3e468bba7d97dfa427b7ddc101d31a42aabd5127511049c707c521456c0946a56e15573fea590e8c6e86ff7ae620735c9a12659ce9d79e5efd76495a07c
 MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild
new file mode 100644
index 000000000000..6f831c3b913f
--- /dev/null
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.36.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 ~arm64 ~ppc64"
+
+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 f9747bc1b0bd..5fab83b3fe9d 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,4 +1,6 @@
 DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
+DIST guava-33.3.1.tar.gz 5827149 BLAKE2B f8ad29e921d7de7d4eeb65812a24dec9ee27feab7d8294ac037ac526c8069a652d7381af92afd457339ff394488d7c56d562e116b2508f105ced32080f727d78 SHA512 d357953607266b844d5711821a261b110bf44c32713a7c889aebc32e7a8e63aaa8126f1f1aee7c6ad3cf44830bd231a19fc09d802f1abeaff42096470214b0c3
 DIST truth-1.4.2.jar 275487 BLAKE2B 9c0dce92648f734ab88a0faf1a1e5328d747efffd29aa8f12b7ed2b2c87036ce18bf3195348f9ffce848842a240179fa60e9625c6997439a4cedce6aac6c2b77 SHA512 5f29cb259f2cf63e8a908061d2a58b28ecf12366a03564c8e63c33cdbdb21935ac95ed7b68437b015a2bd055732c88ec8ca1e55b45b99a2cb3e9dd53cb0b87cc
 EBUILD guava-testlib-33.3.0.ebuild 1563 BLAKE2B 88a95dd25f1b09b46ea7749f25b42a3433900eea274043d119372f5da66bf8289079079060960d8dcbec3c71455bd5f516a2618ee64159648890547362b01b53 SHA512 1c07e250ee7668207d742a4e3ded30c26eb48928b079092d8557ff53e9c14afe977c7075db3e2199ea490f13935cdef2c4232774cf9bd624c6c3070c06ba9d9b
+EBUILD guava-testlib-33.3.1.ebuild 1566 BLAKE2B d706e403bcbc4cf70f16f69e005e9342751067d1202caaa44e2b125bbd8b76902dffcca47cb93022a4ff4e4c330fc8f7a339244a150fda27d7ea0815328a3023 SHA512 6b5fc9ca3d93c222625c875c0ac018184ea357edd5b496e36530c8d809c53bb0b0410973576120969871f6f3c0f17f2ff7422a774f270a9c01e104f48fb53c0b
 MISC metadata.xml 465 BLAKE2B 4219510a2bd85c049ada17dd780de974e3a972df9992cd693b52ae2b2d325342a8e70e233b2b884f8a07243da1abe0a1dc3affe1700f30b4093feb0e9ab07e95 SHA512 f7098be969eae6b094e54df6f05735dd6becf0dcdb19f28c5f7a675fe699e988655991f1846c9cb599b8932bfa1365e739ae762e8a0be8a83536e7fbbfa5e3e9
diff --git a/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild b/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild
new file mode 100644
index 000000000000..d62428453c97
--- /dev/null
+++ b/dev-java/guava-testlib/guava-testlib-33.3.1.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 ~arm64 ~ppc64"
+
+CP_DEPEND="
+	>=dev-java/error-prone-annotations-2.36.0:0
+	~dev-java/guava-${PV}:0
+	dev-java/jsr305:0
+	dev-java/junit:4
+"
+
+DEPEND="${CP_DEPEND}
+	>=dev-java/checker-framework-qual-3.48.2: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 c716cd0a1ebe..117e516f1d0f 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,3 +1,5 @@
 DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
+DIST guava-33.3.1.tar.gz 5827149 BLAKE2B f8ad29e921d7de7d4eeb65812a24dec9ee27feab7d8294ac037ac526c8069a652d7381af92afd457339ff394488d7c56d562e116b2508f105ced32080f727d78 SHA512 d357953607266b844d5711821a261b110bf44c32713a7c889aebc32e7a8e63aaa8126f1f1aee7c6ad3cf44830bd231a19fc09d802f1abeaff42096470214b0c3
 EBUILD guava-33.3.0.ebuild 900 BLAKE2B 8af41b5a562ba16e6557a841fb91e559c5142174780cc5232ec0f301899b416a5efbf6750d8983388d7866ac1a34403da4ec891f567788f44770bfbe7aeb415c SHA512 ea4918f9b0c4a2964aaf14109ff5a7ae8795a6dfdb438a7ff8a776340ea4b12a27d9738adee82c2d7bb9acba1cd366aada382e325cd612af579ac8abf9ecf87e
+EBUILD guava-33.3.1.ebuild 903 BLAKE2B 08598f464fabee2c39faf7ed34a2b0f7ba618ecf936041ab9c0688d6cb6f7498ea9c1bafd7bad08a68778d588ccf8c6f87e911197aa6ce7cab95e84dafdff382 SHA512 27b50ceabcba84d3bed34c4f6f6c2327f30fa9c4d041758f0d316bf829d6f5df01447247de99d51056fd84ca34d5c76aeb10702bf6f3f92bcc9578b26a8cbc8b
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-33.3.1.ebuild b/dev-java/guava/guava-33.3.1.ebuild
new file mode 100644
index 000000000000..5d43bdc9619a
--- /dev/null
+++ b/dev-java/guava/guava-33.3.1.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 ~arm64 ~ppc64"
+
+CP_DEPEND="
+	>=dev-java/error-prone-annotations-2.36.0:0
+	dev-java/j2objc-annotations:0
+	dev-java/jsr305:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=dev-java/checker-framework-qual-3.48.2: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/java-diff-utils/Manifest b/dev-java/java-diff-utils/Manifest
index 8627b73aafbb..e29fab1cfd41 100644
--- a/dev-java/java-diff-utils/Manifest
+++ b/dev-java/java-diff-utils/Manifest
@@ -1,5 +1,7 @@
 DIST java-diff-utils-1.3.0-sources.jar 35161 BLAKE2B 365b2b3a8701a7bf63b1fc8c34f8a54d7a5f67b3b485e91ea3489303de821d5ac08aac4e2b13d140b045b6b45393d293a825e92e800cd34c3b84a17442d548bc SHA512 16426c13fde20c606ac5dc01b4ee368d10360c45c4569879c94d30ac41aba372e9865a7b5db3a68067ea26bdade538eeea4e3e38900f8627beb21d7e48968e62
 DIST java-diff-utils-parent-4.12.tar.gz 2080632 BLAKE2B 36cb824bd00e946484dc62b3d5739620eeff6f509cdfa3f521144c21ea9d5de43ccc838700d3d9d116817dc1256d90fe1bdb552b02a2c7cff1e6b702b889f8d0 SHA512 0ac8f633e01f70b6c0f243b65c95716a1237142abde96eed3211a5ee5afb5bf721e936a67b4e2ce27e1df34a8402d0fbcb830e0557bd32cd24a7529d80e61e5c
+DIST java-diff-utils-parent-4.15.tar.gz 2132869 BLAKE2B 53caeadae5a87bcedd4e1e5aaa6990f89ca144d75027b16b93e019f119d13dc5d9ee5bf398b47e45b041e86505f72f8b017f56f3650e6ad0b828aece36fa2a36 SHA512 d722687708515bea791c753981857293a58bed9cfd9eca5575b77b22919ab1167ffc55fc87f3f825b5686cff27f4fa68841eae4514baef73f6bf5b2d7a1a9c95
 EBUILD java-diff-utils-1.3.0-r1.ebuild 658 BLAKE2B 09c8caaeb7bfa1ba1314a9cf7347a4c78d71a368034dbd1a5def9a86e7be69873f80bb4326c261ee5b30f288f518950b815f64c21faf894d25ddfb0d3ef499cb SHA512 788cc882c2e9063f3f4e0ed0f28e8fde6348ded30e4cfa3147c496a4660424899eac5cf16d84987f5a54d4958b4df089b5d5e8d42030f4cb90654d38e917932e
 EBUILD java-diff-utils-4.12.ebuild 996 BLAKE2B 30cb16e29c33e093b01e1dad16c91a30e97b12e2757d1be85c23262a8ae540da9a26bb4ea5fe2a22efb9fd13e145c3a1dc159031b8154cba36890b83647118ee SHA512 c9a60bf8c68ea33531cb58799079ca7929144cc1a3cb58e7d8f4476a2d0f1af14c42e0565117945c28704719fdda986e5d999fe13a3ce40a4be7da1c8c20946d
+EBUILD java-diff-utils-4.15.ebuild 974 BLAKE2B feb62cbfe14c628f05061d08d8352f470d7e676d69b52468b145416a7276c65ee48f8e61b9ce27b2ecc68b3149c1aca1b056edcd20e3d525cfc6463445bcc19a SHA512 772b16e6e5e870dc766c279827d52f13c71da7e61cbd8d8eb9bcc91ef06ee31fcccc7fe4aaaafaa481aee1e8fc6ff32ae41bf9365477689e492256b7a875bdb3
 MISC metadata.xml 313 BLAKE2B d36ca69273ccafdd633c6f869c19781c4cef27c2947c7461b4c5285cb4f4f68d5896e63e2e12d069a6123b8ede70b891fd55fa583ff9aced04a1672c03a1982d SHA512 071ee6a67e35fc932046c8d22fdd7ba058bcb0630bb528ea8eab675b1df314635e9c8671313c1fef2139cb505f7fb6be2f229643f8833938dd86463fcaa7a056
diff --git a/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild b/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild
new file mode 100644
index 000000000000..f121bb744078
--- /dev/null
+++ b/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild
@@ -0,0 +1,32 @@
+# 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="io.github.java-diff-utils:java-diff-utils:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for computing diffs, applying patches, generationg side-by-side view"
+HOMEPAGE="https://java-diff-utils.github.io/java-diff-utils/"
+SRC_URI="https://github.com/java-diff-utils/java-diff-utils/archive/java-diff-utils-parent-${PV}.tar.gz"
+S="${WORKDIR}/java-diff-utils-java-diff-utils-parent-${PV}/java-diff-utils"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+RESTRICT="test" #839681
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="io.github.javadiffutils"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+	assertj-core-3
+	junit-5
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest
index 889f265857d7..f56feb4d4b0f 100644
--- a/dev-java/libg/Manifest
+++ b/dev-java/libg/Manifest
@@ -1,3 +1,5 @@
 DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
 EBUILD libg-7.0.0.ebuild 1436 BLAKE2B 37365e398e57a64b457ab77aa7fd8435f9e69f5fdd837455d8bbcddd925ab6916ad732af74d6cc898abdfbed8b6160d806f1bd81e5549ea753a4574e67dc7c0b SHA512 9cb69589f60822ac4c3e4c7a1dbcb2782b7803126154672ff1c90e9ac645f98e88395c965c44065998d90e15a40d0ba498369676f805844f78a413486cadf344
+EBUILD libg-7.1.0.ebuild 1130 BLAKE2B d252f95be8da9451ec657f379879e9287ea1213cb0ecc1bdd1270c151c8e161020a1adbca6caf6e218de0f9054af26a3428fbb381cb1242f49b636f9b2b53658 SHA512 bec6a98fdb9a6124d4c71bb673a925ce66af2cfc8e57146bea90e5268b26429ead3c8224e35f36c682dfbb1515969f7fa7cea440d45cb19b65b5595263b7637b
 MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/libg/libg-7.1.0.ebuild b/dev-java/libg/libg-7.1.0.ebuild
new file mode 100644
index 000000000000..4aeca1dfcea8
--- /dev/null
+++ b/dev-java/libg/libg-7.1.0.ebuild
@@ -0,0 +1,48 @@
+# 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="biz.aQute.bnd:aQute.libg:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library to be statically linked. Contains many small utilities"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV/_rc/.RC}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+# aQute.bnd.test.jupiter does not exist
+# org.assertj.core.api.junit.jupiter does not exist
+RESTRICT="test" #839681
+
+CP_DEPEND="
+	dev-java/slf4j-api:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	~dev-java/bnd-annotation-${PV}:0
+	dev-java/eclipse-jdt-annotation:0
+	dev-java/osgi-cmpn:8
+	>=virtual/jdk-17:*
+"
+
+# aQute.libg/src/aQute/libg/uri/URIUtil.java:161:
+# error: switch expressions are not supported in -source 11
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-17:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="aQute.libg"
+JAVA_CLASSPATH_EXTRA="
+	bnd-annotation
+	eclipse-jdt-annotation
+	osgi-cmpn-8
+"
+JAVA_SRC_DIR="aQute.libg/src"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 0b610e5e61ab..97c971b0ffb7 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,8 +1,8 @@
 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
-DIST protobuf-28.1.tar.gz 9258233 BLAKE2B 908dd074cc4ef632efdf123fdc76e6d78fd0db13d580584f00fd6afd3b5e1b6d3b6b52e49c528d4095905c802dcf0f391b01d2edf872738ed11a70c1123258a9 SHA512 769ef61206e39336d93df786a25c08cdf1acb12f2f5818ae31afb268aad8b02076eeba15c41c68aadbf140c6e1653c0aaefc2a637278c7695ded1b5d72888d81
 DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d
+DIST protobuf-29.1.tar.gz 9363710 BLAKE2B 8d43358c17f14a807391f37796226b9cedef3ef27ef536a6cb50a7a336a80fe221777ba669f3cee7e6a33a4decfc64e3b091d658de73e24a708297e2a539322c SHA512 eb604b473e09a5a001bf451ccd417cdb8732ebd3c2075fa46f3d0e48b7ed4d458f05d2e09eedc71c0f4252ba18d3161837efb7a2eed46d78b9eb3cc9b45f96ff
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
 EBUILD protobuf-java-4.27.2.ebuild 5026 BLAKE2B f4774dbbca752dcd18aeeb07cf05013b8b26d8dbc70b3f3cbef4543475564ce7fb16582d443cd0c326fe94835e965d459d48416ea63e10518c20347e2b751a94 SHA512 c5a11192867bc6f485df0abee48f3c31921c3ee9fbe335bb5c3c462a6e7ab6c77de0bc06499b364dc939ed27724ca0d79a186f19643d593033815d7a11ce1b20
-EBUILD protobuf-java-4.28.1.ebuild 5014 BLAKE2B 32d898d794c63ce5f952cfa05e724e8593bf47dabc65ef517e698e6797bb5815f7af37a417d819e65b3c404ceb3288896a81f2eddb1043efae0e56e70050e94d SHA512 7fe133439358e83602623a022b31084a19215993f6796c7380f3da98fa38d8830f8ba5503f54cf15a8b78edb6021180bd723cf65c084a6da574966342357ce85
 EBUILD protobuf-java-4.28.3.ebuild 4753 BLAKE2B 75888b86b796bba01583c86a21d5401daf8569750892ab844870ca1eeaa3c57e61850bfc92403937de948ec5e1b0be6967556cde14d83fd6447eddd1f0256cd0 SHA512 5e6b5a03122df4e0dd2e00c9fc4ca1e7045760577db50ec67e846bedaba5c58c3b191b1f8fc30d34a2ec59dc78183b9da483f36a166e87e2146c6874d6ea8429
+EBUILD protobuf-java-4.29.1.ebuild 4654 BLAKE2B 48f61bbe92c3152e9e011702e6874e83c5e63064e39e091160efae289812eac55e80ce1cf97f2a916058e18229a0779ea5ebe8af2b4378ba471301d8c800737f SHA512 8d7b8bcb0ce808187b38322831f60d595ebf20e4d40cd6d5c1088d2224c536073ac13e18d0632ffad366cabd2d5161598f185d72b3905336e220537e1630e751
 MISC metadata.xml 534 BLAKE2B aa3ede54aa4e1479f977cecb9dace36fa5db7025a5d45d142cde5ea2ede794f721abf0ced139b24d4c2c1aac3631ee43f15b4d74850abc56c1fbafb8736adebc SHA512 11f7b1fca223910cd42be952760e32d98a553fd660e1da66542a722eb1e3296c79e702f899dc36ab0e794a19014ede3738fc0959b04a9d44910e9e0068f3feb7
diff --git a/dev-java/protobuf-java/protobuf-java-4.28.1.ebuild b/dev-java/protobuf-java/protobuf-java-4.29.1.ebuild
index c8dd1f690a36..d8c59df716a3 100644
--- a/dev-java/protobuf-java/protobuf-java-4.28.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-4.29.1.ebuild
@@ -12,7 +12,7 @@ inherit java-pkg-2 java-pkg-simple cmake
 DESCRIPTION="Core Protocol Buffers library"
 HOMEPAGE="https://protobuf.dev"
 # Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 4.28.1 from the 28.1 tarball in order to allow sharing the tarball with
+# And we build artifact 4.29.1 from the 29.1 tarball in order to allow sharing the tarball with
 # dev-libs/protobuf.
 MY_PV4="${PV#4.}"
 MY_PV="${MY_PV4/_rc/-rc}"
@@ -24,7 +24,7 @@ S="${WORKDIR}/protobuf-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="system-protoc"
 
 BDEPEND="
@@ -63,7 +63,7 @@ src_prepare() {
 	fi
 	java-pkg-2_src_prepare
 
-	# https://github.com/protocolbuffers/protobuf/blob/v28.1/java/core/generate-sources-build.xml
+	# ${S}/java/core/generate-sources-build.xml
 	einfo "Replace variables in generate-sources-build.xml"
 	sed \
 		-e 's:${generated.sources.dir}:java/core/src/main/java:' \
@@ -73,7 +73,7 @@ src_prepare() {
 		-e '/project\|echo\|mkdir\|exec/d' \
 		-i java/core/generate-sources-build.xml || die "sed to sources failed"
 
-	# https://github.com/protocolbuffers/protobuf/blob/v28.1/java/core/generate-test-sources-build.xml
+	# ${S}/java/core/generate-test-sources-build.xml
 	einfo "Replace variables in generate-test-sources-build.xml"
 	sed \
 		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
@@ -112,12 +112,7 @@ src_compile() {
 }
 
 src_test() {
-	# https://github.com/protocolbuffers/protobuf/blob/v28.1/java/core/pom.xml#L63-L71
-	jar cvf testdata.jar \
-		-C src google/protobuf/testdata/golden_message_oneof_implemented \
-		-C src google/protobuf/testdata/golden_packed_fields_message || die
-
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-${TV}.jar:testdata.jar"
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-${TV}.jar"
 
 	# google/protobuf/java_features.proto: File not found.
 	cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index f7071bb83c76..98b42adb7efd 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -25,6 +25,9 @@ DIST swt-4.32-gtk-linux-x86_64.zip 4011746 BLAKE2B 5d2784f9a18684d539ea576560bb5
 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
+DIST swt-4.34-gtk-linux-aarch64.zip 4001004 BLAKE2B 4ed2ba9b61cecfda5bad8a3701dccfb12f78617222b24a96e0752bcc481fed96afc31c8053ab38f9b0cc41e46d0c33ddd0c5f04ddba194e7a8725f6856a60d52 SHA512 1c6ab66d02ff27ec45124e46e349a99e6d20f63511c32afbd70ec4d835a86e4f1f83205c67259697bb86250758ac625460bdd105123897f53b233d1e54283cb1
+DIST swt-4.34-gtk-linux-ppc64le.zip 4038598 BLAKE2B 8dd08a73c06c99cf286a894fbe42f8eb74592e4a42d03e184bc8941d067f564e2a1f13d27436ae7e0be44f5a28a0e2124d49dbae6261d841b39d832d3024e31e SHA512 c7c9048f1fc3730f27926d606301100c491b44ee5bab594d4a52bda8f0652302b0954b91d86bd7418532d596c332235a044f04bc677e4e36f33d316819a2a44b
+DIST swt-4.34-gtk-linux-x86_64.zip 4021887 BLAKE2B b9d549db7e143ea79200355e59e393a1305fd30cedfe39d94cd2f02947a62a1a2dc8bea45726e59dddd2360117e8ae757b3f597a37d84bed4e88bf8d4f957797 SHA512 486e18d150e23adb197e2f88448a1c7a48d8ef0d20751b358975460b21792f59a2d7ee55ad2340de381deb5d5508dada2e01087e58fa64690a92271bd3bbc7e7
 EBUILD swt-3.7.2-r4.ebuild 4436 BLAKE2B 2e50500e84ddd46fec47b576f0cdb25e5b6fd8e2312cc2ce609ef52f334433df597de8f18ae80e5a258f44d33d361577cdba218b4bd4029867331bdf29bb7e27 SHA512 829ca9a7743380909c5721c0befc4d08b17320804b9a1b1d01ab6aa39475ed9d96b238e537bc53f30be0ce8f1b0ec3dcf611779b874fc7b98a916c780c856dcc
 EBUILD swt-4.10-r4.ebuild 4269 BLAKE2B 3ef14892698d8df50f090443a8e15f8b0a048b378f5a5a15d9430f3cd2aba36f68d3556444ba43f5e538c5841dc93717ecf91f032bc7cccce98e3a74ca3e12c1 SHA512 79b77fcb263f657fc386b887e1d815165cf87af5bc32ece128eef71845746173cac16cdfb42277e803244d3f507b618c424b65a5e079cbaef57fcaa4932c1070
 EBUILD swt-4.29-r1.ebuild 3456 BLAKE2B 6d48de8cc8e1d9c034fafe3ca67951bf0c59201229a066566732b6828da068a1f6265e7367c9853da795d0ac25db981a6afb1d4691daa47bd372ec89bc10e5e3 SHA512 9c6902c16813aa36289b4131d5a379ab3e937246a18f486fb3a945f0fc240e67bb37b1a9245903fbda0837524c92f917951a3599c472c222e7f6e3001a90304a
@@ -32,4 +35,5 @@ EBUILD swt-4.30-r2.ebuild 3526 BLAKE2B 7d7d2f4af8b64b169daaff9486311d50324170cfa
 EBUILD swt-4.31-r1.ebuild 3597 BLAKE2B 3ebfa0ada9993a92ee67868ee6070b0a4812b455e3e3209e1a00abe4a528c2202be78d413d62123d113edfd22d998d728d2913b4d03296922a01cde4835ce8c8 SHA512 414e93ee4cc2398bb5f7b1b7079a865e48a0d3de4dcd62bba170c2207d4283fe7eace273736335233a6b16848f73890f59646ff763ba311d5aa75ecb5c146870
 EBUILD swt-4.32.ebuild 3597 BLAKE2B 6f6b08425ff52668c342394c50437397eeec8621d766f67d8a90999e2e659919da3837cc987f5166a268016351176406e7bbafa7b74cf59176c276bb5eca5402 SHA512 e9b246638d08f0d415f8412913b9369d9ce257f2a4e43e0741f2e5b989aac31d091d5c4f533a7a6ea50a3ea2cd73ee21728ec7e44a4ed7715aab6fe09a2f554c
 EBUILD swt-4.33.ebuild 3597 BLAKE2B c078bc253f2c56298421dc2c59efb9928b2ee058bf95929d847d52e113f488e1799a6cd56be0a38c802fa6450a3a353c518e5f13104eb174295cc218f65b1358 SHA512 c331378ea4954e967c83ced0cbb3cd1d24e16a75a3b972ae707860efd240ec001818e961fe92f733b5826e95a0142b0bf0807b6a9b32c997d97bd62d1df4eedb
+EBUILD swt-4.34.ebuild 3600 BLAKE2B 93023804243f31104a7c0d08a1eaae8418c93f036a8ea52f06f7e4864119063b3d64b82e8a8f010b1ca47387733cef6658f729f1faab0c14ccc1c26df0c65b67 SHA512 86cfb49c4afeeb87a135ebf8bb1f46e873a0a737aaf5e44927444791e26512e3ed7a39063f90b9e3af8a9135d6d4eb38d6754a9264de56537b2bb467fcc0692e
 MISC metadata.xml 762 BLAKE2B 6d1ffda9ea96f50b3e4736513ca9a3af4e7e9d3cd59a3f8ff8efcae118d290d141ffa90181fb1669f9a4380c6e4c618d780b459ada909c5dd5aa4f5fc1865b7d SHA512 5c50e0d80478a6af08886d9b65230fc161a000a7ea39d0ffa873114e13fd1fb9bcbcc554df41eebd63ee60dd9ed14e6f19110e71a49bd32adef6c43051c2c380
diff --git a/dev-java/swt/swt-4.34.ebuild b/dev-java/swt/swt-4.34.ebuild
new file mode 100644
index 000000000000..78532d57cbf3
--- /dev/null
+++ b/dev-java/swt/swt-4.34.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}-202411201800"
+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.34"
+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
+}