From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-939607-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 359FC139694
for <garchives@archives.gentoo.org>; Sun, 19 Mar 2017 12:30:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5AD6B21C094;
Sun, 19 Mar 2017 12:30:12 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 3284121C13B
for <gentoo-commits@lists.gentoo.org>; Sun, 19 Mar 2017 12:30:12 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C3DE03415D2
for <gentoo-commits@lists.gentoo.org>; Sun, 19 Mar 2017 12:30:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E86F6D99
for <gentoo-commits@lists.gentoo.org>; Sun, 19 Mar 2017 12:30:06 +0000 (UTC)
From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" <leio@gentoo.org>
Message-ID: <1489926522.42440bac1792091549779c1dca8877f197543eb7.leio@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/
X-VCS-Repository: repo/gentoo
X-VCS-Files: gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
X-VCS-Directories: gnome-base/gnome-control-center/
X-VCS-Committer: leio
X-VCS-Committer-Name: Mart Raudsepp
X-VCS-Revision: 42440bac1792091549779c1dca8877f197543eb7
X-VCS-Branch: master
Date: Sun, 19 Mar 2017 12:30:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 24da0e82-be64-441e-b20f-76ed8356b6ba
X-Archives-Hash: 208fc84c920a560d6f1d5364d3e287b7
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 \