Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/electrum/
Date: Tue, 09 Jan 2018 02:04:11
Message-Id: 1515449001.3eaf169929f721a64dfbbde0a4e58730cacfa6c5.ulm@gentoo
1 commit: 3eaf169929f721a64dfbbde0a4e58730cacfa6c5
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 8 22:02:45 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 8 22:03:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eaf1699
7
8 net-misc/electrum: Migrate from LINGUAS to L10N.
9
10 Map all language_TERRITORRY codes (except pt_* and zh_*) to their
11 generic language equivalents. Add codes fa_IR, uk_UA, and zh_TW to
12 those ebuilds that were missing them.
13
14 Package-Manager: Portage-2.3.19, Repoman-2.3.6
15
16 net-misc/electrum/electrum-2.7.15.ebuild | 30 ++++++++++++++++++++----------
17 net-misc/electrum/electrum-2.8.0-r1.ebuild | 30 ++++++++++++++++++++----------
18 net-misc/electrum/electrum-2.8.2.ebuild | 30 ++++++++++++++++++++----------
19 net-misc/electrum/electrum-2.8.3.ebuild | 30 ++++++++++++++++++++----------
20 net-misc/electrum/electrum-2.9.3.ebuild | 30 ++++++++++++++++++++----------
21 net-misc/electrum/electrum-3.0.3.ebuild | 30 ++++++++++++++++++++----------
22 6 files changed, 120 insertions(+), 60 deletions(-)
23
24 diff --git a/net-misc/electrum/electrum-2.7.15.ebuild b/net-misc/electrum/electrum-2.7.15.ebuild
25 index 536d54d9c39..ef6c1839e59 100644
26 --- a/net-misc/electrum/electrum-2.7.15.ebuild
27 +++ b/net-misc/electrum/electrum-2.7.15.ebuild
28 @@ -1,4 +1,4 @@
29 -# Copyright 1999-2017 Gentoo Foundation
30 +# Copyright 1999-2018 Gentoo Foundation
31 # Distributed under the terms of the GNU General Public License v2
32
33 EAPI="5"
34 @@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
35 LICENSE="MIT"
36 SLOT="0"
37 KEYWORDS="amd64 x86"
38 -LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
39 +MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
40 +
41 +my_langs_to_l10n() {
42 + # Map all except pt_* and zh_* to their generic codes
43 + case $1 in
44 + pt_*|zh_*) echo ${1/_/-} ;;
45 + *) echo ${1%%_*} ;;
46 + esac
47 +}
48
49 IUSE="cli cosign email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
50
51 -for lingua in ${LINGUAS}; do
52 - IUSE+=" linguas_${lingua}"
53 +for lang in ${MY_LANGS}; do
54 + IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
55 done
56 +unset lang
57
58 REQUIRED_USE="
59 || ( cli ncurses qt4 )
60 @@ -72,17 +81,18 @@ src_prepare() {
61 sed -i '/icons/d' setup.py || die
62
63 # Remove unrequested localization files:
64 - for lang in ${LINGUAS}; do
65 - use "linguas_${lang}" && continue
66 + local lang
67 + for lang in ${MY_LANGS}; do
68 + use l10n_$(my_langs_to_l10n ${lang}) && continue
69 rm -r "lib/locale/${lang}" || die
70 done
71
72 local wordlist=
73 for wordlist in \
74 - $(usex linguas_ja_JP '' japanese) \
75 - $(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
76 - $(usex linguas_es_ES '' spanish) \
77 - $(usex linguas_zh_CN '' chinese_simplified) \
78 + $(usex l10n_ja '' japanese) \
79 + $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
80 + $(usex l10n_es '' spanish) \
81 + $(usex l10n_zh-CN '' chinese_simplified) \
82 ; do
83 rm -f "lib/wordlist/${wordlist}.txt" || die
84 sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
85
86 diff --git a/net-misc/electrum/electrum-2.8.0-r1.ebuild b/net-misc/electrum/electrum-2.8.0-r1.ebuild
87 index b0058483217..85efdde7134 100644
88 --- a/net-misc/electrum/electrum-2.8.0-r1.ebuild
89 +++ b/net-misc/electrum/electrum-2.8.0-r1.ebuild
90 @@ -1,4 +1,4 @@
91 -# Copyright 1999-2017 Gentoo Foundation
92 +# Copyright 1999-2018 Gentoo Foundation
93 # Distributed under the terms of the GNU General Public License v2
94
95 EAPI="6"
96 @@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
97 LICENSE="MIT"
98 SLOT="0"
99 KEYWORDS="~amd64 ~x86"
100 -LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
101 +MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
102 +
103 +my_langs_to_l10n() {
104 + # Map all except pt_* and zh_* to their generic codes
105 + case $1 in
106 + pt_*|zh_*) echo ${1/_/-} ;;
107 + *) echo ${1%%_*} ;;
108 + esac
109 +}
110
111 IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
112
113 -for lingua in ${LINGUAS}; do
114 - IUSE+=" linguas_${lingua}"
115 +for lang in ${MY_LANGS}; do
116 + IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
117 done
118 +unset lang
119
120 REQUIRED_USE="
121 || ( cli ncurses qt4 )
122 @@ -74,17 +83,18 @@ src_prepare() {
123 sed -i '/icons/d' setup.py || die
124
125 # Remove unrequested localization files:
126 - for lang in ${LINGUAS}; do
127 - use "linguas_${lang}" && continue
128 + local lang
129 + for lang in ${MY_LANGS}; do
130 + use l10n_$(my_langs_to_l10n ${lang}) && continue
131 rm -r "lib/locale/${lang}" || die
132 done
133
134 local wordlist=
135 for wordlist in \
136 - $(usex linguas_ja_JP '' japanese) \
137 - $(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
138 - $(usex linguas_es_ES '' spanish) \
139 - $(usex linguas_zh_CN '' chinese_simplified) \
140 + $(usex l10n_ja '' japanese) \
141 + $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
142 + $(usex l10n_es '' spanish) \
143 + $(usex l10n_zh-CN '' chinese_simplified) \
144 ; do
145 rm -f "lib/wordlist/${wordlist}.txt" || die
146 sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
147
148 diff --git a/net-misc/electrum/electrum-2.8.2.ebuild b/net-misc/electrum/electrum-2.8.2.ebuild
149 index 82aa0e5d8a4..01a96e470f0 100644
150 --- a/net-misc/electrum/electrum-2.8.2.ebuild
151 +++ b/net-misc/electrum/electrum-2.8.2.ebuild
152 @@ -1,4 +1,4 @@
153 -# Copyright 1999-2017 Gentoo Foundation
154 +# Copyright 1999-2018 Gentoo Foundation
155 # Distributed under the terms of the GNU General Public License v2
156
157 EAPI="6"
158 @@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
159 LICENSE="MIT"
160 SLOT="0"
161 KEYWORDS="~amd64 ~x86"
162 -LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
163 +MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN zh_TW"
164 +
165 +my_langs_to_l10n() {
166 + # Map all except pt_* and zh_* to their generic codes
167 + case $1 in
168 + pt_*|zh_*) echo ${1/_/-} ;;
169 + *) echo ${1%%_*} ;;
170 + esac
171 +}
172
173 IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
174
175 -for lingua in ${LINGUAS}; do
176 - IUSE+=" linguas_${lingua}"
177 +for lang in ${MY_LANGS}; do
178 + IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
179 done
180 +unset lang
181
182 REQUIRED_USE="
183 || ( cli ncurses qt4 )
184 @@ -74,17 +83,18 @@ src_prepare() {
185 sed -i '/icons/d' setup.py || die
186
187 # Remove unrequested localization files:
188 - for lang in ${LINGUAS}; do
189 - use "linguas_${lang}" && continue
190 + local lang
191 + for lang in ${MY_LANGS}; do
192 + use l10n_$(my_langs_to_l10n ${lang}) && continue
193 rm -r "lib/locale/${lang}" || die
194 done
195
196 local wordlist=
197 for wordlist in \
198 - $(usex linguas_ja_JP '' japanese) \
199 - $(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
200 - $(usex linguas_es_ES '' spanish) \
201 - $(usex linguas_zh_CN '' chinese_simplified) \
202 + $(usex l10n_ja '' japanese) \
203 + $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
204 + $(usex l10n_es '' spanish) \
205 + $(usex l10n_zh-CN '' chinese_simplified) \
206 ; do
207 rm -f "lib/wordlist/${wordlist}.txt" || die
208 sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
209
210 diff --git a/net-misc/electrum/electrum-2.8.3.ebuild b/net-misc/electrum/electrum-2.8.3.ebuild
211 index 82aa0e5d8a4..312903f737a 100644
212 --- a/net-misc/electrum/electrum-2.8.3.ebuild
213 +++ b/net-misc/electrum/electrum-2.8.3.ebuild
214 @@ -1,4 +1,4 @@
215 -# Copyright 1999-2017 Gentoo Foundation
216 +# Copyright 1999-2018 Gentoo Foundation
217 # Distributed under the terms of the GNU General Public License v2
218
219 EAPI="6"
220 @@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
221 LICENSE="MIT"
222 SLOT="0"
223 KEYWORDS="~amd64 ~x86"
224 -LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
225 +MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
226 +
227 +my_langs_to_l10n() {
228 + # Map all except pt_* and zh_* to their generic codes
229 + case $1 in
230 + pt_*|zh_*) echo ${1/_/-} ;;
231 + *) echo ${1%%_*} ;;
232 + esac
233 +}
234
235 IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
236
237 -for lingua in ${LINGUAS}; do
238 - IUSE+=" linguas_${lingua}"
239 +for lang in ${MY_LANGS}; do
240 + IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
241 done
242 +unset lang
243
244 REQUIRED_USE="
245 || ( cli ncurses qt4 )
246 @@ -74,17 +83,18 @@ src_prepare() {
247 sed -i '/icons/d' setup.py || die
248
249 # Remove unrequested localization files:
250 - for lang in ${LINGUAS}; do
251 - use "linguas_${lang}" && continue
252 + local lang
253 + for lang in ${MY_LANGS}; do
254 + use l10n_$(my_langs_to_l10n ${lang}) && continue
255 rm -r "lib/locale/${lang}" || die
256 done
257
258 local wordlist=
259 for wordlist in \
260 - $(usex linguas_ja_JP '' japanese) \
261 - $(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
262 - $(usex linguas_es_ES '' spanish) \
263 - $(usex linguas_zh_CN '' chinese_simplified) \
264 + $(usex l10n_ja '' japanese) \
265 + $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
266 + $(usex l10n_es '' spanish) \
267 + $(usex l10n_zh-CN '' chinese_simplified) \
268 ; do
269 rm -f "lib/wordlist/${wordlist}.txt" || die
270 sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
271
272 diff --git a/net-misc/electrum/electrum-2.9.3.ebuild b/net-misc/electrum/electrum-2.9.3.ebuild
273 index 82aa0e5d8a4..312903f737a 100644
274 --- a/net-misc/electrum/electrum-2.9.3.ebuild
275 +++ b/net-misc/electrum/electrum-2.9.3.ebuild
276 @@ -1,4 +1,4 @@
277 -# Copyright 1999-2017 Gentoo Foundation
278 +# Copyright 1999-2018 Gentoo Foundation
279 # Distributed under the terms of the GNU General Public License v2
280
281 EAPI="6"
282 @@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
283 LICENSE="MIT"
284 SLOT="0"
285 KEYWORDS="~amd64 ~x86"
286 -LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
287 +MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
288 +
289 +my_langs_to_l10n() {
290 + # Map all except pt_* and zh_* to their generic codes
291 + case $1 in
292 + pt_*|zh_*) echo ${1/_/-} ;;
293 + *) echo ${1%%_*} ;;
294 + esac
295 +}
296
297 IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
298
299 -for lingua in ${LINGUAS}; do
300 - IUSE+=" linguas_${lingua}"
301 +for lang in ${MY_LANGS}; do
302 + IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
303 done
304 +unset lang
305
306 REQUIRED_USE="
307 || ( cli ncurses qt4 )
308 @@ -74,17 +83,18 @@ src_prepare() {
309 sed -i '/icons/d' setup.py || die
310
311 # Remove unrequested localization files:
312 - for lang in ${LINGUAS}; do
313 - use "linguas_${lang}" && continue
314 + local lang
315 + for lang in ${MY_LANGS}; do
316 + use l10n_$(my_langs_to_l10n ${lang}) && continue
317 rm -r "lib/locale/${lang}" || die
318 done
319
320 local wordlist=
321 for wordlist in \
322 - $(usex linguas_ja_JP '' japanese) \
323 - $(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
324 - $(usex linguas_es_ES '' spanish) \
325 - $(usex linguas_zh_CN '' chinese_simplified) \
326 + $(usex l10n_ja '' japanese) \
327 + $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
328 + $(usex l10n_es '' spanish) \
329 + $(usex l10n_zh-CN '' chinese_simplified) \
330 ; do
331 rm -f "lib/wordlist/${wordlist}.txt" || die
332 sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
333
334 diff --git a/net-misc/electrum/electrum-3.0.3.ebuild b/net-misc/electrum/electrum-3.0.3.ebuild
335 index aca1ddb7cae..2b62832e8ba 100644
336 --- a/net-misc/electrum/electrum-3.0.3.ebuild
337 +++ b/net-misc/electrum/electrum-3.0.3.ebuild
338 @@ -1,4 +1,4 @@
339 -# Copyright 1999-2017 Gentoo Foundation
340 +# Copyright 1999-2018 Gentoo Foundation
341 # Distributed under the terms of the GNU General Public License v2
342
343 EAPI="6"
344 @@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
345 LICENSE="MIT"
346 SLOT="0"
347 KEYWORDS="~amd64 ~x86"
348 -LINGUAS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
349 +MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
350 +
351 +my_langs_to_l10n() {
352 + # Map all except pt_* and zh_* to their generic codes
353 + case $1 in
354 + pt_*|zh_*) echo ${1/_/-} ;;
355 + *) echo ${1%%_*} ;;
356 + esac
357 +}
358
359 IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
360
361 -for lingua in ${LINGUAS}; do
362 - IUSE+=" linguas_${lingua}"
363 +for lang in ${MY_LANGS}; do
364 + IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
365 done
366 +unset lang
367
368 REQUIRED_USE="
369 || ( cli ncurses qt5 )
370 @@ -71,17 +80,18 @@ src_prepare() {
371 sed -i '/icons/d' setup.py || die
372
373 # Remove unrequested localization files:
374 - for lang in ${LINGUAS}; do
375 - use "linguas_${lang}" && continue
376 + local lang
377 + for lang in ${MY_LANGS}; do
378 + use l10n_$(my_langs_to_l10n ${lang}) && continue
379 rm -r "lib/locale/${lang}" || die
380 done
381
382 local wordlist=
383 for wordlist in \
384 - $(usex linguas_ja_JP '' japanese) \
385 - $(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
386 - $(usex linguas_es_ES '' spanish) \
387 - $(usex linguas_zh_CN '' chinese_simplified) \
388 + $(usex l10n_ja '' japanese) \
389 + $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
390 + $(usex l10n_es '' spanish) \
391 + $(usex l10n_zh-CN '' chinese_simplified) \
392 ; do
393 rm -f "lib/wordlist/${wordlist}.txt" || die
394 sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die