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-staging/
Date: Sun, 05 Nov 2017 05:53:33
Message-Id: 1509861183.039fcf5b81122e14fa915eb4755fc2271ffcec80.np-hardass@gentoo
1 commit: 039fcf5b81122e14fa915eb4755fc2271ffcec80
2 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 5 05:06:58 2017 +0000
4 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 5 05:53:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=039fcf5b
7
8 app-emulation/wine-staging: Refactor to dynamically add patchbin dep
9
10 Bug: https://bugs.gentoo.org/show_bug.cgi?id=635222
11 Package-Manager: Portage-2.3.13, Repoman-2.3.4
12
13 .../wine-staging/wine-staging-2.0-r1.ebuild | 30 +++++++++++++---------
14 .../wine-staging/wine-staging-2.1-r1.ebuild | 30 +++++++++++++---------
15 .../wine-staging/wine-staging-2.10-r1.ebuild | 30 +++++++++++++---------
16 .../wine-staging/wine-staging-2.11-r1.ebuild | 30 +++++++++++++---------
17 .../wine-staging/wine-staging-2.12-r1.ebuild | 30 +++++++++++++---------
18 .../wine-staging/wine-staging-2.13-r1.ebuild | 30 +++++++++++++---------
19 .../wine-staging/wine-staging-2.14-r1.ebuild | 30 +++++++++++++---------
20 .../wine-staging/wine-staging-2.15-r1.ebuild | 30 +++++++++++++---------
21 .../wine-staging/wine-staging-2.16-r1.ebuild | 30 +++++++++++++---------
22 .../wine-staging/wine-staging-2.17-r1.ebuild | 30 +++++++++++++---------
23 .../wine-staging/wine-staging-2.18.ebuild | 23 ++++++++++-------
24 .../wine-staging/wine-staging-2.2-r1.ebuild | 30 +++++++++++++---------
25 .../wine-staging/wine-staging-2.3-r1.ebuild | 30 +++++++++++++---------
26 .../wine-staging/wine-staging-2.4-r1.ebuild | 30 +++++++++++++---------
27 .../wine-staging/wine-staging-2.5-r1.ebuild | 30 +++++++++++++---------
28 .../wine-staging/wine-staging-2.6-r1.ebuild | 30 +++++++++++++---------
29 .../wine-staging/wine-staging-2.7-r1.ebuild | 30 +++++++++++++---------
30 .../wine-staging/wine-staging-2.8-r1.ebuild | 30 +++++++++++++---------
31 .../wine-staging/wine-staging-2.9-r1.ebuild | 30 +++++++++++++---------
32 .../wine-staging/wine-staging-9999.ebuild | 23 ++++++++++-------
33 20 files changed, 352 insertions(+), 234 deletions(-)
34
35 diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
36 index 0c4b6b962ec..1aeafd492e5 100644
37 --- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
38 +++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
39 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
40
41 # tools/make_requests requires perl
42 DEPEND="${COMMON_DEPEND}
43 - dev-util/patchbin
44 sys-devel/flex
45 >=sys-kernel/linux-headers-2.6
46 virtual/pkgconfig
47 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
48 usr/share/applications/wine-uninstaller.desktop
49 usr/share/applications/wine-winecfg.desktop"
50
51 +PATCHES=(
52 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
53 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
54 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
55 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
56 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
57 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
58 +)
59 +PATCHES_BIN=(
60 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
61 +)
62 +
63 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
64 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
65 + DEPEND+=" dev-util/patchbin"
66 +fi
67 +
68 wine_compiler_check() {
69 [[ ${MERGE_TYPE} = "binary" ]] && return 0
70
71 @@ -347,17 +363,7 @@ src_prepare() {
72 }
73
74 local md5="$(md5sum server/protocol.def)"
75 - local PATCHES=(
76 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
77 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
78 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
79 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
80 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
81 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
82 - )
83 - local PATCHES_BIN=(
84 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
85 - )
86 +
87 if use staging; then
88 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
89 ewarn "Wine bugzilla should explicitly state that staging was used."
90
91 diff --git a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
92 index 04fe221e510..1177c5533ac 100644
93 --- a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
94 +++ b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
95 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
96
97 # tools/make_requests requires perl
98 DEPEND="${COMMON_DEPEND}
99 - dev-util/patchbin
100 sys-devel/flex
101 >=sys-kernel/linux-headers-2.6
102 virtual/pkgconfig
103 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
104 usr/share/applications/wine-uninstaller.desktop
105 usr/share/applications/wine-winecfg.desktop"
106
107 +PATCHES=(
108 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
109 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
110 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
111 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
112 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
113 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
114 +)
115 +PATCHES_BIN=(
116 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
117 +)
118 +
119 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
120 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
121 + DEPEND+=" dev-util/patchbin"
122 +fi
123 +
124 wine_compiler_check() {
125 [[ ${MERGE_TYPE} = "binary" ]] && return 0
126
127 @@ -347,17 +363,7 @@ src_prepare() {
128 }
129
130 local md5="$(md5sum server/protocol.def)"
131 - local PATCHES=(
132 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
133 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
134 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
135 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
136 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
137 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
138 - )
139 - local PATCHES_BIN=(
140 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
141 - )
142 +
143 if use staging; then
144 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
145 ewarn "Wine bugzilla should explicitly state that staging was used."
146
147 diff --git a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
148 index d41fb3977fc..f4d14b26fc4 100644
149 --- a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
150 +++ b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
151 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
152
153 # tools/make_requests requires perl
154 DEPEND="${COMMON_DEPEND}
155 - dev-util/patchbin
156 sys-devel/flex
157 >=sys-kernel/linux-headers-2.6
158 virtual/pkgconfig
159 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
160 usr/share/applications/wine-uninstaller.desktop
161 usr/share/applications/wine-winecfg.desktop"
162
163 +PATCHES=(
164 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
165 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
166 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
167 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
168 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
169 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
170 +)
171 +PATCHES_BIN=(
172 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
173 +)
174 +
175 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
176 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
177 + DEPEND+=" dev-util/patchbin"
178 +fi
179 +
180 wine_compiler_check() {
181 [[ ${MERGE_TYPE} = "binary" ]] && return 0
182
183 @@ -347,17 +363,7 @@ src_prepare() {
184 }
185
186 local md5="$(md5sum server/protocol.def)"
187 - local PATCHES=(
188 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
189 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
190 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
191 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
192 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
193 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
194 - )
195 - local PATCHES_BIN=(
196 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
197 - )
198 +
199 if use staging; then
200 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
201 ewarn "Wine bugzilla should explicitly state that staging was used."
202
203 diff --git a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
204 index d41fb3977fc..f4d14b26fc4 100644
205 --- a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
206 +++ b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
207 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
208
209 # tools/make_requests requires perl
210 DEPEND="${COMMON_DEPEND}
211 - dev-util/patchbin
212 sys-devel/flex
213 >=sys-kernel/linux-headers-2.6
214 virtual/pkgconfig
215 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
216 usr/share/applications/wine-uninstaller.desktop
217 usr/share/applications/wine-winecfg.desktop"
218
219 +PATCHES=(
220 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
221 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
222 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
223 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
224 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
225 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
226 +)
227 +PATCHES_BIN=(
228 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
229 +)
230 +
231 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
232 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
233 + DEPEND+=" dev-util/patchbin"
234 +fi
235 +
236 wine_compiler_check() {
237 [[ ${MERGE_TYPE} = "binary" ]] && return 0
238
239 @@ -347,17 +363,7 @@ src_prepare() {
240 }
241
242 local md5="$(md5sum server/protocol.def)"
243 - local PATCHES=(
244 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
245 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
246 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
247 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
248 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
249 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
250 - )
251 - local PATCHES_BIN=(
252 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
253 - )
254 +
255 if use staging; then
256 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
257 ewarn "Wine bugzilla should explicitly state that staging was used."
258
259 diff --git a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
260 index d41fb3977fc..f4d14b26fc4 100644
261 --- a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
262 +++ b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
263 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
264
265 # tools/make_requests requires perl
266 DEPEND="${COMMON_DEPEND}
267 - dev-util/patchbin
268 sys-devel/flex
269 >=sys-kernel/linux-headers-2.6
270 virtual/pkgconfig
271 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
272 usr/share/applications/wine-uninstaller.desktop
273 usr/share/applications/wine-winecfg.desktop"
274
275 +PATCHES=(
276 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
277 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
278 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
279 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
280 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
281 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
282 +)
283 +PATCHES_BIN=(
284 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
285 +)
286 +
287 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
288 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
289 + DEPEND+=" dev-util/patchbin"
290 +fi
291 +
292 wine_compiler_check() {
293 [[ ${MERGE_TYPE} = "binary" ]] && return 0
294
295 @@ -347,17 +363,7 @@ src_prepare() {
296 }
297
298 local md5="$(md5sum server/protocol.def)"
299 - local PATCHES=(
300 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
301 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
302 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
303 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
304 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
305 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
306 - )
307 - local PATCHES_BIN=(
308 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
309 - )
310 +
311 if use staging; then
312 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
313 ewarn "Wine bugzilla should explicitly state that staging was used."
314
315 diff --git a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
316 index d41fb3977fc..f4d14b26fc4 100644
317 --- a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
318 +++ b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
319 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
320
321 # tools/make_requests requires perl
322 DEPEND="${COMMON_DEPEND}
323 - dev-util/patchbin
324 sys-devel/flex
325 >=sys-kernel/linux-headers-2.6
326 virtual/pkgconfig
327 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
328 usr/share/applications/wine-uninstaller.desktop
329 usr/share/applications/wine-winecfg.desktop"
330
331 +PATCHES=(
332 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
333 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
334 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
335 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
336 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
337 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
338 +)
339 +PATCHES_BIN=(
340 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
341 +)
342 +
343 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
344 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
345 + DEPEND+=" dev-util/patchbin"
346 +fi
347 +
348 wine_compiler_check() {
349 [[ ${MERGE_TYPE} = "binary" ]] && return 0
350
351 @@ -347,17 +363,7 @@ src_prepare() {
352 }
353
354 local md5="$(md5sum server/protocol.def)"
355 - local PATCHES=(
356 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
357 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
358 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
359 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
360 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
361 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
362 - )
363 - local PATCHES_BIN=(
364 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
365 - )
366 +
367 if use staging; then
368 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
369 ewarn "Wine bugzilla should explicitly state that staging was used."
370
371 diff --git a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
372 index 72cf8da0423..a5b3fa57a03 100644
373 --- a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
374 +++ b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
375 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
376
377 # tools/make_requests requires perl
378 DEPEND="${COMMON_DEPEND}
379 - dev-util/patchbin
380 sys-devel/flex
381 >=sys-kernel/linux-headers-2.6
382 virtual/pkgconfig
383 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
384 usr/share/applications/wine-uninstaller.desktop
385 usr/share/applications/wine-winecfg.desktop"
386
387 +PATCHES=(
388 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
389 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
390 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
391 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
392 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
393 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
394 +)
395 +PATCHES_BIN=(
396 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
397 +)
398 +
399 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
400 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
401 + DEPEND+=" dev-util/patchbin"
402 +fi
403 +
404 wine_compiler_check() {
405 [[ ${MERGE_TYPE} = "binary" ]] && return 0
406
407 @@ -347,17 +363,7 @@ src_prepare() {
408 }
409
410 local md5="$(md5sum server/protocol.def)"
411 - local PATCHES=(
412 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
413 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
414 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
415 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
416 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
417 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
418 - )
419 - local PATCHES_BIN=(
420 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
421 - )
422 +
423 if use staging; then
424 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
425 ewarn "Wine bugzilla should explicitly state that staging was used."
426
427 diff --git a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
428 index 72cf8da0423..a5b3fa57a03 100644
429 --- a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
430 +++ b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
431 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
432
433 # tools/make_requests requires perl
434 DEPEND="${COMMON_DEPEND}
435 - dev-util/patchbin
436 sys-devel/flex
437 >=sys-kernel/linux-headers-2.6
438 virtual/pkgconfig
439 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
440 usr/share/applications/wine-uninstaller.desktop
441 usr/share/applications/wine-winecfg.desktop"
442
443 +PATCHES=(
444 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
445 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
446 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
447 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
448 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
449 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
450 +)
451 +PATCHES_BIN=(
452 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
453 +)
454 +
455 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
456 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
457 + DEPEND+=" dev-util/patchbin"
458 +fi
459 +
460 wine_compiler_check() {
461 [[ ${MERGE_TYPE} = "binary" ]] && return 0
462
463 @@ -347,17 +363,7 @@ src_prepare() {
464 }
465
466 local md5="$(md5sum server/protocol.def)"
467 - local PATCHES=(
468 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
469 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
470 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
471 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
472 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
473 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
474 - )
475 - local PATCHES_BIN=(
476 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
477 - )
478 +
479 if use staging; then
480 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
481 ewarn "Wine bugzilla should explicitly state that staging was used."
482
483 diff --git a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
484 index 72cf8da0423..a5b3fa57a03 100644
485 --- a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
486 +++ b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
487 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
488
489 # tools/make_requests requires perl
490 DEPEND="${COMMON_DEPEND}
491 - dev-util/patchbin
492 sys-devel/flex
493 >=sys-kernel/linux-headers-2.6
494 virtual/pkgconfig
495 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
496 usr/share/applications/wine-uninstaller.desktop
497 usr/share/applications/wine-winecfg.desktop"
498
499 +PATCHES=(
500 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
501 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
502 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
503 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
504 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
505 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
506 +)
507 +PATCHES_BIN=(
508 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
509 +)
510 +
511 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
512 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
513 + DEPEND+=" dev-util/patchbin"
514 +fi
515 +
516 wine_compiler_check() {
517 [[ ${MERGE_TYPE} = "binary" ]] && return 0
518
519 @@ -347,17 +363,7 @@ src_prepare() {
520 }
521
522 local md5="$(md5sum server/protocol.def)"
523 - local PATCHES=(
524 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
525 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
526 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
527 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
528 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
529 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
530 - )
531 - local PATCHES_BIN=(
532 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
533 - )
534 +
535 if use staging; then
536 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
537 ewarn "Wine bugzilla should explicitly state that staging was used."
538
539 diff --git a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
540 index 72cf8da0423..a5b3fa57a03 100644
541 --- a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
542 +++ b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
543 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
544
545 # tools/make_requests requires perl
546 DEPEND="${COMMON_DEPEND}
547 - dev-util/patchbin
548 sys-devel/flex
549 >=sys-kernel/linux-headers-2.6
550 virtual/pkgconfig
551 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
552 usr/share/applications/wine-uninstaller.desktop
553 usr/share/applications/wine-winecfg.desktop"
554
555 +PATCHES=(
556 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
557 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
558 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
559 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
560 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
561 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
562 +)
563 +PATCHES_BIN=(
564 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
565 +)
566 +
567 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
568 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
569 + DEPEND+=" dev-util/patchbin"
570 +fi
571 +
572 wine_compiler_check() {
573 [[ ${MERGE_TYPE} = "binary" ]] && return 0
574
575 @@ -347,17 +363,7 @@ src_prepare() {
576 }
577
578 local md5="$(md5sum server/protocol.def)"
579 - local PATCHES=(
580 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
581 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
582 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
583 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
584 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
585 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
586 - )
587 - local PATCHES_BIN=(
588 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
589 - )
590 +
591 if use staging; then
592 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
593 ewarn "Wine bugzilla should explicitly state that staging was used."
594
595 diff --git a/app-emulation/wine-staging/wine-staging-2.18.ebuild b/app-emulation/wine-staging/wine-staging-2.18.ebuild
596 index 64f408768d4..cacc432e250 100644
597 --- a/app-emulation/wine-staging/wine-staging-2.18.ebuild
598 +++ b/app-emulation/wine-staging/wine-staging-2.18.ebuild
599 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
600
601 # tools/make_requests requires perl
602 DEPEND="${COMMON_DEPEND}
603 - dev-util/patchbin
604 sys-devel/flex
605 >=sys-kernel/linux-headers-2.6
606 virtual/pkgconfig
607 @@ -176,6 +175,19 @@ usr/share/applications/wine-notepad.desktop
608 usr/share/applications/wine-uninstaller.desktop
609 usr/share/applications/wine-winecfg.desktop"
610
611 +PATCHES=(
612 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
613 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
614 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
615 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
616 +)
617 +PATCHES_BIN=()
618 +
619 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
620 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
621 + DEPEND+=" dev-util/patchbin"
622 +fi
623 +
624 wine_compiler_check() {
625 [[ ${MERGE_TYPE} = "binary" ]] && return 0
626
627 @@ -347,14 +359,7 @@ src_prepare() {
628 }
629
630 local md5="$(md5sum server/protocol.def)"
631 - local PATCHES=(
632 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
633 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
634 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
635 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
636 - )
637 - local PATCHES_BIN=(
638 - )
639 +
640 if use staging; then
641 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
642 ewarn "Wine bugzilla should explicitly state that staging was used."
643
644 diff --git a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
645 index 04fe221e510..1177c5533ac 100644
646 --- a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
647 +++ b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
648 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
649
650 # tools/make_requests requires perl
651 DEPEND="${COMMON_DEPEND}
652 - dev-util/patchbin
653 sys-devel/flex
654 >=sys-kernel/linux-headers-2.6
655 virtual/pkgconfig
656 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
657 usr/share/applications/wine-uninstaller.desktop
658 usr/share/applications/wine-winecfg.desktop"
659
660 +PATCHES=(
661 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
662 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
663 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
664 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
665 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
666 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
667 +)
668 +PATCHES_BIN=(
669 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
670 +)
671 +
672 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
673 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
674 + DEPEND+=" dev-util/patchbin"
675 +fi
676 +
677 wine_compiler_check() {
678 [[ ${MERGE_TYPE} = "binary" ]] && return 0
679
680 @@ -347,17 +363,7 @@ src_prepare() {
681 }
682
683 local md5="$(md5sum server/protocol.def)"
684 - local PATCHES=(
685 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
686 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
687 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
688 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
689 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
690 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
691 - )
692 - local PATCHES_BIN=(
693 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
694 - )
695 +
696 if use staging; then
697 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
698 ewarn "Wine bugzilla should explicitly state that staging was used."
699
700 diff --git a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
701 index 04fe221e510..1177c5533ac 100644
702 --- a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
703 +++ b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
704 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
705
706 # tools/make_requests requires perl
707 DEPEND="${COMMON_DEPEND}
708 - dev-util/patchbin
709 sys-devel/flex
710 >=sys-kernel/linux-headers-2.6
711 virtual/pkgconfig
712 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
713 usr/share/applications/wine-uninstaller.desktop
714 usr/share/applications/wine-winecfg.desktop"
715
716 +PATCHES=(
717 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
718 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
719 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
720 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
721 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
722 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
723 +)
724 +PATCHES_BIN=(
725 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
726 +)
727 +
728 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
729 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
730 + DEPEND+=" dev-util/patchbin"
731 +fi
732 +
733 wine_compiler_check() {
734 [[ ${MERGE_TYPE} = "binary" ]] && return 0
735
736 @@ -347,17 +363,7 @@ src_prepare() {
737 }
738
739 local md5="$(md5sum server/protocol.def)"
740 - local PATCHES=(
741 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
742 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
743 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
744 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
745 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
746 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
747 - )
748 - local PATCHES_BIN=(
749 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
750 - )
751 +
752 if use staging; then
753 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
754 ewarn "Wine bugzilla should explicitly state that staging was used."
755
756 diff --git a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
757 index d41fb3977fc..f4d14b26fc4 100644
758 --- a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
759 +++ b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
760 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
761
762 # tools/make_requests requires perl
763 DEPEND="${COMMON_DEPEND}
764 - dev-util/patchbin
765 sys-devel/flex
766 >=sys-kernel/linux-headers-2.6
767 virtual/pkgconfig
768 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
769 usr/share/applications/wine-uninstaller.desktop
770 usr/share/applications/wine-winecfg.desktop"
771
772 +PATCHES=(
773 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
774 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
775 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
776 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
777 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
778 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
779 +)
780 +PATCHES_BIN=(
781 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
782 +)
783 +
784 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
785 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
786 + DEPEND+=" dev-util/patchbin"
787 +fi
788 +
789 wine_compiler_check() {
790 [[ ${MERGE_TYPE} = "binary" ]] && return 0
791
792 @@ -347,17 +363,7 @@ src_prepare() {
793 }
794
795 local md5="$(md5sum server/protocol.def)"
796 - local PATCHES=(
797 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
798 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
799 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
800 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
801 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
802 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
803 - )
804 - local PATCHES_BIN=(
805 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
806 - )
807 +
808 if use staging; then
809 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
810 ewarn "Wine bugzilla should explicitly state that staging was used."
811
812 diff --git a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
813 index d41fb3977fc..f4d14b26fc4 100644
814 --- a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
815 +++ b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
816 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
817
818 # tools/make_requests requires perl
819 DEPEND="${COMMON_DEPEND}
820 - dev-util/patchbin
821 sys-devel/flex
822 >=sys-kernel/linux-headers-2.6
823 virtual/pkgconfig
824 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
825 usr/share/applications/wine-uninstaller.desktop
826 usr/share/applications/wine-winecfg.desktop"
827
828 +PATCHES=(
829 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
830 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
831 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
832 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
833 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
834 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
835 +)
836 +PATCHES_BIN=(
837 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
838 +)
839 +
840 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
841 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
842 + DEPEND+=" dev-util/patchbin"
843 +fi
844 +
845 wine_compiler_check() {
846 [[ ${MERGE_TYPE} = "binary" ]] && return 0
847
848 @@ -347,17 +363,7 @@ src_prepare() {
849 }
850
851 local md5="$(md5sum server/protocol.def)"
852 - local PATCHES=(
853 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
854 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
855 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
856 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
857 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
858 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
859 - )
860 - local PATCHES_BIN=(
861 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
862 - )
863 +
864 if use staging; then
865 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
866 ewarn "Wine bugzilla should explicitly state that staging was used."
867
868 diff --git a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
869 index d41fb3977fc..f4d14b26fc4 100644
870 --- a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
871 +++ b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
872 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
873
874 # tools/make_requests requires perl
875 DEPEND="${COMMON_DEPEND}
876 - dev-util/patchbin
877 sys-devel/flex
878 >=sys-kernel/linux-headers-2.6
879 virtual/pkgconfig
880 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
881 usr/share/applications/wine-uninstaller.desktop
882 usr/share/applications/wine-winecfg.desktop"
883
884 +PATCHES=(
885 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
886 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
887 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
888 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
889 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
890 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
891 +)
892 +PATCHES_BIN=(
893 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
894 +)
895 +
896 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
897 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
898 + DEPEND+=" dev-util/patchbin"
899 +fi
900 +
901 wine_compiler_check() {
902 [[ ${MERGE_TYPE} = "binary" ]] && return 0
903
904 @@ -347,17 +363,7 @@ src_prepare() {
905 }
906
907 local md5="$(md5sum server/protocol.def)"
908 - local PATCHES=(
909 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
910 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
911 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
912 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
913 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
914 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
915 - )
916 - local PATCHES_BIN=(
917 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
918 - )
919 +
920 if use staging; then
921 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
922 ewarn "Wine bugzilla should explicitly state that staging was used."
923
924 diff --git a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
925 index d41fb3977fc..f4d14b26fc4 100644
926 --- a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
927 +++ b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
928 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
929
930 # tools/make_requests requires perl
931 DEPEND="${COMMON_DEPEND}
932 - dev-util/patchbin
933 sys-devel/flex
934 >=sys-kernel/linux-headers-2.6
935 virtual/pkgconfig
936 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
937 usr/share/applications/wine-uninstaller.desktop
938 usr/share/applications/wine-winecfg.desktop"
939
940 +PATCHES=(
941 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
942 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
943 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
944 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
945 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
946 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
947 +)
948 +PATCHES_BIN=(
949 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
950 +)
951 +
952 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
953 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
954 + DEPEND+=" dev-util/patchbin"
955 +fi
956 +
957 wine_compiler_check() {
958 [[ ${MERGE_TYPE} = "binary" ]] && return 0
959
960 @@ -347,17 +363,7 @@ src_prepare() {
961 }
962
963 local md5="$(md5sum server/protocol.def)"
964 - local PATCHES=(
965 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
966 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
967 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
968 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
969 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
970 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
971 - )
972 - local PATCHES_BIN=(
973 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
974 - )
975 +
976 if use staging; then
977 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
978 ewarn "Wine bugzilla should explicitly state that staging was used."
979
980 diff --git a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
981 index d41fb3977fc..f4d14b26fc4 100644
982 --- a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
983 +++ b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
984 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
985
986 # tools/make_requests requires perl
987 DEPEND="${COMMON_DEPEND}
988 - dev-util/patchbin
989 sys-devel/flex
990 >=sys-kernel/linux-headers-2.6
991 virtual/pkgconfig
992 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
993 usr/share/applications/wine-uninstaller.desktop
994 usr/share/applications/wine-winecfg.desktop"
995
996 +PATCHES=(
997 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
998 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
999 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1000 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1001 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1002 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1003 +)
1004 +PATCHES_BIN=(
1005 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1006 +)
1007 +
1008 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
1009 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
1010 + DEPEND+=" dev-util/patchbin"
1011 +fi
1012 +
1013 wine_compiler_check() {
1014 [[ ${MERGE_TYPE} = "binary" ]] && return 0
1015
1016 @@ -347,17 +363,7 @@ src_prepare() {
1017 }
1018
1019 local md5="$(md5sum server/protocol.def)"
1020 - local PATCHES=(
1021 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1022 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1023 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1024 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1025 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1026 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1027 - )
1028 - local PATCHES_BIN=(
1029 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1030 - )
1031 +
1032 if use staging; then
1033 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
1034 ewarn "Wine bugzilla should explicitly state that staging was used."
1035
1036 diff --git a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
1037 index d41fb3977fc..f4d14b26fc4 100644
1038 --- a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
1039 +++ b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
1040 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
1041
1042 # tools/make_requests requires perl
1043 DEPEND="${COMMON_DEPEND}
1044 - dev-util/patchbin
1045 sys-devel/flex
1046 >=sys-kernel/linux-headers-2.6
1047 virtual/pkgconfig
1048 @@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
1049 usr/share/applications/wine-uninstaller.desktop
1050 usr/share/applications/wine-winecfg.desktop"
1051
1052 +PATCHES=(
1053 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1054 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1055 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1056 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1057 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1058 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1059 +)
1060 +PATCHES_BIN=(
1061 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1062 +)
1063 +
1064 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
1065 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
1066 + DEPEND+=" dev-util/patchbin"
1067 +fi
1068 +
1069 wine_compiler_check() {
1070 [[ ${MERGE_TYPE} = "binary" ]] && return 0
1071
1072 @@ -347,17 +363,7 @@ src_prepare() {
1073 }
1074
1075 local md5="$(md5sum server/protocol.def)"
1076 - local PATCHES=(
1077 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1078 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1079 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1080 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1081 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1082 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1083 - )
1084 - local PATCHES_BIN=(
1085 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1086 - )
1087 +
1088 if use staging; then
1089 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
1090 ewarn "Wine bugzilla should explicitly state that staging was used."
1091
1092 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
1093 index 64f408768d4..cacc432e250 100644
1094 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
1095 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
1096 @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
1097
1098 # tools/make_requests requires perl
1099 DEPEND="${COMMON_DEPEND}
1100 - dev-util/patchbin
1101 sys-devel/flex
1102 >=sys-kernel/linux-headers-2.6
1103 virtual/pkgconfig
1104 @@ -176,6 +175,19 @@ usr/share/applications/wine-notepad.desktop
1105 usr/share/applications/wine-uninstaller.desktop
1106 usr/share/applications/wine-winecfg.desktop"
1107
1108 +PATCHES=(
1109 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1110 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1111 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1112 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1113 +)
1114 +PATCHES_BIN=()
1115 +
1116 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
1117 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
1118 + DEPEND+=" dev-util/patchbin"
1119 +fi
1120 +
1121 wine_compiler_check() {
1122 [[ ${MERGE_TYPE} = "binary" ]] && return 0
1123
1124 @@ -347,14 +359,7 @@ src_prepare() {
1125 }
1126
1127 local md5="$(md5sum server/protocol.def)"
1128 - local PATCHES=(
1129 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1130 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1131 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1132 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1133 - )
1134 - local PATCHES_BIN=(
1135 - )
1136 +
1137 if use staging; then
1138 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
1139 ewarn "Wine bugzilla should explicitly state that staging was used."
Report Message
Find on MARC Find on Google Groups