From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 9B6121581EE for ; Fri, 11 Apr 2025 10:39:50 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 834EF3435FA for ; Fri, 11 Apr 2025 10:39:50 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 744671104B0; Fri, 11 Apr 2025 10:39:49 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 679FF1104B0 for ; Fri, 11 Apr 2025 10:39:49 +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 004A83435FA for ; Fri, 11 Apr 2025 10:39:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54321159F for ; Fri, 11 Apr 2025 10:39:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1744367949.ef8d2693b1de0f2c4a0ceb388c1c082bb5477888.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/grpc/grpc-1.71.0.ebuild X-VCS-Directories: net-libs/grpc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ef8d2693b1de0f2c4a0ceb388c1c082bb5477888 X-VCS-Branch: master Date: Fri, 11 Apr 2025 10:39:47 +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: 338e8c0d-e45c-42f9-a0ab-10f1d2891764 X-Archives-Hash: d2885e18eedf9a008c21b63490f06ea2 commit: ef8d2693b1de0f2c4a0ceb388c1c082bb5477888 Author: Paul Zander gmail com> AuthorDate: Fri Apr 11 10:38:25 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Apr 11 10:39:09 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8d2693 net-libs/grpc: 1.71.0 conditionally apply gtest patch Patch depends on replacing the included libs from gtest/abseil-cpp. And breaks without USE=test. Signed-off-by: Paul Zander gmail.com> Signed-off-by: Sam James gentoo.org> net-libs/grpc/grpc-1.71.0.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net-libs/grpc/grpc-1.71.0.ebuild b/net-libs/grpc/grpc-1.71.0.ebuild index c745ed62f6b1..7a8547ed98ce 100644 --- a/net-libs/grpc/grpc-1.71.0.ebuild +++ b/net-libs/grpc/grpc-1.71.0.ebuild @@ -73,7 +73,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-1.71.0-fix-already-registered.patch" "${FILESDIR}/${PN}-1.71.0-system-gtest.patch" ) @@ -173,6 +172,9 @@ src_prepare() { # Respect EPYTHON when testing, don't touch installed files otherwise python_fix_shebang --force "${S}" + + # NOTE doesn't apply if we don't replace gtest/abseil libs + eapply "${FILESDIR}/${PN}-1.71.0-fix-already-registered.patch" fi # Called via system() by some of the C++ sources, respect EPYTHON