Merge updates from master

24 files changed, 55 insertions, 51 deletions

diff --git a/games-fps/alienarena/alienarena-20130827-r1.ebuild b/games-fps/alienarena/alienarena-20130827-r1.ebuild
index fabaaecffeb7..8f32fffbdf54 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 303d09082be6..7ba3bcdb4ce9 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 40e991008542..70c8dba417f3 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 f7fffe7d20af..2778fcff0c04 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 7d8220b1af0f..38e4fb6d071a 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 82648759b40f..85a7552e4015 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 2fb858261675..a76843aa4066 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 2ad7334b4487..32b2eab5bb41 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
diff --git a/games-misc/xpenguins/xpenguins-2.2-r2.ebuild b/games-misc/xpenguins/xpenguins-2.2-r2.ebuild
index c4488e3ab799..d3d5a27a0831 100644
--- a/games-misc/xpenguins/xpenguins-2.2-r2.ebuild
+++ b/games-misc/xpenguins/xpenguins-2.2-r2.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_install() {
 	default
diff --git a/games-puzzle/construo/construo-0.2.2-r1.ebuild b/games-puzzle/construo/construo-0.2.2-r1.ebuild
index 1f7406534412..4370d583ab81 100644
--- a/games-puzzle/construo/construo-0.2.2-r1.ebuild
+++ b/games-puzzle/construo/construo-0.2.2-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	x11-libs/libXxf86vm
 "
 DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	default
diff --git a/games-puzzle/quadra/quadra-1.2.0-r1.ebuild b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
index 4f77d48dc9ca..c811bb17564e 100644
--- a/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
+++ b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	sys-devel/bc
-	x11-proto/xextproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
index 5db6d1311c5f..fa9302932cb1 100644
--- a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	X? (
-		x11-proto/xproto
+		x11-base/xorg-proto
 		x11-apps/bdftopcf
 		x11-apps/mkfontdir
 	)"
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index dbc6bc7e6b93..90b697ebbc8a 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 		)
 	x11-libs/libXaw"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}
 
diff --git a/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild b/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
index 9c1b51183004..9213c1144606 100644
--- a/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
+++ b/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
@@ -28,8 +28,7 @@ RDEPEND="
 	virtual/opengl
 	virtual/glu"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}_${PV}
 
diff --git a/games-sports/miniracer/miniracer-1.04.ebuild b/games-sports/miniracer/miniracer-1.04.ebuild
index 968191ca946a..9b4490f7ca13 100644
--- a/games-sports/miniracer/miniracer-1.04.ebuild
+++ b/games-sports/miniracer/miniracer-1.04.ebuild
@@ -21,9 +21,7 @@ RDEPEND="virtual/opengl
 	media-libs/libsdl
 	media-libs/sdl-mixer"
 DEPEND="${RDEPEND}
-	x11-proto/xf86dgaproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-nosharedelf.patch \
diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild
index a59596cbb565..b8c182a4a903 100644
--- a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild
+++ b/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild
@@ -32,8 +32,7 @@ DEPEND="${RDEPEND}
 	x11-libs/libXt
 	x11-libs/libXmu
 	x11-libs/libXrender
-	x11-proto/xproto
-	xrandr? ( x11-proto/randrproto )"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)-src
 
diff --git a/games-sports/torcs/torcs-1.3.6-r1.ebuild b/games-sports/torcs/torcs-1.3.6-r1.ebuild
index 6b7ba9ad5785..77612fb8eaa9 100644
--- a/games-sports/torcs/torcs-1.3.6-r1.ebuild
+++ b/games-sports/torcs/torcs-1.3.6-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="media-libs/freealut
 	x11-libs/libX11
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-no-automake.patch
diff --git a/games-strategy/freeciv/freeciv-2.5.11.ebuild b/games-strategy/freeciv/freeciv-2.5.11.ebuild
index d2e9a55ac115..149823db3192 100644
--- a/games-strategy/freeciv/freeciv-2.5.11.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.11.ebuild
@@ -53,7 +53,7 @@ RDEPEND="app-arch/bzip2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!dedicated? (
-		x11-proto/xextproto
+		x11-base/xorg-proto
 		nls? ( sys-devel/gettext )
 	)"
 
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
index 85687658671c..ceb9ae038ec1 100644
--- a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
@@ -54,7 +54,7 @@ RDEPEND="app-arch/bzip2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!dedicated? (
-		x11-proto/xextproto
+		x11-base/xorg-proto
 		nls? ( sys-devel/gettext )
 	)"
 
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
index 119e643d3faf..e7b53bcc541e 100644
--- a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
+++ b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-text/rman
 	x11-misc/imake
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-sandbox.patch
diff --git a/games-util/etswitch/etswitch-0.1.14-r1.ebuild b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
index b8ac2cb5b6f9..da46e7ba4978 100644
--- a/games-util/etswitch/etswitch-0.1.14-r1.ebuild
+++ b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
@@ -18,9 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
 	x11-libs/libXt
-	x11-proto/recordproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=(
 		"${FILESDIR}"/${P}-desktop-entry.patch
diff --git a/games-util/qjoypad/qjoypad-4.3.0.ebuild b/games-util/qjoypad/qjoypad-4.3.0.ebuild
index c4578b2cd3d3..a1572020293d 100644
--- a/games-util/qjoypad/qjoypad-4.3.0.ebuild
+++ b/games-util/qjoypad/qjoypad-4.3.0.ebuild
@@ -25,9 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 src_install() {
diff --git a/profiles/package.mask b/profiles/package.mask
index 1b78f31d451d..3aca8e30d5ea 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,38 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <mattst88@gentoo.org> (10 Jun 2018)
+# Packages combined into x11-base/xorg-proto. All reverse deps transitioned.
+# Removal in 30 days. Bug #656250
+x11-proto/bigreqsproto
+x11-proto/compositeproto
+x11-proto/damageproto
+x11-proto/dmxproto
+x11-proto/dri2proto
+x11-proto/dri3proto
+x11-proto/fixesproto
+x11-proto/fontsproto
+x11-proto/glproto
+x11-proto/inputproto
+x11-proto/kbproto
+x11-proto/presentproto
+x11-proto/randrproto
+x11-proto/recordproto
+x11-proto/renderproto
+x11-proto/resourceproto
+x11-proto/scrnsaverproto
+x11-proto/trapproto
+x11-proto/videoproto
+x11-proto/xcmiscproto
+x11-proto/xextproto
+x11-proto/xf86bigfontproto
+x11-proto/xf86dgaproto
+x11-proto/xf86driproto
+x11-proto/xf86miscproto
+x11-proto/xf86vidmodeproto
+x11-proto/xineramaproto
+x11-proto/xproto
+
 # Andreas Sturmlechner <asturm@gentoo.org> (10 Jun 2018)
 # Dead upstream, no more revdeps after LO dropped support.
 # Masked for removal in 30 days, bug #657400
diff --git a/profiles/prefix/windows/winnt/package.mask b/profiles/prefix/windows/winnt/package.mask
index 0af713753d95..0b9c2c933897 100644
--- a/profiles/prefix/windows/winnt/package.mask
+++ b/profiles/prefix/windows/winnt/package.mask
@@ -1,8 +1,2 @@
 
 # Distributed under the terms of the GNU General Public License v2
-
-
-# Markus Duft <mduft@gentoo.org> (30 Sep 2009)
-# the patch does not currently apply, and needs some work.
->=x11-proto/xproto-7.0.16
-