From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-817827-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 19F0D138CEE
	for <garchives@archives.gentoo.org>; Sun,  5 Jul 2015 13:27:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 73A9AE0869;
	Sun,  5 Jul 2015 13:26:59 +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 21596E0869
	for <gentoo-commits@lists.gentoo.org>; Sun,  5 Jul 2015 13:26:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 68D0F34090B
	for <gentoo-commits@lists.gentoo.org>; Sun,  5 Jul 2015 13:26:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A9B0073C
	for <gentoo-commits@lists.gentoo.org>; Sun,  5 Jul 2015 13:26:53 +0000 (UTC)
From: "Davide Pesavento" <pesa@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, "Davide Pesavento" <pesa@gentoo.org>
Message-ID: <1436101621.2773b2b244cb30bfd1835f7978835a973900e567.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
X-VCS-Repository: proj/qt
X-VCS-Files: eclass/qt4-build-multilib.eclass eclass/qt5-build.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: 2773b2b244cb30bfd1835f7978835a973900e567
X-VCS-Branch: master
Date: Sun,  5 Jul 2015 13:26:53 +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: 7040a56b-2893-4cc5-9496-22aa05fbc88c
X-Archives-Hash: df5aa6b169d0961383ad2a0b12bd40a9

commit:     2773b2b244cb30bfd1835f7978835a973900e567
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 13:07:01 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 13:07:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2773b2b2

[eclass] Shorten die message.

 eclass/qt4-build-multilib.eclass | 3 ++-
 eclass/qt5-build.eclass          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index baac03c..aef1641 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -640,7 +640,8 @@ qt4_qmake() {
 		CONFIG+=nostrip \
 		LIBS+=-L"${QT4_LIBDIR}" \
 		"${projectdir}" \
-		|| die "qmake failed (${projectdir})"
+		"$@" \
+		|| die "qmake failed (${projectdir#${S}/})"
 }
 
 # @FUNCTION: qt4_install_module_qconfigs

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ef4cdfb..fd9406e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -684,7 +684,7 @@ qt5_qmake() {
 		QMAKE_LFLAGS_DEBUG= \
 		"${projectdir}" \
 		"$@" \
-		|| die "qmake failed (${projectdir})"
+		|| die "qmake failed (${projectdir#${S}/})"
 }
 
 # @FUNCTION: qt5_install_module_qconfigs