From 79851ef7da5ffce7aed667c8c49a1ce04333619e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 16 Apr 2025 08:45:29 +0100
Subject: gentoo auto-resync : 16:04:2025 - 08:45:29

---
 dev-java/Manifest.gz                               | Bin 56182 -> 56190 bytes
 dev-java/protobuf-java/Manifest                    |   2 +-
 dev-java/protobuf-java/protobuf-java-4.30.2.ebuild |  19 +++++++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'dev-java')

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 12b20d0e7155..e9c0438eccf7 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 7d1e9e833a8a..d313694670ba 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -9,5 +9,5 @@ EBUILD protobuf-java-4.28.3.ebuild 4753 BLAKE2B 75888b86b796bba01583c86a21d5401d
 EBUILD protobuf-java-4.29.2.ebuild 4653 BLAKE2B acf9e6a664b8ae569a247ba83424b56c4248e5612d435c46e5eb954cb72ebc6afa1edb41aa347af57802282cd874570ac611f56ebc21f1a045eafa458e6ce2fe SHA512 70bee8ca5569ee462474089a3ddd2be02d43a5dffc393b225e47cf81922fc201455537da037a269b54d24fbfc39c6ede32bcf56fc4a6369617b5b2c4f544f46f
 EBUILD protobuf-java-4.29.3.ebuild 4653 BLAKE2B 8b5cd5f1a915b4e8887e970859f84415fef1944e6f25f34a52929aaa9597d3d634044e92a4904b904c833e897bde6c17f380c6cd5eee59a7fba2ea18deaa967d SHA512 eb00ca1c9f83287d98e4b23ac4c26fd78dbe0d753beca24384a21fe722168baa50a8d45059a8bce97b43f4f28124e5de1ea1d92d930219d0bc1ea58c68581536
 EBUILD protobuf-java-4.29.4.ebuild 4654 BLAKE2B 081d919b2b16db71a80cdd48b0a4aac0ab6d655b4d2c059b9759d40e21f848fbb709fafb53e0a0644939e45084c6ba9c604e71bec7b7be1906a19e844002c337 SHA512 6a37a4f0050839629816b7ad1aa55b734579c738360b4156ea0bacfbb95e6e0450cc3114573a79d857a7c9e699172117373069f42951bab2550df99400fa9284
-EBUILD protobuf-java-4.30.2.ebuild 4968 BLAKE2B 823ec4d86120d1c8eae4d7dbd20e5cddcf2e40f73b655a063053db7ec98163ce065c1538f27580e5ff6229deb056a99470c3e43beecd8fc7d9e075014464099a SHA512 4f14d78944593b608464099e8962f34722138496e9057e770b8ac2e3489456929570febc59ad989a7b55f78390c4dc9488afc9fbf36ce621817f7b701fb3d5ba
+EBUILD protobuf-java-4.30.2.ebuild 5110 BLAKE2B 12760d2d8fe22f90e695904aaab9036f1ad4b445323e3ef77e7a03cd4d4d187fd2d3f0939abf9b39fb51067e1c9f7052bf666bde4cd1943871e61b58e94d2ca0 SHA512 e88a24666685e6051253d828f6def565e55e577b07c30c96b528e92fc50b17c4e8363aa1c70a0d595e7c09feb2eb1949503981f3a6d9e40f81e1019bca5a5512
 MISC metadata.xml 534 BLAKE2B aa3ede54aa4e1479f977cecb9dace36fa5db7025a5d45d142cde5ea2ede794f721abf0ced139b24d4c2c1aac3631ee43f15b4d74850abc56c1fbafb8736adebc SHA512 11f7b1fca223910cd42be952760e32d98a553fd660e1da66542a722eb1e3296c79e702f899dc36ab0e794a19014ede3738fc0959b04a9d44910e9e0068f3feb7
diff --git a/dev-java/protobuf-java/protobuf-java-4.30.2.ebuild b/dev-java/protobuf-java/protobuf-java-4.30.2.ebuild
index d6c978e01de4..23bafe370339 100644
--- a/dev-java/protobuf-java/protobuf-java-4.30.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-4.30.2.ebuild
@@ -21,7 +21,7 @@ MY_PV="$(ver_cut 2-3)"
 MY_PV="${MY_PV/_rc/-rc}"
 TV="1.4.4"
 SRC_URI="
-	https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
+	https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/protobuf-${MY_PV}.tar.gz
 	test? (
 		https://repo1.maven.org/maven2/com/google/truth/truth/${TV}/truth-${TV}.jar
 	)
@@ -97,12 +97,19 @@ src_prepare() {
 	# 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
+
+	# Requires TestParameterInjector library, currently not available in Gentoo.
+	rm java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java || die
+
+	# java/core/src/test/java/editions_unittest/TestDelimited.java:2867:
+	# error: package editions_unittest.MessageImport does not exist
+	rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-Dprotobuf_BUILD_TESTS=OFF
-		-Dprotobuf_ABSL_PROVIDER=package
+		-Dprotobuf_LOCAL_DEPENDENCIES_ONLY=ON
 	)
 	if ! use system-protoc; then
 		cmake_src_configure
@@ -136,21 +143,17 @@ src_test() {
 	run-protoc @test-sources-build-2 \
 		|| die "run-protoc test-sources-build-2 failed"
 
-	# java/core/src/test/java/editions_unittest/TestDelimited.java:2867:
-	# error: package editions_unittest.MessageImport does not exist
-	rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die
-
 	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}" >/dev/null || die
-		local JAVA_TEST_RUN_ONLY=$(find ./* \
+		local JAVA_TEST_RUN_ONLY=$(find * \
 			-path "**/*Test.java" \
 			! -path "**/Abstract*Test.java" \
 			! -name "MapInitializationOrderTest.java" \
-			! -path '*protobuf_unittest/CachedFieldSizeTest.java'
+			! -name CachedFieldSizeTest.java
 			)
 	popd >/dev/null || die
 	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-- 
cgit v1.2.3