gentoo resync : 25.08.2020

5 files changed, 35 insertions, 231 deletions

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 1b11631c8cf5..46eebe08b70f 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,10 +1,8 @@
 AUX qt-creator-4.12.0-dylib-fix.patch 4022 BLAKE2B ea5d2b4a5daabc76515c1777a5df1738800d5cf79e9b52b60bb0d3d1c923b6d0daeb1f1a7e77f1e707aa7948f2a673f637e1e66bd3aa30f47c19ef89351114c5 SHA512 a81ed8b5616f816bc4ade87c159997f33a55c07417b93cbcbfc29f32fb36060370bf05f85cc94ac64297a7b33cf2852b3be2a8c7b99b58914085acd9dc533808
 AUX qt-creator-4.12.0-libclangformat-ide.patch 2463 BLAKE2B a99fc6e1354fde03ddbf60e5115fbec46fc5074353b5512973bb3802bb65d3401a4ac51e41a5d113ffea14faf85b48f334d97f21e210d173b534c6e2fdfec328 SHA512 f08a95d5e0e9201792f5c16e3b2a61e9a54f08a885e214ea237d3e49bad8d2d94a59cbdc35703641a1ed1ee4037f64bf7d6d6bbd4dab11fa153a3ac4ef67e050
-DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
 DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
-EBUILD qt-creator-4.10.1.ebuild 6229 BLAKE2B 9681c8465616bfa0d2ae0c1968285603e6840213c4da1fe34de0ef191c394306c8a935d3080919a590c71bbd04deb6e96828eb95ff691c378696c5f21059f953 SHA512 224693d7cfbddb31bc01ccec252c59e79f82f990b4178bde8aa8d2b647bea8b0b283421cc2e0c2e6076b5caaa430e4b4ac8028ff21f87d0d5d9b24031693f67a
-EBUILD qt-creator-4.12.3.ebuild 7157 BLAKE2B b8496055e4c5fd6b97d80e3e9fc779f5789c30f615009c6b48440fef558f3f891630a4b7f17229985cc6148ae5a0beef32b9c960b248e6ae91e57538b8e0b30b SHA512 270cc34fcb6b32edeff23153cbab9ba78a7293cc024cdfd2a1162cf1eb779dcc551295e90a36f5be7d6a89205fbe62b46af5065579c0ed459b18ec8c62204345
+EBUILD qt-creator-4.12.3.ebuild 7162 BLAKE2B db1e02471e668298bfdda0e69c7451afd1f1833e85f5c9fb50c1c67ed05ff1e6c59b41f2210d23dd28387d763a54a8c5c3959e91c9cabe8c547acd8d50b74b05 SHA512 8f533d94d39213eb8fdc958334e37af1193a3f7c6829fc8975397c71258c294b545f726115e8d7a50ebc0930e21cedc61794b50b757c951d7ce34c7eaff73713
 EBUILD qt-creator-4.8.2.ebuild 5826 BLAKE2B c3b87e94ae39f69abbefd189fe52dd946dbece17de5a301b3b4a651a683770c5ca58c5f2afcea0237ef18bb0d80e53d69f5078bb0d219f0c114331da5456320a SHA512 7f01324288b26da063d3d1d4d93232f74d0c7a7ad9e481d872a045935265aa1bed200ec24ce2d90469f17bb9da3c7de5aeecb8b8be1d2a04c510c51c533c99c4
-EBUILD qt-creator-9999.ebuild 7157 BLAKE2B b8496055e4c5fd6b97d80e3e9fc779f5789c30f615009c6b48440fef558f3f891630a4b7f17229985cc6148ae5a0beef32b9c960b248e6ae91e57538b8e0b30b SHA512 270cc34fcb6b32edeff23153cbab9ba78a7293cc024cdfd2a1162cf1eb779dcc551295e90a36f5be7d6a89205fbe62b46af5065579c0ed459b18ec8c62204345
-MISC metadata.xml 3297 BLAKE2B 02d12b1d65d5791fe108f75d76f01804d363c933b5b50317a2976d5a3099bf36c2a78d40390a6e16e341b462c7b7a86c0da1f1be9ca4e9cb29ea9e24285227dd SHA512 0597fb87fe7f82c0a4502c0299a0b0d6ab981d8923c1db58f0c26102a93507a8ec75005430a2c538a2621c37936b662a6f0acfc2c7168bc2d608cb3ed44db2cf
+EBUILD qt-creator-9999.ebuild 7431 BLAKE2B e001aa963ea858b78cc7bac329431ab91eac07a8f1df7f912c3633c200194674fd89bb59322d3b633a19cb2df82b54819e8b3fd04f1500041405664846311d3c SHA512 90538041ce2e16ca7b0dd8743d653b0ea6a237f36d2860b4c23e37e0e5a3130dfd7cae3405ac532901495fe4eacf87090dbf0d49152be772685eae6c8d6da923
+MISC metadata.xml 3518 BLAKE2B 4153006d68c5a4689e66f39cbaa9762ff1787f88676dc88878e38f5b8376bd28714b78f86449f037eb52cd81b0b91273516e852c34a5460fb0a7081adf0c1e67 SHA512 2cb8d121b8fc6685bcb9fb09c7f39487ba067ba8b5aad8b0f82b0b512290436bcf57b587505f856dd729a1e0bee9f4fc94b5fd28735f255b1cae5ae1e79f44ba
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 91079b87e4e8..f1b1bb3d0251 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -12,34 +12,36 @@
 	<use>
 		<flag name="android">Build plugin for Android devices</flag>
 		<flag name="autotest">Enable integration with popular unit testing frameworks (QtTest, Google Test, Boost.Test)</flag>
-		<flag name="autotools">Enable autotools project manager plugin</flag>
+		<flag name="autotools">Build plugin for autotools-based projects</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
+		<flag name="bazaar">Add support for GNU Bazaar version control system (requires manual installation of Bazaar client)</flag>
 		<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag>
 		<flag name="boot2qt">Build plugin for Boot2Qt devices</flag>
-		<flag name="clang">Build clang-based plugins (code model, formatting, refactoring, static analysis)</flag>
+		<flag name="clang">Build clang-based plugins (code model, formatting, static analysis)</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="cmake">Build plugin for CMake-based projects</flag>
 		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
 		<flag name="ctfvisualizer">Build the Chrome Trace Format visualizer plugin</flag>
 		<flag name="designer">Enable designer for QtWidgets-based UIs</flag>
-		<flag name="glsl">Enable GLSL editor</flag>
+		<flag name="glsl">Build the GLSL editor plugin</flag>
 		<flag name="help">Enable the integrated documentation viewer</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="mcu">Build plugin for MCU devices</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="modeling">Build the graphical model editor plugin</flag>
 		<flag name="nim">Build plugin for Nim language support</flag>
 		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
 		<flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag>
 		<flag name="python">Build plugin for Python language support</flag>
-		<flag name="qbs">Enable QBS project manager plugin</flag>
+		<flag name="qbs">Build plugin for QBS-based projects</flag>
 		<flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag>
+		<flag name="qmljs">Build the QML/JavaScript editor plugin</flag>
 		<flag name="qmlprofiler">Build the QML profiler plugin</flag>
 		<flag name="qnx">Build plugin for QNX devices</flag>
 		<flag name="remotelinux">Add support for deployment and execution on a remote Linux host</flag>
-		<flag name="scxml">Enable graphical SCXML editor</flag>
-		<flag name="serialterminal">Build serial terminal plugin</flag>
+		<flag name="scxml">Build the graphical SCXML editor plugin</flag>
+		<flag name="serialterminal">Build the 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">Enable integration with <pkg>dev-util/valgrind</pkg></flag>
diff --git a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
deleted file mode 100644
index dbf469667697..000000000000
--- a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=8
-PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/"
-LICENSE="GPL-3"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-opensource-src-${MY_PV}
-	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite and KSyntaxHighlighting
-
-QTC_PLUGINS=(android +autotest baremetal beautifier
-	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
-	cmake:cmakeprojectmanager cppcheck cvs +designer git glsl:glsleditor +help ios lsp:languageclient
-	mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor qbs:qbsprojectmanager
-	+qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion
-	valgrind winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	clang? ( test? ( qbs ) )
-	qnx? ( remotelinux )
-"
-
-# minimum Qt version required
-QT_PV="5.12.3:5"
-
-CDEPEND="
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}[ssl]
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtquickcontrols-${QT_PV}
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=dev-qt/qtx11extras-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	clang? ( sys-devel/clang:8= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-	)
-	perfprofiler? ( dev-libs/elfutils )
-	qbs? ( >=dev-util/qbs-1.13.1 )
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-		>=dev-qt/qtxmlpatterns-${QT_PV}[qml]
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	cmake? ( dev-util/cmake )
-	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 )
-"
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
-	IUSE+=" l10n_${x}"
-	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
-				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 clang; then
-		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-		sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/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 tests/auto/auto.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
-	fi
-	if ! use perfprofiler; then
-		rm -rf src/tools/perfparser || die
-		if ! use qmlprofiler; then
-			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
-		fi
-	fi
-	if ! use qmldesigner; then
-		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
-		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
-	fi
-	if ! use valgrind; then
-		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
-		sed -i -e '/valgrind/d' tests/auto/auto.pro || die
-	fi
-
-	# automagic dep on qtwebengine
-	if ! use webengine; then
-		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
-	sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die
-
-	# do not install test binaries
-	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die
-
-	# fix path to some clang headers
-	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
-
-	# fix translations
-	local lang languages=
-	for lang in ${PLOCALES}; do
-		use l10n_${lang} && languages+=" ${lang/-/_}"
-	done
-	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
-
-	# remove bundled qbs
-	rm -rf src/shared/qbs || die
-}
-
-src_configure() {
-	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
-		$(use qbs && echo 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)
-}
-
-src_test() {
-	cd tests/auto && virtx default
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}/usr" install
-
-	dodoc dist/{changes-*,known-issues}
-
-	# install documentation
-	if use doc; then
-		emake docs
-		# don't use ${PF} or the doc will not be found
-		insinto /usr/share/doc/qtcreator
-		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
-	fi
-}
diff --git a/dev-qt/qt-creator/qt-creator-4.12.3.ebuild b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
index ff58c169e4e0..27a1d4838af0 100644
--- a/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
@@ -20,7 +20,7 @@ else
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
 	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index ff58c169e4e0..926ec1ce7a65 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -26,24 +26,25 @@ fi
 
 # TODO: unbundle sqlite
 
-QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
-	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
-	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
-	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
-	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
-	silversearcher subversion valgrind webassembly winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
+	ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial
+	modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner
+	+qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher
+	subversion valgrind webassembly)
+IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
 	mcu? ( cmake )
 	python? ( lsp )
+	qmldesigner? ( qmljs )
 	qnx? ( remotelinux )
 "
 
 # minimum Qt version required
-QT_PV="5.12.3:5"
+QT_PV="5.14:5"
 
 BDEPEND="
 	>=dev-qt/linguist-tools-${QT_PV}
@@ -51,7 +52,6 @@ BDEPEND="
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 "
 CDEPEND="
-	>=dev-cpp/yaml-cpp-0.6.2:=
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
@@ -67,6 +67,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	kde-frameworks/syntax-highlighting:5
 	clang? (
+		>=dev-cpp/yaml-cpp-0.6.2:=
 		|| (
 			( sys-devel/clang:10
 				dev-libs/libclangformat-ide:10 )
@@ -81,7 +82,6 @@ CDEPEND="
 		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 	)
 	perfprofiler? ( dev-libs/elfutils )
-	qbs? ( >=dev-util/qbs-1.13.1 )
 	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
 "
@@ -95,11 +95,13 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
-	cmake? ( dev-util/cmake )
+	autotools? ( sys-devel/autoconf )
+	cmake? ( >=dev-util/cmake-3.14 )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
+	qbs? ( >=dev-util/qbs-1.15 )
 	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )
@@ -137,12 +139,13 @@ src_prepare() {
 				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
-	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
+	sed -i -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
+	sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.pro || die
 
 	# avoid building unused support libraries and tools
 	if ! use clang; then
-		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-		sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die
+		sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die
+		sed -i -e '/clangbackend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then
 		sed -i -e '/glsl/d' src/libs/libs.pro || die
@@ -160,9 +163,13 @@ src_prepare() {
 		fi
 	fi
 	if ! use qmldesigner; then
+		sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die
 		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
 		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
 	fi
+	if ! use qmljs; then
+		sed -i -e '/qmleditorwidgets/d' src/libs/libs.pro || die
+	fi
 	if ! use valgrind; then
 		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
 		sed -i -e '/valgrind/d' tests/auto/auto.pro || die
@@ -209,8 +216,6 @@ src_configure() {
 		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
 		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
 		$(use qbs && echo 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)
 }