gentoo resync : 22.05.2018

47 files changed, 76 insertions, 214 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 12426d137b59..ce4027f899ce 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index 22cdafa957d5..52ab361462df 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-evdev-2.10.5.tar.bz2 405956 BLAKE2B 4ea36a84eb227e79b43bede0a4c9d146a892db3db54a287da7f0be2c0d90f8748250c8b51ff424a8a5d7b34eee8301362ee51bf55ea4be9243b86f8e001255b0 SHA512 4362c1d12e91f25789722b1cc1b624530fd67f0d061d4c4e204af9f5024df0c9e20b73c87be15051f581a2a178f07f380215b172aba4c67db8805b4eeb82819a
-EBUILD xf86-input-evdev-2.10.5.ebuild 550 BLAKE2B 0ca4c5461b7d6be3781b5c292088d60cf5a132a0759b84c9927ef50d9f4ebdd654f88a2a68ca92462e45797955743373c1159457bbc71b19fd7484fd28af021f SHA512 2bcf44e140c5b155dc559b7ffe8f02ae6a5753d5f9dac5a3b8bd21ba5a4833cd662170b56d42160caf0df3d6b7dc750c0ee7933af2dced2a54d10aeb3fe674e7
+EBUILD xf86-input-evdev-2.10.5.ebuild 538 BLAKE2B 10d797c9316ec4e982e6d56888780aaa712d99bcee8cdfb3a47812549c43c5f0841cc81805b292e4800f086b49a4968d5f672d8732441022a76d0b0a9eda6bce SHA512 170d5cd2934ec82cfe92c1f2a6efbc7e840ae6d6ef0f61256ebf453df69e76c116397f744099ead91dd517bee2937f58cf193084f07061e002e9a1ddc12780c3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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/Manifest b/x11-drivers/xf86-input-joystick/Manifest
index 6c6ebdb37f41..bce9a67982c0 100644
--- a/x11-drivers/xf86-input-joystick/Manifest
+++ b/x11-drivers/xf86-input-joystick/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-joystick-1.6.3.tar.bz2 351846 BLAKE2B 3cbba17066cce241d6ed1a04ae26d4a875b994b47eb2d1078704d9dd109c9477ca367aebfec15b3358a7c857b91a8e751a83c2c4bab28f26b7aa6c02119463d8 SHA512 541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5
-EBUILD xf86-input-joystick-1.6.3.ebuild 494 BLAKE2B d126d59a960de9c9c81ae218286b9b1028c7d9a749984f920c59263971ed422a4116e51b7b0e20f0441ed999bc09cf24d092e0af0bfdc2bc0671566e3fafd63b SHA512 4d23e98fa8f6cf1454733de4b2f9704a2969b50ec1b2fbe98e386cda48ce0f94b6e9600c0f828da419f8b863d7c2ac455f1b49568a9075798bc1871a14ca6cf7
+EBUILD xf86-input-joystick-1.6.3.ebuild 474 BLAKE2B c10194bd17385a5ef8fb2823aef64f0d7b0a89d7f6564356efcda19a361c56e36839c6e3816766ce0a331259a505b89cbce51524cb1a3941935a201e33939a4b SHA512 e0c181d5ef1883f27597744995e8575203aa1b2b6bdf370cd2751b6883bac1b824289e17dde5966c03feffd7d8f7f63a34ece40841a89b3f04f52fb2ff80772a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index fe677c8ce392..4f558f3f6454 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,11 +1,3 @@
-DIST xf86-input-libinput-0.24.0.tar.bz2 367266 BLAKE2B 2591a30c9da371a8294c34cb9c04ab97e0f4eb2be3c3fa6a592838ea369efa9b5bea39a784db8389c19f4b9602f163ed81af43c03019b8f9adaf901d64a6b4a6 SHA512 f885cbf1554feb306023c3a355b06d90c7686eb1a01d9a87835cb9677200acb3a031fc690a475938e360db62865cde9f7dbe26fbbe3ee8fac43375bdf351c8f4
-DIST xf86-input-libinput-0.25.1.tar.bz2 370072 BLAKE2B f40d96530f017e13c0229272c9cb61aa948c56130dd502ff57ce1c696c325402ead260c9398e6af9ef54b16094b503f5693b8427d4c1f5b34b4fe8a4ee6489cb SHA512 9a8d16bdffb73a5318d22e352826c410ccb6f8c7ade31c23823bd6c17202bb67e917dfe8d4cab6e54fdf15f201d14d80b6306cedc5f93f66989edfcab5082ece
-DIST xf86-input-libinput-0.26.0.tar.bz2 371165 BLAKE2B e6b237ec2a46aba3fb90f1531c9cb67a057619737f9be4dcd7757be61f235e3fb467bd166030bbaaf17a298f9dbde94fb50b12675b53bcb1d808a2df5462ea06 SHA512 b52a27e916f7e86576500ef2bc3ce640676f5a710543755865a723628c0e01a575989460853bac184ed696961e3f8fca72ecba8ad4625be8cd9e31f9a55f5e97
-DIST xf86-input-libinput-0.27.0.tar.bz2 373039 BLAKE2B 5d80fcfa05c9a01f121b5dbbf4cc563e2069d5e314d7edc1b51b81f15d10121610bc268ab77b92bfe183f0ddf06b3d94fd3b33c3fc0b35375f9db936f366d12e SHA512 716a9b43438acd6b7c6a834a08ecec244fecdc31e77241998414bf1748781026cd6c6e85947155c44400e0192769a714dfbfa0ed42ba3677347cd89ac1081743
 DIST xf86-input-libinput-0.27.1.tar.bz2 373248 BLAKE2B 499c5c1b33f5159374775317777741db361620583f9d647ab5ee63193f5b82ecbbe5c124a447509c6b7de281cf6330f9747032d8bad8c2b1dbbcdd4517cf4f82 SHA512 01379f5d71bf39214c4dff428173512df57fd12e782f3fcde757be923aa0dbf4e010a0395a81bd8e4fb518edc7e05ca1ee64b1e313eb4df5d4990315580609a1
-EBUILD xf86-input-libinput-0.24.0.ebuild 406 BLAKE2B 2aba9771bbe39837f9d4ca5789631a6cbaf7ed75000127fd13245a32ad977a933be16ed231fa2e3712cae648ba80961da7750d6a61c55a6ef63a081a3197f439 SHA512 a53f2c2d2df3d88445136fee82c96f79fc4d305c9bdf30d4537433b569577ba07030afe6abbf3dd42ff05c9b3aa5ce4d5a7eb93d0cdbbfde2232b0945788423c
-EBUILD xf86-input-libinput-0.25.1.ebuild 413 BLAKE2B abf8411513ff40ef45520b947aea96eecc3b028d96ea013c49ce0c17cd8c4e5e735696e3adc75d135f437f54b05ca4220d70160e6a725331eec5f8c6126b9795 SHA512 c74ceef0823e74caf2c8f87138dd1b805d3aa3906905889fe02190d4337cdac19279f927bf740cde7f1c61e5034b3ac2c8a5b99a900418d968698178ea9d120e
-EBUILD xf86-input-libinput-0.26.0.ebuild 428 BLAKE2B 2d26bbe3563e3bdedca8860916ef609aa186184eb80207fef8620a1ef06938db4a3ded2e738235d78df9c32864edd96a49168271ad535cdce306122ab303e242 SHA512 345ccf9e5e27ae0554c4e3df5d08eb88129180c26e158d47820b0d56b2851b1bb298c6d3abc487d126e1971d0c818efbaa8d475956433cd8c97149e220fecbe8
-EBUILD xf86-input-libinput-0.27.0.ebuild 428 BLAKE2B 90d6648f963cec2afb858479f1babe964cbcaa2af67cd690ac900efa5567920117d994e6ab79443580b2c7248a65fbd0f047b6c80f4a8ab93b1336e5e1f93645 SHA512 2a28e938d72ddd7952bba8275f756022139d480c6c78ff24d7450b0451b723dac630c0f6c62a4efd0253c5ad95defe8399f9ee18ab43c0733fd6198134dfa5e4
-EBUILD xf86-input-libinput-0.27.1.ebuild 420 BLAKE2B 6777fc9a15da8703bf67e49c58fa6abd8e6d8281c4e1e106704800baf878382c5b4c952b314ce6f7524c181a1adf3413eb6916a23702e9782ebee82a83b86be8 SHA512 72738c1ed65b36fd310196d207104b20b1503ed4123074c88e609fd358d6f575b8ea740ace901755cc1536014a10728dcf11daafa15380dfdb2b4a5e085e5369
+EBUILD xf86-input-libinput-0.27.1.ebuild 419 BLAKE2B 4777effecc3f83505597c3813ce6d69d921e4d174107093a8072551d1f24908bbefadd246f33679c7eb3c0ad401c091c8aa5b224c375dde3bdcd6fb48182da8b SHA512 d2b05c81136612b9bfae8d881e64d81cda8222a3dda4e01533a7a890bb7c1aba2a0c52ebbeb02448ff10db5d90d56b3520d9a771c6ce1c3669e7156cc6f6335c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.24.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.24.0.ebuild
deleted file mode 100644
index f23943fb3895..000000000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.24.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info xorg-2
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libinput-1.5.0:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( "README.md" )
-
-pkg_pretend() {
-	CONFIG_CHECK="~TIMERFD"
-	check_extra_config
-}
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.25.1.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.25.1.ebuild
deleted file mode 100644
index 1cf69f19cc0a..000000000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.25.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info xorg-2
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libinput-1.5.0:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( "README.md" )
-
-pkg_pretend() {
-	CONFIG_CHECK="~TIMERFD"
-	check_extra_config
-}
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.26.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.26.0.ebuild
deleted file mode 100644
index 4fabb09754a6..000000000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.26.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info xorg-2
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libinput-1.5.0:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( "README.md" )
-
-pkg_pretend() {
-	CONFIG_CHECK="~TIMERFD"
-	check_extra_config
-}
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.0.ebuild
deleted file mode 100644
index 6e3c91ae6cbf..000000000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info xorg-2
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libinput-1.5.0:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( "README.md" )
-
-pkg_pretend() {
-	CONFIG_CHECK="~TIMERFD"
-	check_extra_config
-}
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.1.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.1.ebuild
index ad5f4d97fdeb..7be242bb5b44 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.1.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.1.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-2
 
 DESCRIPTION="X.org input driver based on libinput"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libinput-1.5.0:0="
diff --git a/x11-drivers/xf86-input-mtrack/Manifest b/x11-drivers/xf86-input-mtrack/Manifest
index a95e342a1fcf..c045afc19b4f 100644
--- a/x11-drivers/xf86-input-mtrack/Manifest
+++ b/x11-drivers/xf86-input-mtrack/Manifest
@@ -2,7 +2,7 @@ AUX xf86-input-mtrack-0.2.0-drop-mtrack-test.patch 370 BLAKE2B ae2e56bcb86898269
 DIST xf86-input-mtrack-0.3.0.tar.gz 35826 BLAKE2B f3c1c169ab1e12320214ee6f6ff319f2057333645c312a0ca12e99e7bdf94d99b3008291bc965fcbf5c37919993c97c7c46e4a88b118a2aefd0d619bfdfdf593 SHA512 68422f04ce0b73473cbb4dc7e920dedfce2c91ece1ee59e84dc7f7be5d8e77a2c9b2284dbaefcb0b08ee14868e204c5841fd05320129ec56b33e6ee352c04688
 DIST xf86-input-mtrack-0.3.1.tar.gz 370599 BLAKE2B de31a7b39f7c647d296deccdf0f3ff570bb9b45e89eeed8fa3a40278724d2229a952f51fddfcb39b3660654d04a74119eb34b0bdeb5644b2f3d7061e3cc428c3 SHA512 b8615970092138a7d3670a9783ac29bd57e8f86312af722e6439ef55ca5812a33bbf8460adda1931699084e8a56601c02f307d375e54723857a47f934718a448
 DIST xf86-input-mtrack-0.4.1.tar.gz 386733 BLAKE2B 6d7a49bd34894df6e88a900a86eb249a69a396d046776dd801b41a4ee505d07145f7ce66c2a83a21fa209cb78c6d709fb697145a30cf5cb5f78badd589844bd7 SHA512 2c517b27f4915978a01ed1d6d63f156b84c4eb1006a5e972183616a01c6d672fd7bc1c248ae22dcb09024be670afce1130c8fd8325b015811d58d020f244f010
-EBUILD xf86-input-mtrack-0.3.0.ebuild 1072 BLAKE2B 66f9772459dd8e43334ba82e62fe31838c98f2ef22475b2e4ad8d74ce3faa57cd85b8e88ff0057ae6bf4811ffb9304dc25f22b87932cdada676a5d7238a91444 SHA512 8261fbbbeab9785b5644d67772814a2c9dec3d31dea21d6b02a7b5ffb827b37d6d9f1cee5bf5a900c8e9ca33e6ad7d15d69c78d2b0c7454fbc403223f9686db6
-EBUILD xf86-input-mtrack-0.3.1.ebuild 1072 BLAKE2B 3613359e8107676de567f2679f4224cf98961367ad6cfda441a3325a800b6a2270d8417c2f2311d5b8ae032b5b579bac755bb72b9cf30aea0b74bb1d44b0e361 SHA512 fe7ff6feffd69461b0c0e3883e628a362adfb05b382d70f12e74527869077b5512705ab46fa3b502b222eddec278c6cad0f8097cba62ed302c31cac5d1c08e0b
-EBUILD xf86-input-mtrack-0.4.1.ebuild 923 BLAKE2B 0639c077da9dca796bb4e7c715b483aea2b348196a8068f1e82cfe1301fcc934cf49371b6e6e85ded78794c7b19ab012eec2740452433c67d9de5d21ab4b0775 SHA512 1da084e3e23f6a55249e760d30707d9d80b621712e8c2f8ffb4c87533d2ce684ea8e67a4beed935f57f0ee55cfa1ec8f6afb7c381762bb1f4e33a8bf1f3b2f0b
+EBUILD xf86-input-mtrack-0.3.0.ebuild 1024 BLAKE2B 6261db42943a13c9fc5405b63c989b4cad1f27cd0bad193cdc1e7404c3465d16ea55d824433bccc214177bbed21f06b97a6724487c3b7ae4e19b2490af7f0a66 SHA512 ab788192bea1ffec75609d4de991cbd3757008ff7b339c46eadf026b2dfc8ecc7432cb9273da138611c161f771bb38959321fdfb704eb8a95568446f527f62e9
+EBUILD xf86-input-mtrack-0.3.1.ebuild 1024 BLAKE2B 478e491530a5a29253e9c29644777f6981f53ab623b934ae5108f58132a8eef1a5164f8006880382f03ca56110db600246c161b44f2dad4c71b5a42b9482b13c SHA512 a4997d874b2688881787ce2197c1a94906967519b1eb09e2d8e1bea85fa3a7a8d946443c168ab68f77df4d347f66e52d8c9b2c280c66ab5b7badf7f744dd7378
+EBUILD xf86-input-mtrack-0.4.1.ebuild 875 BLAKE2B ec2bcde3aba6c698bb84932cd566d1b7c377973e5a54d13f74ee5780fcd6d840df30795c3f5f23ca0db20f6e72b8b32acb71949be8b54c0137a0021bb6f2b07f SHA512 fda127708e6bfd937e3edf1bf91fbede89fb7aa99923633f8922418a2aa699885dac433edfc2eba5662ef09d8f3a4f81a66b03536885dd838a521109ec103b2b
 MISC metadata.xml 419 BLAKE2B 35638a571f1318d04069535dc93b5575c22eb3178f13f7321e5e709143a04c5263f8986975967180d9685f34f25865104a5415a3888b5dfbf87b1397a31d846f SHA512 ea5d21be0cf5020e2a1b8d6d342e1ba6c95946a2a6a00df69ae43b4d022fefa452ccd2d1ae1be619a72f7e7fb8a0c124f2b2655a2779ee28451fe0e493a7e5be
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/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index ac99ff084dbf..31a06cb319dd 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-synaptics-1.9.0.tar.bz2 501814 BLAKE2B 7720136dba4e3cb76d21a9624e7e684bc09e22ebd0bc3b53fb170bbfebc29133dcfb471df326ac7b2eec1e4d3e2a3eeef56e57f649ddcc8f4d5e66eba9bd28e8 SHA512 71171ce59136b1c85764d412f9039d6252c94bb2ba44c8c6348aef6509d12219ea17a026440b0e18d26f4d7853d4ca5713eb2404d39deebb8be82886ad57bad4
-EBUILD xf86-input-synaptics-1.9.0.ebuild 937 BLAKE2B 3105adcdcf81a980d0f65be799dc7f2238cae95c6fa77071382e41079cb4d82dadb82305f933b6921bcc36c4624515cc7eee4d86d8ac3bcb5dfee00f2b9d7ef9 SHA512 69fdc83b3c2535288a73621e1566b89613b644f0b2dabea0ac532efb6e4ee3fc45f5b833a8ecaa76f77c533a8fcf1fb9e92af6f8883640541096b75509421657
+EBUILD xf86-input-synaptics-1.9.0.ebuild 895 BLAKE2B 08a1e1ade11ff6d0cfaf10210627fbec65d82980c27c6997d26749588beea21b20d29af017077b26d8c53123694b1e7d68710fca96d9fbbcc66fc1cca9866482 SHA512 859c4152cb4cee9707918aafd3ad9d0b3faad6bfbfcc5b64a32e637696c730988aaddbd5b6953885c4aa9c566346f3291bbb395ef8c15b9046c0af81ea002915
 MISC metadata.xml 567 BLAKE2B 9681ddc834f81beea16bac80ee70737882f3daa8bb0081df819fdb8ebd335d760a036bc4913d5f8fb38c8b014f397d13fc96edce46118f8424b972f1c5bb22ef SHA512 87c2ca0134811881a7e13385d1f435dca2af70c63e833e23647085327e790a2a6a66e0257cdf4f2a30a5c1c268efdcd3b00b2bf4be6d69a35cd25486d73170cc
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/Manifest b/x11-drivers/xf86-input-tslib/Manifest
index e8c54f43b967..bdf48f518d5f 100644
--- a/x11-drivers/xf86-input-tslib/Manifest
+++ b/x11-drivers/xf86-input-tslib/Manifest
@@ -2,6 +2,6 @@ AUX fix-overlapped-variable.patch 485 BLAKE2B e7fd7e023965a2a193f6fa4d1f428ca30d
 AUX xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch 782 BLAKE2B 71c706b4d4e01a9257b56e1c0d2245e78c2e1fcea34146312ad6d57b48d3e4196e14b36143677c69ae2fe7dd158b27a11337d594e222ac8cdd40b6c40f58e494 SHA512 264c921d12591795e8b04c22a7f3b85e63605b3bbc2aaab8418b61ac6ebeb3683bf4e357dddea6c73d416d233bc4d1249f3af17011cc542880772a885c7f4d28
 AUX xf86-input-tslib-port-ABI-12-r48.patch 5306 BLAKE2B e5421a0cf4f0fd645d61777eb7cadf444dd04989eede04b7766453940b65d3a319ec72f57838be14f106215b6aaf5aebd7af73b28dc02b2cad7fcb8e014eb4d0 SHA512 9cdd4c47e8efa3560dd0b508422322f0f4185f4359d98cd7d5c06394bdf096de23e42c5af9f682c457d44831091823867233ced8c6329d2776cf3b5b6bd1ba34
 DIST xf86-input-tslib_0.0.6-3.tar.gz 307751 BLAKE2B 05037c2ca9339245b0987ce7e0121f4825a840dab24e60ce901d290b13841a3843d6c93ef9910db92d47418d649189d78e18e26ec248c4ff9ad1131e54b81240 SHA512 abc6060ba595790dab02a191861ee128a729916a6ea2df2a818a0b3388839dac933a0d7ee5530735f376f917f33bf8db40d42a7dce90b20a7682344370bc7b48
-EBUILD xf86-input-tslib-0.0.6-r2.ebuild 728 BLAKE2B 455bdea7a2cabfb97e3d127b4ebd156be7ee0e4926dad0f914220e21c2b71f617fcf9834648de8500e733a2979b8f06b9dc1c08ce2b96d33883bcb035f78a457 SHA512 af9fe5ac418962a816a509f61f5f3b50c290f6ac5071b4dcffa864909f53030e2764e4009bcd61744a57f96ce545ef16ef74d53943efb12609634537002f547d
-EBUILD xf86-input-tslib-0.0.6-r3.ebuild 782 BLAKE2B 827d617046d02efcb286b3859e33bf99676c4fdb8f721a81473310777348c58f95fd58af8fd24862982a432aa06b07c428b6e9497fb4140fa12f81db12e7fec7 SHA512 b5babb9d9ed2617cc55f2cb52cacfd9ac6c928fc786b26554d0b01f465e16e3dcc61e2cbc5d7938f57762506500108fc3d0c83bbe0d55a81307beb778c81f4ed
+EBUILD xf86-input-tslib-0.0.6-r2.ebuild 727 BLAKE2B cdb2e464846235c6e37088c6771740a6e92d410d41c690587f5d03ab03dfcbde6c4aa279f053164c1a7e6734028409b69cffefca57aead2869dc4cc4897c7e67 SHA512 e04f9672b3bada3400e70aaa225075a20858eb96ad7b511348d75e60ba3ecf6c4354e9beca124cf0655e84fbff4a1d1072ae612e6beb0114b9eac3339a8eda6f
+EBUILD xf86-input-tslib-0.0.6-r3.ebuild 781 BLAKE2B 3b4040ab660975e9135dbd8768e2832f297571fe85cc6f2cba83c8abc89e9323780d6de62a9ba989a0db8c8e34fa8b26b3dfb3a8cdabab33f1448c7e96e251f1 SHA512 c7b8f2629e3d4517c5903ff5ca758dff7ab780b3400c94a61a309706d3cb1c465804919cc59fa5c3942b5dc66dae11b5cd8c545935dd468beb9f31e0d28dce25
 MISC metadata.xml 338 BLAKE2B 3f7f7614c07d92a52a1499634820de2891cf891fd2c86230b69a99b83afae1af395ed8eaabd32b4b17b19b3ffcfd717ea6e7963beb18dfca0ae3db77269eeb87 SHA512 cf7eafaffce2e1064714ac53d374fcb81a4a77cf7a3b9826c595b0b40a01a54b0280ecf4c824b8741b09893d770e80495084ede42281242959f283b5c0d51d2c
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/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest
index c8fc0c33f5ff..e82ca42c82f6 100644
--- a/x11-drivers/xf86-input-vmmouse/Manifest
+++ b/x11-drivers/xf86-input-vmmouse/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-input-vmmouse-13.1.0.tar.bz2 319188 BLAKE2B dddcee47a0d667555ba8a85a4a86c9f922a68ff716f836ac38bb0dbc643011debfbbd2d2054bb8df2f04cc94f2da95cfff7b0ccfb30879e07ca571a9b3aa840a SHA512 38e09c5d7da971eb25ed79fc2daac3b8e1f5e6ec1096424696652c975ea653ed4a49d7779e7735d81a512c12c0a30829d5443ca78a275f3181ebd1740dd2dfd4
-EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 540 BLAKE2B 97ba747a1e0b13c9d7ad594dfa0eb82acbdda3a1bcd087fb38ae62de9f58de2f2dee870045bea25f988079db087087ae530a3a6b3b0fd4dd24ac90c814deaa51 SHA512 154733fdac052c6c623204ab0eb1ab9d7ff651b228f3d3e9913979ee2a696bb803f6dfaf37f3d25ab3375d340ea770531b6e14cfd0ba18e8da2df6da50f228dd
-EBUILD xf86-input-vmmouse-9999.ebuild 509 BLAKE2B 1f9a5a2521f79c4f6bb4175c46884864cf5e7dc27862c0544dc222977f90b44997314d1fea5fc140b00f68dcf92c8c338dc09e2998661d68bc55b562799f78e2 SHA512 6d3cd1afe0b26f48cba8060e1d1f02fb83c6089667c3a18948aa0722b1271abae8e9fab1d441e64f09a7bbd80607710dcbae2f294c2271cee9c9185e916fa252
+EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 539 BLAKE2B 8367fd8e68a3f2d7d960400affe54cd130c3115da9884522dfcf76dcf9f1e0c543938b6a848ba55dfb8c725148c002f224f240600ebc6c82ee085069272e90c2 SHA512 1623286c3f63ddf7879949af7b8cb7da8110d6ff05fa67cd56138cf5db92988fd66ca7a7f584fdc3ff71a4c53f835f16e8fe50efc694db164527ec47ba007973
+EBUILD xf86-input-vmmouse-9999.ebuild 508 BLAKE2B 9c9cea76552985d31d1467e3e38b2341b18829d34c9103800ba7653bab53de176fe1fc16535a282c7546507c01496cfb66ffd7cedd1079a4a1039b5d293075d8 SHA512 4f89a2e60ec6c0862caaa0912889d07103cc45e8a291650722d87df256b014818ead6e1954292cc96974425362fc3c755fd711e44b785c42cbf3324df73cb0f4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 9e1e043c5f84..3056d61641d2 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -2,7 +2,7 @@ AUX xf86-input-wacom-0.34.0-xorg-server-1.19-support.patch 1394 BLAKE2B 1ff519a3
 DIST xf86-input-wacom-0.34.0.tar.bz2 598624 BLAKE2B 9b8b39f859a007c89ff1eb24711a2cc6a90b3106b8a3ceb2bc3c7064c14c5079e8ab08e248309ab08716da5c2e593046dd78b3d989167762c794af95b85ae95f SHA512 d0aae70853f73d989d168e054bb21ddbd2114ec6c012b1c5f949838bb20a7fe75711211886dd649ec0e9449d199da17b4ff156d5d672ad02c8b2e0b667cc40ad
 DIST xf86-input-wacom-0.35.0.tar.bz2 601314 BLAKE2B 59c2b03b79d141b71583ce3ea6ac4957e345322b67e78f24333a3f045316aa878dbcca6a575f7daf490e2991494215d83bf28bb9ec6b8a8c133abc57d559dc44 SHA512 9586348e8da91651bc9a9ee9e74dd77f4311060538dcb228681b98300f7624401878190322dcbc4e798bd1eeeb7d2900abc3f5e949a583b6cda44821b8821058
 DIST xf86-input-wacom-0.36.0.tar.bz2 611678 BLAKE2B b3fc8310514e6e07c3c25fceeb982d66e9e10730028af769cd331578a48720666a0872b625beb15c7f68bbb291293dfe4c4e305411310c67bb2bd148e7d570d8 SHA512 48e4cf945eb0f5c7c65d46153756372bbfd6d1f101cd90f609c71cc21b36fa671d98c7be0b52d519775c7e7b875ec441d4308cf70d7897198600553e7a93ccc5
-EBUILD xf86-input-wacom-0.34.0.ebuild 1853 BLAKE2B 24521e6d2a748e86fb9daea196503400ed304e93f48dddadeb0fb6e11c4949f9d4109dc1f71eb07689175eec072f74c47033d9c2c7ec2e82faca43b89fd78157 SHA512 9db981d3e9e668da33b8855b22cfd34f6d1164a637bc9eb5711eb11c7eb6addab445547ef430452938326d2284c208d711cf710f35a135fd7b16b1b244457dcf
-EBUILD xf86-input-wacom-0.35.0.ebuild 1797 BLAKE2B d09a182f7df650ce2c18d6df8469bcafcbc985be4267d69fce6946e65f616431f4da5604ee87ef6e563d82ba3d91132c53774e8e46d737c5b2bd9c1131435f70 SHA512 ec778effb110216056c0b88ce836827ddaacca255de551ad719f2724c7c034b929a794decb5107b0ce989472a6c0ec4b63f7fe600356230b5ce6204a92e7b1ca
-EBUILD xf86-input-wacom-0.36.0.ebuild 1789 BLAKE2B 1d7e205ff2e493a7b9fc4fdb9869324ffe0760b4749a05d4cb989d181a4747defb63c005fc527328452f3a28b2ea461c02bd995ca12c899c9e876ee1e3522780 SHA512 9a298f6139ad635b29786810eabec2bfe13c8a8196704fbb6d8eef614e3d76ed5da54b8ff2dabea2b1589cbcc499eb26c3ad2f471de5fa641957126f72c4a1a3
+EBUILD xf86-input-wacom-0.34.0.ebuild 1852 BLAKE2B 3556b5b14f5775211639e77d9dedd7aea4243b98e82fe1913a2e50346132a18f562ccf5909d99501ed2933c5a1cb42005ed6b5e94b3123ba9340da9c4213c92a SHA512 e190da2d8eedb07fd74b6cbde5e56709be235aff114c0ca2f90de00221ad72dd2785d2b1eab3e321b688735fbf160c47d3719f5f5d690bd52c580f845363e0d7
+EBUILD xf86-input-wacom-0.35.0.ebuild 1796 BLAKE2B 31162072ec86bc739f196393d7d97d5fd07e45cc7f9fba20b8be587c383e76a4683c66b93eeb717422c49ea94b4677248958510c61ff97fc5c725d5be8bb295a SHA512 e361c2f8e2c102e19f24e638ff4aca3eb2a831b5244b098d59ce12ef722058114875ec5351f3b18a19311e090cf2bef38a0bd559ea808a53a9ce56e2125f31cb
+EBUILD xf86-input-wacom-0.36.0.ebuild 1788 BLAKE2B aacfafed4bfb275c658862bb7c47ddd3068a7ed9076d9b0e5267547a8df5c4f70fd7b434dc723cd193eda835972334bddafd9664904dbdfe4b47f343a808843f SHA512 11856ffc1d0b8336002ce9802115f62586f4675383bc7616cded1152d131feea42c74460ec3419aeeafa37efb4f807cf9d70e90401c74af1f7f13ccce64f08c6
 MISC metadata.xml 436 BLAKE2B 255853d810de0bc1d6fdefd359d613163d1277f2eb423e81fe29c3a699f4cee22731b52286d68c64aa3a1b579b3f723a5b86a8d45d18962d234f4f0cb316c7f5 SHA512 2aa103f44b3d36ff6466ac1fb010b25c649f1cc19d2db1d5c9b1ad54d954184eb7c55496feb58174bd466a9296f6c3eb269819b9036486a071a8100b1a3a6cb2
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/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index d75d5aae28c3..d92bf8d6fb53 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,7 +1,7 @@
 DIST xf86-video-dummy-0.3.6.tar.bz2 285892 BLAKE2B 79fc1915cad3055715529da2254be87cf1b490e757ad6521121ca3957f4d97e1db50e4bebafd0b203ff40af49f096f6f2da1e982f5550eea0ad13f192f1f3fe3 SHA512 3a530083d591ebde37b58a329d9a6ed4955d09d8f3f7fb566840681f2588aa752014c8753f411aec0410a2704b3b55729868a27aee138df42eb7d7bb5a5a52c5
 DIST xf86-video-dummy-0.3.7.tar.bz2 279806 BLAKE2B 0f1f05ac5f9d75a3fd141e98712bd15b3dedf3bb5f3f031254e6864d8fcc1d3dafc4c3165b3f1d5dada3adb03586f4de620bc2b8b91dab4b840cfcd50b6bc6fc SHA512 2893964f19901af0b18417a271a3418c5adfaa311cd1688c159b86a7bdf68517d53d98a9b2c1a9942c7d2cde8ccb742832fd78c2ab0aa29844d261b9334548ec
 DIST xf86-video-dummy-0.3.8.tar.bz2 302353 BLAKE2B 1327db3aeec2ff7e3ff0876b25eace6fcdc7fc428967dee9f0b8ee4c22dd7904dcb47d5433bdc14ab56638225b2d33f3a26543dc9e6041c60af4135c1555f798 SHA512 f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80
-EBUILD xf86-video-dummy-0.3.6.ebuild 495 BLAKE2B 475187ec9408008a814501de4f3222990dbca8a061207b43f16fb0d689ae7e0bd533b3b66ff793d84c29b7bc22ae31e7c40068460ada92c73f7de5f0b5913e1d SHA512 968adb360523b5be139f22f6afd09d86f7eb3fbe75f23315aa965130ba3498956c400001c2d2402a621a7105afbdbcd5434c35aa5bed85bf2b12c8d1e7ab30f6
-EBUILD xf86-video-dummy-0.3.7.ebuild 504 BLAKE2B 1ee2448f3f538971a73efec9636d77cae0affae7cdb3fd94c9c03062fc0718db184159f6e57c7004b662ff099dfbeec74f942dbe983a91856f11daef00225e54 SHA512 9f2ae04b62fc2bcf9122ac2fbf232fd15838cf888d2af2ffb2477293488d509d294cb147d675b1ba28bcee2f6854a38af83f135f5e07a73182fd50eb0c4198fa
-EBUILD xf86-video-dummy-0.3.8.ebuild 504 BLAKE2B 27e003fb08dbd4f8f267849818e5392bcb750468cac4d7100a8411b29f74bf8851d946b3dd485efcf6779c6de3d1185c7d6b357006f66d0384eefdf590379139 SHA512 b33d4bd50c38bee595dfc6eaa9fbb175de017b843149608380f8abeccfcbf748095bb7045f76d0428b53ca1535fcd8680742152a388ae6d4ed3d10d76383635f
+EBUILD xf86-video-dummy-0.3.6.ebuild 489 BLAKE2B 511326e8f1741bd4bb43b4c67fbcc822e1bedf07e1a78d2e01b151c42d4d76d94ee489671ef11243a7d1e64c7b1fdd53b1b1ca6767fcb1d296fb5fe421254278 SHA512 77fd5a7b7132666e21292e8098a9f54c666c338761b069581a889f699d309262badc4871376aeb67c7ae983a7344b33ae53890090301fe54306a40ed90dc04c0
+EBUILD xf86-video-dummy-0.3.7.ebuild 498 BLAKE2B 3cacc8ab7a4cbf507ea30947b4f44a37ca87bbbadcfcd3d8170c7c4918178fef3e175ec5917e58efe66e80b55462db823728db4516c1deaf6e574004020e0ad1 SHA512 9f6ce83887d3cf6946fb613e2130cd7bc8bd56ffe3f26ec3b8468bec36f112d3deb7028903b9ceb03355b207a21a45b41da652520d3cf1af57dc8df1f2416912
+EBUILD xf86-video-dummy-0.3.8.ebuild 498 BLAKE2B 3cacc8ab7a4cbf507ea30947b4f44a37ca87bbbadcfcd3d8170c7c4918178fef3e175ec5917e58efe66e80b55462db823728db4516c1deaf6e574004020e0ad1 SHA512 9f6ce83887d3cf6946fb613e2130cd7bc8bd56ffe3f26ec3b8468bec36f112d3deb7028903b9ceb03355b207a21a45b41da652520d3cf1af57dc8df1f2416912
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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/Manifest b/x11-drivers/xf86-video-fbdev/Manifest
index 6331649a4200..f2425032e8dc 100644
--- a/x11-drivers/xf86-video-fbdev/Manifest
+++ b/x11-drivers/xf86-video-fbdev/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-fbdev-0.4.4.tar.bz2 293545 BLAKE2B 36dd322a079a6f6f80357b5e4f24ef9e83aa66cfa4dc0fbb9df3f2fc918226c32ccdc299bcfd0a565b542372e9aaf610c8bf8a69895d7d5048ca82c7e2313d3d SHA512 942ccf7e528b7cf0af19ef0efc9f5c60ab558bd865aad330f1c58a9ef063f9b38b4e62e5622270c0bfc237cb3cbc579d43b854aaa64fa2a9130eede73b1e55e9
-EBUILD xf86-video-fbdev-0.4.4.ebuild 445 BLAKE2B 9327e0282a630f29ff04216fe3e05ac9d477c8d2766cba1756d5713a6b825cc3912840f8cd76a66fe842d3de82ea4d1dabf057100bf287ce344ec3c6edbcd3c7 SHA512 80cbeec56f046ba4d50c66e7e2f11a64ea2ff465fa4260a5a5ae40910744ca26aa1430fe7044e2bd89567d098e9feeef889b3ef5a0bfac4f6616f529c9471179
+EBUILD xf86-video-fbdev-0.4.4.ebuild 359 BLAKE2B e62bbc0e75cf6f9d63785b0de8f8d1fe06605ceb28838095a371557fe734ea7e3a56cd9dd3d233e528f8447aa9dbb2164f07570bba3d52f141d8296e624a5626 SHA512 a0f879b991c8ba2ea65af475bc508dcdc4f08e8080f150a73ab88a54a7492860f2c0f0dd0482d339b49ccb92be9e7f2d7191c96da8e4dd4e9f1edd8fdb025581
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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/Manifest b/x11-drivers/xf86-video-glint/Manifest
index d2936df76430..5c7e4ffd612e 100644
--- a/x11-drivers/xf86-video-glint/Manifest
+++ b/x11-drivers/xf86-video-glint/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-glint-1.2.9.tar.bz2 419524 BLAKE2B 3ec8b4f3187832e1f2a624e578b07c2e9e6ac6a7c48cac4a67ee59f6c479995977e7f6cf903650c52c5e49c0ea321ddec78d0be4969c27584b8e9655b6a08ec4 SHA512 29b573abc2c77992562ab72ea99dfac5fa4baee99404747c53494680fe750b9c096833cd6c8013aa85f7fb5db5bdbee2a9b26dff633a6a4fe2dc8cd9f0adff12
-EBUILD xf86-video-glint-1.2.9.ebuild 393 BLAKE2B c890a1a135f2d9f28521570405305cc858339987ceb10698be6b824d69cb573496a8749375e678b954cdb49abf7c9d972e1d4cd635f77dde5854e5ed9151650c SHA512 a9db37d86b0d02ad443c74797cb10d9770bd6e9d10e622745f6a4ec7b543610fb9b00484759cbf60c0c0a9b1ec170c768563353015cf6c5ccac2120aeeda7e67
+EBUILD xf86-video-glint-1.2.9.ebuild 329 BLAKE2B e22a87c1d96ac71f73597a54bd616564ebd2b7461b71bce26a709692ea00b5ba2dc1a94aee040c3ff195e2e5e0d337dd7b0457d616723137bc66d70c83192784 SHA512 90555b1e2d357fa7c54e955ba75677a8fc8014200d6b2e5c2fd2e3e2c80576ae57ab9963c465166603aa5416560839af29bc57ad338209601bfcd48f142eb5cd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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/Manifest b/x11-drivers/xf86-video-intel/Manifest
index cd900df86fea..f9548204e446 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-video-intel-2.99.917_p20180214.tar.xz 951544 BLAKE2B 57df523168c6bf650ddf6ca27bbc799a8a9d183c9a6a4d2e232288124b57bfff7bb36a8fcc55e2845c4ece2653d39c0830c4ea2ecef4f1968a3ee7413506bae3 SHA512 afc8a4db550aa5567fa6f5eb9b480fac7c3e496eb62ae62a6a7b7e317515e24d21bf78bf1b03ba90cfd909dd37a5f65247c7aa2314234aec3d575e53db825912
-EBUILD xf86-video-intel-2.99.917_p20180214.ebuild 2097 BLAKE2B af5ca3d7638eed1c49ba62269c2fed9e36de864a09cbc0d1bc14d3dbc79067e4c686e2ee35722effb0b47f57569ee48c3eab95fb01a576e6d163825d8cb8c074 SHA512 cfcab330783525dc255bc9059e87c62859cbc6a0061c65cfdd4ad326ddea88166c026f90f3acc80ff70a0601286dead74fab56dbbe85b0cb507352c1f98c80e8
-EBUILD xf86-video-intel-9999.ebuild 2059 BLAKE2B 860127fd5b3c20a1dfb2d2d48455f743b0756d8d899e8e6fe0afbc221f1f2c102a5cd32fa88021872a940e9966a66aacc6dc6dcac90336c44830d33e92071782 SHA512 cd8ff7b98351f062439a08a227d1ea5d849aa53535537087e4f47bc6903f9116a69aa2ebc8d7e280140e107a9880d4b7fee35a9828ef28dc1f97a90f538c269f
+EBUILD xf86-video-intel-2.99.917_p20180214.ebuild 2021 BLAKE2B 1f854b8fe78e46047378f048c3263a88af93756db3b97a7a22d551a86eec46379680f3c0b28d1df9369c9a4b75c4df743d7fcac362dfedc66b0fa6dcc26fbd2c SHA512 c5b73f5d2775033e234626e47003aea3930071f9be9ab426ca93623e6968d61943e4122cc2755b2f6080358049622ddb9bc61bd44ace5d98991d72b41074bc88
+EBUILD xf86-video-intel-9999.ebuild 1983 BLAKE2B 6eab7e47bf5e8fd706acc602e0af16d10eb0ed59ec5093a5ff761cad2220809df1ae0ad3f9cad435cc85ced2043a2e72c9e0e810df67f043377c8c06ebb48232 SHA512 ebba3fc33850276f7fedd3d33c238ef65f723290d6bb1f44c58aab66b99bd258b923e6913dc5e75530eb4e3538af4cfe7ea40d8950824c271c2efa8606becb0e
 MISC metadata.xml 716 BLAKE2B 9c0d0d8f69b50931cdc0cbb9de69722531918bec055e0bf460dd00dd1fc551054233a99f479856036b2ce129adda1dc4468879eb2903a97e8b1a682004e9265c SHA512 11c95d0fd78c1c38b8398fbeb1b8fd2c6e3e02b0aca2e771cabf6a935e3ef40ec344f0a906268e39094496782ba530a6004c5d7527e6ecce009ef384302c258d
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/Manifest b/x11-drivers/xf86-video-qxl/Manifest
index 23a104c10b51..3cb3a0ed691e 100644
--- a/x11-drivers/xf86-video-qxl/Manifest
+++ b/x11-drivers/xf86-video-qxl/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-qxl-0.1.5.tar.bz2 508266 BLAKE2B ca0fd43830a393d9bb1f5a6ba306f26e07a0b90233fa44f3fbe7a5f21026f1bd6960254db9cd75d947b3c42f6cc8cd3b7cfd71afc2c0a74bd84c60eafcf7e150 SHA512 7510b2d037b3e978df6063b29e2406f3d1270695a239f29fdaec9b1dc65a30ab10cb959f15eb336f78e93aa708d41c64c5ea43803958feffc64542229605b782
-EBUILD xf86-video-qxl-0.1.5.ebuild 675 BLAKE2B c1e380724cd0bf4833c83e8f84ac11a28c15c65d7378cb9d12a87bce2e179fef48196dab472ba71fbc2e33e504cd86b62cdc2f0e8535b5c1f5ed418a17121ebb SHA512 7a85eadb922bd566fc6bdd769b067730df8e1fd9e3fc7443509644e5d29730aeba4ce7da72e4880da7556c80bdadbde9fb993122422dfc1d5df3befbb3d6f2b2
+EBUILD xf86-video-qxl-0.1.5.ebuild 672 BLAKE2B 18217e21b5d350c81d89c8477edbaa6f3bc46b0d6342d7bc3c778b3c55c9bde25c481f3ee6d23a349633711a6283d3054cccf07ff93773da7ea183b466b8b368 SHA512 d3a65e31803c304102712c610d1d32d1ad67ebae8cefea27372b0b24639cb6c8484eba3f3e82398e827c28b2aa53af0184189fa46fe3c19b2380da057c0e4adf
 MISC metadata.xml 292 BLAKE2B def2312773a7e6872be5d2de2184f3bbdd74caaa32bd0a8c1a85955f11e4a56a7a045431fb582eb121c5fbd5aa3f9d59a137af4973870c08c012abd7d45cdf72 SHA512 d09afd5c8c1c5180f73d6b482e84904cd015f8c302a076e059caa504cfd0029049e75a9f70aff5d4cbf1c36cfd8afdd1c4751ad78bd9e21d6aee6c8e574f8078
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/Manifest b/x11-drivers/xf86-video-vboxvideo/Manifest
index 40b23d5b7c44..9a0fe29b6093 100644
--- a/x11-drivers/xf86-video-vboxvideo/Manifest
+++ b/x11-drivers/xf86-video-vboxvideo/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-vboxvideo-1.0.0.tar.bz2 353342 BLAKE2B 8088e150c8e91dd4872218773c2d57a052935926fe08c18d9f5165b112d6213bf79c80d85fd4d10c1b12bd2ac222983b3dbf241cb97c1cb087f4137314a95ead SHA512 1a9856a966495a3a291592ee3113ed5ee83e3ef530bf37d91605206a62f641726511ad48ca79b8a3e94f601f8cf15341255b0c7d14f5c8acf985b84f965d8dfc
-EBUILD xf86-video-vboxvideo-1.0.0.ebuild 488 BLAKE2B 0d8c6193f5239a65bcdfd141bf644d65f7ccfc4ce2179f8b8706f941ef4a2df5f20fa6c05d27f5534b0b846b2a31859df493975edea4f76d3db6766c860cbce3 SHA512 2c76b73bfc1830343e352c03c24745c078ff3a168eb4384e7a6e0679d9831be4f884fb00523f98dff137bc7bde4e191bc9ff5ef7d4ccb0cccc3ea31786b96189
+EBUILD xf86-video-vboxvideo-1.0.0.ebuild 421 BLAKE2B 885db3ba769927971fd9535fa859f05dad3bf8d4affd3a056e79000f0eb7615349eb0b66afffb6c1db7a242e323ec81560d5e461d797a8665e99ca00b4f047a2 SHA512 567164cf3cf1dfd855a439fa2843e421964e684c5cdf7c84222abd93c8a389affa526d197c5f00a14fef5664c8f1aa47770e344c0e12096578ada468dfd6c590
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
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/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 382f9b195c3d..c3a4d6b69a8d 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -5,6 +5,6 @@ AUX xf86-video-virtualbox-5.1.10-xorg119.patch 3375 BLAKE2B 52b6999cffb8b60ceac7
 AUX xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch 533 BLAKE2B 3ef40088fb83096c17944609d4fb7c14b7e7bb39ef0bf08d3bcda2795d4ead8801f06e7761804191ca4eec537bc22f45dcd6085407b1e6ef3ed4227a1fd594b0 SHA512 325a7adca76884e40be17d756ebdee3c8e8565d50a872c7cb2e429d046fd91b44acc6b788abb0eb28ab14594687203894ffe0c2d441c38ea5f87a88e76e87997
 DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1
 DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8
-EBUILD xf86-video-virtualbox-5.1.36.ebuild 5048 BLAKE2B e6214b4d223bd87556921fe320b1603de3cd80256254f9db6e8a60a3773b0212b68e5a5a25fe655fadc32e42b906a0f830e12c64c6a43978bee06e14a7b965f6 SHA512 4ed0f341ca74f86b7a41714d3ffeb7e6871a8362f83fe0a5fa6cb27c827fe88a2fa416d74a155fd05f92e10b79d9f8a0cbd7476e0fcaf7cb87a7b5de3d1813e3
-EBUILD xf86-video-virtualbox-5.1.38.ebuild 5050 BLAKE2B 6c3eb6c9b9004e66b338241fc7155e49765353a9989463e08d5fcbc44a9ea5e8b56f29d52e65681cb0421382d198bdb0eda0cab72350dfc390c49eb18135e29f SHA512 5744ff815d05aa550092d7f877f60a3de571bde0ca4d17433a92b2925d524166768542dc126c60116a7726d0fd69f9d10e57d56f42e57f63ef431af2a6cc7406
+EBUILD xf86-video-virtualbox-5.1.36.ebuild 4861 BLAKE2B 05cd603650893c24947c2dff997795ed3e21cad2e1807f90da9ac6a07a909036e91b1f2b9ca35aeeeac1a204ae01777ceb6cb9b070882e742418ccd886f4a1ef SHA512 a6c1d53eaecaae808be63ec339b9a1a9e544cd8292a987e8ecd90dae6eba9382251c4545bb94bd8c4e3af419b7df5da5f775015f8396366245756b6d7f8b16cd
+EBUILD xf86-video-virtualbox-5.1.38.ebuild 4863 BLAKE2B c4c6a46322d0ea152c28344923cec7cac42b858b1265aacad129b2586b4c5997f0662bd2e18e4c5685b983de9a344a55bb31ae2046ab5a014183e652e2471856 SHA512 4ef1aa96f10b26e9e6ae14d8938303defa3bc25eb29aa8da18a501586161c71610e9a4d3a70ee03c4a96fcae187930bc0566077bbb5a462549ee663bc727527e
 MISC metadata.xml 343 BLAKE2B 9e18764cb3f6a1df7858366112557de847f14dd2d7415612da0ebe28895a92a7714d0295f3551ddc62711bf84d5be253ddda3146f6121d52c4f86c05a20ad835 SHA512 88eabdec952f2eee2490f23050b39127f500765f6f93adecb9cfdb62776d73e9dddcdb56756b41041ed4727375ffb0e5f729c219a7de5620344bbee10bbc06c9
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/Manifest b/x11-drivers/xf86-video-voodoo/Manifest
index af62e72a65dc..5f4a9df5bf7b 100644
--- a/x11-drivers/xf86-video-voodoo/Manifest
+++ b/x11-drivers/xf86-video-voodoo/Manifest
@@ -1,4 +1,4 @@
 AUX xf86-video-voodoo-1.2.5-no-PCITAG.patch 647 BLAKE2B 385af1dfab9fc17d5a0010b467b62695fe9da1f22cdebfca364cda5d72bbb098fd35a9768acd97f65c50470357e87d8b9e78c5624d3e5cd59ce2a92a1fd218af SHA512 b63a5e7240ed0829843e2087fe40ed1658329f33ecdcdcf377005a44bba81d487a2a8875aebbead31a0b67f473869adea5b591b2bf1e644fa9818b6f9adf67bd
 DIST xf86-video-voodoo-1.2.5.tar.bz2 305489 BLAKE2B 8557ae35b70f8a7b257e5dc6d8be1efed6780bd237af3a6c404c1e34a3098688aede689fc722a4bc87f08e1d8d1fd7232fdc5776822489e14ac8f358e590e878 SHA512 371d606abf3d682aa1e42bfce89dabd70bcb0bba3709d63bf34ffb4a364e16422fcd56104ffc4f85cd9a8795f31b7884ff5edac5e7d3f609b4c948180e0e8e10
-EBUILD xf86-video-voodoo-1.2.5.ebuild 359 BLAKE2B e06b6490fe42621ea013577914bf9b0101058e5dada4ef1ca02eb31e08485657409aec9fcc2585417338a2e8067823943c4c34d888dbc0b985a0a82451b51789 SHA512 45ca9d15d19d204864c16595e5a8e4fe784a47b8b6a97f39eaf6fdc6bee79b8b5e6aa739b971665ac69b4f15736900983960510e33fb941ea005d713ecc47cd8
+EBUILD xf86-video-voodoo-1.2.5.ebuild 356 BLAKE2B 5d1d8729a2e6d2cf81444916a9f609245b9d027e3861049d391595a3c09f9c5680e8bd80bb19aadb7fc542eab5abff4e3365582578157de044762b67b238664d SHA512 5107c42e3f1a777ab962bd2a49093acc1193b349c83962dadcf0248193c81bcfd40d36d71ba6102f08db75db31dad9829387a287ffc20de73b1914d42f67b6d9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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