From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 1052915800F for ; Wed, 11 Jan 2023 10:30:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5310BE0BDA; Wed, 11 Jan 2023 10:30:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 36DA9E0BDA for ; Wed, 11 Jan 2023 10:30:14 +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 0313E340E7F for ; Wed, 11 Jan 2023 10:30:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35F8C7FC for ; Wed, 11 Jan 2023 10:30:11 +0000 (UTC) From: "Florian Schmaus" 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" Message-ID: <1673433007.bce3de32853574c0ac459876a30296e1fa9060a5.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/protobuf-java-3.21.9-r2.ebuild X-VCS-Directories: dev-java/protobuf-java/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: bce3de32853574c0ac459876a30296e1fa9060a5 X-VCS-Branch: master Date: Wed, 11 Jan 2023 10:30:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 085d01c5-d431-4af7-b514-e9a34c11cded X-Archives-Hash: cf9a35e275b862b3919ce7af49ff9a7a commit: bce3de32853574c0ac459876a30296e1fa9060a5 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Dec 8 17:25:25 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Jan 11 10:30:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce3de32 dev-java/protobuf-java: add 3.21.9-r2, tests enabled - backports improvements from 3.21.12.ebuild - Keep this version matching a version of dev-libs/protobuf until dev-libs/protobuf-21.12 hits the tree BDEPEND="~dev-libs/protobuf-${PV#3.}:0" Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/28971 Signed-off-by: Florian Schmaus gentoo.org> .../protobuf-java/protobuf-java-3.21.9-r2.ebuild | 118 +++++++++++++++++++++ 1 file changed, 118 insertions(+) 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 new file mode 100644 index 000000000000..9dc32c355b91 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild @@ -0,0 +1,118 @@ +# 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:.*\(.*\):-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.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 +}