From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-916478-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 36A421395E2
for <garchives@archives.gentoo.org>; Sat, 10 Dec 2016 22:36:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5A4BAE0888;
Sat, 10 Dec 2016 22:36:37 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 3717BE0888
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Dec 2016 22:36:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 11590340EDA
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Dec 2016 22:36:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B0F34A6
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Dec 2016 22:36:34 +0000 (UTC)
From: "Alon Bar-Lev" <alonbl@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, "Alon Bar-Lev" <alonbl@gentoo.org>
Message-ID: <1481409382.8ca90ec5a4bfdeb32c7d70f31d14c41d88204b4f.alonbl@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-crypt/pinentry/pinentry-1.0.0.ebuild
X-VCS-Directories: app-crypt/pinentry/
X-VCS-Committer: alonbl
X-VCS-Committer-Name: Alon Bar-Lev
X-VCS-Revision: 8ca90ec5a4bfdeb32c7d70f31d14c41d88204b4f
X-VCS-Branch: master
Date: Sat, 10 Dec 2016 22:36:34 +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: 627274af-b962-4f2c-b562-5a7a3ce05a36
X-Archives-Hash: 070345b09be55083b1fd71edbde21f1a
commit: 8ca90ec5a4bfdeb32c7d70f31d14c41d88204b4f
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 08:33:19 2016 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 22:36:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca90ec5
app-crypt/pinentry: simplify MOC a bit
Package-Manager: portage-2.3.0
app-crypt/pinentry/pinentry-1.0.0.ebuild | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/app-crypt/pinentry/pinentry-1.0.0.ebuild b/app-crypt/pinentry/pinentry-1.0.0.ebuild
index 2106259..5595328 100644
--- a/app-crypt/pinentry/pinentry-1.0.0.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0.ebuild
@@ -70,17 +70,16 @@ src_configure() {
use static && append-ldflags -static
[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
- QT_MOC=""
if use qt4; then
- myconf+=( --enable-pinentry-qt
- --disable-pinentry-qt5
- )
- QT_MOC="$(qt4_get_bindir)"/moc
- # Issues finding qt on multilib systems
+ myconf+=(
+ --enable-pinentry-qt
+ --disable-pinentry-qt5
+ )
+ export MOC="$(qt4_get_bindir)"/moc
export QTLIB="$(qt4_get_libdir)"
elif use qt5; then
myconf+=( --enable-pinentry-qt )
- QT_MOC="$(qt5_get_bindir)"/moc
+ export MOC="$(qt5_get_bindir)"/moc
export QTLIB="$(qt5_get_libdir)"
else
myconf+=( --disable-pinentry-qt )
@@ -95,8 +94,7 @@ src_configure() {
$(use_with caps libcap) \
$(use_enable gnome-keyring libsecret) \
$(use_enable gnome-keyring pinentry-gnome3) \
- "${myconf[@]}" \
- MOC="${QT_MOC}"
+ "${myconf[@]}"
}
src_install() {