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 150A415800F for ; Thu, 12 Jan 2023 14:41:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00696E0932; Thu, 12 Jan 2023 14:41:54 +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 D7EACE0932 for ; Thu, 12 Jan 2023 14:41:53 +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 B699A3402FE for ; Thu, 12 Jan 2023 14:41:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F29C17FF for ; Thu, 12 Jan 2023 14:41:50 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1673533217.3c265c179aa02408713c500e2d13ab80556b12db.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/nitrocli/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/nitrocli/nitrocli-0.4.1.ebuild X-VCS-Directories: app-crypt/nitrocli/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 3c265c179aa02408713c500e2d13ab80556b12db X-VCS-Branch: master Date: Thu, 12 Jan 2023 14:41:50 +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: 9629f150-0c17-4a24-a4d3-ea9a93822367 X-Archives-Hash: e7887599753ff725ad936a1da0c4af26 commit: 3c265c179aa02408713c500e2d13ab80556b12db Author: Daniel Müller posteo net> AuthorDate: Mon Jan 2 18:17:54 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Jan 12 14:20:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c265c17 app-crypt/nitrocli: Use cargo install for shell-complete The way we access the shell-complete binary during the build has always been a hack. There is no way to know for sure where it is located ahead of time and cargo does not expose this information in an easily accessible manner. That may lead to shenanigans such as https://bugs.gentoo.org/889360, where it appears as if a debug build was forced and that resulted in the executable being available in target/debug/ as opposed to target/release/. Fix this issue by using cargo install internally, to force "temporary" installation in less undefined path. Closes: https://bugs.gentoo.org/889360 Signed-off-by: Daniel Müller posteo.net> Closes: https://github.com/gentoo/gentoo/pull/28938 Signed-off-by: Joonas Niilola gentoo.org> app-crypt/nitrocli/nitrocli-0.4.1.ebuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild b/app-crypt/nitrocli/nitrocli-0.4.1.ebuild index 769a5bd019b6..fcfc2efba490 100644 --- a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild +++ b/app-crypt/nitrocli/nitrocli-0.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017-2021 Gentoo Authors +# Copyright 2017-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -93,13 +93,20 @@ RDEPEND=" RESTRICT="test" QA_FLAGS_IGNORED="usr/bin/nitrocli" +src_compile() { + cargo_src_compile --bin=nitrocli + # Install shell-complete binary into source directory to be able to + # use it later on. + cargo install --bin=shell-complete --path . --root "${S}" || die +} + src_install() { cargo_src_install --bin=nitrocli - target/release/shell-complete bash > ${PN}.bash || die + "${S}"/bin/shell-complete bash > ${PN}.bash || die newbashcomp ${PN}.bash ${PN} - target/release/shell-complete fish > ${PN}.fish || die + "${S}"/bin/shell-complete fish > ${PN}.fish || die insinto /usr/share/fish/vendor_conf.d/ insopts -m0755 doins ${PN}.fish