commit: 3711850bf081b378012a416c47689b2ce123b3c0
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri May 11 21:14:28 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 12 00:25:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3711850b
gnome-base/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
gnome-base/gdm/gdm-3.24.3.ebuild | 4 +---
gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild | 4 +---
gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild | 5 ++---
gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild | 2 +-
gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild | 5 +----
gnome-base/nautilus/nautilus-3.20.4.ebuild | 4 ++--
gnome-base/nautilus/nautilus-3.24.2.1.ebuild | 2 +-
7 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/gnome-base/gdm/gdm-3.24.3.ebuild b/gnome-base/gdm/gdm-3.24.3.ebuild
index 468dfb481a9..6dc61fc310a 100644
--- 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 3824d26612f..5e32940aad4 100644
--- 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 e716fbf0258..dbcd5ea476d 100644
--- 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 2077b8c2895..23ef79b6f8a 100644
--- 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 ce672aeecd0..30c72516856 100644
--- 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 080c2d9dfbb..50a2aedfd4d 100644
--- 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 217195b511d..ec1bd6f72c7 100644
--- 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 )
