1 |
commit: b8a089284c84a508eb59ccd64c8267156fcc7ab3 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Mon Apr 30 19:58:57 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 30 20:50:14 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a08928 |
7 |
|
8 |
media-gfx/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto). |
9 |
|
10 |
media-gfx/cellwriter/cellwriter-1.3.4.ebuild | 4 ++-- |
11 |
media-gfx/cellwriter/cellwriter-1.3.5.ebuild | 4 ++-- |
12 |
media-gfx/fbida/fbida-2.12.ebuild | 4 ++-- |
13 |
media-gfx/fbida/fbida-2.13-r1.ebuild | 4 ++-- |
14 |
media-gfx/fbida/fbida-2.14.ebuild | 4 ++-- |
15 |
media-gfx/fbida/fbida-9999.ebuild | 4 ++-- |
16 |
media-gfx/feh/feh-2.18.3.ebuild | 4 ++-- |
17 |
media-gfx/feh/feh-2.24.ebuild | 2 +- |
18 |
media-gfx/feh/feh-2.25.1.ebuild | 2 +- |
19 |
media-gfx/feh/feh-2.25.ebuild | 2 +- |
20 |
media-gfx/fontforge/fontforge-20170731-r3.ebuild | 2 +- |
21 |
media-gfx/gifsicle/gifsicle-1.86.ebuild | 4 ++-- |
22 |
media-gfx/gifsicle/gifsicle-1.90.ebuild | 2 +- |
23 |
media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild | 4 ++-- |
24 |
media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild | 2 +- |
25 |
media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild | 2 +- |
26 |
media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild | 2 +- |
27 |
media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild | 2 +- |
28 |
media-gfx/xfig/xfig-3.2.6a-r1.ebuild | 3 +-- |
29 |
media-gfx/xli/xli-1.17.0-r5.ebuild | 4 ++-- |
30 |
20 files changed, 30 insertions(+), 31 deletions(-) |
31 |
|
32 |
diff --git a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild b/media-gfx/cellwriter/cellwriter-1.3.4.ebuild |
33 |
index 517e2596d52..cb3737df914 100644 |
34 |
--- a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild |
35 |
+++ b/media-gfx/cellwriter/cellwriter-1.3.4.ebuild |
36 |
@@ -1,4 +1,4 @@ |
37 |
-# Copyright 1999-2012 Gentoo Foundation |
38 |
+# Copyright 1999-2018 Gentoo Foundation |
39 |
# Distributed under the terms of the GNU General Public License v2 |
40 |
|
41 |
EAPI=2 |
42 |
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXtst |
43 |
gnome? ( gnome-base/libgnome )" |
44 |
DEPEND="${RDEPEND} |
45 |
virtual/pkgconfig |
46 |
- x11-proto/inputproto" |
47 |
+ x11-base/xorg-proto" |
48 |
|
49 |
src_configure() { |
50 |
econf $(use_with gnome) |
51 |
|
52 |
diff --git a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild b/media-gfx/cellwriter/cellwriter-1.3.5.ebuild |
53 |
index 9f5a7bfdccd..83526f62589 100644 |
54 |
--- a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild |
55 |
+++ b/media-gfx/cellwriter/cellwriter-1.3.5.ebuild |
56 |
@@ -1,4 +1,4 @@ |
57 |
-# Copyright 1999-2014 Gentoo Foundation |
58 |
+# Copyright 1999-2018 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
|
61 |
EAPI=5 |
62 |
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/gtk+:2 |
63 |
x11-libs/libXtst" |
64 |
DEPEND="${RDEPEND} |
65 |
virtual/pkgconfig |
66 |
- x11-proto/xproto" |
67 |
+ x11-base/xorg-proto" |
68 |
|
69 |
DOCS="AUTHORS ChangeLog README TODO" # NEWS is no-op |
70 |
|
71 |
|
72 |
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild |
73 |
index a54e6b18ce0..21c9c5498dc 100644 |
74 |
--- a/media-gfx/fbida/fbida-2.12.ebuild |
75 |
+++ b/media-gfx/fbida/fbida-2.12.ebuild |
76 |
@@ -1,4 +1,4 @@ |
77 |
-# Copyright 1999-2017 Gentoo Foundation |
78 |
+# Copyright 1999-2018 Gentoo Foundation |
79 |
# Distributed under the terms of the GNU General Public License v2 |
80 |
|
81 |
EAPI=5 |
82 |
@@ -47,7 +47,7 @@ CDEPEND=" |
83 |
|
84 |
DEPEND=" |
85 |
${CDEPEND} |
86 |
- X? ( x11-proto/xextproto x11-proto/xproto ) |
87 |
+ X? ( x11-base/xorg-proto ) |
88 |
" |
89 |
|
90 |
RDEPEND=" |
91 |
|
92 |
diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild |
93 |
index b3534f6df82..ca112ea82bf 100644 |
94 |
--- a/media-gfx/fbida/fbida-2.13-r1.ebuild |
95 |
+++ b/media-gfx/fbida/fbida-2.13-r1.ebuild |
96 |
@@ -1,4 +1,4 @@ |
97 |
-# Copyright 1999-2017 Gentoo Foundation |
98 |
+# Copyright 1999-2018 Gentoo Foundation |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
|
101 |
EAPI=6 |
102 |
@@ -47,7 +47,7 @@ CDEPEND=" |
103 |
|
104 |
DEPEND=" |
105 |
${CDEPEND} |
106 |
- X? ( x11-proto/xextproto x11-proto/xproto ) |
107 |
+ X? ( x11-base/xorg-proto ) |
108 |
" |
109 |
|
110 |
RDEPEND=" |
111 |
|
112 |
diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild |
113 |
index 482c92a8d70..0df94d36142 100644 |
114 |
--- a/media-gfx/fbida/fbida-2.14.ebuild |
115 |
+++ b/media-gfx/fbida/fbida-2.14.ebuild |
116 |
@@ -1,4 +1,4 @@ |
117 |
-# Copyright 1999-2017 Gentoo Foundation |
118 |
+# Copyright 1999-2018 Gentoo Foundation |
119 |
# Distributed under the terms of the GNU General Public License v2 |
120 |
|
121 |
EAPI=6 |
122 |
@@ -47,7 +47,7 @@ CDEPEND=" |
123 |
|
124 |
DEPEND=" |
125 |
${CDEPEND} |
126 |
- X? ( x11-proto/xextproto x11-proto/xproto ) |
127 |
+ X? ( x11-base/xorg-proto ) |
128 |
" |
129 |
|
130 |
RDEPEND=" |
131 |
|
132 |
diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild |
133 |
index dc27ba67de8..ff4be7c5c7a 100644 |
134 |
--- a/media-gfx/fbida/fbida-9999.ebuild |
135 |
+++ b/media-gfx/fbida/fbida-9999.ebuild |
136 |
@@ -1,4 +1,4 @@ |
137 |
-# Copyright 1999-2017 Gentoo Foundation |
138 |
+# Copyright 1999-2018 Gentoo Foundation |
139 |
# Distributed under the terms of the GNU General Public License v2 |
140 |
|
141 |
EAPI=6 |
142 |
@@ -49,7 +49,7 @@ CDEPEND=" |
143 |
|
144 |
DEPEND=" |
145 |
${CDEPEND} |
146 |
- X? ( x11-proto/xextproto x11-proto/xproto ) |
147 |
+ X? ( x11-base/xorg-proto ) |
148 |
" |
149 |
|
150 |
RDEPEND=" |
151 |
|
152 |
diff --git a/media-gfx/feh/feh-2.18.3.ebuild b/media-gfx/feh/feh-2.18.3.ebuild |
153 |
index 1b1f2eb93d5..72bb0487879 100644 |
154 |
--- a/media-gfx/feh/feh-2.18.3.ebuild |
155 |
+++ b/media-gfx/feh/feh-2.18.3.ebuild |
156 |
@@ -1,4 +1,4 @@ |
157 |
-# Copyright 1999-2017 Gentoo Foundation |
158 |
+# Copyright 1999-2018 Gentoo Foundation |
159 |
# Distributed under the terms of the GNU General Public License v2 |
160 |
|
161 |
EAPI=6 |
162 |
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X] |
163 |
RDEPEND="${COMMON_DEPEND} |
164 |
virtual/jpeg:0" |
165 |
DEPEND="${COMMON_DEPEND} |
166 |
+ x11-base/xorg-proto |
167 |
x11-libs/libXt |
168 |
- x11-proto/xproto |
169 |
test? ( |
170 |
>=dev-lang/perl-5.10 |
171 |
dev-perl/Test-Command |
172 |
|
173 |
diff --git a/media-gfx/feh/feh-2.24.ebuild b/media-gfx/feh/feh-2.24.ebuild |
174 |
index 97faff3af81..ee6ce5b79e0 100644 |
175 |
--- a/media-gfx/feh/feh-2.24.ebuild |
176 |
+++ b/media-gfx/feh/feh-2.24.ebuild |
177 |
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X] |
178 |
RDEPEND="${COMMON_DEPEND} |
179 |
virtual/jpeg:0" |
180 |
DEPEND="${COMMON_DEPEND} |
181 |
+ x11-base/xorg-proto |
182 |
x11-libs/libXt |
183 |
- x11-proto/xproto |
184 |
test? ( |
185 |
>=dev-lang/perl-5.10 |
186 |
dev-perl/Test-Command |
187 |
|
188 |
diff --git a/media-gfx/feh/feh-2.25.1.ebuild b/media-gfx/feh/feh-2.25.1.ebuild |
189 |
index 97faff3af81..ee6ce5b79e0 100644 |
190 |
--- a/media-gfx/feh/feh-2.25.1.ebuild |
191 |
+++ b/media-gfx/feh/feh-2.25.1.ebuild |
192 |
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X] |
193 |
RDEPEND="${COMMON_DEPEND} |
194 |
virtual/jpeg:0" |
195 |
DEPEND="${COMMON_DEPEND} |
196 |
+ x11-base/xorg-proto |
197 |
x11-libs/libXt |
198 |
- x11-proto/xproto |
199 |
test? ( |
200 |
>=dev-lang/perl-5.10 |
201 |
dev-perl/Test-Command |
202 |
|
203 |
diff --git a/media-gfx/feh/feh-2.25.ebuild b/media-gfx/feh/feh-2.25.ebuild |
204 |
index 97faff3af81..ee6ce5b79e0 100644 |
205 |
--- a/media-gfx/feh/feh-2.25.ebuild |
206 |
+++ b/media-gfx/feh/feh-2.25.ebuild |
207 |
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X] |
208 |
RDEPEND="${COMMON_DEPEND} |
209 |
virtual/jpeg:0" |
210 |
DEPEND="${COMMON_DEPEND} |
211 |
+ x11-base/xorg-proto |
212 |
x11-libs/libXt |
213 |
- x11-proto/xproto |
214 |
test? ( |
215 |
>=dev-lang/perl-5.10 |
216 |
dev-perl/Test-Command |
217 |
|
218 |
diff --git a/media-gfx/fontforge/fontforge-20170731-r3.ebuild b/media-gfx/fontforge/fontforge-20170731-r3.ebuild |
219 |
index 3461e5fc1b1..ccf771d5745 100644 |
220 |
--- a/media-gfx/fontforge/fontforge-20170731-r3.ebuild |
221 |
+++ b/media-gfx/fontforge/fontforge-20170731-r3.ebuild |
222 |
@@ -51,7 +51,7 @@ RDEPEND=" |
223 |
DEPEND="${RDEPEND} |
224 |
sys-devel/gettext |
225 |
virtual/pkgconfig |
226 |
- X? ( x11-proto/inputproto ) |
227 |
+ X? ( x11-base/xorg-proto ) |
228 |
" |
229 |
|
230 |
# Needs keywording on many arches. |
231 |
|
232 |
diff --git a/media-gfx/gifsicle/gifsicle-1.86.ebuild b/media-gfx/gifsicle/gifsicle-1.86.ebuild |
233 |
index 5d14f6a42a1..4ce9c26ea62 100644 |
234 |
--- a/media-gfx/gifsicle/gifsicle-1.86.ebuild |
235 |
+++ b/media-gfx/gifsicle/gifsicle-1.86.ebuild |
236 |
@@ -1,4 +1,4 @@ |
237 |
-# Copyright 1999-2015 Gentoo Foundation |
238 |
+# Copyright 1999-2018 Gentoo Foundation |
239 |
# Distributed under the terms of the GNU General Public License v2 |
240 |
|
241 |
EAPI=5 |
242 |
@@ -14,7 +14,7 @@ IUSE="X" |
243 |
|
244 |
RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )" |
245 |
DEPEND="${RDEPEND} |
246 |
- X? ( x11-proto/xproto )" |
247 |
+ X? ( x11-base/xorg-proto )" |
248 |
|
249 |
src_configure() { |
250 |
local myconf |
251 |
|
252 |
diff --git a/media-gfx/gifsicle/gifsicle-1.90.ebuild b/media-gfx/gifsicle/gifsicle-1.90.ebuild |
253 |
index 1120482889a..9cb9ee7fd17 100644 |
254 |
--- a/media-gfx/gifsicle/gifsicle-1.90.ebuild |
255 |
+++ b/media-gfx/gifsicle/gifsicle-1.90.ebuild |
256 |
@@ -14,7 +14,7 @@ IUSE="X" |
257 |
|
258 |
RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )" |
259 |
DEPEND="${RDEPEND} |
260 |
- X? ( x11-proto/xproto )" |
261 |
+ X? ( x11-base/xorg-proto )" |
262 |
|
263 |
src_configure() { |
264 |
econf $(usex X "" "--disable-gifview") |
265 |
|
266 |
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild |
267 |
index 8067e0b9f59..7abe2883661 100644 |
268 |
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild |
269 |
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild |
270 |
@@ -1,4 +1,4 @@ |
271 |
-# Copyright 1999-2017 Gentoo Foundation |
272 |
+# Copyright 1999-2018 Gentoo Foundation |
273 |
# Distributed under the terms of the GNU General Public License v2 |
274 |
|
275 |
EAPI=6 |
276 |
@@ -28,9 +28,9 @@ RDEPEND="${COMMON_DEPEND} |
277 |
" |
278 |
# ${PN} was part of gnome-utils before 3.4 |
279 |
DEPEND="${COMMON_DEPEND} |
280 |
- x11-proto/xextproto |
281 |
>=dev-util/intltool-0.50.2 |
282 |
virtual/pkgconfig |
283 |
+ x11-base/xorg-proto |
284 |
" |
285 |
|
286 |
DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to |
287 |
|
288 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild |
289 |
index 1a862494fb1..22edbc5a0ff 100644 |
290 |
--- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild |
291 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild |
292 |
@@ -59,7 +59,7 @@ RDEPEND=" |
293 |
DEPEND="${RDEPEND} |
294 |
!media-gfx/graphicsmagick[imagemagick] |
295 |
virtual/pkgconfig |
296 |
- X? ( x11-proto/xextproto )" |
297 |
+ X? ( x11-base/xorg-proto )" |
298 |
|
299 |
REQUIRED_USE="corefonts? ( truetype ) |
300 |
test? ( corefonts )" |
301 |
|
302 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild |
303 |
index 7458e47a0da..d971391a6a9 100644 |
304 |
--- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild |
305 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild |
306 |
@@ -59,7 +59,7 @@ RDEPEND=" |
307 |
DEPEND="${RDEPEND} |
308 |
!media-gfx/graphicsmagick[imagemagick] |
309 |
virtual/pkgconfig |
310 |
- X? ( x11-proto/xextproto )" |
311 |
+ X? ( x11-base/xorg-proto )" |
312 |
|
313 |
REQUIRED_USE="corefonts? ( truetype ) |
314 |
test? ( corefonts )" |
315 |
|
316 |
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild |
317 |
index 1aeb69caf13..4874250e8c0 100644 |
318 |
--- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild |
319 |
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild |
320 |
@@ -59,7 +59,7 @@ RDEPEND=" |
321 |
DEPEND="${RDEPEND} |
322 |
!media-gfx/graphicsmagick[imagemagick] |
323 |
virtual/pkgconfig |
324 |
- X? ( x11-proto/xextproto )" |
325 |
+ X? ( x11-base/xorg-proto )" |
326 |
|
327 |
REQUIRED_USE="corefonts? ( truetype ) |
328 |
test? ( corefonts )" |
329 |
|
330 |
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild |
331 |
index 5264d406ea2..7b4ac4bbb03 100644 |
332 |
--- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild |
333 |
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild |
334 |
@@ -59,7 +59,7 @@ RDEPEND=" |
335 |
DEPEND="${RDEPEND} |
336 |
!media-gfx/graphicsmagick[imagemagick] |
337 |
virtual/pkgconfig |
338 |
- X? ( x11-proto/xextproto )" |
339 |
+ X? ( x11-base/xorg-proto )" |
340 |
|
341 |
REQUIRED_USE="corefonts? ( truetype ) |
342 |
test? ( corefonts )" |
343 |
|
344 |
diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild |
345 |
index 4104b2e0d1a..d68fd060b61 100644 |
346 |
--- a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild |
347 |
+++ b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild |
348 |
@@ -27,8 +27,7 @@ RDEPEND=" |
349 |
postscript? ( app-text/ghostscript-gpl ) |
350 |
" |
351 |
DEPEND="${RDEPEND} |
352 |
- x11-proto/xproto |
353 |
- x11-proto/inputproto |
354 |
+ x11-base/xorg-proto |
355 |
" |
356 |
|
357 |
PATCHES=( |
358 |
|
359 |
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild |
360 |
index 64185ccfaef..fecafa404d7 100644 |
361 |
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild |
362 |
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild |
363 |
@@ -1,4 +1,4 @@ |
364 |
-# Copyright 1999-2014 Gentoo Foundation |
365 |
+# Copyright 1999-2018 Gentoo Foundation |
366 |
# Distributed under the terms of the GNU General Public License v2 |
367 |
|
368 |
EAPI="5" |
369 |
@@ -22,7 +22,7 @@ RDEPEND="app-arch/bzip2 |
370 |
|
371 |
DEPEND="${RDEPEND} |
372 |
app-text/rman |
373 |
- x11-proto/xextproto |
374 |
+ x11-base/xorg-proto |
375 |
x11-misc/imake |
376 |
!media-gfx/xloadimage" |