gentoo auto-resync : 10:01:2025 - 06:41:30

2 files changed, 154 insertions, 0 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 65218bc77cb4..bb8e7d0aea5c 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,8 +1,10 @@
 DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d
 DIST protobuf-29.1.tar.gz 9363710 BLAKE2B 8d43358c17f14a807391f37796226b9cedef3ef27ef536a6cb50a7a336a80fe221777ba669f3cee7e6a33a4decfc64e3b091d658de73e24a708297e2a539322c SHA512 eb604b473e09a5a001bf451ccd417cdb8732ebd3c2075fa46f3d0e48b7ed4d458f05d2e09eedc71c0f4252ba18d3161837efb7a2eed46d78b9eb3cc9b45f96ff
 DIST protobuf-29.2.tar.gz 9348408 BLAKE2B 847798474bc6a76b9badfdbf605e118dece5e321e81242d7fa1bf5f5d17ee05a3d365ec112dc6d861cade97efff8be1d5d04006a5144f613bdb3ff5eacc63b99 SHA512 aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643
+DIST protobuf-29.3.tar.gz 9348951 BLAKE2B 8d37daac6f0d832e5bff5c56b9be73fce1fe016ca4e905f4c66d8fea20fabbee54a6be2c824f503d40f8492a4ec6280a539c454de9a118b69ebc57f2afe3d965 SHA512 0c776133f5789d21baa8860cb41e7926a162d74810a01722b762a78f93e559494e903fcaa092515bfe2ce057fd065a5dd000b316edb1af32c2ef9dbadf02b4c6
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
 EBUILD protobuf-java-4.28.3.ebuild 4753 BLAKE2B 75888b86b796bba01583c86a21d5401daf8569750892ab844870ca1eeaa3c57e61850bfc92403937de948ec5e1b0be6967556cde14d83fd6447eddd1f0256cd0 SHA512 5e6b5a03122df4e0dd2e00c9fc4ca1e7045760577db50ec67e846bedaba5c58c3b191b1f8fc30d34a2ec59dc78183b9da483f36a166e87e2146c6874d6ea8429
 EBUILD protobuf-java-4.29.1.ebuild 4653 BLAKE2B fd5c47a1ad85822957fe692d4ce476d187b2bd387d7495e9d784bc6592ce4e35ee489b35762df3f23f678ad143dfacf83d88bc3a6947083da7580d62b53f771b SHA512 82398ab2b92fd3a75728af96dafeadc0a914b9992a0d1868a34307689fd3f3fca1f59a94fa3f697554cc14f728d0cce38afa3a87ab44e6043c01760b8aebe05e
 EBUILD protobuf-java-4.29.2.ebuild 4654 BLAKE2B d61a3cb0c0041b5d8cd1836d84a6e29f3e2c88e0853c241dae3b0410d11743370f0b280e6874a9250718c2cc92c4c8d05b108c5ddad44915ef261876ff6fbadf SHA512 13a19dc4ecb9399f6c989ece9597647634c90d7574e057b0ad940d356fca44e5d4f40f596777c01b1848694dca1a58af1ea9d3c2fba0216ae9fafe9ea15ef48f
+EBUILD protobuf-java-4.29.3.ebuild 4654 BLAKE2B 081d919b2b16db71a80cdd48b0a4aac0ab6d655b4d2c059b9759d40e21f848fbb709fafb53e0a0644939e45084c6ba9c604e71bec7b7be1906a19e844002c337 SHA512 6a37a4f0050839629816b7ad1aa55b734579c738360b4156ea0bacfbb95e6e0450cc3114573a79d857a7c9e699172117373069f42951bab2550df99400fa9284
 MISC metadata.xml 534 BLAKE2B aa3ede54aa4e1479f977cecb9dace36fa5db7025a5d45d142cde5ea2ede794f721abf0ced139b24d4c2c1aac3631ee43f15b4d74850abc56c1fbafb8736adebc SHA512 11f7b1fca223910cd42be952760e32d98a553fd660e1da66542a722eb1e3296c79e702f899dc36ab0e794a19014ede3738fc0959b04a9d44910e9e0068f3feb7
diff --git a/dev-java/protobuf-java/protobuf-java-4.29.3.ebuild b/dev-java/protobuf-java/protobuf-java-4.29.3.ebuild
new file mode 100644
index 000000000000..11ee57d92df5
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-4.29.3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2008-2025 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:${PV}"
+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 4.29.3 from the 29.3 tarball in order to allow sharing the tarball with
+# dev-libs/protobuf.
+MY_PV4="${PV#4.}"
+MY_PV="${MY_PV4/_rc/-rc}"
+MY_P="protobuf-${MY_PV}.tar.gz"
+TV="1.1.3"
+SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P}
+	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/${TV}/truth-${TV}.jar )"
+S="${WORKDIR}/protobuf-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="system-protoc"
+
+BDEPEND="
+	system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] )
+	!system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+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
+		cmake_src_prepare
+	fi
+	java-pkg-2_src_prepare
+
+	# ${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:' \
+		-e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \
+		-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"
+
+	# ${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:' \
+		-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
+		cmake_src_configure
+	fi
+}
+
+src_compile() {
+	if ! use system-protoc; then
+		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() {
+	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
+
+	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"
+
+	# 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}" || 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
+}