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: dev-util/debhelper/
Date: Sun, 07 Jan 2018 23:07:44
Message-Id: 1515366452.4ea3b65775d183a39fc8e561fe9c121d0ed4ed06.ulm@gentoo
1 commit: 4ea3b65775d183a39fc8e561fe9c121d0ed4ed06
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 7 23:03:30 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 7 23:07:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea3b657
7
8 dev-util/debhelper: Migrate from LINGUAS to L10N.
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 dev-util/debhelper/debhelper-10.10.9.ebuild | 28 +++++++++++++-------------
13 dev-util/debhelper/debhelper-11.ebuild | 28 +++++++++++++-------------
14 dev-util/debhelper/debhelper-9.20160814.ebuild | 28 +++++++++++++-------------
15 3 files changed, 42 insertions(+), 42 deletions(-)
16
17 diff --git a/dev-util/debhelper/debhelper-10.10.9.ebuild b/dev-util/debhelper/debhelper-10.10.9.ebuild
18 index c4f2a7b166c..f485cb5d4c2 100644
19 --- a/dev-util/debhelper/debhelper-10.10.9.ebuild
20 +++ b/dev-util/debhelper/debhelper-10.10.9.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2017 Gentoo Foundation
23 +# Copyright 1999-2018 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -12,11 +12,11 @@ LICENSE="GPL-2"
28 SLOT="0"
29 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
30 IUSE="test"
31 -DH_LINGUAS=( de es fr )
32 -IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
33 +DH_LANGS=( de es fr )
34 +IUSE+=" ${DH_LANGS[@]/#/l10n_}"
35
36 NLS_DEPEND=$(
37 - printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
38 + printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
39 )
40
41 RDEPEND="
42 @@ -39,10 +39,10 @@ S=${WORKDIR}/${PN}
43 src_compile() {
44 tc-export CC
45
46 - local LANGS="" USE_NLS=no lingua
47 - for lingua in ${DH_LINGUAS[@]}; do
48 - if use linguas_${lingua}; then
49 - LANGS+=" ${lingua}"
50 + local LANGS="" USE_NLS=no lang
51 + for lang in ${DH_LANGS[@]}; do
52 + if use l10n_${lang}; then
53 + LANGS+=" ${lang}"
54 USE_NLS=yes
55 fi
56 done
57 @@ -55,14 +55,14 @@ src_install() {
58 dodoc doc/* debian/changelog
59 docinto examples
60 dodoc examples/*
61 - local lingua
62 + local lang
63 for manfile in *.1 *.7 ; do
64 - for lingua in ${DH_LINGUAS[@]}; do
65 + for lang in ${DH_LANGS[@]}; do
66 case ${manfile} in
67 - *.${lingua}.?)
68 - use linguas_${lingua} \
69 - && cp ${manfile} "${T}"/${manfile/.${lingua}/} \
70 - && doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
71 + *.${lang}.?)
72 + use l10n_${lang} \
73 + && cp ${manfile} "${T}"/${manfile/.${lang}/} \
74 + && doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
75 ;;
76 *)
77 doman ${manfile}
78
79 diff --git a/dev-util/debhelper/debhelper-11.ebuild b/dev-util/debhelper/debhelper-11.ebuild
80 index 526db42385e..eb7e5fa626c 100644
81 --- a/dev-util/debhelper/debhelper-11.ebuild
82 +++ b/dev-util/debhelper/debhelper-11.ebuild
83 @@ -1,4 +1,4 @@
84 -# Copyright 1999-2017 Gentoo Foundation
85 +# Copyright 1999-2018 Gentoo Foundation
86 # Distributed under the terms of the GNU General Public License v2
87
88 EAPI=6
89 @@ -12,11 +12,11 @@ LICENSE="GPL-2"
90 SLOT="0"
91 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
92 IUSE="test"
93 -DH_LINGUAS=( de es fr )
94 -IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
95 +DH_LANGS=( de es fr )
96 +IUSE+=" ${DH_LANGS[@]/#/l10n_}"
97
98 NLS_DEPEND=$(
99 - printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
100 + printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
101 )
102
103 RDEPEND="
104 @@ -39,10 +39,10 @@ S=${WORKDIR}/${PN}
105 src_compile() {
106 tc-export CC
107
108 - local LANGS="" USE_NLS=no lingua
109 - for lingua in ${DH_LINGUAS[@]}; do
110 - if use linguas_${lingua}; then
111 - LANGS+=" ${lingua}"
112 + local LANGS="" USE_NLS=no lang
113 + for lang in ${DH_LANGS[@]}; do
114 + if use l10n_${lang}; then
115 + LANGS+=" ${lang}"
116 USE_NLS=yes
117 fi
118 done
119 @@ -55,14 +55,14 @@ src_install() {
120 dodoc doc/* debian/changelog
121 docinto examples
122 dodoc examples/*
123 - local lingua
124 + local lang
125 for manfile in *.1 *.7 ; do
126 - for lingua in ${DH_LINGUAS[@]}; do
127 + for lang in ${DH_LANGS[@]}; do
128 case ${manfile} in
129 - *.${lingua}.?)
130 - use linguas_${lingua} \
131 - && cp ${manfile} "${T}"/${manfile/.${lingua}/} \
132 - && doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
133 + *.${lang}.?)
134 + use l10n_${lang} \
135 + && cp ${manfile} "${T}"/${manfile/.${lang}/} \
136 + && doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
137 ;;
138 *)
139 doman ${manfile}
140
141 diff --git a/dev-util/debhelper/debhelper-9.20160814.ebuild b/dev-util/debhelper/debhelper-9.20160814.ebuild
142 index 3333a21a303..10f0449075e 100644
143 --- a/dev-util/debhelper/debhelper-9.20160814.ebuild
144 +++ b/dev-util/debhelper/debhelper-9.20160814.ebuild
145 @@ -1,4 +1,4 @@
146 -# Copyright 1999-2017 Gentoo Foundation
147 +# Copyright 1999-2018 Gentoo Foundation
148 # Distributed under the terms of the GNU General Public License v2
149
150 EAPI=5
151 @@ -12,11 +12,11 @@ LICENSE="GPL-2"
152 SLOT="0"
153 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
154 IUSE="test"
155 -DH_LINGUAS=( de es fr )
156 -IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
157 +DH_LANGS=( de es fr )
158 +IUSE+=" ${DH_LANGS[@]/#/l10n_}"
159
160 NLS_DEPEND=$(
161 - printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
162 + printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
163 )
164
165 RDEPEND="
166 @@ -39,10 +39,10 @@ S=${WORKDIR}/${PN}
167 src_compile() {
168 tc-export CC
169
170 - local LANGS="" USE_NLS=no lingua
171 - for lingua in ${DH_LINGUAS[@]}; do
172 - if use linguas_${lingua}; then
173 - LANGS+=" ${lingua}"
174 + local LANGS="" USE_NLS=no lang
175 + for lang in ${DH_LANGS[@]}; do
176 + if use l10n_${lang}; then
177 + LANGS+=" ${lang}"
178 USE_NLS=yes
179 fi
180 done
181 @@ -55,14 +55,14 @@ src_install() {
182 dodoc doc/* debian/changelog
183 docinto examples
184 dodoc examples/*
185 - local lingua
186 + local lang
187 for manfile in *.1 *.7 ; do
188 - for lingua in ${DH_LINGUAS[@]}; do
189 + for lang in ${DH_LANGS[@]}; do
190 case ${manfile} in
191 - *.${lingua}.?)
192 - use linguas_${lingua} \
193 - && cp ${manfile} "${T}"/${manfile/.${lingua}/} \
194 - && doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
195 + *.${lang}.?)
196 + use l10n_${lang} \
197 + && cp ${manfile} "${T}"/${manfile/.${lang}/} \
198 + && doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
199 ;;
200 *)
201 doman ${manfile}