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