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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A0EB5158020 for ; Fri, 28 Oct 2022 06:54:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA5EBE0825; Fri, 28 Oct 2022 06:54:42 +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 A4B6FE0825 for ; Fri, 28 Oct 2022 06:54:42 +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 7BF21341036 for ; Fri, 28 Oct 2022 06:54:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B300C5E7 for ; Fri, 28 Oct 2022 06:54:39 +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: <1666940041.1f351af5b3d2d7bc69285d5d1c547de7bdb5db98.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.ebuild dev-java/protobuf-java/protobuf-java-9999.ebuild X-VCS-Directories: dev-java/protobuf-java/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 1f351af5b3d2d7bc69285d5d1c547de7bdb5db98 X-VCS-Branch: master Date: Fri, 28 Oct 2022 06:54:39 +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: da086868-9df7-4582-89b7-b515d06a4655 X-Archives-Hash: 7d0bc5d268ca4334f59ae697c26d8540 commit: 1f351af5b3d2d7bc69285d5d1c547de7bdb5db98 Author: Florian Schmaus gentoo org> AuthorDate: Fri Oct 28 06:51:11 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Fri Oct 28 06:54:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f351af5 dev-java/protobuf-java: fix live ebuild, other fixes Add missing 'local' declaration of for-loop variable. Align latest ebuild with live ebuild. Use edo when generating .proto files. Closes: https://bugs.gentoo.org/878469 Signed-off-by: Florian Schmaus gentoo.org> dev-java/protobuf-java/protobuf-java-3.21.9.ebuild | 26 ++++++++++++++-------- dev-java/protobuf-java/protobuf-java-9999.ebuild | 16 ++++++++----- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild index 96fc4a9564e1..60134da57091 100644 --- a/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild +++ b/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild @@ -9,7 +9,7 @@ MAVEN_ID="com.google.protobuf:protobuf-java:3.21.9" # https://github.com/protocolbuffers/protobuf/blob/v3.21.6/java/core/pom.xml#L35-L39" # JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +inherit edo java-pkg-2 java-pkg-simple DESCRIPTION="Google's Protocol Buffers - Java bindings" HOMEPAGE="https://developers.google.com/protocol-buffers/" @@ -44,17 +44,25 @@ JAVA_TEST_SRC_DIR="core/src/test/java" src_prepare() { default 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/v3.21.6/java/core/pom.xml#L45-L61 - mkdir -p core/src/main/resources/google/protobuf/compiler || die - cp {../src,core/src/main/resources}/google/protobuf/compiler/plugin.proto || die - cp ../src/google/protobuf/{any,api,descriptor,duration,empty,field_mask,source_context,struct,timestamp,type,wrappers}.proto \ - "${JAVA_RESOURCE_DIRS}/google/protobuf" || die + 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/v3.21.6/java/core/generate-sources-build.xml - for proto in any api compiler/plugin descriptor duration empty field_mask source_context struct timestamp type wrappers; do - "${BROOT}/usr/bin/protoc" \ - --java_out=core/src/main/java -I../src ../src/google/protobuf/$proto.proto || die + # https://github.com/protocolbuffers/protobuf/blob/v21.7/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-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild index ab4856250e05..f269a7bc8533 100644 --- a/dev-java/protobuf-java/protobuf-java-9999.ebuild +++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild @@ -12,7 +12,7 @@ MAVEN_ID="com.google.protobuf:${PN}:3.21.7" # https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40 # JAVA_TESTING_FRAMEWORKS="junit-4" -inherit java-pkg-2 java-pkg-simple +inherit edo java-pkg-2 java-pkg-simple PARENT_PN="${PN/-java/}" PARENT_PV="${PV}" @@ -92,14 +92,18 @@ src_prepare() { # Copy resources from ../src/google/protobuf according to # https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L45-L61 mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die - cp "../src/google/protobuf/${core_protos[@]}.proto" \ - "${JAVA_RESOURCE_DIRS}/google/protobuf" || 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.7/java/core/generate-sources-build.xml - for proto in "${core_protos[@]}" compiler/plugin; do - "${BROOT}/usr/bin/protoc" \ - --java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die + 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 }