dev-util/qbs: tentative fix for bug 618424

Gentoo-Bug: 618424
Package-Manager: Portage-2.3.6, Repoman-2.3.2

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 34a26df32fdfd335b8db8320135ba0e610392097..d2cb3eae1ea456de9771b17dc727cb99976436b4 100644 (file)
--- 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