From eb44809c3cf06f2afa0de60578f0adde04c78d1c Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Mon, 19 Oct 2015 05:19:37 +1100 Subject: [PATCH] app-misc/recoll: don't call qmake directly Package-Manager: portage-2.2.20.1 --- app-misc/recoll/recoll-1.17.3-r1.ebuild | 4 ++-- app-misc/recoll/recoll-1.19.5.ebuild | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app-misc/recoll/recoll-1.17.3-r1.ebuild b/app-misc/recoll/recoll-1.17.3-r1.ebuild index 8e8e80d774d7..ead4dff26a33 100644 --- a/app-misc/recoll/recoll-1.17.3-r1.ebuild +++ b/app-misc/recoll/recoll-1.17.3-r1.ebuild @@ -5,7 +5,7 @@ EAPI="4" PYTHON_DEPEND="2" -inherit toolchain-funcs qt4-r2 linux-info python +inherit toolchain-funcs qmake-utils qt4-r2 linux-info python DESCRIPTION="A personal full text search package" HOMEPAGE="http://www.lesbonscomptes.com/recoll/" @@ -103,7 +103,7 @@ src_prepare() { src_configure() { local qtconf - use qt4 && qtconf="QMAKEPATH=/usr/bin/qmake" + use qt4 && qtconf="QMAKEPATH=$(qt4_get_bindir)/qmake" econf \ $(use_with spell aspell) \ diff --git a/app-misc/recoll/recoll-1.19.5.ebuild b/app-misc/recoll/recoll-1.19.5.ebuild index 9c074c11139b..73b09064f1cf 100644 --- a/app-misc/recoll/recoll-1.19.5.ebuild +++ b/app-misc/recoll/recoll-1.19.5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="4" PYTHON_DEPEND="2" -inherit toolchain-funcs qt4-r2 linux-info python readme.gentoo +inherit toolchain-funcs qmake-utils qt4-r2 linux-info python readme.gentoo DESCRIPTION="A personal full text search package" HOMEPAGE="http://www.lesbonscomptes.com/recoll/" @@ -116,7 +116,7 @@ src_configure() { local qtconf if use qt4 || use webkit; then - qtconf="QMAKEPATH=/usr/bin/qmake" + qtconf="QMAKEPATH=$(qt4_get_bindir)/qmake" fi econf \ -- 2.26.2