Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/industri/, games-fps/xonotic/, games-fps/tenebrae/, ...
Date: Mon, 11 Jun 2018 01:53:57
Message-Id: 1528681660.9ff205ba4e2d1b4d0a948d9d5cd1761a241800a1.mattst88@gentoo
1 commit: 9ff205ba4e2d1b4d0a948d9d5cd1761a241800a1
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 11 01:47:40 2018 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 11 01:47:40 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff205ba
7
8 games-fps/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto)
9
10 games-fps/alienarena/alienarena-20130827-r1.ebuild | 4 ++--
11 games-fps/darkplaces/darkplaces-20140513-r1.ebuild | 5 +----
12 games-fps/industri/industri-1.01.ebuild | 5 +----
13 games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild | 5 +----
14 games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild | 2 +-
15 games-fps/tenebrae/tenebrae-1.04-r1.ebuild | 4 +---
16 games-fps/wolfgl/wolfgl-0.93-r2.ebuild | 2 +-
17 games-fps/xonotic/xonotic-0.8.2.ebuild | 5 +----
18 8 files changed, 9 insertions(+), 23 deletions(-)
19
20 diff --git a/games-fps/alienarena/alienarena-20130827-r1.ebuild b/games-fps/alienarena/alienarena-20130827-r1.ebuild
21 index fabaaecffeb..8f32fffbdf5 100644
22 --- a/games-fps/alienarena/alienarena-20130827-r1.ebuild
23 +++ b/games-fps/alienarena/alienarena-20130827-r1.ebuild
24 @@ -29,8 +29,8 @@ UIRDEPEND="
25 net-misc/curl
26 "
27 UIDEPEND="
28 - dga? ( x11-proto/xf86dgaproto )
29 - vidmode? ( x11-proto/xf86vidmodeproto )
30 + dga? ( x11-base/xorg-proto )
31 + vidmode? ( x11-base/xorg-proto )
32 "
33 RDEPEND="!dedicated? ( ${UIRDEPEND} )"
34 DEPEND="${RDEPEND}
35
36 diff --git a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
37 index 303d09082be..7ba3bcdb4ce 100644
38 --- a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
39 +++ b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
40 @@ -37,10 +37,7 @@ UIRDEPEND="
41 x11-libs/libXxf86vm
42 "
43 UIDEPEND="
44 - x11-proto/xextproto
45 - x11-proto/xf86dgaproto
46 - x11-proto/xf86vidmodeproto
47 - x11-proto/xproto
48 + x11-base/xorg-proto
49 "
50 RDEPEND="
51 net-misc/curl
52
53 diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
54 index 40e99100854..70c8dba417f 100644
55 --- a/games-fps/industri/industri-1.01.ebuild
56 +++ b/games-fps/industri/industri-1.01.ebuild
57 @@ -22,10 +22,7 @@ RDEPEND="virtual/opengl
58 media-libs/libpng:0
59 cdinstall? ( games-fps/quake1-data )"
60 DEPEND="${RDEPEND}
61 - x11-proto/xf86dgaproto
62 - x11-proto/xextproto
63 - x11-proto/xf86vidmodeproto
64 - x11-proto/xproto
65 + x11-base/xorg-proto
66 app-arch/unzip"
67
68 S=${WORKDIR}/industri_BIN
69
70 diff --git a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
71 index f7fffe7d20a..2778fcff0c0 100644
72 --- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
73 +++ b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
74 @@ -34,10 +34,7 @@ UIRDEPEND="
75 virtual/opengl
76 alsa? ( media-libs/alsa-lib )
77 sdl? ( media-libs/libsdl[joystick,opengl,video] )"
78 -UIDEPEND="x11-proto/xextproto
79 - x11-proto/xf86dgaproto
80 - x11-proto/xf86vidmodeproto
81 - x11-proto/xproto"
82 +UIDEPEND="x11-base/xorg-proto"
83 RDEPEND="virtual/jpeg:0
84 net-misc/curl
85 opengl? ( ${UIRDEPEND} )
86
87 diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
88 index 7d8220b1af0..38e4fb6d071 100644
89 --- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
90 +++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
91 @@ -29,7 +29,7 @@ RDEPEND="${UIDEPEND}
92 cdinstall? ( games-fps/quake2-data )
93 demo? ( games-fps/quake2-demodata )"
94 DEPEND="${UIDEPEND}
95 - X? ( x11-proto/xf86dgaproto )
96 + X? ( x11-base/xorg-proto )
97 rogue? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )
98 xatrix? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )"
99
100
101 diff --git a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
102 index 82648759b40..85a7552e401 100644
103 --- a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
104 +++ b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
105 @@ -26,9 +26,7 @@ RDEPEND="
106 x11-libs/libXxf86vm"
107 DEPEND="${RDEPEND}
108 app-arch/unzip
109 - x11-proto/xextproto
110 - x11-proto/xf86dgaproto
111 - x11-proto/xf86vidmodeproto"
112 + x11-base/xorg-proto"
113
114 S=${WORKDIR}
115
116
117 diff --git a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
118 index 2fb85826167..a76843aa406 100644
119 --- a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
120 +++ b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
121 @@ -24,7 +24,7 @@ IUSE=""
122 RDEPEND="virtual/opengl"
123 DEPEND="${RDEPEND}
124 app-arch/unzip
125 - x11-proto/xproto"
126 + x11-base/xorg-proto"
127
128 PATCHES=(
129 "${FILESDIR}"/${PV}-gcc.patch
130
131 diff --git a/games-fps/xonotic/xonotic-0.8.2.ebuild b/games-fps/xonotic/xonotic-0.8.2.ebuild
132 index 2ad7334b448..32b2eab5bb4 100644
133 --- a/games-fps/xonotic/xonotic-0.8.2.ebuild
134 +++ b/games-fps/xonotic/xonotic-0.8.2.ebuild
135 @@ -32,10 +32,7 @@ UIRDEPEND="
136 ode? ( dev-games/ode[double-precision] )
137 sdl? ( media-libs/libsdl2[X,sound,joystick,opengl,video,alsa?] )"
138 UIDEPEND="
139 - x11-proto/xextproto
140 - x11-proto/xf86dgaproto
141 - x11-proto/xf86vidmodeproto
142 - x11-proto/xproto"
143 + x11-base/xorg-proto"
144 RDEPEND="
145 sys-libs/zlib
146 virtual/jpeg:0