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() {
