1 |
commit: a0508b6bad045c67be5c8a0ce7fed393bb199c43 |
2 |
Author: Oleksandr Trotsenko <oleksandr.trotsenko <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Nov 23 02:51:18 2018 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 9 19:58:30 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0508b6b |
7 |
|
8 |
sys-auth/authenticator: 0.2.4 version bump, support Python 3.7 |
9 |
|
10 |
Introduce support for Python 3.7 and bump to the latest available version. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/663162 |
13 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
14 |
Signed-off-by: Oleksandr Trotsenko <oleksandr.trotsenko <AT> gmail.com> |
15 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
16 |
|
17 |
sys-auth/authenticator/Manifest | 1 + |
18 |
sys-auth/authenticator/authenticator-0.2.4.ebuild | 70 ++++++++++++++++++++++ |
19 |
sys-auth/authenticator/authenticator-9999.ebuild | 41 ++++++++----- |
20 |
...authenticator-0.2.4-disable-failing-tests.patch | 16 +++++ |
21 |
...or-0.2.4-support-use-of-gdlib-from-system.patch | 23 +++++++ |
22 |
sys-auth/authenticator/metadata.xml | 3 +- |
23 |
6 files changed, 137 insertions(+), 17 deletions(-) |
24 |
|
25 |
diff --git a/sys-auth/authenticator/Manifest b/sys-auth/authenticator/Manifest |
26 |
index 2029d165c90..2009e70cf69 100644 |
27 |
--- a/sys-auth/authenticator/Manifest |
28 |
+++ b/sys-auth/authenticator/Manifest |
29 |
@@ -1 +1,2 @@ |
30 |
DIST authenticator-0.2.1.tar.gz 147693 BLAKE2B b9f3a7fd5b3b7867120b9ed17b90cea4c07a271dc4d75a845ad539e15453a606d48e8637d44d12cecf9b91e5fb351d081c1add48c1a4a955444f39addd51b075 SHA512 aebf3ce147d5ccd404de6af52e130e9a85a3d5d86140d73026dac00219853652e7aa1e67db5838f9ac4d147021cd07b3ebfb86a1ab4b413ec3b98360097d1d6e |
31 |
+DIST authenticator-0.2.4.tar.gz 142444 BLAKE2B 2df1462452d5aaead51af111359120c8a464058730129fd984dd568c709c58f6940a34b996d3b5435b78bd87b433a29735d3fd8e9629b512915720063b49b1a1 SHA512 16b942d24a1136350f78de92a287dcc6b52e9347cd0b73e8310b87c6c24b7075aebe909fe20d80532f7fa1b54d332b8b62fd2fc7d26ce15888fd47bb686520e2 |
32 |
|
33 |
diff --git a/sys-auth/authenticator/authenticator-0.2.4.ebuild b/sys-auth/authenticator/authenticator-0.2.4.ebuild |
34 |
new file mode 100644 |
35 |
index 00000000000..f3d4d2cdf2b |
36 |
--- /dev/null |
37 |
+++ b/sys-auth/authenticator/authenticator-0.2.4.ebuild |
38 |
@@ -0,0 +1,70 @@ |
39 |
+# Copyright 1999-2018 Gentoo Authors |
40 |
+# Distributed under the terms of the GNU General Public License v2 |
41 |
+ |
42 |
+EAPI=6 |
43 |
+ |
44 |
+PYTHON_COMPAT=( python3_{5,6,7} ) |
45 |
+inherit gnome2-utils meson python-single-r1 virtualx xdg-utils |
46 |
+ |
47 |
+DESCRIPTION="Two-factor authentication code generator for GNOME" |
48 |
+HOMEPAGE="https://gitlab.gnome.org/World/Authenticator" |
49 |
+ |
50 |
+if [[ ${PV} == *9999 ]]; then |
51 |
+ inherit git-r3 |
52 |
+ SRC_URI="" |
53 |
+ EGIT_REPO_URI="${HOMEPAGE}" |
54 |
+else |
55 |
+ SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz" |
56 |
+ S="${WORKDIR}/Authenticator-${PV}" |
57 |
+ KEYWORDS="~amd64 ~x86" |
58 |
+fi |
59 |
+ |
60 |
+LICENSE="GPL-2+" |
61 |
+SLOT="0" |
62 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
63 |
+IUSE="test" |
64 |
+RDEPEND=" |
65 |
+ ${PYTHON_DEPS} |
66 |
+ app-crypt/libsecret |
67 |
+ dev-python/pillow[${PYTHON_USEDEP}] |
68 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
69 |
+ dev-python/pyotp[${PYTHON_USEDEP}] |
70 |
+ dev-python/python-gnupg[${PYTHON_USEDEP}] |
71 |
+ dev-python/pyzbar[${PYTHON_USEDEP}] |
72 |
+ media-libs/gd |
73 |
+ x11-libs/gtk+:3 |
74 |
+" |
75 |
+DEPEND="${RDEPEND} |
76 |
+ test? ( x11-apps/xhost )" |
77 |
+PATCHES=( |
78 |
+ "${FILESDIR}/${P}-disable-failing-tests.patch" |
79 |
+ "${FILESDIR}/${P}-support-use-of-gdlib-from-system.patch" |
80 |
+) |
81 |
+ |
82 |
+src_prepare() { |
83 |
+ default |
84 |
+ |
85 |
+ sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang." |
86 |
+ |
87 |
+ rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder." |
88 |
+} |
89 |
+ |
90 |
+pkg_preinst() { |
91 |
+ gnome2_icon_savelist |
92 |
+ gnome2_schemas_savelist |
93 |
+} |
94 |
+ |
95 |
+src_test() { |
96 |
+ xdg_environment_reset |
97 |
+ virtx meson_src_test |
98 |
+} |
99 |
+ |
100 |
+pkg_postinst() { |
101 |
+ gnome2_icon_cache_update |
102 |
+ gnome2_schemas_update |
103 |
+} |
104 |
+ |
105 |
+pkg_postrm() { |
106 |
+ gnome2_icon_cache_update |
107 |
+ gnome2_schemas_update |
108 |
+} |
109 |
|
110 |
diff --git a/sys-auth/authenticator/authenticator-9999.ebuild b/sys-auth/authenticator/authenticator-9999.ebuild |
111 |
index f11556202d2..5d876f94594 100644 |
112 |
--- a/sys-auth/authenticator/authenticator-9999.ebuild |
113 |
+++ b/sys-auth/authenticator/authenticator-9999.ebuild |
114 |
@@ -1,44 +1,60 @@ |
115 |
-# Copyright 1999-2018 Gentoo Foundation |
116 |
+# Copyright 1999-2018 Gentoo Authors |
117 |
# Distributed under the terms of the GNU General Public License v2 |
118 |
|
119 |
EAPI=6 |
120 |
|
121 |
-PYTHON_COMPAT=( python3_{5,6} ) |
122 |
-inherit gnome2-utils meson python-r1 virtualx xdg-utils |
123 |
+PYTHON_COMPAT=( python3_{5,6,7} ) |
124 |
+inherit gnome2-utils meson python-single-r1 virtualx xdg-utils |
125 |
|
126 |
DESCRIPTION="Two-factor authentication code generator for GNOME" |
127 |
-HOMEPAGE="https://github.com/bilelmoussaoui/Authenticator" |
128 |
+HOMEPAGE="https://gitlab.gnome.org/World/Authenticator" |
129 |
|
130 |
if [[ ${PV} == *9999 ]]; then |
131 |
inherit git-r3 |
132 |
SRC_URI="" |
133 |
EGIT_REPO_URI="${HOMEPAGE}" |
134 |
else |
135 |
- SRC_URI="https://github.com/bilelmoussaoui/Authenticator/archive/${PV}.tar.gz -> ${P}.tar.gz" |
136 |
+ SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz" |
137 |
S="${WORKDIR}/Authenticator-${PV}" |
138 |
KEYWORDS="~amd64 ~x86" |
139 |
fi |
140 |
|
141 |
LICENSE="GPL-2+" |
142 |
SLOT="0" |
143 |
- |
144 |
-DEPEND=" |
145 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
146 |
+IUSE="test" |
147 |
+RDEPEND=" |
148 |
+ ${PYTHON_DEPS} |
149 |
app-crypt/libsecret |
150 |
dev-python/pillow[${PYTHON_USEDEP}] |
151 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
152 |
dev-python/pyotp[${PYTHON_USEDEP}] |
153 |
+ dev-python/python-gnupg[${PYTHON_USEDEP}] |
154 |
dev-python/pyzbar[${PYTHON_USEDEP}] |
155 |
- media-gfx/gnome-screenshot |
156 |
+ media-libs/gd |
157 |
x11-libs/gtk+:3 |
158 |
" |
159 |
-RDEPEND="${DEPEND}" |
160 |
+DEPEND="${RDEPEND} |
161 |
+ test? ( x11-apps/xhost )" |
162 |
+ |
163 |
+src_prepare() { |
164 |
+ default |
165 |
|
166 |
-PATCHES=( "${FILESDIR}/disable-failing-tests.patch" ) |
167 |
+ sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang." |
168 |
+ |
169 |
+ rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder." |
170 |
+} |
171 |
|
172 |
pkg_preinst() { |
173 |
gnome2_icon_savelist |
174 |
gnome2_schemas_savelist |
175 |
} |
176 |
|
177 |
+src_test() { |
178 |
+ xdg_environment_reset |
179 |
+ virtx meson_src_test |
180 |
+} |
181 |
+ |
182 |
pkg_postinst() { |
183 |
gnome2_icon_cache_update |
184 |
gnome2_schemas_update |
185 |
@@ -48,8 +64,3 @@ pkg_postrm() { |
186 |
gnome2_icon_cache_update |
187 |
gnome2_schemas_update |
188 |
} |
189 |
- |
190 |
-src_test() { |
191 |
- xdg_environment_reset |
192 |
- virtx meson_src_test |
193 |
-} |
194 |
|
195 |
diff --git a/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch b/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch |
196 |
new file mode 100644 |
197 |
index 00000000000..38b4b95464a |
198 |
--- /dev/null |
199 |
+++ b/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch |
200 |
@@ -0,0 +1,16 @@ |
201 |
+diff --git a/data/meson.build b/data/meson.build |
202 |
+index b646c11..884c5d0 100644 |
203 |
+--- a/data/meson.build |
204 |
++++ b/data/meson.build |
205 |
+@@ -50,10 +50,3 @@ endif |
206 |
+ |
207 |
+ appstreamcli = find_program('appstream-util', required:false) |
208 |
+ |
209 |
+-if appstreamcli.found() |
210 |
+- test ( |
211 |
+- 'Validate appdata file', |
212 |
+- appstreamcli, |
213 |
+- args: ['validate-relax', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')] |
214 |
+- ) |
215 |
+-endif |
216 |
+ |
217 |
|
218 |
diff --git a/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch b/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch |
219 |
new file mode 100644 |
220 |
index 00000000000..ffbde3cf2f0 |
221 |
--- /dev/null |
222 |
+++ b/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch |
223 |
@@ -0,0 +1,23 @@ |
224 |
+diff --git a/meson.build b/meson.build |
225 |
+index ed9c48e..6b20bf0 100644 |
226 |
+--- a/meson.build |
227 |
++++ b/meson.build |
228 |
+@@ -35,16 +35,7 @@ SERVICES_DIR = join_paths(get_option('datadir'), 'dbus-1', 'services') |
229 |
+ SEARCH_PROVIDER_DIR = join_paths(get_option('datadir'), 'gnome-shell', 'search-providers') |
230 |
+ LIBEXEC_DIR = join_paths(get_option('prefix'), get_option('libexecdir')) |
231 |
+ |
232 |
+-subproject('libgd', |
233 |
+- default_options: [ |
234 |
+- 'with-introspection=true', |
235 |
+- 'with-notification=true', |
236 |
+- 'static=false', |
237 |
+- 'pkgdatadir=' + DATA_DIR, |
238 |
+- 'pkglibdir=' + LIB_DIR |
239 |
+- ] |
240 |
+-) |
241 |
+- |
242 |
++libgd_dep = dependency('gdlib', required : true) |
243 |
+ |
244 |
+ |
245 |
+ # Configuration params |
246 |
+ |
247 |
|
248 |
diff --git a/sys-auth/authenticator/metadata.xml b/sys-auth/authenticator/metadata.xml |
249 |
index 3950af1a335..e1df662ac76 100644 |
250 |
--- a/sys-auth/authenticator/metadata.xml |
251 |
+++ b/sys-auth/authenticator/metadata.xml |
252 |
@@ -10,10 +10,9 @@ |
253 |
<name>Proxy Maintainers</name> |
254 |
</maintainer> |
255 |
<upstream> |
256 |
- <remote-id type="github">bilelmoussaoui/Authenticator</remote-id> |
257 |
<maintainer> |
258 |
<name>Bilal Elmoussaoui</name> |
259 |
</maintainer> |
260 |
- <bugs-to>https://github.com/bilelmoussaoui/Authenticator/issues</bugs-to> |
261 |
+ <bugs-to>https://gitlab.gnome.org/World/Authenticator/issues</bugs-to> |
262 |
</upstream> |
263 |
</pkgmetadata> |