Transition deps to x11-base/xorg-proto

13 files changed, 13 insertions, 23 deletions

diff --git a/gnome-base/gdm/gdm-3.26.2.1.ebuild b/gnome-base/gdm/gdm-3.26.2.1.ebuild
index 56cf0c6a..ac51df37 100644
--- a/gnome-base/gdm/gdm-3.26.2.1.ebuild
+++ b/gnome-base/gdm/gdm-3.26.2.1.ebuild
@@ -86,10 +86,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.0
 	dev-util/itstool
 	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/randrproto
+	x11-base/xorg-proto
 	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
 "
 
 DOC_CONTENTS="
diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-9999.ebuild
index 999817ef..0ac9e91a 100644
--- a/gnome-base/gdm/gdm-9999.ebuild
+++ b/gnome-base/gdm/gdm-9999.ebuild
@@ -96,10 +96,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.0
 	dev-util/itstool
 	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/randrproto
+	x11-base/xorg-proto
 	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
 "
 
 DOC_CONTENTS="
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild
index 01975eef..cd5abacb 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild
@@ -113,9 +113,7 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
 
 DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxml2:2
 	dev-libs/libxslt
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
index 2a48430c..1c6d93dc 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -110,9 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
 
 DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxml2:2
 	dev-libs/libxslt
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
index 31b0c59a..b24a5392 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.6
 	dev-util/itstool
 	sys-devel/gettext
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index c68633a6..368727c6 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -46,8 +46,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.6
 	dev-util/itstool
 	sys-devel/gettext
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index 9264faf7..70641148 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.10
 	>=sys-devel/gettext-0.19.7
 	virtual/pkgconfig
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
 	packagekit? ( app-admin/packagekit-base )
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
index 8992e4b4..51c6c0eb 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 "
diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index 815f3e09..77037afb 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
 		>=x11-libs/libX11-1.3.1
 		x11-libs/libXext
 		x11-libs/libXdamage
-		x11-proto/inputproto
+		x11-base/xorg-proto
 		>=x11-libs/libXi-1.3
 		>=x11-libs/libXcomposite-0.4 )
 	wayland? (
diff --git a/media-video/cheese/cheese-3.26.0.ebuild b/media-video/cheese/cheese-3.26.0.ebuild
index 67802db2..39e7f475 100644
--- a/media-video/cheese/cheese-3.26.0.ebuild
+++ b/media-video/cheese/cheese-3.26.0.ebuild
@@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50
 	dev-util/itstool
 	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto
+	x11-base/xorg-proto
 	test? ( dev-libs/glib:2[utils] )
 "
 
diff --git a/media-video/cheese/cheese-9999.ebuild b/media-video/cheese/cheese-9999.ebuild
index ecc673e0..faf364f9 100644
--- a/media-video/cheese/cheese-9999.ebuild
+++ b/media-video/cheese/cheese-9999.ebuild
@@ -63,7 +63,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.50
 	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto
+	x11-base/xorg-proto
 	test? ( dev-libs/glib:2[utils] )
 "
 
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index a6682d85..787a0e19 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -82,8 +82,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.50.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 
 	dev-libs/gobject-introspection-common
 	gnome-base/gnome-common
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
index 6057df2b..294ceee2 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
@@ -44,7 +44,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.0
 	virtual/libudev
 	virtual/pkgconfig
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 # eautoreconf needs:
 #	gnome-base/gnome-common