[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

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