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

25 files changed, 49 insertions, 95 deletions

diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.5.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.5.ebuild
index ba3a1669bb3c..bd887a55784c 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.5.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.5.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,8 +13,8 @@ RDEPEND=">=x11-base/xorg-server-1.18[udev]
 	sys-libs/mtdev
 	virtual/libudev:="
 DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.1.99.3
-	>=sys-kernel/linux-headers-2.6"
+	>=sys-kernel/linux-headers-2.6
+	x11-base/xorg-proto"
 
 pkg_pretend() {
 	if use kernel_linux ; then
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
index d6d447becd5f..2f4f181bd409 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.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
@@ -11,8 +11,7 @@ IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.10"
 DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/kbproto"
+	x11-base/xorg-proto"
 
 src_install() {
 	xorg-2_src_install
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.0.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.0.ebuild
index 2c112c741308..b9798eae3c3b 100644
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.0.ebuild
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.0.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
@@ -20,9 +20,7 @@ RDEPEND="${RDEPEND}
 	>=sys-libs/mtdev-1.0"
 DEPEND="${DEPEND}
 	>=sys-libs/mtdev-1.0
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xineramaproto"
+	x11-base/xorg-proto"
 
 DOCS=( "README.md" )
 PATCHES=( "${FILESDIR}"/${PN}-0.2.0-drop-mtrack-test.patch )
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.1.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.1.ebuild
index 5c5506738003..08cd6a90bb42 100644
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.1.ebuild
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.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
@@ -20,9 +20,7 @@ RDEPEND="${RDEPEND}
 	>=sys-libs/mtdev-1.0"
 DEPEND="${DEPEND}
 	>=sys-libs/mtdev-1.0
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xineramaproto"
+	x11-base/xorg-proto"
 
 DOCS=( "README.md" )
 PATCHES=( "${FILESDIR}"/${PN}-0.2.0-drop-mtrack-test.patch )
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.1.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.1.ebuild
index 01270252978f..1b5ea1efe16f 100644
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.1.ebuild
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.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
@@ -18,9 +18,7 @@ RDEPEND="${RDEPEND}
 	>=sys-libs/mtdev-1.0"
 DEPEND="${DEPEND}
 	>=sys-libs/mtdev-1.0
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xineramaproto"
+	x11-base/xorg-proto"
 
 DOCS=( "README.md" )
 PATCHES=( "${FILESDIR}"/${PN}-0.2.0-drop-mtrack-test.patch )
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild
index 1537d1784792..f9182bd3397a 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.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
@@ -17,8 +17,7 @@ RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
 	>=x11-libs/libXtst-1.1.0"
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.37
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/recordproto-1.14"
+	x11-base/xorg-proto"
 
 DOCS=( "README" )
 
diff --git a/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild
index fe7350a06937..7956b05629ed 100644
--- a/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild
+++ b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.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 @@ IUSE=""
 
 RDEPEND="x11-libs/tslib"
 DEPEND="${RDEPEND}
-	x11-proto/randrproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}-trunk
 
diff --git a/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r3.ebuild b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r3.ebuild
index 645d65c0f2ea..08bf9011cba6 100644
--- a/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r3.ebuild
+++ b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r3.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
@@ -18,7 +18,7 @@ IUSE=""
 
 RDEPEND="x11-libs/tslib"
 DEPEND="${RDEPEND}
-	x11-proto/randrproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}-trunk
 
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
index 4a0bb9479bb4..5a2712bde4e6 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.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
@@ -11,7 +11,7 @@ KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	x11-proto/randrproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
index 3abb6c9f908c..1a242a878474 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-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
@@ -11,7 +11,7 @@ KEYWORDS=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	x11-proto/randrproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.34.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.34.0.ebuild
index 6374c40c3861..cd427a34041c 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.34.0.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.34.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
@@ -25,7 +25,7 @@ RDEPEND="dev-libs/libwacom
 	x11-libs/libXrandr
 	x11-libs/libXinerama"
 DEPEND="${RDEPEND}
-	x11-proto/randrproto"
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}/${P}-xorg-server-1.19-support.patch"
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.35.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.35.0.ebuild
index 61c5f062eb9c..0f91507ed821 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.35.0.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.35.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
@@ -25,7 +25,7 @@ RDEPEND="dev-libs/libwacom
 	x11-libs/libXrandr
 	x11-libs/libXinerama"
 DEPEND="${RDEPEND}
-	x11-proto/randrproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	linux-info_pkg_setup
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0.ebuild
index 8d906ff0b1aa..47a540cf7b69 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="dev-libs/libwacom
 	x11-libs/libXrandr
 	x11-libs/libXinerama"
 DEPEND="${RDEPEND}
-	x11-proto/randrproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	linux-info_pkg_setup
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild
index 1914d37b2730..74af38fe6fb6 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.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
@@ -11,9 +11,7 @@ IUSE="dga"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
 DEPEND="${RDEPEND}
-	dga? (
-		x11-proto/xf86dgaproto
-	)"
+	dga? ( x11-base/xorg-proto )"
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.7.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.7.ebuild
index fbd4cfd1442f..4a6f6c1a00f4 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.7.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.7.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,9 +11,7 @@ IUSE="dga"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
 DEPEND="${RDEPEND}
-	dga? (
-		x11-proto/xf86dgaproto
-	)"
+	dga? ( x11-base/xorg-proto )"
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
index 6709bf90a811..4a6f6c1a00f4 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.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
@@ -11,9 +11,7 @@ IUSE="dga"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
 DEPEND="${RDEPEND}
-	dga? (
-		x11-proto/xf86dgaproto
-	)"
+	dga? ( x11-base/xorg-proto )"
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.4.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.4.ebuild
index 39e19cf50209..bb8b9243f0c9 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.4.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.4.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,8 +11,4 @@ IUSE=""
 
 RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
index ea306a76d5e3..c0b237805622 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.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,7 +12,4 @@ IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
 DEPEND="${RDEPEND}
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
index 8ab62dfd214b..9fc934130bff 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
@@ -57,10 +57,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/dri3proto
-	x11-proto/presentproto
-	x11-proto/resourceproto"
+	x11-base/xorg-proto"
 
 src_configure() {
 	replace-flags -Os -O2
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
index b076e21d496c..260b77654663 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -57,10 +57,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/dri3proto
-	x11-proto/presentproto
-	x11-proto/resourceproto"
+	x11-base/xorg-proto"
 
 src_configure() {
 	replace-flags -Os -O2
diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5.ebuild
index 5dab6f4b5ef8..8774666ba910 100644
--- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5.ebuild
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5.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,8 +19,8 @@ RDEPEND="
 	x11-base/xorg-server[-minimal]
 	>=x11-libs/libdrm-2.4.46"
 DEPEND="${RDEPEND}
-	x11-proto/xf86dgaproto
-	>=app-emulation/spice-protocol-0.12.0"
+	>=app-emulation/spice-protocol-0.12.0
+	x11-base/xorg-proto"
 
 src_prepare() {
 	python_fix_shebang scripts
diff --git a/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild b/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
index 24560bd2dcfd..a24e9f971842 100644
--- a/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
+++ b/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.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
@@ -18,8 +18,5 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
+	x11-base/xorg-proto
 "
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild
index 451c6f821b90..22ec6dd17a30 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild
@@ -27,21 +27,13 @@ DEPEND="${RDEPEND}
 	>=dev-lang/yasm-0.6.2
 	>=dev-util/kbuild-0.1.9998_pre20131130
 	sys-power/iasl
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/resourceproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	x11-libs/libXdmcp
 	x11-libs/libXau
 	x11-libs/libX11
 	x11-libs/libXfixes
 	x11-libs/libXext
-	dri? (  x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.4.5 )"
+	dri? ( >=x11-libs/libdrm-2.4.5 )"
 PDEPEND="dri? ( ~app-emulation/virtualbox-guest-additions-${PV} )"
 
 BUILD_TARGETS="all"
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild
index 932d9378fad9..8bf3e1f2873b 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild
@@ -27,21 +27,13 @@ DEPEND="${RDEPEND}
 	>=dev-lang/yasm-0.6.2
 	>=dev-util/kbuild-0.1.9998_pre20131130
 	sys-power/iasl
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/resourceproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	x11-libs/libXdmcp
 	x11-libs/libXau
 	x11-libs/libX11
 	x11-libs/libXfixes
 	x11-libs/libXext
-	dri? (  x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.4.5 )"
+	dri? ( >=x11-libs/libdrm-2.4.5 )"
 PDEPEND="dri? ( ~app-emulation/virtualbox-guest-additions-${PV} )"
 
 BUILD_TARGETS="all"
diff --git a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild b/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild
index a794386a4fb9..c2a9397a9007 100644
--- a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild
+++ b/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.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
@@ -10,7 +10,7 @@ IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
 DEPEND="${RDEPEND}
-	x11-proto/xf86dgaproto"
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-no-PCITAG.patch