gentoo resync : 25.08.2020

31 files changed, 389 insertions, 253 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 235fc99768a4..e0f62972d7ff 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
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)
 }
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 0ec18267b743..949707a50619 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,5 +1,5 @@
 DIST qtconnectivity-everywhere-src-5.14.2.tar.xz 2804940 BLAKE2B d72e1159877049865d45c5aea8281fce87d797bb41cd82aac534463f48752f8144d018a9a1a23d153adc41b64559c0aa160c00ad1c30ce7790abb11f4ee1d87f SHA512 948050b915f6f2e1fffcb2c8b55d9061f25a82314d02e7a39faa9b88e065bb924ce5f8a7c26ed1f07b29b986d47acd5678f57bb96668d1c1ecd93ad3a7e40c7a
 DIST qtconnectivity-everywhere-src-5.15.0.tar.xz 2803792 BLAKE2B e81358b6dc8c2e8a459ade9e15ae93a017ace0dc6eccc2010bcede2c80b89133566e74ecd266345639e46eae8ba37a292715b8345ee92caf50c24ee48c08e651 SHA512 57f125d232d1b495e82dd0f52243b878c7f0d3ffd1c8f4a7ff92810167867e2a5e480f4e7a3d2f26bbebcf8693eacbced87504b54f79cc8d1c8caf5a8f2da8f2
-EBUILD qtbluetooth-5.14.2.ebuild 634 BLAKE2B df241e3ffadec8e3a4b8cc7fb29bfd10365c997f6e8159468f037c6ec118d9a6e22650f8ff5d49ddd99bbba6206d2651aa791b74afb60aefea00a32607371ee9 SHA512 99c797c416c9fd836bee9ef78808f5323924e033df25543c5c402c8eb8ac99e95984b1c834763308509c49a43f115051dd89be6756f91e32021cb9bd2ceec981
-EBUILD qtbluetooth-5.15.0.ebuild 638 BLAKE2B eb466960d85f88d33193b5df81afa005536657725bf9ecb4210325f8767bdb638dc0c65ac14975f4ad5eb518853e10a1a06953207f1122a8266c0da78ecbd27a SHA512 ab17fefe047787d4b024d894846e2d8c42030d45008d8b0a4b6ea533c554a98596ef3d5dd13861250c319f461c77ec4878ec7b8767c4b97c6fd094db1d1bef12
+EBUILD qtbluetooth-5.14.2-r1.ebuild 637 BLAKE2B 782ff75184a83de5a6ce49eba51ad1320a6b2c87cc23559928231298af2d0299ae8fe98f36b6ed92e034d09b086748cdb806c6c956b2253bae6b573ab6447c9a SHA512 340917ba5f87e627ce70a58287b0777afad3ca0cc4c78dba528fb78a19766eaf5ce6f7b5dc5899f6b790db2385f403395e94633cae9b71423efbf9e2dd2f57b5
+EBUILD qtbluetooth-5.15.0-r1.ebuild 641 BLAKE2B 9727bfd05d1457502a9c8d022e98b61e767e26fa7685e4b22de7f9c42e0b8c519d1984ed91b0c1ff6bd13526cead880b5b962a25c2ed250b522b54d00e28f6a5 SHA512 abe38b529354bafee87b8ee505ab2ac4b84e0e0912e63293e8dab963aa7d95e3d480c2dcf599628bedd39c61103e26a8104af528434ed749e38023c73f0a50aa
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild
index 941ace0c4084..e9b3e7f2f77b 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="qml"
 
 RDEPEND="
 	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
+	~dev-qt/qtcore-${PV}:5=
 	~dev-qt/qtdbus-${PV}
 	>=net-wireless/bluez-5:=
 	qml? ( ~dev-qt/qtdeclarative-${PV} )
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.0.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.0-r1.ebuild
index 7ded615ebf54..5b53f7c84d84 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.0.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.0-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="qml"
 
 RDEPEND="
 	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
+	~dev-qt/qtcore-${PV}:5=
 	~dev-qt/qtdbus-${PV}
 	>=net-wireless/bluez-5:=
 	qml? ( ~dev-qt/qtdeclarative-${PV} )
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index fe84bc10d748..a3079b124860 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -4,6 +4,6 @@ AUX qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch 3141 BLAKE2B 98aa282
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004
 DIST qtdeclarative-everywhere-src-5.15.0.tar.xz 21493268 BLAKE2B c6b8365caa3e0eef3023d727adf086c16bafc171bcfa839a4dc83132b5c9a76c9a849b387f3815c1a9b12db5824ccc628cad22efd0ce0cb70059971cadfbb00b SHA512 0ec3403286efea6d6ac975ea6bd4464ea656c031f5f27b852235fd69d316a627ac3ff2ea2c3cca0a5375ca278f592df3ecade4e98aa15ec92816a16927f56e5e
-EBUILD qtdeclarative-5.14.2-r3.ebuild 1417 BLAKE2B a7f6734e157acb79488a3e3cf283ccd909de12c1ffafdbc293c78179f5c37ac4a605e8916f1e047f7d4847e0391e38639b713904fccf31f8f0de466cad2d7351 SHA512 2a191231c2d9af1cd75adb94e9c1bee95894e75844234308b5169ad8eb4079c395156110a135b84ffb562bf22d7529a9a103adcf3e8832c474945b7770c34dfe
-EBUILD qtdeclarative-5.15.0.ebuild 1360 BLAKE2B 5d66999c92120e357aed3ac2828c8163fbe2f854be4794a4cf793417014a60a16adc794fa9cea50340c8df185c94a7aea5f1b6efd46aa0890765a9684118a816 SHA512 ae0b1468d90fef120f0e22cbe09bc2d33838d30f188167d54addb32f4f286377145b447f6dd4d0e4e914f528182e2b648079c8649ec5f2e0491544e077354fdf
+EBUILD qtdeclarative-5.14.2-r4.ebuild 1420 BLAKE2B 68e9ad656186ac04da20d3f58428c93a8acf8a1282e1cce360d9807775ff1ae88f41d465af1787069d9399b072d85037c0d8d48699a768f36f1557548020fd6f SHA512 f3d46152bcd7443c308899d5c09b6374b67a6486060c0b37d395efbd3eaba2914daad2f46b25f3f32d4920731767358e00ce1afcb82117015c4f2fedf63e3ee5
+EBUILD qtdeclarative-5.15.0-r1.ebuild 1363 BLAKE2B 3cfebdb8ad2a33f8ab15ec59a95c05a126bddbef13cf6f88fca9d633d6354bfecef6c8ea2cad96ffcc961986d0ecdeba4e707bdac9acc1e27b02e72085090222 SHA512 596cbb00b4a4b1dd71f4f01d439acb8a8aa09733bd84ead49c8f304b218476904373adca6b691e11b852337249a9f55c7e7ed8077d19de66ec03cc50b5c0a589
 MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild
index e306c7574439..ee5e2c5a785e 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild
@@ -17,7 +17,7 @@ BDEPEND="${PYTHON_DEPS}"
 # qtgui[gles2-only=] is needed because of bug 504322
 DEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=,vulkan=]
+	~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
 	~dev-qt/qtnetwork-${PV}
 	~dev-qt/qttest-${PV}
 	localstorage? ( ~dev-qt/qtsql-${PV} )
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.0-r1.ebuild
index ffc90aff6647..0ee13270106b 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.0.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.0-r1.ebuild
@@ -17,7 +17,7 @@ BDEPEND="${PYTHON_DEPS}"
 # qtgui[gles2-only=] is needed because of bug 504322
 DEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=,vulkan=]
+	~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
 	~dev-qt/qtnetwork-${PV}
 	~dev-qt/qttest-${PV}
 	localstorage? ( ~dev-qt/qtsql-${PV} )
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index fed92ae22fd4..74f4d8290d6b 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,7 +1,9 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
 AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
+AUX qtgui-5.14.2-CVE-2020-17507.patch 1582 BLAKE2B 6fde9d057c96e65159ba1c07a7fa2df6d9ed5577810eb149667168b0a7c2fd754ae49c153a2c5486ad04768338edd791803d0ebc92955e8db5015d7cc9f72a7c SHA512 159eb0eebd650bc5fe33e3e7555ce7a1d39d3294aaf5d47c2db4f437fb9c15b7ceed1566b4354b26f19b6c5ab10f5c748407c5a31077326018aafb238b167a43
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
+EBUILD qtgui-5.14.2-r1.ebuild 4053 BLAKE2B 95b2c762100109ce1713a4c41543c5aa0e9b2ab2d71dfb3040047a096c0ea8c8f3eb714d75582d879bcfada9d86e60cd739bca8c0320dc62fb73b1d2b989ddec SHA512 d01f9340cec99b65f29a7b19d1d913624afe7f651e7203d4239c0e13f0ee3ad84cd7f83ad2638cf0e6c68120453c285c057daef38a5d8f56c6dfcfc50c00f865
 EBUILD qtgui-5.14.2.ebuild 3985 BLAKE2B e1b9a884ef1cb004beff407628971416081284fdad50a48159248714575ca8446958475821f9ae1dd307361a2834ad86a28d2edd0380d3e2b900b9c3c6ff9ddf SHA512 03b121e4042063519d2bd730994d04dcd7aff1742a46c661a9605f47526e78ccd39f727d62e32636df53d5bfe2e82df6ad5fc6055ac837e4c5acf794b4541b6f
-EBUILD qtgui-5.15.0.ebuild 3967 BLAKE2B d97968e50b9c7897373dafadffc97882bd202a6e1779ad35f1764aaf276981e6500f21c2465e4977ba970e3b620178c3f609df595c018e0670856809c85f926b SHA512 808fa2b36562b57f3a492c25d34cebc8cc979783f9c0ffbd77ee8ba720cafb86bbf2dfa2dd3be7f0316e40ad23ae17f32338071ab9f7694e284b5d7179e96eb0
+EBUILD qtgui-5.15.0-r1.ebuild 4046 BLAKE2B 53a7a4f83feda0ac48b911831dda49ba7ab1ba9213d660101a82b20b594731a0f622e723c28aaaf5694a56342d445dcf803fd4730bcf9a070555d1af44198719 SHA512 9fb0f95b852895239b2f8a7ee2472f040645e41bfb2f4f8adad697f0d787c36ea78d46a7fa70e3504e4a3d3b017ed18869880e636bd2c957d07d5f821cab0067
 MISC metadata.xml 1221 BLAKE2B ddd5982d379222008bfd11c2462de6570c2492635c16a57e7815a23c4870cb35713426fdd4645c7d8d3b32e74afb854e7c8a38ecb5b6c75661136469009fe62c SHA512 d8b994729f64acd05c6269038d41f290885f848b644033e7b8746b35652711a703c313f751e636f6e09e72c360fe107187072c3554e2f9efb1b398a8f7d48bf4
diff --git a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch b/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch
new file mode 100644
index 000000000000..cad9aa4b682c
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch
@@ -0,0 +1,39 @@
+From 1616c71921b73b227f56ccb3f2c49a994ec23440 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Thu, 23 Jul 2020 11:48:48 +0200
+Subject: Fix buffer overflow in XBM parser
+
+Avoid parsing over the buffer limit, or interpreting non-hex
+as hex.
+
+This still leaves parsing of lines longer than 300 chars
+unreliable
+
+Change-Id: I1c57a7e530c4380f6f9040b2ec729ccd7dc7a5fb
+Reviewed-by: Robert Loehning <robert.loehning@qt.io>
+Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
+(cherry picked from commit c562c1fc19629fb505acd0f6380604840b634211)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+ src/gui/image/qxbmhandler.cpp                      |  4 ++-
+ .../gui/image/qimagereader/tst_qimagereader.cpp    | 38 ++++++++++++++++++++++
+ 2 files changed, 41 insertions(+), 1 deletion(-)
+
+diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
+index f06561690c..72ce7f7ecd 100644
+--- a/src/gui/image/qxbmhandler.cpp
++++ b/src/gui/image/qxbmhandler.cpp
+@@ -159,7 +159,9 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage)
+     w = (w+7)/8;                                // byte width
+ 
+     while (y < h) {                                // for all encoded bytes...
+-        if (p) {                                // p = "0x.."
++        if (p && p < (buf + readBytes - 3)) {      // p = "0x.."
++            if (!isxdigit(p[2]) || !isxdigit(p[3]))
++                return false;
+             *b++ = hex2byte(p+2);
+             p += 2;
+             if (++x == w && ++y < h) {
+-- 
+cgit v1.2.1
+
diff --git a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
new file mode 100644
index 000000000000..a676219df351
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 707658
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+	+libinput +png tslib tuio +udev vnc vulkan wayland +X"
+REQUIRED_USE="
+	|| ( eglfs X )
+	accessibility? ( dbus X )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	X? ( gles2-only? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}:5=
+	dev-util/gtk-update-icon-cache
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.6.0:=
+	sys-libs/zlib:=
+	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	eglfs? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+	)
+	evdev? ( sys-libs/mtdev )
+	gles2-only? ( media-libs/mesa[gles2] )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		>=x11-libs/libxkbcommon-0.5.0
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( >=x11-libs/tslib-1.21 )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libxcb-1.12:=[xkb]
+		>=x11-libs/libxkbcommon-0.5.0[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+	wayland? ( ~dev-qt/qtwayland-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/qvkgen
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl:egl:
+	eglfs:eglfs:
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev:evdev:
+	evdev:mtdev:
+	:fontconfig:
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2-only::OPENGL_ES
+	gles2-only:opengles2:OPENGL_ES_2
+	!:no-gui:
+	:system-harfbuzz:
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib:tslib:
+	udev:libudev:
+	vulkan:vulkan:
+	X:xcb:
+	X:xcb-glx:
+	X:xcb-plugin:
+	X:xcb-render:
+	X:xcb-sm:
+	X:xcb-xlib:
+	X:xcb-xinput:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+PATCHES=(
+	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
+	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
+	"${FILESDIR}/${PN}-5.14.2-CVE-2020-17507.patch" # bug 736924
+)
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
+
+	# egl_x11 is activated when both egl and X are enabled
+	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(usex eglfs '-gbm -kms' '')
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		-gui
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		-opengl $(usex gles2-only es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use vulkan)
+		$(qt_use X xcb system)
+		$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
+	)
+	if use libinput || use X; then
+		myconf+=( -xkbcommon )
+	fi
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/qtgui-5.15.0.ebuild b/dev-qt/qtgui/qtgui-5.15.0-r1.ebuild
index 23bc34eb7c46..c32c33860d00 100644
--- a/dev-qt/qtgui/qtgui-5.15.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.0-r1.ebuild
@@ -34,7 +34,6 @@ RDEPEND="
 	>=media-libs/freetype-2.6.1:2
 	>=media-libs/harfbuzz-1.6.0:=
 	sys-libs/zlib:=
-	virtual/opengl
 	dbus? ( ~dev-qt/qtdbus-${PV} )
 	egl? ( media-libs/mesa[egl] )
 	eglfs? (
@@ -43,6 +42,7 @@ RDEPEND="
 	)
 	evdev? ( sys-libs/mtdev )
 	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
 	jpeg? ( virtual/jpeg:0 )
 	libinput? (
 		dev-libs/libinput:=
@@ -131,6 +131,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 PATCHES=(
 	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
 	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
+	"${FILESDIR}/${PN}-5.14.2-CVE-2020-17507.patch" # bug 736924
 )
 
 src_prepare() {
diff --git a/dev-qt/qtlockedfile/Manifest b/dev-qt/qtlockedfile/Manifest
index 0e319b376292..c1eedca3af1a 100644
--- a/dev-qt/qtlockedfile/Manifest
+++ b/dev-qt/qtlockedfile/Manifest
@@ -1,4 +1,4 @@
 AUX qtlockedfile.prf 190 BLAKE2B 254ba3ddc3708c72fdefa5f3a0be26f33752c7a00edbefebc46b8e39ae967064348bcf9e0b946428421d2c232a3d612838e7003352eb489f01a2597928ed4404 SHA512 efd51aa88a40ad5615d3ae9122a360997a3d32e3f212e7d9c1c2cf9e42984a1e4b9ccff02c6ddc1e8926104527004536ad848c5ef24bc28a93eb556d99235696
 DIST qt-solutions-20171024.tar.xz 710532 BLAKE2B 365f4c6fc3bee34bf26ac5039984ceac1d90527297b985b0d1b606f3ba67219bab7f7cba40b4adca55446c34e9f4fe218b4449ee255ba6f6409de78f80ccdaec SHA512 4784d88c2f40c88f06abeb728842875fb5e428a630dbf749f71055681b0c631803d2901b60aa8cc95f5f382dcd21da8d739873aa45e3dd3676ee95925f0198da
-EBUILD qtlockedfile-2.4.1_p20171024.ebuild 1060 BLAKE2B 256049b7f2402bd91278a88f278a886e5299599384e5572d3b4c441f32ade70109adc8b1646e9e5e0df11e41be27de48f4d6dbb75627cccb032c31e04f15f743 SHA512 1fa1a3e52ce3a3944c54ce98fb1441c5dbcdcea7a028bbf9e30e0891beefdb59bc0abed22b38f8deb382f443ab0e8c810284777bffe729a298fe6dc54840f387
+EBUILD qtlockedfile-2.4.1_p20171024.ebuild 1067 BLAKE2B 7bcb83ccbc175ff11d855c2db4a233b8f905924577d9c071b0bf45326f7253a99b241833ad88ce8ab115ad620eecbd679d36ff9d60f7eea9a15d4ef167e88fbe SHA512 56e3b79b3e8cd26ea5efa8049e4f1f3ca350fc13aee3fca34cdc68ecc747b243b5ef97163d6b508fda3e541278d177a8246f7f3bea676023591a9e9fd84d9961
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
index 0c46b28d9241..8ce005c4ebea 100644
--- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
+++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="doc"
 
 DEPEND="dev-qt/qtcore:5"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 7fa5ba35fe29..eb9b48fad4c5 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
-EBUILD qtopengl-5.14.2.ebuild 657 BLAKE2B 02264b13ffe36f059e903d6ae8ccfc5cc252133114975704a1bc0785a64ddb77be30e3ad13e4bd179c6418b87e3a079deefb3dda122683e9d9e818e3675c927e SHA512 8c7ba6eb0a68b1fd6a723beba69ba3d23c91f022a092c98dc7e0537d0a25900a894a719f2436671bfe7f35976e9ac9581853f93f5f67b5b37855f6509c276f5e
-EBUILD qtopengl-5.15.0.ebuild 663 BLAKE2B b5ed7e2936e449ab115aed7f1fa1199661d176d5985040bf1dad4f3e83458d62a9ac1afbea081f9b68fe3799e07ccec8379b63dda8843f0337ff136d0f0ee40c SHA512 150da15223ec6f4049d9c05b7facb12faec803d22755d5f30f89366f3b5af8eb1ff1a76583aad17556469ea4841a0208df4506392febc42d6f383e92fdd122de
+EBUILD qtopengl-5.14.2-r1.ebuild 657 BLAKE2B 02264b13ffe36f059e903d6ae8ccfc5cc252133114975704a1bc0785a64ddb77be30e3ad13e4bd179c6418b87e3a079deefb3dda122683e9d9e818e3675c927e SHA512 8c7ba6eb0a68b1fd6a723beba69ba3d23c91f022a092c98dc7e0537d0a25900a894a719f2436671bfe7f35976e9ac9581853f93f5f67b5b37855f6509c276f5e
+EBUILD qtopengl-5.15.0-r1.ebuild 680 BLAKE2B aa61e1c30bf829f9e9fc5747fd786f8566514833c7989f90e5ea837abfb8290a3a5d2c1c64cc8c515824be49a142e21b511058d765cb51c3344adc5151fa1346 SHA512 d3451a4b3839bfa7781a7c66c8d3442e813292c04dbf0ce2df16e82d8f96f70835fa3504a2f9cd4e5c641affed35aaace652d95e1f697bed58722b2cca589670
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtopengl/qtopengl-5.14.2.ebuild b/dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild
index a2f5822ec72f..a2f5822ec72f 100644
--- a/dev-qt/qtopengl/qtopengl-5.14.2.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild
diff --git a/dev-qt/qtopengl/qtopengl-5.15.0.ebuild b/dev-qt/qtopengl/qtopengl-5.15.0-r1.ebuild
index a2891c533fb6..3aaab692c82d 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.0.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.0-r1.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 	~dev-qt/qtcore-${PV}:5=
 	~dev-qt/qtgui-${PV}[gles2-only=]
 	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	virtual/opengl
+	!gles2-only? ( virtual/opengl )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 2245c0d3bd2d..29556716e178 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,3 +1,3 @@
 DIST qtquicktimeline-everywhere-src-5.15.0.tar.xz 102460 BLAKE2B f563ba5ab8ec1171e32a85422529a9e4e14833377091f3bd66d3f72b14671acc74db9dd11f3d56719921bb516ead885ce6cf994f8b00ea6a734a0f7b9371c451 SHA512 14e0f52800bf7b347f03264f306f2c13f4c0bf590c8881135b3bfeb1a08cd07248345de7ab7d3ae9af39f75a5247c0c9f98dde33466481995e45a93717a937b0
-EBUILD qtquicktimeline-5.15.0.ebuild 373 BLAKE2B e4a74904400302a2ea41bbe2e7c1bfdb3328680237bffc51ce7baf646466622db9d79ec63074cf8d5346a2d2ac40809fe38065cc4dda22b1581437acd4bb8640 SHA512 aa4cfecbe7c393c19018f224954bd0161de3977fe1b64f99a68c0a935dbf8a99383fc4817ea3e8cb7339b1da96ad643fa4fc30dd778c440508b351f1c2bbd675
+EBUILD qtquicktimeline-5.15.0.ebuild 378 BLAKE2B b009dfefa46775bb4b254b7d78669219e08e527741ed6f0a1f679e43f4344301c630173caa1adf9b67072e58732c3ccb3017ebaeed4c2974e5c4637731e92230 SHA512 96a042c936a7867a7a4d78218b935fa4ab4235269ba883811579fa46d76e43e1b14bb9ccb1ae987a84581593aabc0d5e4403d4e926a0166ddfdc6a6c5229e77d
 MISC metadata.xml 382 BLAKE2B 3b12c68b32cd705b033f8750db3115587b76d52369a33481330d100e3bbd22dbfbcc0ea065f7659e6771af923477f2fbd1d4fc86743d13fc64f194e7b014567b SHA512 4825235a64c6320484a0bfd188dc1f4a0686f6222ee4abd29d6904899eed14f6471358562e8f08cd9b90743a718383e980925a432917dbbe3abba1872c631951
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild
index 109d4654f8ba..1bcc027cbd41 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt module for keyframe-based timeline construction"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 DEPEND="
diff --git a/dev-qt/qtsingleapplication/Manifest b/dev-qt/qtsingleapplication/Manifest
index c479f51d6e86..3ad89602af4e 100644
--- a/dev-qt/qtsingleapplication/Manifest
+++ b/dev-qt/qtsingleapplication/Manifest
@@ -3,5 +3,5 @@ AUX 2.6.1_p20130904-unbundle-qtlockedfile.patch 2547 BLAKE2B e1668e24798405e91a3
 AUX qtsingleapplication.prf 255 BLAKE2B a810e133b1017901bffb26aa1ede3ba64d28044b57c5b49828f55d6bf0e0f3e7c3bced99b69064985a8d1703b996d8eb678da89fb620fd91c2b28b8e5c8dfdea SHA512 005d9f547279ee7df2a4c0ae17ad371a73c9d21a3257740d5ad63c261c8eed64acff7211d009ef787ff9610075d0fbf31fb404803cd0ed2647dc2036ef89fad5
 AUX qtsinglecoreapplication.prf 241 BLAKE2B b356e55f6ba7fb1028e399b6111463bd5f0a02d4cd3c07240c433f7f0bffca587334752fb89e38673c075d47d3cee69a69420ccae6d2fa69454b1cac496edc6d SHA512 938d2eb0c2a3a8dc8ab1c15a175a6bad78b20ad699936b7afbbc54fec10cff6f7ed9ca69b68d81d36495fad439b8550c0d515e4b4a6856362c475f1d9fa7d974
 DIST qt-solutions-20171024.tar.xz 710532 BLAKE2B 365f4c6fc3bee34bf26ac5039984ceac1d90527297b985b0d1b606f3ba67219bab7f7cba40b4adca55446c34e9f4fe218b4449ee255ba6f6409de78f80ccdaec SHA512 4784d88c2f40c88f06abeb728842875fb5e428a630dbf749f71055681b0c631803d2901b60aa8cc95f5f382dcd21da8d739873aa45e3dd3676ee95925f0198da
-EBUILD qtsingleapplication-2.6.1_p20171024.ebuild 1452 BLAKE2B a36a341dc7061347cda64b1b0e60b8237f5b2f6b0061c4968e52f53a1b956ce4947709c1e01f5a45d07ca2890e14bc7c03eb5aeeef90169506b458a06810560f SHA512 77003d17b24b04d8740566939e4185771094aeafb819b71ed618cb73d1e7b07ab65a31a126f7b297c37f01db21b25abb163080c341fbebe8bfc22923235782d3
+EBUILD qtsingleapplication-2.6.1_p20171024.ebuild 1459 BLAKE2B 0671641ca1b02bd5c7c408287f8d8a47f057a5f80545cc636b980950fbcd47ec1352eda5d4a14449324f1a1fbb819098daeaeea9b70c22477c97db6122bd407c SHA512 650d8a0b057406729f7c0628235e4fab3e16eb40e1e326dd2f31e630f4c37914d7289db291e86aacf4183d7730bf5b52d8328ef6de6f40dd750c6dd1a20b1518
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild
index e5d54f55420f..c8d3c9c8e5d8 100644
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="doc X"
 
 DEPEND="
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 4ebc234af9d6..587aa8aa7c17 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,11 +1,12 @@
 AUX qtwebengine-5.14.1-disable-fatal-warnings.patch 463 BLAKE2B 711aea51b588c899bc45131e05cf14b3d78c8d88e75ed2531ee338cb70924f6a195bc541e3d00883951b04cca94100ef2b5c5c2c27d5d5546f8da40450c788c2 SHA512 c3c13b4e98079f566a4ac5ac3272f2643f9d2fe179922a8d4e964d604e15d8c386c7cd8e13aa960bba64a6fdd6f590e9fd34a4e824e2054a3f6ea7f7f9935f86
 AUX qtwebengine-5.14.2-gcc-10.patch 3616 BLAKE2B 079a8ef993b793ddb45a4ff5e3f579f7c4276c122c5c25610a0833e10f870e96282bd5add4e42f4cfa34f023eda04f368b3360ae84342340985b0a605d5ff3f3 SHA512 6c8136c4d6d37a57a1df966f6da18d63599e20e5e78c9fd8b887c689d69306acb33a82f8b7c0f189cda94af7b89318b68f8c647ef78abf0ab8fe83f6c41dae18
 AUX qtwebengine-5.14.2-icu67.patch 7348 BLAKE2B b1e4af1fa83c5168600f32c7a58e968dfcbc40016183a41e7df0340742504d441474a2b3f57a5128d32f1b74a2f02a2ee58d14ce34f731fecd19a1e8fef6e540 SHA512 cbcdf51a00c30717ab6aa5d76656138888dc436f278d352a838ac98338613aa0e915114d7a3a0657e2110faaed04af5334077de0c6bc02cea01016d8c2413de7
+AUX qtwebengine-5.15.0-bison-3.7-build.patch 1996 BLAKE2B e84c0d29023d13f348d452847e634d58679d47ed45c58991b4007829c1a547b36f9c19b8e188a83a9b2e9bb4fec3a1e8a3b4139ac0300a21a1fb52ce0f024fc1 SHA512 b4d1cfb77ba7a04a7df325468f52d3267891a1edd93ed5b2e8bcc3ef931b198a0ea3bba88d80bf2d235636650dc88f32bfdadcb9c62fbbde245636c9b1c02bef
 AUX qtwebengine-5.15.0-disable-fatal-warnings.patch 414 BLAKE2B 531523ee8c85d6ac51637b3bfd4fbcd56476e1231103c0db62b7c27ace4d5e070becb97beb74526806101c138669adc81a00eefe319ff96582df4743ecabcef8 SHA512 4e3ae727f2738bcc011c9fdd27593d9689206573ff7f17a51fd78d3aa25d427b899af78c098c278f6e7ab4ce88bf415e7382a8a635dd880448a75e6756abc680
 AUX qtwebengine-5.15.0-gcc-10.patch 910 BLAKE2B 9cbcb19a0c17fa05cf1ac88e4cb1b80c1049f962844ef79b1d9fa8ef565d9c023cc2de2a7df58814fa060b0c3b037a036baea80406ba4ed7a3763da8587b471b SHA512 d42e08100334aa7b1d19f3d8a5770d5fc1c2c1cf9dcfe68c0e719758013c446575e643f3bad7a924591b72a8425965da2d4f7eba4b9726868c64281fcc45994a
 DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
 DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
 DIST qtwebengine-everywhere-src-5.15.0.tar.xz 278257432 BLAKE2B 832b15a0a542297f47ecaa057f29e24eb99dd142b314aa15243d864b715c74ec9dfc2ba23aa9be417581151d684d08dfcba173ea2d9311e19ca7af3d941f590b SHA512 11983470f0da9abfffba072406b2c67b475d8cf65412fdcfd925758e2a9449f509780e5b1001fb6868445c2c9540e5aa0e754954b70f1795b47335bad7c749b2
 EBUILD qtwebengine-5.14.2.ebuild 4498 BLAKE2B 73e51c2c4f4f9df2ad875de15898e4b8bcd0540a77e81b01988799eae88b130cea8fa8dbdf29d9e337a0ba2493bf4bfc50f6e0d9607f2efafdc1159688b3975f SHA512 fba03353839de8ba680bb1c78c4a9a772d1b6c2454cef505cb16f65c60a92cefe5cf3c2b821e5f927416448d94038dcf220c763031aa2dc6235a9617ed279b9b
-EBUILD qtwebengine-5.15.0.ebuild 4744 BLAKE2B 5cac2753b32824024e43787d093d51bbb7648e1552deb182fdff83b7f8d89bdd101f77fbe0721482874f71456c016f63d34a633a03be7b6e851084b11830bd0c SHA512 01357ac86af5299bb76e1961c9fae117e2003c79f7eb6916f0abd65eceb95dd40acf7fe57a575437b3af3c497050a83cdb0bb1dee9d6d8c79e8beef83dad039c
+EBUILD qtwebengine-5.15.0.ebuild 4799 BLAKE2B 485e73ad91b5ec76f5aba0e7413e24267999b218e5af93c377c3e4f5d53a672b27145574c8b89769a21ddb25685218367c224605e3cad109127688691b69703d SHA512 d7decad9a030d459625df743decf28cb7d0e4f9a90cd80b0d9027ee80cc8bcb7db9375040b87a020ff0cce92ef2479699df56476d20b05ad7bb172f031d53c86
 MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch
new file mode 100644
index 000000000000..da7a997fe965
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch
@@ -0,0 +1,54 @@
+From 1a53f5995697f5ac6fd501dbdc0ee39c9488ee66 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Fri, 14 Aug 2020 16:38:48 +0200
+Subject: Fix bison 3.7
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Do a replace run inspired by newer versions of the script.
+
+Fixes: QTBUG-86018
+Change-Id: Ib1dc771e22a662aff0fae842d135ad58fad08bc1
+Reviewed-by: Michael Brüning <michael.bruning@qt.io>
+---
+ .../blink/renderer/build/scripts/rule_bison.py        | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
+index f75e25fd23f..7e0767e951a 100755
+--- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
++++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
+@@ -45,6 +45,19 @@ from utilities import abs
+ 
+ from blinkbuild.name_style_converter import NameStyleConverter
+ 
++def modify_file(path, prefix_lines, suffix_lines, replace_list=[]):
++    prefix_lines = map(lambda s: s + '\n', prefix_lines)
++    suffix_lines = map(lambda s: s + '\n', suffix_lines)
++    with open(path, 'r') as f:
++        old_lines = f.readlines()
++    for i in range(len(old_lines)):
++        for src, dest in replace_list:
++            old_lines[i] = old_lines[i].replace(src, dest)
++    new_lines = prefix_lines + old_lines + suffix_lines
++    with open(path, 'w') as f:
++        f.writelines(new_lines)
++
++
+ assert len(sys.argv) == 4 or len(sys.argv) == 5
+ 
+ inputFile = abs(sys.argv[1])
+@@ -115,3 +128,9 @@ print >>outputHFile, '#define %s' % headerGuard
+ print >>outputHFile, outputHContents
+ print >>outputHFile, '#endif  // %s' % headerGuard
+ outputHFile.close()
++
++common_replace_list = [(inputRoot + '.hh',
++                        inputRoot + '.h')]
++modify_file(
++    outputCpp, [], [],
++    replace_list=common_replace_list)
+-- 
+cgit v1.2.1
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
index eb31e0dc68f7..6aa9345fffd0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
@@ -85,6 +85,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-disable-fatal-warnings.patch" # bug 695446
 	"${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054
 	"${FILESDIR}/${P}-gcc-10.patch" # bug 721876
+	"${FILESDIR}/${P}-bison-3.7-build.patch" # bug 734356
 )
 
 src_prepare() {
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index f1b983f4a541..d7e6769db468 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,3 +1,4 @@
+AUX qtwebkit-5.212.0_pre20200309-bison-3.7.patch 1613 BLAKE2B 0d2d173b5575ed5e1c52a07c5ceb14210bfb0a91e50a064df1e293451d64708822eb54d65947413efb13711d4c0c8e01441869248a4461446bd2bc122f07746b SHA512 cf21eff51e1026f4e506724a512b9925d4619909f5924bf01055244817ec9594e9d3ce105b510cd28ecce4772d122d1393fb7273501e20e16749f43282a3200b
 DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
-EBUILD qtwebkit-5.212.0_pre20200309-r1.ebuild 3878 BLAKE2B 10afa1ed2e8d40814c9a456537b7fc9f9143332a3549a88a059d81a523f98f288cbed30573e9f1c8a6bbc7b670cb24d378404d23c612dd1677390aa689bf97e9 SHA512 4e7e2bf93491360f325ea6c7e4a370592d1b73d46b87f21ff005b1ed0a0ebe64f389e1ae47ed2d471bb6b5dc324a7f1eed6f2042312487931616e01abeec2956
+EBUILD qtwebkit-5.212.0_pre20200309-r1.ebuild 3934 BLAKE2B b94f1d729667fa6e2abd67951b09dcfb856c38f6e28cfafdeeacac4bc1970db4521ada4c42557ceb1b69815e9491ef8177fae9f4919381acff498a3b22b7428d SHA512 231f042c6f2b258bc908e117f395e02477dfc1f45587e055c26538a31df74a198e61f37cbec0d5eb356b724d75c0a1b9352b3b91a4c0f53314fd9984f771b296
 MISC metadata.xml 1152 BLAKE2B 6291c4643d29dd68af56e6054c4db1ebb307fdf2097012182dc77a2754e51bca84c1f53ae7c9f6305ead35cc47334a9e0ca605871aac899ce06482d983c8406f SHA512 28146a11931ab5b106d7bfa08dd3cb38ed3ae1fec003ca27f3f3234887bc9d65a82c76e5ab50334e94de02c3b6455a228acec2574c551e218e53e2005becc6c6
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
new file mode 100644
index 000000000000..de3bbcfc3ef1
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
@@ -0,0 +1,46 @@
+From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Tue, 4 Aug 2020 21:04:06 +0300
+Subject: [PATCH] Let Bison generate the header directly, to fix build with
+ Bison 3.7
+
+Starting with Bison 3.7, the generated C++ file #include's the header
+by default, instead of duplicating it. So we should not delete it.
+
+Remove the code to add #ifdef guards to the header, since Bison adds
+them itself since version 2.6.3.
+---
+ Source/WebCore/css/makegrammar.pl | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl
+index 5d63b08102eb..9435701c7061 100644
+--- a/Source/WebCore/css/makegrammar.pl
++++ b/Source/WebCore/css/makegrammar.pl
+@@ -73,25 +73,6 @@
+ }
+ 
+ my $fileBase = File::Spec->join($outputDir, $filename);
+-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
+ push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
+ system(@bisonCommand) == 0 or die;
+-
+-open HEADER, ">$fileBase.h" or die;
+-print HEADER << "EOF";
+-#ifndef CSSGRAMMAR_H
+-#define CSSGRAMMAR_H
+-EOF
+-
+-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
+-while (<HPP>) {
+-    print HEADER;
+-}
+-close HPP;
+-
+-print HEADER "#endif\n";
+-close HEADER;
+-
+-unlink("$fileBase.cpp.h");
+-unlink("$fileBase.hpp");
+-
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
index 8147c1457869..f7f37face2cb 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot
 	SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 PYTHON_COMPAT=( python3_{6,7,8} )
@@ -83,6 +83,8 @@ RDEPEND="${DEPEND}"
 
 CHECKREQS_DISK_BUILD="16G" # bug 417307
 
+PATCHES=( "${FILESDIR}/${P}-bison-3.7.patch" ) # bug 736499
+
 _check_reqs() {
 	if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then
 		einfo "Checking for sufficient disk space to build ${PN} with debugging flags"