[gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     50ffa5c1ee8bfab13ef813472b38ccb40ad536ad
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May  4 19:52:32 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May  4 19:52:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=50ffa5c1

[dev-qt/qt-creator] Sync.

Package-Manager: portage-2.2.18

 dev-qt/qt-creator/qt-creator-9999.ebuild | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild 
b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 5dd78e5..d1e0c5e 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0_rc1.ebuild,v 1.1 
2015/04/01 14:52:27 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v 
1.4 2015/05/04 19:50:14 pesa Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ KEYWORDS=""
 QTC_PLUGINS=('android:android|qmakeandroidsupport' 
autotools:autotoolsprojectmanager baremetal
        bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git 
ios mercurial
        perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion 
valgrind winrt)
-IUSE="debug doc systemd test ${QTC_PLUGINS[@]%:*}"
+IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="5.4.0:5"
@@ -57,8 +57,9 @@ RDEPEND="
        >=dev-qt/qtxml-${QT_PV}
        >=sys-devel/gdb-7.5[client,python]
        clang? ( >=sys-devel/clang-3.2:= )
-       qbs? ( >=dev-util/qbs-1.3.4 )
+       qbs? ( >=dev-util/qbs-1.4.0-r1 )
        systemd? ( sys-apps/systemd:= )
+       webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "
 DEPEND="${RDEPEND}
        >=dev-qt/linguist-tools-${QT_PV}
@@ -93,6 +94,12 @@ src_prepare() {
                fi
        done
 
+       # automagic dep on qtwebkit (bug 538236)
+       if ! use webkit; then
+               sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+                       src/plugins/help/help.pro || die "failed to disable 
webkit"
+       fi
+
        # disable broken or unreliable tests
        sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
        sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
@@ -112,6 +119,8 @@ src_configure() {
                IDE_PACKAGE_MODE=1 \
                LLVM_INSTALL_DIR="${EPREFIX}/usr" \
                QBS_INSTALL_DIR="${EPREFIX}/usr" \
+               CONFIG+=qbs_disable_rpath \
+               CONFIG+=qbs_enable_project_file_updates \
                $(use systemd && echo CONFIG+=journald) \
                $(use test && echo BUILD_TESTS=1) \
                USE_SYSTEM_BOTAN=1