From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-874877-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 98ACD59CAF
for <garchives@archives.gentoo.org>; Wed, 6 Apr 2016 06:45:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 04B5FE0839;
Wed, 6 Apr 2016 06:45:27 +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 83FC3E083A
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Apr 2016 06:45:26 +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 BDDB2340D65
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Apr 2016 06:45:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 17D6986
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Apr 2016 06:45:21 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@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, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1459925114.e6e3c91b2e092158c6fb066cc91da73cbe4fdcc7.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-im/pidgin/pidgin-2.10.12-r2.ebuild
X-VCS-Directories: net-im/pidgin/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: e6e3c91b2e092158c6fb066cc91da73cbe4fdcc7
X-VCS-Branch: master
Date: Wed, 6 Apr 2016 06:45:21 +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: aee6997d-5106-45d0-89b7-22362accbdbb
X-Archives-Hash: 3dc686f997a7aaede1695e0abe5a0b48
commit: e6e3c91b2e092158c6fb066cc91da73cbe4fdcc7
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 6 06:39:12 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 06:45:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6e3c91b
net-im/pidgin: networkmanager requires dbus (bug #579012).
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-im/pidgin/pidgin-2.10.12-r2.ebuild | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/net-im/pidgin/pidgin-2.10.12-r2.ebuild b/net-im/pidgin/pidgin-2.10.12-r2.ebuild
index 86d8b5f..aa8dcdc 100644
--- a/net-im/pidgin/pidgin-2.10.12-r2.ebuild
+++ b/net-im/pidgin/pidgin-2.10.12-r2.ebuild
@@ -84,8 +84,9 @@ DEPEND="$RDEPEND
DOCS="AUTHORS HACKING NEWS README ChangeLog"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- dbus? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="dbus? ( ${PYTHON_REQUIRED_USE} )
+ networkmanager? ( dbus )
+ python? ( ${PYTHON_REQUIRED_USE} )"
# Enable Default protocols
DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
@@ -161,12 +162,10 @@ src_configure() {
replace-flags -O? -O2
use pie && CFLAGS="${CFLAGS} -fPIE -pie"
- local myconf
+ local myconf=()
if use gadu; then
DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
- myconf="${myconf} --with-gadu-includes=."
- myconf="${myconf} --with-gadu-libs=."
fi
use groupwise && DYNAMIC_PRPLS+=",novell"
@@ -178,18 +177,18 @@ src_configure() {
if use gnutls; then
einfo "Disabling NSS, using GnuTLS"
- myconf+=" --enable-nss=no --enable-gnutls=yes"
- myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
- myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
+ myconf+=( --enable-nss=no --enable-gnutls=yes )
+ myconf+=( --with-gnutls-includes=${EPREFIX}/usr/include/gnutls )
+ myconf+=( --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir) )
else
einfo "Disabling GnuTLS, using NSS"
- myconf+=" --enable-gnutls=no --enable-nss=yes"
+ myconf+=( --enable-gnutls=no --enable-nss=yes )
fi
if use dbus || { use ncurses && use python; }; then
- myconf+=" --with-python=${PYTHON}"
+ myconf+=( --with-python=${PYTHON} )
else
- myconf+=" --without-python"
+ myconf+=( --without-python )
fi
econf \
@@ -221,7 +220,7 @@ src_configure() {
--with-dynamic-prpls="${DYNAMIC_PRPLS}" \
--disable-mono \
--x-includes="${EPREFIX}"/usr/include/X11 \
- ${myconf}
+ ${myconf[@]}
#$(use_enable mono) \
}