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

5 files changed, 15 insertions, 25 deletions

diff --git a/x11-wm/marco/marco-1.12.1-r1.ebuild b/x11-wm/marco/marco-1.12.1-r1.ebuild
index beb7936f32b6..72471cfeadd6 100644
--- a/x11-wm/marco/marco-1.12.1-r1.ebuild
+++ b/x11-wm/marco/marco-1.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,10 +54,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.34.90:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
 	mate_src_configure \
diff --git a/x11-wm/marco/marco-1.12.1.ebuild b/x11-wm/marco/marco-1.12.1.ebuild
index 5de2688902df..81301b782686 100644
--- a/x11-wm/marco/marco-1.12.1.ebuild
+++ b/x11-wm/marco/marco-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,10 +53,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.34.90:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
 	mate_src_configure \
diff --git a/x11-wm/marco/marco-1.14.2-r1.ebuild b/x11-wm/marco/marco-1.14.2-r1.ebuild
index 5cdf56cdaaf6..33a7096f18cd 100644
--- a/x11-wm/marco/marco-1.14.2-r1.ebuild
+++ b/x11-wm/marco/marco-1.14.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,10 +57,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.34.90:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
 	mate_src_configure \
diff --git a/x11-wm/marco/marco-1.16.1.ebuild b/x11-wm/marco/marco-1.16.1.ebuild
index 5cdf56cdaaf6..33a7096f18cd 100644
--- a/x11-wm/marco/marco-1.16.1.ebuild
+++ b/x11-wm/marco/marco-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,10 +57,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.34.90:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
 	mate_src_configure \
diff --git a/x11-wm/marco/marco-1.18.2.ebuild b/x11-wm/marco/marco-1.18.2.ebuild
index 3ee2fa3540d1..2c7b83c978d0 100644
--- a/x11-wm/marco/marco-1.18.2.ebuild
+++ b/x11-wm/marco/marco-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,10 +50,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.34.90:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )"
 
 src_configure() {
 	mate_src_configure \