Gentoo Archives: gentoo-commits

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