1 |
commit: b1bded37f8f09ce2c35805d365694dab7569fc27 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Sat May 12 00:20:37 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 12 00:32:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1bded37 |
7 |
|
8 |
x11-apps/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto). |
9 |
|
10 |
x11-apps/bdftopcf/bdftopcf-1.1.ebuild | 3 +-- |
11 |
x11-apps/iceauth/iceauth-1.0.8.ebuild | 2 +- |
12 |
x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild | 2 +- |
13 |
x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild | 4 ++-- |
14 |
x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild | 4 ++-- |
15 |
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 4 ++-- |
16 |
x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild | 4 ++-- |
17 |
x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild | 4 ++-- |
18 |
x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild | 2 +- |
19 |
x11-apps/rgb/rgb-1.0.5.ebuild | 4 ++-- |
20 |
x11-apps/rgb/rgb-1.0.6.ebuild | 6 +++--- |
21 |
x11-apps/sessreg/sessreg-1.1.1.ebuild | 4 ++-- |
22 |
x11-apps/transset/transset-1.0.1.ebuild | 4 ++-- |
23 |
x11-apps/transset/transset-1.0.2.ebuild | 2 +- |
24 |
x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild | 5 ++--- |
25 |
x11-apps/xdm/xdm-1.1.11-r3.ebuild | 7 +++---- |
26 |
x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild | 13 ++----------- |
27 |
x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild | 13 ++----------- |
28 |
x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild | 4 ++-- |
29 |
x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild | 2 +- |
30 |
x11-apps/xev/xev-1.2.1.ebuild | 4 ++-- |
31 |
x11-apps/xev/xev-1.2.2.ebuild | 4 ++-- |
32 |
x11-apps/xf86dga/xf86dga-1.0.3.ebuild | 4 ++-- |
33 |
x11-apps/xgamma/xgamma-1.0.5.ebuild | 4 ++-- |
34 |
x11-apps/xgamma/xgamma-1.0.6.ebuild | 4 ++-- |
35 |
x11-apps/xinput/xinput-1.6.1.ebuild | 4 ++-- |
36 |
x11-apps/xinput/xinput-1.6.2.ebuild | 4 ++-- |
37 |
x11-apps/xkbutils/xkbutils-1.0.4.ebuild | 5 ++--- |
38 |
x11-apps/xprop/xprop-1.2.2.ebuild | 4 ++-- |
39 |
x11-apps/xprop/xprop-1.2.3.ebuild | 2 +- |
40 |
x11-apps/xtrap/xtrap-1.0.2-r1.ebuild | 4 ++-- |
41 |
x11-apps/xtrap/xtrap-1.0.3.ebuild | 2 +- |
42 |
x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild | 4 ++-- |
43 |
x11-apps/xvidtune/xvidtune-1.0.3.ebuild | 4 ++-- |
44 |
x11-apps/xwd/xwd-1.0.6.ebuild | 6 +++--- |
45 |
x11-apps/xwd/xwd-1.0.7.ebuild | 4 ++-- |
46 |
x11-apps/xwininfo/xwininfo-1.1.3.ebuild | 6 +++--- |
47 |
x11-apps/xwininfo/xwininfo-1.1.4.ebuild | 4 ++-- |
48 |
38 files changed, 72 insertions(+), 94 deletions(-) |
49 |
|
50 |
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild |
51 |
index df9d6c081a2..6c3220866fd 100644 |
52 |
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild |
53 |
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild |
54 |
@@ -10,6 +10,5 @@ DESCRIPTION="X.Org bdftopcf application" |
55 |
KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
56 |
IUSE="" |
57 |
DEPEND=" |
58 |
- x11-proto/fontsproto |
59 |
- x11-proto/xproto" |
60 |
+ x11-base/xorg-proto" |
61 |
RDEPEND="" |
62 |
|
63 |
diff --git a/x11-apps/iceauth/iceauth-1.0.8.ebuild b/x11-apps/iceauth/iceauth-1.0.8.ebuild |
64 |
index 084c861bc6b..fbcafd4b17a 100644 |
65 |
--- a/x11-apps/iceauth/iceauth-1.0.8.ebuild |
66 |
+++ b/x11-apps/iceauth/iceauth-1.0.8.ebuild |
67 |
@@ -12,4 +12,4 @@ IUSE="" |
68 |
|
69 |
RDEPEND="x11-libs/libICE" |
70 |
DEPEND="${RDEPEND} |
71 |
- x11-proto/xproto" |
72 |
+ x11-base/xorg-proto" |
73 |
|
74 |
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild |
75 |
index f14f3fa384a..69ac7b3936c 100644 |
76 |
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild |
77 |
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild |
78 |
@@ -18,7 +18,7 @@ X86_RDEPEND=" |
79 |
x11-libs/libXext |
80 |
x11-libs/libXv |
81 |
)" |
82 |
-X86_DEPEND=">=x11-proto/dri2proto-2.6" |
83 |
+X86_DEPEND="x11-base/xorg-proto" |
84 |
RDEPEND="sys-apps/kmod:= |
85 |
sys-process/procps:= |
86 |
>=x11-libs/cairo-1.12.0[X?] |
87 |
|
88 |
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
89 |
index 1e807c1632f..aa6ffbd8f9a 100644 |
90 |
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
91 |
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
92 |
@@ -1,4 +1,4 @@ |
93 |
-# Copyright 1999-2017 Gentoo Foundation |
94 |
+# Copyright 1999-2018 Gentoo Foundation |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
|
97 |
EAPI=5 |
98 |
@@ -35,7 +35,7 @@ RDEPEND=" |
99 |
DEPEND="${RDEPEND} |
100 |
media-libs/glew |
101 |
virtual/glu |
102 |
- x11-proto/xproto" |
103 |
+ x11-base/xorg-proto" |
104 |
|
105 |
S=${WORKDIR}/${MY_P} |
106 |
EGIT_CHECKOUT_DIR=${S} |
107 |
|
108 |
diff --git a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild |
109 |
index d999d44c52e..07729580b32 100644 |
110 |
--- a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild |
111 |
+++ b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild |
112 |
@@ -1,4 +1,4 @@ |
113 |
-# Copyright 1999-2017 Gentoo Foundation |
114 |
+# Copyright 1999-2018 Gentoo Foundation |
115 |
# Distributed under the terms of the GNU General Public License v2 |
116 |
|
117 |
EAPI=5 |
118 |
@@ -35,7 +35,7 @@ RDEPEND=" |
119 |
DEPEND="${RDEPEND} |
120 |
media-libs/glew |
121 |
virtual/glu |
122 |
- x11-proto/xproto" |
123 |
+ x11-base/xorg-proto" |
124 |
|
125 |
S=${WORKDIR}/${MY_P} |
126 |
EGIT_CHECKOUT_DIR=${S} |
127 |
|
128 |
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild |
129 |
index 3765af34344..5d949f23bd5 100644 |
130 |
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild |
131 |
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild |
132 |
@@ -1,4 +1,4 @@ |
133 |
-# Copyright 1999-2017 Gentoo Foundation |
134 |
+# Copyright 1999-2018 Gentoo Foundation |
135 |
# Distributed under the terms of the GNU General Public License v2 |
136 |
|
137 |
EAPI=5 |
138 |
@@ -35,7 +35,7 @@ RDEPEND=" |
139 |
DEPEND="${RDEPEND} |
140 |
media-libs/glew |
141 |
virtual/glu |
142 |
- x11-proto/xproto" |
143 |
+ x11-base/xorg-proto" |
144 |
|
145 |
S=${WORKDIR}/${MY_P} |
146 |
EGIT_CHECKOUT_DIR=${S} |
147 |
|
148 |
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild |
149 |
index c95b6737e41..ca04af88a15 100644 |
150 |
--- a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild |
151 |
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild |
152 |
@@ -1,4 +1,4 @@ |
153 |
-# Copyright 1999-2017 Gentoo Foundation |
154 |
+# Copyright 1999-2018 Gentoo Foundation |
155 |
# Distributed under the terms of the GNU General Public License v2 |
156 |
|
157 |
EAPI=5 |
158 |
@@ -13,7 +13,7 @@ IUSE="" |
159 |
RDEPEND="x11-libs/libfontenc |
160 |
media-libs/freetype:2" |
161 |
DEPEND="${RDEPEND} |
162 |
- x11-proto/xproto |
163 |
+ x11-base/xorg-proto |
164 |
app-arch/gzip |
165 |
app-arch/bzip2" |
166 |
|
167 |
|
168 |
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild |
169 |
index 17fd24b91e3..4283de38eef 100644 |
170 |
--- a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild |
171 |
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild |
172 |
@@ -1,4 +1,4 @@ |
173 |
-# Copyright 1999-2017 Gentoo Foundation |
174 |
+# Copyright 1999-2018 Gentoo Foundation |
175 |
# Distributed under the terms of the GNU General Public License v2 |
176 |
|
177 |
EAPI=5 |
178 |
@@ -15,8 +15,8 @@ RDEPEND="x11-libs/libfontenc |
179 |
sys-libs/zlib |
180 |
app-arch/bzip2" |
181 |
DEPEND="${RDEPEND} |
182 |
+ x11-base/xorg-proto |
183 |
x11-misc/util-macros |
184 |
- x11-proto/xproto |
185 |
app-arch/gzip" |
186 |
|
187 |
XORG_CONFIGURE_OPTIONS=( |
188 |
|
189 |
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild |
190 |
index 1766e34c190..495a445d1f9 100644 |
191 |
--- a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild |
192 |
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild |
193 |
@@ -15,8 +15,8 @@ RDEPEND="x11-libs/libfontenc |
194 |
sys-libs/zlib |
195 |
app-arch/bzip2" |
196 |
DEPEND="${RDEPEND} |
197 |
+ x11-base/xorg-proto |
198 |
x11-misc/util-macros |
199 |
- x11-proto/xproto |
200 |
app-arch/gzip" |
201 |
|
202 |
XORG_CONFIGURE_OPTIONS=( |
203 |
|
204 |
diff --git a/x11-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild |
205 |
index cdc6a73115a..79ed018a5ac 100644 |
206 |
--- a/x11-apps/rgb/rgb-1.0.5.ebuild |
207 |
+++ b/x11-apps/rgb/rgb-1.0.5.ebuild |
208 |
@@ -1,4 +1,4 @@ |
209 |
-# Copyright 1999-2014 Gentoo Foundation |
210 |
+# Copyright 1999-2018 Gentoo Foundation |
211 |
# Distributed under the terms of the GNU General Public License v2 |
212 |
|
213 |
EAPI=5 |
214 |
@@ -11,4 +11,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f |
215 |
IUSE="" |
216 |
RDEPEND="" |
217 |
DEPEND="${RDEPEND} |
218 |
- x11-proto/xproto" |
219 |
+ x11-base/xorg-proto" |
220 |
|
221 |
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild |
222 |
index 8dc4a3f076f..16d1e459c1c 100644 |
223 |
--- a/x11-apps/rgb/rgb-1.0.6.ebuild |
224 |
+++ b/x11-apps/rgb/rgb-1.0.6.ebuild |
225 |
@@ -1,4 +1,4 @@ |
226 |
-# Copyright 1999-2015 Gentoo Foundation |
227 |
+# Copyright 1999-2018 Gentoo Foundation |
228 |
# Distributed under the terms of the GNU General Public License v2 |
229 |
|
230 |
EAPI=5 |
231 |
@@ -11,5 +11,5 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ |
232 |
IUSE="" |
233 |
RDEPEND="" |
234 |
DEPEND="${RDEPEND} |
235 |
- x11-misc/util-macros |
236 |
- x11-proto/xproto" |
237 |
+ x11-base/xorg-proto |
238 |
+ x11-misc/util-macros" |
239 |
|
240 |
diff --git a/x11-apps/sessreg/sessreg-1.1.1.ebuild b/x11-apps/sessreg/sessreg-1.1.1.ebuild |
241 |
index 2193ff0538a..b2c0ed90b6f 100644 |
242 |
--- a/x11-apps/sessreg/sessreg-1.1.1.ebuild |
243 |
+++ b/x11-apps/sessreg/sessreg-1.1.1.ebuild |
244 |
@@ -1,4 +1,4 @@ |
245 |
-# Copyright 1999-2017 Gentoo Foundation |
246 |
+# Copyright 1999-2018 Gentoo Foundation |
247 |
# Distributed under the terms of the GNU General Public License v2 |
248 |
|
249 |
EAPI=5 |
250 |
@@ -11,4 +11,4 @@ IUSE="" |
251 |
|
252 |
RDEPEND="" |
253 |
DEPEND="${RDEPEND} |
254 |
- x11-proto/xproto" |
255 |
+ x11-base/xorg-proto" |
256 |
|
257 |
diff --git a/x11-apps/transset/transset-1.0.1.ebuild b/x11-apps/transset/transset-1.0.1.ebuild |
258 |
index a2f14e27086..d0aa1d6e3b3 100644 |
259 |
--- a/x11-apps/transset/transset-1.0.1.ebuild |
260 |
+++ b/x11-apps/transset/transset-1.0.1.ebuild |
261 |
@@ -1,4 +1,4 @@ |
262 |
-# Copyright 1999-2013 Gentoo Foundation |
263 |
+# Copyright 1999-2018 Gentoo Foundation |
264 |
# Distributed under the terms of the GNU General Public License v2 |
265 |
|
266 |
EAPI=5 |
267 |
@@ -13,4 +13,4 @@ IUSE="" |
268 |
|
269 |
RDEPEND="x11-libs/libX11" |
270 |
DEPEND="${RDEPEND} |
271 |
- >=x11-proto/xproto-7.0.17" |
272 |
+ x11-base/xorg-proto" |
273 |
|
274 |
diff --git a/x11-apps/transset/transset-1.0.2.ebuild b/x11-apps/transset/transset-1.0.2.ebuild |
275 |
index 061b3239cd7..d0aa1d6e3b3 100644 |
276 |
--- a/x11-apps/transset/transset-1.0.2.ebuild |
277 |
+++ b/x11-apps/transset/transset-1.0.2.ebuild |
278 |
@@ -13,4 +13,4 @@ IUSE="" |
279 |
|
280 |
RDEPEND="x11-libs/libX11" |
281 |
DEPEND="${RDEPEND} |
282 |
- >=x11-proto/xproto-7.0.17" |
283 |
+ x11-base/xorg-proto" |
284 |
|
285 |
diff --git a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild |
286 |
index aa93c76e218..8df4f1fe96f 100644 |
287 |
--- a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild |
288 |
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild |
289 |
@@ -1,4 +1,4 @@ |
290 |
-# Copyright 1999-2017 Gentoo Foundation |
291 |
+# Copyright 1999-2018 Gentoo Foundation |
292 |
# Distributed under the terms of the GNU General Public License v2 |
293 |
|
294 |
EAPI=5 |
295 |
@@ -14,6 +14,5 @@ RDEPEND=" |
296 |
x11-libs/libX11 |
297 |
" |
298 |
DEPEND="${RDEPEND} |
299 |
- x11-proto/xextproto |
300 |
- x11-proto/xproto |
301 |
+ x11-base/xorg-proto |
302 |
" |
303 |
|
304 |
diff --git a/x11-apps/xdm/xdm-1.1.11-r3.ebuild b/x11-apps/xdm/xdm-1.1.11-r3.ebuild |
305 |
index 4233aea6311..7799fbfa3e7 100644 |
306 |
--- a/x11-apps/xdm/xdm-1.1.11-r3.ebuild |
307 |
+++ b/x11-apps/xdm/xdm-1.1.11-r3.ebuild |
308 |
@@ -1,4 +1,4 @@ |
309 |
-# Copyright 1999-2015 Gentoo Foundation |
310 |
+# Copyright 1999-2018 Gentoo Foundation |
311 |
# Distributed under the terms of the GNU General Public License v2 |
312 |
|
313 |
EAPI=5 |
314 |
@@ -28,9 +28,8 @@ RDEPEND="x11-apps/xrdb |
315 |
pam? ( virtual/pam ) |
316 |
!<sys-apps/systemd-187" |
317 |
DEPEND="${RDEPEND} |
318 |
- consolekit? ( !=sys-auth/pambase-20101024-r1 ) |
319 |
- x11-proto/xineramaproto |
320 |
- x11-proto/xproto" |
321 |
+ x11-base/xorg-proto |
322 |
+ consolekit? ( !=sys-auth/pambase-20101024-r1 )" |
323 |
|
324 |
pkg_setup() { |
325 |
PATCHES=( |
326 |
|
327 |
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild |
328 |
index fe6297132ec..1b65aca89d8 100644 |
329 |
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild |
330 |
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild |
331 |
@@ -1,4 +1,4 @@ |
332 |
-# Copyright 1999-2017 Gentoo Foundation |
333 |
+# Copyright 1999-2018 Gentoo Foundation |
334 |
# Distributed under the terms of the GNU General Public License v2 |
335 |
|
336 |
EAPI=5 |
337 |
@@ -22,16 +22,7 @@ RDEPEND=" |
338 |
xinerama? ( x11-libs/libXinerama ) |
339 |
" |
340 |
DEPEND="${RDEPEND} |
341 |
- x11-proto/compositeproto |
342 |
- x11-proto/inputproto |
343 |
- x11-proto/kbproto |
344 |
- x11-proto/renderproto |
345 |
- x11-proto/xf86vidmodeproto |
346 |
- x11-proto/xextproto |
347 |
- x11-proto/xproto |
348 |
- dga? ( x11-proto/xf86dgaproto ) |
349 |
- dmx? ( x11-proto/dmxproto ) |
350 |
- xinerama? ( x11-proto/xineramaproto ) |
351 |
+ x11-base/xorg-proto |
352 |
" |
353 |
|
354 |
pkg_setup() { |
355 |
|
356 |
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild |
357 |
index fe6297132ec..1b65aca89d8 100644 |
358 |
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild |
359 |
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild |
360 |
@@ -1,4 +1,4 @@ |
361 |
-# Copyright 1999-2017 Gentoo Foundation |
362 |
+# Copyright 1999-2018 Gentoo Foundation |
363 |
# Distributed under the terms of the GNU General Public License v2 |
364 |
|
365 |
EAPI=5 |
366 |
@@ -22,16 +22,7 @@ RDEPEND=" |
367 |
xinerama? ( x11-libs/libXinerama ) |
368 |
" |
369 |
DEPEND="${RDEPEND} |
370 |
- x11-proto/compositeproto |
371 |
- x11-proto/inputproto |
372 |
- x11-proto/kbproto |
373 |
- x11-proto/renderproto |
374 |
- x11-proto/xf86vidmodeproto |
375 |
- x11-proto/xextproto |
376 |
- x11-proto/xproto |
377 |
- dga? ( x11-proto/xf86dgaproto ) |
378 |
- dmx? ( x11-proto/dmxproto ) |
379 |
- xinerama? ( x11-proto/xineramaproto ) |
380 |
+ x11-base/xorg-proto |
381 |
" |
382 |
|
383 |
pkg_setup() { |
384 |
|
385 |
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild |
386 |
index bc84de10df6..9e95c9e43c3 100644 |
387 |
--- a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild |
388 |
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild |
389 |
@@ -1,4 +1,4 @@ |
390 |
-# Copyright 1999-2016 Gentoo Foundation |
391 |
+# Copyright 1999-2018 Gentoo Foundation |
392 |
# Distributed under the terms of the GNU General Public License v2 |
393 |
|
394 |
EAPI=5 |
395 |
@@ -12,7 +12,7 @@ IUSE="" |
396 |
RDEPEND="x11-libs/libX11 |
397 |
virtual/opengl" |
398 |
DEPEND="${RDEPEND} |
399 |
- x11-proto/glproto" |
400 |
+ x11-base/xorg-proto" |
401 |
|
402 |
pkg_setup() { |
403 |
xorg-2_pkg_setup |
404 |
|
405 |
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild |
406 |
index 1801d61d66e..8a64373394a 100644 |
407 |
--- a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild |
408 |
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild |
409 |
@@ -12,7 +12,7 @@ IUSE="" |
410 |
RDEPEND="x11-libs/libX11 |
411 |
virtual/opengl" |
412 |
DEPEND="${RDEPEND} |
413 |
- x11-proto/glproto" |
414 |
+ x11-base/xorg-proto" |
415 |
|
416 |
pkg_setup() { |
417 |
xorg-2_pkg_setup |
418 |
|
419 |
diff --git a/x11-apps/xev/xev-1.2.1.ebuild b/x11-apps/xev/xev-1.2.1.ebuild |
420 |
index 2194489aa3b..ec3eda23d5f 100644 |
421 |
--- a/x11-apps/xev/xev-1.2.1.ebuild |
422 |
+++ b/x11-apps/xev/xev-1.2.1.ebuild |
423 |
@@ -1,4 +1,4 @@ |
424 |
-# Copyright 1999-2017 Gentoo Foundation |
425 |
+# Copyright 1999-2018 Gentoo Foundation |
426 |
# Distributed under the terms of the GNU General Public License v2 |
427 |
|
428 |
EAPI=5 |
429 |
@@ -13,4 +13,4 @@ IUSE="" |
430 |
RDEPEND="x11-libs/libX11 |
431 |
x11-libs/libXrandr" |
432 |
DEPEND="${RDEPEND} |
433 |
- x11-proto/xproto" |
434 |
+ x11-base/xorg-proto" |
435 |
|
436 |
diff --git a/x11-apps/xev/xev-1.2.2.ebuild b/x11-apps/xev/xev-1.2.2.ebuild |
437 |
index 33c1a0371cd..29d2b7979e0 100644 |
438 |
--- a/x11-apps/xev/xev-1.2.2.ebuild |
439 |
+++ b/x11-apps/xev/xev-1.2.2.ebuild |
440 |
@@ -1,4 +1,4 @@ |
441 |
-# Copyright 1999-2017 Gentoo Foundation |
442 |
+# Copyright 1999-2018 Gentoo Foundation |
443 |
# Distributed under the terms of the GNU General Public License v2 |
444 |
|
445 |
EAPI=5 |
446 |
@@ -13,4 +13,4 @@ IUSE="" |
447 |
RDEPEND="x11-libs/libX11 |
448 |
x11-libs/libXrandr" |
449 |
DEPEND="${RDEPEND} |
450 |
- x11-proto/xproto" |
451 |
+ x11-base/xorg-proto" |
452 |
|
453 |
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild |
454 |
index 33fa3524c0a..89597872cdb 100644 |
455 |
--- a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild |
456 |
+++ b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild |
457 |
@@ -1,4 +1,4 @@ |
458 |
-# Copyright 1999-2017 Gentoo Foundation |
459 |
+# Copyright 1999-2018 Gentoo Foundation |
460 |
# Distributed under the terms of the GNU General Public License v2 |
461 |
|
462 |
EAPI=5 |
463 |
@@ -13,4 +13,4 @@ IUSE="" |
464 |
RDEPEND="x11-libs/libX11 |
465 |
>=x11-libs/libXxf86dga-1.1" |
466 |
DEPEND="${RDEPEND} |
467 |
- x11-proto/xf86dgaproto" |
468 |
+ x11-base/xorg-proto" |
469 |
|
470 |
diff --git a/x11-apps/xgamma/xgamma-1.0.5.ebuild b/x11-apps/xgamma/xgamma-1.0.5.ebuild |
471 |
index 711a48f4322..bc105e08848 100644 |
472 |
--- a/x11-apps/xgamma/xgamma-1.0.5.ebuild |
473 |
+++ b/x11-apps/xgamma/xgamma-1.0.5.ebuild |
474 |
@@ -1,4 +1,4 @@ |
475 |
-# Copyright 1999-2012 Gentoo Foundation |
476 |
+# Copyright 1999-2018 Gentoo Foundation |
477 |
# Distributed under the terms of the GNU General Public License v2 |
478 |
|
479 |
EAPI=4 |
480 |
@@ -12,4 +12,4 @@ IUSE="" |
481 |
RDEPEND="x11-libs/libXxf86vm |
482 |
x11-libs/libX11" |
483 |
DEPEND="${RDEPEND} |
484 |
- x11-proto/xf86vidmodeproto" |
485 |
+ x11-base/xorg-proto" |
486 |
|
487 |
diff --git a/x11-apps/xgamma/xgamma-1.0.6.ebuild b/x11-apps/xgamma/xgamma-1.0.6.ebuild |
488 |
index b7a197a9624..54f51932cad 100644 |
489 |
--- a/x11-apps/xgamma/xgamma-1.0.6.ebuild |
490 |
+++ b/x11-apps/xgamma/xgamma-1.0.6.ebuild |
491 |
@@ -1,4 +1,4 @@ |
492 |
-# Copyright 1999-2016 Gentoo Foundation |
493 |
+# Copyright 1999-2018 Gentoo Foundation |
494 |
# Distributed under the terms of the GNU General Public License v2 |
495 |
|
496 |
EAPI=5 |
497 |
@@ -12,4 +12,4 @@ IUSE="" |
498 |
RDEPEND="x11-libs/libXxf86vm |
499 |
x11-libs/libX11" |
500 |
DEPEND="${RDEPEND} |
501 |
- x11-proto/xf86vidmodeproto" |
502 |
+ x11-base/xorg-proto" |
503 |
|
504 |
diff --git a/x11-apps/xinput/xinput-1.6.1.ebuild b/x11-apps/xinput/xinput-1.6.1.ebuild |
505 |
index 56ec43dcc08..3b30c64ba01 100644 |
506 |
--- a/x11-apps/xinput/xinput-1.6.1.ebuild |
507 |
+++ b/x11-apps/xinput/xinput-1.6.1.ebuild |
508 |
@@ -1,4 +1,4 @@ |
509 |
-# Copyright 1999-2014 Gentoo Foundation |
510 |
+# Copyright 1999-2018 Gentoo Foundation |
511 |
# Distributed under the terms of the GNU General Public License v2 |
512 |
|
513 |
EAPI=5 |
514 |
@@ -15,4 +15,4 @@ RDEPEND=">=x11-libs/libX11-1.3 |
515 |
x11-libs/libXinerama |
516 |
x11-libs/libXrandr" |
517 |
DEPEND="${RDEPEND} |
518 |
- >=x11-proto/inputproto-2.1.99.1" |
519 |
+ x11-base/xorg-proto" |
520 |
|
521 |
diff --git a/x11-apps/xinput/xinput-1.6.2.ebuild b/x11-apps/xinput/xinput-1.6.2.ebuild |
522 |
index 6084a3a12fb..4e7ffe27b9a 100644 |
523 |
--- a/x11-apps/xinput/xinput-1.6.2.ebuild |
524 |
+++ b/x11-apps/xinput/xinput-1.6.2.ebuild |
525 |
@@ -1,4 +1,4 @@ |
526 |
-# Copyright 1999-2016 Gentoo Foundation |
527 |
+# Copyright 1999-2018 Gentoo Foundation |
528 |
# Distributed under the terms of the GNU General Public License v2 |
529 |
|
530 |
EAPI=5 |
531 |
@@ -15,4 +15,4 @@ RDEPEND=">=x11-libs/libX11-1.3 |
532 |
x11-libs/libXinerama |
533 |
x11-libs/libXrandr" |
534 |
DEPEND="${RDEPEND} |
535 |
- >=x11-proto/inputproto-2.1.99.1" |
536 |
+ x11-base/xorg-proto" |
537 |
|
538 |
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild |
539 |
index b8c25fa73d3..8922936566f 100644 |
540 |
--- a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild |
541 |
+++ b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild |
542 |
@@ -1,4 +1,4 @@ |
543 |
-# Copyright 1999-2016 Gentoo Foundation |
544 |
+# Copyright 1999-2018 Gentoo Foundation |
545 |
# Distributed under the terms of the GNU General Public License v2 |
546 |
|
547 |
EAPI=5 |
548 |
@@ -14,5 +14,4 @@ RDEPEND="x11-libs/libX11 |
549 |
x11-libs/libXt |
550 |
x11-libs/libXaw" |
551 |
DEPEND="${RDEPEND} |
552 |
- x11-proto/xproto |
553 |
- x11-proto/inputproto" |
554 |
+ x11-base/xorg-proto" |
555 |
|
556 |
diff --git a/x11-apps/xprop/xprop-1.2.2.ebuild b/x11-apps/xprop/xprop-1.2.2.ebuild |
557 |
index 65e87ccc79e..574b5572a9f 100644 |
558 |
--- a/x11-apps/xprop/xprop-1.2.2.ebuild |
559 |
+++ b/x11-apps/xprop/xprop-1.2.2.ebuild |
560 |
@@ -1,4 +1,4 @@ |
561 |
-# Copyright 1999-2017 Gentoo Foundation |
562 |
+# Copyright 1999-2018 Gentoo Foundation |
563 |
# Distributed under the terms of the GNU General Public License v2 |
564 |
|
565 |
EAPI=5 |
566 |
@@ -11,5 +11,5 @@ IUSE="" |
567 |
|
568 |
RDEPEND="x11-libs/libX11" |
569 |
DEPEND="${RDEPEND} |
570 |
- >=x11-proto/xproto-7.0.17 |
571 |
+ x11-base/xorg-proto |
572 |
" |
573 |
|
574 |
diff --git a/x11-apps/xprop/xprop-1.2.3.ebuild b/x11-apps/xprop/xprop-1.2.3.ebuild |
575 |
index eaa51ead5c3..574b5572a9f 100644 |
576 |
--- a/x11-apps/xprop/xprop-1.2.3.ebuild |
577 |
+++ b/x11-apps/xprop/xprop-1.2.3.ebuild |
578 |
@@ -11,5 +11,5 @@ IUSE="" |
579 |
|
580 |
RDEPEND="x11-libs/libX11" |
581 |
DEPEND="${RDEPEND} |
582 |
- >=x11-proto/xproto-7.0.25 |
583 |
+ x11-base/xorg-proto |
584 |
" |
585 |
|
586 |
diff --git a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild |
587 |
index f5919090c5e..fbe79b1339e 100644 |
588 |
--- a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild |
589 |
+++ b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild |
590 |
@@ -1,4 +1,4 @@ |
591 |
-# Copyright 1999-2013 Gentoo Foundation |
592 |
+# Copyright 1999-2018 Gentoo Foundation |
593 |
# Distributed under the terms of the GNU General Public License v2 |
594 |
|
595 |
EAPI=4 |
596 |
@@ -10,4 +10,4 @@ IUSE="" |
597 |
RDEPEND="x11-libs/libX11 |
598 |
x11-libs/libXTrap" |
599 |
DEPEND="${RDEPEND} |
600 |
- x11-proto/trapproto" |
601 |
+ x11-base/xorg-proto" |
602 |
|
603 |
diff --git a/x11-apps/xtrap/xtrap-1.0.3.ebuild b/x11-apps/xtrap/xtrap-1.0.3.ebuild |
604 |
index 4575e7f8ec7..1df4ff1b445 100644 |
605 |
--- a/x11-apps/xtrap/xtrap-1.0.3.ebuild |
606 |
+++ b/x11-apps/xtrap/xtrap-1.0.3.ebuild |
607 |
@@ -11,4 +11,4 @@ RDEPEND="x11-libs/libX11 |
608 |
x11-libs/libXt |
609 |
x11-libs/libXTrap" |
610 |
DEPEND="${RDEPEND} |
611 |
- x11-proto/trapproto" |
612 |
+ x11-base/xorg-proto" |
613 |
|
614 |
diff --git a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild |
615 |
index c0e6df2bc89..2da520d4712 100644 |
616 |
--- a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild |
617 |
+++ b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild |
618 |
@@ -1,4 +1,4 @@ |
619 |
-# Copyright 1999-2012 Gentoo Foundation |
620 |
+# Copyright 1999-2018 Gentoo Foundation |
621 |
# Distributed under the terms of the GNU General Public License v2 |
622 |
|
623 |
EAPI=4 |
624 |
@@ -15,4 +15,4 @@ RDEPEND="x11-libs/libXaw |
625 |
x11-libs/libXt |
626 |
x11-libs/libXxf86vm" |
627 |
DEPEND="${RDEPEND} |
628 |
- x11-proto/xf86vidmodeproto" |
629 |
+ x11-base/xorg-proto" |
630 |
|
631 |
diff --git a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild |
632 |
index eb84ada1084..c4801d35036 100644 |
633 |
--- a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild |
634 |
+++ b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild |
635 |
@@ -1,4 +1,4 @@ |
636 |
-# Copyright 1999-2013 Gentoo Foundation |
637 |
+# Copyright 1999-2018 Gentoo Foundation |
638 |
# Distributed under the terms of the GNU General Public License v2 |
639 |
|
640 |
EAPI=5 |
641 |
@@ -15,4 +15,4 @@ RDEPEND="x11-libs/libXaw |
642 |
x11-libs/libXt |
643 |
x11-libs/libXxf86vm" |
644 |
DEPEND="${RDEPEND} |
645 |
- x11-proto/xf86vidmodeproto" |
646 |
+ x11-base/xorg-proto" |
647 |
|
648 |
diff --git a/x11-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild |
649 |
index ec840a7e31b..cd0a83992ae 100644 |
650 |
--- a/x11-apps/xwd/xwd-1.0.6.ebuild |
651 |
+++ b/x11-apps/xwd/xwd-1.0.6.ebuild |
652 |
@@ -1,4 +1,4 @@ |
653 |
-# Copyright 1999-2016 Gentoo Foundation |
654 |
+# Copyright 1999-2018 Gentoo Foundation |
655 |
# Distributed under the terms of the GNU General Public License v2 |
656 |
|
657 |
EAPI=5 |
658 |
@@ -13,6 +13,6 @@ IUSE="" |
659 |
# libXt dependency is not in configure.ac, bug #408629, upstream #47462." |
660 |
RDEPEND="x11-libs/libX11" |
661 |
DEPEND="${RDEPEND} |
662 |
+ x11-base/xorg-proto |
663 |
x11-libs/libXt |
664 |
- x11-libs/libxkbfile |
665 |
- x11-proto/xproto" |
666 |
+ x11-libs/libxkbfile" |
667 |
|
668 |
diff --git a/x11-apps/xwd/xwd-1.0.7.ebuild b/x11-apps/xwd/xwd-1.0.7.ebuild |
669 |
index d88f8dfd465..cd0a83992ae 100644 |
670 |
--- a/x11-apps/xwd/xwd-1.0.7.ebuild |
671 |
+++ b/x11-apps/xwd/xwd-1.0.7.ebuild |
672 |
@@ -13,6 +13,6 @@ IUSE="" |
673 |
# libXt dependency is not in configure.ac, bug #408629, upstream #47462." |
674 |
RDEPEND="x11-libs/libX11" |
675 |
DEPEND="${RDEPEND} |
676 |
+ x11-base/xorg-proto |
677 |
x11-libs/libXt |
678 |
- x11-libs/libxkbfile |
679 |
- x11-proto/xproto" |
680 |
+ x11-libs/libxkbfile" |
681 |
|
682 |
diff --git a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild |
683 |
index 9a8fb51ef20..251eb77838d 100644 |
684 |
--- a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild |
685 |
+++ b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild |
686 |
@@ -1,4 +1,4 @@ |
687 |
-# Copyright 1999-2017 Gentoo Foundation |
688 |
+# Copyright 1999-2018 Gentoo Foundation |
689 |
# Distributed under the terms of the GNU General Public License v2 |
690 |
|
691 |
EAPI=5 |
692 |
@@ -12,8 +12,8 @@ IUSE="" |
693 |
|
694 |
RDEPEND=">=x11-libs/libxcb-1.6" |
695 |
DEPEND="${RDEPEND} |
696 |
- x11-libs/libX11 |
697 |
- >=x11-proto/xproto-7.0.17" |
698 |
+ x11-base/xorg-proto |
699 |
+ x11-libs/libX11" |
700 |
|
701 |
pkg_setup() { |
702 |
# interix has a _very_ old iconv in libc, however, including |
703 |
|
704 |
diff --git a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild |
705 |
index 4e7c0e6044c..251eb77838d 100644 |
706 |
--- a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild |
707 |
+++ b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild |
708 |
@@ -12,8 +12,8 @@ IUSE="" |
709 |
|
710 |
RDEPEND=">=x11-libs/libxcb-1.6" |
711 |
DEPEND="${RDEPEND} |
712 |
- x11-libs/libX11 |
713 |
- >=x11-proto/xproto-7.0.17" |
714 |
+ x11-base/xorg-proto |
715 |
+ x11-libs/libX11" |
716 |
|
717 |
pkg_setup() { |
718 |
# interix has a _very_ old iconv in libc, however, including |