[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/, gnome-extra/gtkhtml/, ...

[Matt Turner]

commit:     9b1ee331c53982a4586386627d3256ff1316e518
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri May 11 21:58:33 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 12 00:25:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b1ee331

gnome-extra/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).

 .../cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild   | 6 ++----
 .../cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild   | 6 ++----
 .../cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild   | 6 ++----
 .../cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild   | 4 +---
 gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild         | 5 ++---
 gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild         | 5 ++---
 gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild         | 5 ++---
 gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild         | 5 ++---
 gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild         | 5 ++---
 gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild         | 3 +--
 .../cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild      | 7 ++-----
 gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild | 7 ++-----
 .../cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild     | 7 ++-----
 .../cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild     | 7 ++-----
 .../cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild      | 7 ++-----
 gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild | 7 ++-----
 gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild | 7 ++-----
 gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild | 7 ++-----
 gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild | 7 ++-----
 .../cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild      | 5 +----
 gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild | 7 ++-----
 .../cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild | 4 ++--
 .../cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild | 4 ++--
 .../cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild | 4 ++--
 .../cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild | 4 ++--
 .../cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.2.ebuild | 4 ++--
 .../cinnamon-settings-daemon/cinnamon-settings-daemon-3.4.4.ebuild | 4 ++--
 .../cinnamon-settings-daemon-3.6.1-r1.ebuild                       | 2 +-
 .../cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1.ebuild | 4 ++--
 gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild  | 2 +-
 gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild                          | 4 ++--
 gnome-extra/nemo/nemo-2.8.7.ebuild                                 | 4 ++--
 gnome-extra/nemo/nemo-3.0.6.ebuild                                 | 4 ++--
 gnome-extra/nemo/nemo-3.2.0.ebuild                                 | 4 ++--
 gnome-extra/nemo/nemo-3.4.4.ebuild                                 | 4 ++--
 gnome-extra/nemo/nemo-3.4.7.ebuild                                 | 4 ++--
 gnome-extra/nemo/nemo-3.6.4.ebuild                                 | 2 +-
 37 files changed, 68 insertions(+), 115 deletions(-)

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 b1b173b37c1..500f58d7c46 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 ee1441423e0..94fc1bf250a 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 fc5ab9e8080..a3713bb7b68 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 12619ac9856..12f5a93bba7 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/cinnamon-desktop-2.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
index 4fb86d3d052..f9959dea6e7 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 300489c9c44..050cdcc7e02 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 7aa1c85f8ee..ceaa3c29ed2 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 91b950b837f..2280d16410e 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 547abb54196..c83638f2d73 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 12c1fd995ce..a509d28ded9 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/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
index 87130ef96d5..54a0d6e276a 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 69108cbe65c..7ae4daa8640 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 7f9d0a8f6e6..2b978b4e29d 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 f0b8bd8fd34..b0916e14019 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 163a5fbf28b..53df4f1a9ed 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 2c25f8005f7..d50ce77b243 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 0f8f1d48b79..f200fc231f7 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 cf81203bff7..af5cf3ca3e4 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 cf81203bff7..af5cf3ca3e4 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 7f0fe607bee..0c336581cdc 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 566c3485d0d..e175e6c4054 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/cinnamon-settings-daemon-2.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
index 88f1e7a56f1..016d70f05fc 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 0c265d4540e..57a99bc2085 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 49d57f84de3..26b72223362 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 8dc7f204f0a..9ec0e9bcb65 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 5e1ec395b16..9ec0e9bcb65 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 5e1ec395b16..9ec0e9bcb65 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 8d31f636ef9..66ed58615ec 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 33d4587404d..5967c0fed3f 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/gnome-power-manager-3.24.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
index 040231ce272..5e67d409645 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/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index 2020a0d68e8..b596e147e0e 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/nemo-2.8.7.ebuild b/gnome-extra/nemo/nemo-2.8.7.ebuild
index 1de930b387b..91c651ac20c 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 1de930b387b..91c651ac20c 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 acb9b63c9b0..9350691d26c 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 2b85d70f926..b553c7f9dce 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 2b85d70f926..b553c7f9dce 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 7b81e88dd9a..d840df8f689 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