gentoo auto-resync : 04:08:2023 - 09:17:05

2 files changed, 0 insertions, 124 deletions

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index be31f5f9658a..27d4e266865d 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,7 +1,5 @@
 AUX protobuf-java-3.23.0-unittest_retention.proto.patch 2122 BLAKE2B b7c7297efaf11291809c46452291419482775e9cca712e000d8a1a604c01fe1bd1df3d076c56154c37ec6d32731a9384bcce1deb23b06dcaa26e0a00b4438160 SHA512 18e9da72f5fca6f1585836c37a3040c43c1db84f617f78ad91d642e9db2811953e30e8a676011ddb5e2c273698527c89487606c0428cfdcbb7c3e7d6d782832f
-DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346
 DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
-EBUILD protobuf-java-3.21.12.ebuild 4452 BLAKE2B d18bf0098fa38c538fd4852d4dc585040cbbd56ad17fbd02a18b1a4292008cdcf3307dc580ab5a5f3c95e4bb3e9025377bc524959f59df3ebb94f49c189b40f9 SHA512 5494d4060782c81d04f45f5184ac304ab846fd3fa375d0513d1481b7f99c85ebdaf6219ee170256fe7d7828121d3d44b790b23c9250aa4fc8a093d97a9d4773e
 EBUILD protobuf-java-3.23.0.ebuild 5004 BLAKE2B 1e8d57764ebd6829fc9dac563302ed4478e01daa7ef0b3613f12ce4b217df8bca853207af11dbf27623526414d0cb5ff5890d0ec502c50d974c23555a3cb0e01 SHA512 2f7fef3aa5ba84f7e17ee9d9d49c734867cde32f49aa4769d2e20fcf02079e0fc1a49fd81515e651bc8980d07d96589d3d43e710eb69df8ab1e0b215c7379413
 MISC metadata.xml 777 BLAKE2B 70de12bad5be3c8278834a4a8444c7485470c0f1822ff50f8d44280ac3c1e7150c4428cc417b59e834004cc92574a7016c90acf96728abc0b86c17ac14826df1 SHA512 7addbf4ecf146a11ab301c0e0657ec0572dfa84d4fccdd0bccb3248cab7f09956758041be670f8e22f114292447e3e00c7cd7d251c29e39b2e57eb5dd3a022c5
diff --git a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild
deleted file mode 100644
index d9140d989305..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2008-2023 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.21.12"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.21.11 from the 21.11 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 )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-		)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-# Once =protobuf-${PV#3.} hits the tree use it
-# BDEPEND="~dev-libs/protobuf-${PV#3.}:0"
-BDEPEND="dev-libs/protobuf:0"
-
-S="${WORKDIR}/protobuf-${PV#3.}/java"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="core/src/main/resources"
-JAVA_SRC_DIR="core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_RESOURCE_DIRS="core/src/test/proto"
-JAVA_TEST_SRC_DIR="core/src/test/java"
-
-src_prepare() {
-	default
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	# https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/pom.xml#L43-L62
-	echo $(sed \
-		-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:-C ../../../../../src \1:p' \
-		"${S}/core/pom.xml") > "${T}/core_proto" || die "echo to core_proto failed"
-	# Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS
-	pushd "${JAVA_RESOURCE_DIRS}" || die
-	jar cv "@${T}/core_proto" | jar xv
-	assert "Copying protos failed"
-	popd || die
-
-	# https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-sources-build.xml
-	einfo "Replace variables in generate-sources-build.xml"
-	sed \
-		-e 's:${generated.sources.dir}:core/src/main/java:' \
-		-e 's:${protobuf.source.dir}:../src:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|echo\|mkdir\|exec/d' \
-		-i core/generate-sources-build.xml || die "sed to sources failed"
-
-	einfo "Run protoc to generate sources"
-	protoc @core/generate-sources-build.xml || die "protoc sources failed"
-}
-
-src_test() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar"
-
-	# https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-test-sources-build.xml
-	einfo "Replace variables in generate-test-sources-build.xml"
-	sed \
-		-e 's:${generated.testsources.dir}:core/src/test/java:' \
-		-e 's:${protobuf.source.dir}:../src:' \
-		-e 's:${test.proto.dir}:core/src/test/proto:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|mkdir\|exec\|Also generate/d' \
-		-i core/generate-test-sources-build.xml || die "sed to test sources failed"
-
-	# Remove second exec from the file. Makes trouble here. We run it separately.
-	sed '50,54d' -i core/generate-test-sources-build.xml || die "cannot remove lines"
-
-	einfo "Running protoc to generate test-sources"
-	protoc @core/generate-test-sources-build.xml || die "protoc I failed"
-
-	einfo "Running protoc on previously removed test-sources"
-	protoc --java_out=lite:core/src/test/java \
-		--proto_path=../src \
-		--proto_path=core/src/test/proto \
-		core/src/test/proto/com/google/protobuf/nested_extension_lite.proto \
-		core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto \
-		|| die "protoc II failed"
-
-	# Ignore two failing test cases from CodedOutputStreamTest.java
-	sed \
-		-e '/import org.junit.Test/a import org.junit.Ignore;' \
-		-e '/testWriteWholeMessage/i @Ignore' \
-		-e '/testWriteWholePackedFieldsMessage/i @Ignore' \
-		-i core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java || die
-
-	einfo "Running tests"
-	# Exclude MapInitializationOrderTest and CachedFieldSizeTest
-	pushd core/src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-wholename "**/*Test.java" \
-			! -wholename "**/Abstract*Test.java" \
-			! -name "MapInitializationOrderTest.java" \
-			! -name "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
-}