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

["Davide Pesavento" <pesa@gentoo.org>]

commit:     2f3be820264b2c7b3ec415d4f42426a2c10a2a2e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 15:38:33 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 15:38:33 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2f3be820

dev-qt/qt-creator: update live ebuild and USE descriptions

Package-Manager: portage-2.2.28

 dev-qt/qt-creator/metadata.xml           |  8 ++++++--
 dev-qt/qt-creator/qt-creator-9999.ebuild | 26 +++++++++++++++++---------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 1e2c4f3..3fec6b3 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,17 +14,21 @@
 		<flag name="autotools">Enable autotools project manager plugin</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
-		<flag name="clang">Build clang-based code model plugin</flag>
+		<flag name="clangcodemodel">Build clang-based code model plugin</flag>
+		<flag name="clangstaticanalyzer">Build clang-based static analyzer plugin</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Enable cmake project manager plugin</flag>
+		<flag name="glsl">Enable GLSL source code editor</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
 		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
 		<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="qnx">Build plugin for QNX 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="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag>
+		<flag name="webkit">Use <pkg>dev-qt/qtwebkit</pkg> to view documentation</flag>
 		<flag name="winrt">Build plugin for WinRT devices</flag>
 	</use>
 	<upstream>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e813af2..c636321 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -9,7 +9,7 @@ inherit eutils l10n qmake-utils virtualx
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+LICENSE="GPL-3"
 SLOT="0"
 
 if [[ ${PV} == *9999 ]]; then
@@ -27,13 +27,13 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-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="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
+	ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
-QT_PV="5.4.0:5"
+QT_PV="5.5.0:5"
 
 RDEPEND="
 	=dev-libs/botan-1.10*[-bindist,threads]
@@ -53,9 +53,10 @@ RDEPEND="
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
-	clang? ( >=sys-devel/clang-3.6:= )
-	qbs? ( >=dev-util/qbs-1.4.4 )
+	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
+	qbs? ( >=dev-util/qbs-1.4.5 )
 	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "
 DEPEND="${RDEPEND}
@@ -73,6 +74,7 @@ unset x
 PDEPEND="
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( sys-devel/clang )
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -112,6 +114,12 @@ src_prepare() {
 			src/plugins/help/help.pro || die "failed to disable webkit"
 	fi
 
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webengine"
+	fi
+
 	# disable broken or unreliable tests
 	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
 	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
@@ -128,7 +136,7 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clang && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \