From b1bded37f8f09ce2c35805d365694dab7569fc27 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Sat, 12 May 2018 02:20:37 +0200
Subject: [PATCH] x11-apps/*: Update dependencies (x11-proto/* ->
 x11-base/xorg-proto).

---
 x11-apps/bdftopcf/bdftopcf-1.1.ebuild               |  3 +--
 x11-apps/iceauth/iceauth-1.0.8.ebuild               |  2 +-
 .../intel-gpu-tools/intel-gpu-tools-1.20.ebuild     |  2 +-
 x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild         |  4 ++--
 x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild         |  4 ++--
 x11-apps/mesa-progs/mesa-progs-9999.ebuild          |  4 ++--
 x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild       |  4 ++--
 x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild       |  4 ++--
 x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild       |  2 +-
 x11-apps/rgb/rgb-1.0.5.ebuild                       |  4 ++--
 x11-apps/rgb/rgb-1.0.6.ebuild                       |  6 +++---
 x11-apps/sessreg/sessreg-1.1.1.ebuild               |  4 ++--
 x11-apps/transset/transset-1.0.1.ebuild             |  4 ++--
 x11-apps/transset/transset-1.0.2.ebuild             |  2 +-
 x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild           |  5 ++---
 x11-apps/xdm/xdm-1.1.11-r3.ebuild                   |  7 +++----
 x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild             | 13 ++-----------
 x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild             | 13 ++-----------
 x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild             |  4 ++--
 x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild             |  2 +-
 x11-apps/xev/xev-1.2.1.ebuild                       |  4 ++--
 x11-apps/xev/xev-1.2.2.ebuild                       |  4 ++--
 x11-apps/xf86dga/xf86dga-1.0.3.ebuild               |  4 ++--
 x11-apps/xgamma/xgamma-1.0.5.ebuild                 |  4 ++--
 x11-apps/xgamma/xgamma-1.0.6.ebuild                 |  4 ++--
 x11-apps/xinput/xinput-1.6.1.ebuild                 |  4 ++--
 x11-apps/xinput/xinput-1.6.2.ebuild                 |  4 ++--
 x11-apps/xkbutils/xkbutils-1.0.4.ebuild             |  5 ++---
 x11-apps/xprop/xprop-1.2.2.ebuild                   |  4 ++--
 x11-apps/xprop/xprop-1.2.3.ebuild                   |  2 +-
 x11-apps/xtrap/xtrap-1.0.2-r1.ebuild                |  4 ++--
 x11-apps/xtrap/xtrap-1.0.3.ebuild                   |  2 +-
 x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild          |  4 ++--
 x11-apps/xvidtune/xvidtune-1.0.3.ebuild             |  4 ++--
 x11-apps/xwd/xwd-1.0.6.ebuild                       |  6 +++---
 x11-apps/xwd/xwd-1.0.7.ebuild                       |  4 ++--
 x11-apps/xwininfo/xwininfo-1.1.3.ebuild             |  6 +++---
 x11-apps/xwininfo/xwininfo-1.1.4.ebuild             |  4 ++--
 38 files changed, 72 insertions(+), 94 deletions(-)

diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
index df9d6c081a20..6c3220866fdd 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
@@ -10,6 +10,5 @@ DESCRIPTION="X.Org bdftopcf application"
 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"
 IUSE=""
 DEPEND="
-	x11-proto/fontsproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 RDEPEND=""
diff --git a/x11-apps/iceauth/iceauth-1.0.8.ebuild b/x11-apps/iceauth/iceauth-1.0.8.ebuild
index 084c861bc6be..fbcafd4b17a2 100644
--- a/x11-apps/iceauth/iceauth-1.0.8.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.8.ebuild
@@ -12,4 +12,4 @@ IUSE=""
 
 RDEPEND="x11-libs/libICE"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
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
index f14f3fa384ae..69ac7b3936c9 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
@@ -18,7 +18,7 @@ X86_RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXv
 	)"
-X86_DEPEND=">=x11-proto/dri2proto-2.6"
+X86_DEPEND="x11-base/xorg-proto"
 RDEPEND="sys-apps/kmod:=
 	sys-process/procps:=
 	>=x11-libs/cairo-1.12.0[X?]
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
index 1e807c1632f6..aa6ffbd8f9a2 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	media-libs/glew
 	virtual/glu
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}
 EGIT_CHECKOUT_DIR=${S}
diff --git a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
index d999d44c52e5..07729580b329 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	media-libs/glew
 	virtual/glu
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}
 EGIT_CHECKOUT_DIR=${S}
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 3765af34344b..5d949f23bd54 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	media-libs/glew
 	virtual/glu
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}
 EGIT_CHECKOUT_DIR=${S}
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
index c95b6737e415..ca04af88a15b 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ IUSE=""
 RDEPEND="x11-libs/libfontenc
 	media-libs/freetype:2"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
+	x11-base/xorg-proto
 	app-arch/gzip
 	app-arch/bzip2"
 
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
index 17fd24b91e3a..4283de38eefa 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,8 +15,8 @@ RDEPEND="x11-libs/libfontenc
 	sys-libs/zlib
 	app-arch/bzip2"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	x11-misc/util-macros
-	x11-proto/xproto
 	app-arch/gzip"
 
 XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
index 1766e34c190b..495a445d1f95 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
@@ -15,8 +15,8 @@ RDEPEND="x11-libs/libfontenc
 	sys-libs/zlib
 	app-arch/bzip2"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	x11-misc/util-macros
-	x11-proto/xproto
 	app-arch/gzip"
 
 XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild
index cdc6a73115a2..79ed018a5ac0 100644
--- a/x11-apps/rgb/rgb-1.0.5.ebuild
+++ b/x11-apps/rgb/rgb-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,4 +11,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
index 8dc4a3f076f2..16d1e459c1ca 100644
--- a/x11-apps/rgb/rgb-1.0.6.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,5 +11,5 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
-	x11-misc/util-macros
-	x11-proto/xproto"
+	x11-base/xorg-proto
+	x11-misc/util-macros"
diff --git a/x11-apps/sessreg/sessreg-1.1.1.ebuild b/x11-apps/sessreg/sessreg-1.1.1.ebuild
index 2193ff0538aa..b2c0ed90b6ff 100644
--- a/x11-apps/sessreg/sessreg-1.1.1.ebuild
+++ b/x11-apps/sessreg/sessreg-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,4 +11,4 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/transset/transset-1.0.1.ebuild b/x11-apps/transset/transset-1.0.1.ebuild
index a2f14e270867..d0aa1d6e3b3d 100644
--- a/x11-apps/transset/transset-1.0.1.ebuild
+++ b/x11-apps/transset/transset-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,4 +13,4 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.17"
+	x11-base/xorg-proto"
diff --git a/x11-apps/transset/transset-1.0.2.ebuild b/x11-apps/transset/transset-1.0.2.ebuild
index 061b3239cd7b..d0aa1d6e3b3d 100644
--- a/x11-apps/transset/transset-1.0.2.ebuild
+++ b/x11-apps/transset/transset-1.0.2.ebuild
@@ -13,4 +13,4 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.17"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
index aa93c76e2183..8df4f1fe96fc 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,5 @@ RDEPEND="
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
diff --git a/x11-apps/xdm/xdm-1.1.11-r3.ebuild b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
index 4233aea63111..7799fbfa3e79 100644
--- a/x11-apps/xdm/xdm-1.1.11-r3.ebuild
+++ b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,9 +28,8 @@ RDEPEND="x11-apps/xrdb
 	pam? ( virtual/pam )
 	!<sys-apps/systemd-187"
 DEPEND="${RDEPEND}
-	consolekit? ( !=sys-auth/pambase-20101024-r1 )
-	x11-proto/xineramaproto
-	x11-proto/xproto"
+	x11-base/xorg-proto
+	consolekit? ( !=sys-auth/pambase-20101024-r1 )"
 
 pkg_setup() {
 	PATCHES=(
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
index fe6297132ec0..1b65aca89d80 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,16 +22,7 @@ RDEPEND="
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${RDEPEND}
-	x11-proto/compositeproto
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/renderproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dga? ( x11-proto/xf86dgaproto )
-	dmx? ( x11-proto/dmxproto )
-	xinerama? ( x11-proto/xineramaproto )
+	x11-base/xorg-proto
 "
 
 pkg_setup() {
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
index fe6297132ec0..1b65aca89d80 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,16 +22,7 @@ RDEPEND="
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${RDEPEND}
-	x11-proto/compositeproto
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/renderproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dga? ( x11-proto/xf86dgaproto )
-	dmx? ( x11-proto/dmxproto )
-	xinerama? ( x11-proto/xineramaproto )
+	x11-base/xorg-proto
 "
 
 pkg_setup() {
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
index bc84de10df6e..9e95c9e43c3f 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	virtual/opengl"
 DEPEND="${RDEPEND}
-	x11-proto/glproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
index 1801d61d66e8..8a64373394ae 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
@@ -12,7 +12,7 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	virtual/opengl"
 DEPEND="${RDEPEND}
-	x11-proto/glproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-apps/xev/xev-1.2.1.ebuild b/x11-apps/xev/xev-1.2.1.ebuild
index 2194489aa3b8..ec3eda23d5fa 100644
--- a/x11-apps/xev/xev-1.2.1.ebuild
+++ b/x11-apps/xev/xev-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,4 +13,4 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xev/xev-1.2.2.ebuild b/x11-apps/xev/xev-1.2.2.ebuild
index 33c1a0371cd4..29d2b7979e0f 100644
--- a/x11-apps/xev/xev-1.2.2.ebuild
+++ b/x11-apps/xev/xev-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,4 +13,4 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
index 33fa3524c0a3..89597872cdb6 100644
--- a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
+++ b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,4 +13,4 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	>=x11-libs/libXxf86dga-1.1"
 DEPEND="${RDEPEND}
-	x11-proto/xf86dgaproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xgamma/xgamma-1.0.5.ebuild b/x11-apps/xgamma/xgamma-1.0.5.ebuild
index 711a48f43226..bc105e08848b 100644
--- a/x11-apps/xgamma/xgamma-1.0.5.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -12,4 +12,4 @@ IUSE=""
 RDEPEND="x11-libs/libXxf86vm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xgamma/xgamma-1.0.6.ebuild b/x11-apps/xgamma/xgamma-1.0.6.ebuild
index b7a197a96249..54f51932cad0 100644
--- a/x11-apps/xgamma/xgamma-1.0.6.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,4 +12,4 @@ IUSE=""
 RDEPEND="x11-libs/libXxf86vm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xinput/xinput-1.6.1.ebuild b/x11-apps/xinput/xinput-1.6.1.ebuild
index 56ec43dcc08d..3b30c64ba019 100644
--- a/x11-apps/xinput/xinput-1.6.1.ebuild
+++ b/x11-apps/xinput/xinput-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,4 +15,4 @@ RDEPEND=">=x11-libs/libX11-1.3
 	x11-libs/libXinerama
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.1.99.1"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xinput/xinput-1.6.2.ebuild b/x11-apps/xinput/xinput-1.6.2.ebuild
index 6084a3a12fb4..4e7ffe27b9ae 100644
--- a/x11-apps/xinput/xinput-1.6.2.ebuild
+++ b/x11-apps/xinput/xinput-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,4 +15,4 @@ RDEPEND=">=x11-libs/libX11-1.3
 	x11-libs/libXinerama
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.1.99.1"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
index b8c25fa73d30..8922936566fa 100644
--- a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
+++ b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,5 +14,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXaw"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/inputproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xprop/xprop-1.2.2.ebuild b/x11-apps/xprop/xprop-1.2.2.ebuild
index 65e87ccc79ee..574b5572a9fa 100644
--- a/x11-apps/xprop/xprop-1.2.2.ebuild
+++ b/x11-apps/xprop/xprop-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,5 +11,5 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.17
+	x11-base/xorg-proto
 "
diff --git a/x11-apps/xprop/xprop-1.2.3.ebuild b/x11-apps/xprop/xprop-1.2.3.ebuild
index eaa51ead5c37..574b5572a9fa 100644
--- a/x11-apps/xprop/xprop-1.2.3.ebuild
+++ b/x11-apps/xprop/xprop-1.2.3.ebuild
@@ -11,5 +11,5 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.25
+	x11-base/xorg-proto
 "
diff --git a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
index f5919090c5e6..fbe79b1339ed 100644
--- a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
+++ b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -10,4 +10,4 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXTrap"
 DEPEND="${RDEPEND}
-	x11-proto/trapproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xtrap/xtrap-1.0.3.ebuild b/x11-apps/xtrap/xtrap-1.0.3.ebuild
index 4575e7f8ec75..1df4ff1b4458 100644
--- a/x11-apps/xtrap/xtrap-1.0.3.ebuild
+++ b/x11-apps/xtrap/xtrap-1.0.3.ebuild
@@ -11,4 +11,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXTrap"
 DEPEND="${RDEPEND}
-	x11-proto/trapproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
index c0e6df2bc894..2da520d4712c 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,4 +15,4 @@ RDEPEND="x11-libs/libXaw
 	x11-libs/libXt
 	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
index eb84ada1084d..c4801d350364 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,4 +15,4 @@ RDEPEND="x11-libs/libXaw
 	x11-libs/libXt
 	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild
index ec840a7e31bf..cd0a83992aef 100644
--- a/x11-apps/xwd/xwd-1.0.6.ebuild
+++ b/x11-apps/xwd/xwd-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,6 @@ IUSE=""
 # libXt dependency is not in configure.ac, bug #408629, upstream #47462."
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	x11-libs/libXt
-	x11-libs/libxkbfile
-	x11-proto/xproto"
+	x11-libs/libxkbfile"
diff --git a/x11-apps/xwd/xwd-1.0.7.ebuild b/x11-apps/xwd/xwd-1.0.7.ebuild
index d88f8dfd465c..cd0a83992aef 100644
--- a/x11-apps/xwd/xwd-1.0.7.ebuild
+++ b/x11-apps/xwd/xwd-1.0.7.ebuild
@@ -13,6 +13,6 @@ IUSE=""
 # libXt dependency is not in configure.ac, bug #408629, upstream #47462."
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	x11-libs/libXt
-	x11-libs/libxkbfile
-	x11-proto/xproto"
+	x11-libs/libxkbfile"
diff --git a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
index 9a8fb51ef20c..251eb77838dc 100644
--- a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
+++ b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,8 +12,8 @@ IUSE=""
 
 RDEPEND=">=x11-libs/libxcb-1.6"
 DEPEND="${RDEPEND}
-	x11-libs/libX11
-	>=x11-proto/xproto-7.0.17"
+	x11-base/xorg-proto
+	x11-libs/libX11"
 
 pkg_setup() {
 	# interix has a _very_ old iconv in libc, however, including
diff --git a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild
index 4e7c0e6044cc..251eb77838dc 100644
--- a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild
+++ b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild
@@ -12,8 +12,8 @@ IUSE=""
 
 RDEPEND=">=x11-libs/libxcb-1.6"
 DEPEND="${RDEPEND}
-	x11-libs/libX11
-	>=x11-proto/xproto-7.0.17"
+	x11-base/xorg-proto
+	x11-libs/libX11"
 
 pkg_setup() {
 	# interix has a _very_ old iconv in libc, however, including
-- 
2.26.2