gentoo resync : 15.12.2019

30 files changed, 558 insertions, 549 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 512665a04e92..e410d6bed302 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 25f913e5d74b..57853705a379 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,8 +1,6 @@
-DIST qt-creator-opensource-src-4.10.0-rc1.tar.xz 26226544 BLAKE2B 5fc66e73d93b2d358c4f3c23e80029b805b1aa841b71fc35077b089bf51d705b6f7f352bd36f2dd573aef0a95efea3573e08af8eea31aeb0f43d33172935cdc1 SHA512 e5f7fb5b67fd803fbcb2a96b26d96e53e5d43fd3733c4867ce9e2f4764220d1772fa788424d917acdc0c78c580ce8ee774e561c6bf5fd54feac320073d5fb263
 DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
-EBUILD qt-creator-4.10.0_rc1.ebuild 6215 BLAKE2B 8c4740e935281c4f5c8570aab1ccd03be021aabf099abf028f032d23ef0e47273b1d65611e340e1816234f7c353a1c15d9cd0e933e488fab5967a343db3816ba SHA512 0245d9d3d243c01cbf2862381e51f03f66f73cd8ba01dd25714eee44a6bff929c8f8b3f77b151b554e9e94e32e3c3258fc6c41768cb331b12d532e4bf0e46490
-EBUILD qt-creator-4.10.1.ebuild 6234 BLAKE2B 7cb7f5acaaea1a3e589a1738de3f9d8249d623b155a130632a240d69937bd40a6ea2bf77df2fa98c1505e97075e70795e04c7418ccb4d34766308ced3e2ffcfc SHA512 bcf2a7addf603c4bcf4a1226caa24189913d1943ff6562203531aa3ceb3660aff7ffe6a6f090fac3e7dfe16b01a459691862b1ecc44f5cc9c6496ddb42c7dcec
-EBUILD qt-creator-4.8.2.ebuild 5831 BLAKE2B debd630939536f622d1e1ce7ab5013248fa1010656c11f936827497b4d748b156f7b7774ced95fb0d6e8a9e23731aa5e6ee793621e62fd9fd7b57d553ae4d4bf SHA512 e94f48f731f960c58924d31e92727f982bb0fd0b14b8d6ce1c675b551c1d280dc7b66c08ebe2954c0409eed2ce6c645fecbf3071acab15c52c640cea1f62caf1
-EBUILD qt-creator-9999.ebuild 6363 BLAKE2B 88f27a5c039b64c2aa6f28f6b9742876444b66ad54af5a4b75bd8b0962432166c6f9b6aaeacbebc40bf8083f03db6860c31ddf560b13b88f1a1e1e71b626c894 SHA512 9fcef5b8e9a1d5443bda81fac98dc3353026aafd9884b7364935935dd43705e11270ddb0504f10112624cf8e697959204d1d073a528f7920d990d86508b314af
+EBUILD qt-creator-4.10.1.ebuild 6261 BLAKE2B 2348236a6af3e4983ca68a854a61cd778037a1257a6e5c12098a8d60606b8dd242ece67e2414d3bcf18991645bc3d38c34fac65ceb72bfac14a71c7c1ae957ae SHA512 0203dd62a125f0200d86bf895bfd278eb5ad63de350fedfe47645e63bd132cb5bfe4b13a4de8cf0369259cf40ffeb0ac25dff26787a31c1f0eb79adede36ea94
+EBUILD qt-creator-4.8.2.ebuild 5858 BLAKE2B b8f8e59e01ee6b26527ee14f5da3afb5ee2965e019f93611a64d79f7799657fd25c2f5305392480f57fb1d5ab1a5e987edfb92ebdcfe25953e2ff8a681a88cf3 SHA512 046d6ba685fe9df233ef80b72cdfb6954f783df977ee2490d840a43bc69d624801f12cf305499794143b77d3f4c412f462e96c2e58996b85fb5ce46e7777a0b8
+EBUILD qt-creator-9999.ebuild 6390 BLAKE2B a75551b888633de3d5bc10ff390bbed66453fa7b64c780b1a6f121e678a09ee29b53d4a8a75c33694fdd76148721e1aa08b953d8e717ae0698129aaec3b28de1 SHA512 c9fc26c7aa7169be6819b3122b13ca7b4ac2ba9353b1579a17ee314f686482ee15c690716de785a01b4d4279b566c788aff7c1228fa526fb887ad942a9251786
 MISC metadata.xml 3388 BLAKE2B 1f27704c6c58e04867e85e8142a96d449f2a65e5b8dc883120ac7502719f97823468c680dcfcb14831e780b5390ec55a40ecc0b487cbfc03c25bd9b139fe671b SHA512 883644b034ef0a7ade3c0fac6e09f835922192b38c462f3a73f60b08e8c36902ec369f07fee2482c247ddb4d85454e90aeb2c21642cc9309ae525fd349691e27
diff --git a/dev-qt/qt-creator/qt-creator-4.10.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-4.10.0_rc1.ebuild
deleted file mode 100644
index 87ff878b2085..000000000000
--- a/dev-qt/qt-creator/qt-creator-4.10.0_rc1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 bazaar 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[@]%:*}"
-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]
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake[server(+)] )
-	cppcheck? ( dev-util/cppcheck )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	silversearcher? ( sys-apps/the_silver_searcher )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-# 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)") \
-		$(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.10.1.ebuild b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
index f161df651cd0..6d9284c5fdef 100644
--- a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
@@ -33,6 +33,7 @@ QTC_PLUGINS=(android +autotest baremetal bazaar beautifier
 	+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 )
diff --git a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
index 612329ed88df..b499cf233a8f 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
@@ -31,6 +31,7 @@ QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectman
 	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
 	silversearcher subversion valgrind winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
 
 # minimum Qt version required
 QT_PV="5.9.0:5"
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 841fd7e86eed..e24f4ae254c0 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -33,6 +33,7 @@ QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
 	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
 	silversearcher subversion valgrind webassembly winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index 92796e309930..ca725ec18c5d 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1,3 +1,3 @@
 DIST qtchooser-66.tar.xz 32008 BLAKE2B 1faf4a44406655621e65132289af6a8b0d23f0c1027a3b99017c3951705378bebcfbc3cb32aa59975a101f21294ff701ca6eb6ec18ce977b714a426be0fbcd6d SHA512 0c7d3588ddd7b21e6e9d799204924e06e0b0950c898dfd23088f1e7657b7f821a35579aa062658499809f9d9757e82c3c592591aa2e5ec453463929bf2b33bac
-EBUILD qtchooser-66.ebuild 943 BLAKE2B 1b7c33da439f25f5b8f59ee1fb68a095a821153e23e425a3d7ae1933419826791d287cb68f12d0c337a7862370d4faef45ea4f3441f190340a61f8348969c441 SHA512 63c5e29b088cf1d021159f1528b2883ac1b38730050614bccd6177b6e6d1b81b1a38cce1eb8ab75ae8ac9c14613a0138e0e809f56ff13eab7517eb12b1c6b30d
+EBUILD qtchooser-66.ebuild 970 BLAKE2B 6ffd6483802fc87c3f4f6064084d6a9675c8745c2c9a95ff8df7d72b168325b179cdc260b5e77e7093939d08bc32a863d428f9c83a88b3cef0ac8dd3215aa982 SHA512 9cd7f87d8335e4c9b848e3f547ba67eba59459401587ac8cf6fdaec4a87587bc0c60f79cba4cf72071a4f4636fe281d2dc43f26c42c79ad6787a7f88f40d67b6
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtchooser/qtchooser-66.ebuild b/dev-qt/qtchooser/qtchooser-66.ebuild
index 3a0c4feafebf..e3eaad8af8b5 100644
--- a/dev-qt/qtchooser/qtchooser-66.ebuild
+++ b/dev-qt/qtchooser/qtchooser-66.ebuild
@@ -13,6 +13,7 @@ LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 		dev-qt/qtcore:5
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 23d106a585e7..0213aa9fbc3f 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,8 +1,11 @@
+AUX qtdeclarative-5.13.2-fix-deadlock-on-exit.patch 4042 BLAKE2B 9ad28ad2e9157d63e18da3c807db8f6c7909a87e82d4798ac7c5ada592a0527f44223cb94f6cf527f7fb34e3e2f3bd6fcf250a44b420500a4d3b4bf7d5ece586 SHA512 6a0d8f3b3d9cc53c23d8ca5942b266d95d1d94a1045d7125c97e23724522913d94bf8b8430d501a2a1f8d39a50f74cf673a63ce5437caa582cfe12e7b525ad9b
+AUX qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch 3348 BLAKE2B 54a263b72e7010271b5ce2fd8ed687ce19270cdf27029ea515a34795b036cae8f582e6f7b1ffcb815be660ac81f1b53b93918c3bda098f614cbc3b51ea80bb60 SHA512 e71ddab29cf35fa4cb1334147b1c5b6771860e68fd1e2e4958fb6cfb1489c567b0d209dfa1ba5e56119e5a61ee2039e8f3af75bd410ab187c2d61ac74a8c0b35
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qtdeclarative-everywhere-src-5.12.3.tar.xz 20513544 BLAKE2B b6c622cb4728d54d0cf382a5a50af4652755ebd1f8e7ebc8bf07a5f3e3355931703ffa443be11dcf36a132b2f3eacb5fce150088209d173f2ca84bc387096026 SHA512 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20
 DIST qtdeclarative-everywhere-src-5.12.5.tar.xz 20512492 BLAKE2B 3e8175217bb9e654db8c57cee55080ea630452fe8c225db5350da00b5fb6c9cb6269b075939eab411cd750a1a431a423522c1bb536b2a1f708bd497d90817301 SHA512 026c5024c06e44b6e91099d1ee912f38017f314ae0125227010d25d733447c692299cc7c47edc1a4bf39366a9c9c9fe77d3a249905f2ae982d0725317d824b9b
 DIST qtdeclarative-everywhere-src-5.13.2.tar.xz 20940748 BLAKE2B acc688691a86318478a3f016821bf6e84ba3a552e4f8613414a51ecde8e588783ed80e53eed31bbc321945950754991d20a29290e9cf3b878c5415d1049be3cc SHA512 a3fcc65eccdd598c03991978db6462293781abc80affd9a489253d4a812073832554892d503fa0de32a9ef97ddc74b9ad71e2bd7cfa2f21ce1fc64d1358ab730
 EBUILD qtdeclarative-5.12.3.ebuild 1186 BLAKE2B 45edac1996283de69288f708561a8782b15b069ca0a6da45fb7976676ddea6db56036168c749aa6912213800f302a14834c099f15407f8d2985d6ad8405c9f05 SHA512 4467dd52f853509bf37ae78cc06bd58e3d7577ba00882fe1942fe3e04d77df9dca722c4cfda219f56f73855588c7ba936407e2aebfd67d13c55cdadcadab587c
 EBUILD qtdeclarative-5.12.5.ebuild 1157 BLAKE2B 9ed30b4e7f4379f2ce58c3bccfdc48385ca15d7c2f11955c4c05400fda8c977c29c4e4a3df2df52c924da291f754421468d8b32de54854f094b93b394e15477a SHA512 a9c2e60bec5e98b7c44346fe32ec905656be41a2716edf8537641c0872165113bfd467edbdc72583e86101cf15b1f8e4b65b4c7cc335ef16c026a472de76cedf
+EBUILD qtdeclarative-5.13.2-r1.ebuild 1303 BLAKE2B 084232652fe6b7868e25a7b1ea5a012c195b5ead78bfa395928b9f95eccd66deeff398f023dd31330bccf8eb75f5ab708abea6666e9bb6fb67ea7327fd6dd1ee SHA512 81d8e782b8f316c0dad168ead41d10b7c2128115e47214fd7a521e94ea5e4d094c819448a959e79fc1513a5a091326d7d2957c222a9e42e554a77b2e450eaf18
 EBUILD qtdeclarative-5.13.2.ebuild 1158 BLAKE2B b7fb48cd79982f41facd25f62f2a7a8226f60c5bd9a701ca399d2c030482ba1437047c2012b9e2a47b4c3887871a1cffdf5730861de516a22ece17c1c46df513 SHA512 58218bbabdbba272f55bf2feec68d9100ede9697b7c86a27aae78ac4079956e3f58c23f061f8727121630a861308fe72c263c2cb37a0d428973c858fbbe3251c
 MISC metadata.xml 718 BLAKE2B 8726e8349c867c54347bb2fae219fb858a2f31058d7fa83fb7aa5691b3dbff327a9b2ef4cdbfdfc087fe30847d037f55ed92a2797ad961764676c10d348148a5 SHA512 827be20878184958800c2b31b4fcff95e67bfff208d4669c4b0b1f190bbc8ebeb46795e62c06f46dd8ef54c072e82fe9f1b32bef14072e81c8f1dc7428e386c3
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-fix-deadlock-on-exit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-fix-deadlock-on-exit.patch
new file mode 100644
index 000000000000..09c4ad831c54
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-fix-deadlock-on-exit.patch
@@ -0,0 +1,112 @@
+From 73ad6e87bbeceea5830ab3a6b3dc66fa99e30f45 Mon Sep 17 00:00:00 2001
+From: Fabian Kosmale <fabian.kosmale@qt.io>
+Date: Mon, 28 Oct 2019 13:41:11 +0100
+Subject: [PATCH] QQuickItem::setParentItem: add child earlier
+
+Calling (de)refWindow can trigger QQuickItem::windowChanged, which in turn
+can call a user defined windowChanged handler. If that signal handler
+were to call setParentItem, we would encounter an inconsistent state:
+The item already has its parent set, but that parent would lack the item
+in its children list (as we would only call refWindow at a later point).
+
+Fixes: QTBUG-79573
+Fixes: QTBUG-73439
+Change-Id: I46adaa54a0521b5cd7f37810b3dd1a206e6a09c6
+Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
+---
+ src/quick/items/qquickitem.cpp                      | 21 +++++++++++++++++----
+ .../qquickitem/data/setParentInWindowChange.qml     | 12 ++++++++++++
+ tests/auto/quick/qquickitem/tst_qquickitem.cpp      |  8 ++++++++
+ 3 files changed, 37 insertions(+), 4 deletions(-)
+ create mode 100644 tests/auto/quick/qquickitem/data/setParentInWindowChange.qml
+
+diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
+index 396012e1e67..26f02aeed7f 100644
+--- a/src/quick/items/qquickitem.cpp
++++ b/src/quick/items/qquickitem.cpp
+@@ -2748,22 +2748,35 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
+     }
+ 
+     QQuickWindow *parentWindow = parentItem ? QQuickItemPrivate::get(parentItem)->window : nullptr;
++    bool alreadyAddedChild = false;
+     if (d->window == parentWindow) {
+         // Avoid freeing and reallocating resources if the window stays the same.
+         d->parentItem = parentItem;
+     } else {
+-        if (d->window)
+-            d->derefWindow();
++        auto oldParentItem = d->parentItem;
+         d->parentItem = parentItem;
++        if (d->parentItem) {
++            QQuickItemPrivate::get(d->parentItem)->addChild(this);
++            alreadyAddedChild = true;
++        }
++        if (d->window) {
++            d->derefWindow();
++            // as we potentially changed d->parentWindow above
++            // the check in derefWindow could not work
++            // thus, we redo it here with the old parent
++            if (!oldParentItem) {
++                QQuickWindowPrivate::get(d->window)->parentlessItems.remove(this);
++            }
++        }
+         if (parentWindow)
+             d->refWindow(parentWindow);
+     }
+ 
+     d->dirty(QQuickItemPrivate::ParentChanged);
+ 
+-    if (d->parentItem)
++    if (d->parentItem && !alreadyAddedChild)
+         QQuickItemPrivate::get(d->parentItem)->addChild(this);
+-    else if (d->window)
++    else if (d->window && !alreadyAddedChild)
+         QQuickWindowPrivate::get(d->window)->parentlessItems.insert(this);
+ 
+     d->setEffectiveVisibleRecur(d->calcEffectiveVisible());
+diff --git a/tests/auto/quick/qquickitem/data/setParentInWindowChange.qml b/tests/auto/quick/qquickitem/data/setParentInWindowChange.qml
+new file mode 100644
+index 00000000000..d68b7adb72a
+--- /dev/null
++++ b/tests/auto/quick/qquickitem/data/setParentInWindowChange.qml
+@@ -0,0 +1,12 @@
++import QtQuick 2.12
++
++Rectangle {
++    width: 800
++    height: 600
++    Item {
++        id: it
++        onWindowChanged: () => it.parent = newParent
++    }
++
++    Item { id: newParent }
++}
+diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+index 7e132f97b67..9ce9766c925 100644
+--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
++++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+@@ -197,6 +197,8 @@ private slots:
+     void qtBug60123();
+ #endif
+ 
++    void setParentCalledInOnWindowChanged();
++
+ private:
+ 
+     enum PaintOrderOp {
+@@ -2145,6 +2147,12 @@ void tst_qquickitem::qtBug60123()
+     activateWindowAndTestPress(&window);
+ }
+ #endif
++void tst_qquickitem::setParentCalledInOnWindowChanged()
++{
++    QQuickView view;
++    view.setSource(testFileUrl("setParentInWindowChange.qml"));
++    QVERIFY(ensureFocus(&view)); // should not crash
++}
+ 
+ QTEST_MAIN(tst_qquickitem)
+ 
+-- 
+2.16.3
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch
new file mode 100644
index 000000000000..63f4235c9e7c
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch
@@ -0,0 +1,92 @@
+From bcbc3c9cec1f7d7bb8c9d5f5ea94eb5c81ec2853 Mon Sep 17 00:00:00 2001
+From: Fabian Kosmale <fabian.kosmale@qt.io>
+Date: Wed, 30 Oct 2019 10:15:23 +0100
+Subject: [PATCH] QQmlProperty: handle reads of QQmlPropertyMap correctly
+
+Fixes: QTBUG-79614
+Change-Id: Iaf84c0178dc88072a367da2b42b09554b85c7d57
+Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
+---
+ src/qml/qml/qqmlproperty.cpp                     | 12 +++++++++---
+ tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp | 21 +++++++++++++++++++++
+ 2 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
+index c8166695bad..a394ed1ad9a 100644
+--- a/src/qml/qml/qqmlproperty.cpp
++++ b/src/qml/qml/qqmlproperty.cpp
+@@ -63,6 +63,7 @@
+ #include <private/qqmlvaluetypewrapper_p.h>
+ #include <QtCore/qdebug.h>
+ #include <cmath>
++#include <QtQml/QQmlPropertyMap>
+ 
+ Q_DECLARE_METATYPE(QList<int>)
+ Q_DECLARE_METATYPE(QList<qreal>)
+@@ -331,10 +332,15 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name)
+ 
+                 return;
+             } else {
+-                if (!property->isQObject())
+-                    return; // Not an object property
++                if (!property->isQObject()) {
++                    if (auto asPropertyMap = qobject_cast<QQmlPropertyMap*>(currentObject))
++                        currentObject = asPropertyMap->value(path.at(ii).toString()).value<QObject*>();
++                    else
++                        return; // Not an object property, and not a property map
++                } else {
++                    property->readProperty(currentObject, &currentObject);
++                }
+ 
+-                property->readProperty(currentObject, &currentObject);
+                 if (!currentObject) return; // No value
+ 
+             }
+diff --git a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
+index 27e06c6f674..ed213cd01aa 100644
+--- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
++++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
+@@ -37,6 +37,7 @@
+ #include <QtCore/qdir.h>
+ #include <QtCore/private/qobject_p.h>
+ #include "../../shared/util.h"
++#include <QtQml/QQmlPropertyMap>
+ 
+ #include <QDebug>
+ class MyQmlObject : public QObject
+@@ -149,6 +150,8 @@ private slots:
+     void floatToStringPrecision();
+ 
+     void copy();
++
++    void nestedQQmlPropertyMap();
+ private:
+     QQmlEngine engine;
+ };
+@@ -2106,6 +2109,24 @@ void tst_qqmlproperty::initTestCase()
+     qmlRegisterType<MyContainer>("Test",1,0,"MyContainer");
+ }
+ 
++void tst_qqmlproperty::nestedQQmlPropertyMap()
++{
++    QQmlPropertyMap mainPropertyMap;
++    QQmlPropertyMap nestedPropertyMap;
++    QQmlPropertyMap deeplyNestedPropertyMap;
++
++    mainPropertyMap.insert("nesting1", QVariant::fromValue(&nestedPropertyMap));
++    nestedPropertyMap.insert("value", 42);
++    nestedPropertyMap.insert("nesting2", QVariant::fromValue(&deeplyNestedPropertyMap));
++    deeplyNestedPropertyMap.insert("value", "success");
++
++    QQmlProperty value{&mainPropertyMap, "nesting1.value"};
++    QCOMPARE(value.read().toInt(), 42);
++
++    QQmlProperty success{&mainPropertyMap, "nesting1.nesting2.value"};
++    QCOMPARE(success.read().toString(), QLatin1String("success"));
++}
++
+ QTEST_MAIN(tst_qqmlproperty)
+ 
+ #include "tst_qqmlproperty.moc"
+-- 
+2.16.3
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild
new file mode 100644
index 000000000000..24def17bec0d
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2009-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="gles2 +jit localstorage +widgets"
+
+BDEPEND="${PYTHON_DEPS}"
+# qtgui[gles2=] is needed because of bug 504322
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qttest-${PV}
+	localstorage? ( ~dev-qt/qtsql-${PV} )
+	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}
+	!<dev-qt/qtquickcontrols-5.7:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-read-QQmlPropertyMap-correctly.patch" # QTBUG-79614
+	"${FILESDIR}/${P}-fix-deadlock-on-exit.patch" # QTBUG-79573
+)
+
+src_prepare() {
+	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
+
+	qt_use_disable_mod localstorage sql \
+		src/imports/imports.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
+		tools/tools.pro \
+		tools/qmlscene/qmlscene.pro \
+		tools/qml/qml.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		-qml-debug
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 85752eed5492..237c9d63dfb9 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,8 +1,9 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
+AUX qtgui-5.13.2-no-xcb-no-xkbcommon.patch 1327 BLAKE2B d51ed6761d300aec44fc9f1ac86c6f26649fd28f9dfafa0aeb8de4d5b8bb64c46697cfa2089f2a97a22e5cad311c7b372aac12be16c83b3932f2686a240d25c9 SHA512 71433f589554e2fef82d73cf112d7b5d2e2454ec5e3560878d0af05e6721ce4919623175c9355be7c54568da26c68e8c9dfe6cc956465e005b01e3ab974cb310
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 EBUILD qtgui-5.12.3-r1.ebuild 3707 BLAKE2B b73f820eded407365f5cb7d3a0938dd938a8e5e0573ec7051bb8375424accb8c1d84d50e4673f7504ed76d53d9bc57f9b1ceb64da3f0e883a729d06ad082b9ac SHA512 8afedb468ff74a47d1974858a2d6e67a5a158bd1540195a7211f3109c48c7ce62a293eeb47215eddca0c4126c0729ae5282fb0b9ebd3482fc2262bc9521f2877
 EBUILD qtgui-5.12.5.ebuild 3792 BLAKE2B 865e36e7dc7c5686bdcea6005063b83d8489291e5541b93d53b2ce8b66f2120f5c6e7c9b773c6edfbdcf7759bf11071252ee0a889eae7eae05f88a6a3f971c85 SHA512 279f7cbd934cea6fa8e6230a6407eb264212178c43617536f720074e02cf2a55aeab533544e2649ae067147074a28775707efba8e268a0f6bb0ff6a13b02e719
-EBUILD qtgui-5.13.2.ebuild 3795 BLAKE2B 6384f89a915a5dae2afb3587c6372af21775a00aa1f6a7dec081a38b0fc23792877eebea19642c3d1fe1f113f1a3adfa0fed80e0c870faf7f007be29f11ef549 SHA512 89c72d955fcabcb2d67efb68f888b1e97f021ce1d708caf67c1b8e41914fdf73ca6317d4f8e4eb81b1b1cba4d1f868e613a8338d729c6dad704e1e8c6832e5a5
+EBUILD qtgui-5.13.2.ebuild 3855 BLAKE2B 3d4c7f7b6b44afa0f3b13c852b046630a877517753973152278a9bc64613b61cb8e02064b37acb1334fe0a12509620fb9b6ccce3e9aa833181204184520e8218 SHA512 df81acdcf28d993155482dc0e1abc6ff958d7a8e50417c3770152b5511e385f1928ebee25580bc14378eee873e89b1afc96227cfa9b70a4356af609b80b22127
 MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a
diff --git a/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch b/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch
new file mode 100644
index 000000000000..6f63a6371ad7
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch
@@ -0,0 +1,34 @@
+From 2749833d844b20a9e642b2df2074dfafde8622d3 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Wed, 6 Nov 2019 00:54:57 +0200
+Subject: [PATCH] Fix build with -xcb and -no-libinput
+
+Since a34e81ab [1], 'xkbcommon_support' is under
+'src/platformsupport/input', and will not be defined when building
+with -no-libinput, and as such, 'xkbcommon_support-private' added in
+'src/plugins/platforms/xcb/xcb_qpa_lib.pro' will be unknown.
+
+1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=a34e81ab
+
+Change-Id: I79563b329623651b462b8fedcfb59ef5f2c2e52a
+Gentoo-bug: https://bugs.gentoo.org/699110
+Suggested-by: Petr Zima <zima@matfyz.cz>
+---
+ src/platformsupport/platformsupport.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
+index 6d4f1b93bd1..877665ff06b 100644
+--- a/src/platformsupport/platformsupport.pro
++++ b/src/platformsupport/platformsupport.pro
+@@ -11,7 +11,7 @@ SUBDIRS = \
+ qtConfig(freetype)|darwin|win32: \
+     SUBDIRS += fontdatabases
+ 
+-qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid) {
++qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConfig(xkbcommon) {
+     SUBDIRS += input
+     input.depends += devicediscovery
+ }
+-- 
+2.16.3
diff --git a/dev-qt/qtgui/qtgui-5.13.2.ebuild b/dev-qt/qtgui/qtgui-5.13.2.ebuild
index 6bec13c736d1..20a5adb6d94f 100644
--- a/dev-qt/qtgui/qtgui-5.13.2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.13.2.ebuild
@@ -124,7 +124,10 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 	:gui
 )
 
-PATCHES+=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946
+PATCHES+=(
+	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
+	"${FILESDIR}/${P}-no-xcb-no-xkbcommon.patch" # bug 699110
+)
 
 src_prepare() {
 	# don't add -O3 to CXXFLAGS, bug 549140
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 278a7d824ffb..f43f675bc477 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,7 +1,9 @@
+AUX qtmultimedia-5.13.2-gstreamer-crash.patch 1395 BLAKE2B d53993a824ee9bcf43d23c2d0a5755ede01d232bd71a0f578cb242147de3b3835e0670ad982c4e3ff3109d53c452517770948b6ca11f3656180d1659aeb2b831 SHA512 5cc9b7986648420bcbce372286f93637e772ea55d25d953569b61eae18e6e678f2c1a0fca00e96528cbe00543872151a3e07abc02850b96df6ad297284317958
 DIST qtmultimedia-everywhere-src-5.12.3.tar.xz 3742244 BLAKE2B 65cc184c2625c998ec0f12d5d2f72401693521c9b5e1f27db342279724789e88e0bd6c6cb741ccf28939e8edbb657dde391ceb24ab0cb97c786c114e7e95743d SHA512 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963
 DIST qtmultimedia-everywhere-src-5.12.5.tar.xz 3744764 BLAKE2B 47e7c09ddc4961ea2c479835732cc31139a4ecb577571a9b804a946909292439ef6bd85d5f8afdae0caacf3491391a8b45b2bfdd113dd18902fa097a0dc36253 SHA512 a59983d887c8de462399fd53beb640c1b865c17f8b1a83635c2e1d27903861dd588eb64935d7c02d733c51c9a21174065e70a5fc1aa78600e5540c489b7695a3
 DIST qtmultimedia-everywhere-src-5.13.2.tar.xz 3820660 BLAKE2B 19949b1256ceeec38a10210a7430082ed197c1f19d37048170fa55a56554e741e3af670733e25fbccf11426d08075f1ac40589a2106169fa0ae9838c8b7725ab SHA512 a18a2dc56ad33068efb78e5fb61df3c45d0102d153a02122ce39917df41acb161469092d0299df228fa7afde53260e9b7acf82ae016b99618c94d2caf02efa51
 EBUILD qtmultimedia-5.12.3.ebuild 1442 BLAKE2B 9119b837e2b5d05315de59bcff3f050641fbfce0e9c5fa98c83d063b0ff1182a40d109f406efb5585bb21e8a1aa7c882489f754d79ac40da95ebe8848f5936b6 SHA512 e7791558ba9bda82a883aed78a82b53f835db95774b415f19d4e61ac709b8d0fd916dde4b21a15c27c43578cfc8b4ed069da4a2a31f6b0545aac767d3d94fa4a
 EBUILD qtmultimedia-5.12.5.ebuild 1445 BLAKE2B bed865095f592c13c0642b5b364525f59c97060f648a66d0582f632f0353f7b4cbede150ae6f7db7812281d48e333a2e562293c7ca78796c46781622154a608f SHA512 4349ea4bdec5a86403b781c66ab0e71ce76aee9c2c2267d098a3ae6b9e0bdfa191734c40cfdf57b9581a8fe785d20b9bb069ec065664633a75010fdbb6535203
+EBUILD qtmultimedia-5.13.2-r1.ebuild 1516 BLAKE2B e2d37eeffd0af2a25a99068b4be42a211f9506c415d0df65a4e68f8c1fcc4cb1bdabf04e9753c0421c720a26f5eb2df9fffde704e468199b9dd1d2ed5a4c5ce8 SHA512 d0806e288afc925d44b5bf89cd7b2a03523874ee84a79f708fa52ec9aa70720f7d7906cc7bd2e24418b75ec66a7be9d3e884388f6722f928d4b5a02f66cff744
 EBUILD qtmultimedia-5.13.2.ebuild 1448 BLAKE2B a932815ba950f6ca4a92467f5b7fee3b768b485b4f5a29ee604cf1ec234444d0fa3c3002eabe7990aa70e4f2be8eb6b5327498ac09279991d8ea5c71a1f8f8c5 SHA512 ab5a885ebedfd17b62ce5762197bc9b689cae6c3a46ffc16d0d37b7f4b43561fcfae6dc3949cab01bf119d492a2a9dbd096dc6a081592391f61a4010692acfb5
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch
new file mode 100644
index 000000000000..ffcdc89c1d3a
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch
@@ -0,0 +1,40 @@
+From 4d251f072c6f97b4cf4618103e4e857e499c5ed7 Mon Sep 17 00:00:00 2001
+From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
+Date: Tue, 5 Nov 2019 13:39:55 +0100
+Subject: [PATCH] GStreamer: Fix crash when video sink is used when it has been
+ destroyed
+
+When custom pipeline is requested, all playbin related elements must be cleared.
+
+Also when QMediaPlayer is destroying, it disables showing preroll frames,
+property of the video sink, which was already destroyed.
+
+Destroying of m_videoOutputBin decreases refcounter for m_videoSink,
+since the video sink is owned by m_videoOutputBin.
+
+Fixes: QTBUG-79753
+Change-Id: I2fcbd19372caf46adf2ae1ed2e5a7d0ee70040ad
+Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
+---
+ src/gsttools/qgstreamerplayersession.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/gsttools/qgstreamerplayersession.cpp b/src/gsttools/qgstreamerplayersession.cpp
+index c0998d7ae..05e419b10 100644
+--- a/src/gsttools/qgstreamerplayersession.cpp
++++ b/src/gsttools/qgstreamerplayersession.cpp
+@@ -252,8 +252,11 @@ void QGstreamerPlayerSession::resetElements()
+     resetGstObject(m_nullVideoSink);
+     resetGstObject(m_videoOutputBin);
+ 
++    m_audioSink = nullptr;
+     m_volumeElement = nullptr;
+     m_videoIdentity = nullptr;
++    m_pendingVideoSink = nullptr;
++    m_videoSink = nullptr;
+ }
+ 
+ GstElement *QGstreamerPlayerSession::playbin() const
+-- 
+2.16.3
+
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
new file mode 100644
index 000000000000..767ac97515a5
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		~dev-qt/qtopengl-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-base/xorg-proto )
+"
+
+PATCHES=( "${FILESDIR}/${P}-gstreamer-crash.patch" ) # QTBUG-79753
+
+src_prepare() {
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	qt_use_disable_mod qml quick \
+		src/src.pro \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 72d09446bdd8..deb1e55497ce 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,7 +1,10 @@
+AUX qtwayland-5.13.2-fix-crash.patch 2173 BLAKE2B 80e797f7ce25085cddd4d9721e61cc94c48ab7310a9cd7f357bc0e6467f759a5c313564af808d4f5d6ffd1b5231731df5a69a6c01f876be6d9e53eb73084b23b SHA512 0071413c1bac608ad7591bb6e6b329424ed3dfac6cf1826cb9cedb512df83563fa995964fffb6e0b8ca47063b52835ffa8aeaf5612dbc72c0e916bd353c03965
+AUX qtwayland-5.13.2-fix-linuxdmabuf-build.patch 1052 BLAKE2B 7b184cbc66f5dab2dc8b640ae307f647bc4aea4772a5e74c5ee2be652ed2a90d6e682c4fafb9944d027022686f2be0cc666b2266051134ad57d7194f18eb48c3 SHA512 3c1c2b13c2ff632469f0e1f6c2d642303d359368343e679726d61357d8e104c483b6b3259f5e3b11961f64257f9d10b50d0bb2aa7d166eed5ffa5aaebcf58132
+AUX qtwayland-5.13.2-fix-touch-ignored.patch 1274 BLAKE2B a643a7df480ddf24939406a6479edb10a615ce031e249325c8509140c65c1377d58d37d29056fbd92cb0b943a01c4be0ec1408c5924e3bde8d07d8a100ae8554 SHA512 abdb8201873652510615e4d4db7ec3b415ba8f4f9db5b6258a4548101a25ea46c131d8bbb7d0d615aa4de384546f3d8ba6f299fa3fde3b0fbe5427b9e48103a9
 DIST qtwayland-everywhere-src-5.12.3.tar.xz 432304 BLAKE2B eb2ba520c651467c8ed5f0d870a69c9b07047cb4c05a0c889b36abeab30149861b83ca693efb0bb93dce4f5da5913afc3c8b61933ef0e8307d22b64fce530d87 SHA512 e66f9f41c15cf84165e559a1ff09e20ec21bb3f909b57fab08b0e3f8f9eeacf75d49541b499b1a6514a34d1ba5dd426ec1ce77719910588afa12cb3a7980dc90
 DIST qtwayland-everywhere-src-5.12.5.tar.xz 448064 BLAKE2B e9ec631d1ec0f19cc5ef9f3c9e9e12d327da8ad896e40bb172b98191947ff20ba33b0fc747a9009d4d9147dd1cdea2d5376a12f25362bfa499eca6d0c838f2d2 SHA512 19e19b3d6226839856f8e8792665eda1f09f0bbf95a38077bdf2831205ee09254c8df6a521ba3f5a228bcd98c4d1929a2bd9e9aa2f6f14c218d4d7458d1a866c
 DIST qtwayland-everywhere-src-5.13.2.tar.xz 495536 BLAKE2B eb4352d76caba9ff1d217950b8be40edee1b963a085ca129938ade0d3a68569856bc1a745951d3731c81182b341704568a5036551693cad5926a239587dd506b SHA512 5eb895c2ef8e2e72b71fed027f760913bf754da213e488a6103d9034170a6333f034b3488115a87a5a4e90761425487b9a8ab8e84a68e2e614c159d747408d53
 EBUILD qtwayland-5.12.3.ebuild 1137 BLAKE2B 91803151e658e54b23668c5ae4d387a2510d26ae42fb204cd6b5e3fc9649293ea90da44cb4243c0df686d42ba29f5b4875b9c2fc193e87a3e53f9bb1d5373996 SHA512 83d2ae87f67d4937bfbe1d24ac621afe0134c307479660e35aa4a4195b8879b6e891432c7e4a93e8822ea7b44c7a024c6cf38504526dba3ed9d4bcaa33b2ac48
 EBUILD qtwayland-5.12.5.ebuild 1139 BLAKE2B e60cfaa7752e389c1cbec992043903bb0f948621ea3afb6e55352de083c5b45189247451675856ae801e27cfaab6cd2ba6a8439e01c0909fe29a3dc2528a8fc8 SHA512 ffe06bcce71e01b74ee745b0a1b28b8f8c09e97461f0fca7428d6e103f3b3ef13056535a8513459a2e684041e59a4d7f9d0074325d6410fe751403cf10ad08f9
-EBUILD qtwayland-5.13.2.ebuild 1142 BLAKE2B c8c396f29cddee68c7612898769452304f3887c2c8d6037a321156fcf145c9d179eb5fc15bcb0012454a2235cfded99f0fb00ede1b8436ce699c692924b280af SHA512 26335eab9d60c8612d79d4462f3512e9b98607b756be06130fbd9d6c0b3eddb46372bc50fe410f5354d205ca33b73a5b12b1a186f8d1b03960adf1a1a3f02c1e
+EBUILD qtwayland-5.13.2-r1.ebuild 1358 BLAKE2B a793e0341d297620cc00573f81b61f8aeb5b00be7729d5c66939cd26b8d7363b1036d1bd7e66293b200b974eb03ef4d5dcfc9d7dfff6400f7491e253dcb9baf9 SHA512 4f6de1e03d17c679ed229878f297eeed2dfa689e44248230c044c2c5e97bc8c7056d2c20047c404dac04c0a9101646985ed27626dda1a5a4e00fdb0f73c5fb69
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-crash.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-crash.patch
new file mode 100644
index 000000000000..b4e78684bb61
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-crash.patch
@@ -0,0 +1,55 @@
+From 962b9be7992cef672cb6307af5653c97382c334f Mon Sep 17 00:00:00 2001
+From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
+Date: Fri, 1 Nov 2019 11:24:26 +0100
+Subject: [PATCH] Client: Fix crash when showing a child window with a hidden
+ parent
+
+[ChangeLog][QPA plugin] Fixed a crash when showing a window with a hidden
+parent.
+
+Now we just avoid creating the subsurface, so nothing is shown. Seems to be
+the same behavior as on xcb.
+
+Fixes: QTBUG-79674
+Change-Id: Ia46fcd9a0da5aad4704816a41515cb1e128ac65f
+Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
+---
+ src/client/qwaylanddisplay.cpp | 4 ++++
+ src/client/qwaylandwindow.cpp  | 7 ++++---
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
+index 78524f6fc..27e38ccf7 100644
+--- a/src/client/qwaylanddisplay.cpp
++++ b/src/client/qwaylanddisplay.cpp
+@@ -109,6 +109,10 @@ struct ::wl_region *QWaylandDisplay::createRegion(const QRegion &qregion)
+         return nullptr;
+     }
+ 
++    // Make sure we don't pass NULL surfaces to libwayland (crashes)
++    Q_ASSERT(parent->object());
++    Q_ASSERT(window->object());
++
+     return mSubCompositor->get_subsurface(window->object(), parent->object());
+ }
+ 
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index 8d34afd1f..7098568b4 100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -124,9 +124,10 @@ void QWaylandWindow::initWindow()
+     if (shouldCreateSubSurface()) {
+         Q_ASSERT(!mSubSurfaceWindow);
+ 
+-        QWaylandWindow *p = static_cast<QWaylandWindow *>(QPlatformWindow::parent());
+-        if (::wl_subsurface *ss = mDisplay->createSubSurface(this, p)) {
+-            mSubSurfaceWindow = new QWaylandSubSurface(this, p, ss);
++        auto *parent = static_cast<QWaylandWindow *>(QPlatformWindow::parent());
++        if (parent->object()) {
++            if (::wl_subsurface *subsurface = mDisplay->createSubSurface(this, parent))
++                mSubSurfaceWindow = new QWaylandSubSurface(this, parent, subsurface);
+         }
+     } else if (shouldCreateShellSurface()) {
+         Q_ASSERT(!mShellSurface);
+-- 
+2.16.3
diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch
new file mode 100644
index 000000000000..f9b6b6571182
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch
@@ -0,0 +1,29 @@
+From 23ea5504200ff5f7e40bd264280a78db09c1bc5b Mon Sep 17 00:00:00 2001
+From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
+Date: Fri, 8 Nov 2019 13:58:04 +0100
+Subject: [PATCH] WIP: Fix compilation of linuxdmabuf compositor plugin
+
+WIP, because I'm not sure if this is the way to go, but it fixes
+compilation on my machine.
+
+Fixes: QTBUG-79709
+Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0
+---
+ .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h                    | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+index 2abc2ce6b..d1f4a3039 100644
+--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
++++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+@@ -53,6 +53,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ 
+ // compatibility with libdrm <= 2.4.74
+ #ifndef DRM_FORMAT_RESERVED
+-- 
+2.16.3
+
diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-touch-ignored.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-touch-ignored.patch
new file mode 100644
index 000000000000..4a33d97bf17e
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-touch-ignored.patch
@@ -0,0 +1,36 @@
+From 57c28f461a066c03ef8ae3f823c040fa91876fb8 Mon Sep 17 00:00:00 2001
+From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
+Date: Mon, 4 Nov 2019 14:21:18 +0100
+Subject: [PATCH] Fix touch being ignored when down and motion are in the same
+ frame
+
+The Wayland protocol gives no guarantees about which events are part of a
+frame, so handle the case where we receive wl_touch.down and wl_touch.motion
+within the same frame.
+
+Fixes: QTBUG-79744
+Change-Id: I5dd9302576d81da38e003c8e7e74da6a98def603
+Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
+---
+ src/client/qwaylandinputdevice.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
+index 8f3df8e4d..193ce714b 100644
+--- a/src/client/qwaylandinputdevice.cpp
++++ b/src/client/qwaylandinputdevice.cpp
+@@ -1062,7 +1062,10 @@ void QWaylandInputDevice::handleTouchPoint(int id, Qt::TouchPointState state, co
+         tp.area.moveCenter(globalPosition);
+     }
+ 
+-    tp.state = state;
++    // If the touch point was pressed earlier this frame, we don't want to overwrite its state.
++    if (tp.state != Qt::TouchPointPressed)
++        tp.state = state;
++
+     tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1;
+ }
+ 
+-- 
+2.16.3
+
diff --git a/dev-qt/qtwayland/qtwayland-5.13.2.ebuild b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
index ac4fdc112362..5cc773676a7c 100644
--- a/dev-qt/qtwayland/qtwayland-5.13.2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
@@ -26,6 +26,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-touch-ignored.patch" # QTBUG-79744
+	"${FILESDIR}/${P}-fix-crash.patch" # QTBUG-79674
+	# Pending upstream:
+	"${FILESDIR}/${P}-fix-linuxdmabuf-build.patch" # bug 699190, QTBUG-79709
+)
+
 src_prepare() {
 	qt_use_disable_config libinput xkbcommon-evdev \
 		src/client/client.pro \
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 4d14def58899..602fb6d97d16 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,10 +1,4 @@
-AUX qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch 4466 BLAKE2B 62a135c8f7270077873291dec3d2d29bd663e3c4583c4886e781a974704628bc46aa4aa24ac45ea3a70c2b8652e78029eed4bba441a6a02eafb6d9b34562ff6c SHA512 9feab732ee2bb7aaeb67049d202e8f6b12ac92b0a1e963b518e85c13e7e3a856c842c3c12c9662ce06d0d77d7a61795270749eba73070eadbb066dcb88aa066e
-AUX qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch 1164 BLAKE2B d0d12652387ed24a21548746687fb4689d3d9198e66ba5bb3fa6ec3aeb83db610f5f9e9910ec6c5f240ac6a0f2af855afa4413f971585588fe0d9bd6b718203c SHA512 52f34491d15cc8ca381347427cb440788f8ac6d7d8e52bab067fe997e321bd9e693c9d48669b6bbc23f060c9475d25563496e368b7a94198aff25a21a1491e3e
-AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
-AUX qtwebkit-5.212.0_pre20180120-js-build-error.patch 2124 BLAKE2B 2c09bff3d9bcc950b7305c7aa943d5af8d47572b2b38063fe4de0e8d48768e9fd337e09fdcc314bd9ceda3e51f8bd6731beb4660a95104c0f1d8e6063d01c294 SHA512 01e090b390dcb78a998203806baa0677d39aa680107ee523e4fe1c26d9fa8750836a715a107eb00487e1ef100cdbfcb8ee9d2d9bb47f5f336dd153b591fb26d3
 AUX qtwebkit-5.212.0_pre20190629-icu-65.patch 1845 BLAKE2B c5bf1f575f55d61d57b6f603c66a18079e746c5cc7e124dd8cf950c4db7927d7fc2ad04606dacbcf41765d4d0e81d4106f5d08752066ab140b69581cf5a3051f SHA512 d934cfb5ef1373617db6b2cfc0ff5d542595b06b180bdd00124f91e9587936e6ab1b92842cdc18127d52db80d86e242febc39ac2f6697ee57489cdc1421c5c14
 DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d SHA512 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
-DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
-EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3978 BLAKE2B f07d92bb3373319701138006ebd3408e25b728d58c1755134966be06b9b70c94dc0e7fc4baec54241db37f37261d9cb7e8e494798ada848bb2dd655bbb67c89d SHA512 3825142883d045a5fedd02848000d212173e6552bfb4b330041e6e1d9930d6fedeb4f0d8c15f41eb00375cb74f5e177c0ce56f37a722c9a5c5c43612bacb5d12
-EBUILD qtwebkit-5.212.0_pre20190629.ebuild 3765 BLAKE2B 0828a90bbd19e39548222bc1c44d70e8ddf825520dbda9170e139d1de7e7c201ef99732f3d9385d6aea6f1bf542462abc0b9485246d75b176c95cf4ec8e8c4be SHA512 daaac68f37dea30df1ecc34c416e4c930e0df746971343d5d79ae70a6d74532f132abc081a8e408e49518521803d62cd63e10160451afe563daa529a72019a1f
+EBUILD qtwebkit-5.212.0_pre20190629.ebuild 3763 BLAKE2B ebffe17831bd5c89dad23cc9d89a8a4aedc292b2e220e3b15da763baad34486159f9badf41bc4790f2119699a2913e717308abbd05ab967ed491f25afd17909f SHA512 cfcb8692e6b0c9012d72b79a2855c0cce5d605f057c87a93b9a0bbb5a1ec20e70af40040f65e0b1bd7316bc11e87ffd6b9dd69b9fe74deb11f5f8a6eb0e4b315
 MISC metadata.xml 1225 BLAKE2B 29d533721955dea3cd9f1d23494438d3abc079d713cf77d707920a765e3eba4e2160d0f80b05ec2ba8cbcf7999aad51201bbf002e8b59161bb2d0d85cd945e50 SHA512 b382f115f4705a577e210760d499fde421d0091818914674f0c2eb7fc4967d19d5dbf752be19f43f0edb27493ebec58b89e07a65ffa505842a089d06353aa122
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch
deleted file mode 100644
index a460cec609bc..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 326604b27878566d581ea8c1991abd280453a75b Mon Sep 17 00:00:00 2001
-From: Andrew Webster <awebster@arcx.com>
-Date: Tue, 20 Mar 2018 09:08:00 -0400
-Subject: [PATCH] [cmake] Make spelling for PKGCONFIG_DEPS consistent
-
-It was referenced as PKGCONGIG_DEPS and PKGCONFIG_DEPS which left
-Qt5WebKitWidgets with empty dependencies.  Correcting to
-PKGCONFIG_DEPS gives it the proper dependencies.
-
-Qt5WebKit was already working, but the spelling has also been
-corrected to avoid confusion.
----
- Source/WebKit/PlatformQt.cmake | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
-index 28976b611cd8..de3eabab1157 100644
---- a/Source/WebKit/PlatformQt.cmake
-+++ b/Source/WebKit/PlatformQt.cmake
-@@ -427,7 +427,7 @@ install(
-     COMPONENT Data
- )
- 
--set(WEBKIT_PKGCONGIG_DEPS "Qt5Core Qt5Gui Qt5Network")
-+set(WEBKIT_PKGCONFIG_DEPS "Qt5Core Qt5Gui Qt5Network")
- set(WEBKIT_PRI_DEPS "core gui network")
- set(WEBKIT_PRI_EXTRA_LIBS "")
- set(WEBKIT_PRI_RUNTIME_DEPS "core_private gui_private")
-@@ -448,11 +448,11 @@ if (USE_MEDIA_FOUNDATION)
-     set(WEBKIT_PRI_EXTRA_LIBS "-lmfuuid -lstrmiids ${WEBKIT_PRI_EXTRA_LIBS}")
- endif ()
- if (USE_QT_MULTIMEDIA)
--    set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Multimedia")
-+    set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Multimedia")
-     set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}")
- endif ()
- 
--set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit")
-+set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit")
- set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit")
- set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} widgets_private")
- 
-@@ -465,12 +465,12 @@ if (ENABLE_PRINT_SUPPORT)
- endif ()
- 
- if (USE_QT_MULTIMEDIA)
--    set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5MultimediaWidgets")
-+    set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5MultimediaWidgets")
-     set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKITWIDGETS_PRI_RUNTIME_DEPS} multimediawidgets")
- endif ()
- 
- if (QT_STATIC_BUILD)
--    set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5PrintSupport")
-+    set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5PrintSupport")
-     set(WEBKITWIDGETS_PRI_DEPS "${WEBKITWIDGETS_PRI_DEPS} printsupport")
-     set(EXTRA_LIBS_NAMES WebCore JavaScriptCore WTF)
-     append_lib_names_to_list(EXTRA_LIBS_NAMES ${LIBXML2_LIBRARIES} ${SQLITE_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
-@@ -494,7 +494,7 @@ if (QT_STATIC_BUILD)
-     endif ()
-     list(REMOVE_DUPLICATES EXTRA_LIBS_NAMES)
-     foreach (LIB_NAME ${EXTRA_LIBS_NAMES})
--        set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} ${LIB_PREFIX}${LIB_NAME}")
-+        set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} ${LIB_PREFIX}${LIB_NAME}")
-         set(WEBKIT_PRI_EXTRA_LIBS "${WEBKIT_PRI_EXTRA_LIBS} -l${LIB_PREFIX}${LIB_NAME}")
-     endforeach ()
- endif ()
-@@ -504,7 +504,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
-         BASE_NAME Qt5WebKit
-         DESCRIPTION "Qt WebKit module"
-         INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
--        DEPS "${WEBKIT_PKGCONGIG_DEPS}"
-+        DEPS "${WEBKIT_PKGCONFIG_DEPS}"
-         FILENAME_VAR WebKit_PKGCONFIG_FILENAME
-     )
-     set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
-From 8c76aabf062232c3fb26839b76716006eca44eec Mon Sep 17 00:00:00 2001
-From: Andrew Webster <awebster@arcx.com>
-Date: Tue, 20 Mar 2018 10:33:59 -0400
-Subject: [PATCH] [cmake] Another PKGCONFIG_DEPS correction
-
----
- Source/WebKit/PlatformQt.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
-index de3eabab1157..6ab441b98d29 100644
---- a/Source/WebKit/PlatformQt.cmake
-+++ b/Source/WebKit/PlatformQt.cmake
-@@ -452,7 +452,7 @@ if (USE_QT_MULTIMEDIA)
-     set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}")
- endif ()
- 
--set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit")
-+set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Widgets Qt5WebKit")
- set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit")
- set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} widgets_private")
- 
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch
deleted file mode 100644
index e5d7796ee142..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fbd1de045999d1e5b5dcae7ac6c1e674ac0044fe Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57@gmail.com>
-Date: Sat, 24 Feb 2018 15:09:53 +0300
-Subject: [PATCH] [cmake] Fix include dir in the generated pkg-config files
-
----
- Source/WebKit/PlatformQt.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
-index 6fe440be800c..28976b611cd8 100644
---- a/Source/WebKit/PlatformQt.cmake
-+++ b/Source/WebKit/PlatformQt.cmake
-@@ -503,6 +503,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
-     ecm_generate_pkgconfig_file(
-         BASE_NAME Qt5WebKit
-         DESCRIPTION "Qt WebKit module"
-+        INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
-         DEPS "${WEBKIT_PKGCONGIG_DEPS}"
-         FILENAME_VAR WebKit_PKGCONFIG_FILENAME
-     )
-@@ -728,6 +729,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
-     ecm_generate_pkgconfig_file(
-         BASE_NAME Qt5WebKitWidgets
-         DESCRIPTION "Qt WebKitWidgets module"
-+        INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets"
-         DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}"
-         FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME
-     )
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
deleted file mode 100644
index d8b5ba6cf31e..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-Date: Fri, 26 Jan 2018 20:50:07 +0300
-Subject: [PATCH] Add missing #include <functional>
-
-Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f
----
- Source/WebCore/dom/SlotAssignment.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h
-index 0fcd4dfa6de8..9b9ebe429816 100644
---- a/Source/WebCore/dom/SlotAssignment.h
-+++ b/Source/WebCore/dom/SlotAssignment.h
-@@ -28,6 +28,7 @@
- 
- #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
- 
-+#include <functional>
- #include <wtf/HashMap.h>
- #include <wtf/HashSet.h>
- #include <wtf/Vector.h>
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch
deleted file mode 100644
index 904957c71861..000000000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e9a78eafc172a69d48ee48d971b3e430613ab513 Mon Sep 17 00:00:00 2001
-From: bernhardu <bernhardu@mailbox.org>
-Date: Mon, 25 Mar 2019 01:57:26 +0100
-Subject: [PATCH] Add attribute fastcall to derived class member
- JSImageConstructor::construct (#803)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise the Debian build on i386 fails with this error:
-In file included from ../Source/WebCore/bindings/js/JSImageConstructor.cpp:24,
-                 from ../Source/WebCore/bindings/js/JSBindingsAllInOne.cpp:101:
-../Source/WebCore/bindings/js/JSDOMConstructor.h: In instantiation of ‘static JSC::ConstructType WebCore::JSDOMNamedConstructor<JSClass>::getConstructData(JSC::JSCell*, JSC::ConstructData&) [with JSClass = WebCore::JSHTMLImageElement]’:
-../Source/WebCore/bindings/js/JSImageConstructor.cpp:75:97:   required from here
-../Source/WebCore/bindings/js/JSDOMConstructor.h:195:35: error: invalid conversion from ‘JSC::EncodedJSValue (*)(JSC::ExecState*)’ {aka ‘long long int (*)(JSC::ExecState*)’} to ‘JSC::NativeFunction’ {aka ‘long long int (__attribute__((fastcall)) *)(JSC::ExecState*)’} [-fpermissive]
-     constructData.native.function = construct;
-     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~
----
- Source/WebCore/bindings/js/JSImageConstructor.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebCore/bindings/js/JSImageConstructor.cpp b/Source/WebCore/bindings/js/JSImageConstructor.cpp
-index 923690600ab1..de553f5fa899 100644
---- a/Source/WebCore/bindings/js/JSImageConstructor.cpp
-+++ b/Source/WebCore/bindings/js/JSImageConstructor.cpp
-@@ -44,7 +44,7 @@ template<> JSValue JSImageConstructor::prototypeForStructure(VM& vm, const JSDOM
-     return JSHTMLElement::getConstructor(vm, &globalObject);
- }
- 
--template<> EncodedJSValue JSImageConstructor::construct(ExecState* state)
-+template<> EncodedJSValue JSC_HOST_CALL JSImageConstructor::construct(ExecState* state)
- {
-     JSImageConstructor* jsConstructor = jsCast<JSImageConstructor*>(state->callee());
-     Document* document = jsConstructor->document();
\ No newline at end of file
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
deleted file mode 100644
index 5d0412d03ffe..000000000000
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-HOMEPAGE="https://www.qt.io/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="BSD LGPL-2+"
-SLOT="5/5.212"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
-
-REQUIRED_USE="
-	nsplugin? ( X )
-	qml? ( opengl )
-	?? ( gstreamer multimedia )
-"
-
-# Dependencies found at Source/cmake/OptionsQt.cmake
-QT_MIN_VER="5.9.1:5"
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/icu:=
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtcore-${QT_MIN_VER}
-	>=dev-qt/qtgui-${QT_MIN_VER}
-	>=dev-qt/qtnetwork-${QT_MIN_VER}
-	>=dev-qt/qtwidgets-${QT_MIN_VER}=
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-bad:1.0
-	)
-	hyphen? ( dev-libs/hyphen )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
-	opengl? (
-		>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
-		>=dev-qt/qtopengl-${QT_MIN_VER}[gles2=]
-	)
-	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
-	qml? (
-		>=dev-qt/qtdeclarative-${QT_MIN_VER}
-		>=dev-qt/qtwebchannel-${QT_MIN_VER}[qml]
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	dev-lang/perl
-	dev-util/gperf
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${COMMIT}
-
-PATCHES=(
-	"${FILESDIR}/${P}-functional.patch"
-	"${FILESDIR}/${P}-fix-pkgconfig.patch"
-	"${FILESDIR}/${P}-cmake-fix-pkgconfig_deps-spelling.patch"
-	"${FILESDIR}/${P}-js-build-error.patch"
-)
-
-CHECKREQS_DISK_BUILD="16G" # bug 417307
-
-_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"
-		check-reqs_$1
-	fi
-}
-
-pkg_pretend() {
-	_check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	_check_reqs pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix, bug #395875
-	tc-export CC
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local mycmakeargs=(
-		-DPORT=Qt
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_TOOLS=OFF
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		-DUSE_GSTREAMER=$(usex gstreamer)
-		-DUSE_LIBHYPHEN=$(usex hyphen)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_QT_MULTIMEDIA=$(usex multimedia)
-		-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_PRINT_SUPPORT=$(usex printsupport)
-		-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
-		-DENABLE_WEBKIT2=$(usex qml)
-		$(cmake-utils_use_find_package webp WebP)
-		-DENABLE_X11_TARGET=$(usex X)
-	)
-
-	if has_version "virtual/rubygems[ruby_targets_ruby26]"; then
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) )
-	elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
-	elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
-	else
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby23) )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# bug 572056
-	if [[ ! -f ${ED%/}$(qt5_get_libdir)/libQt5WebKit.so ]]; then
-		eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
-		die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
-	fi
-}
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
index 0d3882fcc276..196ec44e9343 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5.212"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="