From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1476066-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id D314D15800F
for <garchives@archives.gentoo.org>; Wed, 11 Jan 2023 10:30:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E987DE0BD8;
Wed, 11 Jan 2023 10:30:13 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CA34AE0BD8
for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jan 2023 10:30:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D5F69340D38
for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jan 2023 10:30:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2244376F
for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jan 2023 10:30:11 +0000 (UTC)
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" <flow@gentoo.org>
Message-ID: <1673433006.1cb4575bf07e37b17e04026339a1f5359ad6f74f.flow@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-java/protobuf-java/Manifest dev-java/protobuf-java/protobuf-java-3.21.12.ebuild
X-VCS-Directories: dev-java/protobuf-java/
X-VCS-Committer: flow
X-VCS-Committer-Name: Florian Schmaus
X-VCS-Revision: 1cb4575bf07e37b17e04026339a1f5359ad6f74f
X-VCS-Branch: master
Date: Wed, 11 Jan 2023 10:30:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 209642dd-82d5-492d-9a55-eec9be5fd8b4
X-Archives-Hash: 4719c681137a65edd01b97d90b0fc90b
commit: 1cb4575bf07e37b17e04026339a1f5359ad6f74f
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Oct 31 07:57:52 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 10:30:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb4575b
dev-java/protobuf-java: add 3.21.12
- For generating sources use core/generate-sources-build.xml instead of
listing from core/pom.xml
- Tests enabled using binary version of truth which is not yet packaged
https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar
- When using "protoc @<filename>" in core/generate-test-sources-build.xml
it seems not possible to run more than one exec from the same file.
Removed the second exec and now running it separately.
- Exclude MapInitializationOrderTest and CachedFieldSizeTest, ignore
testWriteWholeMessage() and testWriteWholePackedFieldsMessage() from
CodedOutputStreamTest.java because of unresolved test failures,
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/protobuf-java/Manifest | 2 +
.../protobuf-java/protobuf-java-3.21.12.ebuild | 121 +++++++++++++++++++++
2 files changed, 123 insertions(+)
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 85bcbb4bda71..37ef43909f55 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1 +1,3 @@
+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.12.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild
new file mode 100644
index 000000000000..da7ae95555d7
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild
@@ -0,0 +1,121 @@
+# 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 || die "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
+}