From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-841207-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 2723213888F
for <garchives@archives.gentoo.org>; Sun, 18 Oct 2015 18:20:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B8AAF21C046;
Sun, 18 Oct 2015 18:20:53 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4316F21C046
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Oct 2015 18:20:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1E9AC340614
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Oct 2015 18:20:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 90A6A12F1
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Oct 2015 18:20:43 +0000 (UTC)
From: "Michael Palimaka" <kensington@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, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1445192436.eb44809c3cf06f2afa0de60578f0adde04c78d1c.kensington@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/recoll/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-misc/recoll/recoll-1.17.3-r1.ebuild app-misc/recoll/recoll-1.19.5.ebuild
X-VCS-Directories: app-misc/recoll/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: eb44809c3cf06f2afa0de60578f0adde04c78d1c
X-VCS-Branch: master
Date: Sun, 18 Oct 2015 18:20:43 +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: db4b971c-1539-4a3a-ac86-540a6d5ba897
X-Archives-Hash: 06b4164a0913b11633b1ceb25cd9fa44
commit: eb44809c3cf06f2afa0de60578f0adde04c78d1c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 18:19:37 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 18:20:36 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb44809c
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 8e8e80d..ead4dff 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 9c074c1..73b0906 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 \