x11-plugins/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).

87 files changed, 126 insertions, 161 deletions

diff --git a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild b/x11-plugins/allin1/allin1-0.5.0-r2.ebuild
index 3777c34d6a03..8fbbd58b567a 100644
--- a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild
+++ b/x11-plugins/allin1/allin1-0.5.0-r2.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=6
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}/makefile-r2.patch" )
 
diff --git a/x11-plugins/asapm/asapm-3.1-r1.ebuild b/x11-plugins/asapm/asapm-3.1-r1.ebuild
index 91e71f33349a..8d6ea14a2354 100644
--- a/x11-plugins/asapm/asapm-3.1-r1.ebuild
+++ b/x11-plugins/asapm/asapm-3.1-r1.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
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm"
 
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-{ldflags,include,autoconf}.patch
diff --git a/x11-plugins/ascpu/ascpu-1.11-r1.ebuild b/x11-plugins/ascpu/ascpu-1.11-r1.ebuild
index ab325222b55d..3fd3792e775f 100644
--- a/x11-plugins/ascpu/ascpu-1.11-r1.ebuild
+++ b/x11-plugins/ascpu/ascpu-1.11-r1.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=6
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libXpm
 	jpeg? ( virtual/jpeg:0 )"
 
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}/${P}-gentoo-r1.patch" )
 
diff --git a/x11-plugins/asmem/asmem-1.12-r1.ebuild b/x11-plugins/asmem/asmem-1.12-r1.ebuild
index e0f39bf7ed56..2eb08c18251d 100644
--- a/x11-plugins/asmem/asmem-1.12-r1.ebuild
+++ b/x11-plugins/asmem/asmem-1.12-r1.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=6
@@ -21,7 +21,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	jpeg? ( virtual/jpeg:0 )"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}/respect-ldflags.patch" )
 
diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild
index f6be82776b11..74d7319ab55c 100644
--- a/x11-plugins/asmon/asmon-0.71-r1.ebuild
+++ b/x11-plugins/asmon/asmon-0.71-r1.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
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXpm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/x11-plugins/asmon/asmon-0.71.ebuild b/x11-plugins/asmon/asmon-0.71.ebuild
index 27a25f7cda5d..6bea68eeba79 100644
--- a/x11-plugins/asmon/asmon-0.71.ebuild
+++ b/x11-plugins/asmon/asmon-0.71.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXpm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/x11-plugins/astime/astime-2.8-r2.ebuild b/x11-plugins/astime/astime-2.8-r2.ebuild
index ea8e6a19f84d..c50c9190ab75 100644
--- a/x11-plugins/astime/astime-2.8-r2.ebuild
+++ b/x11-plugins/astime/astime-2.8-r2.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=6
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libXpm
 	jpeg? ( virtual/jpeg:0 )"
 
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}/respect-ldflags.patch" )
 
diff --git a/x11-plugins/cputnik/cputnik-0.2.0.ebuild b/x11-plugins/cputnik/cputnik-0.2.0.ebuild
index ee3e78fa8936..439645be1b36 100644
--- a/x11-plugins/cputnik/cputnik-0.2.0.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.2.0.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${P}/src
 
diff --git a/x11-plugins/epplets/epplets-0.12.ebuild b/x11-plugins/epplets/epplets-0.12.ebuild
index 1d62439e68dd..1b147792f12d 100644
--- a/x11-plugins/epplets/epplets-0.12.ebuild
+++ b/x11-plugins/epplets/epplets-0.12.ebuild
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
 	>=x11-wm/enlightenment-0.16.4"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_install() {
 	emake DESTDIR="${D}" install || die
diff --git a/x11-plugins/epplets/epplets-0.14.ebuild b/x11-plugins/epplets/epplets-0.14.ebuild
index b8abc8e5a2eb..416ba6a70a62 100644
--- a/x11-plugins/epplets/epplets-0.14.ebuild
+++ b/x11-plugins/epplets/epplets-0.14.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="4"
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
 	>=x11-wm/enlightenment-0.16.4"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_configure() {
 	econf $(use_enable static-libs static)
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
index 3e682aad1fd3..83bc210ced4d 100644
--- a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.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=6
@@ -20,7 +20,7 @@ RDEPEND=">=x11-wm/windowmaker-0.95.2
 	x11-libs/libXpm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
+	x11-base/xorg-proto
 	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/${MY_P}
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
index 253934df329f..8e75f7effaff 100644
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	app-admin/gkrellm:2[X]
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
-	x11-proto/inputproto"
+	x11-base/xorg-proto"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
index 235af24fee89..f9f05bc14963 100644
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
@@ -13,8 +13,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
index 1a6b5e27c402..2fb50977e0ea 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
@@ -13,8 +13,7 @@ CDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${CDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 RDEPEND="${CDEPEND}
 	x11-misc/xscreensaver"
 
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
index 206382d667a2..7994fea1f0db 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S="${WORKDIR}/${P}/${PN}"
 
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
index 8b9fd175cd6d..bb9f25ab7bc0 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
@@ -25,8 +25,7 @@ CDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${CDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 RDEPEND="${CDEPEND}
 	net-misc/curl
 	dev-lang/perl"
diff --git a/x11-plugins/wmSun/wmSun-1.05.ebuild b/x11-plugins/wmSun/wmSun-1.05.ebuild
index 4926d4505998..a7701df3ebb3 100644
--- a/x11-plugins/wmSun/wmSun-1.05.ebuild
+++ b/x11-plugins/wmSun/wmSun-1.05.ebuild
@@ -19,7 +19,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
index 564f104c855d..5336ef10ddd1 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.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="2"
@@ -21,7 +21,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm"
 
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
index 8af070e1e11d..ca8e850f9a53 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index 30262c7d8128..d902e3de4a33 100644
--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.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=2
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	# patch wmacpimon.c file to set default path for
diff --git a/x11-plugins/wmamixer/wmamixer-0.2.ebuild b/x11-plugins/wmamixer/wmamixer-0.2.ebuild
index a684fbdad792..47ea86948d75 100644
--- a/x11-plugins/wmamixer/wmamixer-0.2.ebuild
+++ b/x11-plugins/wmamixer/wmamixer-0.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=6
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXpm
 	x11-libs/libXext
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 DOCS=( README.rst )
 src_compile() {
diff --git a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
index d463cae956e2..6825e6d6a68a 100644
--- a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
@@ -16,8 +16,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/x11-plugins/wmappl/wmappl-0.71.ebuild b/x11-plugins/wmappl/wmappl-0.71.ebuild
index 07b149ea1707..797a891879de 100644
--- a/x11-plugins/wmappl/wmappl-0.71.ebuild
+++ b/x11-plugins/wmappl/wmappl-0.71.ebuild
@@ -13,7 +13,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
index 8c74061700f1..534f09d4db2f 100644
--- a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
+++ b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_install() {
 	emake DESTDIR="${D}" install || die "Installation failed"
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
index 96a725b2eaa1..8e73b022cf3e 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
@@ -22,8 +22,7 @@ RDEPEND="x11-libs/libX11
 		)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/dockapps
 
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
index 1185a4b13af9..58c48049945b 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
@@ -22,8 +22,7 @@ RDEPEND="x11-libs/libX11
 		)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
 
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
index 1185a4b13af9..58c48049945b 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
@@ -22,8 +22,7 @@ RDEPEND="x11-libs/libX11
 		)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
 
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
index 28d23517f4d3..91e026814028 100644
--- a/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index 7c9d8fdf8607..b6fcce6d4152 100644
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.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=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${P}/src
 
diff --git a/x11-plugins/wmblob/wmblob-1.0.3.ebuild b/x11-plugins/wmblob/wmblob-1.0.3.ebuild
index 188ec7aa803f..177155ed0a7b 100644
--- a/x11-plugins/wmblob/wmblob-1.0.3.ebuild
+++ b/x11-plugins/wmblob/wmblob-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
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-libs/libXt"
 
 DOCS="AUTHORS ChangeLog NEWS README doc/how_it_works"
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
index 353094287d03..4a5bc61a5db6 100644
--- a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/dockapps
 
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
index 5de26b6bd1eb..a681773c8a4f 100644
--- a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
@@ -16,4 +16,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmcalc/wmcalc-0.6.ebuild b/x11-plugins/wmcalc/wmcalc-0.6.ebuild
index e71e445a3cea..a10e1ac605d3 100644
--- a/x11-plugins/wmcalc/wmcalc-0.6.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.6.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 # Specific to this tarball
 S=${WORKDIR}/dockapps-43ddcdf
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
index 7827b4a7dbfb..a5309acde845 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-misc/imake"
 
 SLOT="0"
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
index d3b33734988a..f0a1d39b633e 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/dockapps
 
diff --git a/x11-plugins/wmclock/wmclock-1.0.16.ebuild b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
index b36973114547..8a6ac6cd1922 100644
--- a/x11-plugins/wmclock/wmclock-1.0.16.ebuild
+++ b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 # Specific path for this version
 S=${WORKDIR}/dockapps-daaf3aa
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild
index bb657bedb11b..15c05d3ee3b2 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.8.1.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.8.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
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libICE"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-libs/libXt"
 
 src_prepare() {
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
index b0a61a2aa8a2..a8546bdbafa0 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.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
@@ -22,12 +22,10 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXft
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-libs/libXt
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-proto/xineramaproto )"
+	x11-base/xorg-proto
+	x11-libs/libXt
+	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/${PN}-debian-${PV/_p/-}-1
 
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
index 3c3c57013756..6b23f379b40f 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.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=6
@@ -20,12 +20,10 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXft
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-libs/libXt
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-proto/xineramaproto )"
+	x11-base/xorg-proto
+	x11-libs/libXt
+	nls? ( sys-devel/gettext )"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
diff --git a/x11-plugins/wmcp/wmcp-1.2.8.ebuild b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
index fbd061cbaa0f..eda159623e38 100644
--- a/x11-plugins/wmcp/wmcp-1.2.8.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild b/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild
index 74a0ed574174..47eeeabe835c 100644
--- a/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild
+++ b/x11-plugins/wmcpuload/wmcpuload-1.1.0_pre5.ebuild
@@ -16,7 +16,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-libs/libICE"
 
 S=${WORKDIR}/${P/_/}
diff --git a/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild b/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild
index a85d7e55763a..86e2770cfb0c 100644
--- a/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.ebuild
+++ b/x11-plugins/wmdiskmon/wmdiskmon-0.0.2.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=4
@@ -15,7 +15,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-libs/libXt"
 
 src_install() {
diff --git a/x11-plugins/wmfortune/wmfortune-0.241.ebuild b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
index b355001833d0..4165e7e95b94 100644
--- a/x11-plugins/wmfortune/wmfortune-0.241.ebuild
+++ b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
@@ -19,8 +19,7 @@ RDEPEND="games-misc/fortune-mod
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild
index ad134fe8a64d..ec123100e9b1 100644
--- a/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild
+++ b/x11-plugins/wmfrog/wmfrog-0.2.0-r1.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=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXpm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/Src
 
diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
index 9bbe9bda51b6..74ad1e179680 100644
--- a/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
+++ b/x11-plugins/wmfrog/wmfrog-0.3.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=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXpm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/Src
 
diff --git a/x11-plugins/wmfsm/wmfsm-0.36.ebuild b/x11-plugins/wmfsm/wmfsm-0.36.ebuild
index 62f0eb72ea04..43937a34e436 100644
--- a/x11-plugins/wmfsm/wmfsm-0.36.ebuild
+++ b/x11-plugins/wmfsm/wmfsm-0.36.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libXt
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.ac || die "sed failed"
diff --git a/x11-plugins/wmget/wmget-0.6.1.ebuild b/x11-plugins/wmget/wmget-0.6.1.ebuild
index 17190d7c7a80..7c6f99f0c6dc 100644
--- a/x11-plugins/wmget/wmget-0.6.1.ebuild
+++ b/x11-plugins/wmget/wmget-0.6.1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	>=net-misc/curl-7.9.7"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 # Specific to this tarball
 S=${WORKDIR}/dockapps-5aaf842
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
index 6586c9fd143f..b64e3a685bf8 100644
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
@@ -22,9 +22,7 @@ RDEPEND=">=net-misc/wget-1.9-r2
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	>=sys-apps/sed-4.1.5-r1"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_PN}-${PV}/${MY_PN}
 
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
index 45b51b595243..6d796359dc84 100644
--- a/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
+++ b/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/dockapps
 
diff --git a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild b/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
index aa8802b5c5b7..31fcd6df0660 100644
--- a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
+++ b/x11-plugins/wminet/wminet-3.0.0-r1.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
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-list.patch
diff --git a/x11-plugins/wmix/wmix-3.2.ebuild b/x11-plugins/wmix/wmix-3.2.ebuild
index 84b87b79bfa5..6164f74253cb 100644
--- a/x11-plugins/wmix/wmix-3.2.ebuild
+++ b/x11-plugins/wmix/wmix-3.2.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/dockapps
 
diff --git a/x11-plugins/wmix/wmix-3.3.ebuild b/x11-plugins/wmix/wmix-3.3.ebuild
index a82978ca7e55..c5b23a95a591 100644
--- a/x11-plugins/wmix/wmix-3.3.ebuild
+++ b/x11-plugins/wmix/wmix-3.3.ebuild
@@ -17,4 +17,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild b/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
index 8a1f8644c5a9..da724eecc00b 100644
--- a/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
+++ b/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
@@ -18,8 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	>=sys-apps/sed-4.1.5-r1"
+	x11-base/xorg-proto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmload/wmload-0.9.7.ebuild b/x11-plugins/wmload/wmload-0.9.7.ebuild
index 9d170235dac5..424fa397b0ff 100644
--- a/x11-plugins/wmload/wmload-0.9.7.ebuild
+++ b/x11-plugins/wmload/wmload-0.9.7.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.6-solaris.patch
diff --git a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
index ca06b0cbe563..95d390651648 100644
--- a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
+++ b/x11-plugins/wmmand/wmmand-1.3.2-r1.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=6
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}/wmMand
 
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild
index 4dcb8d04e282..27e6684bf27a 100644
--- a/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.8.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-libs/libICE
 	x11-libs/libXt"
 
diff --git a/x11-plugins/wmmisc/wmmisc-1.1.ebuild b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
index 342162e0f659..5b4d2a91fae1 100644
--- a/x11-plugins/wmmisc/wmmisc-1.1.ebuild
+++ b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmmixer/wmmixer-1.8.ebuild b/x11-plugins/wmmixer/wmmixer-1.8.ebuild
index 72b8ef660d7a..e557c839133f 100644
--- a/x11-plugins/wmmixer/wmmixer-1.8.ebuild
+++ b/x11-plugins/wmmixer/wmmixer-1.8.ebuild
@@ -16,4 +16,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
index 9dc5da613248..3da3e885fae8 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.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
@@ -19,7 +19,7 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/wmmon.app/wmmon
 
diff --git a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
index 54f0ae422f8b..94e8f0cbdbcc 100644
--- a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.2_beta1.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=4
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${P/_beta/b}
 
diff --git a/x11-plugins/wmmon/wmmon-1.3.ebuild b/x11-plugins/wmmon/wmmon-1.3.ebuild
index 7705ab2e7056..ed8ccc7f24b3 100644
--- a/x11-plugins/wmmon/wmmon-1.3.ebuild
+++ b/x11-plugins/wmmon/wmmon-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=6
@@ -16,4 +16,4 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmmon/wmmon-1.4.ebuild b/x11-plugins/wmmon/wmmon-1.4.ebuild
index 9b4d238fc259..ed8ccc7f24b3 100644
--- a/x11-plugins/wmmon/wmmon-1.4.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.4.ebuild
@@ -16,4 +16,4 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild
index 702588106f7d..d7fbf53d8020 100644
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.27-r1.ebuild
@@ -13,8 +13,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
index 3daf78facc86..3eae322ded2f 100644
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
@@ -16,5 +16,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmmp3/wmmp3-0.12.ebuild b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
index e4b39917b7a4..9b9d18396b0f 100644
--- a/x11-plugins/wmmp3/wmmp3-0.12.ebuild
+++ b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
@@ -18,8 +18,8 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	media-sound/mpg123"
+	media-sound/mpg123
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmnd/wmnd-0.4.16.ebuild b/x11-plugins/wmnd/wmnd-0.4.16.ebuild
index 0e607154895e..b33c06f48689 100644
--- a/x11-plugins/wmnd/wmnd-0.4.16.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.16.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
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_install() {
 	emake DESTDIR="${D}" install
diff --git a/x11-plugins/wmnd/wmnd-0.4.17.ebuild b/x11-plugins/wmnd/wmnd-0.4.17.ebuild
index 516ebf9f1ffb..5f888de90ca1 100644
--- a/x11-plugins/wmnd/wmnd-0.4.17.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.17.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
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_install() {
 	emake DESTDIR="${D}" install
diff --git a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
index 9dfb8a9c75a0..8c28d8b06e11 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
@@ -14,8 +14,7 @@ HOMEPAGE="http://www.dockapps.net/wmnet"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-misc/imake
 	app-text/rman"
 
diff --git a/x11-plugins/wmpeople/wmpeople-1.3.ebuild b/x11-plugins/wmpeople/wmpeople-1.3.ebuild
index 0498d568e410..1b9773539ea3 100644
--- a/x11-plugins/wmpeople/wmpeople-1.3.ebuild
+++ b/x11-plugins/wmpeople/wmpeople-1.3.ebuild
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	>=net-mail/peephole-1.2"
 
 src_install() {
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
index 884ccdd4b4cc..9e6f56ea7cbf 100644
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.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=6
@@ -16,4 +16,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
index 8354198a3b43..f7fbc6a43a8d 100644
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
@@ -14,8 +14,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmping/wmping-0.2.1.ebuild b/x11-plugins/wmping/wmping-0.2.1.ebuild
index 4b44c98b1243..3c7b7a00eadb 100644
--- a/x11-plugins/wmping/wmping-0.2.1.ebuild
+++ b/x11-plugins/wmping/wmping-0.2.1.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
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	x11-libs/libICE
 	x11-libs/libXt"
 
diff --git a/x11-plugins/wmpower/wmpower-0.4.3.ebuild b/x11-plugins/wmpower/wmpower-0.4.3.ebuild
index b5e73a0ae6cc..3235f25cf635 100644
--- a/x11-plugins/wmpower/wmpower-0.4.3.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.3.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_compile() {
 	# override wmpower self-calculated cflags
diff --git a/x11-plugins/wmrack/wmrack-1.3.ebuild b/x11-plugins/wmrack/wmrack-1.3.ebuild
index d167626d1349..52fa77442a2c 100644
--- a/x11-plugins/wmrack/wmrack-1.3.ebuild
+++ b/x11-plugins/wmrack/wmrack-1.3.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmrack/wmrack-1.4.ebuild b/x11-plugins/wmrack/wmrack-1.4.ebuild
index b1b4763a9dab..2b0d6930da55 100644
--- a/x11-plugins/wmrack/wmrack-1.4.ebuild
+++ b/x11-plugins/wmrack/wmrack-1.4.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=4
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	sed -i -e 's:gcc:$(CC):' "${S}"/Makefile.in
diff --git a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
index b0ac99ee9486..7323122856a0 100644
--- a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
+++ b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
@@ -14,8 +14,7 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	>=sys-apps/sed-4.1.5-r1"
+	x11-base/xorg-proto"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
index 043175cd149c..7e01b194131d 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libXpm
 	x11-libs/libXext
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_compile() {
 	g++ ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
index e4cc74eca71e..d5ab7c82a729 100644
--- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/wmswallow
 
diff --git a/x11-plugins/wmtime/wmtime-1.4.ebuild b/x11-plugins/wmtime/wmtime-1.4.ebuild
index 2da6f1f1bfcc..54dbafbab8c4 100644
--- a/x11-plugins/wmtime/wmtime-1.4.ebuild
+++ b/x11-plugins/wmtime/wmtime-1.4.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libXdmcp
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/x11-plugins/wmtop/wmtop-0.85.ebuild b/x11-plugins/wmtop/wmtop-0.85.ebuild
index 43f1dbde59c0..63b85df2a302 100644
--- a/x11-plugins/wmtop/wmtop-0.85.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.85.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libXpm
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 # Incorrect path in this tarball version
 S=${WORKDIR}/dockapps-be3f170
diff --git a/x11-plugins/wmweather/wmweather-2.4.4.ebuild b/x11-plugins/wmweather/wmweather-2.4.4.ebuild
index 413d431c5fc1..dd51b110b97b 100644
--- a/x11-plugins/wmweather/wmweather-2.4.4.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.4.ebuild
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-apps/xmessage
 	net-misc/curl"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${P}/src
 
diff --git a/x11-plugins/wmweather/wmweather-2.4.5.ebuild b/x11-plugins/wmweather/wmweather-2.4.5.ebuild
index 672b5595b974..44c2c24cfab1 100644
--- a/x11-plugins/wmweather/wmweather-2.4.5.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.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=4
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-apps/xmessage
 	net-misc/curl"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${P}/src
 
diff --git a/x11-plugins/wmweather/wmweather-2.4.6.ebuild b/x11-plugins/wmweather/wmweather-2.4.6.ebuild
index 451ba034bb93..125790de1114 100644
--- a/x11-plugins/wmweather/wmweather-2.4.6.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.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=6
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-apps/xmessage
 	net-misc/curl"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${P}/src
 
diff --git a/x11-plugins/wmwifi/wmwifi-0.6.ebuild b/x11-plugins/wmwifi/wmwifi-0.6.ebuild
index 0c2e17e0086d..45fc88ee8bef 100644
--- a/x11-plugins/wmwifi/wmwifi-0.6.ebuild
+++ b/x11-plugins/wmwifi/wmwifi-0.6.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_compile()
 {
diff --git a/x11-plugins/wmwork/wmwork-0.2.5.ebuild b/x11-plugins/wmwork/wmwork-0.2.5.ebuild
index c9dd6314ab14..3b4840f0b94f 100644
--- a/x11-plugins/wmwork/wmwork-0.2.5.ebuild
+++ b/x11-plugins/wmwork/wmwork-0.2.5.ebuild
@@ -16,7 +16,7 @@ RDEPEND=">=x11-libs/libXext-1.0.3
 	>=x11-libs/libX11-1.1.1-r1
 	>=x11-libs/libXpm-3.5.6"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${P}/src
 
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
index af99220d04e8..37bfd003969e 100644
--- a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
+++ b/x11-plugins/wmxkb/wmxkb-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=2
@@ -18,9 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	x11-proto/inputproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	sed -i -e 's:$(LD) -o:$(CC) $(LDFLAGS) -o:' Makefile.in || die #336528
diff --git a/x11-plugins/wmxres/wmxres-1.2.ebuild b/x11-plugins/wmxres/wmxres-1.2.ebuild
index bc0f29ab3149..793229458363 100644
--- a/x11-plugins/wmxres/wmxres-1.2.ebuild
+++ b/x11-plugins/wmxres/wmxres-1.2.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
@@ -18,9 +18,8 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
-	x11-libs/libXxf86dga
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto
+	x11-libs/libXxf86dga"
 
 S=${WORKDIR}/${PN}.app