1 |
commit: 0430f3ea803e8a7a8673b079a3ada878539606a9 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Thu Apr 26 19:09:43 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 27 01:04:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0430f3ea |
7 |
|
8 |
app-emulation/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto). |
9 |
|
10 |
app-emulation/bochs/bochs-2.6.9.ebuild | 4 ++-- |
11 |
app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild | 4 ++-- |
12 |
app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild | 5 ++--- |
13 |
app-emulation/gxemul/gxemul-0.6.0-r1.ebuild | 4 ++-- |
14 |
app-emulation/spectemu/spectemu-0.99.3-r1.ebuild | 6 ++---- |
15 |
app-emulation/spectemu/spectemu-0.99.3.ebuild | 6 ++---- |
16 |
app-emulation/spim/spim-8.0-r3.ebuild | 6 ++++-- |
17 |
app-emulation/vice/vice-3.1.ebuild | 7 +------ |
18 |
.../virtualbox-guest-additions-5.1.32.ebuild | 7 +++---- |
19 |
.../virtualbox-guest-additions-5.1.34.ebuild | 7 +++---- |
20 |
.../virtualbox-guest-additions-5.1.36.ebuild | 7 +++---- |
21 |
.../virtualbox-guest-additions-5.2.10.ebuild | 7 +++---- |
22 |
.../virtualbox-guest-additions-5.2.8.ebuild | 7 +++---- |
23 |
app-emulation/wine-any/wine-any-2.0-r1.ebuild | 8 ++------ |
24 |
app-emulation/wine-any/wine-any-2.19.ebuild | 8 ++------ |
25 |
app-emulation/wine-any/wine-any-2.20.ebuild | 8 ++------ |
26 |
app-emulation/wine-any/wine-any-2.21.ebuild | 8 ++------ |
27 |
app-emulation/wine-any/wine-any-9999.ebuild | 8 ++------ |
28 |
app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild | 8 ++------ |
29 |
app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild | 8 ++------ |
30 |
app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild | 8 ++------ |
31 |
app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild | 8 ++------ |
32 |
app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 8 ++------ |
33 |
app-emulation/wine-staging/wine-staging-2.0-r1.ebuild | 8 ++------ |
34 |
app-emulation/wine-staging/wine-staging-2.19.ebuild | 8 ++------ |
35 |
app-emulation/wine-staging/wine-staging-2.20.ebuild | 8 ++------ |
36 |
app-emulation/wine-staging/wine-staging-2.21.ebuild | 8 ++------ |
37 |
app-emulation/wine-staging/wine-staging-9999.ebuild | 8 ++------ |
38 |
app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild | 8 ++------ |
39 |
app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild | 8 ++------ |
40 |
app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild | 8 ++------ |
41 |
app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild | 8 ++------ |
42 |
app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild | 8 ++------ |
43 |
app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild | 8 ++------ |
44 |
app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild | 8 ++------ |
45 |
app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild | 8 ++------ |
46 |
app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild | 8 ++------ |
47 |
app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild | 8 ++------ |
48 |
app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild | 8 ++------ |
49 |
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 8 ++------ |
50 |
app-emulation/xen-tools/xen-tools-4.10.0.ebuild | 2 +- |
51 |
app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild | 2 +- |
52 |
app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild | 2 +- |
53 |
app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild | 2 +- |
54 |
44 files changed, 90 insertions(+), 211 deletions(-) |
55 |
|
56 |
diff --git a/app-emulation/bochs/bochs-2.6.9.ebuild b/app-emulation/bochs/bochs-2.6.9.ebuild |
57 |
index 1fbf6c61aec..80e103e7f58 100644 |
58 |
--- a/app-emulation/bochs/bochs-2.6.9.ebuild |
59 |
+++ b/app-emulation/bochs/bochs-2.6.9.ebuild |
60 |
@@ -1,4 +1,4 @@ |
61 |
-# Copyright 1999-2017 Gentoo Foundation |
62 |
+# Copyright 1999-2018 Gentoo Foundation |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
|
65 |
EAPI=6 |
66 |
@@ -30,7 +30,7 @@ RDEPEND=" |
67 |
" |
68 |
DEPEND="${RDEPEND} |
69 |
doc? ( app-text/docbook-sgml-utils ) |
70 |
- X? ( x11-proto/xproto ) |
71 |
+ X? ( x11-base/xorg-proto ) |
72 |
sys-apps/sed |
73 |
>=app-text/opensp-1.5 |
74 |
" |
75 |
|
76 |
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild |
77 |
index 8b5fcdc0a69..4f7a7c37c07 100644 |
78 |
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild |
79 |
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild |
80 |
@@ -1,4 +1,4 @@ |
81 |
-# Copyright 1999-2017 Gentoo Foundation |
82 |
+# Copyright 1999-2018 Gentoo Foundation |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
|
85 |
EAPI=6 |
86 |
@@ -37,7 +37,7 @@ RDEPEND="X? ( x11-libs/libX11 |
87 |
>=sys-libs/slang-1.4" |
88 |
|
89 |
DEPEND="${RDEPEND} |
90 |
- X? ( x11-proto/xf86dgaproto ) |
91 |
+ X? ( x11-base/xorg-proto ) |
92 |
>=sys-devel/autoconf-2.57" |
93 |
|
94 |
S="${WORKDIR}/${PN}-code-${COMMIT}" |
95 |
|
96 |
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild |
97 |
index d9078de33c1..63d99f142b4 100644 |
98 |
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild |
99 |
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild |
100 |
@@ -1,4 +1,4 @@ |
101 |
-# Copyright 1999-2017 Gentoo Foundation |
102 |
+# Copyright 1999-2018 Gentoo Foundation |
103 |
# Distributed under the terms of the GNU General Public License v2 |
104 |
|
105 |
EAPI=6 |
106 |
@@ -44,8 +44,7 @@ RDEPEND="X? ( x11-libs/libXt |
107 |
virtual/cdrtools" |
108 |
|
109 |
DEPEND="${RDEPEND} |
110 |
- X? ( dga? ( x11-proto/xf86vidmodeproto |
111 |
- x11-proto/xf86dgaproto ) )" |
112 |
+ X? ( dga? ( x11-base/xorg-proto ) )" |
113 |
|
114 |
src_prepare() { |
115 |
default |
116 |
|
117 |
diff --git a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild |
118 |
index 97c1a3de88f..88953028592 100644 |
119 |
--- a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild |
120 |
+++ b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild |
121 |
@@ -1,4 +1,4 @@ |
122 |
-# Copyright 1999-2012 Gentoo Foundation |
123 |
+# Copyright 1999-2018 Gentoo Foundation |
124 |
# Distributed under the terms of the GNU General Public License v2 |
125 |
|
126 |
EAPI="4" |
127 |
@@ -16,7 +16,7 @@ IUSE="debug X" |
128 |
|
129 |
RDEPEND="X? ( x11-libs/libX11 )" |
130 |
DEPEND="${RDEPEND} |
131 |
- X? ( x11-proto/xproto )" |
132 |
+ X? ( x11-base/xorg-proto )" |
133 |
|
134 |
src_prepare() { |
135 |
epatch "${FILESDIR}"/${PV}-gcc46.patch |
136 |
|
137 |
diff --git a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild |
138 |
index 1052d0a334f..478549c3d5c 100644 |
139 |
--- a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild |
140 |
+++ b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild |
141 |
@@ -1,4 +1,4 @@ |
142 |
-# Copyright 1999-2012 Gentoo Foundation |
143 |
+# Copyright 1999-2018 Gentoo Foundation |
144 |
# Distributed under the terms of the GNU General Public License v2 |
145 |
|
146 |
EAPI=4 |
147 |
@@ -16,9 +16,7 @@ IUSE="readline svga +X" |
148 |
|
149 |
REQUIRED_USE="|| ( svga X )" |
150 |
|
151 |
-DEPEND="X? ( >=x11-proto/xf86vidmodeproto-2.2.2 |
152 |
- >=x11-proto/xextproto-7.0.2 |
153 |
- >=x11-proto/xproto-7.0.4 |
154 |
+DEPEND="X? ( x11-base/xorg-proto |
155 |
>=x11-libs/libX11-1.0.0 |
156 |
>=x11-libs/libXext-1.0.0 |
157 |
>=x11-libs/libXxf86vm-1.0.0 ) |
158 |
|
159 |
diff --git a/app-emulation/spectemu/spectemu-0.99.3.ebuild b/app-emulation/spectemu/spectemu-0.99.3.ebuild |
160 |
index 2ab41303ddc..cbdae8d8a0e 100644 |
161 |
--- a/app-emulation/spectemu/spectemu-0.99.3.ebuild |
162 |
+++ b/app-emulation/spectemu/spectemu-0.99.3.ebuild |
163 |
@@ -1,4 +1,4 @@ |
164 |
-# Copyright 1999-2009 Gentoo Foundation |
165 |
+# Copyright 1999-2018 Gentoo Foundation |
166 |
# Distributed under the terms of the GNU General Public License v2 |
167 |
|
168 |
### Several versions of specemu exist, xspect & vgaspect, utilising X11 |
169 |
@@ -17,9 +17,7 @@ SLOT="0" |
170 |
KEYWORDS="amd64 ppc x86" |
171 |
IUSE="X readline svga" |
172 |
|
173 |
-DEPEND="X? ( >=x11-proto/xf86vidmodeproto-2.2.2 |
174 |
- >=x11-proto/xextproto-7.0.2 |
175 |
- >=x11-proto/xproto-7.0.4 |
176 |
+DEPEND="X? ( x11-base/xorg-proto |
177 |
>=x11-libs/libX11-1.0.0 |
178 |
>=x11-libs/libXext-1.0.0 |
179 |
>=x11-libs/libXxf86vm-1.0.0 ) |
180 |
|
181 |
diff --git a/app-emulation/spim/spim-8.0-r3.ebuild b/app-emulation/spim/spim-8.0-r3.ebuild |
182 |
index 00776564c32..2717b50ee23 100644 |
183 |
--- a/app-emulation/spim/spim-8.0-r3.ebuild |
184 |
+++ b/app-emulation/spim/spim-8.0-r3.ebuild |
185 |
@@ -19,8 +19,10 @@ RDEPEND=" |
186 |
x11-libs/libXaw ) |
187 |
" |
188 |
DEPEND="${RDEPEND} |
189 |
- X? ( x11-misc/imake |
190 |
- x11-proto/xproto ) |
191 |
+ X? ( |
192 |
+ x11-base/xorg-proto |
193 |
+ x11-misc/imake |
194 |
+ ) |
195 |
sys-devel/bison |
196 |
" |
197 |
# test hangs forever, disabling it |
198 |
|
199 |
diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild |
200 |
index cc4fb987e50..6fe9e2623e2 100644 |
201 |
--- a/app-emulation/vice/vice-3.1.ebuild |
202 |
+++ b/app-emulation/vice/vice-3.1.ebuild |
203 |
@@ -75,15 +75,10 @@ DEPEND="${RDEPEND} |
204 |
virtual/pkgconfig |
205 |
x11-apps/bdftopcf |
206 |
x11-apps/mkfontdir |
207 |
- x11-proto/xproto |
208 |
- x11-proto/xextproto |
209 |
+ x11-base/xorg-proto |
210 |
media-libs/fontconfig |
211 |
- x11-proto/videoproto |
212 |
nls? ( sys-devel/gettext ) |
213 |
!sdl? ( |
214 |
- fullscreen? ( |
215 |
- x11-proto/xf86vidmodeproto |
216 |
- ) |
217 |
!gtk? ( |
218 |
x11-libs/libICE |
219 |
x11-libs/libSM |
220 |
|
221 |
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild |
222 |
index 6e4ec727e56..49506f057f7 100644 |
223 |
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild |
224 |
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild |
225 |
@@ -20,6 +20,7 @@ IUSE="X" |
226 |
|
227 |
RDEPEND="X? ( x11-apps/xrandr |
228 |
x11-apps/xrefresh |
229 |
+ x11-base/xorg-proto |
230 |
x11-libs/libXmu |
231 |
x11-libs/libX11 |
232 |
x11-libs/libXt |
233 |
@@ -27,8 +28,7 @@ RDEPEND="X? ( x11-apps/xrandr |
234 |
x11-libs/libXau |
235 |
x11-libs/libXdmcp |
236 |
x11-libs/libSM |
237 |
- x11-libs/libICE |
238 |
- x11-proto/glproto ) |
239 |
+ x11-libs/libICE ) |
240 |
sys-apps/dbus |
241 |
!!x11-drivers/xf86-input-virtualbox" |
242 |
DEPEND="${RDEPEND} |
243 |
@@ -37,8 +37,7 @@ DEPEND="${RDEPEND} |
244 |
sys-devel/bin86 |
245 |
sys-libs/pam |
246 |
sys-power/iasl |
247 |
- X? ( x11-proto/renderproto ) |
248 |
- !X? ( x11-proto/xproto )" |
249 |
+ x11-base/xorg-proto" |
250 |
PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )" |
251 |
|
252 |
BUILD_TARGETS="all" |
253 |
|
254 |
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild |
255 |
index b85dda606c3..1e207ed862f 100644 |
256 |
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild |
257 |
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild |
258 |
@@ -20,6 +20,7 @@ IUSE="X" |
259 |
|
260 |
RDEPEND="X? ( x11-apps/xrandr |
261 |
x11-apps/xrefresh |
262 |
+ x11-base/xorg-proto |
263 |
x11-libs/libXmu |
264 |
x11-libs/libX11 |
265 |
x11-libs/libXt |
266 |
@@ -27,8 +28,7 @@ RDEPEND="X? ( x11-apps/xrandr |
267 |
x11-libs/libXau |
268 |
x11-libs/libXdmcp |
269 |
x11-libs/libSM |
270 |
- x11-libs/libICE |
271 |
- x11-proto/glproto ) |
272 |
+ x11-libs/libICE ) |
273 |
sys-apps/dbus |
274 |
!!x11-drivers/xf86-input-virtualbox" |
275 |
DEPEND="${RDEPEND} |
276 |
@@ -37,8 +37,7 @@ DEPEND="${RDEPEND} |
277 |
sys-devel/bin86 |
278 |
sys-libs/pam |
279 |
sys-power/iasl |
280 |
- X? ( x11-proto/renderproto ) |
281 |
- !X? ( x11-proto/xproto )" |
282 |
+ x11-base/xorg-proto" |
283 |
PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )" |
284 |
|
285 |
BUILD_TARGETS="all" |
286 |
|
287 |
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild |
288 |
index b85dda606c3..1e207ed862f 100644 |
289 |
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild |
290 |
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild |
291 |
@@ -20,6 +20,7 @@ IUSE="X" |
292 |
|
293 |
RDEPEND="X? ( x11-apps/xrandr |
294 |
x11-apps/xrefresh |
295 |
+ x11-base/xorg-proto |
296 |
x11-libs/libXmu |
297 |
x11-libs/libX11 |
298 |
x11-libs/libXt |
299 |
@@ -27,8 +28,7 @@ RDEPEND="X? ( x11-apps/xrandr |
300 |
x11-libs/libXau |
301 |
x11-libs/libXdmcp |
302 |
x11-libs/libSM |
303 |
- x11-libs/libICE |
304 |
- x11-proto/glproto ) |
305 |
+ x11-libs/libICE ) |
306 |
sys-apps/dbus |
307 |
!!x11-drivers/xf86-input-virtualbox" |
308 |
DEPEND="${RDEPEND} |
309 |
@@ -37,8 +37,7 @@ DEPEND="${RDEPEND} |
310 |
sys-devel/bin86 |
311 |
sys-libs/pam |
312 |
sys-power/iasl |
313 |
- X? ( x11-proto/renderproto ) |
314 |
- !X? ( x11-proto/xproto )" |
315 |
+ x11-base/xorg-proto" |
316 |
PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )" |
317 |
|
318 |
BUILD_TARGETS="all" |
319 |
|
320 |
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild |
321 |
index 13cfeb79a1d..9330c3a361e 100644 |
322 |
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild |
323 |
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild |
324 |
@@ -21,6 +21,7 @@ IUSE="X" |
325 |
RDEPEND=" |
326 |
X? ( x11-apps/xrandr |
327 |
x11-apps/xrefresh |
328 |
+ x11-base/xorg-proto |
329 |
x11-libs/libXmu |
330 |
x11-libs/libX11 |
331 |
x11-libs/libXt |
332 |
@@ -28,8 +29,7 @@ RDEPEND=" |
333 |
x11-libs/libXau |
334 |
x11-libs/libXdmcp |
335 |
x11-libs/libSM |
336 |
- x11-libs/libICE |
337 |
- x11-proto/glproto ) |
338 |
+ x11-libs/libICE ) |
339 |
sys-apps/dbus |
340 |
!!x11-drivers/xf86-input-virtualbox |
341 |
!x11-drivers/xf86-video-virtualbox |
342 |
@@ -41,8 +41,7 @@ DEPEND=" |
343 |
sys-devel/bin86 |
344 |
sys-libs/pam |
345 |
sys-power/iasl |
346 |
- X? ( x11-proto/renderproto ) |
347 |
- !X? ( x11-proto/xproto ) |
348 |
+ x11-base/xorg-proto |
349 |
" |
350 |
PDEPEND=" |
351 |
X? ( x11-drivers/xf86-video-vboxvideo ) |
352 |
|
353 |
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild |
354 |
index 13cfeb79a1d..9330c3a361e 100644 |
355 |
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild |
356 |
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild |
357 |
@@ -21,6 +21,7 @@ IUSE="X" |
358 |
RDEPEND=" |
359 |
X? ( x11-apps/xrandr |
360 |
x11-apps/xrefresh |
361 |
+ x11-base/xorg-proto |
362 |
x11-libs/libXmu |
363 |
x11-libs/libX11 |
364 |
x11-libs/libXt |
365 |
@@ -28,8 +29,7 @@ RDEPEND=" |
366 |
x11-libs/libXau |
367 |
x11-libs/libXdmcp |
368 |
x11-libs/libSM |
369 |
- x11-libs/libICE |
370 |
- x11-proto/glproto ) |
371 |
+ x11-libs/libICE ) |
372 |
sys-apps/dbus |
373 |
!!x11-drivers/xf86-input-virtualbox |
374 |
!x11-drivers/xf86-video-virtualbox |
375 |
@@ -41,8 +41,7 @@ DEPEND=" |
376 |
sys-devel/bin86 |
377 |
sys-libs/pam |
378 |
sys-power/iasl |
379 |
- X? ( x11-proto/renderproto ) |
380 |
- !X? ( x11-proto/xproto ) |
381 |
+ x11-base/xorg-proto |
382 |
" |
383 |
PDEPEND=" |
384 |
X? ( x11-drivers/xf86-video-vboxvideo ) |
385 |
|
386 |
diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild |
387 |
index 1f394f6f13b..52aa80d79f2 100644 |
388 |
--- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild |
389 |
+++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild |
390 |
@@ -150,17 +150,13 @@ DEPEND="${COMMON_DEPEND} |
391 |
>=sys-kernel/linux-headers-2.6 |
392 |
virtual/pkgconfig |
393 |
virtual/yacc |
394 |
- X? ( |
395 |
- x11-proto/inputproto |
396 |
- x11-proto/xextproto |
397 |
- x11-proto/xf86vidmodeproto |
398 |
- ) |
399 |
+ X? ( x11-base/xorg-proto ) |
400 |
prelink? ( sys-devel/prelink ) |
401 |
staging? ( |
402 |
dev-lang/perl |
403 |
dev-perl/XML-Simple |
404 |
) |
405 |
- xinerama? ( x11-proto/xineramaproto )" |
406 |
+ xinerama? ( x11-base/xorg-proto )" |
407 |
|
408 |
# These use a non-standard "Wine" category, which is provided by |
409 |
# /etc/xdg/applications-merged/wine.menu |
410 |
|
411 |
diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild |
412 |
index 62b897aa0e7..d0b16c47aa1 100644 |
413 |
--- a/app-emulation/wine-any/wine-any-2.19.ebuild |
414 |
+++ b/app-emulation/wine-any/wine-any-2.19.ebuild |
415 |
@@ -151,17 +151,13 @@ DEPEND="${COMMON_DEPEND} |
416 |
>=sys-kernel/linux-headers-2.6 |
417 |
virtual/pkgconfig |
418 |
virtual/yacc |
419 |
- X? ( |
420 |
- x11-proto/inputproto |
421 |
- x11-proto/xextproto |
422 |
- x11-proto/xf86vidmodeproto |
423 |
- ) |
424 |
+ X? ( x11-base/xorg-proto ) |
425 |
prelink? ( sys-devel/prelink ) |
426 |
staging? ( |
427 |
dev-lang/perl |
428 |
dev-perl/XML-Simple |
429 |
) |
430 |
- xinerama? ( x11-proto/xineramaproto )" |
431 |
+ xinerama? ( x11-base/xorg-proto )" |
432 |
|
433 |
# These use a non-standard "Wine" category, which is provided by |
434 |
# /etc/xdg/applications-merged/wine.menu |
435 |
|
436 |
diff --git a/app-emulation/wine-any/wine-any-2.20.ebuild b/app-emulation/wine-any/wine-any-2.20.ebuild |
437 |
index ceb899dbb83..913e3e1528a 100644 |
438 |
--- a/app-emulation/wine-any/wine-any-2.20.ebuild |
439 |
+++ b/app-emulation/wine-any/wine-any-2.20.ebuild |
440 |
@@ -152,17 +152,13 @@ DEPEND="${COMMON_DEPEND} |
441 |
>=sys-kernel/linux-headers-2.6 |
442 |
virtual/pkgconfig |
443 |
virtual/yacc |
444 |
- X? ( |
445 |
- x11-proto/inputproto |
446 |
- x11-proto/xextproto |
447 |
- x11-proto/xf86vidmodeproto |
448 |
- ) |
449 |
+ X? ( x11-base/xorg-proto ) |
450 |
prelink? ( sys-devel/prelink ) |
451 |
staging? ( |
452 |
dev-lang/perl |
453 |
dev-perl/XML-Simple |
454 |
) |
455 |
- xinerama? ( x11-proto/xineramaproto )" |
456 |
+ xinerama? ( x11-base/xorg-proto )" |
457 |
|
458 |
# These use a non-standard "Wine" category, which is provided by |
459 |
# /etc/xdg/applications-merged/wine.menu |
460 |
|
461 |
diff --git a/app-emulation/wine-any/wine-any-2.21.ebuild b/app-emulation/wine-any/wine-any-2.21.ebuild |
462 |
index ceb899dbb83..913e3e1528a 100644 |
463 |
--- a/app-emulation/wine-any/wine-any-2.21.ebuild |
464 |
+++ b/app-emulation/wine-any/wine-any-2.21.ebuild |
465 |
@@ -152,17 +152,13 @@ DEPEND="${COMMON_DEPEND} |
466 |
>=sys-kernel/linux-headers-2.6 |
467 |
virtual/pkgconfig |
468 |
virtual/yacc |
469 |
- X? ( |
470 |
- x11-proto/inputproto |
471 |
- x11-proto/xextproto |
472 |
- x11-proto/xf86vidmodeproto |
473 |
- ) |
474 |
+ X? ( x11-base/xorg-proto ) |
475 |
prelink? ( sys-devel/prelink ) |
476 |
staging? ( |
477 |
dev-lang/perl |
478 |
dev-perl/XML-Simple |
479 |
) |
480 |
- xinerama? ( x11-proto/xineramaproto )" |
481 |
+ xinerama? ( x11-base/xorg-proto )" |
482 |
|
483 |
# These use a non-standard "Wine" category, which is provided by |
484 |
# /etc/xdg/applications-merged/wine.menu |
485 |
|
486 |
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild |
487 |
index 4ac2529840f..d8688841e0a 100644 |
488 |
--- a/app-emulation/wine-any/wine-any-9999.ebuild |
489 |
+++ b/app-emulation/wine-any/wine-any-9999.ebuild |
490 |
@@ -154,17 +154,13 @@ DEPEND="${COMMON_DEPEND} |
491 |
>=sys-kernel/linux-headers-2.6 |
492 |
virtual/pkgconfig |
493 |
virtual/yacc |
494 |
- X? ( |
495 |
- x11-proto/inputproto |
496 |
- x11-proto/xextproto |
497 |
- x11-proto/xf86vidmodeproto |
498 |
- ) |
499 |
+ X? ( x11-base/xorg-proto ) |
500 |
prelink? ( sys-devel/prelink ) |
501 |
staging? ( |
502 |
dev-lang/perl |
503 |
dev-perl/XML-Simple |
504 |
) |
505 |
- xinerama? ( x11-proto/xineramaproto )" |
506 |
+ xinerama? ( x11-base/xorg-proto )" |
507 |
|
508 |
# These use a non-standard "Wine" category, which is provided by |
509 |
# /etc/xdg/applications-merged/wine.menu |
510 |
|
511 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild |
512 |
index 296fe4e7b71..0ca4d6a8699 100644 |
513 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild |
514 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild |
515 |
@@ -134,13 +134,9 @@ DEPEND="${COMMON_DEPEND} |
516 |
>=sys-kernel/linux-headers-2.6 |
517 |
virtual/pkgconfig |
518 |
virtual/yacc |
519 |
- X? ( |
520 |
- x11-proto/inputproto |
521 |
- x11-proto/xextproto |
522 |
- x11-proto/xf86vidmodeproto |
523 |
- ) |
524 |
+ X? ( x11-base/xorg-proto ) |
525 |
prelink? ( sys-devel/prelink ) |
526 |
- xinerama? ( x11-proto/xineramaproto )" |
527 |
+ xinerama? ( x11-base/xorg-proto )" |
528 |
|
529 |
# These use a non-standard "Wine" category, which is provided by |
530 |
# /etc/xdg/applications-merged/wine.menu |
531 |
|
532 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild |
533 |
index 94d819782d2..45394c94698 100644 |
534 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild |
535 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild |
536 |
@@ -135,13 +135,9 @@ DEPEND="${COMMON_DEPEND} |
537 |
>=sys-kernel/linux-headers-2.6 |
538 |
virtual/pkgconfig |
539 |
virtual/yacc |
540 |
- X? ( |
541 |
- x11-proto/inputproto |
542 |
- x11-proto/xextproto |
543 |
- x11-proto/xf86vidmodeproto |
544 |
- ) |
545 |
+ X? ( x11-base/xorg-proto ) |
546 |
prelink? ( sys-devel/prelink ) |
547 |
- xinerama? ( x11-proto/xineramaproto )" |
548 |
+ xinerama? ( x11-base/xorg-proto )" |
549 |
|
550 |
# These use a non-standard "Wine" category, which is provided by |
551 |
# /etc/xdg/applications-merged/wine.menu |
552 |
|
553 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild |
554 |
index cd620120b75..d8fd326eccb 100644 |
555 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild |
556 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild |
557 |
@@ -136,13 +136,9 @@ DEPEND="${COMMON_DEPEND} |
558 |
>=sys-kernel/linux-headers-2.6 |
559 |
virtual/pkgconfig |
560 |
virtual/yacc |
561 |
- X? ( |
562 |
- x11-proto/inputproto |
563 |
- x11-proto/xextproto |
564 |
- x11-proto/xf86vidmodeproto |
565 |
- ) |
566 |
+ X? ( x11-base/xorg-proto ) |
567 |
prelink? ( sys-devel/prelink ) |
568 |
- xinerama? ( x11-proto/xineramaproto )" |
569 |
+ xinerama? ( x11-base/xorg-proto )" |
570 |
|
571 |
# These use a non-standard "Wine" category, which is provided by |
572 |
# /etc/xdg/applications-merged/wine.menu |
573 |
|
574 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild |
575 |
index cd620120b75..d8fd326eccb 100644 |
576 |
--- a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild |
577 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild |
578 |
@@ -136,13 +136,9 @@ DEPEND="${COMMON_DEPEND} |
579 |
>=sys-kernel/linux-headers-2.6 |
580 |
virtual/pkgconfig |
581 |
virtual/yacc |
582 |
- X? ( |
583 |
- x11-proto/inputproto |
584 |
- x11-proto/xextproto |
585 |
- x11-proto/xf86vidmodeproto |
586 |
- ) |
587 |
+ X? ( x11-base/xorg-proto ) |
588 |
prelink? ( sys-devel/prelink ) |
589 |
- xinerama? ( x11-proto/xineramaproto )" |
590 |
+ xinerama? ( x11-base/xorg-proto )" |
591 |
|
592 |
# These use a non-standard "Wine" category, which is provided by |
593 |
# /etc/xdg/applications-merged/wine.menu |
594 |
|
595 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
596 |
index 7781bcbed2f..b48cb73fb1b 100644 |
597 |
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
598 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
599 |
@@ -138,13 +138,9 @@ DEPEND="${COMMON_DEPEND} |
600 |
>=sys-kernel/linux-headers-2.6 |
601 |
virtual/pkgconfig |
602 |
virtual/yacc |
603 |
- X? ( |
604 |
- x11-proto/inputproto |
605 |
- x11-proto/xextproto |
606 |
- x11-proto/xf86vidmodeproto |
607 |
- ) |
608 |
+ X? ( x11-base/xorg-proto ) |
609 |
prelink? ( sys-devel/prelink ) |
610 |
- xinerama? ( x11-proto/xineramaproto )" |
611 |
+ xinerama? ( x11-base/xorg-proto )" |
612 |
|
613 |
# These use a non-standard "Wine" category, which is provided by |
614 |
# /etc/xdg/applications-merged/wine.menu |
615 |
|
616 |
diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild |
617 |
index 191ee925a44..2eb9fbdb2a4 100644 |
618 |
--- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild |
619 |
+++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild |
620 |
@@ -140,17 +140,13 @@ DEPEND="${COMMON_DEPEND} |
621 |
>=sys-kernel/linux-headers-2.6 |
622 |
virtual/pkgconfig |
623 |
virtual/yacc |
624 |
- X? ( |
625 |
- x11-proto/inputproto |
626 |
- x11-proto/xextproto |
627 |
- x11-proto/xf86vidmodeproto |
628 |
- ) |
629 |
+ X? ( x11-base/xorg-proto ) |
630 |
prelink? ( sys-devel/prelink ) |
631 |
staging? ( |
632 |
dev-lang/perl |
633 |
dev-perl/XML-Simple |
634 |
) |
635 |
- xinerama? ( x11-proto/xineramaproto )" |
636 |
+ xinerama? ( x11-base/xorg-proto )" |
637 |
|
638 |
# These use a non-standard "Wine" category, which is provided by |
639 |
# /etc/xdg/applications-merged/wine.menu |
640 |
|
641 |
diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-2.19.ebuild |
642 |
index e6caef35641..933b53a87ff 100644 |
643 |
--- a/app-emulation/wine-staging/wine-staging-2.19.ebuild |
644 |
+++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild |
645 |
@@ -141,17 +141,13 @@ DEPEND="${COMMON_DEPEND} |
646 |
>=sys-kernel/linux-headers-2.6 |
647 |
virtual/pkgconfig |
648 |
virtual/yacc |
649 |
- X? ( |
650 |
- x11-proto/inputproto |
651 |
- x11-proto/xextproto |
652 |
- x11-proto/xf86vidmodeproto |
653 |
- ) |
654 |
+ X? ( x11-base/xorg-proto ) |
655 |
prelink? ( sys-devel/prelink ) |
656 |
staging? ( |
657 |
dev-lang/perl |
658 |
dev-perl/XML-Simple |
659 |
) |
660 |
- xinerama? ( x11-proto/xineramaproto )" |
661 |
+ xinerama? ( x11-base/xorg-proto )" |
662 |
|
663 |
# These use a non-standard "Wine" category, which is provided by |
664 |
# /etc/xdg/applications-merged/wine.menu |
665 |
|
666 |
diff --git a/app-emulation/wine-staging/wine-staging-2.20.ebuild b/app-emulation/wine-staging/wine-staging-2.20.ebuild |
667 |
index 3733269fd13..e3bcca8e5da 100644 |
668 |
--- a/app-emulation/wine-staging/wine-staging-2.20.ebuild |
669 |
+++ b/app-emulation/wine-staging/wine-staging-2.20.ebuild |
670 |
@@ -142,17 +142,13 @@ DEPEND="${COMMON_DEPEND} |
671 |
>=sys-kernel/linux-headers-2.6 |
672 |
virtual/pkgconfig |
673 |
virtual/yacc |
674 |
- X? ( |
675 |
- x11-proto/inputproto |
676 |
- x11-proto/xextproto |
677 |
- x11-proto/xf86vidmodeproto |
678 |
- ) |
679 |
+ X? ( x11-base/xorg-proto ) |
680 |
prelink? ( sys-devel/prelink ) |
681 |
staging? ( |
682 |
dev-lang/perl |
683 |
dev-perl/XML-Simple |
684 |
) |
685 |
- xinerama? ( x11-proto/xineramaproto )" |
686 |
+ xinerama? ( x11-base/xorg-proto )" |
687 |
|
688 |
# These use a non-standard "Wine" category, which is provided by |
689 |
# /etc/xdg/applications-merged/wine.menu |
690 |
|
691 |
diff --git a/app-emulation/wine-staging/wine-staging-2.21.ebuild b/app-emulation/wine-staging/wine-staging-2.21.ebuild |
692 |
index 3733269fd13..e3bcca8e5da 100644 |
693 |
--- a/app-emulation/wine-staging/wine-staging-2.21.ebuild |
694 |
+++ b/app-emulation/wine-staging/wine-staging-2.21.ebuild |
695 |
@@ -142,17 +142,13 @@ DEPEND="${COMMON_DEPEND} |
696 |
>=sys-kernel/linux-headers-2.6 |
697 |
virtual/pkgconfig |
698 |
virtual/yacc |
699 |
- X? ( |
700 |
- x11-proto/inputproto |
701 |
- x11-proto/xextproto |
702 |
- x11-proto/xf86vidmodeproto |
703 |
- ) |
704 |
+ X? ( x11-base/xorg-proto ) |
705 |
prelink? ( sys-devel/prelink ) |
706 |
staging? ( |
707 |
dev-lang/perl |
708 |
dev-perl/XML-Simple |
709 |
) |
710 |
- xinerama? ( x11-proto/xineramaproto )" |
711 |
+ xinerama? ( x11-base/xorg-proto )" |
712 |
|
713 |
# These use a non-standard "Wine" category, which is provided by |
714 |
# /etc/xdg/applications-merged/wine.menu |
715 |
|
716 |
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild |
717 |
index a231afd2ad8..fd41d6cfdb2 100644 |
718 |
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild |
719 |
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild |
720 |
@@ -144,17 +144,13 @@ DEPEND="${COMMON_DEPEND} |
721 |
>=sys-kernel/linux-headers-2.6 |
722 |
virtual/pkgconfig |
723 |
virtual/yacc |
724 |
- X? ( |
725 |
- x11-proto/inputproto |
726 |
- x11-proto/xextproto |
727 |
- x11-proto/xf86vidmodeproto |
728 |
- ) |
729 |
+ X? ( x11-base/xorg-proto ) |
730 |
prelink? ( sys-devel/prelink ) |
731 |
staging? ( |
732 |
dev-lang/perl |
733 |
dev-perl/XML-Simple |
734 |
) |
735 |
- xinerama? ( x11-proto/xineramaproto )" |
736 |
+ xinerama? ( x11-base/xorg-proto )" |
737 |
|
738 |
# These use a non-standard "Wine" category, which is provided by |
739 |
# /etc/xdg/applications-merged/wine.menu |
740 |
|
741 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild |
742 |
index 122d7b74893..44f1a68f219 100644 |
743 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild |
744 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild |
745 |
@@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
746 |
>=sys-kernel/linux-headers-2.6 |
747 |
virtual/pkgconfig |
748 |
virtual/yacc |
749 |
- X? ( |
750 |
- x11-proto/inputproto |
751 |
- x11-proto/xextproto |
752 |
- x11-proto/xf86vidmodeproto |
753 |
- ) |
754 |
+ X? ( x11-base/xorg-proto ) |
755 |
prelink? ( sys-devel/prelink ) |
756 |
- xinerama? ( x11-proto/xineramaproto )" |
757 |
+ xinerama? ( x11-base/xorg-proto )" |
758 |
|
759 |
# These use a non-standard "Wine" category, which is provided by |
760 |
# /etc/xdg/applications-merged/wine.menu |
761 |
|
762 |
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 |
763 |
index c701c112800..203ac31a11d 100644 |
764 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild |
765 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild |
766 |
@@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
767 |
>=sys-kernel/linux-headers-2.6 |
768 |
virtual/pkgconfig |
769 |
virtual/yacc |
770 |
- X? ( |
771 |
- x11-proto/inputproto |
772 |
- x11-proto/xextproto |
773 |
- x11-proto/xf86vidmodeproto |
774 |
- ) |
775 |
+ X? ( x11-base/xorg-proto ) |
776 |
prelink? ( sys-devel/prelink ) |
777 |
- xinerama? ( x11-proto/xineramaproto )" |
778 |
+ xinerama? ( x11-base/xorg-proto )" |
779 |
|
780 |
# These use a non-standard "Wine" category, which is provided by |
781 |
# /etc/xdg/applications-merged/wine.menu |
782 |
|
783 |
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 |
784 |
index c701c112800..203ac31a11d 100644 |
785 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild |
786 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild |
787 |
@@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
788 |
>=sys-kernel/linux-headers-2.6 |
789 |
virtual/pkgconfig |
790 |
virtual/yacc |
791 |
- X? ( |
792 |
- x11-proto/inputproto |
793 |
- x11-proto/xextproto |
794 |
- x11-proto/xf86vidmodeproto |
795 |
- ) |
796 |
+ X? ( x11-base/xorg-proto ) |
797 |
prelink? ( sys-devel/prelink ) |
798 |
- xinerama? ( x11-proto/xineramaproto )" |
799 |
+ xinerama? ( x11-base/xorg-proto )" |
800 |
|
801 |
# These use a non-standard "Wine" category, which is provided by |
802 |
# /etc/xdg/applications-merged/wine.menu |
803 |
|
804 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild |
805 |
index e24402ac58f..42ea191ef33 100644 |
806 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild |
807 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild |
808 |
@@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
809 |
>=sys-kernel/linux-headers-2.6 |
810 |
virtual/pkgconfig |
811 |
virtual/yacc |
812 |
- X? ( |
813 |
- x11-proto/inputproto |
814 |
- x11-proto/xextproto |
815 |
- x11-proto/xf86vidmodeproto |
816 |
- ) |
817 |
+ X? ( x11-base/xorg-proto ) |
818 |
prelink? ( sys-devel/prelink ) |
819 |
- xinerama? ( x11-proto/xineramaproto )" |
820 |
+ xinerama? ( x11-base/xorg-proto )" |
821 |
|
822 |
# These use a non-standard "Wine" category, which is provided by |
823 |
# /etc/xdg/applications-merged/wine.menu |
824 |
|
825 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild |
826 |
index 1897a5fe7ad..e012559463d 100644 |
827 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild |
828 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild |
829 |
@@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND} |
830 |
>=sys-kernel/linux-headers-2.6 |
831 |
virtual/pkgconfig |
832 |
virtual/yacc |
833 |
- X? ( |
834 |
- x11-proto/inputproto |
835 |
- x11-proto/xextproto |
836 |
- x11-proto/xf86vidmodeproto |
837 |
- ) |
838 |
+ X? ( x11-base/xorg-proto ) |
839 |
prelink? ( sys-devel/prelink ) |
840 |
- xinerama? ( x11-proto/xineramaproto )" |
841 |
+ xinerama? ( x11-base/xorg-proto )" |
842 |
|
843 |
# These use a non-standard "Wine" category, which is provided by |
844 |
# /etc/xdg/applications-merged/wine.menu |
845 |
|
846 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild |
847 |
index 3f1778611a3..40d354c58c0 100644 |
848 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild |
849 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild |
850 |
@@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND} |
851 |
>=sys-kernel/linux-headers-2.6 |
852 |
virtual/pkgconfig |
853 |
virtual/yacc |
854 |
- X? ( |
855 |
- x11-proto/inputproto |
856 |
- x11-proto/xextproto |
857 |
- x11-proto/xf86vidmodeproto |
858 |
- ) |
859 |
+ X? ( x11-base/xorg-proto ) |
860 |
prelink? ( sys-devel/prelink ) |
861 |
- xinerama? ( x11-proto/xineramaproto )" |
862 |
+ xinerama? ( x11-base/xorg-proto )" |
863 |
|
864 |
# These use a non-standard "Wine" category, which is provided by |
865 |
# /etc/xdg/applications-merged/wine.menu |
866 |
|
867 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild |
868 |
index 3f1778611a3..40d354c58c0 100644 |
869 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild |
870 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild |
871 |
@@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND} |
872 |
>=sys-kernel/linux-headers-2.6 |
873 |
virtual/pkgconfig |
874 |
virtual/yacc |
875 |
- X? ( |
876 |
- x11-proto/inputproto |
877 |
- x11-proto/xextproto |
878 |
- x11-proto/xf86vidmodeproto |
879 |
- ) |
880 |
+ X? ( x11-base/xorg-proto ) |
881 |
prelink? ( sys-devel/prelink ) |
882 |
- xinerama? ( x11-proto/xineramaproto )" |
883 |
+ xinerama? ( x11-base/xorg-proto )" |
884 |
|
885 |
# These use a non-standard "Wine" category, which is provided by |
886 |
# /etc/xdg/applications-merged/wine.menu |
887 |
|
888 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild |
889 |
index 3f1778611a3..40d354c58c0 100644 |
890 |
--- a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild |
891 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild |
892 |
@@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND} |
893 |
>=sys-kernel/linux-headers-2.6 |
894 |
virtual/pkgconfig |
895 |
virtual/yacc |
896 |
- X? ( |
897 |
- x11-proto/inputproto |
898 |
- x11-proto/xextproto |
899 |
- x11-proto/xf86vidmodeproto |
900 |
- ) |
901 |
+ X? ( x11-base/xorg-proto ) |
902 |
prelink? ( sys-devel/prelink ) |
903 |
- xinerama? ( x11-proto/xineramaproto )" |
904 |
+ xinerama? ( x11-base/xorg-proto )" |
905 |
|
906 |
# These use a non-standard "Wine" category, which is provided by |
907 |
# /etc/xdg/applications-merged/wine.menu |
908 |
|
909 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild |
910 |
index ad6493ebe95..0fc72130806 100644 |
911 |
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild |
912 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild |
913 |
@@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND} |
914 |
>=sys-kernel/linux-headers-2.6 |
915 |
virtual/pkgconfig |
916 |
virtual/yacc |
917 |
- X? ( |
918 |
- x11-proto/inputproto |
919 |
- x11-proto/xextproto |
920 |
- x11-proto/xf86vidmodeproto |
921 |
- ) |
922 |
+ X? ( x11-base/xorg-proto ) |
923 |
prelink? ( sys-devel/prelink ) |
924 |
- xinerama? ( x11-proto/xineramaproto )" |
925 |
+ xinerama? ( x11-base/xorg-proto )" |
926 |
|
927 |
# These use a non-standard "Wine" category, which is provided by |
928 |
# /etc/xdg/applications-merged/wine.menu |
929 |
|
930 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild |
931 |
index 28b84951d9b..a7cee775064 100644 |
932 |
--- a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild |
933 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild |
934 |
@@ -122,13 +122,9 @@ DEPEND="${COMMON_DEPEND} |
935 |
>=sys-kernel/linux-headers-2.6 |
936 |
virtual/pkgconfig |
937 |
virtual/yacc |
938 |
- X? ( |
939 |
- x11-proto/inputproto |
940 |
- x11-proto/xextproto |
941 |
- x11-proto/xf86vidmodeproto |
942 |
- ) |
943 |
+ X? ( x11-base/xorg-proto ) |
944 |
prelink? ( sys-devel/prelink ) |
945 |
- xinerama? ( x11-proto/xineramaproto )" |
946 |
+ xinerama? ( x11-base/xorg-proto )" |
947 |
|
948 |
# These use a non-standard "Wine" category, which is provided by |
949 |
# /etc/xdg/applications-merged/wine.menu |
950 |
|
951 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild |
952 |
index 28b84951d9b..a7cee775064 100644 |
953 |
--- a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild |
954 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild |
955 |
@@ -122,13 +122,9 @@ DEPEND="${COMMON_DEPEND} |
956 |
>=sys-kernel/linux-headers-2.6 |
957 |
virtual/pkgconfig |
958 |
virtual/yacc |
959 |
- X? ( |
960 |
- x11-proto/inputproto |
961 |
- x11-proto/xextproto |
962 |
- x11-proto/xf86vidmodeproto |
963 |
- ) |
964 |
+ X? ( x11-base/xorg-proto ) |
965 |
prelink? ( sys-devel/prelink ) |
966 |
- xinerama? ( x11-proto/xineramaproto )" |
967 |
+ xinerama? ( x11-base/xorg-proto )" |
968 |
|
969 |
# These use a non-standard "Wine" category, which is provided by |
970 |
# /etc/xdg/applications-merged/wine.menu |
971 |
|
972 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
973 |
index ddf4b23d2ee..62ef97c197e 100644 |
974 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
975 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
976 |
@@ -123,13 +123,9 @@ 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 |
- xinerama? ( x11-proto/xineramaproto )" |
988 |
+ xinerama? ( x11-base/xorg-proto )" |
989 |
|
990 |
# These use a non-standard "Wine" category, which is provided by |
991 |
# /etc/xdg/applications-merged/wine.menu |
992 |
|
993 |
diff --git a/app-emulation/xen-tools/xen-tools-4.10.0.ebuild b/app-emulation/xen-tools/xen-tools-4.10.0.ebuild |
994 |
index 03bc0dd6383..1d2b4deba3b 100644 |
995 |
--- a/app-emulation/xen-tools/xen-tools-4.10.0.ebuild |
996 |
+++ b/app-emulation/xen-tools/xen-tools-4.10.0.ebuild |
997 |
@@ -110,7 +110,7 @@ DEPEND="${COMMON_DEPEND} |
998 |
dev-texlive/texlive-latexextra |
999 |
media-gfx/transfig |
1000 |
) |
1001 |
- hvm? ( x11-proto/xproto |
1002 |
+ hvm? ( x11-base/xorg-proto |
1003 |
!net-libs/libiscsi ) |
1004 |
qemu? ( |
1005 |
app-arch/snappy:= |
1006 |
|
1007 |
diff --git a/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild |
1008 |
index 4c35903b2c5..f18cfce1271 100644 |
1009 |
--- a/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild |
1010 |
+++ b/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild |
1011 |
@@ -108,7 +108,7 @@ DEPEND="${COMMON_DEPEND} |
1012 |
dev-texlive/texlive-latexextra |
1013 |
media-gfx/transfig |
1014 |
) |
1015 |
- hvm? ( x11-proto/xproto |
1016 |
+ hvm? ( x11-base/xorg-proto |
1017 |
!net-libs/libiscsi ) |
1018 |
qemu? ( |
1019 |
app-arch/snappy:= |
1020 |
|
1021 |
diff --git a/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild |
1022 |
index 0ef35d660eb..191c3222dbe 100644 |
1023 |
--- a/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild |
1024 |
+++ b/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild |
1025 |
@@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND} |
1026 |
dev-texlive/texlive-latexextra |
1027 |
media-gfx/transfig |
1028 |
) |
1029 |
- hvm? ( x11-proto/xproto |
1030 |
+ hvm? ( x11-base/xorg-proto |
1031 |
!net-libs/libiscsi ) |
1032 |
qemu? ( |
1033 |
app-arch/snappy:= |
1034 |
|
1035 |
diff --git a/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild |
1036 |
index e7a533511e1..723cc4fdf1d 100644 |
1037 |
--- a/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild |
1038 |
+++ b/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild |
1039 |
@@ -108,7 +108,7 @@ DEPEND="${COMMON_DEPEND} |
1040 |
dev-texlive/texlive-latexextra |
1041 |
media-gfx/transfig |
1042 |
) |
1043 |
- hvm? ( x11-proto/xproto |
1044 |
+ hvm? ( x11-base/xorg-proto |
1045 |
!net-libs/libiscsi ) |
1046 |
qemu? ( |
1047 |
app-arch/snappy:= |