[gentoo-commits] repo/gentoo:master commit in: games-fps/industri/, games-fps/xonotic/, games-fps/tenebrae/, ...

[gentoo-commits] repo/gentoo:master commit in: games-fps/industri/, games-fps/xonotic/, games-fps/tenebrae/, ...

[Matt Turner]

commit:     9ff205ba4e2d1b4d0a948d9d5cd1761a241800a1
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 11 01:47:40 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 01:47:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff205ba

games-fps/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto)

 games-fps/alienarena/alienarena-20130827-r1.ebuild       | 4 ++--
 games-fps/darkplaces/darkplaces-20140513-r1.ebuild       | 5 +----
 games-fps/industri/industri-1.01.ebuild                  | 5 +----
 games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild                  | 5 +----
 games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild | 2 +-
 games-fps/tenebrae/tenebrae-1.04-r1.ebuild               | 4 +---
 games-fps/wolfgl/wolfgl-0.93-r2.ebuild                   | 2 +-
 games-fps/xonotic/xonotic-0.8.2.ebuild                   | 5 +----
 8 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/games-fps/alienarena/alienarena-20130827-r1.ebuild b/games-fps/alienarena/alienarena-20130827-r1.ebuild
index fabaaecffeb..8f32fffbdf5 100644
--- a/games-fps/alienarena/alienarena-20130827-r1.ebuild
+++ b/games-fps/alienarena/alienarena-20130827-r1.ebuild
@@ -29,8 +29,8 @@ UIRDEPEND="
 	net-misc/curl
 "
 UIDEPEND="
-	dga? ( x11-proto/xf86dgaproto )
-	vidmode? ( x11-proto/xf86vidmodeproto )
+	dga? ( x11-base/xorg-proto )
+	vidmode? ( x11-base/xorg-proto )
 "
 RDEPEND="!dedicated? ( ${UIRDEPEND} )"
 DEPEND="${RDEPEND}

diff --git a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
index 303d09082be..7ba3bcdb4ce 100644
--- a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
+++ b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
@@ -37,10 +37,7 @@ UIRDEPEND="
 	x11-libs/libXxf86vm
 "
 UIDEPEND="
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 RDEPEND="
 	net-misc/curl

diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
index 40e99100854..70c8dba417f 100644
--- a/games-fps/industri/industri-1.01.ebuild
+++ b/games-fps/industri/industri-1.01.ebuild
@@ -22,10 +22,7 @@ RDEPEND="virtual/opengl
 	media-libs/libpng:0
 	cdinstall? ( games-fps/quake1-data )"
 DEPEND="${RDEPEND}
-	x11-proto/xf86dgaproto
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	app-arch/unzip"
 
 S=${WORKDIR}/industri_BIN

diff --git a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
index f7fffe7d20a..2778fcff0c0 100644
--- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
+++ b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
@@ -34,10 +34,7 @@ UIRDEPEND="
 	virtual/opengl
 	alsa? ( media-libs/alsa-lib )
 	sdl? ( media-libs/libsdl[joystick,opengl,video] )"
-UIDEPEND="x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xproto"
+UIDEPEND="x11-base/xorg-proto"
 RDEPEND="virtual/jpeg:0
 	net-misc/curl
 	opengl? ( ${UIRDEPEND} )

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
index 7d8220b1af0..38e4fb6d071 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${UIDEPEND}
 	cdinstall? ( games-fps/quake2-data )
 	demo? ( games-fps/quake2-demodata )"
 DEPEND="${UIDEPEND}
-	X? ( x11-proto/xf86dgaproto )
+	X? ( x11-base/xorg-proto )
 	rogue? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )
 	xatrix? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )"
 

diff --git a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
index 82648759b40..85a7552e401 100644
--- a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
+++ b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
@@ -26,9 +26,7 @@ RDEPEND="
 	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
 	app-arch/unzip
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}
 

diff --git a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
index 2fb85826167..a76843aa406 100644
--- a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
+++ b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
@@ -24,7 +24,7 @@ IUSE=""
 RDEPEND="virtual/opengl"
 DEPEND="${RDEPEND}
 	app-arch/unzip
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-gcc.patch

diff --git a/games-fps/xonotic/xonotic-0.8.2.ebuild b/games-fps/xonotic/xonotic-0.8.2.ebuild
index 2ad7334b448..32b2eab5bb4 100644
--- a/games-fps/xonotic/xonotic-0.8.2.ebuild
+++ b/games-fps/xonotic/xonotic-0.8.2.ebuild
@@ -32,10 +32,7 @@ UIRDEPEND="
 	ode? ( dev-games/ode[double-precision] )
 	sdl? ( media-libs/libsdl2[X,sound,joystick,opengl,video,alsa?] )"
 UIDEPEND="
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 RDEPEND="
 	sys-libs/zlib
 	virtual/jpeg:0