From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-952316-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 947AB139694
for <garchives@archives.gentoo.org>; Sat, 27 May 2017 00:25:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 62B74E0E20;
Sat, 27 May 2017 00:25:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 3B8F2E0E20
for <gentoo-commits@lists.gentoo.org>; Sat, 27 May 2017 00:25:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CDFE43416DC
for <gentoo-commits@lists.gentoo.org>; Sat, 27 May 2017 00:25:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 41B407463
for <gentoo-commits@lists.gentoo.org>; Sat, 27 May 2017 00:25:12 +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: <1495844696.9eda51b648cb728c5b9a5e2d4ae2b962e670f69f.pesa@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/qbs/qbs-1.8.0-r1.ebuild dev-util/qbs/qbs-1.8.0.ebuild
X-VCS-Directories: dev-util/qbs/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: 9eda51b648cb728c5b9a5e2d4ae2b962e670f69f
X-VCS-Branch: master
Date: Sat, 27 May 2017 00:25:12 +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: 841d59f1-75e4-4c5d-8cf6-3af14e466150
X-Archives-Hash: 8b9bfea19cb765829cef97cddba1c781
commit: 9eda51b648cb728c5b9a5e2d4ae2b962e670f69f
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 00:24:16 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat May 27 00:24:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eda51b6
dev-util/qbs: tentative fix for bug 618424
Gentoo-Bug: 618424
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-util/qbs/{qbs-1.8.0.ebuild => qbs-1.8.0-r1.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dev-util/qbs/qbs-1.8.0.ebuild b/dev-util/qbs/qbs-1.8.0-r1.ebuild
similarity index 92%
rename from dev-util/qbs/qbs-1.8.0.ebuild
rename to dev-util/qbs/qbs-1.8.0-r1.ebuild
index 34a26df32fd..d2cb3eae1ea 100644
--- a/dev-util/qbs/qbs-1.8.0.ebuild
+++ b/dev-util/qbs/qbs-1.8.0-r1.ebuild
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
src_prepare() {
default
+ # don't add /usr/include to INCLUDEPATH
+ # avoids a build failure in qt-creator with gcc-6 (bug 618424)
+ sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
+
if ! use examples; then
sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
fi