gentoo resync : 13.05.2018

65 files changed, 116 insertions, 138 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 9569ccac11e2..b22a4320e672 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index ad5721b76166..771ee78d5b63 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -3,5 +3,5 @@ DIST bdftopcf-1.0.5.tar.bz2 123291 BLAKE2B acd4838278b090026f002e6f5fae7146fff71
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
 EBUILD bdftopcf-1.0.4.ebuild 441 BLAKE2B 1ad53f7ac677a55d815219c21b8b03d4158168c5685898557092afe35b07151f10c8f05e5f29143a36f8dd673cd474c08ba61d59135c11a393391c973f574b54 SHA512 82825e87f9f4defb60cf7892328860cde0977df9aaf410f3dbd101723809342cc2a45b690b188d0c338a272d6aba9c4ce972bbe6f6c4de85712a068d44144350
 EBUILD bdftopcf-1.0.5.ebuild 441 BLAKE2B 1ad53f7ac677a55d815219c21b8b03d4158168c5685898557092afe35b07151f10c8f05e5f29143a36f8dd673cd474c08ba61d59135c11a393391c973f574b54 SHA512 82825e87f9f4defb60cf7892328860cde0977df9aaf410f3dbd101723809342cc2a45b690b188d0c338a272d6aba9c4ce972bbe6f6c4de85712a068d44144350
-EBUILD bdftopcf-1.1.ebuild 455 BLAKE2B 68e1ee427ba1f6d2081f5193eeefd2ca82e99251e8f4cbc156f051c236d3d389bf6bac16245d79595a8eaa6c4e147ca0ca36c57bd81a2d091c290e76b7a1a80c SHA512 5e381026160d63191a7e9a484939a6b62f949c71d2fdb082a39c309bdd7ef10bb7be020cd59cc109007136daaf8aaa6f14578e948051273a721fc3c08e512827
+EBUILD bdftopcf-1.1.ebuild 435 BLAKE2B 6b07dc0b186d0e327323fe319cb02de3a9ee50b2e8d3855ce7ed05355ac1258cc95437af38b969878e88ca5a1079228d3ddd8905b1059a823e3096a375f8c2a1 SHA512 082d1f020c023b012d099ae60fb25f76d5c00ab99a01928bbd2abc877a723ecda080c19ead0a17b698c2b0412dc445ca68ec474f9d64ded245b013b84ae2bf68
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
index df9d6c081a20..17bf9ad89698 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
@@ -7,9 +7,8 @@ inherit xorg-2
 
 DESCRIPTION="X.Org bdftopcf application"
 
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="
-	x11-proto/fontsproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 RDEPEND=""
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index 2aa274207ae5..f855b2bcc929 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,3 +1,3 @@
 DIST iceauth-1.0.8.tar.bz2 137905 BLAKE2B 8fb2e29e5f4fee57e5c1f86eb78ce518519f04301e8aa81778e0de6589f62f32478a7cae05db831177f4425eb388f7b666f697314d5ab967ea3e2b6ac7b47d56 SHA512 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1
-EBUILD iceauth-1.0.8.ebuild 434 BLAKE2B 8b67efdda40ea2d42f821b159aac8561fddcfa2db6d97594fc604a8ca3eae6126b4c13ab25d0359182d562afb8bfc436720788d4e1add8b16e3bfc12efb84cfc SHA512 55f6c0cbf1361240c168603df9619525ea1f325df67d3e67265a8f2db6c9d58299d5f95172acd921329b0d1aac72b455b67148ca8c99900939a2a85918c65e5d
+EBUILD iceauth-1.0.8.ebuild 437 BLAKE2B 62d779ae5e7a8a4227e3454cea7b82e3dc038c43dcd2366d85c5f81d56ea3767c6070732c08dbfa5b577c89cc2bb628f7781d5d08826255fbde1f84877f84310 SHA512 d96cee8fb31aec4bbdeb629921f05b455f5d26e7ad1ab885ff9c4d2d69eb5d862c5db227fe69179727e688aa8926dd91a1753688e515649316df057ac35752c7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/iceauth/iceauth-1.0.8.ebuild b/x11-apps/iceauth/iceauth-1.0.8.ebuild
index 084c861bc6be..fbcafd4b17a2 100644
--- a/x11-apps/iceauth/iceauth-1.0.8.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.8.ebuild
@@ -12,4 +12,4 @@ IUSE=""
 
 RDEPEND="x11-libs/libICE"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index 6407a2bcea3d..02ae23a25221 100644
--- a/x11-apps/intel-gpu-tools/Manifest
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -3,5 +3,5 @@ AUX intel-gpu-tools-1.12-sysmacros.patch 981 BLAKE2B a6183a9d0d07c57ed34205c028c
 DIST intel-gpu-tools-1.15.tar.bz2 1827851 BLAKE2B dac481571603ff36957ad2d5ef89266e744ec39a5623bb2b8e3d2e389d39d7aa09130cd7591e876b02d8edd970fb287c53ea9b520801a4a9ceede294e2917a7f SHA512 407f7c4ce72babbbd3ed08fc77719f88321b56745601b588bb6dce1a659786215e6d1b121af748087746df6f7da1bfd3ae8f9a898173eede5d5bb4a5b24b4559
 DIST intel-gpu-tools-1.20.tar.bz2 2274390 BLAKE2B 55c8614f93f5ed6391d35570ed6e4e36a659bd8ba5d98e321cb1daaf89413a95d1f0911cd07ed00670f0dceacd8f4443894a59b85cce1debeae9f8e01a75f824 SHA512 7b930c6949c04a600792df359f7cd230ca7b843072936c0c674cb9212b2d8c0701c43ef3bebe66b34141ed7a9b39774bbb99466cd52d70b3f1abfe5e52608f25
 EBUILD intel-gpu-tools-1.15.ebuild 1312 BLAKE2B aa33654e6b13869db7925a3bb6b9b9e20491c382021289ddb6fb1bdc29f2931c017e30ddf8db7e0e0ab4594545a91f5a7ed35b3197cc423ace1011e48678c0ff SHA512 4c76d129ea87cdc22ec85fd0572978c17bf6a6c11aaf43d0265a3bed1b444741e172c44d89348d7eb94d6ca2f91d8c332a6877c7c6656b336dbf205ab5461bdd
-EBUILD intel-gpu-tools-1.20.ebuild 2340 BLAKE2B 562eec910f1220fb92d60d161a922864aa0e0fd56fda5540ecb9cdf7785c40d60cb6631c109d9df26ba0d3e8afd558ba1aac774e437c2051cd2234b7d21f3bdc SHA512 8a34d86cfa622addbef622db66d0994c26f7e0390f4bdd2e46a7c8bcfc519c3b949e43f4b2e348fbbae50c4409d6e515dc3659e6c5e6ce4d60ec7a574a57f7b4
+EBUILD intel-gpu-tools-1.20.ebuild 2334 BLAKE2B c24a37212d73047c26dc01c0ed7509640a1cce1dc0bda2821bb5dc10b7f35fa63bedf3529146c8dce403d3050dd156e8799791781515bd945c919fdaeb5f02d0 SHA512 0beb5211b5416ab7fb6f2137b9ddef140a75434c43dd762d0cad35352fdd3963f26a03fe27898dffb0ffb49981e601331026c01b24e7810261763a9cffb3a1db
 MISC metadata.xml 603 BLAKE2B 45dd9f436fa73acc04e08ad1e3bddde995b09fa16da4bcc66898203eb5b72f72ad57d3e3c07f4669e57bcdcc26e5a2711a0295964c49738041ad06d9d4b9c31c SHA512 1d211baff35dbc0ce425b433b9a1a9897184a53800f7a2e4dde8e88a8de87cc9913341a4ff5cd15115067ac4fcbf9151f6c26fd34fb2feaf9477e9636fa32b1f
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
index f14f3fa384ae..69ac7b3936c9 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
@@ -18,7 +18,7 @@ X86_RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXv
 	)"
-X86_DEPEND=">=x11-proto/dri2proto-2.6"
+X86_DEPEND="x11-base/xorg-proto"
 RDEPEND="sys-apps/kmod:=
 	sys-process/procps:=
 	>=x11-libs/cairo-1.12.0[X?]
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 05c75dfdbc53..8c40bec7ce78 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,7 +1,7 @@
 AUX mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch 1182 BLAKE2B 38cf9b073cae923cec2797ef8c7b0a5df752ef5ebb11363e5cdd8d23ccef500b1cdd7eee654d48820b78c2e53af1d65d674d2b0b15713f15f6c5f29405b95d15 SHA512 0c2c5bf3b938215ab433e698c253b35a535562ebf8f8be0dc903b4e916224b298d0381e19bae462c75733a078b929173f3074230e1953d5135b7e0721cb5117e
 DIST mesa-demos-8.2.0.tar.bz2 10071635 BLAKE2B 3619738f9aabb8a32e23e96fb3283c1215354f1b45c5c8df315d339b7d3153b0f0042bd0a5e1f45c8ca4c461284a1843615904a6f0d32b108f60c9a043cb99a8 SHA512 590e9fb66e23c0ad526754e9084858eb3e1fa906be55ee6121089325254b970e135e04d53c634cabd13d59c572ea39a4a877bce14b120d73850aafd159a5c8de
 DIST mesa-demos-8.3.0.tar.bz2 10044647 BLAKE2B 66605d2be7a3e1ea30429b29c574d866961e7df6f17479647d8d4a3cb788f52701ee8c6379c208157348a265d0a3eb90b929415073fa03ba6aefc47f8a45e5c8 SHA512 9ba96980306953f7b72745063e75809fb8399bbd5fc58fca96290a8b4e61741bb82fb6171311eddf249ea12face83d7c7b087e6dade6833699a8d220fc752e3f
-EBUILD mesa-progs-8.2.0.ebuild 1783 BLAKE2B 7603b6e6d297c6e8975cceb4a3a5c5ccf5f84a2ec076278e3476536ff6c2d8296e91213d51767ab9c3cd54358dc1c1ce124d520cec243aefc169a8f3b39c9255 SHA512 925ee6661e7dfbc02b901a6b3ae43099b6e78066ad2de269bef931be76c9ef728a5a9a0e7de00d681cbacc904694c831b297d17de8dea0a32717a206b176238e
-EBUILD mesa-progs-8.3.0.ebuild 1762 BLAKE2B 58c4e6d913b2bddb2f5cdf36a2243732be03da38b28009ab915c2b36126752b477257c95dd9b1e680b758a6668ab27dacb3442aa92144c5618c36e88aaee8869 SHA512 d66ef4b3b89275b12721bd0b0f2eefe400b22c8820ad155c0fed19828a48441ee6feb6f6ed26a9b2ce16735d8e4ba5e0d0590bc478ae2a63917cdafa65e76126
-EBUILD mesa-progs-9999.ebuild 1726 BLAKE2B 4e4d96d0f31c67341a5436312949ac6188dc6109edbe70e594c174af7907e60f06e5658a7f33884f91fb4bff4b74548cf104ac05142be5ca7e697adcf0e60cc6 SHA512 97e37c0f755302606ba7ebe3532df29bfcbd9eb46733d6b59e7fc3f86e134633b581b0ad058a3fdb6507213f47a5db1f0ebaf50222464562dcf4efc0bce86632
+EBUILD mesa-progs-8.2.0.ebuild 1786 BLAKE2B 82361bc640f94d04a176c4a0da13abe5d9f335c5fc199b282a9b9be9a4baad9fbb40588891cf329bf72002f8f1486289a540b2444e20b6fb14fc5300e2e5c851 SHA512 6e1f814476e8cc7232361c7e0e1164a2e060dd4dc7cd2acb60b0ef42472ee8e9360ea741795023baaab9708d8821ac13670d3c8f4d9cf7d7af43b5bb0a93cc85
+EBUILD mesa-progs-8.3.0.ebuild 1765 BLAKE2B 68c0105fe8e293a37dfd985fe66f6ffab9fb5f68effc364c9c50ae1059b83ae4f919cca7f01973dc7a7848e139a465b492aa85145c121ed84a52b503437bbac9 SHA512 53ff646fd9e744b5943500861f97fad9dc7ca196b9a3fd1606bfe72d2117ee40e6d2a72a23d34912b3d7ef9a498339943daa23faadd6ad6a3013fa2dafec78ac
+EBUILD mesa-progs-9999.ebuild 1729 BLAKE2B 9c5a305aaee1d42fa12f078e2e262d7f75140f4a30d2566ec0c1899dbbcde4828b5f684619666839260a913b7739017bfb92e631e71e8cae6d5042d5065cc267 SHA512 784a05d1eb56e042e9fbbcd951455816b18b24afc4f599fdf80eb67ab751c96740382fb2cabecc9a14b086fc94c0ba4d01d9b63df6e0c78b43118ef4e1d9ed4e
 MISC metadata.xml 475 BLAKE2B 4275e3d7871f0b092559ddf5c898bad781441267b093d55bdb14d7e9795ac070aa7d9a87cf7248d58b75798eb28a4413d588492bb6ab092ef79373434fb1652e SHA512 624480e9601ad6ad1cb996b25074c3e47a539113af39633de80c9eb0330322453f545ecfede9d602de7259d66047f507bf3a1cb115becb5f5e7d0613cb5bc675
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
index 1e807c1632f6..aa6ffbd8f9a2 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	media-libs/glew
 	virtual/glu
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}
 EGIT_CHECKOUT_DIR=${S}
diff --git a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
index d999d44c52e5..07729580b329 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	media-libs/glew
 	virtual/glu
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}
 EGIT_CHECKOUT_DIR=${S}
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 3765af34344b..5d949f23bd54 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	media-libs/glew
 	virtual/glu
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}
 EGIT_CHECKOUT_DIR=${S}
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 58bdac022bfe..462a0a1cd94c 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,7 +1,7 @@
 DIST mkfontscale-1.1.1.tar.bz2 139923 BLAKE2B 441aef79b2f1db18c56c5235afb83711c5ed43b16f8046750ab89abbe8eae58f01b7cd5b7a3565bcb10ac8a859ca2bc24b0bdd17ed15caa97f00915c9b2359f2 SHA512 7a6da239b2f166c6283090c219889e998be9332ee1e8eb4d84bbdf0cb58125a3773fe7ee97774d86f2cd5385dc49636a797c7b9c25c6c8bbe24b898329f97220
 DIST mkfontscale-1.1.2.tar.bz2 141728 BLAKE2B e15dea8a22fb59ad21a63a907dc0c30869480d26fa2721ecfd1ba65c81425b3ebf4709f89d4105a8f14d2d5c6e924754122713a244b58789227ad469a2d09d60 SHA512 5c3331f66cd523afe95347aa36440655ba8fdbc716c5987a24ad624c1fbd718c4a8d67aa36330f6d5ab2eb5a6195a409a041954568c0a3375c0e2aeb6a955601
 DIST mkfontscale-1.1.3.tar.bz2 144386 BLAKE2B 8cf4a61472b9357888ef355e89c3087102c4928884ecc6b5671202ad09284a2dc188b81faba6b1727b1a28ccaa6c3c36649c53659faf7a3fae4a2b32ab5a2420 SHA512 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62
-EBUILD mkfontscale-1.1.1.ebuild 573 BLAKE2B 1c3b8eeb2aa36d7c30343c9a886ac18467e3e4151f33359ac1503041f5769c64118585f814ffeac99b9e2973206f17ca4f3183f123d147b7888febd883d9507a SHA512 524a44269125f2b1ee9a0a03cad546a80518c2e10e92a7e26010d2f519ee71dbe26b34fb3b06c8f7f21b2ad1302c2a7a6ca4e3b4e127383d33e8b0ac7a25c561
-EBUILD mkfontscale-1.1.2.ebuild 613 BLAKE2B a5ff65d2fdc7aba353ffc3c9ed8c0ae9dd8f024f19f60cc7ab09a723906fa636d589e3b59c1d8a39aba8298072db15707c67afe8ee6cdc14fadd41f93ed55f28 SHA512 f00fccba5d5635ecc6b7002f03c706600109e21a5df4c82266e823445a2c9418d4ae457f167450df2e72856a6e56c0faabfecadeee87a861271d7d1a8ab03775
-EBUILD mkfontscale-1.1.3.ebuild 612 BLAKE2B 1677ebf345fc37b81bb1c371b9957183a0b987dcb53d4b6911dff10f134560deb4eadaf18790b75b8401272d86572e4149e20f2b35c79ff81ae8f1b7ea87057c SHA512 4de1648d2bfe147e951e2633570bdc06b08cd06f4ad956d0c68d9bda6bb06d5841a9df406997a7e8e6eab38d088d90f18049b0417d48d7429828b74adc4a88ef
+EBUILD mkfontscale-1.1.1.ebuild 576 BLAKE2B 5b1cf672ae090cdb6a99edf9c685796a62760a4d00112d6f1b5e9569983a81167ff946fbf8e7e46e73ac670e0ae682ca7ade7a8d76b1b4229212cc0227493008 SHA512 e55161937149fb277ee07501f503c674d47755e204cc5b0dbd1b21219a1887d4e9e6bbbe1254b91b1c582cd02b9db069c3d92f1a21e61b60e84d5b07f902aa27
+EBUILD mkfontscale-1.1.2.ebuild 616 BLAKE2B 6397e8f9d393a87ae746ca5563300f280511ddc342fb23ac89f2a2d6ec3fc6c5a18bdb3a9f621eac9938bcfe6f247e766fa4d507da3d7ea755798753472e712c SHA512 e67622605dec6fd3945fe59d3a2bca42eed73b9508135a418669148270c7d298f19a6fd06ff486969c336957febb84cbb5becca82cb73c9af927aa93a442b15d
+EBUILD mkfontscale-1.1.3.ebuild 615 BLAKE2B 826d4a8ed0f9cde234c191e479e6599e15d89a28abe5abee24c05bc112a19946f178a6d8184d7faa370fe0374039f6f22cedfaec98b03f2b91a9d52fab4a0d0e SHA512 30c474ff763c85ecdded5aac1c0a0762170ebd54b6bf1a57b37d06b2f601da9aacb9ac99eaa824e1c883c450aee6b47fb47f1fd925e1c1033cc6cf3cff63667e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
index c95b6737e415..ca04af88a15b 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ IUSE=""
 RDEPEND="x11-libs/libfontenc
 	media-libs/freetype:2"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
+	x11-base/xorg-proto
 	app-arch/gzip
 	app-arch/bzip2"
 
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
index 17fd24b91e3a..4283de38eefa 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,8 +15,8 @@ RDEPEND="x11-libs/libfontenc
 	sys-libs/zlib
 	app-arch/bzip2"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	x11-misc/util-macros
-	x11-proto/xproto
 	app-arch/gzip"
 
 XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
index 1766e34c190b..495a445d1f95 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
@@ -15,8 +15,8 @@ RDEPEND="x11-libs/libfontenc
 	sys-libs/zlib
 	app-arch/bzip2"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	x11-misc/util-macros
-	x11-proto/xproto
 	app-arch/gzip"
 
 XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index 707416420b18..73ced3e687fd 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,5 +1,5 @@
 DIST rgb-1.0.5.tar.bz2 130900 BLAKE2B 40675dfd862757d62cc636fe2cc3cfac25a87d863ada67e76dd9516a1607e356530b2578082b9e5cdf84d97b766c558b80f8fa919c515a5eb3da2731ac07391f SHA512 2e4ad2b0f5539375986d455b47cb5f10e50841198ee242ee430e021e9ddbffec1304259c259c7a6b7e0cd4b244ecedcb5818baac35deb4447da53c2ddba3ad43
 DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
-EBUILD rgb-1.0.5.ebuild 456 BLAKE2B dcca752650a17723b64df6a3770c71d88741de603b0c99c50fdeb1fe37258366836893cb396e6b5e3df5c979855882ae4845bb978d9e82aba73431a850523145 SHA512 38c3c67cf17944e9314952142354fa0ea3cb72f6d3c58628b787497e38edf14d74c72a624d35e535e7e10a7aa7d7e39b65de0a6624d88659e066cf8cce91febd
-EBUILD rgb-1.0.6.ebuild 485 BLAKE2B be6eb38d6a9a40497a733f0a456011ab64ded04c7d73219cbd5c0929c769de0da5c398511e742f17daaff2ec287a427f9a0d51245aa5bb998748bdfdcd5f6aae SHA512 bf9d8f72d44ef7001dec6251198b2fc8125e9940b09601dd1ff226aef2fde7feaf975f4a813a9b4b12141c0287935e1363dd91e4b2482ab72677307eedaa01d4
+EBUILD rgb-1.0.5.ebuild 459 BLAKE2B 14afcfdaf45273d0a2a2b91e0e6eeaa5ec92fb9088e98ab6a65bc3c742ca5b008a86244dd953dea391b4124cfb36c3ddd50d0d621c5832b66001f29148f36df9 SHA512 8d3a38f6579645815f57bfcf08ccb7c99acca49b238a38b3ecebbfd3940133396f4e0350b0818f6114d4239ec389d2f91333d519c04cd5e2905dd0e9036dba5f
+EBUILD rgb-1.0.6.ebuild 488 BLAKE2B b54492cf1dc1dfed814a9be8722e680333b2e126ab5f95b7b14271e7c0d9325234fc9b3471c059a67df2017874414deb187a3f79ca018b3ff43df1531c70ce49 SHA512 d288e88f9a0cd7cfcf49696f0a6afefeae53b4499462b5aabdf860545b5c50d9b369a87a55c76070af717e93d59ff67aaafdc28141e600d27d194820454278ec
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild
index cdc6a73115a2..79ed018a5ac0 100644
--- a/x11-apps/rgb/rgb-1.0.5.ebuild
+++ b/x11-apps/rgb/rgb-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,4 +11,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
index 8dc4a3f076f2..16d1e459c1ca 100644
--- a/x11-apps/rgb/rgb-1.0.6.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,5 +11,5 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
-	x11-misc/util-macros
-	x11-proto/xproto"
+	x11-base/xorg-proto
+	x11-misc/util-macros"
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
index a42c78fd646a..356a3a6590ba 100644
--- a/x11-apps/sessreg/Manifest
+++ b/x11-apps/sessreg/Manifest
@@ -1,3 +1,3 @@
 DIST sessreg-1.1.1.tar.bz2 136044 BLAKE2B 63cb285b82b1e47878b8e5165083efa320d8e13b2e8ca2e722df4d095fccc306d748966983d23833e2c4e9b31c0bcae62f10b5ed7da55eb5e32d46bab31061bf SHA512 92a21d31c5698212fa3d04360f4e931e018156ffed70ba03bee3f1ecd8540d5d54f07a0c7661e1077b73255eee4cc1afd1dda6907df109d3556626495ec08193
-EBUILD sessreg-1.1.1.ebuild 352 BLAKE2B aae88c31d30ebaaeeec1b4a784d81b560d79dcdece1bb73b5779dbc3e3d6187a804fe4c1aa9c77b32d0d1315c5ba976f467bcf8a718b0f84ecdc8b60b39e55fe SHA512 cef7e0568245b41cc121d18196636bba5f9ca74762fa8f7aaebef5640b082d47621cad5fbd4ad5067701df0c13584ea2d54616e3e53f5a8620639b14fc5aa6c2
+EBUILD sessreg-1.1.1.ebuild 355 BLAKE2B 259b1f9aaa92ebcfdbac654479ddd708bc5ac57cc4743985f3957ce7db0aa2bbb85fad7a01c373b8c516a628c320969164ac0c333330e038046721bcdad80536 SHA512 cb25d5f1b75d86e6938292efca47201a59d7dec37889d647391e858a1b7e7e83452363f72a0b0e118a478ec4f1f5c6e7629e39c9bcbcc39a00243354fca93d23
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/sessreg/sessreg-1.1.1.ebuild b/x11-apps/sessreg/sessreg-1.1.1.ebuild
index 2193ff0538aa..b2c0ed90b6ff 100644
--- a/x11-apps/sessreg/sessreg-1.1.1.ebuild
+++ b/x11-apps/sessreg/sessreg-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,4 +11,4 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
index 0a5cd88d8f6c..6b6030071569 100644
--- a/x11-apps/transset/Manifest
+++ b/x11-apps/transset/Manifest
@@ -1,5 +1,5 @@
 DIST transset-1.0.1.tar.bz2 121199 BLAKE2B 1ef56061150993bf870075c5dadf0589dc795750ce9b898a5a39a062fd14693003a4b0ab258140e87a208fb1f560742dc6217bfebaeffce98cc73d677fe015e9 SHA512 709a693cedc877f981179376105ac071ea5cf553c4388ecc7b974547050104fbc2cc64292f86f047b70acf7d85e7dca1ed7cd004b73652f4854275c8a514fd1d
 DIST transset-1.0.2.tar.bz2 127774 BLAKE2B fba4e8dc6eb3b3ea1285af9fccacc2d46cddbf17a086084c3db395bb5d78e6f13a348e2733c8b42efd2993dc053c01a4e6761c479506ba5d84a8715a956303c0 SHA512 f7a658cae70e211a0455420efbfacee0f3032821d94e7a80ec6db32ced716c1ce013f38713915505998071c312cedd1bad08575dbadfbbeb94361b048623f874
-EBUILD transset-1.0.1.ebuild 416 BLAKE2B 0a1bbe4c607482213a80ba9d26507d0d8a1131633632b87e2abab122bd0f8684c7678e555ccfad57d179953327b2dd45d1991603a7ea089ee3a35611472b26a4 SHA512 4c94916760170171b98ac82972b069b95b415cc767b16a579424d0fa80d02be7484062d6c5a841dcc74b6cb6e5e50eb399bee543daeee785ddc6caff277b71c8
-EBUILD transset-1.0.2.ebuild 416 BLAKE2B dfb9454b61613fcb03fdf945143eabf79ad3ee7ebc92e0ae903404440544bd121b4d273a6cf130150269aa41f54c08870df03f117190838dfee4625b90fb3b03 SHA512 81494bbcc53b78389ef1731cafb19ec63cefa3de1e986adc6f933204c583bc9dd017836c0c673ded05ca8b85b6bc674746bc3ec2419e8ec964790e95ed802e0c
+EBUILD transset-1.0.1.ebuild 410 BLAKE2B 02052443d52fc6324a0597817ecb636d59cb2449a097cb12e57c0e3357e0e3b061a9e0dc50ff4aa7fdbc499ed47226e9a043dccf425df561daf79d01cc7654f0 SHA512 1d39b5ccca7c032dd3c75c7d0fdb48985094156003bf2f0b2b0a9abf1c9e2e663916a80da4b2fc5b37cd23cd54793a470f85dedba917044107618eea81f3ef42
+EBUILD transset-1.0.2.ebuild 410 BLAKE2B 02052443d52fc6324a0597817ecb636d59cb2449a097cb12e57c0e3357e0e3b061a9e0dc50ff4aa7fdbc499ed47226e9a043dccf425df561daf79d01cc7654f0 SHA512 1d39b5ccca7c032dd3c75c7d0fdb48985094156003bf2f0b2b0a9abf1c9e2e663916a80da4b2fc5b37cd23cd54793a470f85dedba917044107618eea81f3ef42
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/transset/transset-1.0.1.ebuild b/x11-apps/transset/transset-1.0.1.ebuild
index a2f14e270867..d0aa1d6e3b3d 100644
--- a/x11-apps/transset/transset-1.0.1.ebuild
+++ b/x11-apps/transset/transset-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,4 +13,4 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.17"
+	x11-base/xorg-proto"
diff --git a/x11-apps/transset/transset-1.0.2.ebuild b/x11-apps/transset/transset-1.0.2.ebuild
index 061b3239cd7b..d0aa1d6e3b3d 100644
--- a/x11-apps/transset/transset-1.0.2.ebuild
+++ b/x11-apps/transset/transset-1.0.2.ebuild
@@ -13,4 +13,4 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.17"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xdbedizzy/Manifest b/x11-apps/xdbedizzy/Manifest
index 8d7120fe201b..96eed3826bab 100644
--- a/x11-apps/xdbedizzy/Manifest
+++ b/x11-apps/xdbedizzy/Manifest
@@ -1,3 +1,3 @@
 DIST xdbedizzy-1.1.0.tar.bz2 110340 BLAKE2B 2245ee691441e72e22a71ce482d97f7a24c230fae23779f6a496f8f82f962e7a0875b136b2a2308ac3e4940835b129e7641bebc895be02e2d32fff890d42489f SHA512 58b9c88b09772008fe18921c0b63972a65ee5833f96edbbd2e1dc335e5f20ca9a241728b9a225e3b0f3eb392a7941cc1ab6e3c871b9463ff21bb23e38557e9fa
-EBUILD xdbedizzy-1.1.0.ebuild 346 BLAKE2B 93977d4bf3fdc457f847b0995ca247ddfe559d680cd5fa2ab4e79997d548db0bf69d3161b3a635a0357e926e0e04f8d2ff6acd2e751a9b31849517445729dcd9 SHA512 798326ef1a72507a4f6538556130f28441641978d1f8c76fc2293a01bb0033ba73c84ce9c4085e6f3c3ff130e4b2f4b5cce3b84e4d5411275995428bd1c75b2a
+EBUILD xdbedizzy-1.1.0.ebuild 328 BLAKE2B bd5088b4b6129f6c455ff042f9d8377ba794e68e78eed5238e588ac01425912b8aad9162161f5965d4abbfa6c0c1d254fe5211aed4b02def8c6b67de12f5c9a8 SHA512 2872aeca7b00117c79c3ef86a1b9039164e60620c489a64a4850607df5c8ef63bb6bc06abc57b0f03df4aa14adf97351eca108e582f9384c0ec42902f09a7ca1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
index aa93c76e2183..8df4f1fe96fc 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,5 @@ RDEPEND="
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index f9ee20c77cf6..d94c8af79ece 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -4,5 +4,5 @@ AUX xdm-1.1.11-cve-2013-2179.patch 1519 BLAKE2B cd0329d5c97b4bd5051dcd594bf54676
 AUX xdm-1.1.11-setproctitle-include.patch 849 BLAKE2B cd5749feb0d11d07208922e94cef14a7063c43b7a05a804c09f6febabfa35941914e8f8d508992f52bc7804aeee12e98525cf5f854250e30a4470ef7389c9b3b SHA512 496ad42ee35ce6d25f87b349330394f65cc8979b388759d7e03636f96bc2272068a999a9f7ac3b2e0486099b7678ef1c0e30505c3e0a08cc3041121936f1abb0
 AUX xdm-consolekit.patch 5712 BLAKE2B 0526aad6742c86d878ca01204a2e6c781dc4532f7de573a67723e4ab3c7dacefe20d25766402b705c957db75fbf41d396c46442e7da500ad3ce2afb3f0facc67 SHA512 d87ec56e4b7d067709679f222d3bd9009f1496d66c3c4335458b54e2a468200e3c7ac99843330c23bad7049995c93e8f3c74f3161529c6fb488e94e9fcd4752a
 DIST xdm-1.1.11.tar.bz2 446612 BLAKE2B ce9bed568e036a882ecc56d75f7ce8646d14ae00c754d6e5542ea5b186c3ef1ce8499e2d70190b4fbc4b344e0c70fd36deab5aacc5f1f55501db709300aee520 SHA512 fe6f2b7817c0f7f07a1f5f497edcdfa15b93986fd87f314daa472dac8625327ef46ebbf40d27fe8d4a8a2f8d5af8a01c4438a29356740e0eb350f2bd0c7ec0d5
-EBUILD xdm-1.1.11-r3.ebuild 1829 BLAKE2B 13069753bead08f48bb2140845b2feba97ca31110515951d5acfd4d621394ea93c340e52f7f533bb3caacdebe880c494341684852d92ebd59c1b242bf283f2ad SHA512 c8b901047ff6c1c999281ea565790ea81086b6681c46fbfdf1e4dc2e1f84faf3b4649f4e6054e31b6fb644eb0ac746914103868085ad15c587b3fdc0c4b44f09
+EBUILD xdm-1.1.11-r3.ebuild 1807 BLAKE2B 1c98b7e9ea0bb96ccd82c355d3e4fb16641eadc41167fd5d559927405c95b7153f0aea14d3a906540d053c2f88d289330007bf312c1e8470fa98d04efd68c78c SHA512 7d30353885804970be0e0fd31c455d9ff52615ad1ae2611da2ab30705e048114221bf78de639bc05923ea3eeca4af251fa3b6935e7100c3a987db6e01532ab8a
 MISC metadata.xml 414 BLAKE2B 6e4d9441a5a392ed6a989fbfd08b9e664dfd6843fa6b6f4f9644b4ace383cd5ed8ea859a0f6e1d34580fd8acac06333eb566bf6460144128494a046991fe08c0 SHA512 f3acd7a9e8f8e1d93ca5c657409efbaeb5695dc81528926d9ecdc517cff8a7c2f597b9ac8b856cb81246ff39c2ceaac5bd72587db68a5d260c3117599e24c38c
diff --git a/x11-apps/xdm/xdm-1.1.11-r3.ebuild b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
index 4233aea63111..7799fbfa3e79 100644
--- a/x11-apps/xdm/xdm-1.1.11-r3.ebuild
+++ b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,9 +28,8 @@ RDEPEND="x11-apps/xrdb
 	pam? ( virtual/pam )
 	!<sys-apps/systemd-187"
 DEPEND="${RDEPEND}
-	consolekit? ( !=sys-auth/pambase-20101024-r1 )
-	x11-proto/xineramaproto
-	x11-proto/xproto"
+	x11-base/xorg-proto
+	consolekit? ( !=sys-auth/pambase-20101024-r1 )"
 
 pkg_setup() {
 	PATCHES=(
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index 496f4c92f35e..5131abada46f 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,5 +1,5 @@
 DIST xdpyinfo-1.3.1.tar.bz2 136412 BLAKE2B 6c9750a0c9690f6c5cebf3551f6ed77b4504e1ec31685c698abb5963b571d214d4647f3b1b11837e3df645becc468bd9f0275616527519693011d7e3168051a3 SHA512 1d9f5948f04bf555181f7989bd25dd4559226f757a8452493cfa7ba0ed33112502df28ea702e48c384e801360ea1b6374a1e3f626bd56b7a855016c12b7ad927
 DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
-EBUILD xdpyinfo-1.3.1.ebuild 1034 BLAKE2B b90ab76f1d5fe8e121b9c4518a49bbc6393598d496640968ceef41509ed3fbec05ad71868624fb90315a110539a480a196df176faecb436cc713c4ee03e9a2a3 SHA512 dec447a1c53ff0e1437f6b82705a286afac2cfdcd02c89cef7db631f640b473937dee81082f52878842c2e37167cc17056b1391272d998ed85d2437c6870bce5
-EBUILD xdpyinfo-1.3.2.ebuild 1034 BLAKE2B b90ab76f1d5fe8e121b9c4518a49bbc6393598d496640968ceef41509ed3fbec05ad71868624fb90315a110539a480a196df176faecb436cc713c4ee03e9a2a3 SHA512 dec447a1c53ff0e1437f6b82705a286afac2cfdcd02c89cef7db631f640b473937dee81082f52878842c2e37167cc17056b1391272d998ed85d2437c6870bce5
+EBUILD xdpyinfo-1.3.1.ebuild 797 BLAKE2B 7f8a29c678ee8b9cc923a0a4317e4001570d40178627187fd0b633f2136d1a375f19156299170e6a2cbbee1f29c333baae87dbdee935a52e58ccd6508d21220b SHA512 49266b18ebcd171be8a017bb01e4f66b4c000cfaca23ec0cca1f40d63d31bc6ea5f9a18e2bcc335334fbd1c86e0492735119ea8364c660088ae6dffa0a79c44c
+EBUILD xdpyinfo-1.3.2.ebuild 797 BLAKE2B 7f8a29c678ee8b9cc923a0a4317e4001570d40178627187fd0b633f2136d1a375f19156299170e6a2cbbee1f29c333baae87dbdee935a52e58ccd6508d21220b SHA512 49266b18ebcd171be8a017bb01e4f66b4c000cfaca23ec0cca1f40d63d31bc6ea5f9a18e2bcc335334fbd1c86e0492735119ea8364c660088ae6dffa0a79c44c
 MISC metadata.xml 347 BLAKE2B 0496b148ad07710139de96e153b80e6035e6731a18d6e8a4dce75dd17bdfc54ad77276f1f82791393d198e96c9306f464dbce832b4d643b6285fb9a6d92e6261 SHA512 98174497a1f55be4b14d769ec110dafd63a8942eb8f51e2953237b76705128e47bd36a39b9c25985cdd99a3b431f3d5aa856fd634b2a2fbfc1a5cc13a3826fab
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
index fe6297132ec0..1b65aca89d80 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,16 +22,7 @@ RDEPEND="
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${RDEPEND}
-	x11-proto/compositeproto
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/renderproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dga? ( x11-proto/xf86dgaproto )
-	dmx? ( x11-proto/dmxproto )
-	xinerama? ( x11-proto/xineramaproto )
+	x11-base/xorg-proto
 "
 
 pkg_setup() {
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
index fe6297132ec0..1b65aca89d80 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,16 +22,7 @@ RDEPEND="
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${RDEPEND}
-	x11-proto/compositeproto
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/renderproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dga? ( x11-proto/xf86dgaproto )
-	dmx? ( x11-proto/dmxproto )
-	xinerama? ( x11-proto/xineramaproto )
+	x11-base/xorg-proto
 "
 
 pkg_setup() {
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 86a80fb878c2..ade9f7bdfe94 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,5 +1,5 @@
 DIST xdriinfo-1.0.5.tar.bz2 121276 BLAKE2B c6db6dfd5ff0f5f6106f92ad42b37e18cc148d156a5e294c497f4ac84226114bcb7d7666196b4b1e1b4471108f839c03d4a2e1dc19080af0d60c5cfb10b55463 SHA512 6b7a3641f488d305f950c494464fd4b674ab3aaed5c7159d6d8ddad4587c18d680e5854bd80666444f1dee52eb4f46b45709a6d9c333593fe045c73e738524de
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
-EBUILD xdriinfo-1.0.5.ebuild 513 BLAKE2B 829e5f26fe122bb41e447963ea39fa95ed61d89cff6347b3c753b2b3d205520a277954f277331f5c0d25235ea4460d04a547f5ad87edfb76571cddc83e6fb75c SHA512 ee1f6cc695a16233fb9ce4e3f930651d722875a50f3c4bdd943205f8633193da43c67a6cf5803fb03fb63e3c7332b0a7776ea7f26d1c90502a5b0f19c3e3765f
-EBUILD xdriinfo-1.0.6.ebuild 512 BLAKE2B 3f38138a42a82a3e50f16337ba34889e5bf58088ccecae7029ad0ca667b5c44723cdb466309c5a4cf3b033025ac389447d5b50bb88bc0cdc40c5aa0a747a0c53 SHA512 f5613d03bf839146aeb46514dabb0d97af19624df07c1fcf43d8ff06f6093ee83fccec9a98ecc5a3c5ab93746412138140a6e8d32a6a20b97d37fbd4ad6740fa
+EBUILD xdriinfo-1.0.5.ebuild 515 BLAKE2B 9b5c326d81d08c406653f0f0190d9ed50fc43ead64b03a2c9095f1bc92899e6351745f7ac0ff94f7c3d0887afc8b521e3de9279fe70450431da28a43fcd7167e SHA512 ff18c90bf854b98a7551e01705a2b48129f40bc453122c4518e35651e2f050c1e9c046c4488be47cbac81fc95629459549b03260dbc299b2ddebf515ee134318
+EBUILD xdriinfo-1.0.6.ebuild 514 BLAKE2B d9f548cd809f8dbe7f63256094f1284d98222c28c71754fc0b4f8c1f258795899000c0e75fac5edb93c8f8f50e5bfeb9a371b9255257587fca51f0b3600993a3 SHA512 3f73d9af7c154e385a7b4bed0e880a84de21185db739ec8ac8d01b422d1ac84f062e2d97371435be0527c2513b5a6986b1e3780e939cb4a85df04c7894dedc80
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
index bc84de10df6e..9e95c9e43c3f 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	virtual/opengl"
 DEPEND="${RDEPEND}
-	x11-proto/glproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
index 1801d61d66e8..8a64373394ae 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
@@ -12,7 +12,7 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	virtual/opengl"
 DEPEND="${RDEPEND}
-	x11-proto/glproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	xorg-2_pkg_setup
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index be2ead1674ca..487aa09056e7 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,5 +1,5 @@
 DIST xev-1.2.1.tar.bz2 125884 BLAKE2B faa41acc01b47c4b031ac0aa69154839cf43c180d90287cb929a922b2c5b8d174834f559c80cfeecc3839e4064d8e37d29c340756ce37e114f4420bf551b9e80 SHA512 6fbe8e69eeeafff4561b695293f23d9ce0f20261474f4a0f0281278b13f11e7ed9efd49f2712586f909e3e7a26b9fe39f8e98b50a2bf189d077668fc67388d19
 DIST xev-1.2.2.tar.bz2 132596 BLAKE2B 243556cda4ea52f488b60c98566fa1b84896c972eef484f9a29d8a7a3e6709a26c47f5478f7a010d430c79471f1f04d684a5b761a721013540f9f1e08d0573c9 SHA512 453fc18072e4d4fd088a1b2e918f3772aaa2c56b36c082deb41ec4d434d1579de75f447fc4e0507086c170152e02d6db8b60dc7fd87ae18a2e817448bd628fca
-EBUILD xev-1.2.1.ebuild 397 BLAKE2B fcdd99977d5b84c97e3599c36d202602b3c53ebda8c32e6265f513a075f05b61a0460a213af331e2c82a5fe914ce5484e974e5c1e346b7ddb3929e94e2e68cce SHA512 cea8c7ff94d17a098bcb2c24178f4c37bc57b02cbe5dc474f636ffda158a415e50948bd074869ef17b3beaca160329bad431235a4c9fa1e7bd94761fb214720a
-EBUILD xev-1.2.2.ebuild 404 BLAKE2B 18d8243a3916a86cf53a69caaf08382b0ab86d84a7d80956503b50b3833893a105aa59b07ebc4f4893e07f7f9d18334d74e4abd5ceed79294c17b03b44151108 SHA512 3249d5b4e882ea5b88108445a43cdc0d9788627b14411975124b4bee04417e0957851073f6d4e4ac4785304851e2a14b8f0610f9651e90e87d7636ff1bd1325c
+EBUILD xev-1.2.1.ebuild 400 BLAKE2B f988e39967c29da855fff0c4c5c7fcdddeca88deb8c3fe0bfe762bc50db8083106eb335bbb9e5532405e0298fd1bea2f9eabbce6a57fcd6a76c8bf17d317d5f2 SHA512 b00e75fa86a063f07cdb93543e4f261620c83a6f5d9f57460fa04ac4fce4cbf941261fc8a0b320219c916742287463d50b625771f327f9301beadc9ef322ec7a
+EBUILD xev-1.2.2.ebuild 407 BLAKE2B 605deef3a200013078478f032006cff46d9f1c2e301878a1f1a6905ad0d75a44d5a157da805a4a3b74eb51a33f105f9cc3506640cb37812f7ab2f5747f40d6b7 SHA512 6a383e6d74c0fcc6fd24a23728b805897ff3809e1fcaecce20d3cd1da7ddc054ed970d1850a1e13909e0732b2662d07e1beab61acc52d11087f2c1e8ca2d46c4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xev/xev-1.2.1.ebuild b/x11-apps/xev/xev-1.2.1.ebuild
index 2194489aa3b8..ec3eda23d5fa 100644
--- a/x11-apps/xev/xev-1.2.1.ebuild
+++ b/x11-apps/xev/xev-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,4 +13,4 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xev/xev-1.2.2.ebuild b/x11-apps/xev/xev-1.2.2.ebuild
index 33c1a0371cd4..29d2b7979e0f 100644
--- a/x11-apps/xev/xev-1.2.2.ebuild
+++ b/x11-apps/xev/xev-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,4 +13,4 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
index 40f4a6fb323b..fddd68e89707 100644
--- a/x11-apps/xf86dga/Manifest
+++ b/x11-apps/xf86dga/Manifest
@@ -1,3 +1,3 @@
 DIST xf86dga-1.0.3.tar.bz2 104935 BLAKE2B ec294d1d1d49b57479d52e9bee834ad15eb15758d50da3d894c5236e9d94a37e2383258e2c2456ef6a6cf9f73d1332b594fc663a48dd0241cfc02be1b9157480 SHA512 18dbf9b5bbe1bb9c993c742e04e132ee22e376148a499ee159418435477221b00904f36c1a6b1063df788079a4ff5520b4d604abcafaad3b5fd391a3b2c1ec07
-EBUILD xf86dga-1.0.3.ebuild 397 BLAKE2B 6db97178e17b313490bb892675f9695f56ac09ce730866c2bc04b6bc9b321fcb81cf6b14208f6073bdd55443ff817171ddaab7220b98796700680cd38d4e96d1 SHA512 cd1b8be52e7c1ea4bb23a2fb0da5a4bb09c34ecd150ac430d319c7a60087de14964979bdfaac1ead401bb6b0d0bd40ba8f0174a3b22397e2b6406fd6896cc741
+EBUILD xf86dga-1.0.3.ebuild 394 BLAKE2B 8ee07aba2441adfd7f7192951115f51c160a91af829c75b26da0b42e43240a356b63d8d849feb35f38fccf505b23601ff096db67fd7b9cfe727ad44d90ee324b SHA512 24b9ebd2b750f6fb2ce2f38087be59c30566eef0fe1c110194d4526192ff163cbb2732fb02fff2774914c3f41a392b4e3d9b286409204b658d4baaba75fa173a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
index 33fa3524c0a3..89597872cdb6 100644
--- a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
+++ b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,4 +13,4 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	>=x11-libs/libXxf86dga-1.1"
 DEPEND="${RDEPEND}
-	x11-proto/xf86dgaproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xgamma/Manifest b/x11-apps/xgamma/Manifest
index 362a0f65181c..f039a0070f21 100644
--- a/x11-apps/xgamma/Manifest
+++ b/x11-apps/xgamma/Manifest
@@ -1,5 +1,5 @@
 DIST xgamma-1.0.5.tar.bz2 115035 BLAKE2B e24ad2d1ad76139d8cb0dc9e86e2eb25deda01d5c1ee1f16da135cb45d937e7c574d2330ef8359548dfd7e7400034ce031a6b1250efeab55ea3d8f2d3e08da62 SHA512 6680a4e2ef7cc8806febdb69b85922eaf98a4c779ef2b1f9875507d10b31a43dc3cc2ec147b1f3ccac6f3c5f6abdaaea320eef2ebac68c14608599b17bae4ec9
 DIST xgamma-1.0.6.tar.bz2 123105 BLAKE2B fbf5496e7c91f1e96d591721bfe7a1771659e7ef408be689e205e898191e0fd6beeff9466f4eff628054aefa640e83d7a8d69de028a6a6e5716a1eee50ef0abd SHA512 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a
-EBUILD xgamma-1.0.5.ebuild 399 BLAKE2B 77929e35a7420a10330f1af0f0adc682d8b072e29c3b0d4453d0db200176f3e36b15b29a74ebd5ca323d67598c91f2f49693960bb0682cde606bd4faf716e6f1 SHA512 cae062e040f084775835f2b5492cd0bc2015db5b68195ee23a70eacb8e92425f3bf301ba288c4485eceb6f1bd9f97dbb03a208d0add0589159b74b9b37273db3
-EBUILD xgamma-1.0.6.ebuild 408 BLAKE2B d88943f2e21421fcdb9280116e4130dc65dab92d7295d3653207b4ea289b1fbbc595a8f5bb5d3ccf8f8c7e61d9e4731a7d9484861d726721b110e2d44a2a45db SHA512 eb096e328801253bc47de54d9ef3d350e4e0fcebee5cf92ba511d047bdb4981e15bebb26457b7a20b0f294be6d49c9196b4372b4bfb0eb4cee12489ff6e29867
+EBUILD xgamma-1.0.5.ebuild 392 BLAKE2B 2c58f38cc1b3e24d6676f4d3c447d94d7d62e9cee30265f0f3ed4cc9fed36ab9f81efae2efb46b55bfc8c40f795165d8c453a6d6d598ee2d5baef14f8f8f86d3 SHA512 8267a6e0ff64c9d02e612c7f4fcca1f26b4cb63af8016791d2e8e4e0b9ac4f7495304018776139eb14c61fca1f2e69300e9347a63f1390ecc7a8f36da99e96f6
+EBUILD xgamma-1.0.6.ebuild 401 BLAKE2B f2e73e061952ffc82008293dfcac595f893b22fe4101d52ddf4e9000b41195cc34aa3df208fccb710276e172ca2bb43cf44596977029e87ad16a90cbf7c98906 SHA512 4efd59b90db7dec1943eaa7bca648243e2a3821980e826688c1ae87d8c10d22a334b415e33bdbad1cdd3dc18b6798ded1188e41dabd6d19ee0160560b9b4cc61
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgamma/xgamma-1.0.5.ebuild b/x11-apps/xgamma/xgamma-1.0.5.ebuild
index 711a48f43226..bc105e08848b 100644
--- a/x11-apps/xgamma/xgamma-1.0.5.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -12,4 +12,4 @@ IUSE=""
 RDEPEND="x11-libs/libXxf86vm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xgamma/xgamma-1.0.6.ebuild b/x11-apps/xgamma/xgamma-1.0.6.ebuild
index b7a197a96249..54f51932cad0 100644
--- a/x11-apps/xgamma/xgamma-1.0.6.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,4 +12,4 @@ IUSE=""
 RDEPEND="x11-libs/libXxf86vm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index dae5d1e1db7e..fd8e71a5a430 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -12,5 +12,5 @@ DIST xinit-1.3.4.tar.bz2 165881 BLAKE2B 78e0b9e8fdb146e969014d726ac05e7f4cf14947
 DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
 EBUILD xinit-1.3.4-r3.ebuild 1913 BLAKE2B af34d5eb73f8e99ea509c577c7560d44f11f8151dafd2371d91172c395e564605bd326f8da5610a34e1b2edaad4f58f09f208a38d1d803610b641cbbc651592f SHA512 59712d0dd8ff2e7637bbd3b72a9bc067d860247eb9bb8be603211d265a3c209d59431759cffee408e4104a5d28f07fe18349e7aab1858b18944b5b6ca4467e05
 EBUILD xinit-1.3.4-r4.ebuild 1770 BLAKE2B aff5f95040e5b78e49670178dbf5ba32cf80b437aa91857acd0c6590eb60cf39f4dcc460b16519d86ea05c08e2e0fbd670e49ee4dcb5831ef79cf7cca12ada3d SHA512 bddc5e4776a5b27533fb179aa4102618f8f6a9e9afc1202f962734f5854bd4e60bddac6141fafa297060b544b633be269646a8cb3b4896f0003e2e707d2930b8
-EBUILD xinit-1.4.0.ebuild 1763 BLAKE2B 7d49d469b42eeaf75f13f311099e02b8e38d98c436ee4ad6d287f8da59c236a541d870cdf6f8c9f1f751fc2b4e81ac51e5b5f52d4d6e7f7092b9d8234fbf9e20 SHA512 8e25718b5ca76a6ecb8557cc73a7a03fa7b5e3a9ebba32e3a4ca3de7f1b8b3dedc96238028345ea95ca332b88d89604bbfa2bac05dd4a9ff8e5dab198c236b79
+EBUILD xinit-1.4.0.ebuild 1762 BLAKE2B 125af5b99a63b2e7a49bd3c815c3737eae97090d499c7f54cf8560f1fe780d4a5100754b021f7d89ea8f337d3df40c0189277ed979dff055471b9c82a8bb9f84 SHA512 ed09d694dfa29a45fd51bf3700564c7e5ce31bb8dcad6a3b63e7a0921060c0b314bf4c6881c940decc071f5058ca8a71ed2cf99a60dfd884f865eec9a9237245
 MISC metadata.xml 480 BLAKE2B 190a0b3a84e4d0d85e0928b964cb820599510c6c09a1a7c385b2f9b402a44478e08b48fce2d88216fe2fd52a3f35ec02d99cb7d738caf8a2d8dd6418e36f6125 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55
diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild b/x11-apps/xinit/xinit-1.4.0.ebuild
index b52564c0651a..980a062d1359 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
diff --git a/x11-apps/xinput/Manifest b/x11-apps/xinput/Manifest
index 57a5dda4c549..573ac6f4f495 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1,5 +1,5 @@
 DIST xinput-1.6.1.tar.bz2 152587 BLAKE2B 7c60a40d35b1eed9da72524d4415c9cfe4a0a0a9a5152b46123972cfdb9a3874f5e333d4ae43dae3a11e1af970d8ba309467f0457221072c2acd0d6530d40266 SHA512 b7770152837ee1f1d44e2737c0955d021441c4a8896edd63a6de896624315f1dc8c0391ce3ef23551ff584b0ed549103ae436bbfcab26f97cfc9f6dfb156f22a
 DIST xinput-1.6.2.tar.bz2 158061 BLAKE2B ed9c8ab412979353ecd6a63575b57238ce37fe76da7b0104fce0576b6736a7a521998225ec4c39e117b97d420f4d0c63662c019011b4e54400b7475ed44ec6e3 SHA512 dbef3a87dd47bb8c593f1305bea7978697a12434a4992584e4124d745bb366812366b44fc205159137a3db6f7b8338effd1b90641a194497b19159b9fd91939e
-EBUILD xinput-1.6.1.ebuild 456 BLAKE2B bdb6375d5e2cca97dfd50f123f6f969e92bd1feefbc09cb10d10653ba2c985095dc1d3d202baad2952a07e3f8b98ee262b85ba36cc0b064ba289634ac10f1cc5 SHA512 43d894d0a777e1bdb9d0e380ba9909025c297957698e687cb2c42f5770d5728eeb50134cebcdbcacffe9ffc5acd55138673dca17bed2f23478e5d0b28dfb81fd
-EBUILD xinput-1.6.2.ebuild 463 BLAKE2B d4c8aca7891c7dd47fde6c962524e61f07ffaad7e0e83cdcfef4feed1abadfab34dfa0058ab413b67be9b79e466a896d7c6c2fd2c5fb9ade2ad3156aea75b69d SHA512 f89aa6dc30edba15f2aa0a724ab19c0089671b44d7a0bff3a7df52484482861c2f35ea4b8db970329ef4d46720dddded47841e0d87e9213c20894a6d2b69da79
+EBUILD xinput-1.6.1.ebuild 444 BLAKE2B 5a3273613af4369bedbe08537adc991826dbc23abb4aeb710642356cac135057c3f7e87c0b9f4e96e751888e2beb83ab122ab60d6d291c1fc8382f59c8378e99 SHA512 e3a6345718f64f2a8424609a8060dc5b5d9569f629039af811e08297a22fa5fa57795a34ee16cb4248c9801d7ac913689c6cbc275139ce5649453ec900a37c32
+EBUILD xinput-1.6.2.ebuild 451 BLAKE2B 9d2eec956143579a5a8f62b396b26e75fafdb05294835aacb44d0da6c67b26af4771f8855765bcdb9a10da824d5edcd4f697a623499755d552876bc6bb1c6ddd SHA512 69292f98d2f26dcc4440b7165b173a066843e26528fcac3d6ecf70f2d6dc3368863e4d0d1a4ae68caa03617ed3394cb06132c0d553d7e556872e55839b461778
 MISC metadata.xml 315 BLAKE2B 29713769214403192ffd5937d2585eb204044d95976ff4836b1cd94406420c6c15d1df6efe7da1dd1afd7f3e950e025994dfd13e4e8fc70cd521e24ca63cbdbd SHA512 d2d36e4e38b384daa8555a0824dc7fcd364b9a61350a31a7c25f7d24e42901e0386606a8410800e7ca6efac8b49c11b805b76bd27f1510f3dd89ba91a0856400
diff --git a/x11-apps/xinput/xinput-1.6.1.ebuild b/x11-apps/xinput/xinput-1.6.1.ebuild
index 56ec43dcc08d..3b30c64ba019 100644
--- a/x11-apps/xinput/xinput-1.6.1.ebuild
+++ b/x11-apps/xinput/xinput-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,4 +15,4 @@ RDEPEND=">=x11-libs/libX11-1.3
 	x11-libs/libXinerama
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.1.99.1"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xinput/xinput-1.6.2.ebuild b/x11-apps/xinput/xinput-1.6.2.ebuild
index 6084a3a12fb4..4e7ffe27b9ae 100644
--- a/x11-apps/xinput/xinput-1.6.2.ebuild
+++ b/x11-apps/xinput/xinput-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,4 +15,4 @@ RDEPEND=">=x11-libs/libX11-1.3
 	x11-libs/libXinerama
 	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.1.99.1"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index 9f43af6bc509..eeb0eb7df347 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -3,5 +3,5 @@ DIST xkbcomp-1.4.0.tar.bz2 243774 BLAKE2B f6a226abfe555608a898a7db40fd83cac954bc
 DIST xkbcomp-1.4.1.tar.bz2 251069 BLAKE2B dd485d2a5c985bace74fb5cc8da64d6b33dc9450c2e98f42e7e82f989faaa724da068799c40d2703da7172d758e67ece633ca47d2fc97342ec7a9aaedd71d201 SHA512 443397e112f67e2ebc5150ec0dbf0f4a072ea39585d964d2c7cbd0569b7e0ce7d8bed0bc2c2d886343fdb060c941e65b42aac16adf189c66e90849029e278f23
 EBUILD xkbcomp-1.3.1.ebuild 458 BLAKE2B c06aff2b862cf68af1950647fe3d8f60342cb17225516c1d31a6932371e49199551b290311d58cb57312cf8854e8975e84d5b0fe1a2ebd81b407fd520bb98363 SHA512 fbccde9c157ba47ae47ae3cdd52c3fe254dbb2fc4f395f0b5ad5e18f52f35022912646b42ba141b08ef1e644293ab59ab07fee437e4b4a8c5534083406dc3443
 EBUILD xkbcomp-1.4.0.ebuild 458 BLAKE2B 494541c3f941fedd25b488a4094bc0f92598948b454eb1bf32c5abac18dbdae01af939d4e259928b450cc7976d9f93fb49cd207e239e99c6bb6999f37152586e SHA512 899bc4a357b2a9feca67fe97e9b3a2b7bdfef6d180331493cfe3b4dec67e1b669f5f956a7f244973acf8bb8c0d96d961d399644487279d07b55be63f4341de33
-EBUILD xkbcomp-1.4.1.ebuild 460 BLAKE2B f1538206eca7fe809b94de32f767c2db9284a2bc9d8845804faa42ba0119adb75555eb125648637752ba5480fd9cbe3802ca73499f9ba7e446f9932a10753563 SHA512 3236a92e61eb24c090857b63b7b41cf5a2c50773193a4f040602320ff132beb7db2c82984000cb67b877c0a229f55a9fa27667df3c2326a47423d3eb45d064a7
+EBUILD xkbcomp-1.4.1.ebuild 459 BLAKE2B 5ad7a3b31d467692c80abfff18903399c2a5f43222e4081ab4a1ba768ed42712f74317622846cc3a1f2813a0254a2a09b30481f5fa82f62798841962dfe91579 SHA512 a430b31cae73f61b98c15ae3ae6735fbb465827894ef2ffe151e408b79beb87be71e342efd5c91f2a6add9bb173d696e6b0e433e63e12bc936c11a3fa64efada
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
index 3b2956725e56..0f8d6920e19b 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 6211c8de56e8..e1fddaa81bc6 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,3 +1,3 @@
 DIST xkbutils-1.0.4.tar.bz2 131269 BLAKE2B 20e51a33b280bf4eaf6dfb3b2986ffdb09d1bb4fe3dd3689de5256204cc0e90808367b0afc054e2b5a6746b3b125bc0d20337761e1714c069f3c300a65fddb06 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d
-EBUILD xkbutils-1.0.4.ebuild 404 BLAKE2B b1151e09f7614692260a159e6721650ae5950d42c21c3c6fab320ebf5902b16d3a7608cd9890ad14f5897adc4afca2631acfb28da8cf1bc916861f798316cd1f SHA512 ebcad94e6598a8e71005d4968e75e69fbe0c0d27873c12490c50473da2d58686b1557d05405a56d26c8b68e5109ad79628f29ca0bdfff6fbfd95a6fdad24db91
+EBUILD xkbutils-1.0.4.ebuild 385 BLAKE2B 4417b476e25de14ca66833253d5eb5cdcd2a566d1897da4c56fdb4981fb318082922ed9c66aef4d71193eea753dd41de4dd441f6aeb406dabcdc9711ea68dcdd SHA512 97227d9d3dcca575bd2d8e6d4bb87cf880b913e9797729e3f6adf30a2697991c18fc96d47643fe27912f6ad97611961453432e313e7d45baf69c8f86957948c6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
index b8c25fa73d30..8922936566fa 100644
--- a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
+++ b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,5 +14,4 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXaw"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/inputproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 4fde440ceb48..429129c5f064 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,5 +1,5 @@
 DIST xprop-1.2.2.tar.bz2 145556 BLAKE2B f1560f7688b4c9a5c2cc55a29aa15181f09d65883f44f63a3761988cc1b905c768a1cfebe9303b3f5e12d0c84e0e6a0ced79d69e49e2d5ab99087c16157d4c41 SHA512 934a46423d4904e57a3f5fc4ffed469f85a9bb6a3544cd2d2f80cf7ac1e6ebe1de8b3631c99a4d32c0f02992fcc940e2938832751182f0996ba3a95017794572
 DIST xprop-1.2.3.tar.bz2 149202 BLAKE2B 57c6459b873ecb91adb2bd01c350918abf95b8eb33ad1de05ded1f49350bbf3be2c46f597d9f559d473c9dd41dab2b327ca2c3e8a0fe742498e5a2c94ca1ca22 SHA512 ad7987fec11ae19b7adc3b0f683fc393e95155f3b6c753d1d8744aedcfb360452eee5735a4c380152b286905931515f3e1a28676b5531001eb8dd93b7249916a
-EBUILD xprop-1.2.2.ebuild 432 BLAKE2B f6a64d516beda5fc5e341ddd2ec5c3011f6d4f541fd863693b671b58dca732c7c446add6305fe2c4bd4c3a07ad234aeda87d2e69cd148a339dcda5fec3f499d8 SHA512 f6a30db3566a9b9b8b47968903dd9f863343d986162d2ab585ae24e48036e337d16c2dad6dfc4608efaf2d18076eefaaf72ba4c576b86d0519e861e6f7d7acfb
-EBUILD xprop-1.2.3.ebuild 432 BLAKE2B fc10252ba6d2f79a7b3f36e2f72eddcd7236a7097d887e31e3136f69fcbe10ddf38fd84759d2c9820510bad7e171cec32a26b9d7041c0876f522efbc661453fa SHA512 637d5670bbf15028a03255018c7623b4768a72d38f2ca35b2e7a09c4f496d13e5ad077afbb102c28b78edd0329e4783a80c12db407f26f1186187ff4112fddf1
+EBUILD xprop-1.2.2.ebuild 426 BLAKE2B b22e703405d55389ff50be52ffc897dbfd56ae91ef786177c4470fe0a988819de441e3c20f3169d80c5ca57547797d71f45901280cab46965fdbdbb58c00709e SHA512 c5f814faa896f2f311263e354c7eec078d2da90c2a48f7d2d3e0c737cf589add2f657ac4f0c734f670c58c5cf4d91f3958f5dc3f27009d2297b0b74cbe21e2b8
+EBUILD xprop-1.2.3.ebuild 426 BLAKE2B b22e703405d55389ff50be52ffc897dbfd56ae91ef786177c4470fe0a988819de441e3c20f3169d80c5ca57547797d71f45901280cab46965fdbdbb58c00709e SHA512 c5f814faa896f2f311263e354c7eec078d2da90c2a48f7d2d3e0c737cf589add2f657ac4f0c734f670c58c5cf4d91f3958f5dc3f27009d2297b0b74cbe21e2b8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.2.ebuild b/x11-apps/xprop/xprop-1.2.2.ebuild
index 65e87ccc79ee..574b5572a9fa 100644
--- a/x11-apps/xprop/xprop-1.2.2.ebuild
+++ b/x11-apps/xprop/xprop-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,5 +11,5 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.17
+	x11-base/xorg-proto
 "
diff --git a/x11-apps/xprop/xprop-1.2.3.ebuild b/x11-apps/xprop/xprop-1.2.3.ebuild
index eaa51ead5c37..574b5572a9fa 100644
--- a/x11-apps/xprop/xprop-1.2.3.ebuild
+++ b/x11-apps/xprop/xprop-1.2.3.ebuild
@@ -11,5 +11,5 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.25
+	x11-base/xorg-proto
 "
diff --git a/x11-apps/xtrap/Manifest b/x11-apps/xtrap/Manifest
index d9d819c90ec7..d011c1b99ab2 100644
--- a/x11-apps/xtrap/Manifest
+++ b/x11-apps/xtrap/Manifest
@@ -1,5 +1,5 @@
 DIST xtrap-1.0.2.tar.bz2 95471 BLAKE2B 430d6881b743094b1e9b6eb60479cef44d636108ace4d53db35ed0371c567b2623088c5997c1dedebf17143bdd81f2e531f7b7c728f3336fc2c419b1ff3c8b39 SHA512 5fe6e02dd36d2fb65e5b83cbdae81d89fcbf467c9fc3f943a013299c2fc03c76f125627294302acb808d8b53e3ec51a82ba288d793df6ba3e88e0c980c6b3f77
 DIST xtrap-1.0.3.tar.bz2 134065 BLAKE2B f0e67ff4436a2c7eafd2ed4e6fe5c1d41dbd397918cbffa81587c4b3276c206cc4b9e4e889d50588ffb2dd1b029f04304acf1f34c27b1dccc52c61342ed5be91 SHA512 cdb205859a96a64ede8ce1df119c318e5b6d35107425996c18be0ec56a6287a0564d768f93012f301cb91d517f67261de5c76441c0bfb796cc0190799aaf6c2f
-EBUILD xtrap-1.0.2-r1.ebuild 324 BLAKE2B 5729a161893d22d7de7965ccc2817bf6fe83a306a28aab19dd3c16abc8ab0b847e41d3c1e8b25a6ed34b7c017cdb1f35b6807ef244e17885d8de6cf808b3b2ac SHA512 6ff90efec4593cdce795f438a7e016029823264f4cd7f0759b4d74601926f29346e24aafbd1030d71249ea2e6570dcaa29cb52c12337a3f1a32328119ca6710c
-EBUILD xtrap-1.0.3.ebuild 346 BLAKE2B fcdd39b579fbeefad5182f233c2fd640e4aad723ad37282617161f95d70d9b70b573872b2addcbe444e63050d848002e299ecb8c5065304408beb9045b93378b SHA512 37fc7e03f2f840c1f9f3c6dde0b77041813ab54e68cc330a93743388037e56779119e189f5b6858d3abb93656bbe1ae29d37973790a2c29e28efeae47f58488f
+EBUILD xtrap-1.0.2-r1.ebuild 324 BLAKE2B d271e66251759aa367ee5f02a789e7147a63d484f2a5690d2cc9267025824bd6ee66f0cbcd6510c561a9ee9010fd7c5d6675380bdc9e3c7ccb38d71f8d6af440 SHA512 caf4835f82b3b582bb63b7b4cd1edfa7d9630d32f6cf88fff0810e245ccaba1b2164570290d8e0c6382981f67fa7c1c09b45d225d7f462157a01a3106a3e46be
+EBUILD xtrap-1.0.3.ebuild 345 BLAKE2B 55bec46bdbcd25804a166e8d71ca128a0cb853cfbb392dcae2853f728f75dcbcfbdadd8411e820614839f91c1bc9a665ac0a4e39ef4672d7064c0cab39cb0e26 SHA512 e9115511a798df284cdadd56d0b58311681c329ce6f99ad3d5964c6dbb9099080a46361c48a264f86b3528fb6561a83e2c182e4c4b9b1a29571d88c9c25657bc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
index f5919090c5e6..fbe79b1339ed 100644
--- a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
+++ b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -10,4 +10,4 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXTrap"
 DEPEND="${RDEPEND}
-	x11-proto/trapproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xtrap/xtrap-1.0.3.ebuild b/x11-apps/xtrap/xtrap-1.0.3.ebuild
index 4575e7f8ec75..bd3a6b9a5ca6 100644
--- a/x11-apps/xtrap/xtrap-1.0.3.ebuild
+++ b/x11-apps/xtrap/xtrap-1.0.3.ebuild
@@ -5,10 +5,10 @@ EAPI="5"
 inherit xorg-2
 
 DESCRIPTION="X.Org xtrap application"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXTrap"
 DEPEND="${RDEPEND}
-	x11-proto/trapproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xvidtune/Manifest b/x11-apps/xvidtune/Manifest
index 9479cde2f83c..3ce581832831 100644
--- a/x11-apps/xvidtune/Manifest
+++ b/x11-apps/xvidtune/Manifest
@@ -1,5 +1,5 @@
 DIST xvidtune-1.0.2.tar.bz2 113117 BLAKE2B ca6c59d1554370bbee31b508fe291049592467d5228e3e5355f8e6b45193c9a683df35c75ad4c66e399bd5a5a9fcb9c044603d27a5b1d1d4fafad58fbe3b837e SHA512 4afbd4739e9fd1f94f7c5694a0bf4f7c90deba8e0b34ae446b49058293ccc90f27d0b3da2a134e1724f87183b8bbef73035eaf8c82fc11094e85b6e84c773276
 DIST xvidtune-1.0.3.tar.bz2 128492 BLAKE2B 87271fa736f1c377f48f36fbb63a28ad0e6327ca612b681328aec44cafa839f5e1c04b239907e25f547b5a69e7dbd92bccd3500ed20760efcf18fb570078241b SHA512 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352
-EBUILD xvidtune-1.0.2-r1.ebuild 392 BLAKE2B 24da12aafe043cbce8b6e15c7da490f48d4167af79c584f094486817384e8ae00b27d3b1be8c7651f61cd2cc2583a3a106049b591f1ac22246df8842e38afc8d SHA512 3fcd21d92381ecc6050373aff8b6c0d8c1a06464a6f069cee27a42beed96d4798d936d8c85cbe10608f769db21eaa58a26d580f8a088903885ccba16078e19ef
-EBUILD xvidtune-1.0.3.ebuild 394 BLAKE2B 254b845c1180f973db3a20769bc65f924893d9f1634136392710a35633a4d5ac8941c6d5db00abd4d04aa69d1d2a8f43860759b83ac6442e8d9f7094380ec72a SHA512 e218d6a48007e663eb8f429402d6173efe96e9bb807fb8b569004dc242b73416427d99ca434c6abf166974181e10f14b701f01aaf0960903ed7fa2f8a8589419
+EBUILD xvidtune-1.0.2-r1.ebuild 385 BLAKE2B b9524abc47248e1bb9e44da0ccd86bf887571d70daf94352d0121117099424046d4ae06d541d01d0b9430cc415c82d7d07a2d8f928307cfab8eeb51e2d8862fb SHA512 7c1ff2ad8d4d65c7426263d5bba9cab38ec8ec5b99ba988f33d1e8014ceb63914da86985e01fe2fb75f0cdc99c662b2d4c023fdbc0e60ee0577ceb2045dfdf16
+EBUILD xvidtune-1.0.3.ebuild 387 BLAKE2B afed5e237a469f6578311fc545f2869865a3bbe87a985f4d4373ade1d1fc12365b1dbe42ddd693e074ff9691676b873b287de6f6fed951d9574ec2b17fac65cf SHA512 5bac1f6468e9a5a85bdaf317e6c6c394d12d85d726515e4d22ef0e377cbfe091897bfa9bb9728b830fcdde72bc51be88c03fe44d171b9c54c1e270bbae634eec
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
index c0e6df2bc894..2da520d4712c 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,4 +15,4 @@ RDEPEND="x11-libs/libXaw
 	x11-libs/libXt
 	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
index eb84ada1084d..c4801d350364 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,4 +15,4 @@ RDEPEND="x11-libs/libXaw
 	x11-libs/libXt
 	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto"
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index ee421bc4cc11..ff322ba1a97e 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,5 +1,5 @@
 DIST xwd-1.0.6.tar.bz2 144548 BLAKE2B 56560a36931d15f6f59d6c6548325e559534cee10cb13b07722bce5b47d7d2360244b29e88a66a58ffffd2209336f0ffb14cbabb0369c144ceeeabb4eb184b06 SHA512 8fb86cbe163631fdb3f49ad6bb648ea599d7c5f9b11aba7e88afb86daed34cab88dcba057e0c5ca3e4e5904598b279f5a68ad43a64dd1053d647aa78523a806f
 DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
-EBUILD xwd-1.0.6.ebuild 462 BLAKE2B bbd6d4ea5a075b8e7dbc84cc14536fe2a3a588706e31954e6569c479f338933813b4fd2be72cbfdab38b9c742f99295af046302421e00e8950760f7bf6032a11 SHA512 9e07413ae79fa875abebfe27c2a820d2c72f263b9ad3e42332605ce8131f2667a5bc3f129fbd6d2838ed4e23d6f5162068f891fa87dcd229592e8c56a3cd6fc1
-EBUILD xwd-1.0.7.ebuild 462 BLAKE2B 0034aa92744d0e295bf7a724ed5fa3d17a5407018b0f173e4fa5c8fbb059677bcf1fffad48519eb3555fbb7aab0ff4488c09cce944da138139fe1a2e9231973d SHA512 8b6c1d53f11a6e5d871048a43f290b5e717d3b744e073605cd73375de49d1e56683794cb7c7a7f8c435080b482b291495363d3d48fb5c74f299432f815935a7c
+EBUILD xwd-1.0.6.ebuild 465 BLAKE2B feffeca201137087233ddf7393331382a421140b4d6dd2cbbbf2079b1a2a63fd0c86315be5b270fd4e0fb3dee862b808a4d6954493b02b57189815aa4a576df1 SHA512 f43fb091f7427ce754f0030bd280edde9e4d19c2527b89346e99db63518f22fc263db5439b539f7e906943707e33827aaef724b08ba59d7e639ce3170d41eade
+EBUILD xwd-1.0.7.ebuild 465 BLAKE2B feffeca201137087233ddf7393331382a421140b4d6dd2cbbbf2079b1a2a63fd0c86315be5b270fd4e0fb3dee862b808a4d6954493b02b57189815aa4a576df1 SHA512 f43fb091f7427ce754f0030bd280edde9e4d19c2527b89346e99db63518f22fc263db5439b539f7e906943707e33827aaef724b08ba59d7e639ce3170d41eade
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild
index ec840a7e31bf..cd0a83992aef 100644
--- a/x11-apps/xwd/xwd-1.0.6.ebuild
+++ b/x11-apps/xwd/xwd-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,6 @@ IUSE=""
 # libXt dependency is not in configure.ac, bug #408629, upstream #47462."
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	x11-libs/libXt
-	x11-libs/libxkbfile
-	x11-proto/xproto"
+	x11-libs/libxkbfile"
diff --git a/x11-apps/xwd/xwd-1.0.7.ebuild b/x11-apps/xwd/xwd-1.0.7.ebuild
index d88f8dfd465c..cd0a83992aef 100644
--- a/x11-apps/xwd/xwd-1.0.7.ebuild
+++ b/x11-apps/xwd/xwd-1.0.7.ebuild
@@ -13,6 +13,6 @@ IUSE=""
 # libXt dependency is not in configure.ac, bug #408629, upstream #47462."
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	x11-libs/libXt
-	x11-libs/libxkbfile
-	x11-proto/xproto"
+	x11-libs/libxkbfile"
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index a2b56cf4d7e9..37ad62d6ce1c 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,5 +1,5 @@
 DIST xwininfo-1.1.3.tar.bz2 157512 BLAKE2B eba1f98cf8aa8afc68a5bc0f538e1e0588a38bd0022ba0a2bf6da7e2cbcd4459111aed37f88b8d46054f8c3e52e435d0c95a8f7c9b1247580dde812a3bd3715c SHA512 b4c3c72de157d33e309694be96dcafabb3240c1883fb3caf44843cba8b90fe09496eb4ab061eba9107115d76ca59a8ec660e11ff968e422ab35cd5e1749ca466
 DIST xwininfo-1.1.4.tar.bz2 169159 BLAKE2B 4bdf7321eba8e2cd078c3220e3135ca1b044461ab90b8daa350beed1feb53f02dd9dd4c1192be6dd6b9ef2a9dc028c4a9c464f3124590e6195aca7547ed61830 SHA512 d3ab103a0a311e08d1eabc4346750c21eb7d2fbcdc27cab0989a2624b9cd488911614fcf9832603353450114b1231a8f8262cab16e090a0d458d83ec7b6b959b
-EBUILD xwininfo-1.1.3.ebuild 741 BLAKE2B 376b205354177dec9cd17d1d11f04413b18820608a7c38db078d3a10f888da97c85b4c67d3881185ed609583af26e680692bc2c464cc97c531dc16e9362dd57e SHA512 d48b8bba681614c0e5355c512977455cfde7de628cfaa3fd511dbe30b1eeb3b3e5c2bf950a6d384c2e8d9af9a49dbdf38b65f767a75d2e7692d0ccc666be6d84
-EBUILD xwininfo-1.1.4.ebuild 741 BLAKE2B 6f014028708c38e4f9390ed4678a6882ba9ee3e9fa00ad7cbf5f5d05b82a27002aa0ed52f69ad329e592451245e6ae4e5d76cac1024554eab2591c496b567fa3 SHA512 65041f52214a9171a378b30a87cd92a220d9a6d20776f5b1e3fa61948d67f938d4d1f173ae51769c3d7fe9cf4cfc80a996f2b8369791a4e3a6b4ee5bec302d3a
+EBUILD xwininfo-1.1.3.ebuild 735 BLAKE2B 25d7e78b415715c25ad7c723963e1ca45b65e13a179e2bb771516aa89449cc74b6ba9231c5b3f82274c3a7e2cf31565045188a347c0cb1daae4f26aa756499a2 SHA512 0ed87c6355c120b111322aa15c97231cb210d73255734389e9769f0c4a6efb4d15c8d03308a865e6725b6e762ceff0630026ebff9b26134c1782be7feb2d4a2b
+EBUILD xwininfo-1.1.4.ebuild 735 BLAKE2B 25d7e78b415715c25ad7c723963e1ca45b65e13a179e2bb771516aa89449cc74b6ba9231c5b3f82274c3a7e2cf31565045188a347c0cb1daae4f26aa756499a2 SHA512 0ed87c6355c120b111322aa15c97231cb210d73255734389e9769f0c4a6efb4d15c8d03308a865e6725b6e762ceff0630026ebff9b26134c1782be7feb2d4a2b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
index 9a8fb51ef20c..251eb77838dc 100644
--- a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
+++ b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,8 +12,8 @@ IUSE=""
 
 RDEPEND=">=x11-libs/libxcb-1.6"
 DEPEND="${RDEPEND}
-	x11-libs/libX11
-	>=x11-proto/xproto-7.0.17"
+	x11-base/xorg-proto
+	x11-libs/libX11"
 
 pkg_setup() {
 	# interix has a _very_ old iconv in libc, however, including
diff --git a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild
index 4e7c0e6044cc..251eb77838dc 100644
--- a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild
+++ b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild
@@ -12,8 +12,8 @@ IUSE=""
 
 RDEPEND=">=x11-libs/libxcb-1.6"
 DEPEND="${RDEPEND}
-	x11-libs/libX11
-	>=x11-proto/xproto-7.0.17"
+	x11-base/xorg-proto
+	x11-libs/libX11"
 
 pkg_setup() {
 	# interix has a _very_ old iconv in libc, however, including