[gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/
Date: Fri, 10 Feb 2023 20:53:03 +0000 (UTC)	[thread overview]
Message-ID: <1676062344.f82b0ef2df5ef6fbdcce466783557c0a9ba46cf1.sam@gentoo> (raw)

commit:     f82b0ef2df5ef6fbdcce466783557c0a9ba46cf1
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Feb 10 20:46:30 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 20:52:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f82b0ef2

dev-java/protobuf-java: drop 3.21.9-r1, 3.21.9-r2

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29509
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/protobuf-java/Manifest                    |   1 -
 .../protobuf-java/protobuf-java-3.21.9-r1.ebuild   |  98 -----------------
 .../protobuf-java/protobuf-java-3.21.9-r2.ebuild   | 119 ---------------------
 3 files changed, 218 deletions(-)

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 37ef43909f55..1af6191837ab 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,3 +1,2 @@
 DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346
-DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8

diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9-r1.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9-r1.ebuild
deleted file mode 100644
index 4929dd830b68..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.21.9-r1.ebuild
+++ /dev/null
@@ -1,98 +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.9"
-# Tests not enabled, depend on com.google.truth which is not packaged
-# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/pom.xml#L35-L40
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit edo java-pkg-2 java-pkg-simple
-
-PARENT_PN="${PN/-java/}"
-PARENT_PV="$(ver_cut 2-)"
-PARENT_P="${PARENT_PN}-${PARENT_PV}"
-PARENT_SUBSLOT="32"
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/"
-SRC_URI="
-	https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
-		-> ${PARENT_P}.tar.gz
-"
-
-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:*"
-
-BDEPEND="dev-libs/protobuf:0/${PARENT_SUBSLOT}"
-
-S="${WORKDIR}/${PARENT_P}/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="../src"
-JAVA_TEST_SRC_DIR="core/src/test/java"
-
-# Same than PATCHES but from repository's root directory,
-# please see function `src_prepare` below.
-# Simplier for users IMHO.
-PARENT_PATCHES=(
-)
-
-# Here for patches within "java/" subdirectory.
-PATCHES=(
-)
-
-src_prepare() {
-	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
-	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
-	eapply_user
-	popd > /dev/null || die
-
-	# Same than default without the eapply_user part, this last is kept
-	# for the parent directory.
-	# It looks like function java-pkg-2_src_prepare doesn’t call "default".
-	[[ -n "${PATCHES[@]}" ]] && eapply "${PATCHES[@]}"
-
-	# Remove bundled jars
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-
-	# There is also compiler/plugin, but not in this list because in a subdirectory
-	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
-
-	# Copy resources from ../src/google/protobuf according to
-	# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/pom.xml#L45-L61
-	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
-	local core_proto
-	for core_proto in "${core_protos[@]}"; do
-		cp "../src/google/protobuf/${core_proto}.proto" \
-		   "${JAVA_RESOURCE_DIRS}/google/protobuf" \
-			|| die
-	done
-	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
-
-	# Generate 146 .java files according to
-	# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-sources-build.xml
-	for core_proto in "${core_protos[@]}" compiler/plugin; do
-		edo "${BROOT}/usr/bin/protoc" \
-			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${core_proto}".proto
-	done
-}

diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild
deleted file mode 100644
index ef157767a703..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild
+++ /dev/null
@@ -1,119 +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.9"
-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.9 from the 21.9 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:*"
-BDEPEND="~dev-libs/protobuf-${PV#3.}: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.9/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.9/java/core/generate-sources-build.xml
-	einfo "Replace variables for code generation "
-	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.9/java/core/generate-test-sources-build.xml
-	einfo "Replace variables for code generation "
-	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 first exec"
-	protoc @core/generate-test-sources-build.xml || die "protoc I failed"
-
-	einfo "Running protoc second exec"
-	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
-}

next             reply	other threads:[~2023-02-10 20:53 UTC|newest]

Thread overview: 168+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-10 20:53 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-19 18:12 [gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/ Miroslav Šulc
2025-10-19 18:12 Miroslav Šulc
2025-10-18 14:43 Miroslav Šulc
2025-10-18 14:43 Miroslav Šulc
2025-10-18 14:43 Miroslav Šulc
2025-10-18 11:54 Sam James
2025-10-03 22:02 Sam James
2025-10-03 22:02 Sam James
2025-10-03 22:02 Sam James
2025-10-03 16:27 Sam James
2025-06-18 18:52 Miroslav Šulc
2025-05-05  8:48 Arthur Zamarin
2025-04-15 10:35 Florian Schmaus
2025-04-05  0:42 Sam James
2025-04-05  0:42 Sam James
2025-02-08  0:55 Sam James
2025-01-19 17:35 Arthur Zamarin
2025-01-19 13:11 Arthur Zamarin
2025-01-09  9:48 Miroslav Šulc
2024-12-30 19:41 Florian Schmaus
2024-12-21 10:22 Miroslav Šulc
2024-12-07 13:24 Miroslav Šulc
2024-12-07 12:37 Miroslav Šulc
2024-12-06  7:49 Sam James
2024-11-04  7:26 Miroslav Šulc
2024-10-15 20:45 Sam James
2024-10-15 16:17 Sam James
2024-09-16  6:26 Miroslav Šulc
2024-09-12 16:16 Jakov Smolić
2024-09-03 18:29 Miroslav Šulc
2024-09-01 16:00 Arthur Zamarin
2024-08-08  8:19 Miroslav Šulc
2024-08-08  8:06 Miroslav Šulc
2024-07-15 11:14 Miroslav Šulc
2024-06-30 11:54 Miroslav Šulc
2024-06-30 11:54 Miroslav Šulc
2024-06-15  8:13 Joonas Niilola
2024-06-15  7:10 Sam James
2024-06-12 17:43 Sam James
2024-03-14 10:50 Miroslav Šulc
2024-02-12  8:47 Miroslav Šulc
2024-01-06 21:52 Miroslav Šulc
2023-12-07 13:05 Miroslav Šulc
2023-12-07 13:05 Miroslav Šulc
2023-09-04  7:55 Miroslav Šulc
2023-08-04  5:58 Miroslav Šulc
2023-07-27 22:20 Sam James
2023-02-10 20:36 Sam James
2023-02-10 20:36 Sam James
2023-02-10 20:36 Sam James
2023-01-14 19:17 Sam James
2023-01-11 13:37 Sam James
2023-01-11 10:30 Florian Schmaus
2023-01-11 10:30 Florian Schmaus
2023-01-11 10:30 Florian Schmaus
2023-01-06  9:37 Miroslav Šulc
2023-01-05  7:58 Sam James
2022-11-06  9:30 Sam James
2022-11-06  7:25 Sam James
2022-11-03 19:00 Arthur Zamarin
2022-11-03 18:40 Arthur Zamarin
2022-10-30 22:05 Sam James
2022-10-30  4:12 Jakov Smolić
2022-10-29 10:34 Jakov Smolić
2022-10-28  6:54 Florian Schmaus
2022-10-27 20:11 Florian Schmaus
2022-10-27 20:11 Florian Schmaus
2022-10-26 10:54 Sam James
2022-10-26 10:54 Sam James
2022-10-25 21:55 Sam James
2022-09-04 21:09 Conrad Kostecki
2022-09-04 21:09 Conrad Kostecki
2022-05-04  0:16 Sam James
2022-05-03 17:37 Arthur Zamarin
2022-05-02 19:03 Sam James
2022-03-09  8:59 Jakov Smolić
2022-01-29 15:20 Yixun Lan
2022-01-29 15:20 Yixun Lan
2021-11-18 22:22 Mike Gilbert
2021-11-18 22:22 Mike Gilbert
2021-11-14 18:51 Conrad Kostecki
2021-07-02  6:28 Agostino Sarubbo
2021-07-02  4:10 Sam James
2021-07-02  4:09 Sam James
2021-06-09 20:10 Mike Gilbert
2021-06-06 17:04 Mike Gilbert
2021-06-06 17:04 Mike Gilbert
2021-06-06 17:04 Mike Gilbert
2021-06-06 17:04 Mike Gilbert
2021-06-04 19:51 Mike Gilbert
2021-06-03  6:38 Miroslav Šulc
2021-06-02 16:44 Sam James
2021-05-31 23:04 Mike Gilbert
2021-05-31 23:04 Mike Gilbert
2021-05-31 23:04 Mike Gilbert
2021-05-09 13:44 Mike Gilbert
2021-05-05 12:14 Agostino Sarubbo
2021-05-03 16:55 Sam James
2021-04-09 22:32 Mike Gilbert
2021-04-09 22:32 Mike Gilbert
2021-04-05 23:51 Thomas Deutschmann
2021-03-26 14:38 Mike Gilbert
2021-02-03  3:12 Sam James
2021-02-01  4:43 Sam James
2020-12-27 18:39 Mike Gilbert
2020-11-24  7:42 Agostino Sarubbo
2020-11-22 19:32 Mike Gilbert
2020-11-22 19:32 Mike Gilbert
2020-11-22 19:32 Mike Gilbert
2020-09-24 14:26 Mike Gilbert
2020-09-24 14:26 Mike Gilbert
2020-09-24 14:26 Mike Gilbert
2020-09-15 18:34 Mike Gilbert
2020-09-15 18:34 Mike Gilbert
2020-09-15 18:34 Mike Gilbert
2020-07-04 13:53 Mike Gilbert
2020-06-13 18:59 Mike Gilbert
2020-03-10  8:56 Agostino Sarubbo
2020-03-09 19:29 Mike Gilbert
2020-03-09 19:29 Mike Gilbert
2020-03-09 19:29 Mike Gilbert
2019-12-31  8:18 Agostino Sarubbo
2019-12-29 19:34 Mike Gilbert
2019-12-29 19:34 Mike Gilbert
2019-12-29 19:34 Mike Gilbert
2019-12-06 20:25 Mike Gilbert
2019-12-06 20:25 Mike Gilbert
2019-12-06 20:25 Mike Gilbert
2019-09-29  2:56 Mike Gilbert
2019-08-23 10:06 Agostino Sarubbo
2019-08-16 17:03 Mike Gilbert
2019-08-16 17:03 Mike Gilbert
2019-06-28 18:10 Mike Gilbert
2019-06-22  9:38 Sergei Trofimovich
2019-06-18 15:59 Mike Gilbert
2019-06-18 15:59 Mike Gilbert
2019-04-19 16:39 Mike Gilbert
2019-04-19 16:39 Mike Gilbert
2019-04-19 16:39 Mike Gilbert
2019-02-25 21:25 Mike Gilbert
2018-12-11 17:48 Mike Gilbert
2018-10-20 11:46 Sergei Trofimovich
2018-10-19 17:39 Mike Gilbert
2018-10-02 20:08 Mike Gilbert
2018-10-02 20:08 Mike Gilbert
2018-08-22 19:01 Mike Gilbert
2018-07-07  2:03 Mike Gilbert
2018-06-24 20:25 Sergei Trofimovich
2018-04-30 15:58 Mike Gilbert
2018-04-26 15:14 Mike Gilbert
2018-03-13 22:14 Sergei Trofimovich
2018-03-08 19:33 Mike Gilbert
2018-02-22  9:49 Jason Zaman
2018-02-21 20:34 Mike Gilbert
2018-02-13 20:11 Thomas Deutschmann
2018-02-12 21:03 Jonas Stein
2018-01-08 21:31 Mike Gilbert
2017-11-18 20:44 Sergei Trofimovich
2017-10-30  1:08 Manuel Rüger
2017-10-01  0:04 Thomas Deutschmann
2017-09-21 21:06 Mike Gilbert
2017-05-09 17:18 Michał Górny
2017-02-05  5:07 Mart Raudsepp
2016-12-08 20:37 Patrice Clement
2016-07-04  3:10 Yixun Lan
2016-06-23 15:57 Patrice Clement
2016-04-21  9:52 Ian Delaney

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:37ef43909f5 dfblob:1af6191837a dfblob:4929dd830b6
dfblob:ef157767a70 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1676062344.f82b0ef2df5ef6fbdcce466783557c0a9ba46cf1.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox