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-vanilla/
Date: Sun, 05 Nov 2017 05:53:33
Message-Id: 1509861178.5b6d00017644283b5d199787b9603928ef8fa13e.np-hardass@gentoo
1 commit: 5b6d00017644283b5d199787b9603928ef8fa13e
2 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 3 16:56:15 2017 +0000
4 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 5 05:52:58 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6d0001
7
8 app-emulation/wine-vanilla: 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-vanilla/wine-vanilla-2.0-r1.ebuild | 29 +++++++++++++---------
14 .../wine-vanilla/wine-vanilla-2.0.1-r1.ebuild | 29 +++++++++++++---------
15 .../wine-vanilla/wine-vanilla-2.0.2-r1.ebuild | 29 +++++++++++++---------
16 .../wine-vanilla/wine-vanilla-2.1-r1.ebuild | 29 +++++++++++++---------
17 .../wine-vanilla/wine-vanilla-2.10-r1.ebuild | 29 +++++++++++++---------
18 .../wine-vanilla/wine-vanilla-2.11-r1.ebuild | 29 +++++++++++++---------
19 .../wine-vanilla/wine-vanilla-2.12-r1.ebuild | 29 +++++++++++++---------
20 .../wine-vanilla/wine-vanilla-2.13-r1.ebuild | 29 +++++++++++++---------
21 .../wine-vanilla/wine-vanilla-2.14-r1.ebuild | 29 +++++++++++++---------
22 .../wine-vanilla/wine-vanilla-2.15-r1.ebuild | 29 +++++++++++++---------
23 .../wine-vanilla/wine-vanilla-2.16-r1.ebuild | 29 +++++++++++++---------
24 .../wine-vanilla/wine-vanilla-2.17-r1.ebuild | 29 +++++++++++++---------
25 ...-2.18-r1.ebuild => wine-vanilla-2.18-r2.ebuild} | 22 +++++++++-------
26 ...lla-2.19.ebuild => wine-vanilla-2.19-r1.ebuild} | 22 +++++++++-------
27 .../wine-vanilla/wine-vanilla-2.2-r1.ebuild | 29 +++++++++++++---------
28 .../wine-vanilla/wine-vanilla-2.3-r1.ebuild | 29 +++++++++++++---------
29 .../wine-vanilla/wine-vanilla-2.4-r1.ebuild | 29 +++++++++++++---------
30 .../wine-vanilla/wine-vanilla-2.5-r1.ebuild | 29 +++++++++++++---------
31 .../wine-vanilla/wine-vanilla-2.6-r1.ebuild | 29 +++++++++++++---------
32 .../wine-vanilla/wine-vanilla-2.7-r1.ebuild | 29 +++++++++++++---------
33 .../wine-vanilla/wine-vanilla-2.8-r1.ebuild | 29 +++++++++++++---------
34 .../wine-vanilla/wine-vanilla-2.9-r1.ebuild | 29 +++++++++++++---------
35 .../wine-vanilla/wine-vanilla-9999.ebuild | 22 +++++++++-------
36 23 files changed, 379 insertions(+), 267 deletions(-)
37
38 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
39 index 697e0f31fb0..775a1f19fce 100644
40 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
41 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
42 @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
43
44 # tools/make_requests requires perl
45 DEPEND="${COMMON_DEPEND}
46 - dev-util/patchbin
47 sys-devel/flex
48 >=sys-kernel/linux-headers-2.6
49 virtual/pkgconfig
50 @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop
51 usr/share/applications/wine-uninstaller.desktop
52 usr/share/applications/wine-winecfg.desktop"
53
54 +PATCHES=(
55 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
56 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
57 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
58 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
59 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
60 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
61 +)
62 +PATCHES_BIN=(
63 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
64 +)
65 +
66 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
67 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
68 + DEPEND+=" dev-util/patchbin"
69 +fi
70 +
71 wine_compiler_check() {
72 [[ ${MERGE_TYPE} = "binary" ]] && return 0
73
74 @@ -299,17 +315,6 @@ src_prepare() {
75 }
76
77 local md5="$(md5sum server/protocol.def)"
78 - local PATCHES=(
79 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
80 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
81 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
82 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
83 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
84 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
85 - )
86 - local PATCHES_BIN=(
87 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
88 - )
89
90 default
91 eapply_bin
92
93 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
94 index 72ca9065ccc..0a297502ec6 100644
95 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
96 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
97 @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
98
99 # tools/make_requests requires perl
100 DEPEND="${COMMON_DEPEND}
101 - dev-util/patchbin
102 sys-devel/flex
103 >=sys-kernel/linux-headers-2.6
104 virtual/pkgconfig
105 @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop
106 usr/share/applications/wine-uninstaller.desktop
107 usr/share/applications/wine-winecfg.desktop"
108
109 +PATCHES=(
110 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
111 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
112 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
113 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
114 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
115 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
116 +)
117 +PATCHES_BIN=(
118 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
119 +)
120 +
121 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
122 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
123 + DEPEND+=" dev-util/patchbin"
124 +fi
125 +
126 wine_compiler_check() {
127 [[ ${MERGE_TYPE} = "binary" ]] && return 0
128
129 @@ -299,17 +315,6 @@ src_prepare() {
130 }
131
132 local md5="$(md5sum server/protocol.def)"
133 - local PATCHES=(
134 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
135 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
136 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
137 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
138 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
139 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
140 - )
141 - local PATCHES_BIN=(
142 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
143 - )
144
145 default
146 eapply_bin
147
148 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
149 index 72ca9065ccc..0a297502ec6 100644
150 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
151 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
152 @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
153
154 # tools/make_requests requires perl
155 DEPEND="${COMMON_DEPEND}
156 - dev-util/patchbin
157 sys-devel/flex
158 >=sys-kernel/linux-headers-2.6
159 virtual/pkgconfig
160 @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop
161 usr/share/applications/wine-uninstaller.desktop
162 usr/share/applications/wine-winecfg.desktop"
163
164 +PATCHES=(
165 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
166 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
167 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
168 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
169 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
170 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
171 +)
172 +PATCHES_BIN=(
173 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
174 +)
175 +
176 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
177 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
178 + DEPEND+=" dev-util/patchbin"
179 +fi
180 +
181 wine_compiler_check() {
182 [[ ${MERGE_TYPE} = "binary" ]] && return 0
183
184 @@ -299,17 +315,6 @@ src_prepare() {
185 }
186
187 local md5="$(md5sum server/protocol.def)"
188 - local PATCHES=(
189 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
190 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
191 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
192 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
193 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
194 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
195 - )
196 - local PATCHES_BIN=(
197 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
198 - )
199
200 default
201 eapply_bin
202
203 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild
204 index 5d4299bca59..c94a6ccc98d 100644
205 --- a/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild
206 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild
207 @@ -131,7 +131,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 @@ -151,6 +150,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 @@ -299,17 +315,6 @@ 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 default
256 eapply_bin
257
258 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild
259 index b79fd64dd9a..0cbbf7c0682 100644
260 --- a/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild
261 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild
262 @@ -132,7 +132,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 @@ -152,6 +151,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 @@ -300,17 +316,6 @@ 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 default
311 eapply_bin
312
313 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild
314 index b79fd64dd9a..0cbbf7c0682 100644
315 --- a/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild
316 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild
317 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
318
319 # tools/make_requests requires perl
320 DEPEND="${COMMON_DEPEND}
321 - dev-util/patchbin
322 sys-devel/flex
323 >=sys-kernel/linux-headers-2.6
324 virtual/pkgconfig
325 @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop
326 usr/share/applications/wine-uninstaller.desktop
327 usr/share/applications/wine-winecfg.desktop"
328
329 +PATCHES=(
330 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
331 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
332 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
333 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
334 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
335 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
336 +)
337 +PATCHES_BIN=(
338 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
339 +)
340 +
341 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
342 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
343 + DEPEND+=" dev-util/patchbin"
344 +fi
345 +
346 wine_compiler_check() {
347 [[ ${MERGE_TYPE} = "binary" ]] && return 0
348
349 @@ -300,17 +316,6 @@ src_prepare() {
350 }
351
352 local md5="$(md5sum server/protocol.def)"
353 - local PATCHES=(
354 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
355 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
356 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
357 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
358 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
359 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
360 - )
361 - local PATCHES_BIN=(
362 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
363 - )
364
365 default
366 eapply_bin
367
368 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild
369 index b79fd64dd9a..0cbbf7c0682 100644
370 --- a/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild
371 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild
372 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
373
374 # tools/make_requests requires perl
375 DEPEND="${COMMON_DEPEND}
376 - dev-util/patchbin
377 sys-devel/flex
378 >=sys-kernel/linux-headers-2.6
379 virtual/pkgconfig
380 @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop
381 usr/share/applications/wine-uninstaller.desktop
382 usr/share/applications/wine-winecfg.desktop"
383
384 +PATCHES=(
385 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
386 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
387 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
388 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
389 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
390 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
391 +)
392 +PATCHES_BIN=(
393 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
394 +)
395 +
396 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
397 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
398 + DEPEND+=" dev-util/patchbin"
399 +fi
400 +
401 wine_compiler_check() {
402 [[ ${MERGE_TYPE} = "binary" ]] && return 0
403
404 @@ -300,17 +316,6 @@ src_prepare() {
405 }
406
407 local md5="$(md5sum server/protocol.def)"
408 - local PATCHES=(
409 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
410 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
411 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
412 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
413 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
414 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
415 - )
416 - local PATCHES_BIN=(
417 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
418 - )
419
420 default
421 eapply_bin
422
423 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild
424 index b79fd64dd9a..0cbbf7c0682 100644
425 --- a/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild
426 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild
427 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
428
429 # tools/make_requests requires perl
430 DEPEND="${COMMON_DEPEND}
431 - dev-util/patchbin
432 sys-devel/flex
433 >=sys-kernel/linux-headers-2.6
434 virtual/pkgconfig
435 @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop
436 usr/share/applications/wine-uninstaller.desktop
437 usr/share/applications/wine-winecfg.desktop"
438
439 +PATCHES=(
440 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
441 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
442 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
443 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
444 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
445 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
446 +)
447 +PATCHES_BIN=(
448 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
449 +)
450 +
451 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
452 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
453 + DEPEND+=" dev-util/patchbin"
454 +fi
455 +
456 wine_compiler_check() {
457 [[ ${MERGE_TYPE} = "binary" ]] && return 0
458
459 @@ -300,17 +316,6 @@ src_prepare() {
460 }
461
462 local md5="$(md5sum server/protocol.def)"
463 - local PATCHES=(
464 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
465 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
466 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
467 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
468 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
469 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
470 - )
471 - local PATCHES_BIN=(
472 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
473 - )
474
475 default
476 eapply_bin
477
478 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild
479 index ef68ed71111..7a674044d95 100644
480 --- a/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild
481 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild
482 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
483
484 # tools/make_requests requires perl
485 DEPEND="${COMMON_DEPEND}
486 - dev-util/patchbin
487 sys-devel/flex
488 >=sys-kernel/linux-headers-2.6
489 virtual/pkgconfig
490 @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop
491 usr/share/applications/wine-uninstaller.desktop
492 usr/share/applications/wine-winecfg.desktop"
493
494 +PATCHES=(
495 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
496 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
497 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
498 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
499 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
500 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
501 +)
502 +PATCHES_BIN=(
503 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
504 +)
505 +
506 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
507 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
508 + DEPEND+=" dev-util/patchbin"
509 +fi
510 +
511 wine_compiler_check() {
512 [[ ${MERGE_TYPE} = "binary" ]] && return 0
513
514 @@ -300,17 +316,6 @@ src_prepare() {
515 }
516
517 local md5="$(md5sum server/protocol.def)"
518 - local PATCHES=(
519 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
520 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
521 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
522 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
523 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
524 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
525 - )
526 - local PATCHES_BIN=(
527 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
528 - )
529
530 default
531 eapply_bin
532
533 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild
534 index ef68ed71111..7a674044d95 100644
535 --- a/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild
536 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild
537 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
538
539 # tools/make_requests requires perl
540 DEPEND="${COMMON_DEPEND}
541 - dev-util/patchbin
542 sys-devel/flex
543 >=sys-kernel/linux-headers-2.6
544 virtual/pkgconfig
545 @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop
546 usr/share/applications/wine-uninstaller.desktop
547 usr/share/applications/wine-winecfg.desktop"
548
549 +PATCHES=(
550 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
551 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
552 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
553 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
554 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
555 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
556 +)
557 +PATCHES_BIN=(
558 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
559 +)
560 +
561 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
562 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
563 + DEPEND+=" dev-util/patchbin"
564 +fi
565 +
566 wine_compiler_check() {
567 [[ ${MERGE_TYPE} = "binary" ]] && return 0
568
569 @@ -300,17 +316,6 @@ src_prepare() {
570 }
571
572 local md5="$(md5sum server/protocol.def)"
573 - local PATCHES=(
574 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
575 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
576 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
577 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
578 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
579 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
580 - )
581 - local PATCHES_BIN=(
582 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
583 - )
584
585 default
586 eapply_bin
587
588 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild
589 index ef68ed71111..7a674044d95 100644
590 --- a/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild
591 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild
592 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
593
594 # tools/make_requests requires perl
595 DEPEND="${COMMON_DEPEND}
596 - dev-util/patchbin
597 sys-devel/flex
598 >=sys-kernel/linux-headers-2.6
599 virtual/pkgconfig
600 @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop
601 usr/share/applications/wine-uninstaller.desktop
602 usr/share/applications/wine-winecfg.desktop"
603
604 +PATCHES=(
605 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
606 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
607 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
608 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
609 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
610 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
611 +)
612 +PATCHES_BIN=(
613 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
614 +)
615 +
616 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
617 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
618 + DEPEND+=" dev-util/patchbin"
619 +fi
620 +
621 wine_compiler_check() {
622 [[ ${MERGE_TYPE} = "binary" ]] && return 0
623
624 @@ -300,17 +316,6 @@ src_prepare() {
625 }
626
627 local md5="$(md5sum server/protocol.def)"
628 - local PATCHES=(
629 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
630 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
631 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
632 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
633 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
634 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
635 - )
636 - local PATCHES_BIN=(
637 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
638 - )
639
640 default
641 eapply_bin
642
643 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild
644 index ef68ed71111..7a674044d95 100644
645 --- a/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild
646 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild
647 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
648
649 # tools/make_requests requires perl
650 DEPEND="${COMMON_DEPEND}
651 - dev-util/patchbin
652 sys-devel/flex
653 >=sys-kernel/linux-headers-2.6
654 virtual/pkgconfig
655 @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop
656 usr/share/applications/wine-uninstaller.desktop
657 usr/share/applications/wine-winecfg.desktop"
658
659 +PATCHES=(
660 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
661 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
662 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
663 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
664 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
665 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
666 +)
667 +PATCHES_BIN=(
668 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
669 +)
670 +
671 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
672 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
673 + DEPEND+=" dev-util/patchbin"
674 +fi
675 +
676 wine_compiler_check() {
677 [[ ${MERGE_TYPE} = "binary" ]] && return 0
678
679 @@ -300,17 +316,6 @@ src_prepare() {
680 }
681
682 local md5="$(md5sum server/protocol.def)"
683 - local PATCHES=(
684 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
685 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
686 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
687 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
688 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
689 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
690 - )
691 - local PATCHES_BIN=(
692 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
693 - )
694
695 default
696 eapply_bin
697
698 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.18-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild
699 similarity index 97%
700 rename from app-emulation/wine-vanilla/wine-vanilla-2.18-r1.ebuild
701 rename to app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild
702 index 8851cfc5ac4..d8b9031e8ed 100644
703 --- a/app-emulation/wine-vanilla/wine-vanilla-2.18-r1.ebuild
704 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild
705 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
706
707 # tools/make_requests requires perl
708 DEPEND="${COMMON_DEPEND}
709 - dev-util/patchbin
710 sys-devel/flex
711 >=sys-kernel/linux-headers-2.6
712 virtual/pkgconfig
713 @@ -152,6 +151,19 @@ usr/share/applications/wine-notepad.desktop
714 usr/share/applications/wine-uninstaller.desktop
715 usr/share/applications/wine-winecfg.desktop"
716
717 +PATCHES=(
718 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
719 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
720 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
721 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
722 +)
723 +PATCHES_BIN=()
724 +
725 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
726 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
727 + DEPEND+=" dev-util/patchbin"
728 +fi
729 +
730 wine_compiler_check() {
731 [[ ${MERGE_TYPE} = "binary" ]] && return 0
732
733 @@ -300,14 +312,6 @@ src_prepare() {
734 }
735
736 local md5="$(md5sum server/protocol.def)"
737 - local PATCHES=(
738 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
739 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
740 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
741 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
742 - )
743 - local PATCHES_BIN=(
744 - )
745
746 default
747 eapply_bin
748
749 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild
750 similarity index 97%
751 rename from app-emulation/wine-vanilla/wine-vanilla-2.19.ebuild
752 rename to app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild
753 index 8851cfc5ac4..d8b9031e8ed 100644
754 --- a/app-emulation/wine-vanilla/wine-vanilla-2.19.ebuild
755 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild
756 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
757
758 # tools/make_requests requires perl
759 DEPEND="${COMMON_DEPEND}
760 - dev-util/patchbin
761 sys-devel/flex
762 >=sys-kernel/linux-headers-2.6
763 virtual/pkgconfig
764 @@ -152,6 +151,19 @@ usr/share/applications/wine-notepad.desktop
765 usr/share/applications/wine-uninstaller.desktop
766 usr/share/applications/wine-winecfg.desktop"
767
768 +PATCHES=(
769 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
770 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
771 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
772 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
773 +)
774 +PATCHES_BIN=()
775 +
776 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
777 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
778 + DEPEND+=" dev-util/patchbin"
779 +fi
780 +
781 wine_compiler_check() {
782 [[ ${MERGE_TYPE} = "binary" ]] && return 0
783
784 @@ -300,14 +312,6 @@ src_prepare() {
785 }
786
787 local md5="$(md5sum server/protocol.def)"
788 - local PATCHES=(
789 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
790 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
791 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
792 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
793 - )
794 - local PATCHES_BIN=(
795 - )
796
797 default
798 eapply_bin
799
800 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild
801 index 5d4299bca59..c94a6ccc98d 100644
802 --- a/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild
803 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild
804 @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
805
806 # tools/make_requests requires perl
807 DEPEND="${COMMON_DEPEND}
808 - dev-util/patchbin
809 sys-devel/flex
810 >=sys-kernel/linux-headers-2.6
811 virtual/pkgconfig
812 @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop
813 usr/share/applications/wine-uninstaller.desktop
814 usr/share/applications/wine-winecfg.desktop"
815
816 +PATCHES=(
817 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
818 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
819 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
820 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
821 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
822 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
823 +)
824 +PATCHES_BIN=(
825 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
826 +)
827 +
828 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
829 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
830 + DEPEND+=" dev-util/patchbin"
831 +fi
832 +
833 wine_compiler_check() {
834 [[ ${MERGE_TYPE} = "binary" ]] && return 0
835
836 @@ -299,17 +315,6 @@ src_prepare() {
837 }
838
839 local md5="$(md5sum server/protocol.def)"
840 - local PATCHES=(
841 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
842 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
843 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
844 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
845 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
846 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
847 - )
848 - local PATCHES_BIN=(
849 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
850 - )
851
852 default
853 eapply_bin
854
855 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild
856 index 5d4299bca59..c94a6ccc98d 100644
857 --- a/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild
858 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild
859 @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
860
861 # tools/make_requests requires perl
862 DEPEND="${COMMON_DEPEND}
863 - dev-util/patchbin
864 sys-devel/flex
865 >=sys-kernel/linux-headers-2.6
866 virtual/pkgconfig
867 @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop
868 usr/share/applications/wine-uninstaller.desktop
869 usr/share/applications/wine-winecfg.desktop"
870
871 +PATCHES=(
872 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
873 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
874 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
875 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
876 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
877 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
878 +)
879 +PATCHES_BIN=(
880 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
881 +)
882 +
883 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
884 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
885 + DEPEND+=" dev-util/patchbin"
886 +fi
887 +
888 wine_compiler_check() {
889 [[ ${MERGE_TYPE} = "binary" ]] && return 0
890
891 @@ -299,17 +315,6 @@ src_prepare() {
892 }
893
894 local md5="$(md5sum server/protocol.def)"
895 - local PATCHES=(
896 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
897 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
898 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
899 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
900 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
901 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
902 - )
903 - local PATCHES_BIN=(
904 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
905 - )
906
907 default
908 eapply_bin
909
910 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild
911 index 757d3e9e857..a69e75d961e 100644
912 --- a/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild
913 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild
914 @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
915
916 # tools/make_requests requires perl
917 DEPEND="${COMMON_DEPEND}
918 - dev-util/patchbin
919 sys-devel/flex
920 >=sys-kernel/linux-headers-2.6
921 virtual/pkgconfig
922 @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop
923 usr/share/applications/wine-uninstaller.desktop
924 usr/share/applications/wine-winecfg.desktop"
925
926 +PATCHES=(
927 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
928 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
929 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
930 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
931 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
932 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
933 +)
934 +PATCHES_BIN=(
935 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
936 +)
937 +
938 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
939 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
940 + DEPEND+=" dev-util/patchbin"
941 +fi
942 +
943 wine_compiler_check() {
944 [[ ${MERGE_TYPE} = "binary" ]] && return 0
945
946 @@ -299,17 +315,6 @@ src_prepare() {
947 }
948
949 local md5="$(md5sum server/protocol.def)"
950 - local PATCHES=(
951 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
952 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
953 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
954 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
955 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
956 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
957 - )
958 - local PATCHES_BIN=(
959 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
960 - )
961
962 default
963 eapply_bin
964
965 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild
966 index 757d3e9e857..a69e75d961e 100644
967 --- a/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild
968 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild
969 @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
970
971 # tools/make_requests requires perl
972 DEPEND="${COMMON_DEPEND}
973 - dev-util/patchbin
974 sys-devel/flex
975 >=sys-kernel/linux-headers-2.6
976 virtual/pkgconfig
977 @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop
978 usr/share/applications/wine-uninstaller.desktop
979 usr/share/applications/wine-winecfg.desktop"
980
981 +PATCHES=(
982 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
983 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
984 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
985 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
986 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
987 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
988 +)
989 +PATCHES_BIN=(
990 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
991 +)
992 +
993 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
994 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
995 + DEPEND+=" dev-util/patchbin"
996 +fi
997 +
998 wine_compiler_check() {
999 [[ ${MERGE_TYPE} = "binary" ]] && return 0
1000
1001 @@ -299,17 +315,6 @@ src_prepare() {
1002 }
1003
1004 local md5="$(md5sum server/protocol.def)"
1005 - local PATCHES=(
1006 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1007 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1008 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1009 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1010 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1011 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1012 - )
1013 - local PATCHES_BIN=(
1014 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1015 - )
1016
1017 default
1018 eapply_bin
1019
1020 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild
1021 index 757d3e9e857..a69e75d961e 100644
1022 --- a/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild
1023 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild
1024 @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
1025
1026 # tools/make_requests requires perl
1027 DEPEND="${COMMON_DEPEND}
1028 - dev-util/patchbin
1029 sys-devel/flex
1030 >=sys-kernel/linux-headers-2.6
1031 virtual/pkgconfig
1032 @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop
1033 usr/share/applications/wine-uninstaller.desktop
1034 usr/share/applications/wine-winecfg.desktop"
1035
1036 +PATCHES=(
1037 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1038 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1039 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1040 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1041 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1042 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1043 +)
1044 +PATCHES_BIN=(
1045 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1046 +)
1047 +
1048 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
1049 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
1050 + DEPEND+=" dev-util/patchbin"
1051 +fi
1052 +
1053 wine_compiler_check() {
1054 [[ ${MERGE_TYPE} = "binary" ]] && return 0
1055
1056 @@ -299,17 +315,6 @@ src_prepare() {
1057 }
1058
1059 local md5="$(md5sum server/protocol.def)"
1060 - local PATCHES=(
1061 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1062 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1063 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1064 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1065 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1066 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1067 - )
1068 - local PATCHES_BIN=(
1069 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1070 - )
1071
1072 default
1073 eapply_bin
1074
1075 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild
1076 index 757d3e9e857..a69e75d961e 100644
1077 --- a/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild
1078 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild
1079 @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
1080
1081 # tools/make_requests requires perl
1082 DEPEND="${COMMON_DEPEND}
1083 - dev-util/patchbin
1084 sys-devel/flex
1085 >=sys-kernel/linux-headers-2.6
1086 virtual/pkgconfig
1087 @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop
1088 usr/share/applications/wine-uninstaller.desktop
1089 usr/share/applications/wine-winecfg.desktop"
1090
1091 +PATCHES=(
1092 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1093 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1094 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1095 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1096 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1097 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1098 +)
1099 +PATCHES_BIN=(
1100 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1101 +)
1102 +
1103 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
1104 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
1105 + DEPEND+=" dev-util/patchbin"
1106 +fi
1107 +
1108 wine_compiler_check() {
1109 [[ ${MERGE_TYPE} = "binary" ]] && return 0
1110
1111 @@ -299,17 +315,6 @@ src_prepare() {
1112 }
1113
1114 local md5="$(md5sum server/protocol.def)"
1115 - local PATCHES=(
1116 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1117 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1118 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1119 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1120 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1121 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1122 - )
1123 - local PATCHES_BIN=(
1124 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1125 - )
1126
1127 default
1128 eapply_bin
1129
1130 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild
1131 index 757d3e9e857..a69e75d961e 100644
1132 --- a/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild
1133 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild
1134 @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
1135
1136 # tools/make_requests requires perl
1137 DEPEND="${COMMON_DEPEND}
1138 - dev-util/patchbin
1139 sys-devel/flex
1140 >=sys-kernel/linux-headers-2.6
1141 virtual/pkgconfig
1142 @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop
1143 usr/share/applications/wine-uninstaller.desktop
1144 usr/share/applications/wine-winecfg.desktop"
1145
1146 +PATCHES=(
1147 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1148 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1149 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1150 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1151 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1152 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1153 +)
1154 +PATCHES_BIN=(
1155 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1156 +)
1157 +
1158 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
1159 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
1160 + DEPEND+=" dev-util/patchbin"
1161 +fi
1162 +
1163 wine_compiler_check() {
1164 [[ ${MERGE_TYPE} = "binary" ]] && return 0
1165
1166 @@ -299,17 +315,6 @@ src_prepare() {
1167 }
1168
1169 local md5="$(md5sum server/protocol.def)"
1170 - local PATCHES=(
1171 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1172 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1173 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1174 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1175 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1176 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1177 - )
1178 - local PATCHES_BIN=(
1179 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1180 - )
1181
1182 default
1183 eapply_bin
1184
1185 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild
1186 index b79fd64dd9a..0cbbf7c0682 100644
1187 --- a/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild
1188 +++ b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild
1189 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
1190
1191 # tools/make_requests requires perl
1192 DEPEND="${COMMON_DEPEND}
1193 - dev-util/patchbin
1194 sys-devel/flex
1195 >=sys-kernel/linux-headers-2.6
1196 virtual/pkgconfig
1197 @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop
1198 usr/share/applications/wine-uninstaller.desktop
1199 usr/share/applications/wine-winecfg.desktop"
1200
1201 +PATCHES=(
1202 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1203 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1204 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1205 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1206 + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1207 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1208 +)
1209 +PATCHES_BIN=(
1210 + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1211 +)
1212 +
1213 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
1214 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
1215 + DEPEND+=" dev-util/patchbin"
1216 +fi
1217 +
1218 wine_compiler_check() {
1219 [[ ${MERGE_TYPE} = "binary" ]] && return 0
1220
1221 @@ -300,17 +316,6 @@ src_prepare() {
1222 }
1223
1224 local md5="$(md5sum server/protocol.def)"
1225 - local PATCHES=(
1226 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1227 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1228 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1229 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1230 - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
1231 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
1232 - )
1233 - local PATCHES_BIN=(
1234 - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
1235 - )
1236
1237 default
1238 eapply_bin
1239
1240 diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
1241 index 8851cfc5ac4..d8b9031e8ed 100644
1242 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
1243 +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
1244 @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND}
1245
1246 # tools/make_requests requires perl
1247 DEPEND="${COMMON_DEPEND}
1248 - dev-util/patchbin
1249 sys-devel/flex
1250 >=sys-kernel/linux-headers-2.6
1251 virtual/pkgconfig
1252 @@ -152,6 +151,19 @@ usr/share/applications/wine-notepad.desktop
1253 usr/share/applications/wine-uninstaller.desktop
1254 usr/share/applications/wine-winecfg.desktop"
1255
1256 +PATCHES=(
1257 + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1258 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1259 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1260 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1261 +)
1262 +PATCHES_BIN=()
1263 +
1264 +# https://bugs.gentoo.org/show_bug.cgi?id=635222
1265 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
1266 + DEPEND+=" dev-util/patchbin"
1267 +fi
1268 +
1269 wine_compiler_check() {
1270 [[ ${MERGE_TYPE} = "binary" ]] && return 0
1271
1272 @@ -300,14 +312,6 @@ src_prepare() {
1273 }
1274
1275 local md5="$(md5sum server/protocol.def)"
1276 - local PATCHES=(
1277 - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
1278 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
1279 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
1280 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
1281 - )
1282 - local PATCHES_BIN=(
1283 - )
1284
1285 default
1286 eapply_bin
Report Message
Find on MARC Find on Google Groups