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