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

diff --git a/gnome-base/gdm/gdm-3.24.3.ebuild b/gnome-base/gdm/gdm-3.24.3.ebuild
index 468dfb481a95b76a700531fe9ae5fc1607ceb1ba..6dc61fc310aca9810e077581021741dc4e04dfb4 100644 (file)
--- a/gnome-base/gdm/gdm-3.24.3.ebuild
+++ b/gnome-base/gdm/gdm-3.24.3.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/gnome-control-center/gnome-control-center-3.24.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
index 3824d26612f30d7175f77e23a9ae3eb5109705d2..5e32940aad468413e0fffd2cd8672a25f67e307c 100644 (file)
--- a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.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-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
index e716fbf0258de94d057e5de2c8a14dac7367d24a..dbcd5ea476d1cf66bf12c1b18a8cc712409756f8 100644 (file)
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-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="5"
@@ -37,8 +37,7 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        >=app-text/gnome-doc-utils-0.3.2
        ~app-text/docbook-xml-dtd-4.1.2
-       x11-proto/xproto
-       >=x11-proto/randrproto-1.2
+       x11-base/xorg-proto
 "
 PDEPEND=">=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
        >=dev-python/pygobject-2.14:2[${PYTHON_USEDEP}]

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
index 2077b8c289509536c57f3a17636c340894774685..23ef79b6f8aa767d31d2eb55f09a9b9c21ac91c8 100644 (file)
--- a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.24.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-settings-daemon/gnome-settings-daemon-3.24.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
index ce672aeecd01ee802be1841d36367e54b86b4b87..30c725168566f6f388d82846c8bda5d203b3d28d 100644 (file)
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
@@ -90,10 +90,7 @@ DEPEND="${COMMON_DEPEND}
        sys-devel/gettext
        >=dev-util/intltool-0.40
        virtual/pkgconfig
-       x11-proto/inputproto
-       x11-proto/xf86miscproto
-       x11-proto/kbproto
-       >=x11-proto/xproto-7.0.15
+       x11-base/xorg-proto
 "
 
 # TypeErrors with python3; weird test errors with python2; all in power component that was made required now

diff --git a/gnome-base/nautilus/nautilus-3.20.4.ebuild b/gnome-base/nautilus/nautilus-3.20.4.ebuild
index 080c2d9dfbbaca9167f441a79c591649d3bfe790..50a2aedfd4d61e02e7d7c222559a3cf653d3ea02 100644 (file)
--- a/gnome-base/nautilus/nautilus-3.20.4.ebuild
+++ b/gnome-base/nautilus/nautilus-3.20.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
@@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
        >=dev-util/intltool-0.50
        sys-devel/gettext
        virtual/pkgconfig
-       x11-proto/xproto
+       x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
        packagekit? ( app-admin/packagekit-base )

diff --git a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
index 217195b511d1d7e3096868bcbd31309ec027a8c4..ec1bd6f72c7a281c5129488feb41e7286433c816 100644 (file)
--- a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
@@ -48,7 +48,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 )