gentoo auto-resync : 17:10:2024 - 04:04:26

3 files changed, 0 insertions, 204 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index b41195e72626..a8d98704526f 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,9 +1,6 @@
-AUX protobuf-java-3.23.0-unittest_retention.proto.patch 2122 BLAKE2B b7c7297efaf11291809c46452291419482775e9cca712e000d8a1a604c01fe1bd1df3d076c56154c37ec6d32731a9384bcce1deb23b06dcaa26e0a00b4438160 SHA512 18e9da72f5fca6f1585836c37a3040c43c1db84f617f78ad91d642e9db2811953e30e8a676011ddb5e2c273698527c89487606c0428cfdcbb7c3e7d6d782832f
-DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
 DIST protobuf-28.1.tar.gz 9258233 BLAKE2B 908dd074cc4ef632efdf123fdc76e6d78fd0db13d580584f00fd6afd3b5e1b6d3b6b52e49c528d4095905c802dcf0f391b01d2edf872738ed11a70c1123258a9 SHA512 769ef61206e39336d93df786a25c08cdf1acb12f2f5818ae31afb268aad8b02076eeba15c41c68aadbf140c6e1653c0aaefc2a637278c7695ded1b5d72888d81
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
-EBUILD protobuf-java-3.25.3.ebuild 5064 BLAKE2B b861ad7ab1e4e9fab98d4133779b671473fafe1570f5551f343b81d7185d31ccd99635270e0b41cd155d5b4ac0f353e74606be2c91fe70354ff949acfb950c19 SHA512 e817349fcbeb0b864e5622e9fc9ef7432a813fcbe94a3f904ef6c2481e0e963a7a98b8bfb7ae3d1a82b12bacb9bb8839b83e3500818b86b9ab83c47d7842fe25
 EBUILD protobuf-java-4.27.2.ebuild 5031 BLAKE2B 500a0fa2b0de21721c4324747625168745606de0d7806b8e87534a0a0c9fe8df3a27f04b2ea759fcb43d6374f82803412941f3293beb90b6ee191376ab23a4fd SHA512 3ea3b35c3e843223b01b6e6903cd0a568f521067e347bf1b2bfd33f704c1dc519c31969074deac9ef04efcd68bf5afcc2daa676335b437eaf44b9d765e8f3982
 EBUILD protobuf-java-4.28.1.ebuild 5019 BLAKE2B 79794705a568b5c8a6fdef7abc02bf32ff4b4c82fd99b34fccc505116c16e8ec98e4f989300747280109f17ac7da8e70a19a7c2052f1cac3be4aa0e9b7acb518 SHA512 915cf81eda655d576e0d3ed4397b83f277bf899bf36326cf2566b26fc8621fc2349e56b6575debaf4664358f54f252cede6d3738549252212c37225d39e4df2a
 MISC metadata.xml 534 BLAKE2B aa3ede54aa4e1479f977cecb9dace36fa5db7025a5d45d142cde5ea2ede794f721abf0ced139b24d4c2c1aac3631ee43f15b4d74850abc56c1fbafb8736adebc SHA512 11f7b1fca223910cd42be952760e32d98a553fd660e1da66542a722eb1e3296c79e702f899dc36ab0e794a19014ede3738fc0959b04a9d44910e9e0068f3feb7
diff --git a/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch b/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch
deleted file mode 100644
index c838bf3cede2..000000000000
--- a/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:68: error: cannot find symbol
-import protobuf_unittest.UnittestRetention;
-                        ^
-  symbol:   class UnittestRetention
-  location: package protobuf_unittest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:402: error: cannot find symbol
-    FileOptions options = UnittestRetention.getDescriptor().getOptions();
-                          ^
-  symbol:   variable UnittestRetention
-  location: class DescriptorsTest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:403: error: cannot find symbol
-    assertThat(options.hasExtension(UnittestRetention.plainOption)).isTrue();
-                                    ^
-  symbol:   variable UnittestRetention
-  location: class DescriptorsTest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:404: error: cannot find symbol
-    assertThat(options.hasExtension(UnittestRetention.runtimeRetentionOption)).isTrue();
-                                    ^
-  symbol:   variable UnittestRetention
-  location: class DescriptorsTest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:405: error: cannot find symbol
-    assertThat(options.hasExtension(UnittestRetention.sourceRetentionOption)).isFalse();
-                                    ^
-  symbol:   variable UnittestRetention
-  location: class DescriptorsTest
---- a/java/core/generate-test-sources-build.xml
-+++ b/java/core/generate-test-sources-build.xml
-@@ -19,6 +19,7 @@
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_optimize_for.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_optional.proto"/>
-+        <arg value="${protobuf.source.dir}/google/protobuf/unittest_retention.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_well_known_types.proto"/>
-         <arg value="${test.proto.dir}/com/google/protobuf/any_test.proto"/>
-         <arg value="${test.proto.dir}/com/google/protobuf/cached_field_size_test.proto"/>
diff --git a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild
deleted file mode 100644
index 95aa1c28a226..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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:${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 3.25.3 from the 25.3 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-MY_PV3="${PV#3.}"
-MY_PV="${MY_PV3/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
-	system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
-	!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:*"
-
-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/v25.3/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/v25.3/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/v25.3/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/v25.3/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
-}