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

12 files changed, 32 insertions, 64 deletions

diff --git a/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild
index 25346ddc62a0..f51605c92113 100644
--- a/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,14 +66,8 @@ DEPEND="${RDEPEND}
 	dev-util/desktop-file-utils:0
 	>=dev-util/intltool-0.50.1:*
 	sys-devel/gettext:*
-	x11-proto/kbproto:0
-	x11-proto/randrproto:0
-	x11-proto/renderproto:0
-	x11-proto/scrnsaverproto:0
-	x11-proto/xextproto:0
-	x11-proto/xf86miscproto:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
+	virtual/pkgconfig:*
+	x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}/${PN}-1.12.1-backport-appindicator-configure.patch" )
 
diff --git a/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild
index a8ace75b4cfc..0a2e57bb6083 100644
--- a/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -69,14 +69,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/desktop-file-utils:0
 	>=dev-util/intltool-0.50.1:*
 	sys-devel/gettext:*
-	x11-proto/kbproto:0
-	x11-proto/randrproto:0
-	x11-proto/renderproto:0
-	x11-proto/scrnsaverproto:0
-	x11-proto/xextproto:0
-	x11-proto/xf86miscproto:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
+	virtual/pkgconfig:*
+	x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}/${PN}-1.12.1-backport-appindicator-configure.patch" )
 
diff --git a/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild b/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild
index 80aec283c926..cf625f137e25 100644
--- a/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -69,14 +69,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/desktop-file-utils:0
 	>=dev-util/intltool-0.50.1:*
 	sys-devel/gettext:*
-	x11-proto/kbproto:0
-	x11-proto/randrproto:0
-	x11-proto/renderproto:0
-	x11-proto/scrnsaverproto:0
-	x11-proto/xextproto:0
-	x11-proto/xf86miscproto:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
+	virtual/pkgconfig:*
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild b/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild
index 40a29327bdff..982cd41f991e 100644
--- a/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,14 +60,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/desktop-file-utils:0
 	>=dev-util/intltool-0.50.1:*
 	sys-devel/gettext:*
-	x11-proto/kbproto:0
-	x11-proto/randrproto:0
-	x11-proto/renderproto:0
-	x11-proto/scrnsaverproto:0
-	x11-proto/xextproto:0
-	x11-proto/xf86miscproto:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
+	virtual/pkgconfig:*
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild b/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild
index a48d9660443c..59177607a9c1 100644
--- a/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.12.1-r2.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
@@ -38,9 +38,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40:*
 	>=gnome-base/dconf-0.13.4:0
 	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
+	virtual/pkgconfig:*
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild
index 16df086e4c73..6e2ff4767e73 100644
--- a/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.14.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
@@ -37,9 +37,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40:*
 	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
+	virtual/pkgconfig:*
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild b/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild
index 49fc7f1eeae9..6e2ff4767e73 100644
--- a/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.16.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,9 +37,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40:*
 	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
+	virtual/pkgconfig:*
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild
index 5413834f586b..7b37db19157f 100644
--- a/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.18.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
@@ -36,9 +36,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40:*
 	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
+	virtual/pkgconfig:*
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild
index af03f9d70d16..fff4079c0979 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -56,8 +56,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.50.1:0
 	sys-devel/gettext:0
 	virtual/pkgconfig:0
-	x11-proto/inputproto:0
-	x11-proto/xproto:0"
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.ebuild
index 262630d7c4a6..1161e4944d37 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.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
@@ -58,8 +58,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50.1:0
 	sys-devel/gettext:0
 	virtual/pkgconfig:0
-	x11-proto/inputproto:0
-	x11-proto/xproto:0"
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild
index 193d67a874e1..1161e4944d37 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.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
@@ -58,8 +58,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50.1:0
 	sys-devel/gettext:0
 	virtual/pkgconfig:0
-	x11-proto/inputproto:0
-	x11-proto/xproto:0"
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.2.ebuild
index 51daf6b135f5..fddc900aa8e1 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.2.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -56,8 +56,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50.1:0
 	sys-devel/gettext:0
 	virtual/pkgconfig:0
-	x11-proto/inputproto:0
-	x11-proto/xproto:0"
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \