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: sys-boot/unetbootin/
Date: Sun, 07 Jan 2018 16:22:48
Message-Id: 1515342157.db8c3313d3e87dae284b1d2032c989b6f956035b.ulm@gentoo
1 commit: db8c3313d3e87dae284b1d2032c989b6f956035b
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 7 16:16:02 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 7 16:22:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db8c3313
7
8 sys-boot/unetbootin: Test LINGUAS rather than linguas_* USE flags.
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 sys-boot/unetbootin/unetbootin-625.ebuild | 10 +++-------
13 sys-boot/unetbootin/unetbootin-647.ebuild | 10 +++-------
14 sys-boot/unetbootin/unetbootin-655.ebuild | 10 +++-------
15 sys-boot/unetbootin/unetbootin-657.ebuild | 10 +++-------
16 4 files changed, 12 insertions(+), 28 deletions(-)
17
18 diff --git a/sys-boot/unetbootin/unetbootin-625.ebuild b/sys-boot/unetbootin/unetbootin-625.ebuild
19 index f6884665740..aabc1aa868d 100644
20 --- a/sys-boot/unetbootin/unetbootin-625.ebuild
21 +++ b/sys-boot/unetbootin/unetbootin-625.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2016 Gentoo Foundation
24 +# Copyright 1999-2018 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=5
28 @@ -19,10 +19,6 @@ UNBI_LINGUAS="
29 zh_CN zh_TW
30 "
31
32 -for lingua in ${UNBI_LINGUAS}; do
33 - IUSE="${IUSE} linguas_${lingua}"
34 -done
35 -
36 S=${WORKDIR}/${P}/src/${PN}
37
38 DEPEND="dev-qt/qtgui:4"
39 @@ -52,7 +48,7 @@ src_prepare() {
40 # Remove localisations
41 local lingua
42 for lingua in ${UNBI_LINGUAS}; do
43 - if ! use linguas_${lingua}; then
44 + if ! has ${lingua} ${LINGUAS-${lingua}}; then
45 sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
46 rm ${PN}_${lingua}.ts || die
47 fi
48 @@ -82,7 +78,7 @@ src_install() {
49
50 local lingua
51 for lingua in ${UNBI_LINGUAS}; do
52 - if use linguas_${lingua}; then
53 + if has ${lingua} ${LINGUAS-${lingua}}; then
54 insinto /usr/share/${PN}
55 doins ${PN}_${lingua}.qm
56 fi
57
58 diff --git a/sys-boot/unetbootin/unetbootin-647.ebuild b/sys-boot/unetbootin/unetbootin-647.ebuild
59 index e449aefee55..0371e75f2c8 100644
60 --- a/sys-boot/unetbootin/unetbootin-647.ebuild
61 +++ b/sys-boot/unetbootin/unetbootin-647.ebuild
62 @@ -1,4 +1,4 @@
63 -# Copyright 1999-2017 Gentoo Foundation
64 +# Copyright 1999-2018 Gentoo Foundation
65 # Distributed under the terms of the GNU General Public License v2
66
67 EAPI=6
68 @@ -19,10 +19,6 @@ UNBI_LINGUAS="
69 zh_CN zh_TW
70 "
71
72 -for lingua in ${UNBI_LINGUAS}; do
73 - IUSE="${IUSE} linguas_${lingua}"
74 -done
75 -
76 S=${WORKDIR}/${P}/src/${PN}
77
78 DEPEND="dev-qt/qtgui:4"
79 @@ -51,7 +47,7 @@ src_prepare() {
80 # Remove localisations
81 local lingua
82 for lingua in ${UNBI_LINGUAS}; do
83 - if ! use linguas_${lingua}; then
84 + if ! has ${lingua} ${LINGUAS-${lingua}}; then
85 sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
86 rm ${PN}_${lingua}.ts || die
87 fi
88 @@ -81,7 +77,7 @@ src_install() {
89
90 local lingua
91 for lingua in ${UNBI_LINGUAS}; do
92 - if use linguas_${lingua}; then
93 + if has ${lingua} ${LINGUAS-${lingua}}; then
94 insinto /usr/share/${PN}
95 doins ${PN}_${lingua}.qm
96 fi
97
98 diff --git a/sys-boot/unetbootin/unetbootin-655.ebuild b/sys-boot/unetbootin/unetbootin-655.ebuild
99 index 453496db667..1007cc620a1 100644
100 --- a/sys-boot/unetbootin/unetbootin-655.ebuild
101 +++ b/sys-boot/unetbootin/unetbootin-655.ebuild
102 @@ -1,4 +1,4 @@
103 -# Copyright 1999-2017 Gentoo Foundation
104 +# Copyright 1999-2018 Gentoo Foundation
105 # Distributed under the terms of the GNU General Public License v2
106
107 EAPI=6
108 @@ -19,10 +19,6 @@ UNBI_LINGUAS="
109 zh_CN zh_TW
110 "
111
112 -for lingua in ${UNBI_LINGUAS}; do
113 - IUSE="${IUSE} linguas_${lingua}"
114 -done
115 -
116 S=${WORKDIR}/${P}/src/${PN}
117
118 DEPEND="dev-qt/qtgui:4"
119 @@ -50,7 +46,7 @@ src_prepare() {
120 # Remove localisations
121 local lingua
122 for lingua in ${UNBI_LINGUAS}; do
123 - if ! use linguas_${lingua}; then
124 + if ! has ${lingua} ${LINGUAS-${lingua}}; then
125 sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
126 rm ${PN}_${lingua}.ts || die
127 fi
128 @@ -80,7 +76,7 @@ src_install() {
129
130 local lingua
131 for lingua in ${UNBI_LINGUAS}; do
132 - if use linguas_${lingua}; then
133 + if has ${lingua} ${LINGUAS-${lingua}}; then
134 insinto /usr/share/${PN}
135 doins ${PN}_${lingua}.qm
136 fi
137
138 diff --git a/sys-boot/unetbootin/unetbootin-657.ebuild b/sys-boot/unetbootin/unetbootin-657.ebuild
139 index 453496db667..1007cc620a1 100644
140 --- a/sys-boot/unetbootin/unetbootin-657.ebuild
141 +++ b/sys-boot/unetbootin/unetbootin-657.ebuild
142 @@ -1,4 +1,4 @@
143 -# Copyright 1999-2017 Gentoo Foundation
144 +# Copyright 1999-2018 Gentoo Foundation
145 # Distributed under the terms of the GNU General Public License v2
146
147 EAPI=6
148 @@ -19,10 +19,6 @@ UNBI_LINGUAS="
149 zh_CN zh_TW
150 "
151
152 -for lingua in ${UNBI_LINGUAS}; do
153 - IUSE="${IUSE} linguas_${lingua}"
154 -done
155 -
156 S=${WORKDIR}/${P}/src/${PN}
157
158 DEPEND="dev-qt/qtgui:4"
159 @@ -50,7 +46,7 @@ src_prepare() {
160 # Remove localisations
161 local lingua
162 for lingua in ${UNBI_LINGUAS}; do
163 - if ! use linguas_${lingua}; then
164 + if ! has ${lingua} ${LINGUAS-${lingua}}; then
165 sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
166 rm ${PN}_${lingua}.ts || die
167 fi
168 @@ -80,7 +76,7 @@ src_install() {
169
170 local lingua
171 for lingua in ${UNBI_LINGUAS}; do
172 - if use linguas_${lingua}; then
173 + if has ${lingua} ${LINGUAS-${lingua}}; then
174 insinto /usr/share/${PN}
175 doins ${PN}_${lingua}.qm
176 fi