1 |
commit: be8b011a1c388524a181128e74abc5b7c98d8585 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 25 03:04:14 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 31 00:17:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8b011a |
7 |
|
8 |
app-admin/pass: [QA] unconditionally install completion files |
9 |
|
10 |
QA policy [0] says that we don't conditionalise installation of |
11 |
small files. It's a wasteful rebuild and inconsistent across packages |
12 |
for when users desire completions to be available. |
13 |
|
14 |
[0] https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0301 |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
app-admin/pass/metadata.xml | 3 --- |
18 |
.../{pass-1.7.3.ebuild => pass-1.7.3-r1.ebuild} | 21 +++++++++++---------- |
19 |
.../{pass-1.7.4.ebuild => pass-1.7.4-r1.ebuild} | 17 +++++++++-------- |
20 |
app-admin/pass/pass-9999.ebuild | 15 ++++++++------- |
21 |
4 files changed, 28 insertions(+), 28 deletions(-) |
22 |
|
23 |
diff --git a/app-admin/pass/metadata.xml b/app-admin/pass/metadata.xml |
24 |
index 3e292a92eba..4d843ab7e68 100644 |
25 |
--- a/app-admin/pass/metadata.xml |
26 |
+++ b/app-admin/pass/metadata.xml |
27 |
@@ -12,9 +12,6 @@ |
28 |
<flag name="git"> |
29 |
Use <pkg>dev-vcs/git</pkg> for password revisions. |
30 |
</flag> |
31 |
- <flag name="fish-completion"> |
32 |
- Enable fish completion support. |
33 |
- </flag> |
34 |
<flag name="dmenu"> |
35 |
Add support for x11-misc/dmenu with the 'passmenu' program. |
36 |
</flag> |
37 |
|
38 |
diff --git a/app-admin/pass/pass-1.7.3.ebuild b/app-admin/pass/pass-1.7.3-r1.ebuild |
39 |
similarity index 87% |
40 |
rename from app-admin/pass/pass-1.7.3.ebuild |
41 |
rename to app-admin/pass/pass-1.7.3-r1.ebuild |
42 |
index ae678d292fa..e4c51b733fd 100644 |
43 |
--- a/app-admin/pass/pass-1.7.3.ebuild |
44 |
+++ b/app-admin/pass/pass-1.7.3-r1.ebuild |
45 |
@@ -1,18 +1,19 @@ |
46 |
# Copyright 1999-2021 Gentoo Authors |
47 |
# Distributed under the terms of the GNU General Public License v2 |
48 |
|
49 |
-EAPI=6 |
50 |
+EAPI=7 |
51 |
|
52 |
inherit bash-completion-r1 elisp-common |
53 |
|
54 |
DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely" |
55 |
HOMEPAGE="https://www.passwordstore.org/" |
56 |
SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz" |
57 |
+S="${WORKDIR}/password-store-${PV}" |
58 |
|
59 |
-SLOT="0" |
60 |
LICENSE="GPL-2" |
61 |
+SLOT="0" |
62 |
KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos" |
63 |
-IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin" |
64 |
+IUSE="+git X emacs dmenu importers elibc_Darwin" |
65 |
|
66 |
RDEPEND=" |
67 |
app-crypt/gnupg |
68 |
@@ -21,19 +22,16 @@ RDEPEND=" |
69 |
git? ( dev-vcs/git ) |
70 |
X? ( x11-misc/xclip ) |
71 |
elibc_Darwin? ( app-misc/getopt ) |
72 |
- zsh-completion? ( app-shells/gentoo-zsh-completions ) |
73 |
- fish-completion? ( app-shells/fish ) |
74 |
dmenu? ( x11-misc/dmenu x11-misc/xdotool ) |
75 |
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 ) |
76 |
" |
77 |
|
78 |
-S="${WORKDIR}/password-store-${PV}" |
79 |
- |
80 |
src_prepare() { |
81 |
default |
82 |
|
83 |
use elibc_Darwin || return |
84 |
- # use coreutils' |
85 |
+ |
86 |
+ # use coreutils |
87 |
sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die |
88 |
# host getopt isn't cool, and we aren't brew (rip out brew reference) |
89 |
sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die |
90 |
@@ -51,13 +49,16 @@ src_install() { |
91 |
PREFIX="${EPREFIX}/usr" \ |
92 |
BASHCOMPDIR="$(get_bashcompdir)" \ |
93 |
WITH_BASHCOMP=yes \ |
94 |
- WITH_ZSHCOMP=$(usex zsh-completion) \ |
95 |
- WITH_FISHCOMP=$(usex fish-completion) |
96 |
+ WITH_ZSHCOMP=yes \ |
97 |
+ WITH_FISHCOMP=yes |
98 |
+ |
99 |
use dmenu && dobin contrib/dmenu/passmenu |
100 |
+ |
101 |
if use emacs; then |
102 |
elisp-install ${PN} contrib/emacs/*.{el,elc} |
103 |
elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" |
104 |
fi |
105 |
+ |
106 |
if use importers; then |
107 |
exeinto /usr/share/${PN}/importers |
108 |
doexe contrib/importers/* |
109 |
|
110 |
diff --git a/app-admin/pass/pass-1.7.4.ebuild b/app-admin/pass/pass-1.7.4-r1.ebuild |
111 |
similarity index 88% |
112 |
rename from app-admin/pass/pass-1.7.4.ebuild |
113 |
rename to app-admin/pass/pass-1.7.4-r1.ebuild |
114 |
index d1349cc2976..795de43f39b 100644 |
115 |
--- a/app-admin/pass/pass-1.7.4.ebuild |
116 |
+++ b/app-admin/pass/pass-1.7.4-r1.ebuild |
117 |
@@ -8,11 +8,12 @@ inherit bash-completion-r1 elisp-common |
118 |
DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely" |
119 |
HOMEPAGE="https://www.passwordstore.org/" |
120 |
SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz" |
121 |
+S="${WORKDIR}/password-store-${PV}" |
122 |
|
123 |
-SLOT="0" |
124 |
LICENSE="GPL-2" |
125 |
+SLOT="0" |
126 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" |
127 |
-IUSE="+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin" |
128 |
+IUSE="+git wayland X emacs dmenu importers elibc_Darwin" |
129 |
|
130 |
RDEPEND=" |
131 |
app-crypt/gnupg |
132 |
@@ -22,18 +23,15 @@ RDEPEND=" |
133 |
wayland? ( gui-apps/wl-clipboard ) |
134 |
X? ( x11-misc/xclip ) |
135 |
elibc_Darwin? ( app-misc/getopt ) |
136 |
- zsh-completion? ( app-shells/gentoo-zsh-completions ) |
137 |
- fish-completion? ( app-shells/fish ) |
138 |
dmenu? ( x11-misc/dmenu x11-misc/xdotool ) |
139 |
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 ) |
140 |
" |
141 |
|
142 |
-S="${WORKDIR}/password-store-${PV}" |
143 |
- |
144 |
src_prepare() { |
145 |
default |
146 |
|
147 |
use elibc_Darwin || return |
148 |
+ |
149 |
# use coreutils' |
150 |
sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die |
151 |
# host getopt isn't cool, and we aren't brew (rip out brew reference) |
152 |
@@ -52,13 +50,16 @@ src_install() { |
153 |
PREFIX="${EPREFIX}/usr" \ |
154 |
BASHCOMPDIR="$(get_bashcompdir)" \ |
155 |
WITH_BASHCOMP=yes \ |
156 |
- WITH_ZSHCOMP=$(usex zsh-completion) \ |
157 |
- WITH_FISHCOMP=$(usex fish-completion) |
158 |
+ WITH_ZSHCOMP=yes \ |
159 |
+ WITH_FISHCOMP=yes |
160 |
+ |
161 |
use dmenu && dobin contrib/dmenu/passmenu |
162 |
+ |
163 |
if use emacs; then |
164 |
elisp-install ${PN} contrib/emacs/*.{el,elc} |
165 |
elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" |
166 |
fi |
167 |
+ |
168 |
if use importers; then |
169 |
exeinto /usr/share/${PN}/importers |
170 |
doexe contrib/importers/* |
171 |
|
172 |
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild |
173 |
index a6ee842f817..b0b05e8dda9 100644 |
174 |
--- a/app-admin/pass/pass-9999.ebuild |
175 |
+++ b/app-admin/pass/pass-9999.ebuild |
176 |
@@ -10,16 +10,16 @@ if [[ ${PV} = 9999* ]]; then |
177 |
inherit git-r3 |
178 |
else |
179 |
SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz" |
180 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" |
181 |
S="${WORKDIR}/password-store-${PV}" |
182 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" |
183 |
fi |
184 |
|
185 |
DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely" |
186 |
HOMEPAGE="https://www.passwordstore.org/" |
187 |
|
188 |
-SLOT="0" |
189 |
LICENSE="GPL-2" |
190 |
-IUSE="+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin" |
191 |
+SLOT="0" |
192 |
+IUSE="+git wayland X emacs dmenu importers elibc_Darwin" |
193 |
|
194 |
RDEPEND=" |
195 |
app-crypt/gnupg |
196 |
@@ -29,8 +29,6 @@ RDEPEND=" |
197 |
wayland? ( gui-apps/wl-clipboard ) |
198 |
X? ( x11-misc/xclip ) |
199 |
elibc_Darwin? ( app-misc/getopt ) |
200 |
- zsh-completion? ( app-shells/gentoo-zsh-completions ) |
201 |
- fish-completion? ( app-shells/fish ) |
202 |
dmenu? ( x11-misc/dmenu x11-misc/xdotool ) |
203 |
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 ) |
204 |
" |
205 |
@@ -57,13 +55,16 @@ src_install() { |
206 |
PREFIX="${EPREFIX}/usr" \ |
207 |
BASHCOMPDIR="$(get_bashcompdir)" \ |
208 |
WITH_BASHCOMP=yes \ |
209 |
- WITH_ZSHCOMP=$(usex zsh-completion) \ |
210 |
- WITH_FISHCOMP=$(usex fish-completion) |
211 |
+ WITH_ZSHCOMP=yes \ |
212 |
+ WITH_FISHCOMP=yes |
213 |
+ |
214 |
use dmenu && dobin contrib/dmenu/passmenu |
215 |
+ |
216 |
if use emacs; then |
217 |
elisp-install ${PN} contrib/emacs/*.{el,elc} |
218 |
elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" |
219 |
fi |
220 |
+ |
221 |
if use importers; then |
222 |
exeinto /usr/share/${PN}/importers |
223 |
doexe contrib/importers/* |