1 |
commit: cca5e801c584f5a50a60d8c86ebe72feb35cad9f |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 25 03:04:08 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 31 00:16:43 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cca5e801 |
7 |
|
8 |
app-misc/khard: [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 |
...{khard-0.13.0.ebuild => khard-0.13.0-r1.ebuild} | 26 +++++++++------------- |
18 |
...{khard-0.17.0.ebuild => khard-0.17.0-r1.ebuild} | 25 ++++++++++----------- |
19 |
2 files changed, 23 insertions(+), 28 deletions(-) |
20 |
|
21 |
diff --git a/app-misc/khard/khard-0.13.0.ebuild b/app-misc/khard/khard-0.13.0-r1.ebuild |
22 |
similarity index 83% |
23 |
rename from app-misc/khard/khard-0.13.0.ebuild |
24 |
rename to app-misc/khard/khard-0.13.0-r1.ebuild |
25 |
index 7b7ff564f1b..06a157e5b7f 100644 |
26 |
--- a/app-misc/khard/khard-0.13.0.ebuild |
27 |
+++ b/app-misc/khard/khard-0.13.0-r1.ebuild |
28 |
@@ -1,20 +1,18 @@ |
29 |
-# Copyright 1999-2020 Gentoo Authors |
30 |
+# Copyright 1999-2021 Gentoo Authors |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
|
33 |
EAPI=7 |
34 |
|
35 |
-PYTHON_COMPAT=( python3_{7,8} ) |
36 |
- |
37 |
+PYTHON_COMPAT=( python3_8 ) |
38 |
DISTUTILS_USE_SETUPTOOLS=rdepend |
39 |
- |
40 |
inherit distutils-r1 |
41 |
|
42 |
DESCRIPTION="Console CardDAV client" |
43 |
HOMEPAGE="https://github.com/scheibler/khard" |
44 |
-LICENSE="GPL-3" |
45 |
|
46 |
+LICENSE="GPL-3" |
47 |
SLOT="0" |
48 |
-IUSE="test zsh-completion" |
49 |
+IUSE="test" |
50 |
RESTRICT="!test? ( test )" |
51 |
|
52 |
if [ "${PV}" == "9999" ]; then |
53 |
@@ -32,7 +30,7 @@ RDEPEND=" |
54 |
dev-python/unidecode[${PYTHON_USEDEP}] |
55 |
>dev-python/vobject-0.9.3[${PYTHON_USEDEP}] |
56 |
" |
57 |
-DEPEND=" |
58 |
+BDEPEND=" |
59 |
dev-python/setuptools[${PYTHON_USEDEP}] |
60 |
test? ( |
61 |
${RDEPEND} |
62 |
@@ -44,15 +42,13 @@ DEPEND=" |
63 |
|
64 |
DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example ) |
65 |
|
66 |
+python_test() { |
67 |
+ esetup.py test |
68 |
+} |
69 |
+ |
70 |
src_install() { |
71 |
distutils-r1_src_install |
72 |
|
73 |
- if use zsh-completion; then |
74 |
- insinto /usr/share/zsh/site-functions |
75 |
- doins misc/zsh/_khard |
76 |
- fi |
77 |
-} |
78 |
- |
79 |
-python_test() { |
80 |
- esetup.py test |
81 |
+ insinto /usr/share/zsh/site-functions |
82 |
+ doins misc/zsh/_khard |
83 |
} |
84 |
|
85 |
diff --git a/app-misc/khard/khard-0.17.0.ebuild b/app-misc/khard/khard-0.17.0-r1.ebuild |
86 |
similarity index 83% |
87 |
rename from app-misc/khard/khard-0.17.0.ebuild |
88 |
rename to app-misc/khard/khard-0.17.0-r1.ebuild |
89 |
index 3d491af83fd..79c4e3cd1a7 100644 |
90 |
--- a/app-misc/khard/khard-0.17.0.ebuild |
91 |
+++ b/app-misc/khard/khard-0.17.0-r1.ebuild |
92 |
@@ -1,17 +1,18 @@ |
93 |
-# Copyright 1999-2020 Gentoo Authors |
94 |
+# Copyright 1999-2021 Gentoo Authors |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
|
97 |
EAPI=7 |
98 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
99 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
100 |
|
101 |
+PYTHON_COMPAT=( python3_{8,9} ) |
102 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
103 |
inherit distutils-r1 |
104 |
|
105 |
DESCRIPTION="Console CardDAV client" |
106 |
HOMEPAGE="https://github.com/scheibler/khard" |
107 |
+ |
108 |
LICENSE="GPL-3" |
109 |
SLOT="0" |
110 |
-IUSE="test zsh-completion" |
111 |
+IUSE="test" |
112 |
RESTRICT="!test? ( test )" |
113 |
|
114 |
if [[ "${PV}" == *9999 ]]; then |
115 |
@@ -30,7 +31,7 @@ RDEPEND=" |
116 |
dev-python/unidecode[${PYTHON_USEDEP}] |
117 |
dev-python/vobject[${PYTHON_USEDEP}] |
118 |
" |
119 |
-DEPEND=" |
120 |
+BDEPEND=" |
121 |
dev-python/setuptools[${PYTHON_USEDEP}] |
122 |
test? ( |
123 |
${RDEPEND} |
124 |
@@ -40,15 +41,13 @@ DEPEND=" |
125 |
|
126 |
DOCS=( CHANGES CONTRIBUTING.rst README.md doc/source/examples/khard.conf.example ) |
127 |
|
128 |
+python_test() { |
129 |
+ esetup.py test |
130 |
+} |
131 |
+ |
132 |
src_install() { |
133 |
distutils-r1_src_install |
134 |
|
135 |
- if use zsh-completion; then |
136 |
- insinto /usr/share/zsh/site-functions |
137 |
- doins misc/zsh/_khard |
138 |
- fi |
139 |
-} |
140 |
- |
141 |
-python_test() { |
142 |
- esetup.py test |
143 |
+ insinto /usr/share/zsh/site-functions |
144 |
+ doins misc/zsh/_khard |
145 |
} |