commit: 9d2602d7f41f1675f70e5bae430a79ecaefd5947 Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> AuthorDate: Tue May 29 22:44:09 2018 +0000 Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> CommitDate: Tue May 29 22:45:02 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9d2602d7
Transition deps to x11-base/xorg-proto Closes: https://bugs.gentoo.org/656306 .../gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild | 7 ++----- gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild | 6 ++---- gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild | 2 +- gnome-extra/gtkhtml/gtkhtml-9999.ebuild | 2 +- x11-libs/gtk+/gtk+-9999.ebuild | 7 +------ x11-libs/pango/pango-9999.ebuild | 2 +- 6 files changed, 8 insertions(+), 18 deletions(-) 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..43bc67af 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 @@ -77,7 +77,7 @@ RDEPEND="${COMMON_DEPEND} !<gnome-extra/gnome-power-manager-3.1.3 !<gnome-base/gnome-session-3.25 " -# xproto-7.0.15 needed for power plugin + DEPEND="${COMMON_DEPEND} cups? ( sys-apps/sed ) test? ( @@ -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..d407fd69 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild @@ -83,7 +83,7 @@ RDEPEND="${COMMON_DEPEND} !<gnome-extra/gnome-color-manager-3.1.1 !<gnome-extra/gnome-power-manager-3.1.3 " -# xproto-7.0.15 needed for power plugin + DEPEND="${COMMON_DEPEND} cups? ( sys-apps/sed ) test? ( @@ -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-extra/gnome-power-manager/gnome-power-manager-9999.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild index 69adee7c..c926ecb4 100644 --- a/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild +++ b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild @@ -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..ce5130d9 100644 --- a/gnome-extra/gtkhtml/gtkhtml-9999.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-9999.ebuild @@ -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/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild index 7c73fa43..250c1235 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-9999.ebuild @@ -76,12 +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 diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild index 9d5d0d05..d5e0c5b9 100644 --- a/x11-libs/pango/pango-9999.ebuild +++ b/x11-libs/pango/pango-9999.ebuild @@ -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 "
