From 30d7c63d7dd8c744ddd37c5e3a1ca451afc07f03 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Wed, 23 May 2018 06:14:41 +0200 Subject: [PATCH] */*: Update dependencies (x11-proto/* -> x11-base/xorg-proto). Closes: https://bugs.gentoo.org/656306 --- gnome-base/gdm/gdm-3.26.2.1.ebuild | 4 +--- gnome-base/gdm/gdm-9999.ebuild | 4 +--- .../gnome-control-center-3.26.2.ebuild | 4 +--- .../gnome-control-center-9999.ebuild | 4 +--- gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild | 2 +- gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 3 +-- .../gnome-settings-daemon-3.26.2.ebuild | 5 +---- .../gnome-settings-daemon-9999.ebuild | 4 +--- gnome-base/nautilus/nautilus-3.26.2.ebuild | 2 +- gnome-base/nautilus/nautilus-9999.ebuild | 4 ++-- .../gnome-power-manager-9999.ebuild | 4 ++-- gnome-extra/gtkhtml/gtkhtml-9999.ebuild | 4 ++-- .../gnome-screenshot/gnome-screenshot-9999.ebuild | 4 ++-- media-libs/clutter/clutter-9999.ebuild | 4 ++-- media-video/cheese/cheese-3.26.0.ebuild | 4 ++-- media-video/cheese/cheese-9999.ebuild | 4 ++-- media-video/totem/totem-9999.ebuild | 5 ++--- .../gnome-bluetooth/gnome-bluetooth-9999.ebuild | 4 ++-- status/portage-configs/package.keywords.gnome3 | 5 +---- x11-libs/gtk+/gtk+-9999.ebuild | 10 ++-------- x11-libs/pango/pango-9999.ebuild | 4 ++-- x11-wm/mutter/mutter-3.26.1.ebuild | 4 +--- x11-wm/mutter/mutter-9999.ebuild | 6 ++---- 23 files changed, 35 insertions(+), 63 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/gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild index f946060e..8c8142c1 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild @@ -89,10 +89,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/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild index 1f51925b..1977a73e 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild @@ -93,9 +93,7 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig - x11-proto/inputproto - x11-proto/xf86miscproto - >=x11-proto/xproto-7.0.15 + x11-base/xorg-proto " src_prepare() { diff --git a/gnome-base/nautilus/nautilus-3.26.2.ebuild b/gnome-base/nautilus/nautilus-3.26.2.ebuild index 7e62ef46..53ab9b95 100644 --- a/gnome-base/nautilus/nautilus-3.26.2.ebuild +++ b/gnome-base/nautilus/nautilus-3.26.2.ebuild @@ -50,7 +50,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-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/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild index 9264faf7..3299beac 100644 --- a/gnome-base/nautilus/nautilus-9999.ebuild +++ b/gnome-base/nautilus/nautilus-9999.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,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/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild index 69adee7c..8a85b536 100644 --- a/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild +++ b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.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 # $Id$ @@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND} dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext - x11-proto/randrproto + x11-base/xorg-proto virtual/pkgconfig test? ( sys-apps/dbus ) " diff --git a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild index fc8a5ca6..b90508b0 100644 --- a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -31,7 +31,7 @@ RDEPEND=" >=net-libs/libsoup-2.26.0:2.4 " DEPEND="${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto sys-devel/gettext >=dev-util/intltool-0.40.0 virtual/pkgconfig diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild index 8992e4b4..aeb6bdfd 100644 --- a/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild +++ b/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -38,9 +38,9 @@ RDEPEND="${COMMON_DEPEND} " # ${PN} was part of gnome-utils before 3.4 DEPEND="${COMMON_DEPEND} - x11-proto/xextproto >=dev-util/intltool-0.40 virtual/pkgconfig + x11-base/xorg-proto " DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild index 815f3e09..484e8162 100644 --- a/media-libs/clutter/clutter-9999.ebuild +++ b/media-libs/clutter/clutter-9999.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 # $Id$ @@ -54,7 +54,6 @@ RDEPEND=" >=x11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage - x11-proto/inputproto >=x11-libs/libXi-1.3 >=x11-libs/libXcomposite-0.4 ) wayland? ( @@ -69,6 +68,7 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-1.20 >=app-text/docbook-sgml-utils-0.6.14[jadetex] dev-libs/libxslt ) + X? ( x11-base/xorg-proto ) test? ( x11-libs/gdk-pixbuf ) " diff --git a/media-video/cheese/cheese-3.26.0.ebuild b/media-video/cheese/cheese-3.26.0.ebuild index 67802db2..cd4fef75 100644 --- a/media-video/cheese/cheese-3.26.0.ebuild +++ b/media-video/cheese/cheese-3.26.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 @@ -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..5cfe89a8 100644 --- a/media-video/cheese/cheese-9999.ebuild +++ b/media-video/cheese/cheese-9999.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 # $Id$ @@ -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..c56c90a1 100644 --- a/media-video/totem/totem-9999.ebuild +++ b/media-video/totem/totem-9999.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 # $Id$ @@ -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..be588808 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -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 diff --git a/status/portage-configs/package.keywords.gnome3 b/status/portage-configs/package.keywords.gnome3 index 4666325d..865dfe56 100644 --- a/status/portage-configs/package.keywords.gnome3 +++ b/status/portage-configs/package.keywords.gnome3 @@ -275,10 +275,7 @@ app-misc/tomboy # GNOME Shell dev-libs/gjs dev-libs/libcroco:0.6 -~x11-proto/inputproto-2.3 -~x11-proto/xextproto-7.2.1 -~x11-proto/kbproto-1.0.6 -~x11-proto/xproto-7.0.23 +x11-base/xorg-proto ~x11-libs/libX11-1.5.0 ~x11-libs/libXfixes-5.0 ~x11-libs/libXext-1.3.1 diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild index 7c73fa43..91c319eb 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-9999.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 # $Id$ @@ -76,13 +76,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( - x11-proto/xextproto[${MULTILIB_USEDEP}] - x11-proto/xproto[${MULTILIB_USEDEP}] - x11-proto/inputproto[${MULTILIB_USEDEP}] - x11-proto/damageproto[${MULTILIB_USEDEP}] - xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) - ) + X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild index 9d5d0d05..16b7a0cb 100644 --- a/x11-libs/pango/pango-9999.ebuild +++ b/x11-libs/pango/pango-9999.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 @@ -39,7 +39,7 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.20 virtual/pkgconfig[${MULTILIB_USEDEP}] test? ( media-fonts/cantarell ) - X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) !<=sys-devel/autoconf-2.63:2.5 " diff --git a/x11-wm/mutter/mutter-3.26.1.ebuild b/x11-wm/mutter/mutter-3.26.1.ebuild index 7d5a008b..ab9e1ae9 100644 --- a/x11-wm/mutter/mutter-3.26.1.ebuild +++ b/x11-wm/mutter/mutter-3.26.1.ebuild @@ -70,9 +70,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} >=sys-devel/gettext-0.19.6 virtual/pkgconfig - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto + x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) " diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild index ea948333..312cd1c9 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.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 # $Id$ @@ -75,9 +75,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.41 sys-devel/gettext virtual/pkgconfig - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto + x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) " RDEPEND="${COMMON_DEPEND} -- 2.17.0