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 DB2F6158041 for ; Thu, 22 Feb 2024 09:18:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20CF4E2A0E; Thu, 22 Feb 2024 09:18:32 +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 EC765E2A0E for ; Thu, 22 Feb 2024 09:18:31 +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 B8BA134320B for ; Thu, 22 Feb 2024 09:18:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0578131B for ; Thu, 22 Feb 2024 09:18:28 +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: <1708593470.cd99c9384d60752d15561204c02c85acb9107ff4.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/sequoia-sq/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/sequoia-sq/sequoia-sq-0.33.0.ebuild X-VCS-Directories: app-crypt/sequoia-sq/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: cd99c9384d60752d15561204c02c85acb9107ff4 X-VCS-Branch: master Date: Thu, 22 Feb 2024 09:18:28 +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: 4a442a1c-cb13-4c78-8667-99a101e371c1 X-Archives-Hash: 7d9c1b550fb964a03770776f34e9d955 commit: cd99c9384d60752d15561204c02c85acb9107ff4 Author: Florian Schmaus gentoo org> AuthorDate: Thu Feb 22 09:17:17 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Thu Feb 22 09:17:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd99c938 app-crypt/sequoia-sq: fix installation of shell completions Also use shell-completion.eclass. Closes: https://bugs.gentoo.org/923572 Signed-off-by: Florian Schmaus gentoo.org> app-crypt/sequoia-sq/sequoia-sq-0.33.0.ebuild | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.33.0.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.33.0.ebuild index 1719811decfa..b7a023d4f417 100644 --- a/app-crypt/sequoia-sq/sequoia-sq-0.33.0.ebuild +++ b/app-crypt/sequoia-sq/sequoia-sq-0.33.0.ebuild @@ -461,7 +461,7 @@ CRATES=" LLVM_MAX_SLOT=17 -inherit bash-completion-r1 cargo llvm +inherit bash-completion-r1 cargo shell-completion llvm DESCRIPTION="CLI of the Sequoia OpenPGP implementation" HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq" @@ -518,11 +518,16 @@ src_install() { doman target/$(usex debug debug release)/build/sequoia-sq-*/out/man-pages/*.1 - newbashcomp target/$(usex debug debug release)/build/sequoia-sq-*/out/shell-completions/sq.bash sq + # Since 0.33 sequoia-sq creates two shell-completions/ directories + # with indentical content. Select one of them. See also + # https://bugs.gentoo.org/923572 + local completion_dirs=( + $(ls -1d target/$(usex debug debug release)/build/sequoia-sq-*/out/shell-completions) + ) + [[ ${#completion_dirs[@]} -lt 1 ]] && die "No completion directories found" + local completion_dir="${completion_dirs[0]}" - insinto /usr/share/zsh/site-functions - doins target/$(usex debug debug release)/build/sequoia-sq-*/out/shell-completions/_sq - - insinto /usr/share/fish/vendor_completions.d - doins target/$(usex debug debug release)/build/sequoia-sq-*/out/shell-completions/sq.fish + newbashcomp "${completion_dir}"/sq.bash sq + dozshcomp "${completion_dir}"/_sq + dofishcomp "${completion_dir}"/sq.fish }