commit: 42440bac1792091549779c1dca8877f197543eb7 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sun Mar 19 12:25:19 2017 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sun Mar 19 12:28:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42440bac
gnome-base/gnome-control-center-3.23: sync with changes done to 3.22 Package-Manager: Portage-2.3.4, Repoman-2.3.1 .../gnome-control-center-3.23.91.ebuild | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild index 29048eb6189..3a0e26def25 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild @@ -3,8 +3,9 @@ EAPI=6 GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" -inherit autotools bash-completion-r1 gnome2 +inherit bash-completion-r1 gnome2 DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"; @@ -89,7 +90,7 @@ RDEPEND="${COMMON_DEPEND} x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) - ibus? ( >=gnome-base/libgnomekbd-3 ) + >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 @@ -122,19 +123,15 @@ DEPEND="${COMMON_DEPEND} # gnome-base/gnome-common # sys-devel/autoconf-archive -src_prepare() { +PATCHES=( # Make some panels and dependencies optional; requires eautoreconf # https://bugzilla.gnome.org/686840, 697478, 700145 - eapply "${FILESDIR}"/${P}-optional.patch - eapply "${FILESDIR}"/${PN}-3.22.0-make-wayland-optional.patch - eapply "${FILESDIR}"/${P}-make-networkmanager-optional.patch - + "${FILESDIR}"/${P}-optional.patch + "${FILESDIR}"/${PN}-3.22.0-make-wayland-optional.patch + "${FILESDIR}"/${P}-make-networkmanager-optional.patch # Fix some absolute paths to be appropriate for Gentoo - eapply "${FILESDIR}"/${P}-gentoo-paths.patch - - eautoreconf - gnome2_src_prepare -} + "${FILESDIR}"/${P}-gentoo-paths.patch +) src_configure() { gnome2_src_configure \
