Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/gnucash-docs/
Date: Fri, 30 Aug 2019 17:50:26
Message-Id: 1567186697.20664dd65ec565233f460b94efc0337249b84550.mgorny@gentoo
1 commit: 20664dd65ec565233f460b94efc0337249b84550
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 30 17:38:17 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 30 17:38:17 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20664dd6
7
8 app-doc/gnucash-docs: Backport L10N updates to old versions
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 ...cs-3.2-r1.ebuild => gnucash-docs-3.2-r2.ebuild} | 33 +++++-----------------
13 ...-docs-3.3.ebuild => gnucash-docs-3.3-r1.ebuild} | 33 +++++-----------------
14 ...-docs-3.4.ebuild => gnucash-docs-3.4-r1.ebuild} | 31 ++++----------------
15 ...-docs-3.5.ebuild => gnucash-docs-3.5-r1.ebuild} | 31 ++++----------------
16 app-doc/gnucash-docs/metadata.xml | 3 --
17 5 files changed, 26 insertions(+), 105 deletions(-)
18
19 diff --git a/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.2-r2.ebuild
20 similarity index 67%
21 rename from app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild
22 rename to app-doc/gnucash-docs/gnucash-docs-3.2-r2.ebuild
23 index b82237e7a15..4582197df33 100644
24 --- a/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild
25 +++ b/app-doc/gnucash-docs/gnucash-docs-3.2-r2.ebuild
26 @@ -1,12 +1,9 @@
27 -# Copyright 1999-2018 Gentoo Authors
28 +# Copyright 1999-2019 Gentoo Authors
29 # Distributed under the terms of the GNU General Public License v2
30
31 EAPI=6
32
33 -PLOCALES="C de it ja pt ru"
34 -PLOCALE_BACKUP="C"
35 -
36 -inherit autotools gnome2 l10n
37 +inherit autotools gnome2
38
39 DESCRIPTION="Documentation package for GnuCash"
40 HOMEPAGE="http://www.gnucash.org/"
41 @@ -15,10 +12,8 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
42 SLOT="0"
43 LICENSE="GPL-2 FDL-1.1"
44 KEYWORDS="amd64 ~ppc ~ppc64 x86"
45 -
46 -for my_locale in ${PLOCALES}; do
47 - IUSE+=" l10n_${my_locale}"
48 -done
49 +LOCALES=( de it ja pt ru )
50 +IUSE="${LOCALES[*]/#/l10n_}"
51
52 DEPEND="
53 app-text/docbook-xml-dtd
54 @@ -28,18 +23,6 @@ DEPEND="
55 dev-libs/libxslt
56 "
57
58 -my_l10n_get_locales() {
59 - local l locales
60 - for l in ${PLOCALES[@]}; do
61 - use "l10n_${l}" && locales+=( $l )
62 - done
63 - if [[ ${#locales[@]} -gt 0 ]]; then
64 - echo ${locales[@]}
65 - else
66 - echo $PLOCALE_BACKUP
67 - fi
68 -}
69 -
70 src_prepare() {
71 default
72 eautoreconf
73 @@ -53,7 +36,7 @@ src_install() {
74 local doc_type my_lang
75
76 for doc_type in help guide; do
77 - for my_lang in $(my_l10n_get_locales); do
78 + for my_lang in C ${L10N}; do
79 case $my_lang in
80 # Both help and guides translated
81 C|de|it|pt) ;;
82 @@ -61,7 +44,7 @@ src_install() {
83 if [[ ${doc_type} = "help" ]] ; then
84 elog "Help documentation hasn't been translated for $my_lang"
85 elog "Will do English instead."
86 - my_lang=C
87 + continue
88 fi
89 ;;
90 *)
91 @@ -69,12 +52,10 @@ src_install() {
92 ;;
93 esac
94
95 - cd "${S}/${doc_type}/${my_lang}" || die
96 - emake DESTDIR="${D}" install
97 + emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
98 done
99 done
100
101 - cd "${S}" || die
102 einstalldocs
103 }
104
105
106 diff --git a/app-doc/gnucash-docs/gnucash-docs-3.3.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.3-r1.ebuild
107 similarity index 67%
108 rename from app-doc/gnucash-docs/gnucash-docs-3.3.ebuild
109 rename to app-doc/gnucash-docs/gnucash-docs-3.3-r1.ebuild
110 index 1faefbd6ed4..da27ce8d5de 100644
111 --- a/app-doc/gnucash-docs/gnucash-docs-3.3.ebuild
112 +++ b/app-doc/gnucash-docs/gnucash-docs-3.3-r1.ebuild
113 @@ -1,12 +1,9 @@
114 -# Copyright 1999-2018 Gentoo Authors
115 +# Copyright 1999-2019 Gentoo Authors
116 # Distributed under the terms of the GNU General Public License v2
117
118 EAPI=6
119
120 -PLOCALES="C de it ja pt ru"
121 -PLOCALE_BACKUP="C"
122 -
123 -inherit autotools gnome2 l10n
124 +inherit autotools gnome2
125
126 DESCRIPTION="Documentation package for GnuCash"
127 HOMEPAGE="http://www.gnucash.org/"
128 @@ -15,10 +12,8 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
129 SLOT="0"
130 LICENSE="GPL-2 FDL-1.1"
131 KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
132 -
133 -for my_locale in ${PLOCALES}; do
134 - IUSE+=" l10n_${my_locale}"
135 -done
136 +LOCALES=( de it ja pt ru )
137 +IUSE="${LOCALES[*]/#/l10n_}"
138
139 DEPEND="
140 app-text/docbook-xml-dtd
141 @@ -28,18 +23,6 @@ DEPEND="
142 dev-libs/libxslt
143 "
144
145 -my_l10n_get_locales() {
146 - local l locales
147 - for l in ${PLOCALES[@]}; do
148 - use "l10n_${l}" && locales+=( $l )
149 - done
150 - if [[ ${#locales[@]} -gt 0 ]]; then
151 - echo ${locales[@]}
152 - else
153 - echo $PLOCALE_BACKUP
154 - fi
155 -}
156 -
157 src_prepare() {
158 default
159 eautoreconf
160 @@ -53,7 +36,7 @@ src_install() {
161 local doc_type my_lang
162
163 for doc_type in help guide; do
164 - for my_lang in $(my_l10n_get_locales); do
165 + for my_lang in C ${L10N}; do
166 case $my_lang in
167 # Both help and guides translated
168 C|de|it|pt) ;;
169 @@ -61,7 +44,7 @@ src_install() {
170 if [[ ${doc_type} = "help" ]] ; then
171 elog "Help documentation hasn't been translated for $my_lang"
172 elog "Will do English instead."
173 - my_lang=C
174 + continue
175 fi
176 ;;
177 *)
178 @@ -69,12 +52,10 @@ src_install() {
179 ;;
180 esac
181
182 - cd "${S}/${doc_type}/${my_lang}" || die
183 - emake DESTDIR="${D}" install
184 + emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
185 done
186 done
187
188 - cd "${S}" || die
189 einstalldocs
190 }
191
192
193 diff --git a/app-doc/gnucash-docs/gnucash-docs-3.4.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.4-r1.ebuild
194 similarity index 69%
195 rename from app-doc/gnucash-docs/gnucash-docs-3.4.ebuild
196 rename to app-doc/gnucash-docs/gnucash-docs-3.4-r1.ebuild
197 index 2fd86099fbd..505a73b7878 100644
198 --- a/app-doc/gnucash-docs/gnucash-docs-3.4.ebuild
199 +++ b/app-doc/gnucash-docs/gnucash-docs-3.4-r1.ebuild
200 @@ -3,10 +3,7 @@
201
202 EAPI=6
203
204 -PLOCALES="C de it ja pt ru"
205 -PLOCALE_BACKUP="C"
206 -
207 -inherit autotools gnome2 l10n
208 +inherit autotools gnome2
209
210 DESCRIPTION="Documentation package for GnuCash"
211 HOMEPAGE="http://www.gnucash.org/"
212 @@ -15,10 +12,8 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
213 SLOT="0"
214 LICENSE="GPL-2 FDL-1.1"
215 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
216 -
217 -for my_locale in ${PLOCALES}; do
218 - IUSE+=" l10n_${my_locale}"
219 -done
220 +LOCALES=( de it ja pt ru )
221 +IUSE="${LOCALES[*]/#/l10n_}"
222
223 DEPEND="
224 app-text/docbook-xml-dtd
225 @@ -28,18 +23,6 @@ DEPEND="
226 dev-libs/libxslt
227 "
228
229 -my_l10n_get_locales() {
230 - local l locales
231 - for l in ${PLOCALES[@]}; do
232 - use "l10n_${l}" && locales+=( $l )
233 - done
234 - if [[ ${#locales[@]} -gt 0 ]]; then
235 - echo ${locales[@]}
236 - else
237 - echo $PLOCALE_BACKUP
238 - fi
239 -}
240 -
241 src_prepare() {
242 default
243 eautoreconf
244 @@ -53,7 +36,7 @@ src_install() {
245 local doc_type my_lang
246
247 for doc_type in help guide; do
248 - for my_lang in $(my_l10n_get_locales); do
249 + for my_lang in C ${L10N}; do
250 case $my_lang in
251 # Both help and guides translated
252 C|de|it|pt) ;;
253 @@ -61,7 +44,7 @@ src_install() {
254 if [[ ${doc_type} = "help" ]] ; then
255 elog "Help documentation hasn't been translated for $my_lang"
256 elog "Will do English instead."
257 - my_lang=C
258 + continue
259 fi
260 ;;
261 *)
262 @@ -69,12 +52,10 @@ src_install() {
263 ;;
264 esac
265
266 - cd "${S}/${doc_type}/${my_lang}" || die
267 - emake DESTDIR="${D}" install
268 + emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
269 done
270 done
271
272 - cd "${S}" || die
273 einstalldocs
274 }
275
276
277 diff --git a/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
278 similarity index 69%
279 rename from app-doc/gnucash-docs/gnucash-docs-3.5.ebuild
280 rename to app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
281 index 2fd86099fbd..505a73b7878 100644
282 --- a/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild
283 +++ b/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
284 @@ -3,10 +3,7 @@
285
286 EAPI=6
287
288 -PLOCALES="C de it ja pt ru"
289 -PLOCALE_BACKUP="C"
290 -
291 -inherit autotools gnome2 l10n
292 +inherit autotools gnome2
293
294 DESCRIPTION="Documentation package for GnuCash"
295 HOMEPAGE="http://www.gnucash.org/"
296 @@ -15,10 +12,8 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
297 SLOT="0"
298 LICENSE="GPL-2 FDL-1.1"
299 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
300 -
301 -for my_locale in ${PLOCALES}; do
302 - IUSE+=" l10n_${my_locale}"
303 -done
304 +LOCALES=( de it ja pt ru )
305 +IUSE="${LOCALES[*]/#/l10n_}"
306
307 DEPEND="
308 app-text/docbook-xml-dtd
309 @@ -28,18 +23,6 @@ DEPEND="
310 dev-libs/libxslt
311 "
312
313 -my_l10n_get_locales() {
314 - local l locales
315 - for l in ${PLOCALES[@]}; do
316 - use "l10n_${l}" && locales+=( $l )
317 - done
318 - if [[ ${#locales[@]} -gt 0 ]]; then
319 - echo ${locales[@]}
320 - else
321 - echo $PLOCALE_BACKUP
322 - fi
323 -}
324 -
325 src_prepare() {
326 default
327 eautoreconf
328 @@ -53,7 +36,7 @@ src_install() {
329 local doc_type my_lang
330
331 for doc_type in help guide; do
332 - for my_lang in $(my_l10n_get_locales); do
333 + for my_lang in C ${L10N}; do
334 case $my_lang in
335 # Both help and guides translated
336 C|de|it|pt) ;;
337 @@ -61,7 +44,7 @@ src_install() {
338 if [[ ${doc_type} = "help" ]] ; then
339 elog "Help documentation hasn't been translated for $my_lang"
340 elog "Will do English instead."
341 - my_lang=C
342 + continue
343 fi
344 ;;
345 *)
346 @@ -69,12 +52,10 @@ src_install() {
347 ;;
348 esac
349
350 - cd "${S}/${doc_type}/${my_lang}" || die
351 - emake DESTDIR="${D}" install
352 + emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
353 done
354 done
355
356 - cd "${S}" || die
357 einstalldocs
358 }
359
360
361 diff --git a/app-doc/gnucash-docs/metadata.xml b/app-doc/gnucash-docs/metadata.xml
362 index e0724f47e4b..dc94f737b78 100644
363 --- a/app-doc/gnucash-docs/metadata.xml
364 +++ b/app-doc/gnucash-docs/metadata.xml
365 @@ -9,9 +9,6 @@
366 <email>gnome@g.o</email>
367 <name>Gentoo GNOME Desktop</name>
368 </maintainer>
369 - <use>
370 - <flag name="l10n_C">English</flag>
371 - </use>
372 <upstream>
373 <remote-id type="sourceforge">gnucash</remote-id>
374 </upstream>