gentoo resync : 05.12.2021

5 files changed, 275 insertions, 36 deletions

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 176e4a6846ee..271dfe086082 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,6 @@
 DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a SHA512 a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3
-EBUILD qt-creator-4.15.1.ebuild 7181 BLAKE2B 1d374ac5b14917b315654aa2d3d24d54b1d1855ee895e6f3ab666395d6b09661f21e2af602ecb43748e388cb7010286e125929e0e972aa1757f689a60b304e1e SHA512 72ea5019db3cb5e74d7058e8eeb3ccb4024a7e6a85b12c624db25ee3cb9aea906f0e903a6bbe9a1fa794e086ff0b94cc53b39e362cf720cf44e11399e408c419
-EBUILD qt-creator-9999.ebuild 7181 BLAKE2B 1d374ac5b14917b315654aa2d3d24d54b1d1855ee895e6f3ab666395d6b09661f21e2af602ecb43748e388cb7010286e125929e0e972aa1757f689a60b304e1e SHA512 72ea5019db3cb5e74d7058e8eeb3ccb4024a7e6a85b12c624db25ee3cb9aea906f0e903a6bbe9a1fa794e086ff0b94cc53b39e362cf720cf44e11399e408c419
-MISC metadata.xml 3399 BLAKE2B 0cfa5258ef99dabbe09cb8df0e3186c98d49cbf8e3f3330cba4d16385f5f01877cd1c95bc00586f03c1706e603a1901058da093e924f537428baddf33f4378cc SHA512 8b5dd9ce27b582b06729ea479530176e10cc55a36bfd07c870a677f5375435acb3a42abf81cbd03fde18d91df7f94a58eee89e9ebe6d6e285f69a667563f9343
+DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348 SHA512 4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb
+EBUILD qt-creator-4.15.1.ebuild 7209 BLAKE2B f4fc67fa5ff3548a1751478d17d292c883e463d083f1fd59b7785c3c8f6a818746df4eb4cca1ebf38751e24bcc15e08d87cd2e710002496472eaccedbd77589c SHA512 64c89d041808b92d31077c8e24d9727902b653c20fc3f268c337461a97e111259cfb76dbb62329945036f56f09d542048e303122ff286335b215f45f47cd4c02
+EBUILD qt-creator-6.0.0.ebuild 7282 BLAKE2B 2935b4c5ca4e9d107a4f47aa67c1188a23ac634c50fa3a04e859a66513d532b1073fe5583738461212ef4472056477e816d5d04bf83c6877f1d47719bae14800 SHA512 023c98bba47ec6fa272873651601e010aee2682941a5597c6a24dbe37a1405f571e20c1f4369c8f8a061d4010e6a833dde03a101fa35b2556fbeb8fe85c1a038
+EBUILD qt-creator-9999.ebuild 7282 BLAKE2B 2935b4c5ca4e9d107a4f47aa67c1188a23ac634c50fa3a04e859a66513d532b1073fe5583738461212ef4472056477e816d5d04bf83c6877f1d47719bae14800 SHA512 023c98bba47ec6fa272873651601e010aee2682941a5597c6a24dbe37a1405f571e20c1f4369c8f8a061d4010e6a833dde03a101fa35b2556fbeb8fe85c1a038
+MISC metadata.xml 3881 BLAKE2B e70f7f66fd52b5e9a0526d4cc902289d7a1a94933f741d3a941d53aa3a2534dfb24942a952931b221750755a5793f458803f6f86dd958052f5a1982d69d6025b SHA512 0f06152dc28ce8b8a15dd80a46aff37088b4383dd50f609e5da075a88d3c14a3304c9b3e40c7315fd448d08138148d68dcac3dafd294a7c266d9f0ba879d1b5f
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 45e6f90bbd93..d2e6af3e1338 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -11,34 +11,40 @@
 	</maintainer>
 	<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="autotest">Enable integration with popular unit testing frameworks (QtTest, GoogleTest, Boost.Test, Catch2)</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, static analysis)</flag>
+		<flag name="clang">Build clang-based plugins for C/C++ development (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">Build plugin for CMake-based projects</flag>
+		<flag name="conan">Build plugin to integrate with the Conan package manager</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="docker">Build plugin for Docker support</flag>
 		<flag name="glsl">Build the GLSL editor plugin</flag>
 		<flag name="help">Enable the integrated documentation viewer</flag>
+		<flag name="incredibuild">Enable integration with Incredibuild</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="meson">Build plugin for Meson-based projects</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">Build plugin for QBS-based projects</flag>
+		<flag name="qbs">Build plugin for Qbs-based projects</flag>
+		<flag name="qmake">Build plugin for qmake-based projects</flag>
+		<flag name="qml">Build plugins for QML-based development (designer, editor, project manager)</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="remotelinux">Build plugin for deployment and execution on a remote Linux host</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>
diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
index bfc4e05275dc..18260cba5420 100644
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
@@ -33,9 +33,10 @@ QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaa
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
+	android? ( lsp )
 	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
-	mcu? ( cmake )
+	mcu? ( baremetal cmake )
 	python? ( lsp )
 	qmldesigner? ( qmljs )
 	qnx? ( remotelinux )
diff --git a/dev-qt/qt-creator/qt-creator-6.0.0.ebuild b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
new file mode 100644
index 000000000000..f8eca8f995f6
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=13
+PLOCALES="cs da de fr hr 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/"
+
+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"
+	S=${WORKDIR}/${MY_P}
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
+	clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker +git glsl:glsleditor +help incredibuild
+	+lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python
+	qbs:qbsprojectmanager +qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+	qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly)
+IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	android? ( lsp )
+	boot2qt? ( remotelinux )
+	clang? ( lsp )
+	mcu? ( baremetal cmake )
+	python? ( lsp )
+	qml? ( qmake )
+	qnx? ( remotelinux )
+"
+
+# minimum Qt version required
+QT_PV="5.15:5"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
+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}
+	>=kde-frameworks/syntax-highlighting-5.87:5
+	clang? (
+		>=dev-cpp/yaml-cpp-0.6.2:=
+		|| (
+			sys-devel/clang:13
+			sys-devel/clang:12
+			sys-devel/clang:11
+		)
+		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
+	)
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	perfprofiler? ( dev-libs/elfutils )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${CDEPEND}
+	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[python]
+	cppcheck? ( dev-util/cppcheck )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+	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
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			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 -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
+
+	# avoid building unused support libraries and tools
+	if ! use clang; then
+		sed -i -e '/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
+	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 -r src/tools/perfparser || die
+		if ! use ctfvisualizer && ! use qmlprofiler; then
+			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
+		fi
+	fi
+	if ! use qmake; then
+		sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die
+	fi
+	if ! use qml; then
+		sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die
+		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
+		sed -i -e '/qmldesigner\|qmlprojectmanager/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\.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 '/reformatter/d' tests/auto/qml/qml.pro || die
+	sed -i -e 's/\<\(imports\|\)check\>//' tests/auto/qml/codemodel/codemodel.pro || die
+	sed -i -e '/timelineitemsrenderpass/d' tests/auto/tracing/tracing.pro || die
+	sed -i -e '/qtcprocess/d' tests/auto/utils/utils.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_INCLUDE_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 syntax-highlighting
+	rm -r src/libs/3rdparty/syntax-highlighting || die
+
+	# remove bundled yaml-cpp
+	rm -r src/libs/3rdparty/yaml-cpp || die
+
+	# remove bundled qbs
+	rm -r src/shared/qbs || die
+
+	# TODO: unbundle sqlite
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		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") \
+		$(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-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index bfc4e05275dc..f8eca8f995f6 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
 PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
@@ -24,25 +24,25 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-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)
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
+	clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker +git glsl:glsleditor +help incredibuild
+	+lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python
+	qbs:qbsprojectmanager +qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+	qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
+	android? ( lsp )
 	boot2qt? ( remotelinux )
-	clang? ( test? ( qbs ) )
-	mcu? ( cmake )
+	clang? ( lsp )
+	mcu? ( baremetal cmake )
 	python? ( lsp )
-	qmldesigner? ( qmljs )
+	qml? ( qmake )
 	qnx? ( remotelinux )
 "
 
 # minimum Qt version required
-QT_PV="5.14:5"
+QT_PV="5.15:5"
 
 BDEPEND="
 	>=dev-qt/linguist-tools-${QT_PV}
@@ -63,10 +63,11 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	kde-frameworks/syntax-highlighting:5
+	>=kde-frameworks/syntax-highlighting-5.87:5
 	clang? (
 		>=dev-cpp/yaml-cpp-0.6.2:=
 		|| (
+			sys-devel/clang:13
 			sys-devel/clang:12
 			sys-devel/clang:11
 		)
@@ -91,14 +92,11 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[python]
-	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.18 )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+	qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )
 	valgrind? ( dev-util/valgrind )
@@ -124,17 +122,15 @@ src_prepare() {
 	# 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 -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
+	sed -i -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
 
 	# avoid building unused support libraries and tools
 	if ! use clang; then
-		sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die
+		sed -i -e '/yaml-cpp/d' src/libs/libs.pro || die
 		sed -i -e '/clangbackend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then
@@ -152,13 +148,13 @@ src_prepare() {
 			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
 		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
+	if ! use qmake; then
+		sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die
 	fi
-	if ! use qmljs; then
-		sed -i -e '/qmleditorwidgets/d' src/libs/libs.pro || die
+	if ! use qml; then
+		sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die
+		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
+		sed -i -e '/qmldesigner\|qmlprojectmanager/d' tests/auto/qml/qml.pro || die
 	fi
 	if ! use valgrind; then
 		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
@@ -172,9 +168,12 @@ src_prepare() {
 
 	# 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 '/dumpers\.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
+	sed -i -e '/reformatter/d' tests/auto/qml/qml.pro || die
+	sed -i -e 's/\<\(imports\|\)check\>//' tests/auto/qml/codemodel/codemodel.pro || die
+	sed -i -e '/timelineitemsrenderpass/d' tests/auto/tracing/tracing.pro || die
+	sed -i -e '/qtcprocess/d' tests/auto/utils/utils.pro || die
 
 	# do not install test binaries
 	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die