app-admin/pass: [QA] unconditionally install completion files

QA policy [0] says that we don't conditionalise installation of
small files. It's a wasteful rebuild and inconsistent across packages
for when users desire completions to be available.

[0] https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0301
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 28 insertions, 28 deletions

diff --git a/app-admin/pass/metadata.xml b/app-admin/pass/metadata.xml
index 3e292a92eba7..4d843ab7e68a 100644
--- a/app-admin/pass/metadata.xml
+++ b/app-admin/pass/metadata.xml
@@ -12,9 +12,6 @@
 		<flag name="git">
 			Use <pkg>dev-vcs/git</pkg> for password revisions.
 		</flag>
-		<flag name="fish-completion">
-			Enable fish completion support.
-		</flag>
 		<flag name="dmenu">
 			Add support for x11-misc/dmenu with the 'passmenu' program.
 		</flag>
diff --git a/app-admin/pass/pass-1.7.3.ebuild b/app-admin/pass/pass-1.7.3-r1.ebuild
index ae678d292fa6..e4c51b733fd7 100644
--- a/app-admin/pass/pass-1.7.3.ebuild
+++ b/app-admin/pass/pass-1.7.3-r1.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit bash-completion-r1 elisp-common
 
 DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
 HOMEPAGE="https://www.passwordstore.org/"
 SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
+S="${WORKDIR}/password-store-${PV}"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+IUSE="+git X emacs dmenu importers elibc_Darwin"
 
 RDEPEND="
 	app-crypt/gnupg
@@ -21,19 +22,16 @@ RDEPEND="
 	git? ( dev-vcs/git )
 	X? ( x11-misc/xclip )
 	elibc_Darwin? ( app-misc/getopt )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	fish-completion? ( app-shells/fish )
 	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
 	emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 "
 
-S="${WORKDIR}/password-store-${PV}"
-
 src_prepare() {
 	default
 
 	use elibc_Darwin || return
-	# use coreutils'
+
+	# use coreutils
 	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
 	# host getopt isn't cool, and we aren't brew (rip out brew reference)
 	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
@@ -51,13 +49,16 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		BASHCOMPDIR="$(get_bashcompdir)" \
 		WITH_BASHCOMP=yes \
-		WITH_ZSHCOMP=$(usex zsh-completion) \
-		WITH_FISHCOMP=$(usex fish-completion)
+		WITH_ZSHCOMP=yes \
+		WITH_FISHCOMP=yes
+
 	use dmenu && dobin contrib/dmenu/passmenu
+
 	if use emacs; then
 		elisp-install ${PN} contrib/emacs/*.{el,elc}
 		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
 	fi
+
 	if use importers; then
 		exeinto /usr/share/${PN}/importers
 		doexe contrib/importers/*
diff --git a/app-admin/pass/pass-1.7.4.ebuild b/app-admin/pass/pass-1.7.4-r1.ebuild
index d1349cc29760..795de43f39b1 100644
--- a/app-admin/pass/pass-1.7.4.ebuild
+++ b/app-admin/pass/pass-1.7.4-r1.ebuild
@@ -8,11 +8,12 @@ inherit bash-completion-r1 elisp-common
 DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
 HOMEPAGE="https://www.passwordstore.org/"
 SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
+S="${WORKDIR}/password-store-${PV}"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-IUSE="+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+IUSE="+git wayland X emacs dmenu importers elibc_Darwin"
 
 RDEPEND="
 	app-crypt/gnupg
@@ -22,18 +23,15 @@ RDEPEND="
 	wayland? ( gui-apps/wl-clipboard )
 	X? ( x11-misc/xclip )
 	elibc_Darwin? ( app-misc/getopt )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	fish-completion? ( app-shells/fish )
 	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
 	emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 "
 
-S="${WORKDIR}/password-store-${PV}"
-
 src_prepare() {
 	default
 
 	use elibc_Darwin || return
+
 	# use coreutils'
 	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
 	# host getopt isn't cool, and we aren't brew (rip out brew reference)
@@ -52,13 +50,16 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		BASHCOMPDIR="$(get_bashcompdir)" \
 		WITH_BASHCOMP=yes \
-		WITH_ZSHCOMP=$(usex zsh-completion) \
-		WITH_FISHCOMP=$(usex fish-completion)
+		WITH_ZSHCOMP=yes \
+		WITH_FISHCOMP=yes
+
 	use dmenu && dobin contrib/dmenu/passmenu
+
 	if use emacs; then
 		elisp-install ${PN} contrib/emacs/*.{el,elc}
 		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
 	fi
+
 	if use importers; then
 		exeinto /usr/share/${PN}/importers
 		doexe contrib/importers/*
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index a6ee842f8175..b0b05e8dda99 100644
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-9999.ebuild
@@ -10,16 +10,16 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 	S="${WORKDIR}/password-store-${PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
 HOMEPAGE="https://www.passwordstore.org/"
 
-SLOT="0"
 LICENSE="GPL-2"
-IUSE="+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+SLOT="0"
+IUSE="+git wayland X emacs dmenu importers elibc_Darwin"
 
 RDEPEND="
 	app-crypt/gnupg
@@ -29,8 +29,6 @@ RDEPEND="
 	wayland? ( gui-apps/wl-clipboard )
 	X? ( x11-misc/xclip )
 	elibc_Darwin? ( app-misc/getopt )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	fish-completion? ( app-shells/fish )
 	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
 	emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 "
@@ -57,13 +55,16 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		BASHCOMPDIR="$(get_bashcompdir)" \
 		WITH_BASHCOMP=yes \
-		WITH_ZSHCOMP=$(usex zsh-completion) \
-		WITH_FISHCOMP=$(usex fish-completion)
+		WITH_ZSHCOMP=yes \
+		WITH_FISHCOMP=yes
+
 	use dmenu && dobin contrib/dmenu/passmenu
+
 	if use emacs; then
 		elisp-install ${PN} contrib/emacs/*.{el,elc}
 		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
 	fi
+
 	if use importers; then
 		exeinto /usr/share/${PN}/importers
 		doexe contrib/importers/*