gentoo resync : 13.05.2018

45 files changed, 105 insertions, 152 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index d0c38cbc6eab..50d55a3abe7f 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index beb1e541fc13..c818f6658b31 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -3,8 +3,8 @@ DIST cinnamon-control-center-3.0.1.tar.gz 3834138 BLAKE2B ecc6f496deacf967026698
 DIST cinnamon-control-center-3.2.0.tar.gz 3837279 BLAKE2B eee6a735b8686229d27d90d655e1598700b329dd72c61cc0535e4f423eb9ff2534b0f733db872db65a8a5372bf71ab69c2a9cec7b4d189e06e3f89bf9ec6be80 SHA512 19a3481ba52784c733e5aae9603596a29fc12c78f21b8fe08492deda8c3eeac2bdbfc2da24f29dc5db6f6de02a26a43f67f3141dbfbd07c26f0e38a872c39216
 DIST cinnamon-control-center-3.2.1.tar.gz 3838032 BLAKE2B 615cee8d3bb4498c2faa9ae7bf776ab872169c9e0eb98412383e927f9dc199deb8d70ac3efad7e13c2ce6892a634a80dd114ec228cd4c308ba043799d7853ee0 SHA512 77f98aa47a10ef280ca7c3f8662e770d87a5427c91093382d3c289abcc0eac38317a31cd47a19a8ee67a4579375b84392f45d239b98fe494f7abfe10ef186554
 DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91
-EBUILD cinnamon-control-center-3.0.1.ebuild 2611 BLAKE2B 9a4ba0fd9dbd45cf87cf1b2ddafd26023a1c7e6c3cbddafb7072b6ef8b99d8d80e3f14483533e9a9486a3e9102a354b11cfb2828867577fc08461154bd62c3e2 SHA512 f4373e0845807fc3182a086ebbacee8e5a18c015c6ef2d1c2f00211cf8f3ea162f9c55daed64b5a1c100d3621d7446ca6bb8f4cdec86099a2ab51c911fb52fcd
-EBUILD cinnamon-control-center-3.2.0.ebuild 2585 BLAKE2B 2dd57986cf8c80549a91ae4a0934aedf09d4c6fb577ba9c75cfcec349c4e2cfe082e6f52988b4084294ca014db1181ae343b34d75a47f05a4793b6ff6f9c80a9 SHA512 4dbb1a7f539a6a38e99472ada1703d0b27a6e761c62b266b500b9b66e59a955d698387431e9f8adfbf68511bc9a8ff4e5d36c416d5d0314406990b49a11e595a
-EBUILD cinnamon-control-center-3.2.1.ebuild 2561 BLAKE2B 52a21e3c82a9a738ac88f1a3cedc516c3510e05072f3b2d0b85553fa7340e87917339cb490893f77a15480edf117953b091423b8c713642e3e302bf1cc00f3e8 SHA512 423385581a6c1702d2064aca5a3e85eecbd0e43c4fa92368ff959e92891fac2aa1c411c7cf215e73900917844ce281bec3d4b37185cb148d172e7236bb0d968b
-EBUILD cinnamon-control-center-3.6.5.ebuild 2507 BLAKE2B 57b964b9b626d26babdb33999c0ba5b99fe624bd3acbed46102ad72c8247b49c31f06a510ad93ef85749cdb52ed5c20d48f01273e4e5225a85c86d9bcb0cf3b3 SHA512 cd033ea475de5dbcaca660a91318f10753a742bace75369c4625d0df8b49bc0a13f67a8dd2551c7bf1d9ad73ab9d996fb57fe678d30cf776df6aa6e0253e0c9d
+EBUILD cinnamon-control-center-3.0.1.ebuild 2570 BLAKE2B 6ada17476cb4b042c0d841e46a3688050028041e7a4dbba7d37f6b13a3c1140875598e79c6bd3c37374b1463ef07990a42624aca420993aa2f2f8b7c90ecc94d SHA512 3106f15d699c3563bb86f903ef2eba8aafea789683843dabb988bf2b5e82ee0959850cb2011440971e946afb611f89fa5cbf0ebe35b5c78479d65ee65162134b
+EBUILD cinnamon-control-center-3.2.0.ebuild 2544 BLAKE2B 5bad35b53916fe856adf1cb16fc2789b7d171f732b4d980c86bc1cd2882192a6912f4d9bcf6093ed204768c8ca0adbb1472d25772a00d3567a19bfa28a4a7bf2 SHA512 1a04ee650e2f704a55684d5539a9ac986f49923042c0679feb360dd92ce12c527b0e0054deb937a4360e78385b435e5eb745fb09751d0601315c27ef01147660
+EBUILD cinnamon-control-center-3.2.1.ebuild 2520 BLAKE2B b5f22fe85ae0ce3cb929c177458f461bd82cd0ba8b56d95326bf067855a054318ea23cbd13add59159ef307ebb9681ed6ec255d5133a4f2eb4bb88d2966de96b SHA512 9aeca0bca0b798bba3d9a701d516173bf8f8f1be1df6e9655fa32b6c15b96736345d07442b865536571c5bb87bc1f484a8091b1d43bd7db582ffaa2c4018ffed
+EBUILD cinnamon-control-center-3.6.5.ebuild 2466 BLAKE2B 7a3bb2afeb1618e7d020c4d5320baf222ddbac924b4fcf3f0ccebf10072e9ccc990a0781a7a20d3feb6017c9e7370b8b62c33d36ba71612f1ed5d2f2c71e877a SHA512 9f3b7c43c256d1565904eef0262e276f53b9e2d272e6546f54645e0852a1432f32e1ee51019df243d21c234ea6845d0d2f232ba56d676a3549679c02733afa52
 MISC metadata.xml 452 BLAKE2B 0b3f734916acf4ee8b2fb22b8b419dd63a18c107c4521d874a7c4a2ea45fd8ffd9ce7f44e85a7b4642a989dd0c96a80f02af4e57e64d99f650ab821b2a89f746 SHA512 e063012f6cd1d892a124a3c47c247ec36351993af36c3c5cf0be0b1fafa12119f1e7506013a3fb97616b8343c924d4bcd341350c4e575fb042d63c957c8cc666
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild
index b1b173b37c18..500f58d7c46c 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40.1
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild
index ee1441423e0d..94fc1bf250a4 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-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
@@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40.1
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild
index fc5ab9e8080f..a3713bb7b68c 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40.1
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
index 12619ac98563..12f5a93bba7e 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
@@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40.1
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index e7326549fa66..ecbf3ca0c0a6 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -5,10 +5,10 @@ DIST cinnamon-desktop-3.2.0.tar.gz 572478 BLAKE2B 64a3e050a5188f2dba0708cc97d0af
 DIST cinnamon-desktop-3.2.4.tar.gz 570814 BLAKE2B ad45af4e3e308fb6b7d97fc6b094f55d01f6bc51e44ecd0ae429020c2a410b64d21a1b57d981a4034c34389e965123f0942768b0f08069b1d09ad74e5b468af2 SHA512 d07dbc63df4b689cb1fdeb7032c9f19557de0849def929a9ffc99d5aa1bb49edd37899256152d1245e1d43690821ed61a10e63f82962f787f5e06d999dadaf76
 DIST cinnamon-desktop-3.4.2.tar.gz 570232 BLAKE2B 528e2b70e06b6a984db3059fee9557b47ec2248fbe928c076985e100d2c17a53fb3b7a62407fd5d8b9139e5158b1e247cc683f8762d42756906e67128c2ce4cb SHA512 821b49aefa2c4fff54a2ebf4ed61d8bd8ccb193d5ba113b9e5e917d7abe6baf4e85f721bdaf9dc206b4d6b1ba3080eff0c7925ab4d1970e0a58895e8891b4f8a
 DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
-EBUILD cinnamon-desktop-2.8.1.ebuild 1667 BLAKE2B 3cdcd4795d1e4d41ac84d5ae3c281ca0fa807cf45b352586bdab735fa78bfe777a0474bf875f0ea2c01be962bb36234e4a6c0ed4b624c146586a3ccf8ca58437 SHA512 e4204597edcf5e9a49174abe82ddd9ccdd65ff9785017328ac8323ce44090b68f58c36a98bebe07fa83d07b801dc8b0310f496e2026023a484421cd70ec5226f
-EBUILD cinnamon-desktop-3.0.2.ebuild 1697 BLAKE2B 545f0aadd610e177123e4eee3060f735ecfad2cbec9a9ccc77de08dd1d76520b7e9f02eeff8073f6cd4a7ff708dd9b11f81df946cc9003aa860cf3731e5a2511 SHA512 bfe955ae7cff1c85b970ec9ad8bccebf491d5ff86b5019c3fb858bb9c1dd6a9aa0a25b6974885889064e1524b60579cc49443a562e90878ef83411edd27d3dcc
-EBUILD cinnamon-desktop-3.2.0.ebuild 1673 BLAKE2B 0762ea6ff30652e4ec1a4772bd714f2c4d12d5100962c959fd4c1fd56a26b38222281d063fdd4af6f68fd997c6e777a085b0bac3b8fd7bf407cd40718a1fe72b SHA512 82a24036ad9e62d4417e5b0d823d1afa414d3336e645dd24a0f248a683385f5c42cf73c6e64540d601ae9f1f258e4a4a9457d51e69d11984ae6c36e635be95c8
-EBUILD cinnamon-desktop-3.2.4.ebuild 1679 BLAKE2B b687238b60628262cb6d3d96614b831d29e4e5ef9fa47a359c1b0ee5e001d2d2e030a2be447757ca0dfe6bb18646a1db3e2b36b1fd16c1c53013ba3fa341ec9f SHA512 3ffe482cbb3993b554832a377b0192a6bbe2c3b50f92b7e0ead48a99877b19aafae6b109c84167310b8d7cb19c7bbd98eb01f43302c15acf7399f8ae6f4fdeba
-EBUILD cinnamon-desktop-3.4.2.ebuild 1705 BLAKE2B ca49c74af422e94772440d734e4efb878634c11aa3c315cc65fd32d091a9793ff1b64920dcb40f3b33663b0e279940aa73bddc043e33a6933ada0a9e5ac5b615 SHA512 02fded4450d126d41528911207e6073c4e310bdfb2c2e786d73979b9a96cb59ff4ab4e28628bf11c9eda4a5453a3bbe96bd85c857cce5459f6235e0375dcef7e
-EBUILD cinnamon-desktop-3.6.2.ebuild 1703 BLAKE2B c80ad8fb283894230bdfc6fafe53ed846a724d87a9bf65ca6e1c69f4e5029db7afa246acf2022aba4c871f21ba8ba3950eb861b5d478ec9f0c52e971087375ac SHA512 8f8070c887952aabbc974af4e1f1badf063f9e027fd2876af2bbfc2059d3d1d841a9610691c0720d497109c3d473fce567b353305a78d0db12855f2c6bdc78b8
+EBUILD cinnamon-desktop-2.8.1.ebuild 1648 BLAKE2B 431ebe2de02eb9f911cc8974d10673d97204380c98f30976c67373beb49ef4720c6492134682ee7dac664fa6fdd46227c6555b374e69575dfc9e4cbb8a9f9d2c SHA512 a28956f18321acc75301a5f3e3c8eb88cec54f9d9ef8c3962a79364f8f2a49905990fb4530804eff2ade74d3c022ae48380199570e835881de781e5325ba113c
+EBUILD cinnamon-desktop-3.0.2.ebuild 1678 BLAKE2B af0759d4282cea438410dc6e2eb5350ded78b084c1b4e25f1b15579632264f34702f617b439b7382a48c60ed14bef19fbf37e443d0196f86e489b9f7004dd106 SHA512 0e837559c32d30a61657918812b1ee5e43075f9392e57ed5c53480838339c3def263528534448ef2417eeff45cf61348623e10f43dbb7b4bb4fb58997466d00e
+EBUILD cinnamon-desktop-3.2.0.ebuild 1654 BLAKE2B 75807cc0742004afaf8a4fddc5f84a890245aafc16f9ce645555fde8e7b2df6aa4a3ecb044f53e86319f07d20029a4607785fe3b92236dff443f26d8aabf7bcc SHA512 64a49898e3a48c4b501ae684dc303f82554d0705ca9182bad4d356d9c907b6cd1338b562190f3663d13c947af4ec6457180c904334150fe297b007bf4600c46b
+EBUILD cinnamon-desktop-3.2.4.ebuild 1660 BLAKE2B 85b4cc13dd1dee6b77010dc9aad563887872c13c61f8d3b03e725e2663cb2b17529c2e69d4ee9ccd8ef372f1d2b820dace16af3aea28e57bf0f8a50e6416045a SHA512 1dfdbcde28df91c48f073747fc093c0fb2db729d6e53afb3c89ee0d75deaf7617edfa2017a34e078c6546b511a8850725a783c892c037cccfe62ca52199f3442
+EBUILD cinnamon-desktop-3.4.2.ebuild 1686 BLAKE2B a1f75acac89dfff32dda8e6983a43651dfdc097dc8d3a05e6fc13065d4e48d931610af23a7eed5363b8c87dad31c45bdae4b44d0a81bf4ae2c48228c32e6f051 SHA512 5b807cf193396a95f8c7abea3ad7ae04f86ccda695f7795f5c7b4371cf6173127cc00d0c292828b501c8875847c67e4f0d1a22333c351cf806b0a14ae4ff0cce
+EBUILD cinnamon-desktop-3.6.2.ebuild 1684 BLAKE2B a663d72bb18781e3e6ee22212d29bef6a49bde9fe434a78d5ceadc723cb975f48b04c1021f1390e6d676833ca9880091de4059ceb306778d3917e4dbe4d3d62f SHA512 1254cfe83cd36533bd8a398ea47b9bdeb95822768ada0e477fb1b810dc0b1ec73eef6fa0ff6b6aeb0b31f2c22f35ac82b8b4a7f8edcba6b56bd158c894b82e62
 MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
index 4fb86d3d0526..f9959dea6e70 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.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
@@ -36,8 +36,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild
index 300489c9c44b..050cdcc7e02f 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,8 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild
index 7aa1c85f8eea..ceaa3c29ed27 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,8 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild
index 91b950b837fd..2280d16410e5 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.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
@@ -37,8 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild
index 547abb541964..c83638f2d736 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.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
@@ -38,8 +38,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
index 12c1fd995ce9..a509d28ded90 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
@@ -38,8 +38,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index d0a3fd173ea6..a6f30807c196 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -9,15 +9,15 @@ DIST cinnamon-screensaver-3.2.6.tar.gz 124287 BLAKE2B f477b5f4741a8d6222fd1f6fff
 DIST cinnamon-screensaver-3.4.1.tar.gz 153389 BLAKE2B 64d43fc81ec94b66e88791ba7802f672980441d7968bc2dbefe9cba8c0285404811b6c40f10f5c0655fc1cefc7c5fc77c7905c13b719d9fbd7192399f4db8328 SHA512 3b5b35bfac37d220a260917633a2f0ed79bcc4d479cc9924a86eb73e864b2893d037eabf6c70b0ba68d93008b649399e29dd42b8490e58662db4840ee470e137
 DIST cinnamon-screensaver-3.4.2.tar.gz 154119 BLAKE2B 2350f8aa1d256f964ef2da0e05b867da5a807b7799b47961e16e83fb25bdc0086b080638904b7d6dce44680640c73bcb2dc6946d2c0c7924291c9eb1aefea42e SHA512 1d226f72c1f7d8e264bee8b1c175cf32866dfdbf7738383552c4d218dc6ca1f04ef37f56c91793ff42358dcf6b832ba1962b8e39129683b5bf9cd3c3c2b1a764
 DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
-EBUILD cinnamon-screensaver-2.8.0-r1.ebuild 2639 BLAKE2B 55d73774c1515a66304c819e72d9f8286aff00bbe8da6261b5a86ddfe1aa2aaafae164a281c9c5da1004037c701e4e1e3933ba575501eff9853ae72a14dd9c7d SHA512 b3ecddf3dd1a38cbc805458ce3f2f2aa529ed7e5bff934882ebdc9c4b28ea0982e9368b88876f69ccf800d0cd9a738f4b605c40c5d5c0b45ca26a276ff26ba90
-EBUILD cinnamon-screensaver-3.0.1.ebuild 2596 BLAKE2B 61a8fe3305c52c8316ad6878fce2063ea68d78c91cc4e743cc5d1a7503be4c0a373af7dc1236a81e30ac4890187b99a32833ccd274a68e54a42625db18c3da7e SHA512 8a335ff13abf3ec0bfad3d697a424e3bc088867e9aefa782c34b4a117ebf20b8443be330bf8d9524f3f119b314fa65d0a4cbe9b784becb8ecf7c743d6601b734
-EBUILD cinnamon-screensaver-3.2.13-r1.ebuild 2153 BLAKE2B 05a21fa6d3129e7ba38345bfe3d7e758273b192b3b662856e4a54a90d2e973f282c4171d50d6db91237e71b357bc56cf86e8d970c2df068ee7f9bd13e70ed4ce SHA512 0ed55eaece836ebb60fad02932d8e985921a80a0c477ce1928f246f5d04c845e2c4c0ed1f2f88c8995197a546e95a57562eea0f29e138ca4363c733804d8bb38
-EBUILD cinnamon-screensaver-3.2.13-r2.ebuild 2174 BLAKE2B 8f1d99bfeb2ec39e989b6dc4e936309fa9c631deab6f523f885c5caf4ebeb43ea5abf5ba9a1e2e9e1ce546cee441c0fa4b46f2ef1f4468ed89c6a97ceb217f8f SHA512 0b191a565717f18ad76ee80f218da9bfe8a30d036a4843a34ffdcfa8f1fc53afbbcd35b41d052cdd38c1d990efcda0dfa2095632876095e2f70308994f4cfa8d
-EBUILD cinnamon-screensaver-3.2.2-r1.ebuild 2110 BLAKE2B cbbe498ab4304a99e2d6f494b7ba828b26201e7a9254d2d3809646fcadd679bc98ec1e682ae7c84a24679dc0ba1da97cfc1c6e3dc4f362d08bbc8f59c4cf03f9 SHA512 e904f7c14ae0f7274f3350ffb84e6f4cf83d8e81ce0abc95d947c4f5dab17d49570b8ff7ad04962998f5296055d13c17056ab35e45b6bfed39fac14bf0219aa5
-EBUILD cinnamon-screensaver-3.2.2.ebuild 2094 BLAKE2B 5c2f6423404a45214fe43e00befe2ca5e57ea064374bc0e8fac9199e4230cc25a77a06a9ba43cbc746b22c7dc77733da9077b0754cc89b44e8b27e4a49c156eb SHA512 0547e01b7f37ff9acc7b1b46adc4eb92dc98a85d57b75ec615704d3776f68d0d0e0264c4e50c0c6a24dacb52126de93c5e728641946a959407199dd01ab40dde
-EBUILD cinnamon-screensaver-3.2.6.ebuild 2159 BLAKE2B 32d836992715ce4587caff1e0d41e2cb580a9e8966a3a58b4411c905604796e2eee84013f4ae955eaab22b38b8cec7026684d2577f0a6f2c889ddbb0e33dc57e SHA512 47ea8d306639cd452ce2bcaccc041a83cc52016ae3dfbdc670c2843c2753ae6ece01d1b3ca83d9252a2859935aca93c69800826404955b2503e43a5d17043aaf
-EBUILD cinnamon-screensaver-3.4.1.ebuild 2248 BLAKE2B 0f89284cd790bb25c5a262d4c6c8e36c3f41040c01f837f91643365bc55abaada7046d21739371e51992fb8e4e24e0668ead9edc1e9bc976b8ed648b882d59eb SHA512 d5972271196e6a35911d79f4929fa55c3daf169fa8fedaa03af59b158aad05d60ec6545b48fe900384154d193b3fbc5fced2b2dce319c577278231e0b3e8cfa4
-EBUILD cinnamon-screensaver-3.4.2.ebuild 2248 BLAKE2B 0f89284cd790bb25c5a262d4c6c8e36c3f41040c01f837f91643365bc55abaada7046d21739371e51992fb8e4e24e0668ead9edc1e9bc976b8ed648b882d59eb SHA512 d5972271196e6a35911d79f4929fa55c3daf169fa8fedaa03af59b158aad05d60ec6545b48fe900384154d193b3fbc5fced2b2dce319c577278231e0b3e8cfa4
-EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2097 BLAKE2B 2ce291cf115506f8c0189e081d0fea0a9b97a3c40a583b5152a761aad0c5e38d9a32001fe830b354953b32bb215fb59b209fc05420d26da0b0ef64d6d94b3c4d SHA512 d03066250ea44307d5b1e1804379dcf0fd44ed9a7f94feb512d253adc25b91d9f034df4dab72897a760af62a32726c573dd93aba0cd64167e1217ee0af8e9bc4
-EBUILD cinnamon-screensaver-3.6.1.ebuild 2213 BLAKE2B ccdcaa8a67c5d27952de8753c6030f98dab82f586a011ac801a4105f462a967506b412badae0ecd587c3ab93f58ff9c23aa99d7b6fa03be1625d735f8a3e44cc SHA512 369929a2a9acd868b1f5aeecfcb754fa5c9fdb28fd69c6dede76b2e27cedf2d3f91db5a2888ecb4863b2a395dd2ff1321415f71f8b855ef84cd6338557f03382
+EBUILD cinnamon-screensaver-2.8.0-r1.ebuild 2566 BLAKE2B 989344eb32f967e79a5ddc744974032e8adb1bc8f8ac87892ea7725bbc4304f310a3e81a4c8a6d6a81bcb2ac7a89d4ae5e469639bb39ab014cd374110b2fe155 SHA512 16b1c0326bdb9da1dbfc20b59f99220d73ae920e2a6f40c15049e883070e755b9c8abdc10300940fdd6053b6658b6b98fa9ef943d9acaf656d121f3470d01528
+EBUILD cinnamon-screensaver-3.0.1.ebuild 2523 BLAKE2B 3a5d853a83e1a849bde3bd8266368d7f4eff40d36fb6df409bcc33536334a5755e4e68d3a6e6fa4b820cf22179516f7eae26a6b2fbaebd8eed49d95c8d2b9117 SHA512 1d403510ee02258438b4773231c9427bd1ce27b109a4722308b31c55233d99e6aa1a392ab9ca782ac1a1405e755733a4d34aab38bc94433809f7087542ca2ce0
+EBUILD cinnamon-screensaver-3.2.13-r1.ebuild 2080 BLAKE2B 0d3c653f55304db3db8bfe4315d097bd5e32c917a420f7030aaacd6828b1b3182c91c31304649d34b1786c2f65a378600684eea5ec4c7aa307ad02296bce3c98 SHA512 3e83d5bbf0514b1bd2bd42b44f43100c1f66805108444bd78a60cf3e3d5e678b10e82031a497a60673f6ab6180d85787d5cc592aeafda17481001dcdff59f0c9
+EBUILD cinnamon-screensaver-3.2.13-r2.ebuild 2101 BLAKE2B 0cfdd5b6e4b3240f81d55400191882af88bf5a5a549d4c02626749081b95b914b975af17f3c04e760cc4b047f023b1dd668b141a020a488a80e17a1a1a6dbe04 SHA512 78e3417794f6af49f36c854437e4e30650391a622e245fe9cb3a4bb67e0a7ddcf186be1775c1c38d05a47a963023c2ff360704a44c1b7b44af2c8bf70dd2ff86
+EBUILD cinnamon-screensaver-3.2.2-r1.ebuild 2037 BLAKE2B 5c060ff9a8a410f315083d0afab83659c91cde1f2dfae512d2874729e80c11c4b9f5dbcf8b552d1edce6ed9de87f6a3133f855a96a15fb50db7a285c5987aa81 SHA512 29504a65ecf26308596dde6127717a14f526743296e04ec25eaf446f4e5624a0aa5357f42a52f8967efb1f32de181d60789bbd82ffb045196ab810f73e2be35c
+EBUILD cinnamon-screensaver-3.2.2.ebuild 2021 BLAKE2B 335f5379d32bcd1fd329341c0471a399835aecb92dcb0ad4a6fa5f6c8cfb54bb8293aef3684eec3807c2ee57c3281d54b66d6535ba42f5e01221f9578b8e2008 SHA512 4000aae1daffb3645c143954932198b4147062f2908baf8f6461bffb8e8935709ba83ba14aefb772fb4b0e1a09a107df6deb4dadb6a4bc2d4019ca29537226cb
+EBUILD cinnamon-screensaver-3.2.6.ebuild 2086 BLAKE2B 4672bd807abd87204ed28b396394a6d3f578bc7aaa79c2c024c31db1f3d83a86a75a74d5fe86603f690e93a68487d4366c5a5e8b8d861b7b7efa94746372ec15 SHA512 f8a7f95d31f7de9fc002dd95f2e4e5b897dc818139c0c83d154443382959c5f5134670effc64e456e70ad408ecb90739e9b55f3955c15d26321bc3e38aa7a4a4
+EBUILD cinnamon-screensaver-3.4.1.ebuild 2175 BLAKE2B aa8dc55ca10eb704055f74b89ec15cba0949d34a26ec3c5940352badaafb5fe2a1d156ba95d0ac20a600de4618ae31c81f9024cf8a87d15c942c6d677611e4f4 SHA512 2a10716304b8034577bf86e2f55fd0ed81fdef54b0ec9e7c915f19702dc9b4fc571d7bb40c1e4078026123ca2b1837d209cc66768e7520ea469d64d24d29794a
+EBUILD cinnamon-screensaver-3.4.2.ebuild 2175 BLAKE2B aa8dc55ca10eb704055f74b89ec15cba0949d34a26ec3c5940352badaafb5fe2a1d156ba95d0ac20a600de4618ae31c81f9024cf8a87d15c942c6d677611e4f4 SHA512 2a10716304b8034577bf86e2f55fd0ed81fdef54b0ec9e7c915f19702dc9b4fc571d7bb40c1e4078026123ca2b1837d209cc66768e7520ea469d64d24d29794a
+EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2024 BLAKE2B 80141dcc65f1817703fc4339ed02599d40af68f62f729564ccd64dc41fe498781e3427c9ed7c73b6ad1af8b37661361f00bf01558b6c6a870bb53c310d79a224 SHA512 e5d43f38ab31e210746706197b69d176e522f567ef49df24e6ecc1b9ac74ebbf5fa4a07d5ed72000a2488aa2b25668eec1930e5e14f8c9b6d8185264c89e3abf
+EBUILD cinnamon-screensaver-3.6.1.ebuild 2140 BLAKE2B 998a72a36fa6bc62464935120ee18359ed72be4429fb5328c4f9c2ac8d7610d22fe977bd2536cc6d0a863a23d240ae1590c114588197d222e372e37403ff8105 SHA512 3c912dbb3b82a7b884e3adff78b7f3d780858ec94898a3ea349160c922a946278de5c91ea1af4b5f8ff25b253b6715a31b3dbadedb882393b479870585fd674a
 MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
index 87130ef96d5c..54a0d6e276ac 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -54,10 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
index 69108cbe65c8..7ae4daa8640b 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,10 +52,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild
index 7f9d0a8f6e6d..2b978b4e29d7 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-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,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild
index f0b8bd8fd34e..b0916e14019a 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,10 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
index 163a5fbf28b7..53df4f1a9edc 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.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
@@ -53,10 +53,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild
index 2c25f8005f72..d50ce77b2437 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,10 +52,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
index 0f8f1d48b79e..f200fc231f7d 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.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,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild
index cf81203bff73..af5cf3ca3e43 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-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
@@ -57,10 +57,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild
index cf81203bff73..af5cf3ca3e43 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.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
@@ -57,10 +57,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
index 7f0fe607beef..0c336581cdca 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
@@ -57,10 +57,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild
index 566c3485d0d5..e175e6c40547 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.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=6
@@ -56,10 +56,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index aaa418a4e927..949a130a9344 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -7,12 +7,12 @@ DIST cinnamon-settings-daemon-3.2.0.tar.gz 2915197 BLAKE2B e3891077ac807c30ad7bb
 DIST cinnamon-settings-daemon-3.4.2.tar.gz 3102793 BLAKE2B 1794d60426937f5b654d8b5f8d78c878c0d44f33e33f76df975acccc96badf13ec04e98c7a768b609164cf44464ad9af90465fd6c08c8314adb9475a74db9203 SHA512 597f3a08e5c2168d0fc3da4b83c85f4c1f4451573cccc79bcb2a3debaab7f4714244e0300dce8ddc62de40b2f4c1c44ff282d280a1437d14041b44d4541c83e0
 DIST cinnamon-settings-daemon-3.4.4.tar.gz 3102951 BLAKE2B d799621861d2450d401788b344dd7c26347054a2756081a8c85526b9f31f9a468ea97695dc26a9c060692efcf0189aae958988f3c911b5a8f7028873158ee3b4 SHA512 93a7609a5c1b9c34061f9ba7836ace58cfa5549d9be811a1a5ca50e2cb9fc9e9462d9f356f50c9115cca93fa42f29ff9d130c184e19cccf9c0ee814fb39bc6d6
 DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521 SHA512 48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33
-EBUILD cinnamon-settings-daemon-2.8.3.ebuild 2741 BLAKE2B 9ade19ed457f9d6aa17e7bb11c23412a87139b732a73407b385a62abfac2de224022c906708f41af7dd48223c9d9fb42455f2313fda0a4a86cccbb9215ad315c SHA512 b9b353976b6308f881462ab71ce815e2a61c78c2721de69592395411ccb28718db3c647ff0f0f98bc2c44bb884ca4076502effff0a06356c23ef7bb82a27afb2
-EBUILD cinnamon-settings-daemon-2.8.4.ebuild 2651 BLAKE2B c82c4643de889bee2f2b2b06d96f61b2b3f28c0288cc7072abc47242339963d7fc200f09c738cb767983262214bb83031219a825afe7b1871848d21093fb0651 SHA512 bae8ac3e239db5780b3a700af5766f82e591e2e7caf834e19521e6b3b47fa061e01c15eb96af4bc87fd646d753f39d9f1657da74a6870bac1d298de8ad74c622
-EBUILD cinnamon-settings-daemon-3.0.1.ebuild 2127 BLAKE2B b27f8210d431bb09563863e2e76ecb5e0e8e575289bc80c5a0d117732ea006ce96e0d2f1206d09363ba94b98a14c3969749d79d1d04cb1b16584056124ed445c SHA512 2cd23b7c5fb8b974e8bdf199f6baec37f6a51e872c4851d30d137bacde4055178b3f509e21a82814bf5fef4a2c249af3c32dc34fa9d21471a802476ce4341e98
-EBUILD cinnamon-settings-daemon-3.2.0.ebuild 2129 BLAKE2B 04a7d41002d9ae54699c3d6797c8d58240a2239a8a43b8ef995126703e74f6fc4e73b810c98da091b5ca71568da63acf13ae07894ba9cdc5dfca6150eb565c26 SHA512 df00468ad86b1d7327c53257f6157ea771ee419a02c9c088477886acd5d362aeb9aa3126c8f30d3d4c59aff2f34176d00f0f9a575947e4be935bfc36ac4dad99
-EBUILD cinnamon-settings-daemon-3.4.2.ebuild 2129 BLAKE2B bd195a092c8f68255ba5a2c09815a5311e4c35e2a281418bab097f0c78770207efd1ce6ac4ced749f965e75ef677ad8f2112b2d25ac653a2425a279e139424ef SHA512 18e49014871be8347a777fdc0d1833360173815280552bd88f1b547b798d33714718113b93ae8f8ee5ca80061c1f1e63073e29d45f1723b66b6951d02f8f96da
-EBUILD cinnamon-settings-daemon-3.4.4.ebuild 2129 BLAKE2B bd195a092c8f68255ba5a2c09815a5311e4c35e2a281418bab097f0c78770207efd1ce6ac4ced749f965e75ef677ad8f2112b2d25ac653a2425a279e139424ef SHA512 18e49014871be8347a777fdc0d1833360173815280552bd88f1b547b798d33714718113b93ae8f8ee5ca80061c1f1e63073e29d45f1723b66b6951d02f8f96da
-EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2040 BLAKE2B 90203e8702fd7c07a49d6bd842f36163c6c7231806127a651decf04bcb6d707af1be9a89a450bb8588973640cc3a63626483df861de9432ec9b679a4a53be853 SHA512 91b16d3d9e870955c6c6ef14fdff7739cefabea7b631b6f6e717f7c7d12a53c5fbbe0d9d95801a1bd2c357bb9c3a9789dc2b3ef68efc5f90ad38063cb538bf1d
-EBUILD cinnamon-settings-daemon-3.6.1.ebuild 2096 BLAKE2B bea3fb08478f5b018dabf2c9c3ff1d4a0442eb226757cfd761d3671bdd9c6460ed5db7afb253586a9295561e7d53caf278b895c4dd666bbddb4bfc7069aa3b53 SHA512 50d49219acd3b1919dc8273f2f73249961bcc591823da39479550bd50a6d73bbbde3d907d9452ac9b14329a42b900cd3cc4617e69cc4061edda4f5f0deb8b928
+EBUILD cinnamon-settings-daemon-2.8.3.ebuild 2743 BLAKE2B 4ecfb776fe8078e49004770dba03d2ea3ab063dc4b0043e602477405b92e44d3b35c452b4a206ebf9dc8a84da38e4c7ab7e5b6b0fd85a4d4f6ab778d50cf6430 SHA512 ebbd8677c20572324a7f9efdb35644d2bea26e3613bf72e49e1ce19417b3c2c0eba4650a1b95de844b30d97d659e1e5b682ab947e4140ac8f9bcc93436cd4b92
+EBUILD cinnamon-settings-daemon-2.8.4.ebuild 2653 BLAKE2B a12bce7c3f29fc6503d390b77cd600c3a4180ba67210d0ae46b245a182bd61377914d2483689ede16c354ee2fc305952b80b9c4ac5dbfc10b20813bec05dbdde SHA512 6e13d9bfe4827af4d53163d4029a78f9628db95a21fa8e42be2714529f45f461b2e2f2b29b446fffb81be3dba4b648f3b5c85d7d8a7efa38a15f41105cccc476
+EBUILD cinnamon-settings-daemon-3.0.1.ebuild 2129 BLAKE2B 46736507a0ff3e18f378d1fab7ffa6ba174cefa862ae091c70e9a8e208696741bc89106d2ea51193385df2735ff6c5d0fd5abee94124fe19b588037127c4a25d SHA512 4b8a365552a70b7a7c7d6aeb2c4dadb530fa71e77105093193fcd68ced04689e9fe422ecf57cd9ec910c1dc6fe88a1f9908bfbd8b0e1cc3b9d6cabaef0ef0d3e
+EBUILD cinnamon-settings-daemon-3.2.0.ebuild 2131 BLAKE2B 306efc5536596bd3b787998046ca3e1fdc85a2382e5563e0c3fa12ca2eb4383d68e215a2fa2a7cbfebc7c76dc309dfce66a0d4db1c35ca4f1e8fd5ca69d06ea7 SHA512 af4dd51eefea5884818d10e8408d00c304ecf8ab45fca3a70a1048cc7e7c172c5e8fcd5ecde4266e7c1c03dca914fbe8ae78b846cbc7f3f2b0884a9956301c97
+EBUILD cinnamon-settings-daemon-3.4.2.ebuild 2131 BLAKE2B 306efc5536596bd3b787998046ca3e1fdc85a2382e5563e0c3fa12ca2eb4383d68e215a2fa2a7cbfebc7c76dc309dfce66a0d4db1c35ca4f1e8fd5ca69d06ea7 SHA512 af4dd51eefea5884818d10e8408d00c304ecf8ab45fca3a70a1048cc7e7c172c5e8fcd5ecde4266e7c1c03dca914fbe8ae78b846cbc7f3f2b0884a9956301c97
+EBUILD cinnamon-settings-daemon-3.4.4.ebuild 2131 BLAKE2B 306efc5536596bd3b787998046ca3e1fdc85a2382e5563e0c3fa12ca2eb4383d68e215a2fa2a7cbfebc7c76dc309dfce66a0d4db1c35ca4f1e8fd5ca69d06ea7 SHA512 af4dd51eefea5884818d10e8408d00c304ecf8ab45fca3a70a1048cc7e7c172c5e8fcd5ecde4266e7c1c03dca914fbe8ae78b846cbc7f3f2b0884a9956301c97
+EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2042 BLAKE2B 5941be45774f98c77b5cff4ea89403166943715c46a7904f634c394fc168bc6aeccd9dfbd35869cf36dd0fa4af89ec286aebaf9be861722dc4096399c9ed3ea8 SHA512 41702acbfccba846c82ebec1e88a9b15c3b5946cd73231075086b7bac52734f15d8061e02f80e7431469b204d2f2e8259dd5d101361f48357c5e1c0fbcee10f0
+EBUILD cinnamon-settings-daemon-3.6.1.ebuild 2098 BLAKE2B e756b248d5eafd43490c551c621bddaec27fa33e5e72fdaeabee6932d605351ae137c0f9482c3d4cc5342dfbcf775824e7ba115c03f63577db9806c98866b67f SHA512 77daac478eddec0292f7c69dc2e25c97561b538293231cc68adc16661dbf0c3a8b100f4a8ca195effaf4497d1b1d49cad7e5724dd8cf8aed2958cac478cb6e6e
 MISC metadata.xml 453 BLAKE2B 430a92263b5593b373d945790b066af782b50e58008c4cbe045b768b757bf0ff286629df2a1e35b8fa13582aea2e134a8b55468e1abb3b67598f4f338c4f67f2 SHA512 b4525358e2f21c39d179f8003bd27122af405a7c79dbde94bb0d3b5086f9c39691c9dae986cacbe669316e92459cec19a40af2ed651d0abfcbbbce0857054ee8
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
index 88f1e7a56f1e..016d70f05fcd 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -52,7 +52,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
index 0c265d4540ec..57a99bc20855 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,7 +51,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
index 49d57f84de36..26b72223362b 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.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,7 +53,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
index 8dc7f204f0a0..9ec0e9bcb654 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-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,7 +53,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild
index 5e1ec395b16a..9ec0e9bcb654 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.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
@@ -53,7 +53,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild
index 5e1ec395b16a..9ec0e9bcb654 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.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,7 +53,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
index 8d31f636ef97..66ed58615ece 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild
index 33d4587404d7..5967c0fed3f1 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.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=6
@@ -53,7 +53,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 0981fafd4631..1fb25f58426a 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-power-manager-3.24.0.tar.xz 554616 BLAKE2B f39ce93943426fe8e833b48b5e7e4a02645eb3ffd28aa9e3e8c515d159950409ae9904b2683419d0087b3ced8e30f1c42b4dd9c511100041952449aef0b18e0f SHA512 fbbac0f5176382ccd13497cd80792d10ca4bc39fa4cc0585543f5458ba0f256ffb66b7ebd82667e482ba33cf2b6f3ef6a64bf2f55ac224e1d9ab2e2b7491e4e0
-EBUILD gnome-power-manager-3.24.0.ebuild 1308 BLAKE2B 078e603ad3abdefe5eacbe16d8651f1c9d28c571f204e6327af747b447e74d9afab91a77aeceb77eba66ac4c01e04601a55da88177d0c1e4b6264ee49f9cecd6 SHA512 b86ad47dad5536a8f307462a91852e11272463a312cd0ec69413cd4f53de6fcbbb9f93adf2ae2917f1263cfb91bca3cf2d40188321199e56287a8f3ddc36368d
+EBUILD gnome-power-manager-3.24.0.ebuild 1307 BLAKE2B e095a196b85063bbb4d24370c2f682c87527c29c1e768cfd214de4afbc608bc0494e95cd381da5e25ca2e361f09a6c488a3372f2a390954a2c4802f35b123df2 SHA512 e41221b0c3fbe36bc4944fd3f159d378d399cb073ddc29250186ab6922e5d9d1d70d6282f61893d6352bb4a51ca339cea2e443f4743687b46e68becdcdcd3a7f
 MISC metadata.xml 421 BLAKE2B db2e0d7210e04256add24c9bfa054291ffcd6cf8b52107c184b61b27859589ed17bc3ef2037cf3eaf1fe7a8ceb3ac381c67f6c3557f0d960ff0f1aaf67e9bb99 SHA512 3734560a015221b467a58c968ebd60272e14fc37bd93d07dfecc15e68dd403ed82e1724d62ba88ce3ee07b5c0e179adc1fc67d68d2c119458901e609a740b43a
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
index 040231ce2727..5e67d409645f 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-sgml-utils
 	dev-libs/appstream-glib
 	>=sys-devel/gettext-0.19.7
-	x11-proto/randrproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 "
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 4742ac55f066..965e855bc860 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,3 +1,3 @@
 DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0
-EBUILD gtkhtml-4.10.0.ebuild 967 BLAKE2B 7e13a43f829d6a7f3c7b0ab34488d62c14dfa8b27c91e3bfa00818964d7e6059cf114e8fec2f7bea10da55caba6ea202994d7b9b1a9378d019bfd6163aa1b5ec SHA512 ebe33d0bf84e225175dc740cca9e02960f8bb18d7943a91d4ad8c10d320beeb0edb76d18572a2fcf337c92af0217660aa33c7f26ff84b0f1463d167d096cd752
+EBUILD gtkhtml-4.10.0.ebuild 970 BLAKE2B 5c8c81303f3d8d0ea64325fd7ae78cb876970983da7c84ed923118019c6526debe71700573eedb074ac2fab017f1902b43fb0c21c057c138dd716e3569953fef SHA512 c1f401b7ab55a2e61c3de3be8c22325a5f75858c207647926b92a0671b76361f59479add8d1b0109e5974ee38eda166936d9a59911f10428b1d61a8a265c5e94
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index 2020a0d68e8d..b596e147e0ec 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,7 +25,7 @@ RDEPEND="
 	>=net-libs/libsoup-2.26.0:2.4
 "
 DEPEND="${RDEPEND}
-	x11-proto/xproto
+	x11-base/xorg-proto
 	sys-devel/gettext
 	>=dev-util/intltool-0.40.0
 	virtual/pkgconfig
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 630ea7b5b6b5..5bdbe92524a3 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -4,10 +4,10 @@ DIST nemo-3.2.0.tar.gz 1365508 BLAKE2B e64f15647b1df1c93bb392dfd6ad335b4bf7d907a
 DIST nemo-3.4.4.tar.gz 1417650 BLAKE2B 0dae9d09daaadf7cde74f60c4f1d4733d8e91ef44671cafb3c180c4f7ac946291a3cdf35c592022582312011b43046ffda022b49fee958d156a49d80c8b4493f SHA512 f2056653a2ac1e26cd8da2226acbc05046988f2f051b72ed267f572ad010a6bd4d7d1ef39ee732cebb7a05dd3d88053bfe2cdc3aee31c20eac29a8f659bcd67b
 DIST nemo-3.4.7.tar.gz 1422209 BLAKE2B 5ac6bdda0822850a61b61649258af793f514d6a5fb90143c58c52370210f65bdda53d40b911fafc369123739f3bab6b4a3be32efeb58c6f48fa8eb4e3a8b1731 SHA512 75f84e4c4f60c01a003ec413493107fa0ff02d3dcdb5772dd31b726905de1d49679b294e4760e5806b982c8a9e3fcd6411dc7deb3091545d74b688afaae39bbe
 DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
-EBUILD nemo-2.8.7.ebuild 2057 BLAKE2B 7307d19383728b51d7f5811f46fab197b9dbaa048b85201374e3e8ab9594d3d2b6d1b9f72db577944a4be3bb7c136b0a1d77bb7dae4e849b55770b85c21cef4f SHA512 9c2925464ee3029a9422df959736ddcf59164445805fabdeb46b03cdb65f42dc54feb893a8121b80e0c81335b86d89297a1c9e18cca24eb761ac46d411f571c7
-EBUILD nemo-3.0.6.ebuild 2057 BLAKE2B 7307d19383728b51d7f5811f46fab197b9dbaa048b85201374e3e8ab9594d3d2b6d1b9f72db577944a4be3bb7c136b0a1d77bb7dae4e849b55770b85c21cef4f SHA512 9c2925464ee3029a9422df959736ddcf59164445805fabdeb46b03cdb65f42dc54feb893a8121b80e0c81335b86d89297a1c9e18cca24eb761ac46d411f571c7
-EBUILD nemo-3.2.0.ebuild 2037 BLAKE2B 48d59e3b2531dd65e19d51b7539cef48dfb625974b1ef306e804929b53ebae572819fa74e97bdd8498d8f7cb0065fc8c490b22f817d517b4f4e0f743f5f4f375 SHA512 192ccd9436b6e402d0631b32e35955f371136204e46357108805f4c14a455d2a6389beb553cd07b35de28e6c34c42434b1b1a6776d46af75622dcd167d335a30
-EBUILD nemo-3.4.4.ebuild 2058 BLAKE2B 1b9d3ee099f93d059a92c787dcfe96967be9338c4950fe4bfca96518b82852af10451e737f6bc140f9ea4295ac85ed75e430cab251f772d464c818979437ed0c SHA512 9708445f2223b2d856636fded2268a1da8fc0cf040b2e18380facceb8f74e44703da7cf2069ed8685d014ae5b39dd181e88f601f83db3c0ba98f26edc55fe179
-EBUILD nemo-3.4.7.ebuild 2058 BLAKE2B 1b9d3ee099f93d059a92c787dcfe96967be9338c4950fe4bfca96518b82852af10451e737f6bc140f9ea4295ac85ed75e430cab251f772d464c818979437ed0c SHA512 9708445f2223b2d856636fded2268a1da8fc0cf040b2e18380facceb8f74e44703da7cf2069ed8685d014ae5b39dd181e88f601f83db3c0ba98f26edc55fe179
-EBUILD nemo-3.6.4.ebuild 2080 BLAKE2B 351cf5ebf316c21e53c69b8ba8c586ea3fb95ade11f8b1ae582843783d4e6cad5244b85e410008aea7a8d15153820a2ae575a8c6f684e7cf7bb2da15b91d0117 SHA512 ba4893ec7ea2c863c67fdfcba9ea4cb6f0cfbeeaf5233c0717a7de86b567d7b788bf46d5888dd9c804baa89e46ae6e353bf8e89b13d7a79d8d87f8ad4b6564ae
+EBUILD nemo-2.8.7.ebuild 2060 BLAKE2B 5f79b61475137ffe463cd87631a23451f727a4ae463f332c20deba8eb878080b662568cd80e73621472fe27f3b2d9d8361cf6d9ccc64409e47b20b069b0589b7 SHA512 268de490501a543c86ed3a500446b1869d972ebbf66f2e6f3768aad61750408da4a004de5cc7f18348dc86966ed93a3d390d3d335d929c078d71eea19dc13c31
+EBUILD nemo-3.0.6.ebuild 2060 BLAKE2B 5f79b61475137ffe463cd87631a23451f727a4ae463f332c20deba8eb878080b662568cd80e73621472fe27f3b2d9d8361cf6d9ccc64409e47b20b069b0589b7 SHA512 268de490501a543c86ed3a500446b1869d972ebbf66f2e6f3768aad61750408da4a004de5cc7f18348dc86966ed93a3d390d3d335d929c078d71eea19dc13c31
+EBUILD nemo-3.2.0.ebuild 2040 BLAKE2B ce017010c558d19c8e896a8581605f87c9c629aa03b7959cd0dd7aea35e11952d4a4ae3fb17a2476410d33e12e77aeb8fc4c65ab10dde8cad11be47e6cab0216 SHA512 97365a854f7a03a88d4cc102e32520b15c261f2c93365a27c98d748a849b89aad09e8048849b5bcf72840b433014cd4fc460ef3db09a73eefdbc3752ba94dfc3
+EBUILD nemo-3.4.4.ebuild 2061 BLAKE2B d9069a7628319ab40f52ca9f52a0824591610c480c3d1615a2ee871cb07dff5021a04dcf7e6b754162cf0d2357aac81d7e93ac0c2f151f8dd9b60d6c6fe70926 SHA512 1128318883732170e8559fdb1dcf1f46f5d92ce35c0125a6b9eb36c4b15d8eb636bf5b6a2f4ae5f310cc556d6483bccf0b7af0d687ae0627eb8d0b1cbca0f844
+EBUILD nemo-3.4.7.ebuild 2061 BLAKE2B d9069a7628319ab40f52ca9f52a0824591610c480c3d1615a2ee871cb07dff5021a04dcf7e6b754162cf0d2357aac81d7e93ac0c2f151f8dd9b60d6c6fe70926 SHA512 1128318883732170e8559fdb1dcf1f46f5d92ce35c0125a6b9eb36c4b15d8eb636bf5b6a2f4ae5f310cc556d6483bccf0b7af0d687ae0627eb8d0b1cbca0f844
+EBUILD nemo-3.6.4.ebuild 2083 BLAKE2B a42237f3a60077c8c317c0bf986c3fa35b8850a5a76adee061c7dd036dc6f2a25623182cfe11b7aa44a6d0966575d36b853ca8828f0d1eb9e4c1742466b1f8ff SHA512 a0e21b561853d86f9dd5304112bd924b46993d163c86354e9937dba2105d830d465e872e3f5ad84b38692ea039647432b26ef4f0c9be643f92a5342c2b9eefcb
 MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/nemo-2.8.7.ebuild b/gnome-extra/nemo/nemo-2.8.7.ebuild
index 1de930b387b7..91c651ac20c3 100644
--- a/gnome-extra/nemo/nemo-2.8.7.ebuild
+++ b/gnome-extra/nemo/nemo-2.8.7.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
@@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto
+	x11-base/xorg-proto
 
 	dev-util/gtk-doc
 	gnome-base/gnome-common
diff --git a/gnome-extra/nemo/nemo-3.0.6.ebuild b/gnome-extra/nemo/nemo-3.0.6.ebuild
index 1de930b387b7..91c651ac20c3 100644
--- a/gnome-extra/nemo/nemo-3.0.6.ebuild
+++ b/gnome-extra/nemo/nemo-3.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto
+	x11-base/xorg-proto
 
 	dev-util/gtk-doc
 	gnome-base/gnome-common
diff --git a/gnome-extra/nemo/nemo-3.2.0.ebuild b/gnome-extra/nemo/nemo-3.2.0.ebuild
index acb9b63c9b0a..9350691d26c2 100644
--- a/gnome-extra/nemo/nemo-3.2.0.ebuild
+++ b/gnome-extra/nemo/nemo-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto
+	x11-base/xorg-proto
 
 	dev-util/gtk-doc
 	gnome-base/gnome-common
diff --git a/gnome-extra/nemo/nemo-3.4.4.ebuild b/gnome-extra/nemo/nemo-3.4.4.ebuild
index 2b85d70f926a..b553c7f9dce1 100644
--- a/gnome-extra/nemo/nemo-3.4.4.ebuild
+++ b/gnome-extra/nemo/nemo-3.4.4.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
@@ -55,7 +55,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto
+	x11-base/xorg-proto
 
 	dev-util/gtk-doc
 	gnome-base/gnome-common
diff --git a/gnome-extra/nemo/nemo-3.4.7.ebuild b/gnome-extra/nemo/nemo-3.4.7.ebuild
index 2b85d70f926a..b553c7f9dce1 100644
--- a/gnome-extra/nemo/nemo-3.4.7.ebuild
+++ b/gnome-extra/nemo/nemo-3.4.7.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
@@ -55,7 +55,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto
+	x11-base/xorg-proto
 
 	dev-util/gtk-doc
 	gnome-base/gnome-common
diff --git a/gnome-extra/nemo/nemo-3.6.4.ebuild b/gnome-extra/nemo/nemo-3.6.4.ebuild
index 7b81e88dd9aa..d840df8f6897 100644
--- a/gnome-extra/nemo/nemo-3.6.4.ebuild
+++ b/gnome-extra/nemo/nemo-3.6.4.ebuild
@@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto
+	x11-base/xorg-proto
 
 	dev-util/gtk-doc
 	gnome-base/gnome-common