Gentoo Archives: gentoo-commits

From: NP Hardass <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/
Date: Fri, 30 Dec 2016 22:43:28
Message-Id: 1483137755.493600f430ad8bdeb9b421b3ee4a3a18b556c552.np-hardass@gentoo
1 commit: 493600f430ad8bdeb9b421b3ee4a3a18b556c552
2 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 30 22:40:38 2016 +0000
4 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 30 22:42:35 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493600f4
7
8 app-emulation/wine: update to use multilib_foreach_abi in src_install
9
10 Uses multilib_foreach_abi to rm wineconsole now, so it should handle
11 systems with merged libdirs, as per mgorny's request.
12
13 Package-Manager: portage-2.3.0
14
15 app-emulation/wine/wine-1.8-r3.ebuild | 6 ++++--
16 app-emulation/wine/wine-1.8.1-r3.ebuild | 6 ++++--
17 app-emulation/wine/wine-1.8.2-r2.ebuild | 6 ++++--
18 app-emulation/wine/wine-1.8.3-r1.ebuild | 6 ++++--
19 app-emulation/wine/wine-1.8.4.ebuild | 6 ++++--
20 app-emulation/wine/wine-1.9.10-r3.ebuild | 6 ++++--
21 app-emulation/wine/wine-1.9.11-r3.ebuild | 6 ++++--
22 app-emulation/wine/wine-1.9.12-r2.ebuild | 6 ++++--
23 app-emulation/wine/wine-1.9.13-r2.ebuild | 6 ++++--
24 app-emulation/wine/wine-1.9.14-r2.ebuild | 6 ++++--
25 app-emulation/wine/wine-1.9.15-r1.ebuild | 6 ++++--
26 app-emulation/wine/wine-1.9.16.ebuild | 6 ++++--
27 app-emulation/wine/wine-1.9.17.ebuild | 6 ++++--
28 app-emulation/wine/wine-1.9.18.ebuild | 6 ++++--
29 app-emulation/wine/wine-1.9.19-r1.ebuild | 6 ++++--
30 app-emulation/wine/wine-1.9.20.ebuild | 6 ++++--
31 app-emulation/wine/wine-1.9.4-r3.ebuild | 6 ++++--
32 app-emulation/wine/wine-1.9.5-r3.ebuild | 6 ++++--
33 app-emulation/wine/wine-1.9.6-r3.ebuild | 6 ++++--
34 app-emulation/wine/wine-1.9.7-r3.ebuild | 6 ++++--
35 app-emulation/wine/wine-1.9.8-r2.ebuild | 6 ++++--
36 app-emulation/wine/wine-1.9.9-r3.ebuild | 6 ++++--
37 app-emulation/wine/wine-9999.ebuild | 6 ++++--
38 23 files changed, 92 insertions(+), 46 deletions(-)
39
40 diff --git a/app-emulation/wine/wine-1.8-r3.ebuild b/app-emulation/wine/wine-1.8-r3.ebuild
41 index 02b5c87..696da26 100644
42 --- a/app-emulation/wine/wine-1.8-r3.ebuild
43 +++ b/app-emulation/wine/wine-1.8-r3.ebuild
44 @@ -485,8 +485,10 @@ multilib_src_install_all() {
45 if ! use X && ! use ncurses; then
46 rm "${D}"/usr/bin/wineconsole* || die
47 rm "${D}"/usr/share/man/man1/wineconsole* || die
48 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
49 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
50 + rm_wineconsole() {
51 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
52 + }
53 + multilib_foreach_abi rm_wineconsole
54 fi
55
56 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
57
58 diff --git a/app-emulation/wine/wine-1.8.1-r3.ebuild b/app-emulation/wine/wine-1.8.1-r3.ebuild
59 index 7c8a9ce..e1eb209 100644
60 --- a/app-emulation/wine/wine-1.8.1-r3.ebuild
61 +++ b/app-emulation/wine/wine-1.8.1-r3.ebuild
62 @@ -491,8 +491,10 @@ multilib_src_install_all() {
63 if ! use X && ! use ncurses; then
64 rm "${D}"/usr/bin/wineconsole* || die
65 rm "${D}"/usr/share/man/man1/wineconsole* || die
66 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
67 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
68 + rm_wineconsole() {
69 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
70 + }
71 + multilib_foreach_abi rm_wineconsole
72 fi
73
74 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
75
76 diff --git a/app-emulation/wine/wine-1.8.2-r2.ebuild b/app-emulation/wine/wine-1.8.2-r2.ebuild
77 index a13d736..522fd97 100644
78 --- a/app-emulation/wine/wine-1.8.2-r2.ebuild
79 +++ b/app-emulation/wine/wine-1.8.2-r2.ebuild
80 @@ -491,8 +491,10 @@ multilib_src_install_all() {
81 if ! use X && ! use ncurses; then
82 rm "${D}"/usr/bin/wineconsole* || die
83 rm "${D}"/usr/share/man/man1/wineconsole* || die
84 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
85 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
86 + rm_wineconsole() {
87 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
88 + }
89 + multilib_foreach_abi rm_wineconsole
90 fi
91
92 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
93
94 diff --git a/app-emulation/wine/wine-1.8.3-r1.ebuild b/app-emulation/wine/wine-1.8.3-r1.ebuild
95 index eddb6f2..429315c 100644
96 --- a/app-emulation/wine/wine-1.8.3-r1.ebuild
97 +++ b/app-emulation/wine/wine-1.8.3-r1.ebuild
98 @@ -490,8 +490,10 @@ multilib_src_install_all() {
99 if ! use X && ! use ncurses; then
100 rm "${D}"/usr/bin/wineconsole* || die
101 rm "${D}"/usr/share/man/man1/wineconsole* || die
102 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
103 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
104 + rm_wineconsole() {
105 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
106 + }
107 + multilib_foreach_abi rm_wineconsole
108 fi
109
110 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
111
112 diff --git a/app-emulation/wine/wine-1.8.4.ebuild b/app-emulation/wine/wine-1.8.4.ebuild
113 index 0a88892..bc8d807 100644
114 --- a/app-emulation/wine/wine-1.8.4.ebuild
115 +++ b/app-emulation/wine/wine-1.8.4.ebuild
116 @@ -489,8 +489,10 @@ multilib_src_install_all() {
117 if ! use X && ! use ncurses; then
118 rm "${D}"/usr/bin/wineconsole* || die
119 rm "${D}"/usr/share/man/man1/wineconsole* || die
120 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
121 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
122 + rm_wineconsole() {
123 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
124 + }
125 + multilib_foreach_abi rm_wineconsole
126 fi
127
128 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
129
130 diff --git a/app-emulation/wine/wine-1.9.10-r3.ebuild b/app-emulation/wine/wine-1.9.10-r3.ebuild
131 index 06559b1..e268ad1 100644
132 --- a/app-emulation/wine/wine-1.9.10-r3.ebuild
133 +++ b/app-emulation/wine/wine-1.9.10-r3.ebuild
134 @@ -509,8 +509,10 @@ multilib_src_install_all() {
135 if ! use X && ! use ncurses; then
136 rm "${D}"/usr/bin/wineconsole* || die
137 rm "${D}"/usr/share/man/man1/wineconsole* || die
138 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
139 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
140 + rm_wineconsole() {
141 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
142 + }
143 + multilib_foreach_abi rm_wineconsole
144 fi
145
146 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
147
148 diff --git a/app-emulation/wine/wine-1.9.11-r3.ebuild b/app-emulation/wine/wine-1.9.11-r3.ebuild
149 index 06559b1..e268ad1 100644
150 --- a/app-emulation/wine/wine-1.9.11-r3.ebuild
151 +++ b/app-emulation/wine/wine-1.9.11-r3.ebuild
152 @@ -509,8 +509,10 @@ multilib_src_install_all() {
153 if ! use X && ! use ncurses; then
154 rm "${D}"/usr/bin/wineconsole* || die
155 rm "${D}"/usr/share/man/man1/wineconsole* || die
156 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
157 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
158 + rm_wineconsole() {
159 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
160 + }
161 + multilib_foreach_abi rm_wineconsole
162 fi
163
164 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
165
166 diff --git a/app-emulation/wine/wine-1.9.12-r2.ebuild b/app-emulation/wine/wine-1.9.12-r2.ebuild
167 index 4d1c5ee..f8713ef 100644
168 --- a/app-emulation/wine/wine-1.9.12-r2.ebuild
169 +++ b/app-emulation/wine/wine-1.9.12-r2.ebuild
170 @@ -509,8 +509,10 @@ multilib_src_install_all() {
171 if ! use X && ! use ncurses; then
172 rm "${D}"/usr/bin/wineconsole* || die
173 rm "${D}"/usr/share/man/man1/wineconsole* || die
174 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
175 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
176 + rm_wineconsole() {
177 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
178 + }
179 + multilib_foreach_abi rm_wineconsole
180 fi
181
182 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
183
184 diff --git a/app-emulation/wine/wine-1.9.13-r2.ebuild b/app-emulation/wine/wine-1.9.13-r2.ebuild
185 index 1f4a9c9..6cee705 100644
186 --- a/app-emulation/wine/wine-1.9.13-r2.ebuild
187 +++ b/app-emulation/wine/wine-1.9.13-r2.ebuild
188 @@ -508,8 +508,10 @@ multilib_src_install_all() {
189 if ! use X && ! use ncurses; then
190 rm "${D}"/usr/bin/wineconsole* || die
191 rm "${D}"/usr/share/man/man1/wineconsole* || die
192 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
193 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
194 + rm_wineconsole() {
195 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
196 + }
197 + multilib_foreach_abi rm_wineconsole
198 fi
199
200 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
201
202 diff --git a/app-emulation/wine/wine-1.9.14-r2.ebuild b/app-emulation/wine/wine-1.9.14-r2.ebuild
203 index 1f4a9c9..6cee705 100644
204 --- a/app-emulation/wine/wine-1.9.14-r2.ebuild
205 +++ b/app-emulation/wine/wine-1.9.14-r2.ebuild
206 @@ -508,8 +508,10 @@ multilib_src_install_all() {
207 if ! use X && ! use ncurses; then
208 rm "${D}"/usr/bin/wineconsole* || die
209 rm "${D}"/usr/share/man/man1/wineconsole* || die
210 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
211 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
212 + rm_wineconsole() {
213 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
214 + }
215 + multilib_foreach_abi rm_wineconsole
216 fi
217
218 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
219
220 diff --git a/app-emulation/wine/wine-1.9.15-r1.ebuild b/app-emulation/wine/wine-1.9.15-r1.ebuild
221 index 1f4a9c9..6cee705 100644
222 --- a/app-emulation/wine/wine-1.9.15-r1.ebuild
223 +++ b/app-emulation/wine/wine-1.9.15-r1.ebuild
224 @@ -508,8 +508,10 @@ multilib_src_install_all() {
225 if ! use X && ! use ncurses; then
226 rm "${D}"/usr/bin/wineconsole* || die
227 rm "${D}"/usr/share/man/man1/wineconsole* || die
228 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
229 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
230 + rm_wineconsole() {
231 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
232 + }
233 + multilib_foreach_abi rm_wineconsole
234 fi
235
236 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
237
238 diff --git a/app-emulation/wine/wine-1.9.16.ebuild b/app-emulation/wine/wine-1.9.16.ebuild
239 index 1f4a9c9..6cee705 100644
240 --- a/app-emulation/wine/wine-1.9.16.ebuild
241 +++ b/app-emulation/wine/wine-1.9.16.ebuild
242 @@ -508,8 +508,10 @@ multilib_src_install_all() {
243 if ! use X && ! use ncurses; then
244 rm "${D}"/usr/bin/wineconsole* || die
245 rm "${D}"/usr/share/man/man1/wineconsole* || die
246 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
247 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
248 + rm_wineconsole() {
249 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
250 + }
251 + multilib_foreach_abi rm_wineconsole
252 fi
253
254 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
255
256 diff --git a/app-emulation/wine/wine-1.9.17.ebuild b/app-emulation/wine/wine-1.9.17.ebuild
257 index 9e5e124..5e3df5f 100644
258 --- a/app-emulation/wine/wine-1.9.17.ebuild
259 +++ b/app-emulation/wine/wine-1.9.17.ebuild
260 @@ -508,8 +508,10 @@ multilib_src_install_all() {
261 if ! use X && ! use ncurses; then
262 rm "${D}"/usr/bin/wineconsole* || die
263 rm "${D}"/usr/share/man/man1/wineconsole* || die
264 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
265 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
266 + rm_wineconsole() {
267 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
268 + }
269 + multilib_foreach_abi rm_wineconsole
270 fi
271
272 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
273
274 diff --git a/app-emulation/wine/wine-1.9.18.ebuild b/app-emulation/wine/wine-1.9.18.ebuild
275 index c90f2c9..54f72c0 100644
276 --- a/app-emulation/wine/wine-1.9.18.ebuild
277 +++ b/app-emulation/wine/wine-1.9.18.ebuild
278 @@ -508,8 +508,10 @@ multilib_src_install_all() {
279 if ! use X && ! use ncurses; then
280 rm "${D}"/usr/bin/wineconsole* || die
281 rm "${D}"/usr/share/man/man1/wineconsole* || die
282 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
283 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
284 + rm_wineconsole() {
285 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
286 + }
287 + multilib_foreach_abi rm_wineconsole
288 fi
289
290 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
291
292 diff --git a/app-emulation/wine/wine-1.9.19-r1.ebuild b/app-emulation/wine/wine-1.9.19-r1.ebuild
293 index 5c1f95b..5eba6e1 100644
294 --- a/app-emulation/wine/wine-1.9.19-r1.ebuild
295 +++ b/app-emulation/wine/wine-1.9.19-r1.ebuild
296 @@ -510,8 +510,10 @@ multilib_src_install_all() {
297 if ! use X && ! use ncurses; then
298 rm "${D}"/usr/bin/wineconsole* || die
299 rm "${D}"/usr/share/man/man1/wineconsole* || die
300 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
301 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
302 + rm_wineconsole() {
303 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
304 + }
305 + multilib_foreach_abi rm_wineconsole
306 fi
307
308 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
309
310 diff --git a/app-emulation/wine/wine-1.9.20.ebuild b/app-emulation/wine/wine-1.9.20.ebuild
311 index 5c1f95b..5eba6e1 100644
312 --- a/app-emulation/wine/wine-1.9.20.ebuild
313 +++ b/app-emulation/wine/wine-1.9.20.ebuild
314 @@ -510,8 +510,10 @@ multilib_src_install_all() {
315 if ! use X && ! use ncurses; then
316 rm "${D}"/usr/bin/wineconsole* || die
317 rm "${D}"/usr/share/man/man1/wineconsole* || die
318 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
319 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
320 + rm_wineconsole() {
321 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
322 + }
323 + multilib_foreach_abi rm_wineconsole
324 fi
325
326 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
327
328 diff --git a/app-emulation/wine/wine-1.9.4-r3.ebuild b/app-emulation/wine/wine-1.9.4-r3.ebuild
329 index 7b4221c..ad953d1 100644
330 --- a/app-emulation/wine/wine-1.9.4-r3.ebuild
331 +++ b/app-emulation/wine/wine-1.9.4-r3.ebuild
332 @@ -488,8 +488,10 @@ multilib_src_install_all() {
333 if ! use X && ! use ncurses; then
334 rm "${D}"/usr/bin/wineconsole* || die
335 rm "${D}"/usr/share/man/man1/wineconsole* || die
336 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
337 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
338 + rm_wineconsole() {
339 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
340 + }
341 + multilib_foreach_abi rm_wineconsole
342 fi
343
344 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
345
346 diff --git a/app-emulation/wine/wine-1.9.5-r3.ebuild b/app-emulation/wine/wine-1.9.5-r3.ebuild
347 index 49b9dc7..b053582 100644
348 --- a/app-emulation/wine/wine-1.9.5-r3.ebuild
349 +++ b/app-emulation/wine/wine-1.9.5-r3.ebuild
350 @@ -490,8 +490,10 @@ multilib_src_install_all() {
351 if ! use X && ! use ncurses; then
352 rm "${D}"/usr/bin/wineconsole* || die
353 rm "${D}"/usr/share/man/man1/wineconsole* || die
354 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
355 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
356 + rm_wineconsole() {
357 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
358 + }
359 + multilib_foreach_abi rm_wineconsole
360 fi
361
362 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
363
364 diff --git a/app-emulation/wine/wine-1.9.6-r3.ebuild b/app-emulation/wine/wine-1.9.6-r3.ebuild
365 index 186ee04..fcfa5a0 100644
366 --- a/app-emulation/wine/wine-1.9.6-r3.ebuild
367 +++ b/app-emulation/wine/wine-1.9.6-r3.ebuild
368 @@ -487,8 +487,10 @@ multilib_src_install_all() {
369 if ! use X && ! use ncurses; then
370 rm "${D}"/usr/bin/wineconsole* || die
371 rm "${D}"/usr/share/man/man1/wineconsole* || die
372 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
373 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
374 + rm_wineconsole() {
375 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
376 + }
377 + multilib_foreach_abi rm_wineconsole
378 fi
379
380 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
381
382 diff --git a/app-emulation/wine/wine-1.9.7-r3.ebuild b/app-emulation/wine/wine-1.9.7-r3.ebuild
383 index 186ee04..fcfa5a0 100644
384 --- a/app-emulation/wine/wine-1.9.7-r3.ebuild
385 +++ b/app-emulation/wine/wine-1.9.7-r3.ebuild
386 @@ -487,8 +487,10 @@ multilib_src_install_all() {
387 if ! use X && ! use ncurses; then
388 rm "${D}"/usr/bin/wineconsole* || die
389 rm "${D}"/usr/share/man/man1/wineconsole* || die
390 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
391 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
392 + rm_wineconsole() {
393 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
394 + }
395 + multilib_foreach_abi rm_wineconsole
396 fi
397
398 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
399
400 diff --git a/app-emulation/wine/wine-1.9.8-r2.ebuild b/app-emulation/wine/wine-1.9.8-r2.ebuild
401 index 278a370..1c6bc3b 100644
402 --- a/app-emulation/wine/wine-1.9.8-r2.ebuild
403 +++ b/app-emulation/wine/wine-1.9.8-r2.ebuild
404 @@ -487,8 +487,10 @@ multilib_src_install_all() {
405 if ! use X && ! use ncurses; then
406 rm "${D}"/usr/bin/wineconsole* || die
407 rm "${D}"/usr/share/man/man1/wineconsole* || die
408 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
409 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
410 + rm_wineconsole() {
411 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
412 + }
413 + multilib_foreach_abi rm_wineconsole
414 fi
415
416 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
417
418 diff --git a/app-emulation/wine/wine-1.9.9-r3.ebuild b/app-emulation/wine/wine-1.9.9-r3.ebuild
419 index 919a4fa..16bdcb6 100644
420 --- a/app-emulation/wine/wine-1.9.9-r3.ebuild
421 +++ b/app-emulation/wine/wine-1.9.9-r3.ebuild
422 @@ -509,8 +509,10 @@ multilib_src_install_all() {
423 if ! use X && ! use ncurses; then
424 rm "${D}"/usr/bin/wineconsole* || die
425 rm "${D}"/usr/share/man/man1/wineconsole* || die
426 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
427 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
428 + rm_wineconsole() {
429 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
430 + }
431 + multilib_foreach_abi rm_wineconsole
432 fi
433
434 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
435
436 diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
437 index 5c1f95b..5eba6e1 100644
438 --- a/app-emulation/wine/wine-9999.ebuild
439 +++ b/app-emulation/wine/wine-9999.ebuild
440 @@ -510,8 +510,10 @@ multilib_src_install_all() {
441 if ! use X && ! use ncurses; then
442 rm "${D}"/usr/bin/wineconsole* || die
443 rm "${D}"/usr/share/man/man1/wineconsole* || die
444 - use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
445 - use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
446 + rm_wineconsole() {
447 + rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
448 + }
449 + multilib_foreach_abi rm_wineconsole
450 fi
451
452 use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055