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 B9319159C9B for ; Mon, 12 Aug 2024 08:56:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0509E2B00; Mon, 12 Aug 2024 08:56:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 DB0FAE2B00 for ; Mon, 12 Aug 2024 08:56:34 +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 13C1D342FA5 for ; Mon, 12 Aug 2024 08:56:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 480451E5D for ; Mon, 12 Aug 2024 08:56:32 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1723452778.5b8f27f19e24d19c418a5be21d77f92b2b549157.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/zerotier/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/zerotier/zerotier-1.14.0.ebuild X-VCS-Directories: net-misc/zerotier/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 5b8f27f19e24d19c418a5be21d77f92b2b549157 X-VCS-Branch: master Date: Mon, 12 Aug 2024 08:56:32 +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: c6dc656f-ba21-45ef-9572-21f25df793ca X-Archives-Hash: 415554d9e8ceb82d55c6c55c15ff098a commit: 5b8f27f19e24d19c418a5be21d77f92b2b549157 Author: Alfred Wingate protonmail com> AuthorDate: Sun Aug 11 20:33:28 2024 +0000 Commit: Yixun Lan gentoo org> CommitDate: Mon Aug 12 08:52:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8f27f1 net-misc/zerotier: use target specific dir for cargo Closes: https://bugs.gentoo.org/937782 Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Yixun Lan gentoo.org> net-misc/zerotier/zerotier-1.14.0.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net-misc/zerotier/zerotier-1.14.0.ebuild b/net-misc/zerotier/zerotier-1.14.0.ebuild index 8a00c6b94532..933ff2176ec9 100644 --- a/net-misc/zerotier/zerotier-1.14.0.ebuild +++ b/net-misc/zerotier/zerotier-1.14.0.ebuild @@ -413,9 +413,11 @@ src_prepare() { #1. Dont call cargo, we'll run it with cargo eclass functions #2. Remove man page compression and install, we'll handle it with ebuild functions + #3. Gentoo generates target specific build dirs now bug #937782 sed -i \ -e '/ifeq ($(ZT_SSO_SUPPORTED)/,/endif/ { /cargo build/d }' \ -e '/install:/,/^$/ { /man[0-9]/d }' \ + -e "s|rustybits/target/$(usex debug debug release)|rustybits/$(cargo_target_dir)|" \ make-linux.mk || die }