gentoo resync : 13.05.2018

12 files changed, 32 insertions, 65 deletions

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