Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: NP Hardass <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/
Date: Mon, 11 Jul 2016 17:49:11
Message-Id: 1468259335.dd9a77d4bd4929d83b16c7d7ef8a364e254d2378.np-hardass@gentoo
1 commit: dd9a77d4bd4929d83b16c7d7ef8a364e254d2378
2 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 11 17:48:13 2016 +0000
4 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 11 17:48:55 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9a77d4
7
8 app-emulation/wine: Fix two QA issues, #588604
9
10 Package-Manager: portage-2.2.28
11
12 app-emulation/wine/wine-1.8-r2.ebuild | 17 ++++++++++-------
13 app-emulation/wine/wine-1.8.1-r2.ebuild | 17 ++++++++++-------
14 app-emulation/wine/wine-1.8.2-r1.ebuild | 17 ++++++++++-------
15 app-emulation/wine/wine-1.8.2.ebuild | 2 +-
16 app-emulation/wine/wine-1.8.3.ebuild | 17 ++++++++++-------
17 app-emulation/wine/wine-1.9.10-r1.ebuild | 17 ++++++++++-------
18 app-emulation/wine/wine-1.9.11-r1.ebuild | 17 ++++++++++-------
19 app-emulation/wine/wine-1.9.12.ebuild | 17 ++++++++++-------
20 app-emulation/wine/wine-1.9.13.ebuild | 17 ++++++++++-------
21 app-emulation/wine/wine-1.9.4-r2.ebuild | 17 ++++++++++-------
22 app-emulation/wine/wine-1.9.5-r2.ebuild | 17 ++++++++++-------
23 app-emulation/wine/wine-1.9.6-r2.ebuild | 17 ++++++++++-------
24 app-emulation/wine/wine-1.9.7-r2.ebuild | 17 ++++++++++-------
25 app-emulation/wine/wine-1.9.8-r1.ebuild | 17 ++++++++++-------
26 app-emulation/wine/wine-1.9.9-r1.ebuild | 17 ++++++++++-------
27 app-emulation/wine/wine-9999.ebuild | 17 ++++++++++-------
28 16 files changed, 151 insertions(+), 106 deletions(-)
29
30 diff --git a/app-emulation/wine/wine-1.8-r2.ebuild b/app-emulation/wine/wine-1.8-r2.ebuild
31 index 4675885..60871af 100644
32 --- a/app-emulation/wine/wine-1.8-r2.ebuild
33 +++ b/app-emulation/wine/wine-1.8-r2.ebuild
34 @@ -21,8 +21,8 @@ else
35 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
36 fi
37
38 -GV="2.40"
39 -MV="4.5.6"
40 +VANILLA_GV="2.40"
41 +VANILLA_MV="4.5.6"
42 STAGING_GV="2.40"
43 STAGING_MV="4.5.6"
44 STAGING_P="wine-staging-${PV}"
45 @@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
46 SRC_URI="${SRC_URI}
47 !staging? (
48 gecko? (
49 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
50 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
51 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
52 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
53 )
54 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
55 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
56 )
57 staging? (
58 gecko? (
59 @@ -261,7 +261,10 @@ pkg_pretend() {
60
61 pkg_setup() {
62 wine_build_environment_check || die
63 - if use staging; then
64 + if ! use staging; then
65 + GV=${VANILLA_GV}
66 + MV=${VANILLA_MV}
67 + else
68 GV=${STAGING_GV}
69 MV=${STAGING_MV}
70 fi
71 @@ -341,7 +344,7 @@ src_prepare() {
72 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
73 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
74
75 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
76 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
77 }
78
79 src_configure() {
80
81 diff --git a/app-emulation/wine/wine-1.8.1-r2.ebuild b/app-emulation/wine/wine-1.8.1-r2.ebuild
82 index fb71732..79bcfa0 100644
83 --- a/app-emulation/wine/wine-1.8.1-r2.ebuild
84 +++ b/app-emulation/wine/wine-1.8.1-r2.ebuild
85 @@ -21,8 +21,8 @@ else
86 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
87 fi
88
89 -GV="2.40"
90 -MV="4.5.6"
91 +VANILLA_GV="2.40"
92 +VANILLA_MV="4.5.6"
93 STAGING_GV="2.40"
94 STAGING_MV="4.5.6"
95 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
96 @@ -35,10 +35,10 @@ HOMEPAGE="http://www.winehq.org/"
97 SRC_URI="${SRC_URI}
98 !staging? (
99 gecko? (
100 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
101 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
102 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
103 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
104 )
105 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
106 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
107 )
108 staging? (
109 gecko? (
110 @@ -262,7 +262,10 @@ pkg_pretend() {
111
112 pkg_setup() {
113 wine_build_environment_check || die
114 - if use staging; then
115 + if ! use staging; then
116 + GV=${VANILLA_GV}
117 + MV=${VANILLA_MV}
118 + else
119 GV=${STAGING_GV}
120 MV=${STAGING_MV}
121 fi
122 @@ -347,7 +350,7 @@ src_prepare() {
123 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
124 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
125
126 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
127 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
128 }
129
130 src_configure() {
131
132 diff --git a/app-emulation/wine/wine-1.8.2-r1.ebuild b/app-emulation/wine/wine-1.8.2-r1.ebuild
133 index 6d7436a..772d165 100644
134 --- a/app-emulation/wine/wine-1.8.2-r1.ebuild
135 +++ b/app-emulation/wine/wine-1.8.2-r1.ebuild
136 @@ -21,8 +21,8 @@ else
137 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
138 fi
139
140 -GV="2.40"
141 -MV="4.5.6"
142 +VANILLA_GV="2.40"
143 +VANILLA_MV="4.5.6"
144 STAGING_GV="2.40"
145 STAGING_MV="4.5.6"
146 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
147 @@ -35,10 +35,10 @@ HOMEPAGE="http://www.winehq.org/"
148 SRC_URI="${SRC_URI}
149 !staging? (
150 gecko? (
151 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
152 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
153 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
154 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
155 )
156 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
157 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
158 )
159 staging? (
160 gecko? (
161 @@ -262,7 +262,10 @@ pkg_pretend() {
162
163 pkg_setup() {
164 wine_build_environment_check || die
165 - if use staging; then
166 + if ! use staging; then
167 + GV=${VANILLA_GV}
168 + MV=${VANILLA_MV}
169 + else
170 GV=${STAGING_GV}
171 MV=${STAGING_MV}
172 fi
173 @@ -347,7 +350,7 @@ src_prepare() {
174 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
175 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
176
177 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
178 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
179 }
180
181 src_configure() {
182
183 diff --git a/app-emulation/wine/wine-1.8.2.ebuild b/app-emulation/wine/wine-1.8.2.ebuild
184 index 0da62bb..d9b6371 100644
185 --- a/app-emulation/wine/wine-1.8.2.ebuild
186 +++ b/app-emulation/wine/wine-1.8.2.ebuild
187 @@ -314,7 +314,7 @@ src_prepare() {
188 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
189 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
190
191 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
192 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
193 }
194
195 src_configure() {
196
197 diff --git a/app-emulation/wine/wine-1.8.3.ebuild b/app-emulation/wine/wine-1.8.3.ebuild
198 index 6d39710..1feebae 100644
199 --- a/app-emulation/wine/wine-1.8.3.ebuild
200 +++ b/app-emulation/wine/wine-1.8.3.ebuild
201 @@ -21,8 +21,8 @@ else
202 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
203 fi
204
205 -GV="2.40"
206 -MV="4.5.6"
207 +VANILLA_GV="2.40"
208 +VANILLA_MV="4.5.6"
209 STAGING_GV="2.40"
210 STAGING_MV="4.5.6"
211 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
212 @@ -35,10 +35,10 @@ HOMEPAGE="http://www.winehq.org/"
213 SRC_URI="${SRC_URI}
214 !staging? (
215 gecko? (
216 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
217 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
218 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
219 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
220 )
221 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
222 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
223 )
224 staging? (
225 gecko? (
226 @@ -262,7 +262,10 @@ pkg_pretend() {
227
228 pkg_setup() {
229 wine_build_environment_check || die
230 - if use staging; then
231 + if ! use staging; then
232 + GV=${VANILLA_GV}
233 + MV=${VANILLA_MV}
234 + else
235 GV=${STAGING_GV}
236 MV=${STAGING_MV}
237 fi
238 @@ -346,7 +349,7 @@ src_prepare() {
239 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
240 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
241
242 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
243 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
244 }
245
246 src_configure() {
247
248 diff --git a/app-emulation/wine/wine-1.9.10-r1.ebuild b/app-emulation/wine/wine-1.9.10-r1.ebuild
249 index 97400a5..33c7d8f 100644
250 --- a/app-emulation/wine/wine-1.9.10-r1.ebuild
251 +++ b/app-emulation/wine/wine-1.9.10-r1.ebuild
252 @@ -21,8 +21,8 @@ else
253 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
254 fi
255
256 -GV="2.44"
257 -MV="4.6.2"
258 +VANILLA_GV="2.44"
259 +VANILLA_MV="4.6.2"
260 STAGING_GV="2.47-beta1"
261 STAGING_MV="4.6.2"
262 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
263 @@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
264 SRC_URI="${SRC_URI}
265 !staging? (
266 gecko? (
267 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
268 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
269 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
270 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
271 )
272 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
273 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
274 )
275 staging? (
276 gecko? (
277 @@ -264,7 +264,10 @@ pkg_pretend() {
278
279 pkg_setup() {
280 wine_build_environment_check || die
281 - if use staging; then
282 + if ! use staging; then
283 + GV=${VANILLA_GV}
284 + MV=${VANILLA_MV}
285 + else
286 GV=${STAGING_GV}
287 MV=${STAGING_MV}
288 fi
289 @@ -360,7 +363,7 @@ src_prepare() {
290 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
291 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
292
293 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
294 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
295 }
296
297 src_configure() {
298
299 diff --git a/app-emulation/wine/wine-1.9.11-r1.ebuild b/app-emulation/wine/wine-1.9.11-r1.ebuild
300 index 97400a5..33c7d8f 100644
301 --- a/app-emulation/wine/wine-1.9.11-r1.ebuild
302 +++ b/app-emulation/wine/wine-1.9.11-r1.ebuild
303 @@ -21,8 +21,8 @@ else
304 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
305 fi
306
307 -GV="2.44"
308 -MV="4.6.2"
309 +VANILLA_GV="2.44"
310 +VANILLA_MV="4.6.2"
311 STAGING_GV="2.47-beta1"
312 STAGING_MV="4.6.2"
313 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
314 @@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
315 SRC_URI="${SRC_URI}
316 !staging? (
317 gecko? (
318 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
319 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
320 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
321 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
322 )
323 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
324 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
325 )
326 staging? (
327 gecko? (
328 @@ -264,7 +264,10 @@ pkg_pretend() {
329
330 pkg_setup() {
331 wine_build_environment_check || die
332 - if use staging; then
333 + if ! use staging; then
334 + GV=${VANILLA_GV}
335 + MV=${VANILLA_MV}
336 + else
337 GV=${STAGING_GV}
338 MV=${STAGING_MV}
339 fi
340 @@ -360,7 +363,7 @@ src_prepare() {
341 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
342 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
343
344 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
345 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
346 }
347
348 src_configure() {
349
350 diff --git a/app-emulation/wine/wine-1.9.12.ebuild b/app-emulation/wine/wine-1.9.12.ebuild
351 index 1c8e112..d5f0bad 100644
352 --- a/app-emulation/wine/wine-1.9.12.ebuild
353 +++ b/app-emulation/wine/wine-1.9.12.ebuild
354 @@ -21,8 +21,8 @@ else
355 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
356 fi
357
358 -GV="2.44"
359 -MV="4.6.3"
360 +VANILLA_GV="2.44"
361 +VANILLA_MV="4.6.3"
362 STAGING_GV="2.47-beta1"
363 STAGING_MV="4.6.3"
364 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
365 @@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
366 SRC_URI="${SRC_URI}
367 !staging? (
368 gecko? (
369 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
370 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
371 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
372 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
373 )
374 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
375 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
376 )
377 staging? (
378 gecko? (
379 @@ -264,7 +264,10 @@ pkg_pretend() {
380
381 pkg_setup() {
382 wine_build_environment_check || die
383 - if use staging; then
384 + if ! use staging; then
385 + GV=${VANILLA_GV}
386 + MV=${VANILLA_MV}
387 + else
388 GV=${STAGING_GV}
389 MV=${STAGING_MV}
390 fi
391 @@ -360,7 +363,7 @@ src_prepare() {
392 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
393 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
394
395 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
396 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
397 }
398
399 src_configure() {
400
401 diff --git a/app-emulation/wine/wine-1.9.13.ebuild b/app-emulation/wine/wine-1.9.13.ebuild
402 index 5da73b4..c637572 100644
403 --- a/app-emulation/wine/wine-1.9.13.ebuild
404 +++ b/app-emulation/wine/wine-1.9.13.ebuild
405 @@ -21,8 +21,8 @@ else
406 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
407 fi
408
409 -GV="2.47"
410 -MV="4.6.3"
411 +VANILLA_GV="2.47"
412 +VANILLA_MV="4.6.3"
413 STAGING_GV="2.47"
414 STAGING_MV="4.6.3"
415 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
416 @@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
417 SRC_URI="${SRC_URI}
418 !staging? (
419 gecko? (
420 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
421 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
422 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
423 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
424 )
425 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
426 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
427 )
428 staging? (
429 gecko? (
430 @@ -264,7 +264,10 @@ pkg_pretend() {
431
432 pkg_setup() {
433 wine_build_environment_check || die
434 - if use staging; then
435 + if ! use staging; then
436 + GV=${VANILLA_GV}
437 + MV=${VANILLA_MV}
438 + else
439 GV=${STAGING_GV}
440 MV=${STAGING_MV}
441 fi
442 @@ -359,7 +362,7 @@ src_prepare() {
443 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
444 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
445
446 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
447 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
448 }
449
450 src_configure() {
451
452 diff --git a/app-emulation/wine/wine-1.9.4-r2.ebuild b/app-emulation/wine/wine-1.9.4-r2.ebuild
453 index e72fc49..0f6ce35 100644
454 --- a/app-emulation/wine/wine-1.9.4-r2.ebuild
455 +++ b/app-emulation/wine/wine-1.9.4-r2.ebuild
456 @@ -21,8 +21,8 @@ else
457 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
458 fi
459
460 -GV="2.44"
461 -MV="4.5.6"
462 +VANILLA_GV="2.44"
463 +VANILLA_MV="4.5.6"
464 STAGING_GV="2.44"
465 STAGING_MV="4.5.6"
466 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
467 @@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
468 SRC_URI="${SRC_URI}
469 !staging? (
470 gecko? (
471 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
472 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
473 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
474 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
475 )
476 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
477 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
478 )
479 staging? (
480 gecko? (
481 @@ -260,7 +260,10 @@ pkg_pretend() {
482
483 pkg_setup() {
484 wine_build_environment_check || die
485 - if use staging; then
486 + if ! use staging; then
487 + GV=${VANILLA_GV}
488 + MV=${VANILLA_MV}
489 + else
490 GV=${STAGING_GV}
491 MV=${STAGING_MV}
492 fi
493 @@ -343,7 +346,7 @@ src_prepare() {
494 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
495 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
496
497 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
498 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
499 }
500
501 src_configure() {
502
503 diff --git a/app-emulation/wine/wine-1.9.5-r2.ebuild b/app-emulation/wine/wine-1.9.5-r2.ebuild
504 index a2e4f3e..717ef85 100644
505 --- a/app-emulation/wine/wine-1.9.5-r2.ebuild
506 +++ b/app-emulation/wine/wine-1.9.5-r2.ebuild
507 @@ -21,8 +21,8 @@ else
508 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
509 fi
510
511 -GV="2.44"
512 -MV="4.6.0"
513 +VANILLA_GV="2.44"
514 +VANILLA_MV="4.6.0"
515 STAGING_GV="2.44"
516 STAGING_MV="4.6.0"
517 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
518 @@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
519 SRC_URI="${SRC_URI}
520 !staging? (
521 gecko? (
522 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
523 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
524 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
525 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
526 )
527 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
528 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
529 )
530 staging? (
531 gecko? (
532 @@ -259,7 +259,10 @@ pkg_pretend() {
533
534 pkg_setup() {
535 wine_build_environment_check || die
536 - if use staging; then
537 + if ! use staging; then
538 + GV=${VANILLA_GV}
539 + MV=${VANILLA_MV}
540 + else
541 GV=${STAGING_GV}
542 MV=${STAGING_MV}
543 fi
544 @@ -345,7 +348,7 @@ src_prepare() {
545 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
546 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
547
548 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
549 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
550 }
551
552 src_configure() {
553
554 diff --git a/app-emulation/wine/wine-1.9.6-r2.ebuild b/app-emulation/wine/wine-1.9.6-r2.ebuild
555 index 47058cb..c52e247 100644
556 --- a/app-emulation/wine/wine-1.9.6-r2.ebuild
557 +++ b/app-emulation/wine/wine-1.9.6-r2.ebuild
558 @@ -21,8 +21,8 @@ else
559 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
560 fi
561
562 -GV="2.44"
563 -MV="4.6.0"
564 +VANILLA_GV="2.44"
565 +VANILLA_MV="4.6.0"
566 STAGING_GV="2.44"
567 STAGING_MV="4.6.0"
568 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
569 @@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
570 SRC_URI="${SRC_URI}
571 !staging? (
572 gecko? (
573 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
574 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
575 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
576 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
577 )
578 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
579 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
580 )
581 staging? (
582 gecko? (
583 @@ -259,7 +259,10 @@ pkg_pretend() {
584
585 pkg_setup() {
586 wine_build_environment_check || die
587 - if use staging; then
588 + if ! use staging; then
589 + GV=${VANILLA_GV}
590 + MV=${VANILLA_MV}
591 + else
592 GV=${STAGING_GV}
593 MV=${STAGING_MV}
594 fi
595 @@ -342,7 +345,7 @@ src_prepare() {
596 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
597 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
598
599 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
600 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
601 }
602
603 src_configure() {
604
605 diff --git a/app-emulation/wine/wine-1.9.7-r2.ebuild b/app-emulation/wine/wine-1.9.7-r2.ebuild
606 index 47058cb..c52e247 100644
607 --- a/app-emulation/wine/wine-1.9.7-r2.ebuild
608 +++ b/app-emulation/wine/wine-1.9.7-r2.ebuild
609 @@ -21,8 +21,8 @@ else
610 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
611 fi
612
613 -GV="2.44"
614 -MV="4.6.0"
615 +VANILLA_GV="2.44"
616 +VANILLA_MV="4.6.0"
617 STAGING_GV="2.44"
618 STAGING_MV="4.6.0"
619 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
620 @@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
621 SRC_URI="${SRC_URI}
622 !staging? (
623 gecko? (
624 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
625 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
626 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
627 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
628 )
629 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
630 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
631 )
632 staging? (
633 gecko? (
634 @@ -259,7 +259,10 @@ pkg_pretend() {
635
636 pkg_setup() {
637 wine_build_environment_check || die
638 - if use staging; then
639 + if ! use staging; then
640 + GV=${VANILLA_GV}
641 + MV=${VANILLA_MV}
642 + else
643 GV=${STAGING_GV}
644 MV=${STAGING_MV}
645 fi
646 @@ -342,7 +345,7 @@ src_prepare() {
647 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
648 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
649
650 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
651 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
652 }
653
654 src_configure() {
655
656 diff --git a/app-emulation/wine/wine-1.9.8-r1.ebuild b/app-emulation/wine/wine-1.9.8-r1.ebuild
657 index c886ca7..2db9e5b 100644
658 --- a/app-emulation/wine/wine-1.9.8-r1.ebuild
659 +++ b/app-emulation/wine/wine-1.9.8-r1.ebuild
660 @@ -21,8 +21,8 @@ else
661 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
662 fi
663
664 -GV="2.44"
665 -MV="4.6.2"
666 +VANILLA_GV="2.44"
667 +VANILLA_MV="4.6.2"
668 STAGING_GV="2.44"
669 STAGING_MV="4.6.2"
670 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
671 @@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
672 SRC_URI="${SRC_URI}
673 !staging? (
674 gecko? (
675 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
676 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
677 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
678 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
679 )
680 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
681 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
682 )
683 staging? (
684 gecko? (
685 @@ -259,7 +259,10 @@ pkg_pretend() {
686
687 pkg_setup() {
688 wine_build_environment_check || die
689 - if use staging; then
690 + if ! use staging; then
691 + GV=${VANILLA_GV}
692 + MV=${VANILLA_MV}
693 + else
694 GV=${STAGING_GV}
695 MV=${STAGING_MV}
696 fi
697 @@ -342,7 +345,7 @@ src_prepare() {
698 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
699 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
700
701 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
702 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
703 }
704
705 src_configure() {
706
707 diff --git a/app-emulation/wine/wine-1.9.9-r1.ebuild b/app-emulation/wine/wine-1.9.9-r1.ebuild
708 index 34d2b89..ef7d72c 100644
709 --- a/app-emulation/wine/wine-1.9.9-r1.ebuild
710 +++ b/app-emulation/wine/wine-1.9.9-r1.ebuild
711 @@ -21,8 +21,8 @@ else
712 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
713 fi
714
715 -GV="2.44"
716 -MV="4.6.2"
717 +VANILLA_GV="2.44"
718 +VANILLA_MV="4.6.2"
719 STAGING_GV="2.44"
720 STAGING_MV="4.6.2"
721 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
722 @@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
723 SRC_URI="${SRC_URI}
724 !staging? (
725 gecko? (
726 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
727 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
728 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
729 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
730 )
731 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
732 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
733 )
734 staging? (
735 gecko? (
736 @@ -264,7 +264,10 @@ pkg_pretend() {
737
738 pkg_setup() {
739 wine_build_environment_check || die
740 - if use staging; then
741 + if ! use staging; then
742 + GV=${VANILLA_GV}
743 + MV=${VANILLA_MV}
744 + else
745 GV=${STAGING_GV}
746 MV=${STAGING_MV}
747 fi
748 @@ -360,7 +363,7 @@ src_prepare() {
749 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
750 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
751
752 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
753 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
754 }
755
756 src_configure() {
757
758 diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
759 index 5da73b4..c637572 100644
760 --- a/app-emulation/wine/wine-9999.ebuild
761 +++ b/app-emulation/wine/wine-9999.ebuild
762 @@ -21,8 +21,8 @@ else
763 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
764 fi
765
766 -GV="2.47"
767 -MV="4.6.3"
768 +VANILLA_GV="2.47"
769 +VANILLA_MV="4.6.3"
770 STAGING_GV="2.47"
771 STAGING_MV="4.6.3"
772 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
773 @@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
774 SRC_URI="${SRC_URI}
775 !staging? (
776 gecko? (
777 - abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
778 - abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
779 + abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
780 + abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
781 )
782 - mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
783 + mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
784 )
785 staging? (
786 gecko? (
787 @@ -264,7 +264,10 @@ pkg_pretend() {
788
789 pkg_setup() {
790 wine_build_environment_check || die
791 - if use staging; then
792 + if ! use staging; then
793 + GV=${VANILLA_GV}
794 + MV=${VANILLA_MV}
795 + else
796 GV=${STAGING_GV}
797 MV=${STAGING_MV}
798 fi
799 @@ -359,7 +362,7 @@ src_prepare() {
800 # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
801 cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
802
803 - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
804 + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
805 }
806
807 src_configure() {
Report Message
Find on MARC Find on Google Groups