gentoo resync : 22.05.2018

92 files changed, 176 insertions, 292 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index a74a4f4224d6..67ef3f2301a1 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/aewm++/Manifest b/x11-wm/aewm++/Manifest
index 70b8271bc2b7..f5497ccfad09 100644
--- a/x11-wm/aewm++/Manifest
+++ b/x11-wm/aewm++/Manifest
@@ -1,5 +1,5 @@
 AUX aewm++-1.1.5-gcc43.patch 1011 BLAKE2B 8450e4a1028275196533a3d41450ef094bbd58c442fea8e8963e43155659a6e935ee612adecd8aa29654999c9599bfe1c1e800e749944faa724c9be0dd4756ca SHA512 aa95ca31f68ac57ee4d92377b39839594b8673cf9f54834c15026ab385c17dace0f0e7673feb9b92bbab5aaa528dbd4a861e7df5e3b257052cb253bdffeda3bd
 AUX aewm++-1.1.5-makefile.patch 853 BLAKE2B d5f90e83b0c4e7b10c6afc057578ad5db820c5ac31840eff812a3ae482dd2609fb6657c45817318abace461577bbd4e973c3e67d5b6c8ad5b0df76ce60aace62 SHA512 f4d3ddec499e18598c6a2d99aed0f709226bbc43b6183c7bb5832e26d2fbe99c3292fe9c249613f62c962e10ddace5b10b6ee3d484f3030d1d233ce0b2269adc
 DIST aewm++-1.1.5.tar.gz 24553 BLAKE2B f6a013cbc33476a809623c434dd0d1dc38766d27beb42e042c39e8a51db03410ea5cbdfae0f2169df46722d72d25542d920fad4881d48f589a832847177e4961 SHA512 84fe2d51e82a2098a42ad405da705810e5d3b93513a30cd688f7bb8c717875b286b64bbd8e48ab799e4ee14ac27097fb98276f89bcfeb9301dc8187d0bcad370
-EBUILD aewm++-1.1.5-r2.ebuild 590 BLAKE2B f02c645ab6ed9241172c80b209ef44cc5c4f788ae5bbd7b21082dd8a68afe15f17c292c127e7d2d2ad0b40d3b97346bf6c4764f6d928ea77ba3d12f4a2f8ee78 SHA512 383e45f24d99c7ca037ce4f92c47235bd1c9c75b4dbc12233d45b9095c80b870ab37645ac93e0fd6c218bd36c7f0d2266be9521e81992d7f917b9f84f485f90b
+EBUILD aewm++-1.1.5-r2.ebuild 572 BLAKE2B cd3971939e4569effb91d82ac7f4f325e2eca86644fa8a216b86aa46227af634c9dcabc00946388d1c9d357dad36b1636abfd2d32bb8655c57ca8225bde3b9b3 SHA512 0dc9de98fb400d0164a357d3348ee2a52ed90a6c180640235b97186dcf955745ca93c305a5ecd14539daa857cf7da6fedd92d15329106c5e08c4529bdb15ede5
 MISC metadata.xml 461 BLAKE2B 1629877b72d2339d7ff8d53e34f217f9cd025d6c9bec873d9fe35020663c6b4f93878bd46c6c4d4600c62bf32a1d2ec10d5f763520390d7ebe7c50e482c51b0e SHA512 d26ec6f5aadf0ad8fce04d95bed45a4cc2b5ff8c12f36ad522171e2589829b8805720e2b1c1f3e5c636c9737cc391ff57d7397d406478d204077b55729047eb1
diff --git a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
index 601677e367b8..be82ae9aeef9 100644
--- a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
+++ b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
@@ -16,8 +16,7 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 0b4c415ba416..afefae5e9e6b 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,4 +1,4 @@
 AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb053546261fbeb8d6f6e79d49f7561381cc02a614cc17998e37d40e000df1def0be71c8417194ea448797c911e6c8 SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
-EBUILD aewm-1.3.12.ebuild 964 BLAKE2B a9314dbd6c35b297c13994e4e5063080d33091323570d35f73b019704ea5159bde45593641c452ed6fa19c072546b9d8de5494d4c4129cf5a1c14ee97f937786 SHA512 34a8944f454daa6368f40710c973ee832657844a218a960a0ee2368be829efec22bfaee5cca2c4ef923414581a600ac6d1702e20efa7eb01840d3577a842f442
+EBUILD aewm-1.3.12.ebuild 946 BLAKE2B 742e2865b7ac0b219b47c458d6260535f4814d9245d2ea8e09d6af87aa88ce5997d93abe97f32a4165b1fdfb8a90ac723d4b05c5293a1b46e6e61d45d586c521 SHA512 18f47281037e0cedeac11a5bf02045479b245b946847b2c6c2b2fe6507dd39bf14d64fe3b78d7dd9460076120a88231bf5ec485e2de2a9d1f3e917b5100a2ba0
 MISC metadata.xml 559 BLAKE2B 262c00ea913f10dccedef6d9b086d19de9b2b210cba0dac9125cad36642149d76b669387682ce1fa09fd96cfc715e618e1cc9c758ab2a66838d6fcf7fdb6a182 SHA512 f9a2092397717d558532432ee9ccb9715923338145485b7655fa84b83d08c89d900c3baf16d60cf3d16e5d495d26f04d889371ab010aa3dc54bdff3d7fa04831
diff --git a/x11-wm/aewm/aewm-1.3.12.ebuild b/x11-wm/aewm/aewm-1.3.12.ebuild
index 12e9f0fb5727..4bc663d65e6c 100644
--- a/x11-wm/aewm/aewm-1.3.12.ebuild
+++ b/x11-wm/aewm/aewm-1.3.12.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
@@ -22,8 +22,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index ee1e41739000..61a5667c43bd 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,5 +1,5 @@
 AUX afterstep 29 BLAKE2B 9bd4a8ece18d1192c4b36c18c4ec8920069f8e7b82f0812bef902657bf0029137dc6a0f5bdaf1c5dd3102dd3c70697410a8edfb094292fbed375633ae59d2f88 SHA512 194b2af81df48b4c87704bee1db1d01c4cfac3a529f76d8d073fb1358aa95eb9e84a9c2a7da12983a64d61b63e2689b93a79b778007bb8bcdfad8574086ba852
 AUX afterstep-2.2.12-gcc5.patch 9374 BLAKE2B c80a928feb81c3cb53322add051c28fed30cca8bb54813ba1655fc7991e308086ada771ce87db0567c31274594060bfb986c0a805424f5d02d5f73de65605bdc SHA512 81f0998409d9d45f8a25d66cd1c0ae07d23f6ed40f77f56241aae9085d0098510058807f24310c557825ebd67a513cb0c67ff0430cb2f33d2e355e6482c2b491
 DIST AfterStep-2.2.12.tar.bz2 6132233 BLAKE2B 44a597f55bd500f4bb34f499cc5f6f6a011b421d27fc118775fb9f3ff64d9553f5cb9e62aabcc8d0461ef53351e318ed0b6c0385654c40b2cc94d098e2040b05 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee
-EBUILD afterstep-2.2.12.ebuild 3476 BLAKE2B 9654f2c5233c5ccae3b8c58ffa6a4fcf311e70ec68aef86d352d0aba5b917b3d9d3ade4e65b53de8f5bde3e15662315927bde6c8e999d3bc797eb5f13c1cf7ef SHA512 8635b0b40af2a9a870c269033fdd33b6d433b0aaec6d03ba46e393e76b4cf2c76a0a784bf0649cded7f7ef5e08b1cffec0beb564f0ce7b2158d80296bd82d811
+EBUILD afterstep-2.2.12.ebuild 3419 BLAKE2B e70b05658c1af1afb98c1f200e0b37613e76ce810ab3e3aeb7b3edbaa41514a98456dd9d9cd9291c5417f68a94171c07e2c9d538e7112062a5b5aec3e96ac07f SHA512 ab1f6a40cdcb9a8d476d353f8c1746cf617083f9d09796cd08dda0b5c5f126e5ec56391690d67985ef8c570af5ef612cc4a38081da06586f39036b55dae57c69
 MISC metadata.xml 245 BLAKE2B 6621b0f12423f517bfd4000262c79e57c5f68cd2ce8e47f1d9518998a4f273b6db6f7125d163dbbb09636a46e39e0203675438a7e54f88e644480c88a54d71c5 SHA512 9e09ae84ab10dd84251f53e570c7d5bef4a7e3cbfcbba3548d8e3f2a00545b69fb3d01a5905c0d95826b6d0bef822c5c20158c0e70314be191d1d47456aa9a43
diff --git a/x11-wm/afterstep/afterstep-2.2.12.ebuild b/x11-wm/afterstep/afterstep-2.2.12.ebuild
index 3bfc2da9701d..522dd4266352 100644
--- a/x11-wm/afterstep/afterstep-2.2.12.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.12.ebuild
@@ -37,10 +37,8 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	x11-base/xorg-proto
 	!!media-libs/libafterimage
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )
 "
 
 S="${WORKDIR}/${PN}-devel-${PV}"
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
index f5be08c09133..443d7c6a8cd2 100644
--- a/x11-wm/amiwm/Manifest
+++ b/x11-wm/amiwm/Manifest
@@ -2,5 +2,5 @@ AUX amiwm-0.21_p2-flex-2.6.3-fix.patch 686 BLAKE2B 9dc83c547918e54d73db7882f2235
 AUX amiwm-0.21_p2-gentoo.diff 6030 BLAKE2B 9724d841fbb2905c87008f6020853d89b492af2db63546ca81c0eaf1b79c51dfbd4475762b9bd3b95b3dbb05e6a5c23c9341231936d78ad6540db35ae05bf9c7 SHA512 0eed752869ab7a46de2925e13e53796d1459d1ce656cd3d96b0367dcb6f17fbb2e98cd58a336e0d6880f9e76ca037c7ac2b91f1670ecc636f5ba8281dc35aa82
 AUX amiwm-0.21_p2-implicts.patch 1547 BLAKE2B 698d800eefaa82a7887c98fad6beeca349342f392f950af3068d92e07edd81f1110d49088fafb7c548c88888830029cf4b7444fb9025371545728c6422b7d9f9 SHA512 19a0983d7de963f75696968918553c362941e437e5f5ebe75ceb0d0b4f28402c00f1df003bd1639ad6001274b670cad97ce1324afa1aae68c1dc93a424422b1a
 DIST amiwm0.21pl2.tar.gz 195128 BLAKE2B de7c843e6b756797b7a72a8e0b6fde6d4c02893e3eae8262d85d4417a7ad6309c10add802c04dde2d092bc7c8a604edbc96c4a9fc3c7f1166897a7933a978ccb SHA512 6504a4fd4c30a571b0c501b46fdc442fcc993c27b4595753f7bfa12a38c0b997a01d939c7a35e6c499aa0f8972bc0fda7cc88a9fe77091f363f8cd5a9e8d50de
-EBUILD amiwm-0.21_p2.ebuild 1262 BLAKE2B 06308c3db52785b36655b7e4f5f39dceadc04943c894f6b52db1470131259827b8e915dbe668668318119c791b7d275a6151d151e664539f4650d3a30cb5df06 SHA512 73c2b231bfe238d600d4267595c6a63a24c2481a025f72fc73a2fa6e8145acc19b4eed7f0528bc349430d6adddd8d90e9af7bccc046885bf70aac606507e99a3
+EBUILD amiwm-0.21_p2.ebuild 1244 BLAKE2B 8ae34da5973132de636eaea3e2cc2f102109bfaf4aab7ee3ec4df600e519e286a467a60b386a28dcc08186697d84dc01c9238e947a453da1aaff82dfeb63edc7 SHA512 431b38ac15e7a077fc2288e3f71e9d69cedd0366e60f9e4ab7e84c74a8e7b0a72af0f754ca21338b746b857c9f67be7f15f520bc5bb47d4f3792712a6b6d2f70
 MISC metadata.xml 421 BLAKE2B 46cf8aaaec020d3fe7206a8a039c6c00f53958754cc4bd992d3421662c495fe9aff6a53d2a662f7cfae719da48d0668cf3066d8347882da1f056b18ac2b271a2 SHA512 941d314dced43df9951b885f47245c4ca9deff091c8c75727f1cc2b3fcdb485024d4b8e04ebf8d40bebe491bae50522e41ae3cee9f6f600814874f01aae43d90
diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild b/x11-wm/amiwm/amiwm-0.21_p2.ebuild
index 3e5a3cf8bacd..0fba9046d07d 100644
--- a/x11-wm/amiwm/amiwm-0.21_p2.ebuild
+++ b/x11-wm/amiwm/amiwm-0.21_p2.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
@@ -25,8 +25,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xsetroot
 	x11-terms/xterm"
 DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index d2dde6c01130..3027c8e78bfe 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -11,7 +11,7 @@ AUX awesome-session 1999 BLAKE2B c7c784fba884ff0e579eb60cb049e695022be162a535065
 AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5abf5f8fa7467694226bdcd1441bd5c601f0f27e7d2c8656bb4c75cb364cd6d8d641a648611ed2658b27cd389 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d
 DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f2222969599486c2f79b73ba36cfa237270cd5972d4e10e0a4f774a54dfa92948bba5d2e0438687d36739e12c3f5ecc SHA512 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
-EBUILD awesome-3.5.9-r2.ebuild 3127 BLAKE2B 4166794a00826b0ee6f60a09da0e4741509ca0320b7e8db8bf382405a6c2b8292bc98cb2c7c8114581e2d6cf7d732ee7c4378d6e78e6c0ad24df512357ce81f4 SHA512 0d889d9d15de5faa6dc0dd910d22ea7ed40f81818bc021d48c11a67736ecfdb2c9927a5cca6042ed2a730f8d77cf97d05d0e07f8134f979e78f632628b814ef0
-EBUILD awesome-4.2-r2.ebuild 4042 BLAKE2B 9e6873ca0ac2d9f61fb1a6068657a4e8f40e85c263318a20656f838bfd46a337050b32553a455156f00d333173fa4d9c770d54744c2cae06ca72a28e0e1c88bd SHA512 37e782168c0192d5d2da87193029c709c331a79ad050491f6b0d56cadf94894713915b87b2a02184d4076066b51f99d3825cdeb183fb8610477f4014cefab164
-EBUILD awesome-9999.ebuild 3621 BLAKE2B 9026ba9b17972701ed22cad718cab87b13b54a5aa050d46624cc909e71d184075eba9cca443040f5f270e9474d458759967fc522687e6088fd733ea7f6d21c29 SHA512 6a23d4ef60be5a746a037d5ada66ef018f3b5f0e83714ab972489a0434430562a7f78b9eb85c1cb8e7c279485bc59d5efb94963809a93af0321590c0fcc65918
+EBUILD awesome-3.5.9-r2.ebuild 3121 BLAKE2B ea3a419afae1e9964aae9e16e0b0aab842326c3c4bc5e1da1448e52040904fadef52986ab5abc9bc41a0d6d0c3cf67c0b320e18b2e4e1ef61d16c45e63ddd258 SHA512 a5deff9c9bd7dad5b1502c146646da35ab52522dd9fa2de4fbc5f34ab3d490efcd1166ab0ef7488e658e3b35382a82f5a80d25b5d4f30fbb0077cd88e348fedd
+EBUILD awesome-4.2-r2.ebuild 4036 BLAKE2B ea15b83f977e57203d3ea875917c88a86fbe6fe7d4bddb91c4135edf26660be212bed707c3b42bf5951825928ca616fc86ef10f540f64d188c1d97443b7cde88 SHA512 3f90acc941090576ad99b40f97c254431796c29c846db5b67e59303a158e68397d791ec6cbe798d698c91075c56823522b6728f2f955b136e65669743a889c07
+EBUILD awesome-9999.ebuild 3615 BLAKE2B 7bafe7eec8369c0dcab8152d5f40fdc77edff5c05d4d91ab73a92edc09f3754a4f73a7fddd18c4d3cb27c32b57bfb3b182dc3bf0684985d45afa56e503a61a13 SHA512 a39da115a6829487a9bd08b5297e7ca4d4eb443945cc733f8b07d86a390b50137fb9b23f524d9ad5c43210fcac403e34630b8f2c84a0e75e9b02ebc50db43666
 MISC metadata.xml 568 BLAKE2B 2a3b777ad5eca2e372536b4ad13b3861b67f88d1cd7746c9a5c0d5b42ff2aec908d53ffd338a5eed7f146f74602017ec67a3d1e1cedcd61d57741af9c599d754 SHA512 6f46bf6d3ba0d5d7917e6d54fa4b98309a7cca66da2299b3206544b90ff1322a2705fb11cdee31808d91a3a59149811c9c25436cf204787278c03f620ef3b105
diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
index 19db570fd479..6c0ad6ff15c8 100644
--- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	media-gfx/imagemagick[png]
 	>=x11-base/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
+	x11-base/xorg-proto
 	doc? (
 		app-doc/doxygen
 		media-gfx/graphviz
diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild
index 2ed75628ce4a..3642f6c5a127 100644
--- a/x11-wm/awesome/awesome-4.2-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.2-r2.ebuild
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	media-gfx/imagemagick[png]
 	>=x11-base/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
+	x11-base/xorg-proto
 	doc? ( dev-lua/ldoc )
 	test? (
 		app-shells/zsh
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 72cb2ec82622..d3e88b54440d 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	media-gfx/imagemagick[png]
 	>=x11-base/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
+	x11-base/xorg-proto
 	doc? ( dev-lua/ldoc )
 	test? (
 		app-shells/zsh
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index d8c8a80437f4..51948a97b7a9 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -3,5 +3,5 @@ AUX blackbox-0.70.1-gcc-4.3.patch 3274 BLAKE2B 0c29f4a2e97e4339cdd436c4bc18ba9ba
 AUX blackbox-0.70.1-no-LDFLAGS-pc.patch 615 BLAKE2B a0b40fc2b0ad66731387224a653485c5b6bf7b7de204bd9e58dca0b09fb1856c6acaabb0bcfced71f4b934eae5eeb54fda4fec26c64a3b98feee2c96c73ce178 SHA512 5728aad146c8d32d55d72e696c21b5d4381859ecdf38fad064e41c25c9516d91ff965137bf1f9fea0028115b7f08b7d38d5e7760837c009b91e2942598f97c87
 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d
 DIST blackbox-0.70.1.tar.bz2 492399 BLAKE2B d6faed388d2a1fbfbf10baf2b848f78fc5d99bc4e5fb2daf28df7ec9732d9ad5de9dfa87763cea9a954ed72b23207563dda65c92bb37ba2136e8f6e6049e0ab7 SHA512 6e8cf6fd04030a5f97ffd8dbe97aaa0f683f776e7237cdd46f2b93265cd8de665cffce5a352624a2235aa6c42628be13f98d565af765b3f06e95bff404fb0ccb
-EBUILD blackbox-0.70.1-r1.ebuild 1341 BLAKE2B 4b24b6f95bf133c951e50322e4045459097e6c477dcb7e486f46f6a097e969ea2ad9464330df2791d4b499807167d3e470a0d12cd3023652c6ce3e283f4348c2 SHA512 7755948d3a51f9d618996fbcfcd4843d6fdb56751e57232486852ca4f81a6eee979922ec1186984ca17123c497d38b0925f2dc7b5c2f70acfe1ee9eb8b4e8312
+EBUILD blackbox-0.70.1-r1.ebuild 1323 BLAKE2B 9e2b5549edf2296956694eceff701eda6f3784065317e8ec03c6bfe03a7d5e2ce48855a90d5ed093a61957f07a2b59256a6540bd691043634caaa8b6c163c708 SHA512 a0fcca04573cdc00d89cd4ea3b4af0086a4e5d8b61dc8669f281ce8df52e914610fc640f903a432fd2731c6efac98130a4b45259edb95698b1ed932238b3540c
 MISC metadata.xml 490 BLAKE2B 0ca863be035220ffd4a469ec8acfabca05ccc05f45e0fac9972e9a329704270699128d11eb83c3605863cc2d4e53a7fcf3b91104d0efb1fafc76e72f88fedb96 SHA512 e750812e501f74eb1b6f04eeda051bc651a474e0cb667648e68ea46207a1bdcc6d596bf38362dd02fa0c1d48225ee382b00ef276e886c7c525eb0bdc775d76c2
diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
index 112d8fcb051b..773ef0d41a87 100644
--- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,8 +20,7 @@ RDEPEND="x11-libs/libXft
 	truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=sys-apps/sed-4
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc-4.3.patch \
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 6ecbc81d2bc6..0f4df0fef235 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,3 +1,3 @@
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7 SHA512 8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
-EBUILD ctwm-4.0.1.ebuild 899 BLAKE2B 1fbb14215e8b31096c81fec17b3be053f375f65e43dba22ad9568f2d42f4dfb80f9043ced5cd81b2569f15a2b82e8384e0d0c84f946e96ba9aea403974fdcb1c SHA512 6e93d0b57ea19d2a7cfa329f8dbf75d5d6747f2c63c3bcfeb1f06692d935fefcc6ef0d1cfe3c6e4efc0438dd52a458eb56c85e5703721362bc2ffee5cbe659b5
+EBUILD ctwm-4.0.1.ebuild 881 BLAKE2B d476155cb7a13721f3c7c31932a3172d3753bf9c6bb87d8c9e7399bbbf87fc517c2a2b9e4fa24b92352cb6cd5a879cc26e83de604edb16e5e505dc135b5b4700 SHA512 819b7e3d0fff0ae88b1d6f6a4e86fde3c0ddaf51919fa28dd49ca95966fcaf72c7a0d04b5b926a66e18dcdf69761f2ec3d26f1e724b9f322ba588472687a0400
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
index ecd97a4a914c..c509b28861a7 100644
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -27,8 +27,7 @@ DEPEND="
 	app-arch/xz-utils
 	app-text/rman
 	virtual/jpeg
-	x11-proto/xextproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 48a56494ec73..0c7d4c65abfb 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,8 +1,6 @@
 AUX cwm-4.2_p20111229-Makefile.patch 259 BLAKE2B a0d07907342587c807957c6c7fbf521ce39db3bb88c6d9f35212120837aa8e679c2c1c6f0848e7221785fa1b9ff4671bf4f92869b7943e65eebc1dcdeea35425 SHA512 d943debea5c55430b4304809bd9e0ae15d754dc6abd2a9b895f23186faaad12181f4752bf2c663f73aa99d605050c551e483556a6065e60571dc4b3a269bb610
-DIST cwm-5.1.tar.gz 44095 BLAKE2B 105b7991795d1af76ce590d300ecb53af3d8b97c78d6310d9c5f40a1d43fe9079bc75ada083eb465a5ccc1299c9e907f1d24a515223e2285cd8fdc3acdc197d2 SHA512 6bacd3b76aac4773c77e7216714d64f64f5b810904fb68ea62528e13a7326689ce0320b876086c044eac1cd0e24b71c541843c4c679af1184b93d9a9fe041eda
 DIST cwm-5.6-chneukirchen.tar.gz 50799 BLAKE2B 4d9341e89b21187044bbcbc658dea2eac6f6c1c87f25e1b0b81871a9f8b95af7354c8b486bd77f201acba430e019a5c784591cfc5efb281fd40d6670749958ad SHA512 0bb5f9c69e1ed30ef38ced70008baa347032a0c31ee2d4a88e3b45092969a5427ef160577da4891aba3181067235b244f11fc796815f41448930b438099b5bfc
 DIST cwm-5.6-xmw.tar.gz 53738 BLAKE2B 9c36c42fc35a8206035ed59fb8fe2e8eb13effcdb43d488bcc99c2d0f48476e206e46fd52c0928afdb51d55c68d9be03a186aaf4c49d03bcdf8754df0c5d81db SHA512 cf0174523838dba5997206be904ab667efc5ff7e413e98bb81cc3a69d40a79b54e21405787e088486feb8790d1094a2d3cce0be08d7ee36a2b9b0dadd78466c7
-EBUILD cwm-5.1.ebuild 765 BLAKE2B e530133f4d848a5751661b73b236fd7ba4b136a657f0519f812af3da997af31cf23d34eabdd2988959fdc1cab6f3a1ae3726d0c5aad4b4efd4b60a473201c480 SHA512 2d9dddd03cb2a344af40ebf078468072ae58dbb1cecfc9a75d41beb67be8b8b944e5963c4d456945b0e58ecb8276269f68fa096cba7cb6966c3f4963042fe302
 EBUILD cwm-5.6.ebuild 1006 BLAKE2B c104bcfe023a159a8251951ba5854bc81eda5739e1d3d890df3532eebfd41a6fdbfc4eccce83c63a83f2c931c2c1e9897d2386d649b6f32146ab173b36e7ed12 SHA512 e7fbee979acdd1c82bc47bfc4e7b1dc1e0a686c5d9bf5e3dbe8bbcd19a4fdc6c77ecfb03418872440c25c4929fbb5491d18e31ac9e7719c392d76866131da498
 EBUILD cwm-9999.ebuild 871 BLAKE2B 76b7efce92fdd5bd7bf59e4bd9b88e8681aa80b1178b3bd77fa5da8a91ec88d88f27c705a91b709957deebf15a64a57703be4538ccf3569359fe6fb30f77723a SHA512 59c7df88477f281931d02d885291b725bf6dd5857cd77f34187893270113756191faa443b653bead385dc7697b61d0a84aa019b71ca652a460be44a2093fae81
 MISC metadata.xml 324 BLAKE2B 331232b13e393f0d72cff1e0bb37a987c4de69f64e4086abeb00e156dc3bf76b257e59b65913e302d8c5f5e1cf9daf76613ea4ab58532191e3055c194b1575af SHA512 549acd771ebbcb5f82ac43f8ebe578ca6681b1ecf66602dd769b049c9235158e5f59c7605769c0d2642b1ad40235869d35f2f5906d64b0ca0e88d3f5ebe9afcd
diff --git a/x11-wm/cwm/cwm-5.1.ebuild b/x11-wm/cwm/cwm-5.1.ebuild
deleted file mode 100644
index 0eb7d10256b0..000000000000
--- a/x11-wm/cwm/cwm-5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
-HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
-	https://github.com/chneukirchen/cwm"
-SRC_URI="http://chneukirchen.org/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2_p20111229-Makefile.patch
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc README
-	make_session_desktop ${PN} ${PN}
-}
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 95962a9196f5..4e748495d996 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,7 +1,7 @@
 AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad3ff00483ca634075b2b5b4fc3a97b105e66128c1c882154cd815bb420d473ad1e6af0ff1dce75 SHA512 e882c447824ec430862f9af968aad0f2276b7ab28cf60b8f8e49551e3b9cc2a249429987f4a7d6577eb18182b7709fb4d7c5c4651192a04dc2394ba9afa89f08
 AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
 DIST dwm-6.1.tar.gz 25887 BLAKE2B 36c3aa36b8371b993ac845faaebd738f8295d3bed34a1a97075d8449cb3a2febec746b21858071579e27021502c7e184fcb0750997eacce471b968bac0e555bf SHA512 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1
-EBUILD dwm-6.1-r1.ebuild 1506 BLAKE2B 9e68fe2bc1ae51a2e655a1029ed94f0196b8dc37595a3dc05cb69c80d38dad6586712508c7d1704be91d1be0a8af303737b661e74e306ea98404a6334f9619d6 SHA512 89a619b6bc8977e2ec7248cfd2d761cfb06ddc22e46f197a78dc0aa4edd447e510a362ae3e89c438db632e2f8617d7cc2b13d5f7ccf4d457b0cc090a7e48130f
-EBUILD dwm-6.1.ebuild 2138 BLAKE2B b997c3f01bed50281eebb37044dd43c6497b0a52ba7dee163cb1871c326258001b1b6abbb0b2a11cfb208eef0cf0f81de2b1869a8f22228fabe28d2109d4b9cf SHA512 688324870072ae0d35149dbc78409b1b5fedc4ea9130c358cd5d722f92fa238b0385858bdeebe1f5ee45c521b1ce049c14131947bc9a3cad33cbae403481ac07
-EBUILD dwm-9999.ebuild 1407 BLAKE2B 6beeff0fe452f39c66b17f28712946451fafd9bb0f55dbcda763e31610830a9eb7657352c0cd1d4bae618e1b1ecd1a54e22307e087fe26e96b667834bb6d199a SHA512 f56b0c09e3f045c7da029d6114c2889c85871218017841c16a78eef65e87c9d241fe53311bc6c215cf9ac011021fafd12ceb09904e6cc6977f263bcb06f2d5bd
+EBUILD dwm-6.1-r1.ebuild 1502 BLAKE2B 154e411682437f7c959c4629d3fc31b85658e101db55697bfd45df4e4554fa91ee88edd41c053ba520114b5531fe193c2cf52b04b3707e2fe3ecf1c1c0955dc1 SHA512 4a71a85977c1893e0a4c2b7c50d89e36073b9db8455e91ed38ce2d63c02b45fca046483842ed63d7ee563e03f831037bca088403d8d1c036d8a6178297ce6f2b
+EBUILD dwm-6.1.ebuild 2134 BLAKE2B 5ea7c1a9f34dc10ec36d8d7fa824bf8171b640ac4e6070bf942bbc0f8ae644fa9f0831b3d1ceb2df7da52c28cd94dcc8a96202fa1d8389ad86b89484df3be035 SHA512 6ecd18bda9707fb5c3d8b740eda0d6e86b7fd517f7030e59e42629b91f9f954e3000f0e429f576dca92a9ed83b73a16639144a394327e454a36a6bb27e328872
+EBUILD dwm-9999.ebuild 1403 BLAKE2B abc9035e7132ac3daef3452c0b3e0a33e401091c799c242f118871507a771d1519ed531ff62408f9757bd075d1544d78d342f181498f83c2f08a43135ffd70a2 SHA512 7cc1fbdcbaf9d78cf099d3da588c8523c551bbd8cede13bc7d54e29fe0978ceee9bc5f286c27495851dbc8df9b690bdac2ca8d2b24f202e2fa582f19d665c06a
 MISC metadata.xml 464 BLAKE2B daf6e362c09f3fc174b6ea81e49096899f5de5cf070553391ead7ab1cfe2b9a40bcbe6043b49db219ffa305c32e854864c9c94ef3c340c8b59c4bc2de675ff33 SHA512 e089b8fee6ede56ac362879d23548bef3aaf5abfcd6fe12c0ad1446b59068fd63ac840154d3d007d5fb0e2a5230bbe9bb84a397c44704e5dc3087cd9b5e3025d
diff --git a/x11-wm/dwm/dwm-6.1-r1.ebuild b/x11-wm/dwm/dwm-6.1-r1.ebuild
index 84a3658dd364..a641e17a6bc3 100644
--- a/x11-wm/dwm/dwm-6.1-r1.ebuild
+++ b/x11-wm/dwm/dwm-6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
+	xinerama? ( x11-base/xorg-proto )
 "
 
 src_prepare() {
diff --git a/x11-wm/dwm/dwm-6.1.ebuild b/x11-wm/dwm/dwm-6.1.ebuild
index 305a792c1dd1..d8a03b2546df 100644
--- a/x11-wm/dwm/dwm-6.1.ebuild
+++ b/x11-wm/dwm/dwm-6.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
@@ -21,7 +21,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
+	xinerama? ( x11-base/xorg-proto )
 "
 
 src_prepare() {
diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild
index 4783f3e641b7..27c5d18fe7ae 100644
--- a/x11-wm/dwm/dwm-9999.ebuild
+++ b/x11-wm/dwm/dwm-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=6
@@ -21,7 +21,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
+	xinerama? ( x11-base/xorg-proto )
 "
 
 src_prepare() {
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 79618fbefea6..de46e0da360f 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -5,11 +5,11 @@ DIST enlightenment-0.20.5.tar.xz 25039672 BLAKE2B b9f18ecb5afbd4f8675d0c5e931517
 DIST enlightenment-0.20.6.tar.xz 25030572 BLAKE2B 7ce9b89ec56a741e81bb6ebae690c84ef89b53e7201723f0d74c99b006957f8c26cd8d4b914015aa7956d23f83beeb2ca2a0e9e145d9b2038a6a337acccd43bd SHA512 97179929c039535f6f03fbd1272bde59e25f62b35e17e859379258dac771183562348f7a5c0148c76bcb05b86c21c24950117901f0c2800ac070ba7a27aeee29
 DIST enlightenment-0.21.7.tar.xz 25307500 BLAKE2B 54b0bb7f76390d46f7eec40aecafb1b8769ba659acaffe8ade61ef9cd6fcb28d843bc185a3cc6c478fa30f917946d331569a394132c3351215a3d1d051d7d2ac SHA512 9d10116990f83b6a2f066b81fab08a9b49779df22d92b5823bf579d786a3f4602094cf8c4d08b3e23a1cfc0cd7032004b2e389e234a189fb2479d23287bf1277
 DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd
-EBUILD enlightenment-0.16.9999.ebuild 1841 BLAKE2B 5b10dd80c94ffb9f55ba6211a6c2f214130eae27683382b17bb378943ae40b6c43ab698581c8c96ea8e35aad0b52f4106cca4b262d396da177f440a5e1d696a4 SHA512 e9684440ba5876d0acad750f7f4b9a3dfb3fb77dea17b2963ec623e143f67f049b309e1b4806c19c25eefbfccc282302910673bbd6b7af9c3da425f122887a75
+EBUILD enlightenment-0.16.9999.ebuild 1714 BLAKE2B 18aec7836c982ebf03213d6b8080da238e1581022c9b9b828fe5e28dc82d114762aeb33bda8a9528e245d679c923c46c82c0259f77045ed9b7f5c4951d62271c SHA512 f996d2ee9efcb4abd71f38f2ac54bfcf9da5e5f782bb8f44730aa65024d2eaad725b247b94467b49a4e06ca9049a6a1f5da948e4829e0123947215963d8559d5
 EBUILD enlightenment-0.17.9999.ebuild 3227 BLAKE2B c37c736f8bc4d681f044a36a355fd5e1ec463b4d6f771d0cf4b32f43b5a5fc682d96291d9c767a6f2920e5b6b3e33a34fbecdfd8521933652e92bcea1f384cf4 SHA512 5eb72120a2448a82bea63ae5a3c817d9474648931564e95d883bada8eef5471e20602a36bbba33a5df84f28d40ab3d5f8d8ea8a9b00ee160f00beda8ebfe0c46
 EBUILD enlightenment-0.20.5.ebuild 3582 BLAKE2B d8ca7622c40b90e7eb1326ea5ae6a4a78e71bc7f4de1473403521bedad35e303a8aee37a6e78e498e571b35eca208dca993ef781e018ce862887f6b151fb26be SHA512 af054b708d87e08123888867041eccef68921220650ead5003fa097fecc252a25aa5c26959fb7a1d7af7e257b84291cb44f9183d523569c4548b32a5998df5f7
 EBUILD enlightenment-0.20.6.ebuild 3585 BLAKE2B cebdabb24670587ebb5c5ae96d41c6ba3bf50e9b1737336cfd9f5c397571eb41ae9f63f8c8c96bf85d429230561f3db8167c03b231bcf357a679db960e9c0fef SHA512 4e794929e1792decd901e0ce8f14d51aaca4ee045be3e34df108314e3b48ee620bc3c9efc45729e5a9d4af20c34a8c6ccc51aca424e0627e8f587b61e1744f81
 EBUILD enlightenment-0.21.7.ebuild 3551 BLAKE2B 2888568499c2906ca84924c0d78444e3d9c47370f36eb85355a4b4370fe5abc4bf2f720057489a9973e93c296c5ebe632b104a5db0d69e0355b6c838abd726f7 SHA512 5b5a52d62b9bd68520818e6f225a92cb133ee3ff068a07618e73e01c0f2d25c2bf7af443d1df47d4dc0ef82e614dc26cd5d7e72056a590ad89eb6ca8c553b549
 EBUILD enlightenment-0.22.3.ebuild 2737 BLAKE2B 7bf2b1a96f6c161d5596363543f82262b7b1d68046f5abec134251c18771d3d557f158a1c71ef22b2134dfb661b9b134c1db931dd4723a968d6c05d074bfdfe0 SHA512 8cdfeed5cb353317be0ee3326fbfa12608d965d4d25f0303033c52d1ed6931be4b711c5d7c535580780e90651b880b872f96c2281ae830fb4aa6c404aaf92713
-EBUILD enlightenment-1.0.17.ebuild 1831 BLAKE2B 8cab55f842085e212d695ba8513416eb4d8280be4a0292fa5073f109b33db90bb1a9759dce5f6c889271fda7c9078f516f108ee21d9cd6adc130ea23780f900e SHA512 37308359aec83a4f7b8640646f24263805f1306e9d1b4d8e8dc0f94990bbbe670298711d611f5a30d798bd69c10b3ead951b4b233b3b39dcbfb4fc9e98e831aa
+EBUILD enlightenment-1.0.17.ebuild 1704 BLAKE2B ebc96726bb26d5a4b8f9eff7b36931424117e2e084c4dc584e5c82418d7d64792b3164eafe5a1bdd5f2790eaca2fd866f48221e775854ca1504568aeb06bf446 SHA512 c9373ff015e3ef2c316e84b827c7dad00daf458571fe3537f7d55f34676c9fedc260d9329ead2ce167a3b31570ea1a80580376373c8dc5ea446da364c9c82e74
 MISC metadata.xml 6755 BLAKE2B 2a78b350dad2b56323c33b77f74487ca7c2a58b61eda01500ed4c2c2401fa327d9b136485ed9b10d2e699e22a4d4c58f178777adf0e87f9e262c4c72b4c11a32 SHA512 865f8cdd35ff16f6b80fe75a1d5984e7904f15f1567a473e2db69ecbbac7179e3f2c60471decba60ff0392cb365080a41327bdeabc0eb2db2344400edf493ba4
diff --git a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
index 3796314e1e90..8c16c95bbad6 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.9999.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"
@@ -44,11 +44,7 @@ RDEPEND="pulseaudio? ( media-sound/pulseaudio )
 	virtual/libiconv"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
-	xcomposite? ( x11-proto/compositeproto )
-	x11-proto/xproto
+	x11-base/xorg-proto
 	nls? ( sys-devel/gettext )"
 PDEPEND="doc? ( app-doc/edox-data )"
 
diff --git a/x11-wm/enlightenment/enlightenment-1.0.17.ebuild b/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
index 91f2d348f9d0..418b0bc450d8 100644
--- a/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
+++ b/x11-wm/enlightenment/enlightenment-1.0.17.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"
@@ -44,11 +44,7 @@ RDEPEND="pulseaudio? ( media-sound/pulseaudio )
 	virtual/libiconv"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
-	xcomposite? ( x11-proto/compositeproto )
-	x11-proto/xproto
+	x11-base/xorg-proto
 	nls? ( sys-devel/gettext )"
 PDEPEND="doc? ( app-doc/edox-data )"
 
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index ea040f9c4420..4d7ababe61ec 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -1,6 +1,6 @@
 AUX evilwm.desktop 167 BLAKE2B 6de59f5da259ce3615e2bea2112691e8fa28c07d03a5155deba64b8a2fab2aae3160a1f896e7dbde51ab0068e7ba0dd083e51f5615a8b632c62e6a67171c3937 SHA512 b4f4d2e237c4e7fa55a1eaab9e3aa3182b0d90eeb34cc5691707a1f4a4ae394553e4bf8231511c3bc0cb56bd3448153f8a7ed1dd6c0273535199df3fe11b8288
 DIST evilwm-1.0.1.tar.gz 31468 BLAKE2B 64ee8c0e429c4eefd908a700e727845f2de1e7531cdfb51133014c05cb350eb0bed02476f8a81155b5f70b6b164279ce220aa82d2e9ec8d017b54076a7158f6e SHA512 f9a5abe13ce7ae9fa9a72962316dd7a847419f29a6ab7270315da5a71058c51bde620d34fa690f9de29838490e1da68efe72c6ef33745d69e3e026de98ed3938
 DIST evilwm-1.1.1.tar.gz 40150 BLAKE2B b595e9267fb7421bdcf1ce1c6f37559ab62e58beb11aa755bd21a141ad66387a7e95106231277caff84579bfd61183a554427319c7d85ec20716c69fc3cd0968 SHA512 a11af475f057bf18adef339f4772ff1291a25a19c86b7f18a4ce7821e70b039c256151232da6cca616ceea7d9242a60b055d654ce26e85384c6ba687ede7898d
-EBUILD evilwm-1.0.1-r1.ebuild 1251 BLAKE2B 5c35bbaaf0de077c3891eb0affdef0e00fb158639482ca9bacb50ee59e840404adf18b6a27a5289293ec130a6da52fa7fdbe8d6047bad7e1a4637d692920f8e8 SHA512 381ab86bd73e5974073621d8a071d1558d111ca612d5d36e86ecf5463a85fd270c1587ff17cf7df068fbbd7cd294f0517892d2dd5c3f6121ac2c24eb7be41725
-EBUILD evilwm-1.1.1.ebuild 1123 BLAKE2B 9d8d83d49951515cd36b1d2fd59667f921b9ad96713ab0a4948decb152f837d104f711a22e6f9fdc6e39042af3a57f595dcecc434e93f0f8858c6951cc18b7a2 SHA512 0c6064438b6efa1c4a28b23b11d2685b5e0af45219e9b694efd129b9faf3599db62da6a20d3c54da5b50ea725316888e440c4fb8c89a5edb4dbafda4736182b3
+EBUILD evilwm-1.0.1-r1.ebuild 1233 BLAKE2B 99f09ec16d1fd500850ccced08436bebd51f81042bf156a3bafb8bf2680bdb8f4479ac6430f88fb0dde6b77b32fb37af99a9b5c9be6fade813e63fd2b37f58e3 SHA512 62ebacf436d095c3ac289ddef9f42563db114321081e4f18f74bbceaa4db03d5d265fc3ee288babda3ee57cc7c9aad9473cf86656093bd4e17e20fac0febf580
+EBUILD evilwm-1.1.1.ebuild 1126 BLAKE2B 18e4e7b222f1dfe4d87db64e5c62769a6f7aa24646b2660589a02e42b7abaf18861190b5c30c86d724a9398b4fe0a88b0a0effec43666b0051158aefffe69122 SHA512 a9927f36d4bf6bff96149ae301afc2da870618e0da508619c55adfb5a39ec8205f17c9865e89e49b32d9501439fed5d804996998cd8607d598f1ada84f725308
 MISC metadata.xml 629 BLAKE2B 8fdd2e1f8890c3f40133a3026b38e99ca807fbb861def884e574e5d3faef342fe39b65a8da91b0d0d5cd23a89f996cc47bd2113a40ecaf9996def58438922d24 SHA512 b4b8fd73b2ec512b1307265bbe7f5c4c67e8a78beedda86beecb9fd8cce164b776ccc75a586499c0a6cac7f31cb54908d767ad35bb427ae03390057c77727999
diff --git a/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
index 82001e5c2a6c..24472c3a050a 100644
--- a/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
+++ b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXrandr"
 
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	default
diff --git a/x11-wm/evilwm/evilwm-1.1.1.ebuild b/x11-wm/evilwm/evilwm-1.1.1.ebuild
index e1ae05372ef6..78d001de8a73 100644
--- a/x11-wm/evilwm/evilwm-1.1.1.ebuild
+++ b/x11-wm/evilwm/evilwm-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=6
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXrandr
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	default
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 942df0b0ff74..510565b8e581 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -7,7 +7,7 @@ AUX styles-menu-commonbox 127 BLAKE2B a216b4b3b94ce1710876676a75fe6657c89b68106e
 AUX styles-menu-fluxbox 117 BLAKE2B 8a72f7739a3fc80f6c5dc31204df4d930111f5279bd6eb8625cbceed770502137c87b2130fed6ce6817b59350bba4ba43127195c720a8f536bdec34eeab5c1bb SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622
 AUX styles-menu-user 93 BLAKE2B a2161d88f4fe85f3b95374186dbdc4c5eed480f631a3b8902545bd7cddcf9c9df74befd58747da7e9382742f7c8c5710be1aff411a83f982ee0d668fbe88a75b SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094
 DIST fluxbox-1.3.7.tar.xz 786492 BLAKE2B ecf50e2eb19949b4a301366eaffc1d5199c17b116b7d19a31392eea632e6320210e1dff24b1794d3427c14206e31d9722d3c21ce24b584c61288233feb564925 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01
-EBUILD fluxbox-1.3.7-r3.ebuild 3161 BLAKE2B a3a91a131ed781773ecfa148b48cf98c662102ad75c8cc66012ef843ea24a895a32692c5dff45dfe5a9a401ca9865c4cb16a1fa044ad8ad3c8ea883bf9c8b42f SHA512 7bbb10e470ee491e893e5ecea72781e460a68bd551cd626e13b2ca5f344d84e06f89f66e3e1fd34ce8447790b34ed976eb842d8e42cbfa95f39bfdc2e48465e2
-EBUILD fluxbox-1.3.7-r4.ebuild 3203 BLAKE2B eb0d9092e7fd93d62a271aa28742412f38fee058415e871788dc58656d605731e28b75243d46351c379bb0a47f82538679c54acafd44d6b523512b1d6db389e5 SHA512 49044b2b559363442d1a01ece2e076c73f897951aa0ca1f075fdff485c8b21172e3efc0ae2713a300cde4640e580984be4314fb1aa78456c5632d9b84bcf28ab
-EBUILD fluxbox-9999.ebuild 2989 BLAKE2B 178229fc33528be2ca6c8fd47588651ec8c2757c081ecddc52d35e1347e44a31292855ab029d325b749827f65f61992946893e1848279055c654fe2d75f88831 SHA512 867dafcbf0964944811de4328f0f95f2b57454f03cae66f536e9f015998ce873e00b4d198e02f3948d8cd27cc41a7a38f464966c3b54e621cde16975deb48cfe
+EBUILD fluxbox-1.3.7-r3.ebuild 3161 BLAKE2B 1cbb67f575779a24d910a5e8a264876d4f0ee180b6d0b22206e9ea60a432ec3592639309e2e0c4c49c82ddc8469dbb589dec6d5a222ca758026cb53158ae7ba3 SHA512 2a51804ad745a5f67027afbe86099f9928d32c58fe995f74488e7832aaebda3b419140ad6bc1a93527accb55a5684842406a2be1b4ca3e74cb5d37751389f073
+EBUILD fluxbox-1.3.7-r4.ebuild 3203 BLAKE2B 43f02729b38eb94d55cca497b92020c608f20120fbbf424620c7805fe121f90053408ab1d251c78524e79b0809bd43209db4cbf672ad28a6b053a994d9adf8ec SHA512 eb518836570debdee0aa768ed44f998bef1e917a6cd5fd03582582c8995a081c002fb86d7cb05f3dbdb7802b5eb762741fb22becb797659b081248753ac0584f
+EBUILD fluxbox-9999.ebuild 2989 BLAKE2B fd1ca1cb0e2bd290436a65da63b431204996ae1f046b3a8876d42fee5177fef3c81dd9443a1d9855a1006964d2289f863b866df597f1c633a735050ccd62a0b7 SHA512 4c77a116e4e5be9ac525b1047bd39f45763b6300d97c4efb34b8bbedbd3de9ba56cc4c7935b681b89cb3a38a7116f4513dd3641d30caf44ef07572aae4fa328c
 MISC metadata.xml 1000 BLAKE2B 37bb680df975da4d9074c20418218ba2da7ace4d50d89ab9b802a3b71ac1270a48c1ae33f25c1c3ec07719d6b021d4538a44a535f945c8b73de5a22d9b4eabd8 SHA512 7c3c819b2e19ea143255b2305722bb09f70cfc304f8becad482ffacbf751a934de96a3e3635cc95acd6e2529ef810a08eb7011632baf064fdc6ce27c307341d6
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
index c2443384420c..e77bc234f23a 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	${RDEPEND}
 	bidi? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
-	x11-proto/xextproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
index 404b247f0126..9b32e3c6335c 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	${RDEPEND}
 	bidi? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
-	x11-proto/xextproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
index 399a7ee66f9c..70aa43032016 100644
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	${RDEPEND}
 	bidi? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
-	x11-proto/xextproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 4a30e035be4f..872e8a9b77a4 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -3,5 +3,5 @@ AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa
 AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be66d110441075839484b6bb26667104090258267b3e484c6fc0b0650349488902d216f3cf841c23e45b59e SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45
 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
 DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698
-EBUILD fvwm-2.6.5-r2.ebuild 4811 BLAKE2B 05828fa21464a072c6d383ebbea9abcd148ef1cecb42d8c561d8fde19e151e093f4b572302d66c2c0a5892bdcfe9018a34728ad0cda423da3d3fc0e2488ce429 SHA512 44991b5b512d6b449ddf3aa61a6f463c865db0c916f77f38da91282665622769a3ece2b12066c8f018a51e14a3ddeeedef2fafe188117ea054ca8eee06987380
+EBUILD fvwm-2.6.5-r2.ebuild 4793 BLAKE2B 10d28f244881fd41ba3ec89b36b25cffad5bb33daf609cfabe8f159a61307c4704c4652906a330c4df8f185497a3b5d288b2938707b8477683ae4abcc349ffcf SHA512 f30727158ce0f7962963396efe10c8b860516ef7413e9a10da1247d850f8ab3b2968860f1b7b45e5041fe045a6c51597c8bfd16575856c7e3d8665ffd0c43da5
 MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
diff --git a/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild
index c25e8794bf6c..9f65b7d88423 100644
--- a/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -57,9 +57,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	doc? ( dev-libs/libxslt )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 
 src_prepare() {
diff --git a/x11-wm/goomwwm/Manifest b/x11-wm/goomwwm/Manifest
index 565cc9671a25..8446a43438bd 100644
--- a/x11-wm/goomwwm/Manifest
+++ b/x11-wm/goomwwm/Manifest
@@ -1,6 +1,6 @@
 DIST goomwwm-1.0.0-github.tar.gz 406143 BLAKE2B 0118dfec32a3598b0a23b3421643a211386c1bc302d523a4a63a78e34ba9f0673b0bae18b27b491ab153e3e0fb8031123c56425ac007c20651fb3ec8484ab7a5 SHA512 e37d80c8ea47fe136172c392521ec8d4dab361c3469d3d1626ed7c30385513301983c0ffde39f4c2e6f2dee8709da6a34f14f7bb89776f1ccde5103ab1a26764
 DIST goomwwm-1.0.0.tar.gz 69967 BLAKE2B 562666d3a2d9121d07f00a339776f8c510f04eefae0f49f3f9475af250803194b8f4b1eb2673799f3f8b365a6623e5c1b1e49e009ed830699fca51a0846c0ffa SHA512 a2d486e7b97ef3dd0c6eb0702a21e51853ed1456aee7c1d11c90561a62218a4970a61ebb9ba7551428d72035066d7be445a952083baf9c53957e351ad8f4b5de
-EBUILD goomwwm-1.0.0-r1.ebuild 777 BLAKE2B f598b3d23af93a475cec3e3f5de2e41fcf7f196ea7274bf346ae6bef384c4c907e0735b409e329f4d88fe9f253922caa8a89923762daa55f7c9399710f9880d3 SHA512 99afd8a7c13481ab5e59646e9b95203abab16d8186d225ffb49d557f1100fbfbf90d9b1c7f865ef1c91fe8619fcfc319cc27c43bf5841e6e46ea40ed4c141fb6
-EBUILD goomwwm-1.0.0.ebuild 752 BLAKE2B 418bb98372b3e50e0ce7590ee85064c89bc1f7ea52fb90abd183a316560216c3655dbd611c0ab6842db4b392824372c49b0bc96b2c45aa4478307bde1329458b SHA512 fc12401a7de7addff12651fe02f0df83778444f26dce2b9d5db395efd848d69f647240e083d65f730335e0b4268c4b474a9e5be69f6dce0dae0f00fca04f234a
-EBUILD goomwwm-9999.ebuild 736 BLAKE2B da07bc80bdc4ba48619e936837f2bdb26b99f898a36ca3024d8cda40982e6cd4e7805961934becaa79776712a2866cdc257bc88375b89d51c232a4eceae4ed51 SHA512 b66c355a7b6a8223f28b6d8eda5ecf9ec9befe9d41007c6d2b5df144bd91381b628752e96f02934a4ac543c7f44b39110d40bfed1d53f6ada9c1f83f588ec602
+EBUILD goomwwm-1.0.0-r1.ebuild 755 BLAKE2B 168968e8e5016af836c2836ab87a366e314cecf06f93a78557ef09631ccb9a5456a40390b5d5f38e03b293f129887d89c3069fd45e66c025028d47a22bcad697 SHA512 ae2bf63c3c1db85dd6000fbb8bb1f16d800c30f3544bfb34481b2aa0ab6f476ddbeeb07c497e247975084826987c192ddf4b976222e76f1d4ec73dac2eb68eb4
+EBUILD goomwwm-1.0.0.ebuild 730 BLAKE2B 077ed6e144bd53b2db8970a219fcb249826bb2aea72a6083c960f1cd1d09905572bfd130928e78a38258fd4239f280ac623ec74d241db68bad0cb3d0f2f4a836 SHA512 b89d3655c8cb3d275517bf2de3323fd18e4e7b48314b84ba92a9e8435ec83438a70d837b7cfdb83a3eb0c703a9a0e42dafca52b34c91966d7faac65ff31e556f
+EBUILD goomwwm-9999.ebuild 714 BLAKE2B ef5322cce595e7503c7d1dd2c4f63b3132db82143ff9b2566e03fbcc80ef16fcb5aac5bb82718d50a9cba7fe036f5175ebe84d0f10b3ac2db83c875121680127 SHA512 543b57163cb0a5dd037d402596ebfe03c3ef4d08e3a60f096fc436ec5a89af36c99b0e0357bcd6407aa81a08864a09829472ff87016cf98519c952870949f7a1
 MISC metadata.xml 328 BLAKE2B 292932626f6db147c5fda1ac53e606d808a43956fa046e5e65e7843b82a1476f16e1582af3567962bd99b4c5ef301b8a13ef581dbfdb75d460b3e83ed6524127 SHA512 e2a9ef6e4d4867c0a8188d08300444aa9f7e126fa60b1b811ddf2096c43b847cfb4dfda36b0e5f7fe9413ec5b5ac7677f953a10d9f824dc031673a7ca25628d6
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
index 8e769cfdc2c4..4286eabe8d4a 100644
--- a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
+++ b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,8 +21,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
index 27d7d564db68..99f5e273752a 100644
--- a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
+++ b/x11-wm/goomwwm/goomwwm-1.0.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=5
@@ -21,8 +21,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-wm/goomwwm/goomwwm-9999.ebuild b/x11-wm/goomwwm/goomwwm-9999.ebuild
index 92024280f4e8..99de6578f721 100644
--- a/x11-wm/goomwwm/goomwwm-9999.ebuild
+++ b/x11-wm/goomwwm/goomwwm-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=6
@@ -21,8 +21,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index ad6895ef1b91..a5d9134b59a3 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -2,5 +2,5 @@ AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80
 AUX icewm-1.3.10-menu.patch 821 BLAKE2B 2274136f91b891c971a84f80c3ace49f4c3e5245ae0de83408219575a25dc1cb42523459a923634ab25565fdafe1b5320b955adbb1de4b3fda3c7613ba93d7ad SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e
 AUX icewm-1.3.8-uclibc.patch 1830 BLAKE2B 36037fcdadb7d70d1cc4125170c05e9800a2acca930148eeb091d084a4aca7f4813f452e3565aece03aca7d441755e958cd75a83c875f684beec335355ee7a16 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e
 DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
-EBUILD icewm-1.4.2.ebuild 2518 BLAKE2B 95975eef4219b5bbbccdce658a7c17d0d686cd2880574ee6b721b5b269183ae9e67dbbca775b90763ccff75bd48ee4b25e69181b6619360fa45137aae4d9ddde SHA512 a2e5c37b98fa5ab43b202434b9a53bcd04e5915d94e7a2eb55283fdbb8667b78105ff5497120c4531debb2c538be8bd82fc5705d2bf031c8d62f09e68b47dd6b
+EBUILD icewm-1.4.2.ebuild 2443 BLAKE2B 38036c762f5bfb36cd2533ee1e30f7ede5da5325748504a17af7a0f53cd58f74bcf28698218a8be46611a379cf2e49031d46e901d388b398330dde63d9c3fecb SHA512 0dbdfc3a6b30a8c3e61be3ff826e7b02f5ecd325af8db6f185896ec5dcecaf3bc7dd44ca8a02710b780f13ee5694faf9646949bd0609e9d6c5f138e2f2919103
 MISC metadata.xml 619 BLAKE2B f25a8bc7e435eee00d8ba0cfd21a750ae84d3643b25aaad271cf297918b0c5d702ec60e9ffe919c0b7b07e36f5ff10ba82d5c81d561d22072cec94772de4d8bd SHA512 5beee59a4a9d6785a338f2a18b0f4906681dbcff463ddb3bb273634416c297ad646e0a4247d94f367352b4a063d1858953827d775a01e100f1a769941d2d9cb2
diff --git a/x11-wm/icewm/icewm-1.4.2.ebuild b/x11-wm/icewm/icewm-1.4.2.ebuild
index 1a51819f42a0..328bcf3ab891 100644
--- a/x11-wm/icewm/icewm-1.4.2.ebuild
+++ b/x11-wm/icewm/icewm-1.4.2.ebuild
@@ -36,13 +36,10 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	>=sys-apps/sed-4
-	x11-proto/xextproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	doc? ( app-text/linuxdoc-tools )
 	nls? ( >=sys-devel/gettext-0.19.6 )
 	truetype? ( >=media-libs/freetype-2.0.9 )
-	xinerama? ( x11-proto/xineramaproto )
 "
 
 pkg_setup() {
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index ae1bbecf66bc..c582300b6119 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -4,9 +4,9 @@ DIST jwm-2.3.4.tar.xz 332140 BLAKE2B ad2ea9d094b6cded0891176c97900b8491c3d81f64b
 DIST jwm-2.3.5.tar.xz 339792 BLAKE2B dcbaeac2e6842499509651155618821cf302b3e3ae1b013f3811c49e65ac83122e00aff33af4a366ea0c126f2a009a0baba0538e132f00efac306319b94e50c4 SHA512 cb45a5fb349e6c130b89996ba11a99059e95ccedc4ea82ad527676130833fd93297b64fad905a1f22908a4ae69cca544a6353c37160ed8df3e1089f40f9a0565
 DIST jwm-2.3.6.tar.xz 343644 BLAKE2B 44d6156b79957352b52f8f4000f12e655259f2125eeba183a087358b7537d3affd7125a50b0ff93efa9c8d2599d08e7cc3db6c26807ad587481ce689541aaad0 SHA512 ed3556bf2e28bfcf36b2b145e6c08e75c24e47b723b16ce072100d2773338d819c5465e7af2dc6b842e2e35f375ec3a0b85d9987e0a8acecdbe628dc09eabd11
 DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc
-EBUILD jwm-2.3.2.ebuild 1480 BLAKE2B fe30802f9bd47aa25485f4a7c24529f47f48adab3273170a75913733ee4126cad079da60264b2e603397594853ba545e89e286f7f568671b95ac6da14d57a3e4 SHA512 5d77f8d9365f335cac1cbf64328e4f02658604944ee82b1403c32476dc2d757c156aeffd68a15e7d4bd758519f0c0af1618605420fef8bb3feb9786983bb985d
-EBUILD jwm-2.3.4-r1.ebuild 1550 BLAKE2B bdf2910020fbe9226186c508b40d9adc6387c2b055571f20f470901c776fbc4889a4694ae1cd165699c955e9239acac22a9381c45b0e3a01f5bc08e6812fa059 SHA512 c85ff474a7afe9d2a734fcfd330b2ed2ef3b269d4f695fcc64cc3089ccad6b1387764541b7ff388978f0de99fa7cd6d0c2bb0218a275ea4e0acbaf0d503cfe34
-EBUILD jwm-2.3.5.ebuild 1830 BLAKE2B e9b79774818290d1fb05a81d8bdd1941ab6463d11371da255b6f5c211962d16dfd2b612565c886f352cdc7d8f396458b2ade64f2e19fa8e2e0f5ba24a78b1138 SHA512 ffe5f1e92de51b3bc2c545c454910706f662d1f546dde2f05d2ecf539715bd0c5ad1af6f9fff89b26c4a5e0562170d253d489c0281e2fa042704246930433d47
-EBUILD jwm-2.3.6.ebuild 1889 BLAKE2B d8215466d2479aedc1e58c740013db193a561e67d636ad4620174367d2f2cfaaf24b4ae142a96222b50d78325e6eb0caeb7ce601226b1187f23ea47c0e605dfe SHA512 13f2e66a2c02145fa326df6242f49acfdde3436a1c8211d9fa3e1f835dbe0a23e5745a40e837207fc039b412a45945c153d1a3adaf7a7f86959df23c056fe616
-EBUILD jwm-2.3.7.ebuild 1889 BLAKE2B 36ac9faf64506bc8e69ba0d8eea545982852726ee71047f9b17444b7e5acd3b9f4e67a1a0265ca890af18d32754f5eb62e5b1f84cd4c8f26675454e7099d3fed SHA512 eaac2f63e51673c9b7ca371eac4232f9f321803e64d039a56ff71ad65bab776085e13c43d5c3b2f1809cd4db202485c45083cace9aa1b12d1f3438501847a7ab
+EBUILD jwm-2.3.2.ebuild 1423 BLAKE2B d9033cea48ccf8414941bb5a6e2aecdd64e59e2aef5074a599df926729f7a8dce38424ae95beaf89e11fdd66ec2eeda00c8eb134be100520cb22f684680ef806 SHA512 18379ea09e94db1c5996752ccb75d13c5417b548863804c2c58885125b8d463e897e2baf233298008fe6a1bd829035e72221c471afdee78af3e8d3dc17370645
+EBUILD jwm-2.3.4-r1.ebuild 1493 BLAKE2B ade32fbe5954271c26943490d0c1970084b7f53dd9d3559bbd26b9bdc4a32c712eac8fb68a1abe3328c942c5ca35be4fd68e3d0e9da0efdf415c0fbe8f83b00b SHA512 42135fa2006cbc7b8109df9c6e8b19f78715f88802ad3d3ab24810dfc078b4c309e569c48b3a57aa86df928ac55447363829a9cc0543ba7afaae26f21822c1d1
+EBUILD jwm-2.3.5.ebuild 1773 BLAKE2B 38544c2219983545a7c3d12d2656858e0e790cbec3344f1f6b5cff82bde53fce18e681038155ba65e98075e504f0d595ba145dce1bfbfba4c0b1203cde827203 SHA512 1608c2e237a6acb2f608ba6b7e36b4feb172f75de94ae8b170985b7c78d501ffd5264ea5b6a1191f71778aace4163af0cf8839f03684219d89eeef3f872e5412
+EBUILD jwm-2.3.6.ebuild 1832 BLAKE2B ccfe15f50a45c4471ef445fa51950e8c100a2b8e76310b9db73439a347534fb5bda6fc64fbeb8730154462ebe6722319d501e15c8715c00bd39c77a3e00e6369 SHA512 b9268ac1ce453158433f608b43b4367cde2eb4c9792b80ff426b8eccc5e68cdcea4ce1d4a04ac19e79c5601917eff4ad678519f4da437329a81172c0590bf2ae
+EBUILD jwm-2.3.7.ebuild 1832 BLAKE2B ccfe15f50a45c4471ef445fa51950e8c100a2b8e76310b9db73439a347534fb5bda6fc64fbeb8730154462ebe6722319d501e15c8715c00bd39c77a3e00e6369 SHA512 b9268ac1ce453158433f608b43b4367cde2eb4c9792b80ff426b8eccc5e68cdcea4ce1d4a04ac19e79c5601917eff4ad678519f4da437329a81172c0590bf2ae
 MISC metadata.xml 973 BLAKE2B 396dc5d70f98f46e0a2698b893b127cad189762b28a1be2272b560ea4bd174a637cb4a9a01783a69c14797605d74442d221a55d3b5ca4128f343d7e602333096 SHA512 11ce10dace193af664e4939f506adc8311db83c7caa00959ebc7b57ed3084cd1e6ca8dcd8ff141e9ddbb823c485d45696ca3653d2ba9e252401704077dd932f0
diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild
index 006a0ebc1aab..b1ada2e713ec 100644
--- a/x11-wm/jwm/jwm-2.3.2.ebuild
+++ b/x11-wm/jwm/jwm-2.3.2.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
@@ -25,9 +25,7 @@ RDEPEND="xpm? ( x11-libs/libXpm )
 	bidi? ( dev-libs/fribidi )
 	dev-libs/expat"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )"
+	x11-base/xorg-proto"
 
 src_configure() {
 	econf \
diff --git a/x11-wm/jwm/jwm-2.3.4-r1.ebuild b/x11-wm/jwm/jwm-2.3.4-r1.ebuild
index f1d7d763d72a..1cc308d043e8 100644
--- a/x11-wm/jwm/jwm-2.3.4-r1.ebuild
+++ b/x11-wm/jwm/jwm-2.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,9 +25,7 @@ RDEPEND="xpm? ( x11-libs/libXpm )
 	bidi? ( dev-libs/fribidi )
 	dev-libs/expat"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )"
+	x11-base/xorg-proto"
 
 src_configure() {
 	econf \
diff --git a/x11-wm/jwm/jwm-2.3.5.ebuild b/x11-wm/jwm/jwm-2.3.5.ebuild
index 105297f295f1..8607775ee278 100644
--- a/x11-wm/jwm/jwm-2.3.5.ebuild
+++ b/x11-wm/jwm/jwm-2.3.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=6
@@ -33,9 +33,7 @@ RDEPEND="dev-libs/expat
 	xinerama? ( x11-libs/libXinerama )
 	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )"
+	x11-base/xorg-proto"
 
 src_configure() {
 	econf \
diff --git a/x11-wm/jwm/jwm-2.3.6.ebuild b/x11-wm/jwm/jwm-2.3.6.ebuild
index 3f5fcc05da2e..44d5478bb9ef 100644
--- a/x11-wm/jwm/jwm-2.3.6.ebuild
+++ b/x11-wm/jwm/jwm-2.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,9 +33,7 @@ RDEPEND="dev-libs/expat
 	xinerama? ( x11-libs/libXinerama )
 	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )"
+	x11-base/xorg-proto"
 
 src_configure() {
 	econf \
diff --git a/x11-wm/jwm/jwm-2.3.7.ebuild b/x11-wm/jwm/jwm-2.3.7.ebuild
index 891ecda192e7..44d5478bb9ef 100644
--- a/x11-wm/jwm/jwm-2.3.7.ebuild
+++ b/x11-wm/jwm/jwm-2.3.7.ebuild
@@ -33,9 +33,7 @@ RDEPEND="dev-libs/expat
 	xinerama? ( x11-libs/libXinerama )
 	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )"
+	x11-base/xorg-proto"
 
 src_configure() {
 	econf \
diff --git a/x11-wm/larswm/Manifest b/x11-wm/larswm/Manifest
index 380f6a7220f9..6efd7d97d3b5 100644
--- a/x11-wm/larswm/Manifest
+++ b/x11-wm/larswm/Manifest
@@ -1,4 +1,4 @@
 AUX larswm.desktop 125 BLAKE2B 15556dde41d8bbec4649e946a0cc8113fda06d667bb0c85691964af2513e32a36da0e0ce5bf979c212f295e4305b3fae202f62f883c459b297516facc66547db SHA512 033ca80e83d928eca524c0a5473f2776f363ff301442a7a7c3f34bb99bc61af8a524f6bf39ee1d6282ce5f732bd1fd7b0b242ad4909063496c4c6965becd7b43
 DIST larswm-7.5.3.tar.gz 84505 BLAKE2B 4548f8d757b8dc86f8bf545bc45b09f8b934792fea2a9a49d905669b767b453d007b29923fc0d7c9b4bd744f8c77e72652388bb66f51658846699d6b517f40d5 SHA512 7c99aadcc419f695b55bf0ea2f9833757c06f6ba0f00ae58e1db6e38df70bf944bac44834418bb52188d844722a7ac3c49388280c649ede073a74c21572cf3d4
-EBUILD larswm-7.5.3-r1.ebuild 1096 BLAKE2B 5f1ea74bbe82bdcf4db3c8f889d17616621dde35f3393f68c5d72b5a9b5ac9c0af1dbf4db7bdb0929635ca4e797ebb5d071dc7f46ccab7a6890d8a32384e3856 SHA512 5e8d2e489d9255cb277e30efb4e11f80b47d9a8663d9f91d820f72005a740dd3056f27001468b22e58abc41da106ad8b872c19d6a85b6587e9f131c3eff9470d
+EBUILD larswm-7.5.3-r1.ebuild 1078 BLAKE2B f8b14cf87f046a374f7e0eb58d6f2ffebfedd2c67509d371bb08d28ddf92f8a1431d1516707715f67b81979ad47d1f5acb85183e70c2f7a411d950d81afd663a SHA512 da3268fd8b1ab4fb827cad6c574431ddacd5c6072a44b382055ea627515d021cc676baefb0a2cc5f75d24a41f44a670bf44454f717589f402932319385cc7cf2
 MISC metadata.xml 605 BLAKE2B a55956469773e235d3c3bae88bcc826689fcc80aad5b1cfbf36908875253a0ce4728cd1a8692bd91c551e1cc1c2c5aa293a5339beb27799c5fa8d5fcf94438c8 SHA512 5c777d2c54e8cbe89c8644cd68697e1da2049c75a450cd6be085fba62bab7d56a8b4a28850330599684dfe9c9725977d14f8de1e52e624911d5c5c7088acb29d
diff --git a/x11-wm/larswm/larswm-7.5.3-r1.ebuild b/x11-wm/larswm/larswm-7.5.3-r1.ebuild
index 98f7f805a725..6c4d029b86c5 100644
--- a/x11-wm/larswm/larswm-7.5.3-r1.ebuild
+++ b/x11-wm/larswm/larswm-7.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -19,8 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	x11-misc/imake
 	x11-misc/gccmakedep
 	app-text/rman"
diff --git a/x11-wm/lwm/Manifest b/x11-wm/lwm/Manifest
index aaf07acc1f2b..545eb07de67a 100644
--- a/x11-wm/lwm/Manifest
+++ b/x11-wm/lwm/Manifest
@@ -1,3 +1,3 @@
 DIST lwm-1.2.4.tar.gz 47519 BLAKE2B 209cc24e938978489ba33f940dfc2166880d9c150863f8e1982d5ad21f53a76e95fd71ca461e81a7fdb025c0a957ac2c4623e751de250beec1a2a74e570b9687 SHA512 bb4e394c43020b48dedf8c98702b68be7a580f9851d298ba2c6f0aacbd21719d8c772712e56cbbcc400e81a45ad7f4f29cb6e5f17d6dad76aef65029daf812c5
-EBUILD lwm-1.2.4.ebuild 864 BLAKE2B 31dcb108554c04799c5b81e448d2a73596c71e06aa70ca75bfe9b7de25a5814de01cd97946987535709720432247db022cb914054ee223bf58d67310813e6e03 SHA512 1cc038c3dcfdc4f3f7ba40b7ae4e2754d908f5919042802307cc03380f499c8b898b302525f6c03c16edebc4d125f11bc7042b12aa8398864dbcfb97b087c848
+EBUILD lwm-1.2.4.ebuild 846 BLAKE2B 121047c38e7a21b3bbe501ff7d36a153d66481f6be28372d7381be5d76c886de13eff9488a421c281c9d24fb4e0854bb4b6a1dc25c9af1e5e98ab67ca01f59e4 SHA512 d420e0b3b76af67f7240b802b6babee9fb618d9de9e68ba1969be9f30834c4a8976429e167d95811b792770739f0a16ec15fb7bd246dbbcb2655ed49251c0eff
 MISC metadata.xml 355 BLAKE2B 503762328f2c0793a7febe15e4d4ba88a21a6f577ba817df1a5a4ceb53b6969b4e448b98d3ce5665c91a0abfc06deb8bba59323d6dded0e8050a0bf7eee0dd8d SHA512 9bb07654a69afd045464b0ff8190523a21716d53ad309cc87165c82b699ef7db8cb10caf27a6ccf549cb408f7d1af3f263c5a1e57520856dbcf1f3138807f94f
diff --git a/x11-wm/lwm/lwm-1.2.4.ebuild b/x11-wm/lwm/lwm-1.2.4.ebuild
index 01496199fc7e..7301a62bd4d5 100644
--- a/x11-wm/lwm/lwm-1.2.4.ebuild
+++ b/x11-wm/lwm/lwm-1.2.4.ebuild
@@ -22,9 +22,8 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	x11-base/xorg-proto
 	x11-misc/imake
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 
 DOCS=( AUTHORS BUGS ChangeLog )
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 92b62d6da84d..439dbc358e57 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -2,9 +2,9 @@ DIST marco-1.12.1.tar.xz 1163996 BLAKE2B ff133af6d56a7c91c0b104fdbfe82ce16492429
 DIST marco-1.14.2.tar.xz 1244076 BLAKE2B a1f88f49a2d5048ba6fec2c5c5b86ff1ed546638256782ef1e9fa27f5253e65d67055e96d8d337d4bcc41fbe614164695483e76c2f2fac6bccd1f842548ab795 SHA512 6ca782f5dbbc01f5df4be901a1a6bf5b23398716e5802118482a0bf98e35f4dc544a6070358a931ca11f2d8b71cbbfb7e8768e0535c6605433a202be348ddf84
 DIST marco-1.16.1.tar.xz 1247072 BLAKE2B 71959f5b37a2e499ae7a304de279d0b87b56618ffb135e6792dccbbdf0fe4dbff091257d6c6e856162a0c80d3c08c0aae8233e94d8526af3072479b4d06a02b5 SHA512 c5f88d71378a210e6490edab2db8bedf12eb013ce89fe232863c6538b240f38b7393474893bcead6904aad1835d1dc8794328e71235f17194ba3f0c3c426de36
 DIST marco-1.18.2.tar.xz 1255492 BLAKE2B 034ad26789f894d7fa829e48ed39d11925e304dd8f6c3c74b14972a332b63782d1a8c4cb5b81b20f4d8bc12a74d053bf587ed72e3c1dca8b4fddd567dd6551ef SHA512 f18cd8d46c2ad6e6d86e6e110fb588ea8c6c301c6ffc1ee72ce80984125be5cbdeb20bf4a7fe8d1d1a60b93c7cb32de8dbd00532462c5637b747068f96e79129
-EBUILD marco-1.12.1-r1.ebuild 1565 BLAKE2B 52aa8d582b335fa717f24f6eea05a6b9b4c6458028cf3d369cfefd7afa9b710f3ddaa41732caabe107ead2503fb7248923688d3cee47dca90908361a8e112bf1 SHA512 f67061e9d5a4db1b1fab69e9895057148316ec31e085bb33cbc78501e6e77df5306d5fe16478f080680294767aa531eb9db7466c4ba839efc44e5cd438c026eb
-EBUILD marco-1.12.1.ebuild 1523 BLAKE2B 5309f6ea4d04f2d1d89cd93bcc5bc71e732ed302a4c8b725c568d4ca4733576011e85335ab149451134b6a12bf9b7fb40355ebb85cb283f7ce9ba9e750c46d12 SHA512 a032aa7dd3eaaef4b6a5dd38330ddebabd61b1f6dd6ebc9569e036368cc5b23e66dbde8f89886fa0a27115c4ba128767b479828bf52a9216d3d06095a9dcbe4d
-EBUILD marco-1.14.2-r1.ebuild 1606 BLAKE2B 9baad655deceb177686f705b5666c41de4913ef05e4d2127d00c4eae99e589fc53117e68ca20d1585834bbf0ebcfb745c35d36cb56f3c1255cc906a90cb7747d SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231
-EBUILD marco-1.16.1.ebuild 1606 BLAKE2B 9baad655deceb177686f705b5666c41de4913ef05e4d2127d00c4eae99e589fc53117e68ca20d1585834bbf0ebcfb745c35d36cb56f3c1255cc906a90cb7747d SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231
-EBUILD marco-1.18.2.ebuild 1480 BLAKE2B 8e9c8a30b52686f628db419f22e4fdab76959f1a03c9b6083d9be265c477505febd88a2c469af064d161f1eeb37c3edcbd278a8935c68dfadc4a37fb47e46639 SHA512 242ca3e45e8f4c7ceebd32234e5ab6a749bd464d4714a86c21607b8cc6e9651d367f56fdee18083caa832625828d650a4527d602089e76c1de544cf0b3abe80e
+EBUILD marco-1.12.1-r1.ebuild 1502 BLAKE2B 2c53f9c4df33cd624d2ed1abd1f290d2d0cd1912931f3947057f00a7ecd4715da7402ebde8dd640dcdef6a03edce59b5044f09755874f6f90ede2991a3ee3f5f SHA512 e1204bc07cc8485caf2c877e623edc8bfe15f6e990efd00810611c17dd6a461e42d0300ab864c4a6bec940272d0bf9153ac54ea9b2a6db1568e29219a4bf34d8
+EBUILD marco-1.12.1.ebuild 1460 BLAKE2B b2bbb460a3eba5c2ffa7e6ffb9c135d848d1c5ec0bc76e7fe440b9d9f1a3cee5e7924296a4bcb3f64197dba91ed956ca677a065825000eceff2e7938a4958947 SHA512 44cd5b5dee0a98fcb55e89db74a519bd852f3bee3a3676ff43b40b85ae98a62bcd3a7349cad9e5ba4e8d4a7627c11fa900a62b5cae3b19906552ea01106f7bb7
+EBUILD marco-1.14.2-r1.ebuild 1543 BLAKE2B 401d6c5b53ed2e44917f73b6ddaed9f606ff159f001ce62db1306a06d2dc5027d16debf3c805ba26b73052509639278bd17ae8012b101e37fd1f5431a8b1d7c8 SHA512 7fc91ad79deb72fc660455b8db00571bd17fe6974d44e4c6bf447b54ea2c2ecafef631a577ef36ab8844774026bc46d42697e6e75581193acfc18541c5a074f8
+EBUILD marco-1.16.1.ebuild 1543 BLAKE2B 401d6c5b53ed2e44917f73b6ddaed9f606ff159f001ce62db1306a06d2dc5027d16debf3c805ba26b73052509639278bd17ae8012b101e37fd1f5431a8b1d7c8 SHA512 7fc91ad79deb72fc660455b8db00571bd17fe6974d44e4c6bf447b54ea2c2ecafef631a577ef36ab8844774026bc46d42697e6e75581193acfc18541c5a074f8
+EBUILD marco-1.18.2.ebuild 1417 BLAKE2B c4c0a327221cde03183b409d6a15554029884ac9c387964baf65c345e533d3981b0c1507db590a82ec12eea96a5f762937a0712e50087f57d7aa82a032f7cbe0 SHA512 d8c5c73d740a085c26e1097bfd2ee7cc80758d8ac8c862e1672499e0e34339c3032050ab1063fc2af1ede2d4873d66d1f693cc90077aa987195b470641a18b26
 MISC metadata.xml 410 BLAKE2B 11d9345ad1a0ebbb5b537c27a3447cfb56cdcb621bb3df330f163612415a48e542a78c563689c33e52ee81eb19a9654a2ed45f27f45604b5f6cc2e6ef04953d5 SHA512 3736e03b4952f45354445560aa2aa6118a3257fe8b00d8d39df7946f65cfee017ef04f48447807387a9a4b6f37641bc55074efa7cadd944e1243feb183ab1d84
diff --git a/x11-wm/marco/marco-1.12.1-r1.ebuild b/x11-wm/marco/marco-1.12.1-r1.ebuild
index beb7936f32b6..72471cfeadd6 100644
--- a/x11-wm/marco/marco-1.12.1-r1.ebuild
+++ b/x11-wm/marco/marco-1.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,10 +54,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.34.90:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
 	mate_src_configure \
diff --git a/x11-wm/marco/marco-1.12.1.ebuild b/x11-wm/marco/marco-1.12.1.ebuild
index 5de2688902df..81301b782686 100644
--- a/x11-wm/marco/marco-1.12.1.ebuild
+++ b/x11-wm/marco/marco-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,10 +53,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.34.90:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
 	mate_src_configure \
diff --git a/x11-wm/marco/marco-1.14.2-r1.ebuild b/x11-wm/marco/marco-1.14.2-r1.ebuild
index 5cdf56cdaaf6..33a7096f18cd 100644
--- a/x11-wm/marco/marco-1.14.2-r1.ebuild
+++ b/x11-wm/marco/marco-1.14.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,10 +57,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.34.90:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
 	mate_src_configure \
diff --git a/x11-wm/marco/marco-1.16.1.ebuild b/x11-wm/marco/marco-1.16.1.ebuild
index 5cdf56cdaaf6..33a7096f18cd 100644
--- a/x11-wm/marco/marco-1.16.1.ebuild
+++ b/x11-wm/marco/marco-1.16.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
@@ -57,10 +57,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.34.90:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
 	mate_src_configure \
diff --git a/x11-wm/marco/marco-1.18.2.ebuild b/x11-wm/marco/marco-1.18.2.ebuild
index 3ee2fa3540d1..2c7b83c978d0 100644
--- a/x11-wm/marco/marco-1.18.2.ebuild
+++ b/x11-wm/marco/marco-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,10 +50,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.34.90:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
 	mate_src_configure \
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index b521d971b657..faf3339d57ad 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -4,11 +4,11 @@ DIST muffin-3.2.0.tar.gz 2718913 BLAKE2B c77ee145b53a5362f853777582dbbcdbd849c24
 DIST muffin-3.4.0.tar.gz 2719701 BLAKE2B 245154f95c92789b2195be5d4b498314cbd2c4a8e34bf1522251a4f259705688c826145e38ec55cba30d2b0ea00d5d8f3653912eb7e957f4c78ff86bfe14acef SHA512 27c800dbd433f5eac19aa7db51994311acad347630f1f8b86f71846723f1b7d89929a1c900e6f8766b86ab078ed6b766554fe65dc12d81a61925e0396095e51d
 DIST muffin-3.4.1.tar.gz 2720297 BLAKE2B 94b628bccd6542aa46d950fe6b2818baa8c429f7f116378267b38f302b99b9ff589eb7d95e303ca30f37d5d4a5c3af8d4a50d819a06db3584366892b819e81a3 SHA512 896dcb9c51d4aee28dcf16fbf721c1b3f581bc2a0f5344eb360655339e78f34ee89120c7a9b4ee3ffe55243c7c300f20140b76bfff52a7a9a9f292de33b9488c
 DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
-EBUILD muffin-2.8.5.ebuild 2113 BLAKE2B 73cf05267d58cc0568cde5da90913dcfcbd88e0b0aaa6029f19e5fa0609755ccf2ac7467b624b0c7e95471f368ceac03261e9a618bc017d538c9ce0d781ad374 SHA512 572c9c02850d30fe088ff832a1a92df2ad422d250a6739e94d0240668e1669ad8f677ac55409b4d136bca6f8d6f5591b232096dab2bf09378e56c3ccd5c30f2c
-EBUILD muffin-3.0.5.ebuild 2070 BLAKE2B be1df268e344dc8ae35e29c18bcce44fbdae2be99382525467be1dd708ba76ca0b1651079519b3bc2163c1195f4741cede47d57773b1c939042dc9cac2ed17d0 SHA512 f3596e96d56b7b7577bc5c368c792322260221951fd5fb2eac71689d1d4cc54dc8ddc0b2990a41d5d7a5aafd6ff293c01fcc36f026853a2d2161fb4ee172ccd7
-EBUILD muffin-3.2.0-r1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
-EBUILD muffin-3.2.0.ebuild 2072 BLAKE2B f297b24912e563e831e94406f4afda05751273dd3b422d309682f7b935a63c1fd3bb430dc349fdfdfc54d95b85ca39fc16f42df00db8d9f2398399afb7418365 SHA512 85a1a978cef004b7874c9febecb7ed7723a4c68241fcc2b573b7e0527fd8f78092da3ae21c1f7f91c976a0ea90c1f75fb71e73475bbf29bfde4e2909e65494ac
-EBUILD muffin-3.4.0.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
-EBUILD muffin-3.4.1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
-EBUILD muffin-3.6.0.ebuild 2072 BLAKE2B 1cdc618503123feec486e43853c48cd85caf57ca7a40250b0a435c760e88d51287cc3fb9f7ce9d963579183a6bddd21f5ca33114145aec5002419e10a7be703a SHA512 04a92d3c7314ffbce7170819a1e01972f56fcb8319c7a142b1db447c2b022fbce69713ff3a1f41cf79da3f46fdcc4c6073f8da3eb86178bb8d0bfe198f0df624
+EBUILD muffin-2.8.5.ebuild 2056 BLAKE2B bfb7be5032d41266fb45c8d21dd9b6d0ef8d8edfaf371f33492710824e399e8ca1cf0cf4c74c7a77eebf5e8799df62bb1c6212f92b068e229a9b83a4039949a0 SHA512 b72de64ab390367c6977eb8e899b92db9bfa29392239f1a7151998d244f40798a2a161b1c2e5b5921a58f509223e09b9747ec76a38d8f05902d656122508f96d
+EBUILD muffin-3.0.5.ebuild 2013 BLAKE2B 6545978d6ed60c71e2d6a6466c4b727b28a1ad701b567b3884bc01b32b1fb0775cee5709cc02cf28004860fd59004a30584e6668c39ecff2cfdde3ccb8d58de9 SHA512 1a349ec0c3985ad36d866a2f5754b49506b7c105cfcbbc15a20c5c309f89c24e645c3f52cfb399df9e0ff6e3eedd56cce374650cf787905c65db93289faa8370
+EBUILD muffin-3.2.0-r1.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
+EBUILD muffin-3.2.0.ebuild 2015 BLAKE2B 757ac4f0c132db1b9763d075b65ea64fb696b50e8522ae499f753e8ca634efaa2deb42a01d48fd4181fe0b4fd13fa1bff2c33f168ab65b099fcb1ff63daab4ea SHA512 9b48be96b243c2cb2adefa6fbd0a611ab4e5ed77845ae9255d1aa707b4f33f53a656f8db878ec97b0b5fd4fcac282a79ec92aaeefcc477d93e3b928c0ed714f3
+EBUILD muffin-3.4.0.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
+EBUILD muffin-3.4.1.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
+EBUILD muffin-3.6.0.ebuild 2015 BLAKE2B a1e42826b62c46bd57de0f2a849525f9cc9eaa162279188a893f3108d33ca9e5a028a8fc1c6c5b7391d444d266773880f5bb6ed0e680609f4c3a387e40e10a6a SHA512 86c08741e7787f220d94900a34f5fe9db2a8b09d9caadfef96b76ba5051f5eb20409d38f1a7a0111c8791664dcad07046ef88cbe53557b199e41b8cd90c43341
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/muffin-2.8.5.ebuild b/x11-wm/muffin/muffin-2.8.5.ebuild
index ec923203378d..c8ed0ba12a9b 100644
--- a/x11-wm/muffin/muffin-2.8.5.ebuild
+++ b/x11-wm/muffin/muffin-2.8.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=6
@@ -55,10 +55,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.0.5.ebuild b/x11-wm/muffin/muffin-3.0.5.ebuild
index 67813feeeb3b..489e8ebb0541 100644
--- a/x11-wm/muffin/muffin-3.0.5.ebuild
+++ b/x11-wm/muffin/muffin-3.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=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.2.0-r1.ebuild b/x11-wm/muffin/muffin-3.2.0-r1.ebuild
index 54cfd8ecf95d..691da9e9652a 100644
--- a/x11-wm/muffin/muffin-3.2.0-r1.ebuild
+++ b/x11-wm/muffin/muffin-3.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.2.0.ebuild b/x11-wm/muffin/muffin-3.2.0.ebuild
index afdf5b916e46..4f0194061da0 100644
--- a/x11-wm/muffin/muffin-3.2.0.ebuild
+++ b/x11-wm/muffin/muffin-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.4.0.ebuild b/x11-wm/muffin/muffin-3.4.0.ebuild
index 54cfd8ecf95d..691da9e9652a 100644
--- a/x11-wm/muffin/muffin-3.4.0.ebuild
+++ b/x11-wm/muffin/muffin-3.4.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=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.4.1.ebuild b/x11-wm/muffin/muffin-3.4.1.ebuild
index 54cfd8ecf95d..691da9e9652a 100644
--- a/x11-wm/muffin/muffin-3.4.1.ebuild
+++ b/x11-wm/muffin/muffin-3.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
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
index 843e993737d2..5b0e9e55033a 100644
--- a/x11-wm/muffin/muffin-3.6.0.ebuild
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 4b246c6d799a..ba6211308c83 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -7,6 +7,6 @@ AUX 3.24.4-build-debug.patch 1159 BLAKE2B 1ceb783c5c1c8117c7b4e9809a370d2b46ebd4
 AUX 3.24.4-gudev-232.patch 1034 BLAKE2B 8f6bfbaa50dca872c6ad21eaef5b23af8d75749140f16f595deaec1aa47021650da569e2f46b0fc4c446cf86f735c3b3a5a04df72737d175a51eacb52c0b7891 SHA512 a73aabd388c73a6a4ab91f69cdd647e5e2b1295f67c1576725f7cbaa8dc24afeb77a7f4e3880f6b2e8fc604aeefb4b44f30cc80f3f2f88b0d0c03b49dd6bbfe2
 DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65f7609547d296036b0cb4be79e451387395f32d3d9a736a5b8c4be5a03a9fa56d5fbebeedaef3c35ea6e5c16302 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c
 DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3
-EBUILD mutter-3.22.4-r1.ebuild 4117 BLAKE2B 4d526168d3a2f353d03a3b7ce40f6f4d7cb26bfa11127b7c4c776c62db73e2510ff7703ba2ea6fd82b31dbec51606098213b3fcaa70a590fd26f24aae2c66b60 SHA512 36e28f4334d87b8d2319c19ec384593b2d8bba8e206b21d13e043ba3381cb8215ee5836d8427e0b4bb025efa23ea0f89175e6c04c278cb340f40d6961152d8a7
-EBUILD mutter-3.24.4.ebuild 3715 BLAKE2B 1f247be1fa63f9b81cf47b4160b74ac26255b0a4b4186d1420ca5d29f8217e9bfec07e3c650bd9cbba2a5de37fdfa26aa56353385aac0e0bba20ab8f2c791699 SHA512 81790eeba90028413e43bba871946516ab7a890ad36df1f7442acc4525fbee6b9178f7df6a8d27b8e80c0d78fa8f1b14d613e0001222f8078fe9e051b56b03f3
+EBUILD mutter-3.22.4-r1.ebuild 4074 BLAKE2B f8d93705b79bbdc066d5e2637318c988288d57c538ae7ab11ab715cf629568b4b78c953f4bb0116a3cd36aa4a6aac8e05680994277308d6c3a4eda5b5ed744c0 SHA512 fd0cae9ccceb3eeb158cc331b077c7ac664266509f6d6669bdac16b8651a5f8c769488109ac9701e32cdfad7ed2bfd11f2fe49bac8a6d4d81086fae46acda047
+EBUILD mutter-3.24.4.ebuild 3672 BLAKE2B f07f0b1874371e26460ec17112af090f6bfe93537a7a56063ec0b00ee5cae91ba9d65e0c6cd06245fc7db06bf071a437dd8dc123a4b04934c99e658e04e2f874 SHA512 f74446183f52159acb10684bd027001cceb671ca6110b3898e3f16590a6deca65e70ec619f90b0c9a91c3dd0084c795df5b1358145005ad6f0df87817c914b8f
 MISC metadata.xml 325 BLAKE2B 3ee20e50b2bbbab4ac5083cf64dd2817b397a0e8a77895f5aa7197f016af1e958d6debe92e6e69c10319b1d468f80f16831aa57a0dda1f57173732056b5856c4 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80
diff --git a/x11-wm/mutter/mutter-3.22.4-r1.ebuild b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
index 997051bb842b..8868471403f7 100644
--- a/x11-wm/mutter/mutter-3.22.4-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -70,9 +70,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
 	wayland? ( >=sys-kernel/linux-headers-4.4 )
 "
diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild
index 8f31f1764842..7307af626908 100644
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -70,9 +70,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
 	wayland? ( >=sys-kernel/linux-headers-4.4 )
 "
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index b2d96a149642..07153831bcb8 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -3,8 +3,8 @@ DIST openbox-3.5.2.tar.gz 972751 BLAKE2B 67fa52c595ac107906b879bc98cbf057ef38432
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST openbox-3.6.tar.gz 963207 BLAKE2B cbc29011fea9157af62c87a68e1cf4c31b474a5520c995bca360f2db83fe0957716bbf5af916bf7d5d0f677192d07d4cb07ad35f7b79ede548342f2805add533 SHA512 7f158a5236dcba5ec3c0e4fb5d1a5cabbd956d4125f19dfdb0594f5ded52545078d85ab645589ec3400a5306f63b43db5ee1ae26e3683141ee47f1b406d9788b
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
-EBUILD openbox-3.5.2-r1.ebuild 2716 BLAKE2B 459307d03272e0d95b3f21cd49df2430ca292fbea5b77a880ab5f70b33250b65de1e927333bf4331fbbd7d94cbd0954519aebfb59ace683cdce19db9dcb5ee50 SHA512 b14911124572668c88dd4dc52728fcb186e68dfab27198025d65f5f0ac60bb95668526526e5a46548193b45eb30965133c48a004bec6c03e6bc36068431234f2
-EBUILD openbox-3.6.1.ebuild 2750 BLAKE2B 8de71996996a737ccc294003904e4c355f726f5573618815ba7bd0e99df27206e76439f1e97109315308ce7c9772227fd0ec58bf0f01981623bfd26af7e5c66a SHA512 e0a5e23ab9323d4575ec93ee5fbf1491e6331676528c665859f97f170b69084d9f96b02febb58a240a436027462c8cc3e3f5e5681fc272a37466b589002aaa28
-EBUILD openbox-3.6.ebuild 2724 BLAKE2B 23ad664cdd28539e02804f4ce853ab32ec50fb6aeab35be3290f7d5259d22c3b9fb5809600a7553264bb56bb152151e10b82b8cc8a4f55e96fa2d287de275843 SHA512 7bb1da8b01675655a6d35585b8c4ab5b3c9e27923dc5a4ed58c1f5a47564318f4e97a3718b4332e1e7e8de1a8f43123030b134ce00c038f3093245aa518496e0
-EBUILD openbox-9999.ebuild 2677 BLAKE2B febf4ab47eaf92d02e30139bf53256b743ad754dbc818de3e10fde13d69894d18285d2ff084f87f43bb42f4b79e7427cce5d2c4d56c0b774710a193bbe4b4932 SHA512 8c5df980c5514f99497334841de5c3b382715990c34151ac6e48558f196603ebcfd3c78d46c20eeb1bb2e4c31783e9f3638e7096717a4170ea660bc21162dc4c
+EBUILD openbox-3.5.2-r1.ebuild 2663 BLAKE2B 1088d3f938fba0f4aaa54eb92f6ee70925798bf4009270f73cf49db27e1b492fb820165ef0ff11dde24476b15a7a5ba1a7bf912e7cd4381cefae07b2aed67de1 SHA512 3f7adbd4cc1ebbdc7b6d78204754e15658437245226619b004173e7e466933fcfdfcc99a9965150733baeb1848895288b58a62a4dc12d9d8988d7306576dd0e6
+EBUILD openbox-3.6.1.ebuild 2697 BLAKE2B 37fdbe2e77250e589df602f8dbb9f9e9d21796f261f34ad58b707d82db77789a7a733c01f36eeb44c1f3947a88177369dfdf5280e3ca6aa72a2453b60ba720f7 SHA512 785eb20cc0b1b09635b5d8cd6c406ecb354a16a5f7c85e014aaa8fe09d15251cb0a69b1bbb14e7d44e1c9f098301ad9ac19f3e4f7855af65106feb16b643d0ed
+EBUILD openbox-3.6.ebuild 2671 BLAKE2B 5fb2a1bcc642d782e19735e06f84edd18cd0eac2377a13f1ad5b1d0793667515433d36bbd217f5a6837b5caa70c2d506984ee3338cb7de632a5ce253e87dfb0d SHA512 182f43c9154606e323e2723147d70f9b2ba163fbb2d405125377d0f026807baf341d10b1bcc1be6d09fc3bffb60289230c98ae0657601bc88a8e2a7735f6e5f3
+EBUILD openbox-9999.ebuild 2624 BLAKE2B 3ee8bc1671baed6eb0b04d54e575e43af6066f7c4d7bc027adc809e7564c66c15cda6844b47923779deb4be0459ab249e4b7cf15414d663a2c7b7cf4eb03be99 SHA512 82cf7cbc59166cd540e82fa403cb7bfa89071e97f0c0c2e0673a65af9a5251550d627c98359b275d5e68a213ca9a20e57cf5354ddaedca2fdc1e2266bae41d18
 MISC metadata.xml 830 BLAKE2B 229d742b61c0557d742a2157121b941ea5e177764d870a6516af17c30802ed891a833e0982a8e82b15f281c33213575d0fcabe265873f78829a2a639dd9ace24 SHA512 879cbe0783337b93847faf36b5475fcc71bcaa80834fd9910bd6a16ce932ed28943f5e027815ee17d2a33806fef8b5445475133dba962d81b90dd823cf352aaf
diff --git a/x11-wm/openbox/openbox-3.5.2-r1.ebuild b/x11-wm/openbox/openbox-3.5.2-r1.ebuild
index 3f45b41ad72c..433a8a577125 100644
--- a/x11-wm/openbox/openbox-3.5.2-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.5.2-r1.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"
@@ -45,9 +45,7 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto"
+	x11-base/xorg-proto"
 
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
index 555caa92ec33..d06a776bab08 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.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"
@@ -45,9 +45,7 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto"
+	x11-base/xorg-proto"
 
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
diff --git a/x11-wm/openbox/openbox-3.6.ebuild b/x11-wm/openbox/openbox-3.6.ebuild
index 1311371aa881..8412487ff4fa 100644
--- a/x11-wm/openbox/openbox-3.6.ebuild
+++ b/x11-wm/openbox/openbox-3.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"
@@ -45,9 +45,7 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto"
+	x11-base/xorg-proto"
 
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 150b3ce0a56d..a2cb088ec10b 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.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"
@@ -45,9 +45,7 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto"
+	x11-base/xorg-proto"
 
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
diff --git a/x11-wm/oroborus/Manifest b/x11-wm/oroborus/Manifest
index 8a023a6233c8..487502ededdb 100644
--- a/x11-wm/oroborus/Manifest
+++ b/x11-wm/oroborus/Manifest
@@ -1,4 +1,4 @@
 AUX oroborus.desktop 137 BLAKE2B 0c90b2f1b81af70b0355f738ee96398208a8514dd53ac6e3a5173ea54712df2d21021c2c2ab540e9791d5cd39c0dba696763b679a6963ae3ee63a29478cc71e5 SHA512 6fffb36df68027eb763c947d575e8de7cadcfc5fba42caa6d74a54bab884011f81961004563d3327f692905f64d57edca8829724d6fefb3961d23117d6b6ef80
 DIST oroborus_2.0.20.tar.gz 335099 BLAKE2B 6c4dc4e8104f47ca847b0e358ac606aeb684b004a0fc6cf55130318814efd65ef96a602630ea01a090b6851595982fd7c3865d5efec38f72182e29c3ccc1aae5 SHA512 0ffa9e3ce25c3d2cb6f24c827755b4f7af14f6e34127fec66ef367cb8dc53ceb89d0fec3619f80f055f9d2241dfa0e4edf53e4e22dad1558d7b448f0b878c573
-EBUILD oroborus-2.0.20-r1.ebuild 529 BLAKE2B d106b21b189bbea164bef90f2840e0f209b9445a4aa87e1dfaf76e313e8a9377603aa7867be4e962d6b9160f0f299f5f06333e864829fac9a2cf8916b044d425 SHA512 45a942eaf4f35e619a82e0513c7b97cf9e8043fbba019d79b9eb9856e3fa740f5c43381e4035c7af8c99a6c60d23904ac0846933d4d63c59b7414027279f7672
+EBUILD oroborus-2.0.20-r1.ebuild 511 BLAKE2B 03dafae2ec029e30abfedc140e6c529f8c1928032fc23f8b94c9d083867660e803395636dc4d4ed1880ff9096ae1d2775cc63964eff3478a991ff808f8f01ad7 SHA512 94e3363c8445235014d150a1b61cecc490f76b2f45091f941ff858999ec3090d4747bc8d250466f9c3ffa3f00d8c55cbc055cdbb0320bfdd5845699694a2b8c3
 MISC metadata.xml 493 BLAKE2B 8885e6d63fa88a19a9866150d3774733d459c7a40d75269f575f54ac6657e4426d706d2efde4363c539a299134816ab97687106844861c774e4f66ff371604f7 SHA512 f5e29aa56730150e348a610458c2faf18a203712e06ec78cfe0861dc61d0bc1f3c502f53abf02648b81566cee831ddf590894923b220f9b071badc5572d6cadf
diff --git a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
index 1f0a4840a57d..1c51ba7f9b18 100644
--- a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
+++ b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
@@ -19,7 +19,6 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 DOCS=( AUTHORS ChangeLog example.${PN}rc README TODO )
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index ca90cb72282a..ea0a4484fd71 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -5,6 +5,6 @@ AUX ratpoison.xsession 19 BLAKE2B fa3cca1a3a03b0b6da08f6976cd6436fd2e115961fd1c8
 DIST ratpoison-1.4.8.tar.xz 364700 BLAKE2B 0422606cda247cd6c87f7d661b3a09edd51311f8ade6df95ce69be1ffef03fb2837adc4bf9eafa737d14d47e788ad4ff54885f3bb030acf278893a91f099a841 SHA512 10b44489e60d3186ca407a5bd87e23dbd737cdafee22ea7284ac4db8bb4463081af483460d1899161fbae2973f4d25fbd1bfd354e3ffb59735baf69bbd6f94f6
 DIST ratpoison-1.4.9.tar.xz 315584 BLAKE2B 18cff2ed835579b606ea99defda04db6ebaedc8bc71d3f7d12cf859caf908d427f50b345089ca3aae52a407ae763818d91a2dd4026c9b32ead95adfb2d065c25 SHA512 97f705efd2092b8e12528496890c59f613e6fcec010aca94a5a59bd641e22dfc50dd500a4b94af7a07553a8a6359f6bec4eee0db1a7ded29d7f051904b09beef
 EBUILD ratpoison-1.4.8-r1.ebuild 1805 BLAKE2B 0c2019dc6ef6ffb9da23f9080ca73d662ab5acafc9c020770c11da60b2b911560fcc878f95000c023f55b7c5d551ceb52365ee7f3cae75bc992eecedf8ee2dda SHA512 59963dff1a5ffa529180cd8386bce013d0c34acf8141eacefaf798fd219ae4bc18842f5a07453167fb0dcf2823a8e12dfb1313a5fb7c8f55f65ecb93dfd6bbb7
-EBUILD ratpoison-1.4.9.ebuild 1869 BLAKE2B 76c31cc5a0efa22b445749805d9985538bfd172e2077c36f380f792333d30f5c5b4a31ccbf0dca6de699e7aa6c47f12cb8d57f6d8de9218d2d41317df93e0235 SHA512 74e4596179f76e7aa0d5a23387770d4a96be8b936d231faefda9c1b503bcd9b3fa4b7b0ecb047a87224213b93ee0a1aa8d5f7729111c8d70864c042dd83f84c6
-EBUILD ratpoison-9999.ebuild 1847 BLAKE2B 1f85990f8559d52b3d5b969de6ec103b2deb2352dfdefd9c213b79b13cea7bf397ef0387c88d8b00f1b67bde0a79e51b088f079999fba17858648dad25223cdd SHA512 b502680abb58e39f9a4898c63193d0c8fc3e9d228bd954326fb3e393cd5a517b8132d79aacdda973208dc2460b28bdabfe9b63dada14ac91d92febd8582224cf
+EBUILD ratpoison-1.4.9.ebuild 1850 BLAKE2B c3be94ac178380f6e4371f3d1bdebcb4a55c85a9247e96917aa5ad0818cdbf016284f172d1ffe536753663f989b9b12679c547fa07187a6f1f24ac223c5ca2ae SHA512 2de9c661ef92a4d098902de999390113c70c655d276dfeddcc227fffd8281d8797dd0383d9f541f734d05ce5e96251fef1cb733f50e2e26d721e1f6055e00d68
+EBUILD ratpoison-9999.ebuild 1828 BLAKE2B a787426fd010248f132154dbefb9c6ad1f37027bc845ae1c67e5ac76cd1ea95cdacc22c86030257065829a1b2e28a352a2c3e25db99afeb043f64072907dc64c SHA512 550218f84fbf42efc08d61bc30132d71cff23311834447db70a67c786f3edefa97cb2fe76a48c8fee5cc07e56da759bd628dfe927380d7e46ade51aaee3b01d9
 MISC metadata.xml 1036 BLAKE2B 5982e3f331cef53bcc5b9809dab21e7d6f7cae85665c66650e2b09b66e7a7657511eada8fa450bad6b27804cf20dc56867686222e2cb35edc614ab2ff0ea83a0 SHA512 d40c0383ad7243df552727fda5979063a1138224b3eb4ed85cd730ad61af76fa688a74d023c46562856655f1d0c15af748d933f4cc8b61faa7cbc7eed6f4c149
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
index f0c2e4dc948d..6bb0cbb4c799 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.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=6
@@ -24,8 +24,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 SITEFILE=50ratpoison-gentoo.el
diff --git a/x11-wm/ratpoison/ratpoison-9999.ebuild b/x11-wm/ratpoison/ratpoison-9999.ebuild
index 568ee3d06f21..7bdbb46304d0 100644
--- a/x11-wm/ratpoison/ratpoison-9999.ebuild
+++ b/x11-wm/ratpoison/ratpoison-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=6
@@ -24,8 +24,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 SITEFILE=50ratpoison-gentoo.el
diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
index b00017039438..a93cd220759a 100644
--- a/x11-wm/treewm/Manifest
+++ b/x11-wm/treewm/Manifest
@@ -1,5 +1,5 @@
 AUX treewm-0.4.5-gcc43.patch 614 BLAKE2B 033c54a54ec06e81ac80890501f4d1f9d27633cd1b489566e6f32bdbab59286175eebe6f6a063aa7cae47f5acc7a74212744bded7bef5f2be5e25b8b27dbe026 SHA512 2e2e965c8592083e411da78eb3abdf2112e0b37b5759dd98ea62ad8c19859a59b72de1d0b9630962d8651921f220ad8e670e9e963a062dd3435a9e7d9e517e94
 DIST treewm-0.4.5.tar.bz2 87098 BLAKE2B 4ec890573aa32fafef99590f12b1e5491759ece65347339654844f077e9fdf794a96322d62066196eb3c50be271e8f16e842344a755411f3914a347b8cf2835e SHA512 96eb8eec11cec992daa4492b5a9243db5cc80b23d3827169d223d81b9ff289b62dbe6c8c3ea9da5da2e32435d98cc4552038c26e975cddec795de3b88f9db9cf
-EBUILD treewm-0.4.5-r1.ebuild 1606 BLAKE2B 80d1402aa6b5497ba849d1da54c5397a3406878df71b9a35d53cdfb5b03e7e159821884515d6d8550b9dda5cc3e0382e1c6184870f490135e61b2952bacef7b0 SHA512 dc707da5d6ae6c51cde3fc33d32b98ba972e1fccaabad578e3dd5e2eac692944f86d2c2bc567e9c1540340b4da0a2cf028c983c9e3a802e4eb5b1126c086475b
-EBUILD treewm-0.4.5.ebuild 932 BLAKE2B 0b359716adc6756ca2fca1baabd9b31ad0346ba8ed15272d616c9ae5328efb24b064ffacb1c1894775b8064cc6e6d2047313ab3c7b197415d27b31050d7526ca SHA512 8fd474fe024a540d5276300b14be363622e5567f9be85dd2ab2156619a48c9cd02bebc4d92391c39a8655f5fcc61fa4c31fc52137743e637ad8f1615a5c8a99f
+EBUILD treewm-0.4.5-r1.ebuild 1599 BLAKE2B 904b4cada4b8c3be319caaee79be8f3b3b0454a7c565877ddf190ac10d35514e74c0a98b1f6040ef50aefa0295b853acf610d243d592592a64bd427a6b4a17f7 SHA512 539d70320dfd4aabf552e9ca89e0ec19ffaaf8c362a01a82d33cfc02ad33afa4468cd7cede0d760b5ebbf9d54a60244c299254471d353c24de6fefec02581d9c
+EBUILD treewm-0.4.5.ebuild 925 BLAKE2B fdb77850da3956c010cdc3323eac63f44d128a986fd5d740891deb6ca90ca96eb18d27a296385bc651adb44dfdbc0a9c53075e26c4296d9bfb7b0918ea18ecb6 SHA512 08d4c32998543e58c3dc3afa4b4c41508c5a6bec8ead513d230b32cb8bd3773bcdbf71b5759de0021d1788ed8c8cee970c4e44f750cc01020a4fafc6319fe605
 MISC metadata.xml 436 BLAKE2B 666d6583ce2dc47607e4e99557a889d765cd2436131ccba2496e4ea00e9d288e943e4b8aeed2bf4645671baa6911b5063c41fc65511bd854c0dd008b9ba65ba3 SHA512 cde7c7c0dadb71cb58c15a2fa7efb031fda246d1464bebb476c4a02c64baf1f90a03198b82e1188ac83b36eb4778e21595335bce5af14beb1cf20de4b978b7e8
diff --git a/x11-wm/treewm/treewm-0.4.5-r1.ebuild b/x11-wm/treewm/treewm-0.4.5-r1.ebuild
index 118cd3b8d39c..7c71b8f47a2f 100644
--- a/x11-wm/treewm/treewm-0.4.5-r1.ebuild
+++ b/x11-wm/treewm/treewm-0.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -19,8 +19,8 @@ RDEPEND="
 	x11-libs/libXxf86vm
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-misc/imake
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto
+	x11-misc/imake"
 
 src_prepare() {
 	# bug 251845
diff --git a/x11-wm/treewm/treewm-0.4.5.ebuild b/x11-wm/treewm/treewm-0.4.5.ebuild
index b1b6de25e7df..0351757d1ac3 100644
--- a/x11-wm/treewm/treewm-0.4.5.ebuild
+++ b/x11-wm/treewm/treewm-0.4.5.ebuild
@@ -20,8 +20,8 @@ RDEPEND="x11-libs/libXau
 	x11-libs/libXdmcp
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-misc/imake
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto
+	x11-misc/imake"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index d8d02bfd755f..bad263786983 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -2,6 +2,6 @@ AUX vtwm-5.4.7-NO_SOUND_SUPPORT.patch 835 BLAKE2B e1b3dca9ee345f6d76c39de7eba932
 AUX vtwm-5.4.7-do-not-rm.patch 1039 BLAKE2B ae8b28056e353f2b36e61935c32ef58e74cf806905d37f4663aaa262c9ffbb6ed4ef1efe2fc56f2753002d6d154985be2734b7948206723c314ae4eaacd4bc3e SHA512 f10762468cbcdeffbae4d3d2135c094b054e687caaf991caff90dc85e33d27e69664b978e75deda2ba66b18c537c21670005f02ee8a4558ad83c08f401533d86
 DIST vtwm-5.4.6a.tar.gz 992488 BLAKE2B 15a28556c78a9fc81f656eb6d50a2bf9f2d86ef6938cb8926cbb909c2c0edce6cbbe09270e72dfc29f9c665aecc36dcd57bcbf26af96b1f3b24518427b652395 SHA512 2500dfe50fae90cbceeee2b3dcf1dd05c330abd978a51abdf2768b3231fabdd71975f3bbdc341ebe25101773009cbf7cb12f263a013165bbda5c048e8b602686
 DIST vtwm-5.4.7.tar.gz 1021160 BLAKE2B a669e21d2fad5a93036c866053fb73db25f3ab1e877256650d4cc295db3861bd6ff90517e00d7042b00621c05d1947b9747380eac72fec85cfc1d68c8a6b59bb SHA512 abd9a1b1d077232eef7f39521823446f2674d69a071333209a808ff651dfa83a7f6fa00dab06356897d9e7a88fd6616e5920af030e24541bd4703b3351628728
-EBUILD vtwm-5.4.6a.ebuild 979 BLAKE2B d01107e4070e4bea7c864864a7c812a3589233e173cf66619db601f4ad0624183718bdabf9c10d3c858159efb55adfa14e7e03b970c3ddf075e75598d7222ac1 SHA512 37dd4327c1a8ae9beda215eeafa440c83828050bb405bccff1aa289d4353f0cd09b071eb2baf94755e6b5d9104d8236b5017f403f14baa709d6f2af9a58eae93
-EBUILD vtwm-5.4.7-r1.ebuild 1617 BLAKE2B 6a78724f0d639d9179b75dc6eca0e63f9f2fbcdce39ce6a4bd959f5fea3dbdaae755228ab79befa32408435cf953a1298dea602d81aa8437ae8fb9845b68ef79 SHA512 dbe58569459d9ebd9f8d3901c71d675f7cc07e1ea13cdfdb142bd500ff1c692c05f86fe4e9ec3304127b4e1275ecd68b926cffcf2d31d75b130bdb155a540bc3
+EBUILD vtwm-5.4.6a.ebuild 961 BLAKE2B 2d61bc4d825ad2437f3cacf56eb9e58d7ec78b73677cb82e44bfb4dd91d99d2c774d9c72d8c2066aff020185d587d053f4e4d1f10bb407acf74127a3ad23d0eb SHA512 c88fc5582e4067e16d4d447bbf4ca1c603014c198c13dc225a68c11743971f694680db6c96ffd06801faca94a0850e427f44339168fc9faffd445ee35374da93
+EBUILD vtwm-5.4.7-r1.ebuild 1599 BLAKE2B 2823d7eb3e35da76ed5a0f6c965d337e9639f6ed44618e3bb1f414956094e91ebdfa42d72ec664d4d1c2b2f3faf128ff2e4a99f73dec070daa8a06af9e8b89ed SHA512 7ebebb8bce9b391df99a557a6e990a4471190540013bd40a9887c4d204d98a9482576b4e3a1c26340e05e207878d8d16b3badef930537f83fa2ca0de893d7c6c
 MISC metadata.xml 636 BLAKE2B c49eb363f70a7d86906e229d5b9275ad5192068b61f3d4aa46a0c6711e4e3b46e27099ce1bb53e57b9476cda6bbf67fac55cb7eb6c70b37aa35bf08081f7a397 SHA512 5b71984f85b57680ea4d9432ee9aac7c4ed9d0df7082425fb650099338dad971985a56f8278ebb6c2eebe45d58272753682ffdbb9dfebeb54d6fd5d9539b77a4
diff --git a/x11-wm/vtwm/vtwm-5.4.6a.ebuild b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
index 600133e8fc82..db49006317ff 100644
--- a/x11-wm/vtwm/vtwm-5.4.6a.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
@@ -18,10 +18,9 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-misc/imake
 	app-text/rman
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto
+	x11-misc/imake"
 
 src_compile() {
 	xmkmf || die "xmkmf failed"
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
index 2b781fab571a..4fb624a7bec4 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -21,12 +21,11 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	rplay? ( media-sound/rplay )"
 DEPEND="${RDEPEND}
+	app-text/rman
 	sys-devel/bison
 	sys-devel/flex
-	x11-misc/imake
-	app-text/rman
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto
+	x11-misc/imake"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-do-not-rm.patch
diff --git a/x11-wm/windowlab/Manifest b/x11-wm/windowlab/Manifest
index 9d2f4136cbab..92078c754edb 100644
--- a/x11-wm/windowlab/Manifest
+++ b/x11-wm/windowlab/Manifest
@@ -2,6 +2,6 @@ AUX windowlab-1.34-fixed-font.patch 385 BLAKE2B e137d399ed40bda9776316f0b2fd5be9
 AUX windowlab-1.40-gentoo.diff 1621 BLAKE2B eee189cfc54178f850225c4226a1cb70d131ad9417e9f8e000a1a56aaa3ddcf35dc65f4958937a0f40e020be966776a2f61f4797fc4217e128189b3bda4eb771 SHA512 d0d06e2396f1a2f26d7c76b5ed513df2fa4d7496a898664b1fec51b33d6e3f63dd131207cd68243f9c8895d7bfa00e399b3a38ac81101e8321532f454f193ccd
 DIST windowlab-1.34.tar 163840 BLAKE2B 5a4a310f3a9ef4047d6374119c3b9d6239ab450bb11139dc1686e57848d9f5125bab603f7b28a0b33e21403049176e14473d783e503604b7b83a229fd1e410eb SHA512 1d24065fdc2e66d9906d7a1c383d547f677db3c1343176501251637588c7683c08c2803473a505097cafda38486efbdc055bf9597c9ce00456c5ae0d1781e930
 DIST windowlab-1.40.tar 174080 BLAKE2B 9091565b40e886f921f33251c293b39ad4ec544a98d91046e52fa4e1aae66141934645e724ee224750dd7c50fba5a45fe2b4482c46e860c752a10c2b00dd05a5 SHA512 abea16f4f85f846d426fecce548cef2bf867fc6545a720ec2d3a8d93eb5a4abd6942e44534bb7faef6cffe0551181764effa99d835b8f067a1510f7d50af6d3d
-EBUILD windowlab-1.34.ebuild 1239 BLAKE2B d7eb5f9bda4c01a4ab94b95b87d94f977130ebcc4e46f50298c89732b421b2de7ab31eea20aad55403e55d7c1b312d45bd3dd9ce61e25466f321833f94239ee6 SHA512 62a7be005bb0293d6936c6f45d20a77078f51f8c0fad2d4109244a1420d945d893d187a1ea0a43b87c5814dbb9cec9d255385dc4209dc038f1a0fff377819dd5
-EBUILD windowlab-1.40-r1.ebuild 1094 BLAKE2B b4123c8f30f7db52dc109a76b4aa2aeeb612aeaa8505b8080dc1123d12c10bac590aa3bf57590b1eeaed7adc9ed85bfa767c93f1a5d5cd6da428339dca3d350c SHA512 4fcf4cd58cb21ecab8a049b8adf09f7c8339ffd07cebb11c8f84b616bf66cfd99e72ef5bba5c0993fe3d7829ceb38b32261b6fdb0b0a007f918d544caa237e9b
+EBUILD windowlab-1.34.ebuild 1239 BLAKE2B a44f150cda630a9548f1b30256b31328ce9d27292e9dc027d9c4cb4736d4f7a27de992964fce4982c443a43bf6585dd592c5819887f11fb4df22c49c34c8ea33 SHA512 ada14f0b7eba965ceb464cb7c4fb86c96d31915848af6391eab3de323ba9a0a19e2c226468ae65ace31f0dee5bc4c0867f03bb174a117f5351dfa0a25d8ab697
+EBUILD windowlab-1.40-r1.ebuild 1094 BLAKE2B 2880ce0ce7bf58f981d4a8704756a448b9a2ce2d27fe6efec7daf04464982c6109693296093f4d27cd97db920543f0621b67ee464d19b48d0c512ecdc5e634af SHA512 a93b123d5d407a357208523a4d58f5643cbfcbe049466ba95dad8c9b2c4fe613ccbae9a22034ac7aeb1d8af85973d3359cb2efff9db7b6c0ad67d40d5e6df932
 MISC metadata.xml 745 BLAKE2B 13d53f322a8928c1d1b9bbdab5454a351fe29d744127939e2f34de40be078c9a0fb2c04e9dd1f59a6482b4ad45a6216f62733fe87be852846f3ec6760f941ea7 SHA512 ce0e891248ce741753ca470dab5e537d46a361836814608a6253bcd81f56c2b7a7627bda7236e006bea279d28ade0aa6980f71678ad8ca1751769e7b61e46729
diff --git a/x11-wm/windowlab/windowlab-1.34.ebuild b/x11-wm/windowlab/windowlab-1.34.ebuild
index ffaea2ecaf51..56ce2b4b3c07 100644
--- a/x11-wm/windowlab/windowlab-1.34.ebuild
+++ b/x11-wm/windowlab/windowlab-1.34.ebuild
@@ -17,8 +17,8 @@ IUSE="truetype"
 RDEPEND="truetype? ( x11-libs/libXft )
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-wm/windowlab/windowlab-1.40-r1.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild
index 28f22b9e18ac..45087d82b6c4 100644
--- a/x11-wm/windowlab/windowlab-1.40-r1.ebuild
+++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,8 @@ IUSE="truetype"
 RDEPEND="truetype? ( x11-libs/libXft )
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch"
 	  "${FILESDIR}/${P}-gentoo.diff" )
diff --git a/x11-wm/wm2/Manifest b/x11-wm/wm2/Manifest
index 27893beb4057..b01fb5b8f957 100644
--- a/x11-wm/wm2/Manifest
+++ b/x11-wm/wm2/Manifest
@@ -1,4 +1,4 @@
 AUX wm2-4-gentoo.patch 4265 BLAKE2B d4ab8f91b01dd3fa0b0b7499adeebca04950131ace81f3d19cd3ac0e5c3392ecd4398139b4edb53b1d66e9e37bef0d3130df12873dea064db8c2e41eb4b442d2 SHA512 f3772d107c29e4c3a3f14459e80e130122d9be9cf7a1edcff507d1ed53efa67c42e9ba63ea08d1d846bc864507f48231a2c9e903bf9d46b085a75a478efa87df
 DIST wm2-4.tar.gz 32807 BLAKE2B 38598a8c47e3f8512ff75f79534ef97d9d54a47d243e2eeab15b84cfdaa412b25693843ae6266cbcaf4ce299a9e05f35d3a236fdde315a43df372984421515e9 SHA512 9151267e5a6bf39587b15dc3e55b4acc05aa1b14a7a9bcb4e1ed25d474af8b0e7699343117f184c745645deb404d6f6e230809b88d9b7bb5c1f67ba0fbde72e9
-EBUILD wm2-4-r1.ebuild 1387 BLAKE2B bbd386a123e0bb52f4f017b32adc64ac5c464738af60f577332622eac629ff4055edcd8543b6abd2ab0af2b3c3bce82561e4ddb32b8af5b364ef38e47f57752a SHA512 c1a4b09618177932826ac0d135eed89fbfa4bd97c7c1df22c1aca80235d7fe7c5349f844c4ab889901459b34c181a15f8cfe437bf77c157ce04fc4c11a98f7df
+EBUILD wm2-4-r1.ebuild 1387 BLAKE2B b9d2195a188a769901b23fa2e6a759c9f7e886d30a6d6379216c552083719f063c88e01ad6383d35420cbaff8508c483ed0e0efd5f6e92c3be69aea6d1cf9ceb SHA512 deedccd36937381aa2648d6cc8dfe0d8fbac92383e8689a7639d47ac9bac9bc06271c78ed070c38cbe680db2d00863bc8c1326beb1035ffb9243f273f0c8cb18
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/wm2/wm2-4-r1.ebuild b/x11-wm/wm2/wm2-4-r1.ebuild
index 1d023d08d20a..ea872773ae6f 100644
--- a/x11-wm/wm2/wm2-4-r1.ebuild
+++ b/x11-wm/wm2/wm2-4-r1.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
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libXmu"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index 7d6ae09c8a85..81d662de925d 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -2,6 +2,6 @@ AUX wmfs-201003-desktop.patch 167 BLAKE2B 4150ba608826e4defb56161db0044f13402d08
 AUX wmfs-201003-pthread.patch 191 BLAKE2B 4a317083425e5dc6ae58529a6ebba7185a12a0adbdf5e428a1fa935718d18abe5c6c11470d32e2bedfeba1c777e47b2a76b3c269cf0e50d2ed4d6078cc9f71af SHA512 871a6558fc3201c2652e1a84d221d7d2bd90150f4e1afb8b4a7e6862797e47d012f832ecf0b1c205ad07942aa9b0cd3807a9c839cc6304ce3fae3746065493fc
 AUX wmfs-99999999-desktop.patch 153 BLAKE2B e9a3f1039bddd76ddc05955e843e89c1ab81d486b79e870466fc4ac94ec07e72cb1bd0e5d45752543b104386d852f619d749f42e6561ea6767cd797a46e0c434 SHA512 5463fe8bbf312a003e48276fd15e6ad04075d28835f18e61260038278e31f4de4a2a7e38ad7358a12d669af973e2297d121adc0f5a2f07077874327e20362711
 DIST wmfs-201003.tar.gz 59593 BLAKE2B b2e1f2cf73ca3d8881fa8de7b52fb6cae947a6006549f05dd06179b8b44b10fd1157a8e180b2b3177177fe0edf4c39b9a3fbf36ebb2b6470f1ed802a641a4c89 SHA512 117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90
-EBUILD wmfs-201003.ebuild 814 BLAKE2B 19b6cad5332c11e3000ef820c9d788f08b438c22089906aaf20c30f32f9b5164d52b2cf657ff55ff9aec81a43253580cb023acbd5e04f3b39b3d6e530b7f88f5 SHA512 72c5bda3adbce2f02584403c9cad527725155eade0e36c7c416097e54db1e22625e24bf5eab6b3b38b82c5d9e101478165aa2b39b47c74a0bcb06ef2f1dfbd65
-EBUILD wmfs-99999999.ebuild 1087 BLAKE2B bb0296b8060958a1bfa081013c09cdf79e4ce316c7ab9bfd885f6300331a4c82074621a596ca4ce830663ee57675f660e31a7423b6c8972ac22891c09963984e SHA512 a725a3c3fe3c5249c18ede2116749aa79ebc66940fc9d449bb10e7e89f0ccf8103f11377c8027496ca7e9175bead7ee6f28253bed15a78ab52d1d3d4f9f06c65
+EBUILD wmfs-201003.ebuild 770 BLAKE2B b522805acbabd18a4749443b4e60769d1b4b4d0073c678fd769bbe61eb30165143ac10c70c2a6049fc22be2d88ef27f5c378ebe6c1556b7384290153b05231f2 SHA512 ce196648c6540ba4efd0e9d9976793f658c15dff104977d13255c425eda81dc224fee7783153f5f978b36bf99e705e137c4250d5bac8fcbb4c07107ff0ff5372
+EBUILD wmfs-99999999.ebuild 1043 BLAKE2B 2d1816b24fa97a1731b83469d4060ec0355859f4a1ee37fd848ba71cf26f8b65c3f61b8cfe6c9757080486d0f5e1b168eba0cee9e0627620f57e89251cde288a SHA512 8104c132c095d9889e5543839bcf18ba5fd3395c63c74e31dd0b248a117148f72874fd3715846147ec7a29f6ce2b2fe055bdad454ffb3bb1f33e3ef11e1f7456
 MISC metadata.xml 380 BLAKE2B 318de05f3f531b8c35e71a0563525f7c8a1397e0ba4adbd086b768c93d792d8c336da47bc7582dfc7b0f4ce2917dcccb21191f46c064b02317477ef3a568ee17 SHA512 644e88ac0ca2d999cd273f807d45400a8438a9800b3b744f764c914fa41d819efd55ecaa27de6cbcf4403491f2986299fc1c032afd26fee67822cfc2c6368359
diff --git a/x11-wm/wmfs/wmfs-201003.ebuild b/x11-wm/wmfs/wmfs-201003.ebuild
index 1c7709cb6fc5..ffa5e17c56fb 100644
--- a/x11-wm/wmfs/wmfs-201003.ebuild
+++ b/x11-wm/wmfs/wmfs-201003.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
@@ -23,9 +23,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/randrproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 PATCHES=(
diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index accc125060ba..cbcb210e0993 100644
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.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
@@ -24,9 +24,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/randrproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 
 src_prepare() {