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

[Davide Pesavento]

commit:     46d195fda5ae5156ac1291b774995ec19907382c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  1 14:55:06 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 14:55:06 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=46d195fd

[dev-qt/qt-creator] Sync.

Package-Manager: portage-2.2.18

 dev-qt/qt-creator/metadata.xml           | 1 +
 dev-qt/qt-creator/qt-creator-9999.ebuild | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index d89ff7c..23f5234 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -20,6 +20,7 @@
        <flag name="python">Enable Python source code editor</flag>
        <flag name="qbs">Enable QBS project manager plugin</flag>
        <flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
+       <flag name="systemd">Add support for retrieving application output from 
journald</flag>
        <flag name="valgrind">Add support for memory debugging using 
<pkg>dev-util/valgrind</pkg></flag>
        <flag name="winrt">Build plugin for WinRT devices</flag>
 </use>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild 
b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 25ac392..9369c7f 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.3.2.ebuild,v 
1.3 2015/03/29 13:57:41 pesa Exp $
+# $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 $
 
 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 test ${QTC_PLUGINS[@]%:*}"
+IUSE="debug doc systemd test ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="5.3.2:5"
@@ -55,9 +55,10 @@ RDEPEND="
        >=dev-qt/qtwidgets-${QT_PV}
        >=dev-qt/qtx11extras-${QT_PV}
        >=dev-qt/qtxml-${QT_PV}
-       >=sys-devel/gdb-7.4[client(+),python]
+       >=sys-devel/gdb-7.5[client,python]
        clang? ( >=sys-devel/clang-3.2:= )
        qbs? ( >=dev-util/qbs-1.3.4 )
+       systemd? ( sys-apps/systemd:= )
 "
 DEPEND="${RDEPEND}
        >=dev-qt/linguist-tools-${QT_PV}
@@ -111,6 +112,7 @@ src_configure() {
                IDE_PACKAGE_MODE=1 \
                LLVM_INSTALL_DIR="${EPREFIX}/usr" \
                QBS_INSTALL_DIR="${EPREFIX}/usr" \
+               $(use systemd && echo CONFIG+=journald) \
                $(use test && echo BUILD_TESTS=1) \
                USE_SYSTEM_BOTAN=1
 }