1 |
commit: 76e0e536ec881b35bc8fcd496c123331771d0536 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 28 18:18:04 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 30 01:31:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=76e0e536 |
7 |
|
8 |
app-emulation/wine-vanilla: Sync with ::gentoo |
9 |
|
10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
11 |
|
12 |
.../wine-vanilla/wine-vanilla-2.0-r1.ebuild | 24 ++-------------------- |
13 |
.../wine-vanilla/wine-vanilla-2.0.1-r1.ebuild | 24 ++-------------------- |
14 |
.../wine-vanilla/wine-vanilla-2.0.2-r1.ebuild | 24 ++-------------------- |
15 |
.../wine-vanilla/wine-vanilla-2.0.3.ebuild | 24 ++-------------------- |
16 |
.../wine-vanilla/wine-vanilla-2.0.4.ebuild | 24 ++-------------------- |
17 |
.../wine-vanilla/wine-vanilla-2.1-r1.ebuild | 24 ++-------------------- |
18 |
.../wine-vanilla/wine-vanilla-2.10-r1.ebuild | 24 ++-------------------- |
19 |
.../wine-vanilla/wine-vanilla-2.11-r1.ebuild | 24 ++-------------------- |
20 |
.../wine-vanilla/wine-vanilla-2.12-r1.ebuild | 24 ++-------------------- |
21 |
.../wine-vanilla/wine-vanilla-2.13-r1.ebuild | 24 ++-------------------- |
22 |
.../wine-vanilla/wine-vanilla-2.14-r1.ebuild | 24 ++-------------------- |
23 |
.../wine-vanilla/wine-vanilla-2.15-r1.ebuild | 24 ++-------------------- |
24 |
.../wine-vanilla/wine-vanilla-2.16-r1.ebuild | 24 ++-------------------- |
25 |
.../wine-vanilla/wine-vanilla-2.17-r1.ebuild | 24 ++-------------------- |
26 |
.../wine-vanilla/wine-vanilla-2.18-r2.ebuild | 24 ++-------------------- |
27 |
.../wine-vanilla/wine-vanilla-2.19-r1.ebuild | 24 ++-------------------- |
28 |
.../wine-vanilla/wine-vanilla-2.2-r1.ebuild | 24 ++-------------------- |
29 |
.../wine-vanilla/wine-vanilla-2.20.ebuild | 24 ++-------------------- |
30 |
.../wine-vanilla/wine-vanilla-2.21.ebuild | 24 ++-------------------- |
31 |
.../wine-vanilla/wine-vanilla-2.22.ebuild | 24 ++-------------------- |
32 |
.../wine-vanilla/wine-vanilla-2.3-r1.ebuild | 24 ++-------------------- |
33 |
.../wine-vanilla/wine-vanilla-2.4-r1.ebuild | 24 ++-------------------- |
34 |
.../wine-vanilla/wine-vanilla-2.5-r1.ebuild | 24 ++-------------------- |
35 |
.../wine-vanilla/wine-vanilla-2.6-r1.ebuild | 24 ++-------------------- |
36 |
.../wine-vanilla/wine-vanilla-2.7-r1.ebuild | 24 ++-------------------- |
37 |
.../wine-vanilla/wine-vanilla-2.8-r1.ebuild | 24 ++-------------------- |
38 |
.../wine-vanilla/wine-vanilla-2.9-r1.ebuild | 24 ++-------------------- |
39 |
app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild | 24 ++-------------------- |
40 |
app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild | 24 ++-------------------- |
41 |
app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild | 24 ++-------------------- |
42 |
.../wine-vanilla/wine-vanilla-9999.ebuild | 24 ++-------------------- |
43 |
31 files changed, 62 insertions(+), 682 deletions(-) |
44 |
|
45 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild |
46 |
index b6970b1..44f1a68 100644 |
47 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild |
48 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild |
49 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
50 |
xml? ( |
51 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
52 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
53 |
- ) |
54 |
- abi_x86_32? ( |
55 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
56 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
57 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
58 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
59 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
60 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
61 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
62 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
63 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
64 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
65 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
66 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
67 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
68 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
69 |
)" |
70 |
|
71 |
RDEPEND="${COMMON_DEPEND} |
72 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
73 |
>=sys-kernel/linux-headers-2.6 |
74 |
virtual/pkgconfig |
75 |
virtual/yacc |
76 |
- X? ( |
77 |
- x11-proto/inputproto |
78 |
- x11-proto/xextproto |
79 |
- x11-proto/xf86vidmodeproto |
80 |
- ) |
81 |
+ X? ( x11-base/xorg-proto ) |
82 |
prelink? ( sys-devel/prelink ) |
83 |
- xinerama? ( x11-proto/xineramaproto )" |
84 |
+ xinerama? ( x11-base/xorg-proto )" |
85 |
|
86 |
# These use a non-standard "Wine" category, which is provided by |
87 |
# /etc/xdg/applications-merged/wine.menu |
88 |
|
89 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild |
90 |
index f19e2fe..203ac31 100644 |
91 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild |
92 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild |
93 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
94 |
xml? ( |
95 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
96 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
97 |
- ) |
98 |
- abi_x86_32? ( |
99 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
100 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
101 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
102 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
103 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
104 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
105 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
106 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
107 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
108 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
109 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
110 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
111 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
112 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
113 |
)" |
114 |
|
115 |
RDEPEND="${COMMON_DEPEND} |
116 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
117 |
>=sys-kernel/linux-headers-2.6 |
118 |
virtual/pkgconfig |
119 |
virtual/yacc |
120 |
- X? ( |
121 |
- x11-proto/inputproto |
122 |
- x11-proto/xextproto |
123 |
- x11-proto/xf86vidmodeproto |
124 |
- ) |
125 |
+ X? ( x11-base/xorg-proto ) |
126 |
prelink? ( sys-devel/prelink ) |
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-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild |
134 |
index f19e2fe..203ac31 100644 |
135 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild |
136 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild |
137 |
@@ -93,22 +93,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 |
@@ -135,13 +119,9 @@ 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 |
- xinerama? ( x11-proto/xineramaproto )" |
172 |
+ xinerama? ( x11-base/xorg-proto )" |
173 |
|
174 |
# These use a non-standard "Wine" category, which is provided by |
175 |
# /etc/xdg/applications-merged/wine.menu |
176 |
|
177 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild |
178 |
index dd5dfa1..42ea191 100644 |
179 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild |
180 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild |
181 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
182 |
xml? ( |
183 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
184 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
185 |
- ) |
186 |
- abi_x86_32? ( |
187 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
188 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
189 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
190 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
191 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
192 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
193 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
194 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
195 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
196 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
197 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
198 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
199 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
200 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
201 |
)" |
202 |
|
203 |
RDEPEND="${COMMON_DEPEND} |
204 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
205 |
>=sys-kernel/linux-headers-2.6 |
206 |
virtual/pkgconfig |
207 |
virtual/yacc |
208 |
- X? ( |
209 |
- x11-proto/inputproto |
210 |
- x11-proto/xextproto |
211 |
- x11-proto/xf86vidmodeproto |
212 |
- ) |
213 |
+ X? ( x11-base/xorg-proto ) |
214 |
prelink? ( sys-devel/prelink ) |
215 |
- xinerama? ( x11-proto/xineramaproto )" |
216 |
+ xinerama? ( x11-base/xorg-proto )" |
217 |
|
218 |
# These use a non-standard "Wine" category, which is provided by |
219 |
# /etc/xdg/applications-merged/wine.menu |
220 |
|
221 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild |
222 |
index c2b9e49..e012559 100644 |
223 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild |
224 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild |
225 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
226 |
xml? ( |
227 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
228 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
229 |
- ) |
230 |
- abi_x86_32? ( |
231 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
232 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
233 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
234 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
235 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
236 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
237 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
238 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
239 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
240 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
241 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
242 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
243 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
244 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
245 |
)" |
246 |
|
247 |
RDEPEND="${COMMON_DEPEND} |
248 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
249 |
>=sys-kernel/linux-headers-2.6 |
250 |
virtual/pkgconfig |
251 |
virtual/yacc |
252 |
- X? ( |
253 |
- x11-proto/inputproto |
254 |
- x11-proto/xextproto |
255 |
- x11-proto/xf86vidmodeproto |
256 |
- ) |
257 |
+ X? ( x11-base/xorg-proto ) |
258 |
prelink? ( sys-devel/prelink ) |
259 |
- xinerama? ( x11-proto/xineramaproto )" |
260 |
+ xinerama? ( x11-base/xorg-proto )" |
261 |
|
262 |
# These use a non-standard "Wine" category, which is provided by |
263 |
# /etc/xdg/applications-merged/wine.menu |
264 |
|
265 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild |
266 |
index e2fb4fb..1ab401c 100644 |
267 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild |
268 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild |
269 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
270 |
xml? ( |
271 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
272 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
273 |
- ) |
274 |
- abi_x86_32? ( |
275 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
276 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
277 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
278 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
279 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
280 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
281 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
282 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
283 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
284 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
285 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
286 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
287 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
288 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
289 |
)" |
290 |
|
291 |
RDEPEND="${COMMON_DEPEND} |
292 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
293 |
>=sys-kernel/linux-headers-2.6 |
294 |
virtual/pkgconfig |
295 |
virtual/yacc |
296 |
- X? ( |
297 |
- x11-proto/inputproto |
298 |
- x11-proto/xextproto |
299 |
- x11-proto/xf86vidmodeproto |
300 |
- ) |
301 |
+ X? ( x11-base/xorg-proto ) |
302 |
prelink? ( sys-devel/prelink ) |
303 |
- xinerama? ( x11-proto/xineramaproto )" |
304 |
+ xinerama? ( x11-base/xorg-proto )" |
305 |
|
306 |
# These use a non-standard "Wine" category, which is provided by |
307 |
# /etc/xdg/applications-merged/wine.menu |
308 |
|
309 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild |
310 |
index 7fd4362..1c62a21 100644 |
311 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild |
312 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild |
313 |
@@ -94,22 +94,6 @@ COMMON_DEPEND=" |
314 |
xml? ( |
315 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
316 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
317 |
- ) |
318 |
- abi_x86_32? ( |
319 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
320 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
321 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
322 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
323 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
324 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
325 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
326 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
327 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
328 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
329 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
330 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
331 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
332 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
333 |
)" |
334 |
|
335 |
RDEPEND="${COMMON_DEPEND} |
336 |
@@ -136,13 +120,9 @@ DEPEND="${COMMON_DEPEND} |
337 |
>=sys-kernel/linux-headers-2.6 |
338 |
virtual/pkgconfig |
339 |
virtual/yacc |
340 |
- X? ( |
341 |
- x11-proto/inputproto |
342 |
- x11-proto/xextproto |
343 |
- x11-proto/xf86vidmodeproto |
344 |
- ) |
345 |
+ X? ( x11-base/xorg-proto ) |
346 |
prelink? ( sys-devel/prelink ) |
347 |
- xinerama? ( x11-proto/xineramaproto )" |
348 |
+ xinerama? ( x11-base/xorg-proto )" |
349 |
|
350 |
# These use a non-standard "Wine" category, which is provided by |
351 |
# /etc/xdg/applications-merged/wine.menu |
352 |
|
353 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild |
354 |
index 7fd4362..1c62a21 100644 |
355 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild |
356 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild |
357 |
@@ -94,22 +94,6 @@ COMMON_DEPEND=" |
358 |
xml? ( |
359 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
360 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
361 |
- ) |
362 |
- abi_x86_32? ( |
363 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
364 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
365 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
366 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
367 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
368 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
369 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
370 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
371 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
372 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
373 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
374 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
375 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
376 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
377 |
)" |
378 |
|
379 |
RDEPEND="${COMMON_DEPEND} |
380 |
@@ -136,13 +120,9 @@ DEPEND="${COMMON_DEPEND} |
381 |
>=sys-kernel/linux-headers-2.6 |
382 |
virtual/pkgconfig |
383 |
virtual/yacc |
384 |
- X? ( |
385 |
- x11-proto/inputproto |
386 |
- x11-proto/xextproto |
387 |
- x11-proto/xf86vidmodeproto |
388 |
- ) |
389 |
+ X? ( x11-base/xorg-proto ) |
390 |
prelink? ( sys-devel/prelink ) |
391 |
- xinerama? ( x11-proto/xineramaproto )" |
392 |
+ xinerama? ( x11-base/xorg-proto )" |
393 |
|
394 |
# These use a non-standard "Wine" category, which is provided by |
395 |
# /etc/xdg/applications-merged/wine.menu |
396 |
|
397 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild |
398 |
index 7fd4362..1c62a21 100644 |
399 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild |
400 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild |
401 |
@@ -94,22 +94,6 @@ COMMON_DEPEND=" |
402 |
xml? ( |
403 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
404 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
405 |
- ) |
406 |
- abi_x86_32? ( |
407 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
408 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
409 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
410 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
411 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
412 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
413 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
414 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
415 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
416 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
417 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
418 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
419 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
420 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
421 |
)" |
422 |
|
423 |
RDEPEND="${COMMON_DEPEND} |
424 |
@@ -136,13 +120,9 @@ DEPEND="${COMMON_DEPEND} |
425 |
>=sys-kernel/linux-headers-2.6 |
426 |
virtual/pkgconfig |
427 |
virtual/yacc |
428 |
- X? ( |
429 |
- x11-proto/inputproto |
430 |
- x11-proto/xextproto |
431 |
- x11-proto/xf86vidmodeproto |
432 |
- ) |
433 |
+ X? ( x11-base/xorg-proto ) |
434 |
prelink? ( sys-devel/prelink ) |
435 |
- xinerama? ( x11-proto/xineramaproto )" |
436 |
+ xinerama? ( x11-base/xorg-proto )" |
437 |
|
438 |
# These use a non-standard "Wine" category, which is provided by |
439 |
# /etc/xdg/applications-merged/wine.menu |
440 |
|
441 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild |
442 |
index 7fd4362..1c62a21 100644 |
443 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild |
444 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild |
445 |
@@ -94,22 +94,6 @@ COMMON_DEPEND=" |
446 |
xml? ( |
447 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
448 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
449 |
- ) |
450 |
- abi_x86_32? ( |
451 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
452 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
453 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
454 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
455 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
456 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
457 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
458 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
459 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
460 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
461 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
462 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
463 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
464 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
465 |
)" |
466 |
|
467 |
RDEPEND="${COMMON_DEPEND} |
468 |
@@ -136,13 +120,9 @@ DEPEND="${COMMON_DEPEND} |
469 |
>=sys-kernel/linux-headers-2.6 |
470 |
virtual/pkgconfig |
471 |
virtual/yacc |
472 |
- X? ( |
473 |
- x11-proto/inputproto |
474 |
- x11-proto/xextproto |
475 |
- x11-proto/xf86vidmodeproto |
476 |
- ) |
477 |
+ X? ( x11-base/xorg-proto ) |
478 |
prelink? ( sys-devel/prelink ) |
479 |
- xinerama? ( x11-proto/xineramaproto )" |
480 |
+ xinerama? ( x11-base/xorg-proto )" |
481 |
|
482 |
# These use a non-standard "Wine" category, which is provided by |
483 |
# /etc/xdg/applications-merged/wine.menu |
484 |
|
485 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild |
486 |
index 323a372..a87c6fe 100644 |
487 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild |
488 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild |
489 |
@@ -94,22 +94,6 @@ COMMON_DEPEND=" |
490 |
xml? ( |
491 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
492 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
493 |
- ) |
494 |
- abi_x86_32? ( |
495 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
496 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
497 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
498 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
499 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
500 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
501 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
502 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
503 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
504 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
505 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
506 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
507 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
508 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
509 |
)" |
510 |
|
511 |
RDEPEND="${COMMON_DEPEND} |
512 |
@@ -136,13 +120,9 @@ DEPEND="${COMMON_DEPEND} |
513 |
>=sys-kernel/linux-headers-2.6 |
514 |
virtual/pkgconfig |
515 |
virtual/yacc |
516 |
- X? ( |
517 |
- x11-proto/inputproto |
518 |
- x11-proto/xextproto |
519 |
- x11-proto/xf86vidmodeproto |
520 |
- ) |
521 |
+ X? ( x11-base/xorg-proto ) |
522 |
prelink? ( sys-devel/prelink ) |
523 |
- xinerama? ( x11-proto/xineramaproto )" |
524 |
+ xinerama? ( x11-base/xorg-proto )" |
525 |
|
526 |
# These use a non-standard "Wine" category, which is provided by |
527 |
# /etc/xdg/applications-merged/wine.menu |
528 |
|
529 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild |
530 |
index 323a372..a87c6fe 100644 |
531 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild |
532 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild |
533 |
@@ -94,22 +94,6 @@ COMMON_DEPEND=" |
534 |
xml? ( |
535 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
536 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
537 |
- ) |
538 |
- abi_x86_32? ( |
539 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
540 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
541 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
542 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
543 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
544 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
545 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
546 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
547 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
548 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
549 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
550 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
551 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
552 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
553 |
)" |
554 |
|
555 |
RDEPEND="${COMMON_DEPEND} |
556 |
@@ -136,13 +120,9 @@ DEPEND="${COMMON_DEPEND} |
557 |
>=sys-kernel/linux-headers-2.6 |
558 |
virtual/pkgconfig |
559 |
virtual/yacc |
560 |
- X? ( |
561 |
- x11-proto/inputproto |
562 |
- x11-proto/xextproto |
563 |
- x11-proto/xf86vidmodeproto |
564 |
- ) |
565 |
+ X? ( x11-base/xorg-proto ) |
566 |
prelink? ( sys-devel/prelink ) |
567 |
- xinerama? ( x11-proto/xineramaproto )" |
568 |
+ xinerama? ( x11-base/xorg-proto )" |
569 |
|
570 |
# These use a non-standard "Wine" category, which is provided by |
571 |
# /etc/xdg/applications-merged/wine.menu |
572 |
|
573 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild |
574 |
index 323a372..a87c6fe 100644 |
575 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild |
576 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild |
577 |
@@ -94,22 +94,6 @@ COMMON_DEPEND=" |
578 |
xml? ( |
579 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
580 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
581 |
- ) |
582 |
- abi_x86_32? ( |
583 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
584 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
585 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
586 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
587 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
588 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
589 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
590 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
591 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
592 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
593 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
594 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
595 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
596 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
597 |
)" |
598 |
|
599 |
RDEPEND="${COMMON_DEPEND} |
600 |
@@ -136,13 +120,9 @@ DEPEND="${COMMON_DEPEND} |
601 |
>=sys-kernel/linux-headers-2.6 |
602 |
virtual/pkgconfig |
603 |
virtual/yacc |
604 |
- X? ( |
605 |
- x11-proto/inputproto |
606 |
- x11-proto/xextproto |
607 |
- x11-proto/xf86vidmodeproto |
608 |
- ) |
609 |
+ X? ( x11-base/xorg-proto ) |
610 |
prelink? ( sys-devel/prelink ) |
611 |
- xinerama? ( x11-proto/xineramaproto )" |
612 |
+ xinerama? ( x11-base/xorg-proto )" |
613 |
|
614 |
# These use a non-standard "Wine" category, which is provided by |
615 |
# /etc/xdg/applications-merged/wine.menu |
616 |
|
617 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild |
618 |
index 323a372..a87c6fe 100644 |
619 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild |
620 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild |
621 |
@@ -94,22 +94,6 @@ COMMON_DEPEND=" |
622 |
xml? ( |
623 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
624 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
625 |
- ) |
626 |
- abi_x86_32? ( |
627 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
628 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
629 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
630 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
631 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
632 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
633 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
634 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
635 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
636 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
637 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
638 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
639 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
640 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
641 |
)" |
642 |
|
643 |
RDEPEND="${COMMON_DEPEND} |
644 |
@@ -136,13 +120,9 @@ DEPEND="${COMMON_DEPEND} |
645 |
>=sys-kernel/linux-headers-2.6 |
646 |
virtual/pkgconfig |
647 |
virtual/yacc |
648 |
- X? ( |
649 |
- x11-proto/inputproto |
650 |
- x11-proto/xextproto |
651 |
- x11-proto/xf86vidmodeproto |
652 |
- ) |
653 |
+ X? ( x11-base/xorg-proto ) |
654 |
prelink? ( sys-devel/prelink ) |
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-vanilla/wine-vanilla-2.18-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild |
662 |
index 58b4060..52d84ca 100644 |
663 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild |
664 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild |
665 |
@@ -94,22 +94,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 |
@@ -136,13 +120,9 @@ 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 |
- xinerama? ( x11-proto/xineramaproto )" |
700 |
+ xinerama? ( x11-base/xorg-proto )" |
701 |
|
702 |
# These use a non-standard "Wine" category, which is provided by |
703 |
# /etc/xdg/applications-merged/wine.menu |
704 |
|
705 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild |
706 |
index 58b4060..52d84ca 100644 |
707 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild |
708 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild |
709 |
@@ -94,22 +94,6 @@ COMMON_DEPEND=" |
710 |
xml? ( |
711 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
712 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
713 |
- ) |
714 |
- abi_x86_32? ( |
715 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
716 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
717 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
718 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
719 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
720 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
721 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
722 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
723 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
724 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
725 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
726 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
727 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
728 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
729 |
)" |
730 |
|
731 |
RDEPEND="${COMMON_DEPEND} |
732 |
@@ -136,13 +120,9 @@ DEPEND="${COMMON_DEPEND} |
733 |
>=sys-kernel/linux-headers-2.6 |
734 |
virtual/pkgconfig |
735 |
virtual/yacc |
736 |
- X? ( |
737 |
- x11-proto/inputproto |
738 |
- x11-proto/xextproto |
739 |
- x11-proto/xf86vidmodeproto |
740 |
- ) |
741 |
+ X? ( x11-base/xorg-proto ) |
742 |
prelink? ( sys-devel/prelink ) |
743 |
- xinerama? ( x11-proto/xineramaproto )" |
744 |
+ xinerama? ( x11-base/xorg-proto )" |
745 |
|
746 |
# These use a non-standard "Wine" category, which is provided by |
747 |
# /etc/xdg/applications-merged/wine.menu |
748 |
|
749 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild |
750 |
index e2fb4fb..1ab401c 100644 |
751 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild |
752 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild |
753 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
754 |
xml? ( |
755 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
756 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
757 |
- ) |
758 |
- abi_x86_32? ( |
759 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
760 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
761 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
762 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
763 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
764 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
765 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
766 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
767 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
768 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
769 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
770 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
771 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
772 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
773 |
)" |
774 |
|
775 |
RDEPEND="${COMMON_DEPEND} |
776 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
777 |
>=sys-kernel/linux-headers-2.6 |
778 |
virtual/pkgconfig |
779 |
virtual/yacc |
780 |
- X? ( |
781 |
- x11-proto/inputproto |
782 |
- x11-proto/xextproto |
783 |
- x11-proto/xf86vidmodeproto |
784 |
- ) |
785 |
+ X? ( x11-base/xorg-proto ) |
786 |
prelink? ( sys-devel/prelink ) |
787 |
- xinerama? ( x11-proto/xineramaproto )" |
788 |
+ xinerama? ( x11-base/xorg-proto )" |
789 |
|
790 |
# These use a non-standard "Wine" category, which is provided by |
791 |
# /etc/xdg/applications-merged/wine.menu |
792 |
|
793 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild |
794 |
index 55dd4ba..40d354c 100644 |
795 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild |
796 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild |
797 |
@@ -95,22 +95,6 @@ COMMON_DEPEND=" |
798 |
xml? ( |
799 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
800 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
801 |
- ) |
802 |
- abi_x86_32? ( |
803 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
804 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
805 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
806 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
807 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
808 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
809 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
810 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
811 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
812 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
813 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
814 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
815 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
816 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
817 |
)" |
818 |
|
819 |
RDEPEND="${COMMON_DEPEND} |
820 |
@@ -137,13 +121,9 @@ DEPEND="${COMMON_DEPEND} |
821 |
>=sys-kernel/linux-headers-2.6 |
822 |
virtual/pkgconfig |
823 |
virtual/yacc |
824 |
- X? ( |
825 |
- x11-proto/inputproto |
826 |
- x11-proto/xextproto |
827 |
- x11-proto/xf86vidmodeproto |
828 |
- ) |
829 |
+ X? ( x11-base/xorg-proto ) |
830 |
prelink? ( sys-devel/prelink ) |
831 |
- xinerama? ( x11-proto/xineramaproto )" |
832 |
+ xinerama? ( x11-base/xorg-proto )" |
833 |
|
834 |
# These use a non-standard "Wine" category, which is provided by |
835 |
# /etc/xdg/applications-merged/wine.menu |
836 |
|
837 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild |
838 |
index 55dd4ba..40d354c 100644 |
839 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild |
840 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild |
841 |
@@ -95,22 +95,6 @@ COMMON_DEPEND=" |
842 |
xml? ( |
843 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
844 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
845 |
- ) |
846 |
- abi_x86_32? ( |
847 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
848 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
849 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
850 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
851 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
852 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
853 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
854 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
855 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
856 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
857 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
858 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
859 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
860 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
861 |
)" |
862 |
|
863 |
RDEPEND="${COMMON_DEPEND} |
864 |
@@ -137,13 +121,9 @@ DEPEND="${COMMON_DEPEND} |
865 |
>=sys-kernel/linux-headers-2.6 |
866 |
virtual/pkgconfig |
867 |
virtual/yacc |
868 |
- X? ( |
869 |
- x11-proto/inputproto |
870 |
- x11-proto/xextproto |
871 |
- x11-proto/xf86vidmodeproto |
872 |
- ) |
873 |
+ X? ( x11-base/xorg-proto ) |
874 |
prelink? ( sys-devel/prelink ) |
875 |
- xinerama? ( x11-proto/xineramaproto )" |
876 |
+ xinerama? ( x11-base/xorg-proto )" |
877 |
|
878 |
# These use a non-standard "Wine" category, which is provided by |
879 |
# /etc/xdg/applications-merged/wine.menu |
880 |
|
881 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild |
882 |
index 55dd4ba..40d354c 100644 |
883 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild |
884 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild |
885 |
@@ -95,22 +95,6 @@ COMMON_DEPEND=" |
886 |
xml? ( |
887 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
888 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
889 |
- ) |
890 |
- abi_x86_32? ( |
891 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
892 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
893 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
894 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
895 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
896 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
897 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
898 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
899 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
900 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
901 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
902 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
903 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
904 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
905 |
)" |
906 |
|
907 |
RDEPEND="${COMMON_DEPEND} |
908 |
@@ -137,13 +121,9 @@ DEPEND="${COMMON_DEPEND} |
909 |
>=sys-kernel/linux-headers-2.6 |
910 |
virtual/pkgconfig |
911 |
virtual/yacc |
912 |
- X? ( |
913 |
- x11-proto/inputproto |
914 |
- x11-proto/xextproto |
915 |
- x11-proto/xf86vidmodeproto |
916 |
- ) |
917 |
+ X? ( x11-base/xorg-proto ) |
918 |
prelink? ( sys-devel/prelink ) |
919 |
- xinerama? ( x11-proto/xineramaproto )" |
920 |
+ xinerama? ( x11-base/xorg-proto )" |
921 |
|
922 |
# These use a non-standard "Wine" category, which is provided by |
923 |
# /etc/xdg/applications-merged/wine.menu |
924 |
|
925 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild |
926 |
index e2fb4fb..1ab401c 100644 |
927 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild |
928 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild |
929 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
930 |
xml? ( |
931 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
932 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
933 |
- ) |
934 |
- abi_x86_32? ( |
935 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
936 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
937 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
938 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
939 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
940 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
941 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
942 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
943 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
944 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
945 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
946 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
947 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
948 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
949 |
)" |
950 |
|
951 |
RDEPEND="${COMMON_DEPEND} |
952 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
953 |
>=sys-kernel/linux-headers-2.6 |
954 |
virtual/pkgconfig |
955 |
virtual/yacc |
956 |
- X? ( |
957 |
- x11-proto/inputproto |
958 |
- x11-proto/xextproto |
959 |
- x11-proto/xf86vidmodeproto |
960 |
- ) |
961 |
+ X? ( x11-base/xorg-proto ) |
962 |
prelink? ( sys-devel/prelink ) |
963 |
- xinerama? ( x11-proto/xineramaproto )" |
964 |
+ xinerama? ( x11-base/xorg-proto )" |
965 |
|
966 |
# These use a non-standard "Wine" category, which is provided by |
967 |
# /etc/xdg/applications-merged/wine.menu |
968 |
|
969 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild |
970 |
index fec8f09..305cdd1 100644 |
971 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild |
972 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild |
973 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
974 |
xml? ( |
975 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
976 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
977 |
- ) |
978 |
- abi_x86_32? ( |
979 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
980 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
981 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
982 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
983 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
984 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
985 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
986 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
987 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
988 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
989 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
990 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
991 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
992 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
993 |
)" |
994 |
|
995 |
RDEPEND="${COMMON_DEPEND} |
996 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
997 |
>=sys-kernel/linux-headers-2.6 |
998 |
virtual/pkgconfig |
999 |
virtual/yacc |
1000 |
- X? ( |
1001 |
- x11-proto/inputproto |
1002 |
- x11-proto/xextproto |
1003 |
- x11-proto/xf86vidmodeproto |
1004 |
- ) |
1005 |
+ X? ( x11-base/xorg-proto ) |
1006 |
prelink? ( sys-devel/prelink ) |
1007 |
- xinerama? ( x11-proto/xineramaproto )" |
1008 |
+ xinerama? ( x11-base/xorg-proto )" |
1009 |
|
1010 |
# These use a non-standard "Wine" category, which is provided by |
1011 |
# /etc/xdg/applications-merged/wine.menu |
1012 |
|
1013 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild |
1014 |
index fec8f09..305cdd1 100644 |
1015 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild |
1016 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild |
1017 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
1018 |
xml? ( |
1019 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
1020 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
1021 |
- ) |
1022 |
- abi_x86_32? ( |
1023 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1024 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
1025 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
1026 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
1027 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
1028 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
1029 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
1030 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
1031 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
1032 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
1033 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
1034 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
1035 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
1036 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
1037 |
)" |
1038 |
|
1039 |
RDEPEND="${COMMON_DEPEND} |
1040 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
1041 |
>=sys-kernel/linux-headers-2.6 |
1042 |
virtual/pkgconfig |
1043 |
virtual/yacc |
1044 |
- X? ( |
1045 |
- x11-proto/inputproto |
1046 |
- x11-proto/xextproto |
1047 |
- x11-proto/xf86vidmodeproto |
1048 |
- ) |
1049 |
+ X? ( x11-base/xorg-proto ) |
1050 |
prelink? ( sys-devel/prelink ) |
1051 |
- xinerama? ( x11-proto/xineramaproto )" |
1052 |
+ xinerama? ( x11-base/xorg-proto )" |
1053 |
|
1054 |
# These use a non-standard "Wine" category, which is provided by |
1055 |
# /etc/xdg/applications-merged/wine.menu |
1056 |
|
1057 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild |
1058 |
index fec8f09..305cdd1 100644 |
1059 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild |
1060 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild |
1061 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
1062 |
xml? ( |
1063 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
1064 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
1065 |
- ) |
1066 |
- abi_x86_32? ( |
1067 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1068 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
1069 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
1070 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
1071 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
1072 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
1073 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
1074 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
1075 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
1076 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
1077 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
1078 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
1079 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
1080 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
1081 |
)" |
1082 |
|
1083 |
RDEPEND="${COMMON_DEPEND} |
1084 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
1085 |
>=sys-kernel/linux-headers-2.6 |
1086 |
virtual/pkgconfig |
1087 |
virtual/yacc |
1088 |
- X? ( |
1089 |
- x11-proto/inputproto |
1090 |
- x11-proto/xextproto |
1091 |
- x11-proto/xf86vidmodeproto |
1092 |
- ) |
1093 |
+ X? ( x11-base/xorg-proto ) |
1094 |
prelink? ( sys-devel/prelink ) |
1095 |
- xinerama? ( x11-proto/xineramaproto )" |
1096 |
+ xinerama? ( x11-base/xorg-proto )" |
1097 |
|
1098 |
# These use a non-standard "Wine" category, which is provided by |
1099 |
# /etc/xdg/applications-merged/wine.menu |
1100 |
|
1101 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild |
1102 |
index fec8f09..305cdd1 100644 |
1103 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild |
1104 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild |
1105 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
1106 |
xml? ( |
1107 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
1108 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
1109 |
- ) |
1110 |
- abi_x86_32? ( |
1111 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1112 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
1113 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
1114 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
1115 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
1116 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
1117 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
1118 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
1119 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
1120 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
1121 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
1122 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
1123 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
1124 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
1125 |
)" |
1126 |
|
1127 |
RDEPEND="${COMMON_DEPEND} |
1128 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
1129 |
>=sys-kernel/linux-headers-2.6 |
1130 |
virtual/pkgconfig |
1131 |
virtual/yacc |
1132 |
- X? ( |
1133 |
- x11-proto/inputproto |
1134 |
- x11-proto/xextproto |
1135 |
- x11-proto/xf86vidmodeproto |
1136 |
- ) |
1137 |
+ X? ( x11-base/xorg-proto ) |
1138 |
prelink? ( sys-devel/prelink ) |
1139 |
- xinerama? ( x11-proto/xineramaproto )" |
1140 |
+ xinerama? ( x11-base/xorg-proto )" |
1141 |
|
1142 |
# These use a non-standard "Wine" category, which is provided by |
1143 |
# /etc/xdg/applications-merged/wine.menu |
1144 |
|
1145 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild |
1146 |
index fec8f09..305cdd1 100644 |
1147 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild |
1148 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild |
1149 |
@@ -93,22 +93,6 @@ COMMON_DEPEND=" |
1150 |
xml? ( |
1151 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
1152 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
1153 |
- ) |
1154 |
- abi_x86_32? ( |
1155 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1156 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
1157 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
1158 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
1159 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
1160 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
1161 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
1162 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
1163 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
1164 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
1165 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
1166 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
1167 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
1168 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
1169 |
)" |
1170 |
|
1171 |
RDEPEND="${COMMON_DEPEND} |
1172 |
@@ -135,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
1173 |
>=sys-kernel/linux-headers-2.6 |
1174 |
virtual/pkgconfig |
1175 |
virtual/yacc |
1176 |
- X? ( |
1177 |
- x11-proto/inputproto |
1178 |
- x11-proto/xextproto |
1179 |
- x11-proto/xf86vidmodeproto |
1180 |
- ) |
1181 |
+ X? ( x11-base/xorg-proto ) |
1182 |
prelink? ( sys-devel/prelink ) |
1183 |
- xinerama? ( x11-proto/xineramaproto )" |
1184 |
+ xinerama? ( x11-base/xorg-proto )" |
1185 |
|
1186 |
# These use a non-standard "Wine" category, which is provided by |
1187 |
# /etc/xdg/applications-merged/wine.menu |
1188 |
|
1189 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild |
1190 |
index 7fd4362..1c62a21 100644 |
1191 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild |
1192 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild |
1193 |
@@ -94,22 +94,6 @@ COMMON_DEPEND=" |
1194 |
xml? ( |
1195 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
1196 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
1197 |
- ) |
1198 |
- abi_x86_32? ( |
1199 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1200 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
1201 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
1202 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
1203 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
1204 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
1205 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
1206 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
1207 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
1208 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
1209 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
1210 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
1211 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
1212 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
1213 |
)" |
1214 |
|
1215 |
RDEPEND="${COMMON_DEPEND} |
1216 |
@@ -136,13 +120,9 @@ DEPEND="${COMMON_DEPEND} |
1217 |
>=sys-kernel/linux-headers-2.6 |
1218 |
virtual/pkgconfig |
1219 |
virtual/yacc |
1220 |
- X? ( |
1221 |
- x11-proto/inputproto |
1222 |
- x11-proto/xextproto |
1223 |
- x11-proto/xf86vidmodeproto |
1224 |
- ) |
1225 |
+ X? ( x11-base/xorg-proto ) |
1226 |
prelink? ( sys-devel/prelink ) |
1227 |
- xinerama? ( x11-proto/xineramaproto )" |
1228 |
+ xinerama? ( x11-base/xorg-proto )" |
1229 |
|
1230 |
# These use a non-standard "Wine" category, which is provided by |
1231 |
# /etc/xdg/applications-merged/wine.menu |
1232 |
|
1233 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild |
1234 |
index cda136e..0fc7213 100644 |
1235 |
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild |
1236 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild |
1237 |
@@ -95,22 +95,6 @@ COMMON_DEPEND=" |
1238 |
xml? ( |
1239 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
1240 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
1241 |
- ) |
1242 |
- abi_x86_32? ( |
1243 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1244 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
1245 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
1246 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
1247 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
1248 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
1249 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
1250 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
1251 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
1252 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
1253 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
1254 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
1255 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
1256 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
1257 |
)" |
1258 |
|
1259 |
RDEPEND="${COMMON_DEPEND} |
1260 |
@@ -137,13 +121,9 @@ DEPEND="${COMMON_DEPEND} |
1261 |
>=sys-kernel/linux-headers-2.6 |
1262 |
virtual/pkgconfig |
1263 |
virtual/yacc |
1264 |
- X? ( |
1265 |
- x11-proto/inputproto |
1266 |
- x11-proto/xextproto |
1267 |
- x11-proto/xf86vidmodeproto |
1268 |
- ) |
1269 |
+ X? ( x11-base/xorg-proto ) |
1270 |
prelink? ( sys-devel/prelink ) |
1271 |
- xinerama? ( x11-proto/xineramaproto )" |
1272 |
+ xinerama? ( x11-base/xorg-proto )" |
1273 |
|
1274 |
# These use a non-standard "Wine" category, which is provided by |
1275 |
# /etc/xdg/applications-merged/wine.menu |
1276 |
|
1277 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild |
1278 |
index 1c122ab..a7cee77 100644 |
1279 |
--- a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild |
1280 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild |
1281 |
@@ -96,22 +96,6 @@ COMMON_DEPEND=" |
1282 |
xml? ( |
1283 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
1284 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
1285 |
- ) |
1286 |
- abi_x86_32? ( |
1287 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1288 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
1289 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
1290 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
1291 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
1292 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
1293 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
1294 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
1295 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
1296 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
1297 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
1298 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
1299 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
1300 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
1301 |
)" |
1302 |
|
1303 |
RDEPEND="${COMMON_DEPEND} |
1304 |
@@ -138,13 +122,9 @@ DEPEND="${COMMON_DEPEND} |
1305 |
>=sys-kernel/linux-headers-2.6 |
1306 |
virtual/pkgconfig |
1307 |
virtual/yacc |
1308 |
- X? ( |
1309 |
- x11-proto/inputproto |
1310 |
- x11-proto/xextproto |
1311 |
- x11-proto/xf86vidmodeproto |
1312 |
- ) |
1313 |
+ X? ( x11-base/xorg-proto ) |
1314 |
prelink? ( sys-devel/prelink ) |
1315 |
- xinerama? ( x11-proto/xineramaproto )" |
1316 |
+ xinerama? ( x11-base/xorg-proto )" |
1317 |
|
1318 |
# These use a non-standard "Wine" category, which is provided by |
1319 |
# /etc/xdg/applications-merged/wine.menu |
1320 |
|
1321 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild |
1322 |
index 1c122ab..a7cee77 100644 |
1323 |
--- a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild |
1324 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild |
1325 |
@@ -96,22 +96,6 @@ COMMON_DEPEND=" |
1326 |
xml? ( |
1327 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
1328 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
1329 |
- ) |
1330 |
- abi_x86_32? ( |
1331 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1332 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
1333 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
1334 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
1335 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
1336 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
1337 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
1338 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
1339 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
1340 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
1341 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
1342 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
1343 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
1344 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
1345 |
)" |
1346 |
|
1347 |
RDEPEND="${COMMON_DEPEND} |
1348 |
@@ -138,13 +122,9 @@ DEPEND="${COMMON_DEPEND} |
1349 |
>=sys-kernel/linux-headers-2.6 |
1350 |
virtual/pkgconfig |
1351 |
virtual/yacc |
1352 |
- X? ( |
1353 |
- x11-proto/inputproto |
1354 |
- x11-proto/xextproto |
1355 |
- x11-proto/xf86vidmodeproto |
1356 |
- ) |
1357 |
+ X? ( x11-base/xorg-proto ) |
1358 |
prelink? ( sys-devel/prelink ) |
1359 |
- xinerama? ( x11-proto/xineramaproto )" |
1360 |
+ xinerama? ( x11-base/xorg-proto )" |
1361 |
|
1362 |
# These use a non-standard "Wine" category, which is provided by |
1363 |
# /etc/xdg/applications-merged/wine.menu |
1364 |
|
1365 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
1366 |
index 8126d64..62ef97c 100644 |
1367 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
1368 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
1369 |
@@ -97,22 +97,6 @@ COMMON_DEPEND=" |
1370 |
xml? ( |
1371 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
1372 |
dev-libs/libxslt[${MULTILIB_USEDEP}] |
1373 |
- ) |
1374 |
- abi_x86_32? ( |
1375 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1376 |
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14 |
1377 |
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
1378 |
- !<app-emulation/emul-linux-x86-db-20140508-r3 |
1379 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
1380 |
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6 |
1381 |
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] |
1382 |
- !<app-emulation/emul-linux-x86-opengl-20140508-r1 |
1383 |
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
1384 |
- !<app-emulation/emul-linux-x86-sdl-20140508-r1 |
1385 |
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] |
1386 |
- !<app-emulation/emul-linux-x86-soundlibs-20140508 |
1387 |
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
1388 |
- !<app-emulation/emul-linux-x86-xlibs-20140508 |
1389 |
)" |
1390 |
|
1391 |
RDEPEND="${COMMON_DEPEND} |
1392 |
@@ -139,13 +123,9 @@ DEPEND="${COMMON_DEPEND} |
1393 |
>=sys-kernel/linux-headers-2.6 |
1394 |
virtual/pkgconfig |
1395 |
virtual/yacc |
1396 |
- X? ( |
1397 |
- x11-proto/inputproto |
1398 |
- x11-proto/xextproto |
1399 |
- x11-proto/xf86vidmodeproto |
1400 |
- ) |
1401 |
+ X? ( x11-base/xorg-proto ) |
1402 |
prelink? ( sys-devel/prelink ) |
1403 |
- xinerama? ( x11-proto/xineramaproto )" |
1404 |
+ xinerama? ( x11-base/xorg-proto )" |
1405 |
|
1406 |
# These use a non-standard "Wine" category, which is provided by |
1407 |
# /etc/xdg/applications-merged/wine.menu |