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