gentoo auto-resync : 08:08:2024 - 12:38:45

11 files changed, 303 insertions, 33 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 74fc3ace2349..b725e8eb77a0 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/antlr-tool/Manifest b/dev-java/antlr-tool/Manifest
index b3f9b511240f..d2e36d4a8879 100644
--- a/dev-java/antlr-tool/Manifest
+++ b/dev-java/antlr-tool/Manifest
@@ -4,6 +4,6 @@ DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda586
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
 DIST antlr-tool-3.5.3-sources.jar 949247 BLAKE2B f7afa52faae8324093206b7e56dfda58a79815cc2c13baca1cb93b3424c8b310325885ca8c86f0ca8a016a73e30740c2fa5f34ce71ed3a6cfc5fdeb6f2c4a9a7 SHA512 cfbc612c0257c4f0e09451cd76fe904680b6af132596696f2ef9c4e21dcfc53d53501e4d4d2b1c1cf4391355fa3766cf8dabc718dc3580728d24db3ebc14e696
 DIST antlr-tool-4.9.3-sources.jar 961749 BLAKE2B 294c7ba6dff9a1039d3e570d7d49f46a564302d1e7a25ac9f662a2c293cbabadd6a5a4a94d026c4e5fcca37c407e104956badbd1cbbf71b957e464dc67cf823e SHA512 7d70e80714b673eb8301def5e66a7133b2ac477e3cc219e37877ef9df673e0599a1148a8c1929ca8eab081d4e7375c9079241765a1f38832b21cfe8608ef4429
-EBUILD antlr-tool-3.5.3-r1.ebuild 1958 BLAKE2B 12fec5c5bced1ba7264ab11b938211898a8b32651d5d6ae38d0bc44bb60ac451f4e7b1bead70c523ef9e2a026c11bf2008b65508b0e02826c3c417f8d009fd9e SHA512 dd2278182ceae5f8d82976fbb42c79296ba30e4c3bc45ec6daf29895e80b18a1a9f5d85f57f9f23d4b395a2f85b7e9616d19d6ac2848e52885ec66c97f558fab
-EBUILD antlr-tool-4.9.3-r2.ebuild 3712 BLAKE2B 981bfaf34c02951be230d694b4d58a9aae8c833742e1fd2f95be860754ddddf4351709b8ef70ce0447aa0722227a9ad20bf9d21c063f61552e1ff23ba385f1df SHA512 cfb3eaa48052d148f8c8025e99b6f367738d76a6b4601500137fe13e4c22d98cfd248de5e800aa72dab3edce2f648584ae8168781263181f1c2a2bdc738a3141
+EBUILD antlr-tool-3.5.3-r1.ebuild 1943 BLAKE2B 1d7a2632ac193d419bad4707f5b4b74a6589eeef9c247e56a2b37badcd2e30726305371ef0e5bd91e318dc2fa36505c2346f60c0c625eed83fe2c4a4dd32b48a SHA512 0cf818a1d04e6d8a755823e5c08376c6275daa5841fef4ff62b348f9228469e6f85c6a2fdd6106d5fc3bbe9beb993d38e73b2f63068b2542944c8805efa00bfd
+EBUILD antlr-tool-4.9.3-r3.ebuild 3724 BLAKE2B 748c8e79f92a94f232a4cd3797de473fddf96fdea205fb20181306d5e275e1b604c61ae7e58c0f9d557ee396d76fd5034e3ef010b915bc33d874920e7d0ad5f1 SHA512 d54d6d08120fcf0521a042a01056059a40c95cac90d7160869309853d5e9a67e121c3c8ed01eb895525956591462b50856f2219edc9c02e2615a4cb8d87c42b3
 MISC metadata.xml 366 BLAKE2B 134ea633a45f3e33d57f4761afb1ff2d7f7778d06d66ff6e2e77a0c5777d48e8009697f64a4d50780b84b6672f352f4714a2b61d206cd158fcddd50902485caa SHA512 5b0bb774c494f1e7bbc486732abcea66922e65cd209df3d9fa090d71dabbc9aae59d437c340a5d78941d730388c95554fa80fb9852c8c0ceed05c9197d236301
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
index 1997ce8c081f..2bb054ab64c1 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
@@ -48,7 +48,6 @@ RDEPEND="
 	${CP_DEPEND}
 "
 
-S="${WORKDIR}"
 TARBALL_S="${S}/${MY_PN}3-${PV}"
 
 JAVA_SRC_DIR="org"
diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild
index 2891b009c53f..c45261fa0f91 100644
--- a/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild
@@ -23,6 +23,7 @@ SRC_URI="
 	https://github.com/antlr/antlr4/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
 	https://repo1.maven.org/maven2/org/antlr/antlr4/${PV}/antlr4-${PV}-sources.jar -> ${P}-sources.jar
 "
+S="${WORKDIR}/${MY_PN}4-${PV}"
 
 LICENSE="BSD"
 SLOT="4"
@@ -51,8 +52,6 @@ RDEPEND="
 	${CP_DEPEND}
 "
 
-S="${WORKDIR}/${MY_PN}4-${PV}"
-
 JAVA_SRC_DIR=(
 	tool/src
 	../src/org # For UnicodeData.java
@@ -103,7 +102,7 @@ src_test() {
 	)
 	local CP="${S}/${JAVA_JAR_FILENAME}"
 	for test_dep in "${test_deps[@]}"; do
-		CP+=":$(java-pkg_getjars --with-dependencies "${test_dep}")"
+		CP+=":$(java-pkg_getjars --build-only --with-dependencies "${test_dep}")"
 	done
 	for res_dir in "${JAVA_TEST_RESOURCE_DIRS[@]}"; do
 		CP+=":${res_dir}"
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index e755e664a6b3..4b736c1b8b08 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -4,4 +4,5 @@ AUX fec-1.0.4-remove-concurrent-util-imports.patch 3146 BLAKE2B 8716fcc73a5e1030
 AUX fec-1.0.4-soname.patch 790 BLAKE2B 852ef6ec83d42a15bfb1d67b05364d15c3027a8579d5e90dab4dec4cc99273383d89f5d5174ec8a6e2ab3cb09986d3fd60f39aedec6ae2da3f893325f88756c4 SHA512 1586fc0408274fff7eb3ba2cd95cfac8a94dad9981e2e01e8e11642692d2a27068936b673364c9c2cc70ca848d364648a66c728dc41d85c605a25b7fe79e2ec3
 DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
 EBUILD fec-1.0.4-r4.ebuild 1545 BLAKE2B a79eb3864e6a6af9ec3d80314d246b4d06a040f6d08ffaa5ad5cf539a928320bd7dd55caefd598744078b74fe01406648405b8e16fc083d5ec67a7826703154f SHA512 53b032dfe28bddce60b3af59a9c41e6241478574f40820cfcbe2f4ecacf8bcf0de00c9fec4d3f83b70843d4bc189853304960e3d98e84384cb216112633b092b
+EBUILD fec-1.0.4-r5.ebuild 1567 BLAKE2B ce1f459c5baf27e4666c2fc326a61df3c74118ec5f18a376ddffcba81769958ff85cae56d04486b530c0c0f35132e7cd60b84611dfc39997c1e632309cc51d15 SHA512 8cced82ee80ea14f4769ae04e0d65fc70fe77eaca776a3a789bf23c5cb8c7e3f2bdd001a2108db6a27cdd8cda9d2693466b7b8701a3195b1912dae5bdee06b70
 MISC metadata.xml 318 BLAKE2B 463fade62b1a73b7fc75e7bd39e0e8f2d6d2450225af9001519bd14aeb48cf6bb8914f33b075388c683869d282f41ab2a1b2eba634ad43ac5c57d21be965dd22 SHA512 2434a4abc9ba27242e805fde38b3bce7785b44c3c9f9f89dcb8cec0b08776c0a4d64e0c9a3be0d86fd600256c8523d4020a3702b753b8f7b3770e6a73983ac7a
diff --git a/dev-java/fec/fec-1.0.4-r5.ebuild b/dev-java/fec/fec-1.0.4-r5.ebuild
new file mode 100644
index 000000000000..e55373ea5fdb
--- /dev/null
+++ b/dev-java/fec/fec-1.0.4-r5.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"
+
+inherit flag-o-matic toolchain-funcs java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Forward Error Correction library in Java"
+HOMEPAGE="https://github.com/hyphanet/contrib/blob/master/README"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+CP_DEPEND="dev-java/log4j-12-api:2"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-libfec8path.patch"
+	"${FILESDIR}"/"${P}-build.patch"
+	"${FILESDIR}"/"${P}-soname.patch"
+	"${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
+)
+
+JAVA_RESOURCE_DIRS="bin"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	# tests have never been enabled on this package. anyway, keeping this
+	# package with sources hosted in dev-space is only a workaround until
+	# we have a solution for bug #936539. the time for bothering with tests
+	# should be saved for that part.
+	#
+	# for the time being we keep removing the tests like before.
+	rm -rf tests || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	einfo "Sucessfully compiled Java classes!"
+
+	cd "${S}"/src/csrc || die
+	append-flags -fPIC
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)"
+	einfo "Sucessfully compiled C files!"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dolib.so src/csrc/libfec{8,16}.so
+}
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index f7825464b1a5..dd2d7ee10eb7 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,3 +1,4 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
 EBUILD javahelp-2.0.05_p20170719-r3.ebuild 1612 BLAKE2B 200c30695215557ec36930715715a0dd758b7b49d09b670a7c705b53c6ddf69e9a28b4f865fa1c341c1815d26d9fd9337c8ed61ce3a904a5b7aba05aeff93a2c SHA512 cd34ea7328258e5d9a36aaff43b17e5734bbcaca80c8bb9bd9a12b114be8713f1883faf4ddda209d0d85afe28c655ead198ed5a267a164d0b14be5f31bc2ca31
+EBUILD javahelp-2.0.05_p20170719-r4.ebuild 1372 BLAKE2B 3bf3aa00c677ce323d193097db305bfb67e38059e59076b14d4748f7975838166010ba9f72c08fd4ec399f98b5375ef14a8661125eb733ac456b8784fdbb1db6 SHA512 9e6375e10264cfcd62dc1239e9ea9fe71b38f6723cc7737a840475f00b026e5037eae6e2d98d519b34b6489a8cc7074521230e52cb73165d60526995d083aae9
 MISC metadata.xml 705 BLAKE2B 99d50e7e4960fd92f1b9f34d830ee22246f88c5224beb09eb581fa10b128753985c991b22a002eb8cc6ecb599475d0d88a50cfeb76734a4d687fc3c34d88686b SHA512 c20f79d6b27ea89d68d8f9655804986827e4bb5fff86b525047d8b34cb1c30c051af76d732da63a38ee9b311e78fdaaa4e3e2fa1232cde0230b7e75f6af37b6f
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
new file mode 100644
index 000000000000..453dcfef7068
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javaee.github.io/javahelp/"
+COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
+SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+	dev-java/javax-jsp-api:2.0
+	dev-java/javax-servlet-api:2.5
+"
+
+DEPEND="${CP_DEPEND}
+	virtual/jdk:1.8"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_JAR_FILENAME="jhall.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA="javahelp_nbproject/lib/jdic-stub.jar"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR=(
+	jhMaster/JavaHelp/src/{new,impl}
+	jhMaster/JSearch/{client,indexer}
+)
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir res || die
+	pushd jhMaster/JavaHelp/src/new >> /dev/null || die
+		find -type f ! -name '*.java' | xargs cp --parents -t ../../../../res || die
+	popd >> /dev/null || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	java-pkg_dolauncher jhsearch \
+		--main com.sun.java.help.search.QueryEngine
+	java-pkg_dolauncher jhindexer \
+		--main com.sun.java.help.search.Indexer
+
+	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 6606d5c7dc7d..cd4a58451287 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -2,12 +2,14 @@ AUX protobuf-java-3.23.0-unittest_retention.proto.patch 2122 BLAKE2B b7c7297efaf
 AUX protobuf-java-3.26.0-unittest.protos.patch 1828 BLAKE2B 078982186100b1d5466f705967abaa2b0ab09b14a401d406c7d5f9f342cfb4fe596d13b23061951dee8f165eda055ace57f293df12e3fa0bb710c67293ec0862 SHA512 3c2a610f74c7e6520fd781b3771b60e899bd5b94763a5c70873992feacc1e541d326b85250d2be256f9ac20df9af916e0673943533aeb45214dfdac693929b22
 DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d
 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
+DIST protobuf-23.4.tar.gz 5043507 BLAKE2B bf6a50771eb977ef92b779a32fd909693faae6394254c73e3c9b2729bce643f8cbfb5a1bd18b30abf3003b9fbfd24c074cea4085a6ccf14fdb6a3aeac9efcb89 SHA512 b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566
 DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
 DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4
 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
-EBUILD protobuf-java-3.23.0.ebuild 5004 BLAKE2B 1e8d57764ebd6829fc9dac563302ed4478e01daa7ef0b3613f12ce4b217df8bca853207af11dbf27623526414d0cb5ff5890d0ec502c50d974c23555a3cb0e01 SHA512 2f7fef3aa5ba84f7e17ee9d9d49c734867cde32f49aa4769d2e20fcf02079e0fc1a49fd81515e651bc8980d07d96589d3d43e710eb69df8ab1e0b215c7379413
+EBUILD protobuf-java-3.23.0-r1.ebuild 4674 BLAKE2B 42bf12aa651f40c7ab8a9d0262d371be78524097ccd517273807d63ad4ae5bfdae76bf5286c68d0df7e1284907331ed835e2df40a6f384fc0a379bc3d606b8de SHA512 35c74625656430837ac0381ad0b710c45ba099f14378e491853896a2c2009880a093106378baf13dff522ca1f7c279813946b1ea23aa4e5b80c7dbfe83c61961
 EBUILD protobuf-java-3.23.3.ebuild 5025 BLAKE2B dc9565c4bc6bae5d650202e20e427f2a5cf4235668ca23638503f94a73a8155352d1fb66613c0d50066b669f80099abd61c3984a29b9f11c09cd53f785a5ed89 SHA512 31cb0f30f2cb25c41b1d0ec4d64bdfc413f7ce267e86026a88a9329affcd8a288a5afa0349018f74b21528cd9a798db145a5c8dd37edbe06eacb42ae0e7fcd47
+EBUILD protobuf-java-3.23.4.ebuild 5063 BLAKE2B d48f546256aed60a72ce4f27f689d70c8c9cb7f3223d4100ae4aa9fce65d1fb346945f922850434ca353cf667a680f170afe94012908e188e6608ffccf6b0ace SHA512 908cc9c7b684bd3cf8d5c322c7ba15db7e5959a3b884e459f105d0f68d51a92e8a17114e77b3d66cf03889878f1705f5c2d8ae956b5e8378f0f642e384677965
 EBUILD protobuf-java-3.25.3.ebuild 5070 BLAKE2B 253564d29b833f09bda7830790bdd120b5807ff75d4ff70949ceca2c1b79410ba4b023e57c0a58763ad8cb037eb2bcefc875198a3385b7dd032c8b709bac45ea SHA512 503911709bf44eb849037f480d813ae45ca55752cedbb9652fb62a155cd2cadaa0c6511c69ed259d16a7799ee19fe57e7c3359d02196185652386da390807f1b
 EBUILD protobuf-java-4.26.1.ebuild 4758 BLAKE2B 018ffa86d9af50a96db808ee51892e930630ec0709f0effb26522e70bc8d9890a84cb67276b2aab743950b7ba53e77567615f9d1bc63e391521a22696afe1e7b SHA512 4a738022a541fc6b73a13fa7cdc461137adbcfc8f3cf95a522355991c9be2c459b10b99191fb1efa3d23efb4783e539cc5e119fa6e84096b0ed3cc2762675ced
 EBUILD protobuf-java-4.27.2.ebuild 5037 BLAKE2B 67330a0834b53ed7a950daea16be0b2cb7c8523cd6b2c0cafcc1468b39b6dd064e07a12d7e90a6b19612d6e82711c07e76cd6a2951ff6ec5709abcab042eac63 SHA512 51187de703cb88ded86536a068725eddb2692ba71150d2fcfb566058f1996edf39491c46363f31aecfb5210d7e7fbf7974da5dd4fbc90e70caa262079ad48d63
diff --git a/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.0-r1.ebuild
index abeb3464f5e4..6059bd156b76 100644
--- a/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.23.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2023 Gentoo Authors
+# Copyright 2008-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,6 @@ S="${WORKDIR}/protobuf-${PV#3.}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
@@ -31,10 +30,9 @@ DEPEND="
 		)
 "
 RDEPEND=">=virtual/jre-1.8:*"
-
 BDEPEND="
-	system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0  )
-	!system-protoc? ( >=dev-cpp/abseil-cpp-20230125.2 )
+	>=dev-cpp/abseil-cpp-20230125.2
+	<dev-cpp/abseil-cpp-20240116.2
 "
 
 PATCHES=(
@@ -50,20 +48,11 @@ JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
 JAVA_TEST_SRC_DIR="java/core/src/test/java"
 
 run-protoc() {
-	if use system-protoc; then
-		protoc $1
-	else
-		"${BUILD_DIR}"/protoc $1
-	fi
+	"${BUILD_DIR}"/protoc $1
 }
 
 src_prepare() {
-	# If the corrsponding version of system-protoc is not available we build protoc locally
-	if use system-protoc; then
-		:
-	else
-		cmake_src_prepare
-	fi
+	cmake_src_prepare
 	java-pkg-2_src_prepare
 
 	mkdir "${JAVA_RESOURCE_DIRS}" || die
@@ -104,19 +93,11 @@ src_configure() {
 		-Dprotobuf_BUILD_TESTS=OFF
 		-Dprotobuf_ABSL_PROVIDER=package
 	)
-	if use system-protoc; then
-		:
-	else
-		cmake_src_configure
-	fi
+	cmake_src_configure
 }
 
 src_compile() {
-	if use system-protoc; then
-		:
-	else
-		cmake_src_compile
-	fi
+	cmake_src_compile
 
 	einfo "Run protoc to generate sources"
 	run-protoc \
diff --git a/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild
new file mode 100644
index 000000000000..4e75a53cfab4
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild
@@ -0,0 +1,167 @@
+# Copyright 2008-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.protobuf:protobuf-java:3.23.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+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 3.23.4 from the 23.4 tarball in order to allow sharing the tarball with
+# dev-libs/protobuf.
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz
+	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+S="${WORKDIR}/protobuf-${PV#3.}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="system-protoc"
+
+BDEPEND="
+	system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0  )
+	!system-protoc? (
+		>=dev-cpp/abseil-cpp-20230125.3
+		<dev-cpp/abseil-cpp-20240116.2
+	)
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="java/core/src/main/resources"
+JAVA_SRC_DIR="java/core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="java/core/src/test/java"
+
+run-protoc() {
+	if use system-protoc; then
+		protoc $1
+	else
+		"${BUILD_DIR}"/protoc $1
+	fi
+}
+
+src_prepare() {
+	# If the corrsponding version of system-protoc is not available we build protoc locally
+	if use system-protoc; then
+		default # apply patches
+	else
+		cmake_src_prepare
+	fi
+	java-pkg-2_src_prepare
+
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	# https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/pom.xml#L43-L62
+	PROTOS=(  $(sed \
+		-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
+		"${S}/java/core/pom.xml") ) || die
+	pushd src > /dev/null || die
+		cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
+	popd > /dev/null || die
+
+	# https://github.com/protocolbuffers/protobuf/blob/v23.4/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:' \
+		-e 's:${protobuf.source.dir}:src:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|echo\|mkdir\|exec/d' \
+		-i java/core/generate-sources-build.xml || die "sed to sources failed"
+
+	# https://github.com/protocolbuffers/protobuf/blob/v23.4/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:' \
+		-e 's:${protobuf.source.dir}:src:' \
+		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|mkdir\|exec\|Also generate/d' \
+		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
+
+	# Split the file in two parts, one for each run-protoc call
+	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
+		java/core/generate-test-sources-build.xml || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dprotobuf_BUILD_TESTS=OFF
+		-Dprotobuf_ABSL_PROVIDER=package
+	)
+	if use system-protoc; then
+		:
+	else
+		cmake_src_configure
+	fi
+}
+
+src_compile() {
+	if use system-protoc; then
+		:
+	else
+		cmake_src_compile
+	fi
+
+	einfo "Run protoc to generate sources"
+	run-protoc \
+		@java/core/generate-sources-build.xml \
+		|| die "protoc sources failed"
+
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	# https://github.com/protocolbuffers/protobuf/blob/v23.4/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-1.1.3.jar:testdata.jar"
+
+	einfo "Running protoc on first part of generate-test-sources-build.xml"
+	run-protoc @test-sources-build-1 \
+		|| die "run-protoc test-sources-build-1 failed"
+
+	einfo "Running protoc on second part of generate-test-sources-build.xml"
+	run-protoc @test-sources-build-2 \
+		|| die "run-protoc test-sources-build-2 failed"
+
+	einfo "Running tests"
+	# Invalid test class 'map_test.MapInitializationOrderTest':
+	# 1. Test class should have exactly one public constructor
+	# Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
+	# 1. Test class should have exactly one public constructor
+	pushd "${JAVA_TEST_SRC_DIR}" || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-path "**/*Test.java" \
+			! -path "**/Abstract*Test.java" \
+			! -name "MapInitializationOrderTest.java" \
+			! -path '*protobuf_unittest/CachedFieldSizeTest.java'
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}