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

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

commit:     01bd7fba65a1c76324e36077bca49b4da7f457ac
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 08:09:48 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 08:49:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bd7fba

dev-qt/qt-creator: add 4.8.0

 * new plugins: cppcheck, LSP client, silver searcher, serial terminal
 * make help plugin (and its qthelp dependency) optional
 * unify all clang-based plugins under USE=clang
 * enable clang and designer USE flags by default
 * disable updateinfo plugin

Closes: https://bugs.gentoo.org/661646
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                         |  1 +
 dev-qt/qt-creator/metadata.xml                     |  6 +++
 ...creator-9999.ebuild => qt-creator-4.8.0.ebuild} | 47 +++++++++++++---------
 dev-qt/qt-creator/qt-creator-9999.ebuild           | 47 +++++++++++++---------
 4 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index bd6311b1d38..04e7204a2a7 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-4.6.2.tar.xz 23397676 BLAKE2B a6c641d2daaa1d692919739de1a26da0a8806db3a8678dffc792fc77855ecf14136ad1e990e678f66afc471950c6bcc0803a6d47a21af6eb91ff010e77383ee6 SHA512 32d583cc3684b268a649e265ebe97bde0a9fdcea60013d8966edef6df3fa0097bcb19d9fc7abf5ece9b59870ad1049e8320477df4321f0f311843e359aaea6b6
+DIST qt-creator-opensource-src-4.8.0.tar.xz 24545016 BLAKE2B f2c4256ab2d2eb1ac8bf897df2517f8784b97723564a9f53347de858301997c4d02f6a20269a4d74d0305f27babc65491521965b7e1941cd3c3778cb9701c8d5 SHA512 4b6c6778493b7c8b593868ebfe90ccb21eb3daec16853604ea422f29fc57be5623033c79610507931202fa34a648760c29134670d26b1c4c098e1eae28bb1743

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 5cdf568ca74..45e3c6a24d8 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,13 +14,17 @@
 		<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 plugins (code model, format, static analysis)</flag>
 		<flag name="clangcodemodel">Build clang-based code model and refactoring plugins</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="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
 		<flag name="designer">Build widget designer plugin</flag>
 		<flag name="glsl">Enable GLSL source code editor</flag>
+		<flag name="help">Build the help plugin</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
+		<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
 		<flag name="modeling">Enable graphical model editor</flag>
 		<flag name="nim">Enable Nim source code editor</flag>
@@ -29,6 +33,8 @@
 		<flag name="qbs">Enable QBS project manager plugin</flag>
 		<flag name="qnx">Build plugin for QNX devices</flag>
 		<flag name="scxml">Enable graphical SCXML editor</flag>
+		<flag name="serialterminal">Build serial terminal plugin</flag>
+		<flag name="silversearcher">Enable integration with <pkg>sys-apps/the_silver_searcher</pkg></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>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
similarity index 80%
copy from dev-qt/qt-creator/qt-creator-9999.ebuild
copy to dev-qt/qt-creator/qt-creator-4.8.0.ebuild
index 5f8021eb3f5..e08af8921a1 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
 
@@ -26,22 +26,21 @@ fi
 # TODO: unbundle sqlite
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
+	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
+	silversearcher subversion valgrind winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="5.9.0:5"
 
 CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-libs/botan-2.8:2=[-bindist]
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
 	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${QT_PV}
 	>=dev-qt/qtnetwork-${QT_PV}[ssl]
 	>=dev-qt/qtprintsupport-${QT_PV}
 	>=dev-qt/qtquickcontrols-${QT_PV}
@@ -51,11 +50,15 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clangcodemodel? ( >=sys-devel/clang-6:= )
+	clang? ( >=sys-devel/clang-6:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.11.1 )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	qbs? ( >=dev-util/qbs-1.12.2 )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
 DEPEND="${CDEPEND}
 	>=dev-qt/linguist-tools-${QT_PV}
@@ -71,11 +74,12 @@ RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-6:* )
 	cmake? ( dev-util/cmake[server(+)] )
+	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
+	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )
 	valgrind? ( dev-util/valgrind )
 "
@@ -87,7 +91,7 @@ done
 unset x
 
 pkg_setup() {
-	use clangcodemodel && llvm_pkg_setup
+	use clang && llvm_pkg_setup
 }
 
 src_prepare() {
@@ -101,15 +105,19 @@ src_prepare() {
 				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
+	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
 
 	# avoid building unused support libraries and tools
-	if ! use clangcodemodel; then
+	if ! use clang; then
 		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-		sed -i -e '/SUBDIRS += clang\(\|refactoring\|pchmanager\)backend/d' src/tools/tools.pro || die
+		sed -i -e '/SUBDIRS += clangbackend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then
 		sed -i -e '/glsl/d' src/libs/libs.pro || die
 	fi
+	if ! use lsp; then
+		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro || die
+	fi
 	if ! use modeling; then
 		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
 	fi
@@ -137,6 +145,9 @@ src_prepare() {
 	done
 	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
+	# remove bundled botan
+	rm -rf src/libs/3rdparty/botan || die
+
 	# remove bundled qbs
 	rm -rf src/shared/qbs || die
 }
@@ -144,13 +155,13 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \
+		CONFIG+=use_system_botan \
 		$(use systemd && echo CONFIG+=journald) \
-		$(use test && echo BUILD_TESTS=1) \
-		USE_SYSTEM_BOTAN=1
+		$(use test && echo BUILD_TESTS=1)
 }
 
 src_test() {

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 5f8021eb3f5..e08af8921a1 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
 
@@ -26,22 +26,21 @@ fi
 # TODO: unbundle sqlite
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
+	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
+	silversearcher subversion valgrind winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="5.9.0:5"
 
 CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-libs/botan-2.8:2=[-bindist]
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
 	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${QT_PV}
 	>=dev-qt/qtnetwork-${QT_PV}[ssl]
 	>=dev-qt/qtprintsupport-${QT_PV}
 	>=dev-qt/qtquickcontrols-${QT_PV}
@@ -51,11 +50,15 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clangcodemodel? ( >=sys-devel/clang-6:= )
+	clang? ( >=sys-devel/clang-6:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.11.1 )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	qbs? ( >=dev-util/qbs-1.12.2 )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
 DEPEND="${CDEPEND}
 	>=dev-qt/linguist-tools-${QT_PV}
@@ -71,11 +74,12 @@ RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-6:* )
 	cmake? ( dev-util/cmake[server(+)] )
+	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
+	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )
 	valgrind? ( dev-util/valgrind )
 "
@@ -87,7 +91,7 @@ done
 unset x
 
 pkg_setup() {
-	use clangcodemodel && llvm_pkg_setup
+	use clang && llvm_pkg_setup
 }
 
 src_prepare() {
@@ -101,15 +105,19 @@ src_prepare() {
 				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
+	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
 
 	# avoid building unused support libraries and tools
-	if ! use clangcodemodel; then
+	if ! use clang; then
 		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-		sed -i -e '/SUBDIRS += clang\(\|refactoring\|pchmanager\)backend/d' src/tools/tools.pro || die
+		sed -i -e '/SUBDIRS += clangbackend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then
 		sed -i -e '/glsl/d' src/libs/libs.pro || die
 	fi
+	if ! use lsp; then
+		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro || die
+	fi
 	if ! use modeling; then
 		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
 	fi
@@ -137,6 +145,9 @@ src_prepare() {
 	done
 	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
+	# remove bundled botan
+	rm -rf src/libs/3rdparty/botan || die
+
 	# remove bundled qbs
 	rm -rf src/shared/qbs || die
 }
@@ -144,13 +155,13 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \
+		CONFIG+=use_system_botan \
 		$(use systemd && echo CONFIG+=journald) \
-		$(use test && echo BUILD_TESTS=1) \
-		USE_SYSTEM_BOTAN=1
+		$(use test && echo BUILD_TESTS=1)
 }
 
 src_test() {