gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-qt
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
212 files changed, 504 insertions, 2815 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index b361209e1cde..03da54dff9ad 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 474d95902912..387852622b7b 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD assistant-5.11.1.ebuild 1200 BLAKE2B c62aa0e5f3f66f8cb7d29ecc1dc6d778053e95aebe3c887fe6a50d7a222b91fd64250eb2bf78a2933508f799326c37e4bbec60593eab7ee936d2543ea51d466d SHA512 d59f6592d9bb3933520a076f9273593a89ad60a3afcec3a352f079dff628786a7e2a378949f86dc8a6609b8242ea9ec73f687e35764b28bf6507bf255f969d25
-EBUILD assistant-5.11.2.ebuild 1202 BLAKE2B cc09614074320f1227ac9293a25ef81af2996e6335e92c0ca850541b5892cfb391dd0ddc8c3ba800fe64f88fcb8590800457c1dda9faf58084356ce3fada5e50 SHA512 ca60d6235038386dd13708b38915081314f4c7e03de290690ce2870a57da9fd75fa8c9f63b0b88b9a3244378e8cc2d0f19d15d6afcd934d81599ee2fc6fc8661
-EBUILD assistant-5.9.6.ebuild 1195 BLAKE2B 9fd15cfd04a7544046cccdc503169417f53ee3a808aeb58a745063e62acb3deed5d761275c1c9a812c92a38427c447f542a77feb312517556c15b4da7681a2b3 SHA512 9139269fee4450c028b112203655a5917beefe83ef07544c8c129c4efee9815448af5cb59312b53821d0c2fa53214e439f02343b84952207a1f8cb57c3e09ee6
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD assistant-5.11.1.ebuild 1199 BLAKE2B 4a6f39fa05a11d658396d185f1fe58b78b3ff39cf6924c2142ed6cda3474fb7f633747323502d168119b3b8201a9a16301ef95a5fe2702bab80f205b6a81854f SHA512 73a3d7bd27d51920436c5160438f0330553ba97e50569e036d612287dcc2bfe7ed836a7fa30fafd87fbc94f61d1d2ba0e54c296e7b6bfd2089684cbb20c72224
+EBUILD assistant-5.11.3.ebuild 1202 BLAKE2B cc09614074320f1227ac9293a25ef81af2996e6335e92c0ca850541b5892cfb391dd0ddc8c3ba800fe64f88fcb8590800457c1dda9faf58084356ce3fada5e50 SHA512 ca60d6235038386dd13708b38915081314f4c7e03de290690ce2870a57da9fd75fa8c9f63b0b88b9a3244378e8cc2d0f19d15d6afcd934d81599ee2fc6fc8661
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.11.1.ebuild b/dev-qt/assistant/assistant-5.11.1.ebuild
index d9be38464014..c641c4397da8 100644
--- a/dev-qt/assistant/assistant-5.11.1.ebuild
+++ b/dev-qt/assistant/assistant-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/assistant/assistant-5.11.2.ebuild b/dev-qt/assistant/assistant-5.11.3.ebuild
index dc410213c523..dc410213c523 100644
--- a/dev-qt/assistant/assistant-5.11.2.ebuild
+++ b/dev-qt/assistant/assistant-5.11.3.ebuild
diff --git a/dev-qt/assistant/assistant-5.9.6.ebuild b/dev-qt/assistant/assistant-5.9.6.ebuild
deleted file mode 100644
index 4757150b4f37..000000000000
--- a/dev-qt/assistant/assistant-5.9.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ppc64 x86"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qthelp-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	qt_use_disable_mod webkit webkitwidgets \
-		src/assistant/assistant/assistant.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 32 src/assistant/assistant/images/assistant.png
-	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
-	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index b15ab5ad8098..2de5fd30228e 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD designer-5.11.1.ebuild 1239 BLAKE2B a54f73feb11a1ea0592079e05377f65960a1810049d9695f639ccfa6f3a13c62a106551ad6da53e045b0e2c728a05595dc64e2c5858889a94189b221f83a4dc6 SHA512 ea9e993ca6b7336992220e833b5ee85c76a38addb93f5dd35e2a62d18e5d57616579c5223d6e61084f1166078ff5154d0ea755796568cd09efaf128d1d2b726f
-EBUILD designer-5.11.2.ebuild 1241 BLAKE2B ea4b6bc4dfffeeb4daa6f183e603cc6451f3c701c2c02be5557367a5f6b203d3afb353e8b75bd5fa0c0282b992017754286f2a39f0e3015d40a2420f6156848b SHA512 f41e4e42ec895afc898822ae247896bf92ede969b596af6606204e475790160f615b462aff04f4e1dbe2017d4c1986b0ab9955da45cc318be30b8b21a6d89720
-EBUILD designer-5.9.6.ebuild 1240 BLAKE2B 4e9a38c065ef1952e11e1aecb64641713a60158fb871366148b2a14e38f37f3bba3dd851af6785c60c4abb724a3f665a4420b04f6b4b94b0d95d0b2de3f57a6c SHA512 ce7311a632c53fac6ef6203136ca190518e5463f47536aa6bf32cfe9f06b8f2984889c23a0452c5f7c95d1f1e70df5ff20f133b9555c4546faf21b3c68be9a23
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD designer-5.11.1.ebuild 1237 BLAKE2B 78fafc4bf17f03f904161e0db22f1a0821adf3f7326997f1126824325d60951504613fa6be16885ec1600f65b1e6d4df7844961fa4020987aa6a40a247bea4a6 SHA512 379e29b9a3d2339a9c63728ac7870837e7fbaeee52207b1eab0e683ca5ab47d8465b3ff4e3ca3ccd028fc682b29095c0e14b7def40e1d212afb4bb61230b5e48
+EBUILD designer-5.11.3.ebuild 1241 BLAKE2B ea4b6bc4dfffeeb4daa6f183e603cc6451f3c701c2c02be5557367a5f6b203d3afb353e8b75bd5fa0c0282b992017754286f2a39f0e3015d40a2420f6156848b SHA512 f41e4e42ec895afc898822ae247896bf92ede969b596af6606204e475790160f615b462aff04f4e1dbe2017d4c1986b0ab9955da45cc318be30b8b21a6d89720
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.11.1.ebuild b/dev-qt/designer/designer-5.11.1.ebuild
index 1eaf013f6c18..0ab9ea09952c 100644
--- a/dev-qt/designer/designer-5.11.1.ebuild
+++ b/dev-qt/designer/designer-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="declarative webkit"
diff --git a/dev-qt/designer/designer-5.11.2.ebuild b/dev-qt/designer/designer-5.11.3.ebuild
index 96c6447229bb..96c6447229bb 100644
--- a/dev-qt/designer/designer-5.11.2.ebuild
+++ b/dev-qt/designer/designer-5.11.3.ebuild
diff --git a/dev-qt/designer/designer-5.9.6.ebuild b/dev-qt/designer/designer-5.9.6.ebuild
deleted file mode 100644
index 8d195002c7d9..000000000000
--- a/dev-qt/designer/designer-5.9.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
-fi
-
-IUSE="declarative webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt_use_disable_mod webkit webkitwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 128 src/designer/src/designer/images/designer.png
-	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 9f078174980a..711e9c4c6000 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD linguist-tools-5.11.1.ebuild 688 BLAKE2B 657268b085f466b418e224676edc87ac9a7d0ae8106fed7749b1d7ef8da38c25f72a7ca5668d625351e25a87ee26c0646ca1a72a753e7502d42e17445f6e8881 SHA512 1ff54cc4bba75b670773493ebddc931ddd18679ae21003d5cb89e1ffbda006791b76df6d125c82c8a6ddd9501f2493de5bc87f7fc6e3e5540dfc6db3c1d14a82
-EBUILD linguist-tools-5.11.2.ebuild 690 BLAKE2B b9ec12ad97bf084240372c8c5155d93ebc408a182b79bed5fe65338dc1de285b6a9b24a941aaccf2c34c97fe0be796d3afa99c052e91aafe317147b625cd4589 SHA512 2f266d247b4899f095a059565b625130d8cf299233dbcd6f26dd118a855b5e184f79cc4bb2b424854ed729ecf7e6cefeaf51f0dc9b1f5d90c3633e463996eb2e
-EBUILD linguist-tools-5.9.6.ebuild 696 BLAKE2B 84dc96b8c8b7039af136be737689c68be4878322deb002cc28b59dceafb9b0a27920a7e2d9a79416f64af244e008c4f7e4e35a38755952252c27b17a8a8f4127 SHA512 eef4e1a0302525eab0195fc1f334db7bcbc4ed98ccc12b10504e01713555b69ac9ed83e2c0bd22f24f5bcc94a2578d7c94700d7cdfdc4ab09f3c0ea7333426cb
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD linguist-tools-5.11.1.ebuild 686 BLAKE2B 0c074d8adee642f3ca40db27ae772ec0f057b68358d9ad8c3803c988fdc19e4d6fcd6fb303fb60df60ddd25eadd9044763099b750891110f64deae372ca065b7 SHA512 8060eeb217c514a041da421cf229504e30b823e528be998f734062bec5e10fa5418b949389ef045d72575c92fc896da3f11335cd59b07fdc2de7ae7dca0e035a
+EBUILD linguist-tools-5.11.3.ebuild 697 BLAKE2B 95462622ae0c5a074d51ca3b50ab0d318390b907a62cd61705fccb55279a3bcfbc984b1a1b3448d4d769214c59d456b6d96f22170d83a4ae7faf97b3ee0676c7 SHA512 843407575222ef5961b85e62b47407991bc836052175539427f10ab23a69234f1dbfdbda2538e80be09a222123bf18526fe1dd1ebe5d41ddac5f4dc08cfcbd80
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild
index d9ebbd26a690..dbdec6829d22 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.3.ebuild
index f3ca25f77bc5..99c80456d4b6 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.11.2.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.11.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.9.6.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.6.ebuild
deleted file mode 100644
index 974ad6a3cf3f..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.9.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtxml-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 771044cc3df0..b9340f1e866b 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD linguist-5.11.1.ebuild 987 BLAKE2B e5fbc88c480c533ae90dd8611d31fa6e65ca493dccadff92c97121682a4bfafabb4582a83df6d71f8fb7a8d79c9709136656c9739739facdb52084c8ac7ef87c SHA512 900fb74bc8d4fa8dd82e9f6860e731337d9d7a402fbc96f67aedd191455fc39fcb2f6f562730f24805418f4319332403b93440828cf5fc89b2174efb7249f676
-EBUILD linguist-5.11.2.ebuild 989 BLAKE2B 6f6e3671da1f4481e040aa42a134dc9389467eaa165f419e128ec4a66f0b5fbbd9bd42bb648caae8a45c1d286dfe1533b45f5b8460c5cbdf9d0006eabefb68a0 SHA512 4fc12d99f2b6845b10354e33b03d98e6c7de69a5be465fbc2feabaaf8013dc9f1888164c9adad4cb8e4900242cf7acb90b4fe969e5578b4b441cce9c65415a26
-EBUILD linguist-5.9.6.ebuild 989 BLAKE2B d3766d1ec8f65abc86909647bab3e4d28666f8ee11d27aa52138844d0b738bd522154e5f461f6540c856bce00377515caf9cb62035ac67d34e6600f053669be3 SHA512 11a3cad892735e439d1f2851c320bd54e3a2fa89f1b9c4901b0bd445e54709342d4bcb7792e7a14c332326e6e2a6bc1eaf93534298029972e59316735f836a85
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD linguist-5.11.1.ebuild 986 BLAKE2B eb757ff71a0c0501e36b50c252ba9e18ba7029e489af2a7e2b766fff5f4623a08e90016478bb5bd6681278a879a2b6e56ed5882aac929bdfa11e64a32f8476d4 SHA512 563d8364aa2c8415094d175592a0266c0845a5c83d1920ca9fcdcc23d3dc5fd07537ba06108f478da9bb1d2ab1071ed7d3bbb7f949418c60eb5c9348e7b94117
+EBUILD linguist-5.11.3.ebuild 989 BLAKE2B 6f6e3671da1f4481e040aa42a134dc9389467eaa165f419e128ec4a66f0b5fbbd9bd42bb648caae8a45c1d286dfe1533b45f5b8460c5cbdf9d0006eabefb68a0 SHA512 4fc12d99f2b6845b10354e33b03d98e6c7de69a5be465fbc2feabaaf8013dc9f1888164c9adad4cb8e4900242cf7acb90b4fe969e5578b4b441cce9c65415a26
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.11.1.ebuild b/dev-qt/linguist/linguist-5.11.1.ebuild
index 542fa7affd04..13cebe35f706 100644
--- a/dev-qt/linguist/linguist-5.11.1.ebuild
+++ b/dev-qt/linguist/linguist-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/linguist/linguist-5.11.2.ebuild b/dev-qt/linguist/linguist-5.11.3.ebuild
index 4b9deba71e31..4b9deba71e31 100644
--- a/dev-qt/linguist/linguist-5.11.2.ebuild
+++ b/dev-qt/linguist/linguist-5.11.3.ebuild
diff --git a/dev-qt/linguist/linguist-5.9.6.ebuild b/dev-qt/linguist/linguist-5.9.6.ebuild
deleted file mode 100644
index bbe1091a67dc..000000000000
--- a/dev-qt/linguist/linguist-5.9.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ppc64 x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist/linguist
-)
-
-src_install() {
-	qt5-build_src_install
-
-	local size
-	for size in 16 32 48 64 128; do
-		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
-	done
-	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 667863527ca1..7f54af5bdfa2 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD pixeltool-5.11.1.ebuild 429 BLAKE2B cc3d4282440bcf328fdaf639db713f8720fd6fe20b8fc54cd34d8bef98e9295700bd3ef566b690caa1450178d70c1957ba25cb20240785db58adb6d3ab18ba3f SHA512 ed774a9ee61c17aea4201baa1e0879e9810622f5bf5a61b9e48f22083314c48468d0ef8048f99f73bafe5528d43287b58c532402558b7dc3eee20bcb27f54005
-EBUILD pixeltool-5.11.2.ebuild 431 BLAKE2B 3c46935beebc3ad40e22c4f30b4fa04f72cfa6bc18d98ee66525a25042285eb3de9b9c4acca49a6295e2c64918469a3153e2203df8a5a88b45ce51b388a49a73 SHA512 c113bf27d7e155232ef941d3adf7969db1d6bf69643f16e9c90671ba4c40a0c57777f3640927521446f312088b5e8922d6d90112bdd54a1fe1120c38a306724e
-EBUILD pixeltool-5.9.6.ebuild 424 BLAKE2B f70a57ed314ef84a525eeadef282b1f8b526ece30980904fe79c5bb5a1b80d9cc0fabb79847e1eef9d70d419076c19ebad0a5d23ecd2b9d1b5832df5ed824721 SHA512 420f8831d949332c2f2f4625019476853f3073228fcd5a6e4173240647f340b80bf845dd0526ee5d0be466352d6faed48df3b18c67f59441cca06b81ed3411af
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD pixeltool-5.11.1.ebuild 428 BLAKE2B ed2167af73fb9eae2ed5b19f7f313449b026f2ee025b4694a800fe697a5a3d448733b3981bfaecefd72f4167855797d98936528397d98fbba6621de420c85c77 SHA512 2b753cd79eb42bee31114ce6b541a9bcf33fd81bc9eb0719983184e2f3be069d0847984447b0a57163b9bb7e467b1e82ca8d49185010633defb783f79fd452d6
+EBUILD pixeltool-5.11.3.ebuild 431 BLAKE2B 3c46935beebc3ad40e22c4f30b4fa04f72cfa6bc18d98ee66525a25042285eb3de9b9c4acca49a6295e2c64918469a3153e2203df8a5a88b45ce51b388a49a73 SHA512 c113bf27d7e155232ef941d3adf7969db1d6bf69643f16e9c90671ba4c40a0c57777f3640927521446f312088b5e8922d6d90112bdd54a1fe1120c38a306724e
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.11.1.ebuild b/dev-qt/pixeltool/pixeltool-5.11.1.ebuild
index 057018fa9add..1464980f8fe4 100644
--- a/dev-qt/pixeltool/pixeltool-5.11.1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.11.2.ebuild b/dev-qt/pixeltool/pixeltool-5.11.3.ebuild
index 96e86adc7ff1..96e86adc7ff1 100644
--- a/dev-qt/pixeltool/pixeltool-5.11.2.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.11.3.ebuild
diff --git a/dev-qt/pixeltool/pixeltool-5.9.6.ebuild b/dev-qt/pixeltool/pixeltool-5.9.6.ebuild
deleted file mode 100644
index 76868a50145c..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.9.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 4a7fd9b12f92..df93008572ce 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qdbus-5.11.1.ebuild 474 BLAKE2B af1188d1865611a3e3b151e65c69ac177921a24ce2333aae9463075305ebc5cb409721380478caacb3b83daf550601e592c1bd2dd01d93ec024fd9b6ff1d25a1 SHA512 52e5ccb7c5c6b6b21db425000f25b5f1b85d1bd01e277755cd25e2ef863e430db264039071a1cc1a8c902ae69e386c30181fcb6491cdce8775419eeb07b9dc9e
-EBUILD qdbus-5.11.2.ebuild 476 BLAKE2B 98c9ca7b44d275962102406f06d9876e214d1b15e35ab3417c7224a494d0c1560f1663f0143c60bc9ad02eb3767b9ae5b2d69e0a57d9425c19e76096b78c099c SHA512 4477d873ae267d67af06b2edb8093f703b817da33c40d4beefd12d19c1554b1b11561de9003128f771e492c63b636dbbf43b96195ffc8d671413226b9a088964
-EBUILD qdbus-5.9.6.ebuild 469 BLAKE2B 95a5873acaf5b7144802f0d48d6dc5644a4a2d717582572f118f9873aa5e706e71598b6cdae9f76464c9eac9403ad93cacb0871329c5e496742feb14ae300e4b SHA512 d8383e9e3a899ac6f7b13ecc5196bd86d0a1f96144157b6597d6bae265b654fb4362498cf9ba81930bc2118acc50f16cf7db73c290c01dbff71147d6f9c2eb29
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD qdbus-5.11.1.ebuild 472 BLAKE2B 83dac03c954255a98ef7a7865f54b86fc9a407155f987390f3be6171dd029521c105e772414f3b47af751031e7edbc52eafb27a21d78ae9b6a3ec5524cda87b8 SHA512 105cd084d6980ea574e3276898a8d1d64d9fac33a50c78503064828e06e5ae430639aea0d3d58437437413dc6a0c6a34cf0744ac16a37d68ad3ffcfea733540b
+EBUILD qdbus-5.11.3.ebuild 476 BLAKE2B 98c9ca7b44d275962102406f06d9876e214d1b15e35ab3417c7224a494d0c1560f1663f0143c60bc9ad02eb3767b9ae5b2d69e0a57d9425c19e76096b78c099c SHA512 4477d873ae267d67af06b2edb8093f703b817da33c40d4beefd12d19c1554b1b11561de9003128f771e492c63b636dbbf43b96195ffc8d671413226b9a088964
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.11.1.ebuild b/dev-qt/qdbus/qdbus-5.11.1.ebuild
index 4b848e2b138c..fa76f30f9eea 100644
--- a/dev-qt/qdbus/qdbus-5.11.1.ebuild
+++ b/dev-qt/qdbus/qdbus-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.11.2.ebuild b/dev-qt/qdbus/qdbus-5.11.3.ebuild
index 154680d242f4..154680d242f4 100644
--- a/dev-qt/qdbus/qdbus-5.11.2.ebuild
+++ b/dev-qt/qdbus/qdbus-5.11.3.ebuild
diff --git a/dev-qt/qdbus/qdbus-5.9.6.ebuild b/dev-qt/qdbus/qdbus-5.9.6.ebuild
deleted file mode 100644
index 8655c74acdff..000000000000
--- a/dev-qt/qdbus/qdbus-5.9.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Interface to Qt applications communicating over D-Bus"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbus
-)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index f2ded54793f8..14a44c79e6d9 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qdbusviewer-5.11.1.ebuild 975 BLAKE2B 36a680737af6f5c9dbc71191cddd19095e34c37422a7ecbe414149b04939e80d0910682f154d0bdba78d01ba8b5ab6a29d00c15ca4dcf3423a7ec7fc2c178840 SHA512 ff32ecc7e867b91a3884be0a59d4021cd72e40c3c79adc92d54337c71fd9eb7b1624304b730fd6bc4a1af8ba3492fdf79482955f743023fe474c8b28733de18e
-EBUILD qdbusviewer-5.11.2.ebuild 977 BLAKE2B 92e399fbec282973b01f57a26ef735095035489b2edad7db43fad47d143a4e88a5f6e977054a676b5a3b9fc91ab41654889293d82d860523da5bb6125228ce2f SHA512 114fb481bd3558fbc087f3aa9a8381cf168894e485c6a3f8acfca4384f274ea11ad45f4e47e8736a443e0b81f5019a51e1e3836d5757cc90280a202582c83055
-EBUILD qdbusviewer-5.9.6.ebuild 970 BLAKE2B ef175f6e87bcee9a13ff081c8501ce41317fe0e2a45cc8489593cf79a3298480a1f0e70cf95b507fa56739f364ba53ccfcb5ab215cce8625d4c2a01b7f3c7648 SHA512 5fecd7efe36d0dd9cf956ffe573b2a395d32323c0096996e0afd153af7224094cc74926c3473ead047ccf3a2ab079e0a9c78c82427ddebfe567ae90e1c79040a
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD qdbusviewer-5.11.1.ebuild 974 BLAKE2B 40a1b55d7dd289837746148770da2f8616f796311d0219dfe844135559bc5454d19dd604f5adfeb559933304fc78dc5b900ab39270510963e6bb9fc298e09175 SHA512 8fb4d50175478957008670adb21e1458c0ea831ebb65f2030a7a192cea28630952143c7b171bb6418371e558f9ebd3a81ac6ea22aadce236a90b3b7b6d63b9c1
+EBUILD qdbusviewer-5.11.3.ebuild 977 BLAKE2B 92e399fbec282973b01f57a26ef735095035489b2edad7db43fad47d143a4e88a5f6e977054a676b5a3b9fc91ab41654889293d82d860523da5bb6125228ce2f SHA512 114fb481bd3558fbc087f3aa9a8381cf168894e485c6a3f8acfca4384f274ea11ad45f4e47e8736a443e0b81f5019a51e1e3836d5757cc90280a202582c83055
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild
index 5f17933a39f3..895b9900447f 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.11.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.11.3.ebuild
index 8b6f42e2e593..8b6f42e2e593 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.11.2.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.11.3.ebuild
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.9.6.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.9.6.ebuild
deleted file mode 100644
index 72acdeb623c8..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.9.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ppc64 x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
-	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index bb6ca7411764..dc74ec148f8e 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qdoc-5.11.1.ebuild 755 BLAKE2B 395639f24784f4d831f443f7fe3c2d5b9aa88b31e15abd97142f513f7f95c68723b44b7127d4b3988ff17dd68e1b013854a80fe3f0dc96e368449de1160571ab SHA512 1da1934c116b9251deef1b92307de45345023a7ee5fd97a940804ddb0330fdeb3fa0786c141f346e4d24c6398e1495f8c24d4b927bc56fdfdb9933e584a183bd
-EBUILD qdoc-5.11.2.ebuild 757 BLAKE2B f7f06d953f50d8b49c335fbb51a35c3627a5ad0cc958579b70accbb6573f44c8b02939c135caf02ee10fd2c74342eed6bf068fcf5276ef9123b8773e6da4a9b7 SHA512 75e521af77a7c7a39ff71bc35c75066494982c732dc24cb64555173446e1c95481d2ebfb8ce483c5cc12d9020e154a6965a560273e92bc9c06ed8958aaef703e
-EBUILD qdoc-5.9.6.ebuild 534 BLAKE2B 3817288c91c7c034346c8b9d093d243cbb37229c411117d20efad801fd483730f51de736fffd3f697a081b8be2a083b5e9ee50a1e73d646100aa409306389eb8 SHA512 ab20a092b666c13b4e248c6abe9e2fff6a79d740ee3ea996cd3aecd72b23857e950b9555fb0293908c49b4719f923876b5035247e28210bbd82cf19a99e3c57d
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD qdoc-5.11.1.ebuild 760 BLAKE2B 2a20cbbdf7fe7dc786dfabd71638bb9058a8b5c40760099b063491b3131bc0f306acf7549f6e6236d4dcf2bcd4d56896baadb6161b8e5ce7fdab30e1b6520cc5 SHA512 33f0140c4a8252338650348e801029e01f20632ac9346537739dbf77c1e51a4b535ccd0979c63bc3cd49b8cc685454000e9f271bde3fc4c0e6f3579c39bc7e07
+EBUILD qdoc-5.11.3.ebuild 762 BLAKE2B ef7d4635d97db4faed376bc23f3b9e84d430c4eba2bc3e9b4a233c55dd8bd2ff2f372f88be6cfac629ac9d29e47e296ac40757ed3542d478f2f3e122cb7e5f42 SHA512 193712a5940aa2cc3e671395646ba879fac0999bd36349d46631a653b981f0813b1bb18276f57410ee83bb38f43e9cec16092b45507dcdf21e9be873e52b88f9
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.11.1.ebuild b/dev-qt/qdoc/qdoc-5.11.1.ebuild
index 3fd4b332dcc8..0549109119e3 100644
--- a/dev-qt/qdoc/qdoc-5.11.1.ebuild
+++ b/dev-qt/qdoc/qdoc-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qdoc/qdoc-5.11.2.ebuild b/dev-qt/qdoc/qdoc-5.11.3.ebuild
index b9413ea45a74..5e1e6d058c6a 100644
--- a/dev-qt/qdoc/qdoc-5.11.2.ebuild
+++ b/dev-qt/qdoc/qdoc-5.11.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qdoc/qdoc-5.9.6.ebuild b/dev-qt/qdoc/qdoc-5.9.6.ebuild
deleted file mode 100644
index 1b3aa1abfe23..000000000000
--- a/dev-qt/qdoc/qdoc-5.9.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 71165d776832..c75c149605c1 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,6 @@
 DIST qt-creator-opensource-src-4.6.2.tar.xz 23397676 BLAKE2B a6c641d2daaa1d692919739de1a26da0a8806db3a8678dffc792fc77855ecf14136ad1e990e678f66afc471950c6bcc0803a6d47a21af6eb91ff010e77383ee6 SHA512 32d583cc3684b268a649e265ebe97bde0a9fdcea60013d8966edef6df3fa0097bcb19d9fc7abf5ece9b59870ad1049e8320477df4321f0f311843e359aaea6b6
-EBUILD qt-creator-4.6.2.ebuild 5403 BLAKE2B 2ee930417dbfd00c31adb6f84242a384c40456cd9a8e923282eebe9f143f818299efcfca12ae62444cb38955495c42e59999f1eafdbbf0b390f8de6a5f7633c8 SHA512 3cd038d8e73f41529ec9d19cccab2d11b59332b326f3f659b751a8a508c36348c3c719cf6c66bfacf0b671aaa78b9b43267782e67be60090400f4e3e8940c962
-EBUILD qt-creator-9999.ebuild 5402 BLAKE2B 281495742b9e9335c50f9f0736b6e5c1a4d143edf96afcafe82752d4bdf568b1e705ca7ece4d24f618d8a10478be8e90969f41f0d1a34527b0b0eef50009097a SHA512 3fe2812134b52697b5dc18a04e4a2ff8268dc47df2d29684556cacb1db4f7dae3e6e7bd5063985e7d7965a85a00feecde294026b053ce6cd4f6b146bf82a002d
-MISC metadata.xml 2247 BLAKE2B 4cc94d6484cfccef9fd7ffa81afd642603842cc0a840bf1a710e2dba85258d7d116b3201391d62d9e974e44fc18033cae1b4d9d242bb1aa43dfdb1364e782bcc SHA512 d3e92111e1ec61fc5ea8904066eaf205000de8a4e64ccb4b8d6ba349735466c4f851bec8154f30fc8ff21756d27ec07249892136ca56bdcc12ee4e3200616368
+DIST qt-creator-opensource-src-4.8.0.tar.xz 24545016 BLAKE2B f2c4256ab2d2eb1ac8bf897df2517f8784b97723564a9f53347de858301997c4d02f6a20269a4d74d0305f27babc65491521965b7e1941cd3c3778cb9701c8d5 SHA512 4b6c6778493b7c8b593868ebfe90ccb21eb3daec16853604ea422f29fc57be5623033c79610507931202fa34a648760c29134670d26b1c4c098e1eae28bb1743
+EBUILD qt-creator-4.6.2.ebuild 5399 BLAKE2B 8bb4a5266e8ace09a90d2eb40ce2e316ab879cde9602021aa5445627a33fd5f4cf300dcc58fc182a90c813b6e81db79570ff3cb6a0816db99567eaab128f5822 SHA512 83f105c2721bff1f9d82870f32e9cffaaaed55d5b5371998a6c7db61a590bd59a0b1521c8d0e62e6cd3ba29f2bcca5fdd2dc1238d1751db14d82722ac8137ce3
+EBUILD qt-creator-4.8.0.ebuild 5614 BLAKE2B 06d9a96f2036400bf26de6dd9dc6b3d57b1b282174eb56b2485d713ecb31fb1287033a794b6071d997ef2467e1f454d3bc3313c975e639e6e470059ce7f176de SHA512 d7b2a5943857007e53798231b8a2b91d72a7ff2be82cbb240f5ad9f11902d1881cf9e3471b2d4d2285fc94fa9ba59511e7521983810069e3190608e4a5c0ff97
+EBUILD qt-creator-9999.ebuild 5614 BLAKE2B 06d9a96f2036400bf26de6dd9dc6b3d57b1b282174eb56b2485d713ecb31fb1287033a794b6071d997ef2467e1f454d3bc3313c975e639e6e470059ce7f176de SHA512 d7b2a5943857007e53798231b8a2b91d72a7ff2be82cbb240f5ad9f11902d1881cf9e3471b2d4d2285fc94fa9ba59511e7521983810069e3190608e4a5c0ff97
+MISC metadata.xml 2716 BLAKE2B 171285a8ef6f2a73d3dba545e7e6f44eba9f1d180ea28d78e8697691e20fb23b871403e6928d0505e464d6a3820837f7060740877c54e7f727fe0706cee94bd5 SHA512 7875017b499987e058a243086cc843d9bb12e8578ffc48831c49185aafa9fa698070e59d4dc3fc1066b14e563a7a76abb0142474577aadd43be798f4ccbd5550
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 5cdf568ca748..45e3c6a24d80 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,13 +14,17 @@
 		<flag name="autotools">Enable autotools project manager plugin</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
+		<flag name="clang">Build clang-based plugins (code model, format, static analysis)</flag>
 		<flag name="clangcodemodel">Build clang-based code model and refactoring plugins</flag>
 		<flag name="clangstaticanalyzer">Build clang-based static analyzer plugin</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Enable cmake project manager plugin</flag>
+		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
 		<flag name="designer">Build widget designer plugin</flag>
 		<flag name="glsl">Enable GLSL source code editor</flag>
+		<flag name="help">Build the help plugin</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
+		<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
 		<flag name="modeling">Enable graphical model editor</flag>
 		<flag name="nim">Enable Nim source code editor</flag>
@@ -29,6 +33,8 @@
 		<flag name="qbs">Enable QBS project manager plugin</flag>
 		<flag name="qnx">Build plugin for QNX devices</flag>
 		<flag name="scxml">Enable graphical SCXML editor</flag>
+		<flag name="serialterminal">Build serial terminal plugin</flag>
+		<flag name="silversearcher">Enable integration with <pkg>sys-apps/the_silver_searcher</pkg></flag>
 		<flag name="systemd">Add support for retrieving application output from journald</flag>
 		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
 		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag>
diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
index 975beaf20cf1..7e5bc26a04df 100644
--- a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-5:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.11.1 )
+	qbs? ( ~dev-util/qbs-1.11.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
diff --git a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
new file mode 100644
index 000000000000..207b4b6cbf83
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
+	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
+	silversearcher subversion valgrind winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.9.0:5"
+
+CDEPEND="
+	>=dev-libs/botan-2.8:2=[-bindist]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/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-6:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	qbs? ( >=dev-util/qbs-1.12.2 )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	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+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				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 '/SUBDIRS += clangbackend/d' src/tools/tools.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use lsp; then
+		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/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
+	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
+
+	# 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 botan
+	rm -rf src/libs/3rdparty/botan || 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 \
+		CONFIG+=use_system_botan \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1)
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 5f8021eb3f50..207b4b6cbf83 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
 
@@ -26,22 +26,21 @@ fi
 # TODO: unbundle sqlite
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
+	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
+	silversearcher subversion valgrind winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="5.9.0:5"
 
 CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-libs/botan-2.8:2=[-bindist]
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
 	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${QT_PV}
 	>=dev-qt/qtnetwork-${QT_PV}[ssl]
 	>=dev-qt/qtprintsupport-${QT_PV}
 	>=dev-qt/qtquickcontrols-${QT_PV}
@@ -51,11 +50,15 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clangcodemodel? ( >=sys-devel/clang-6:= )
+	clang? ( >=sys-devel/clang-6:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.11.1 )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	qbs? ( >=dev-util/qbs-1.12.2 )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
 DEPEND="${CDEPEND}
 	>=dev-qt/linguist-tools-${QT_PV}
@@ -71,11 +74,12 @@ RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-6:* )
 	cmake? ( dev-util/cmake[server(+)] )
+	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
+	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )
 	valgrind? ( dev-util/valgrind )
 "
@@ -87,7 +91,7 @@ done
 unset x
 
 pkg_setup() {
-	use clangcodemodel && llvm_pkg_setup
+	use clang && llvm_pkg_setup
 }
 
 src_prepare() {
@@ -101,18 +105,26 @@ src_prepare() {
 				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
+	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
 
 	# avoid building unused support libraries and tools
-	if ! use clangcodemodel; then
+	if ! use clang; then
 		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-		sed -i -e '/SUBDIRS += clang\(\|refactoring\|pchmanager\)backend/d' src/tools/tools.pro || die
+		sed -i -e '/SUBDIRS += clangbackend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then
 		sed -i -e '/glsl/d' src/libs/libs.pro || die
 	fi
+	if ! use lsp; then
+		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die
+	fi
 	if ! use modeling; then
 		sed -i -e '/modelinglib/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
+	fi
 
 	# automagic dep on qtwebengine
 	if ! use webengine; then
@@ -121,21 +133,21 @@ src_prepare() {
 
 	# disable broken or unreliable tests
 	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
-	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
-	sed -i -e '/\(dumpers\|offsets\)\.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 '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/tracing/tracing.pro || die
-	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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
 
 	# 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
+	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
+	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled botan
+	rm -rf src/libs/3rdparty/botan || die
 
 	# remove bundled qbs
 	rm -rf src/shared/qbs || die
@@ -144,13 +156,13 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \
+		CONFIG+=use_system_botan \
 		$(use systemd && echo CONFIG+=journald) \
-		$(use test && echo BUILD_TESTS=1) \
-		USE_SYSTEM_BOTAN=1
+		$(use test && echo BUILD_TESTS=1)
 }
 
 src_test() {
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index c8f57c64ba74..ca49d9b956d6 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -6,15 +6,14 @@ DIST 5.11.1-0-201806180847qtscript-documentation.7z 721409 BLAKE2B c1a36f60bc5a2
 DIST 5.11.1-0-201806180847qtscripttools-documentation.7z 88560 BLAKE2B 3114249410ac579ff29d91299e9c3752fc819cc8aadae8f1b8a42125aa3d3ebb5dae2557e7aef55ff8d8384877a8e47bb6c2e7d259cb6bddb97fbdc10aa6a5f1 SHA512 4941dcf96b676026b05bb0ce975c423e0d5d074a6bbdb610b03fc43093fb0cf7d699b57b4844870098b3dfbe722cabe460de7a7ff197a1113007dd73c4b05d67
 DIST 5.11.1-0-201806180847qtvirtualkeyboard-documentation.7z 1489580 BLAKE2B 43161e759ba266bcd5b5eccb42f46c9836473fa9a6f465e82604e61cc05309c9df335421cfd9cb058995c4f60728fdede199cd10476b13e6bca50350e1c06dd7 SHA512 f74740078c4a50fe01b59dda824795881943e898980d6ee74bda80743e9b3b187bbdcfec76a5c4df2fbaf7ccb36055fad9158548f34c7575b7d21d2cdbd29fea
 DIST 5.11.1-0-201806180847qtwebengine-documentation.7z 3326394 BLAKE2B 94f0231d6a78873e8720e9a456025aa7594953be9b61b6560abb8608aa946c4038471909d1ff6c29f2d762f98fd5dbe81999e6cca7fc49aadd45fec6f040491d SHA512 cc8f0d626004e31d58f7f4fbbedfc717bf0d6b64af497683a696ffb81a06938b99ac7a08d2da2d12c33b3f5dbf6cf2b8faab37da64f1b51621e494709f80dacd
-DIST 5.9.6-0-201806072055qt-everywhere-documentation.7z 200837886 BLAKE2B 5bedc098c39a6b43c4fa25217c483072a69d760a29d585b4ad13e4891743cc44f496906ada61f413ab2850ad1cbce1195642002b1b43c1c3bd19a3d867314e5e SHA512 509e1a5f76bcae3fb96f8542c452fce1a417c12cbed9fb0e13369752f130846ddea1264ac9fb041c21c7562f4d139a0216b71644e895ffc5700be4920cd52d16
-DIST 5.9.6-0-201806072055qtcharts-documentation.7z 9071151 BLAKE2B 1533a41e4b13cc760309e7c607a464feca1a314dd36d34f941b0d3e413c0f6792bb745a05b09886061f6585e3ca8827fa6b0a957a40df62c1872a8d4390a4e44 SHA512 5f11848bee82f89269b5b45c058bc29b33fbbb52b891c3908f36cc912b00cab3605d163d5da0c9fc2ebdd610022300038f749cce07c6cd3a7982c3cc93f05dc1
-DIST 5.9.6-0-201806072055qtdatavisualization-documentation.7z 6617326 BLAKE2B d6d0951aa5712a571bed62b154672614163931965fb53aa3511dde2eede957d81a2c90a7a6c231af39f39056d32dc9d0866079f0b70d02a6f0823d55bf090ce0 SHA512 9797b355b82a06b51866bdac08101a76c4032756747b6e456141d98771ae6cf8a6a68e48b85d8de71b8dc14653238b1477f1cf86b497976928f9fe0a0bcc3bfa
-DIST 5.9.6-0-201806072055qtnetworkauth-documentation.7z 259691 BLAKE2B 55e060949594f2b6647b79c64628d6ec2a8645c0a94c64865f7f5b1fcd21493bf38eab96d586d0b3ff9ee5dc9824b6dcc0ada5ce253ea8c6186551c876fa0423 SHA512 2499150520d9994c7fb9c666f15040e6e789fc89f41cd65efb97525d7cac21bf2385197ebcde19788e85b8324fb08d04bc5ad9f60423a4dfaa6125e8a860514d
-DIST 5.9.6-0-201806072055qtscript-documentation.7z 721761 BLAKE2B 2f8c0b189580233c3e65d91538a9208c7a4b40c9b7553c83e7e5e3fe79fe5b748679986d036541bb2cb20659c6e424f52c7f635a5d2664ef1f584480a62f4158 SHA512 b42d59c9cbab2de7b2b71d4560d14130a3dd7a0ead6c086afc651ea86a11a254f48711dd7b122826cb41d8f078e5d6b7616a082489f6f3fdb058705afdf41f50
-DIST 5.9.6-0-201806072055qtscripttools-documentation.7z 76289 BLAKE2B 8335287080f72b893b8e3c9392d462b6219f82a8fd48a1dd2f2b9f7676f737c0ee70dfb875199180149c83f479526b9c06046aea4d5c22f66b9dbd2130d05559 SHA512 d2b5b30ea37731e9ba7e594e34d3d9813152fd4c361875b16a49a895fcadb400e9acfad0a2f2c43a7308b6df9537fca4649653306290ca081e795b38130f0d5e
-DIST 5.9.6-0-201806072055qtspeech-documentation.7z 148960 BLAKE2B f26ad95fbd75f001805566a0ca7ef58816be90327d6905948bc87e8d3fa2d1c01b519d9b4e3c20ad9e689a4d79cbd93f286db9cc01b7a167230ce6d2f7333699 SHA512 af64dd1a2fdb6b1b7a5049eff67576d8b5a1f1408c771ee1db1f78580325f2da71f4d2e74abe4cfb438a11fe1478e65a6366aeb585ed98769a51bf9d471d747d
-DIST 5.9.6-0-201806072055qtvirtualkeyboard-documentation.7z 449786 BLAKE2B 33a7e07d9b2cbd83bc8a6086172ba4cdbdcc4ad3d89c44b8e48df1a5400e1ae784a3e1742f0732f4dcc73a78008d0d2d9035ad412dc03152cd760a3882c4f014 SHA512 ba9d851e2100c895b6831b7a370a98cc5d43baba893a5861daf77bcb5fe490b9e15d6142315fedce89e0517a2aef90280494216175e2f39a6ac19f34d8852f01
-DIST 5.9.6-0-201806072055qtwebengine-documentation.7z 3382083 BLAKE2B dd2e40fe408a21347931e5c73059fe437ce2377018f431dabd1544828cbeb575eb36671cb0567284d6eee4623b699f8cdb9342ed5307c95edc23978235dc6a92 SHA512 394045b2ee583cd826b9aefd0c8fca94586400115f8fc31354854db3f002007c23c27c25ed19f76ce60a118600287f09d53f81a5b3a3fc07b9d6e2478319e1ca
+DIST 5.11.3-0-201811291914qt-everywhere-documentation.7z 250344112 BLAKE2B 08564b52167fce5456fab3e78c72b7eff458b6f8609c48872ed67c020c80b568e0a06018c3ba22f24728d4c949db71d1873afe332012ed64a2681a947c79ec97 SHA512 902a68b200a0deee445113dcc3308e5ecddf36b922cd23909f59a90a6a2eeafeb169ed67203fd0e516a33507456696cae4a97492f473f539532deb2a8842f70f
+DIST 5.11.3-0-201811291914qtcharts-documentation.7z 9204607 BLAKE2B 0fabe007d70f4ec85428862db1d9c48719ecaef3f9bd4cffe2c70574f77d337178c5df8928f74eabee218cdb62cde23c3ae0c826556e4682b4b8dc46f29ca86f SHA512 48a1fb4c0d5e2f46c9639eb2cf3a27cfad378abb8a6f480b1bc71f591b0417e4b05c615ac3b684912c6da861eca77a41e6cfb346e881eb306997d7c3257f8d78
+DIST 5.11.3-0-201811291914qtdatavisualization-documentation.7z 8359648 BLAKE2B 1c396c2d71ca2574e340b948dfc9364c78e3db8cf5482ce2df5a6f3949f01cb13db2eb3a3d17fd95b3796f4cf15ff51a95a2872256f16eb67d6433373849ee9a SHA512 1482f01b94fcac9a602c5cbf1072a96a40ce15becabe248e5506ad29747bd53d0e47f54ecc847999e8b67cbfd26b9aa70036428c72efbd3897af241e77494b1d
+DIST 5.11.3-0-201811291914qtnetworkauth-documentation.7z 293548 BLAKE2B 9010a64c7677475f3ee522e843fa4eee862c61a3c12f373c970d256245da41164095daf0abc0b9d6b742fb181779cd8c4c10f4423274948b0d0fa6e3f98b273a SHA512 31b8d63c1a7bc45bc9301d6451fc512acb13aadd0fec24fd5c806edcfb0ab624f920422321da6a2f5be53e2a253cd3224b6e21fe98b86f6196aa8b43b5ed9c27
+DIST 5.11.3-0-201811291914qtscript-documentation.7z 722145 BLAKE2B 97abb8f938b073a6f030ad01d463c2ca13897bb26134f32d5f97768957abce59962c9650cc95eca47bbbbec3ccdf96f62f6a47c485255c6ed008a5c80ed4ce03 SHA512 cc4eb6b047320dbc322f8b70049da11ddf095cf14922ee24410e3c005e548c432ca1292bcb165c50c6a91ea0a6973c204f629b6bc3baeeab82c576d30a4bdd6f
+DIST 5.11.3-0-201811291914qtscripttools-documentation.7z 88994 BLAKE2B 10d3593bd8261deefcb080b7602a24e2044e43d463a2cc2cef0a795d9fba3d307c3421d7cf07e238a8f7c129dbaccb713c2594bc8411a852fbf052ce4b796bd1 SHA512 29196525e15b3602ed38f03e02036c99fe1c2a2edb45a0c6f061e68c965d049e923ad4e8534c1580895e6b74d72f7f099e3c5771de61c229ec5812680b3b2a50
+DIST 5.11.3-0-201811291914qtvirtualkeyboard-documentation.7z 1637961 BLAKE2B a4c46e635563a6f37c6184a93f8eb1aaa345052873a43bfaf805e3790847324298161229c07420e8665347b45797455cb6ef56cbfdf8240840ccf9e1e8e2982a SHA512 fc48123592a7502abc05f5c8ecfb33d12e041f3f278a1dbc27d3bc8653bb3e2464da89a8f14ef4bf07f786b80c26104dfcc89034a44f62a5810d4a01bf578c88
+DIST 5.11.3-0-201811291914qtwebengine-documentation.7z 3654309 BLAKE2B abd0799f31f0f00af0faaa335ae821e68cbf7f90d0e2027c866bcf2a397fc57efa8a12556eb685d09cc4e65653af1e15946d7f9530b82de10bbe1c2d6ee5c606 SHA512 e61e3d410e39e78b02c7afd86877e7b3d3f18102d7cf07adecf420f84a991ee28edb98b5413b03f3f5248edd68eba33d4273630abd8f8c915c9761f7e8c9da3f
 EBUILD qt-docs-5.11.1_p201806180847.ebuild 2024 BLAKE2B 2c4bf3175b42df76156adc97f9478624f8b3c3d20dbc994d613952150f42b29e651f76f693729f338802cd92956c0706f19d968271515b57b1eebd8071559cdb SHA512 d6da3044733f2e66c341aecb4f6031ac8964bee37211914bffe3479d49c87b0f98c0289cd84927c6159b7bcb4a092a19ff34eea765ab0b9f44fe41bfc2bc7218
-EBUILD qt-docs-5.9.6_p201806072055.ebuild 2100 BLAKE2B b76b031a1e4a72cf86c2135d7f7f3eed9288ab647e4f4ef6817ef4dc83e5b80764c0e590d072c1ee9dcdd5960f9311e876590a4ce20b0de32eae32aad41ff787 SHA512 a883ade826c6e40e49bb68669c9f4cd3b2daa83cf99e4cc5dcef988f124c9938198780c7f1891a09ebb328fac72d194b3790a4cb9d3f482441a2cc099f17b80e
-MISC metadata.xml 1798 BLAKE2B eeb4fd398c6b8c9422c2be3445149f4745d6658c78d16f3ac92b25bf3b622d7fa0a914f5abcfe9170978853c033c8752eaa3afdbf3c2bc41f66df69f86173de4 SHA512 e8ff00579cbba2f2d0fd2d91a370e0c2f4f83dda0ddd4812850f50f7cae2add0fedde9a8ecad9c2fd7219ee344aebcc64ac85860127fea93e430224d45c6fe1d
+EBUILD qt-docs-5.11.3_p201811291914.ebuild 1937 BLAKE2B 6c556a214244799b15b8d67ea6d75a8d00121d0bdbd92e3aa2793802839de29ce285577816963c4b6567270f374af29b0feac6b5f95b1b003cb5ab54248b5e1c SHA512 3354ab5e5e729574fe0881ed1796aab6be4ef42769a79417fdd914e601444903268b90dcaa537ca8c5d8500120ea63a23586dbc644650cd6782e280f64b0d2fe
+MISC metadata.xml 1716 BLAKE2B 1a50a8c7b4b2125df82206b03fad6e9721495a0748bbb98ccf059628b03c19dc2e180fe92dd2ce71195357dde2df8717726721afbc6c3cb53687384d13c931fa SHA512 6f7b54859302dd8f7364e7be60e7750286c0326d22debc6488029e4c144d8935dd1c6042d28d31c41cd67b3ab83cbfcd9cc3f9a1d5d0bed66d65a42de61bada5
diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
index 2cf47d81e171..37c1163e40ea 100644
--- a/dev-qt/qt-docs/metadata.xml
+++ b/dev-qt/qt-docs/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="qch">Install documentation in QCH format</flag>
 		<flag name="script">Install documentation for <pkg>dev-qt/qtscript</pkg></flag>
 		<flag name="sensors">Install documentation for <pkg>dev-qt/qtsensors</pkg></flag>
-		<flag name="speech">Install documentation for <pkg>dev-qt/qtspeech</pkg></flag>
 		<flag name="virtualkeyboard">Install documentation for <pkg>dev-qt/qtvirtualkeyboard</pkg></flag>
 		<flag name="webengine">Install documentation for <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
diff --git a/dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild b/dev-qt/qt-docs/qt-docs-5.11.3_p201811291914.ebuild
index e98530caa87f..d252c8f53b43 100644
--- a/dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.11.3_p201811291914.ebuild
@@ -1,36 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit versionator
+EAPI=7
 
 DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
 HOMEPAGE="https://doc.qt.io/"
 
 PV_FULL=${PV/_p/-0-}
-PV_NODOTS=$(get_version_component_range 1)$(get_version_component_range 2)$(get_version_component_range 3)
-BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.${PV_NODOTS}.doc"
+PV_NODOTS=$(ver_rs 1-3 '' ${PV/_p*/})
+BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
 SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
 	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
 	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
 	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
 	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
 		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
-	speech? ( ${BASE_URI}.qtspeech/${PV_FULL}qtspeech-documentation.7z )
 	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
 	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
 "
 
 LICENSE="FDL-1.3"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
-	multimedia networkauth +qch script sensors speech virtualkeyboard webengine"
+	multimedia networkauth +qch script sensors virtualkeyboard webengine"
 REQUIRED_USE="|| ( html qch )"
 
-DEPEND="app-arch/p7zip"
+BDEPEND="app-arch/p7zip"
 
 S=${WORKDIR}/Docs/Qt-${PV%_p*}
 
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 9759c468e6e7..89cf9a81703e 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,7 +1,5 @@
 DIST qt3d-everywhere-src-5.11.1.tar.xz 84763568 BLAKE2B 92510ae0cbc4627a9d0517bfe3a17c4efc6538cd04787b3fcbf5b0f381558deecb96a70f488d797719852b625bb47827ad630692934aad5574865e63f77f589a SHA512 d1a07586d6b64ff3b1e85c41c8b3b86f6327e9e63f5f45344a65a6136179f6a8361ca9da80944b244d8edc53d8b0e9f8b646d613f6b42faac6cb724f49573a8a
-DIST qt3d-everywhere-src-5.11.2.tar.xz 84932180 BLAKE2B 90166932d34d30d02b1453ebb5dc6f0b77104c37023e00198246cd646c74d88e0931fea085f7021097a5d7b61255ef1a4a1a73466db244f26315433a53d8d4b6 SHA512 706aa7e9a43d50823e8cd1e4838417a44761d6391ca3f8bae54d371742789ee63ba36e219c0a66ad3957ae0d68ed8e58c13f56a5f151b2d09e2c99e986aea4fe
-DIST qt3d-opensource-src-5.9.6.tar.xz 83722792 BLAKE2B bd101674c83a52a9df7a0aab738cebd9500a6d4aa4b5d2c2d4ab2f049f9e643d81ccd48273f089fb04c6c5d0417f9bcdaca0948ecc73972870d8fea472f38655 SHA512 6a882e79c7e0e36f620f9ee77d5943b8b0b4d3e1ee94ab08b70fc30c0bd4774967c656d38c489d9478f8feb91fc83614f639e13933b756ada3c12d6123c907de
+DIST qt3d-everywhere-src-5.11.3.tar.xz 84944236 BLAKE2B f1db5cdb569777603868081bd97b0c1b4e68bdb4ec51e133d1078e23796eadd25ecef73caa23872f264aab51ec4b7cfd1d2af087445a8f826c2659fdec5e1a5d SHA512 d75d9b9ddb456d8a0163b35e9417c313c56ca1332fd742cb9a682d3e9d6c68e8cc6603bd900f8c634baf79522a00c0ba9aa82ce3db3b65c4656fef2c71c908af
 EBUILD qt3d-5.11.1.ebuild 636 BLAKE2B 488a2a0915778d7ea337d1d54ce058dd61a94c21d52a48cf1177b1fca282ad43ab1ab20f9c668cf0d6b2d2700dd35554ba35a082377f8f35f72ec1385b0cffa3 SHA512 bedf4da6c6a3ec4e1365042416dacdbe9727679bdbefe122478e33a629f061392d3722bb75e18b6b8021ec353e0de94583af74be24c24c294aba282eb4db0ace
-EBUILD qt3d-5.11.2.ebuild 638 BLAKE2B 5fc0319b01a260a284446d58155f556dfadd8493b7d7f5323ba7a99708ca25f666a0febf16754c4564a5aa5db16726b2f13eb4cab3f72a328457301b6c2c1135 SHA512 fe935e4bc6fa461e5ec41c1c7e3819e909ad7614d1a24dc70ec258e98373454908cc9a740dca3c92704e771de3a70fe164c1b04cde2ab3c0ad8c18eee29a34f4
-EBUILD qt3d-5.9.6.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
+EBUILD qt3d-5.11.3.ebuild 638 BLAKE2B 5fc0319b01a260a284446d58155f556dfadd8493b7d7f5323ba7a99708ca25f666a0febf16754c4564a5aa5db16726b2f13eb4cab3f72a328457301b6c2c1135 SHA512 fe935e4bc6fa461e5ec41c1c7e3819e909ad7614d1a24dc70ec258e98373454908cc9a740dca3c92704e771de3a70fe164c1b04cde2ab3c0ad8c18eee29a34f4
 MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
diff --git a/dev-qt/qt3d/qt3d-5.11.2.ebuild b/dev-qt/qt3d/qt3d-5.11.3.ebuild
index 40cf9458acc8..40cf9458acc8 100644
--- a/dev-qt/qt3d/qt3d-5.11.2.ebuild
+++ b/dev-qt/qt3d/qt3d-5.11.3.ebuild
diff --git a/dev-qt/qt3d/qt3d-5.9.6.ebuild b/dev-qt/qt3d/qt3d-5.9.6.ebuild
deleted file mode 100644
index e65630904901..000000000000
--- a/dev-qt/qt3d/qt3d-5.9.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="The 3D module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# TODO: gamepad, tools
-IUSE="gles2 qml"
-
-DEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	>=media-libs/assimp-4.0.0
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 895b7f774661..42a82058097b 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,7 +1,5 @@
 DIST qtconnectivity-everywhere-src-5.11.1.tar.xz 2734864 BLAKE2B 7bd22542f06f6a46689b176181e83a315569690e3e5ce20f95d473af6d8513c03d47f2c7801cfbce522f49e25e1183e7553e104c7aaa7d071b86719236847438 SHA512 3533b117a6d028ef7bf4fe89b9ee42409b7a6eb62e60bca84e5f1323f6cd9892234d2c9b213ac806cda29cf36c8c6c646dec145933534664d376cda5bff94d8d
-DIST qtconnectivity-everywhere-src-5.11.2.tar.xz 2729556 BLAKE2B 02b7fc6e9caeb55dc518637d3b1f8135074868fcec0743a1c8d82003f77ac4bf382a32afc3c93caaa4f2fd0439455be9fb0b7e6d7aa8f025c425b0182ae9555b SHA512 c6fc77554434abcb2e9b8be75e2d2a5c31b5a92aab8dfd29b94e381da9f423cd2530d31fc0e58b8e101b7101dbcb0e6696abb45423199e2deeac3b9a0b11f5f6
-DIST qtconnectivity-opensource-src-5.9.6.tar.xz 2712048 BLAKE2B 8eec7fcbbb90f147c28de44203e1d584f0aa3efef996a3a9ebfcafbba8bc2d2dbee8779610e44dfb293898c79666a0e82b40707802f76887f8f3f3fdc86beb2f SHA512 6503013cccea89d56ea8f31e3d1c6f8928c101cbbe0311ad8463e7c49421015a731c7f33e41bbac608d5714a8821cc82a4d6e5596db86e00e60c79ba9dac4399
+DIST qtconnectivity-everywhere-src-5.11.3.tar.xz 2729800 BLAKE2B 30c86277eb6f997b52bd6ee42d1c420bba88b78bd65e4bab6fb6c38b8d9d61e14da3ca0148f364b981636920452915dd4889a528276c711eeedea507ebfeb7e7 SHA512 e44f2438792733f633c2788e7bc1910e7fdd72af660137cba8aff37deb92c01253b3f4b5663e1bc381e63bcf7a4b469f2682f8c85e6885af423df3d4a5fb055a
 EBUILD qtbluetooth-5.11.1.ebuild 636 BLAKE2B b4f9856710aec096d0b61ad5c7be8da02af6a4ba87b0629de39e056e185d8c046081a65b35cdcf506092807220e4664a183143696fbc32a73ad1e56d04deda0e SHA512 79b6162387e3b3f052d3ac4bb4aaba5453b1e4803cf2bf5276653d025b14070469ebbd1870fd638bb9d8171dde751c51b6f2e6b20d29baeec3fdf42618568127
-EBUILD qtbluetooth-5.11.2.ebuild 638 BLAKE2B 101107b56b9c9e1374aebcc4b8916ffc2977bf443c359dcba798171978516f16353a7ceeb64d5c808b19b7acb4a3d0c51f2284267e34aba1b2b81474321d334d SHA512 9f67b9d1d42075fe0a4e8fb09bd2b09af12c09d6944783c058eb05415c52772edd71d8c8159a38cbdc8e4de3243dd6e1f6e6bb310962dc4437031ff881032656
-EBUILD qtbluetooth-5.9.6.ebuild 639 BLAKE2B cc1e3489fce5a48b5965d387e34597ff602a15ec1834bc4e4f528700e91b3f171c23cce9134938a83205a938df91442e068b8f4ecea148d85e18fc4f9d39a4ef SHA512 8e4a38ede0f82c8ca87421bb297d2cf0023d863c3da155f11f4c7d8b5fe7e587160e8b93d5ac40db21ebc098c52108b81b212aa2756ee16f4160eda185177857
+EBUILD qtbluetooth-5.11.3.ebuild 638 BLAKE2B 101107b56b9c9e1374aebcc4b8916ffc2977bf443c359dcba798171978516f16353a7ceeb64d5c808b19b7acb4a3d0c51f2284267e34aba1b2b81474321d334d SHA512 9f67b9d1d42075fe0a4e8fb09bd2b09af12c09d6944783c058eb05415c52772edd71d8c8159a38cbdc8e4de3243dd6e1f6e6bb310962dc4437031ff881032656
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.3.ebuild
index b6610fe444f8..b6610fe444f8 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.11.2.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.11.3.ebuild
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.9.6.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.6.ebuild
deleted file mode 100644
index a290372bd854..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.9.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	>=net-wireless/bluez-5:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtnetwork-${PV}
-"
-
-src_prepare() {
-	sed -i -e 's/nfc//' src/src.pro || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 0ba874cc7541..d1c18945fd24 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,7 +1,5 @@
 DIST qtcharts-everywhere-src-5.11.1.tar.xz 4245496 BLAKE2B 92c1d9330d2da96524505186cd39c34765fc65ba5e5947d27f0bc7e275bc044112d3cd9fcef0c5455b20d0fb931d3bf15f8961381e47a7d537e47d1dffcbe5ee SHA512 e3c02ea9bd985a8d051e305dd04e58711de3b666128a695011afd65271a2c7bcb11763c18fe201045ce03df96326490ca7322bdc0f77e97988ec59427505886b
-DIST qtcharts-everywhere-src-5.11.2.tar.xz 4239784 BLAKE2B ffb753a133232afa7037fc5c41d27de748e23cdcd567d0f8a993e1323a9ec8a1d2c49624c4ff2a076471227b47cb9225107ab726a4df9ffa9cfa7520f5f570ac SHA512 19a9a0d78cba75d7ed237647c04237797b6002f9c6a4a08f4d4a90426bd44bdbde3f4ffc78dfafab3abb56faaef458a2577f5249200ad89e125e86049aafb85d
-DIST qtcharts-opensource-src-5.9.6.tar.xz 4155980 BLAKE2B 975ed87424954502184c0d09cfd51f19b5908e4f297b47b5cfe5e40c5818816843d5c90c4012340b8731fbb306eeeb1edd6ba94a7db755604bc8ef6e8cedb168 SHA512 6d6ed9eca5611774ec683a85164858acb9071f74a0b2ade6976edd406232f51915e5fc1d144c9ba7ec69d36a4ab4840aa6d542214cd70673b3a3b8e6a0b88d68
+DIST qtcharts-everywhere-src-5.11.3.tar.xz 4239348 BLAKE2B 4b601e466f6e9bf3c9f90ace35b4c698a51dda7a3be964fdb68928cce1d5bac95c83f6586656a61bc5c014ccd35bae8223c86503eab200036e466a0cd4bd7b21 SHA512 9fc639e210fee95356deaf564967435a6f29a0d2c4a5599ce271c1bd5e5e2300eb1ec4637f20034630a5cfacea9117ebfcd9ae7c2f3c55adf7f4dce34984bd39
 EBUILD qtcharts-5.11.1.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
-EBUILD qtcharts-5.11.2.ebuild 518 BLAKE2B 6b48d374a365faff7e44b4190d3dd1421144f9c8dc3aa030da0f4e7f6111084fab241b9632f5ef2f8b9fee0c397816d2877698c791833aaafeea351264636a10 SHA512 ee27dc7acb7b44744e9ae32e4579e4fa78a7050ebea4a9859214e75c7a95428e05a7df9907acb305d6fef8a04cd68a7efea7151ca6fc9bf8f267b2de910443df
-EBUILD qtcharts-5.9.6.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
+EBUILD qtcharts-5.11.3.ebuild 518 BLAKE2B 6b48d374a365faff7e44b4190d3dd1421144f9c8dc3aa030da0f4e7f6111084fab241b9632f5ef2f8b9fee0c397816d2877698c791833aaafeea351264636a10 SHA512 ee27dc7acb7b44744e9ae32e4579e4fa78a7050ebea4a9859214e75c7a95428e05a7df9907acb305d6fef8a04cd68a7efea7151ca6fc9bf8f267b2de910443df
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.11.2.ebuild b/dev-qt/qtcharts/qtcharts-5.11.3.ebuild
index 75f61952dee3..75f61952dee3 100644
--- a/dev-qt/qtcharts/qtcharts-5.11.2.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.11.3.ebuild
diff --git a/dev-qt/qtcharts/qtcharts-5.9.6.ebuild b/dev-qt/qtcharts/qtcharts-5.9.6.ebuild
deleted file mode 100644
index ff3df69c0911..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.9.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Chart component library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index 3550f31dc4a9..d5347abf7913 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1,3 +1,5 @@
 DIST qtchooser-0_p20170803.tar.xz 32012 BLAKE2B a0363ccebfd17c2ad514afbaf7ea80456826a42b88badff3a2ff4259745721f336a1b034f4a51831832f5b2dcd042c7c010c47e0f17b77ecacc5520f0c6f8d53 SHA512 320d898617ad52392fe24834e99ace685dac84e3a7edb1f6e6358baadb6658a51b02ae1af465ef5e081485a002c787c6884b6e1637ffd0406767fe7555fc32a7
+DIST qtchooser-66.tar.xz 32008 BLAKE2B 1faf4a44406655621e65132289af6a8b0d23f0c1027a3b99017c3951705378bebcfbc3cb32aa59975a101f21294ff701ca6eb6ec18ce977b714a426be0fbcd6d SHA512 0c7d3588ddd7b21e6e9d799204924e06e0b0950c898dfd23088f1e7657b7f821a35579aa062658499809f9d9757e82c3c592591aa2e5ec453463929bf2b33bac
 EBUILD qtchooser-0_p20170803.ebuild 1570 BLAKE2B c386764d8072ba9066f35a1948e173e7cf87bb24cf59853bd24c8b088c050ef620e9e2d34e24ababdd0baf639af3d1e561121f3dd48565ea5f11d9da49ef0096 SHA512 4650af4d9066f9b1ceadff18a02f38634e27ae974fbaa7c1c1894561d0d589900107517c167c2e624b9b5ea51a0c01f9e09c532e6b41da01eb763101f7f57ba3
+EBUILD qtchooser-66.ebuild 990 BLAKE2B 4daa9c42f155e87fb30b94e17494ffcee41ab77b114e1ad1773c03ac2c89d27ccef8394bea2a1e3db615f7e523aef0c67eb9b946f8f56a979fb8532db6181428 SHA512 3865f51a28a2772e1c1a59d90b2652b0380b6fcb9d0e711f53377936621d9ce7e4cee0d78385e2b0f358d9ff45ced66f3b4d1e4f46a55c700f58b9af960b99c9
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtchooser/qtchooser-66.ebuild b/dev-qt/qtchooser/qtchooser-66.ebuild
new file mode 100644
index 000000000000..6582e4b0d479
--- /dev/null
+++ b/dev-qt/qtchooser/qtchooser-66.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs
+
+DESCRIPTION="Tool to quickly switch between multiple Qt installations"
+HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? (
+		dev-qt/qtcore:5
+		dev-qt/qttest:5
+	)"
+RDEPEND=""
+
+qtchooser_make() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		LFLAGS="${LDFLAGS}" \
+		prefix="${EPREFIX}/usr" \
+		"$@"
+}
+
+src_compile() {
+	qtchooser_make
+}
+
+src_test() {
+	pushd tests/auto >/dev/null || die
+	eqmake5
+	popd >/dev/null || die
+
+	qtchooser_make check
+}
+
+src_install() {
+	qtchooser_make INSTALL_ROOT="${D}" install
+
+	keepdir /etc/xdg/qtchooser
+
+	# TODO: bash and zsh completion
+	# newbashcomp scripts/${PN}.bash ${PN}
+}
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index f11ff0c76222..22d04a67cc52 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtconcurrent-5.11.1.ebuild 453 BLAKE2B 529d48392b61d57f943062af899d19ce0148595ae085c7a5fba0886777dd56f4c40d5ee0bdf84be0baffe2782da4a63d8ca3b57195d4dbf9d46ed10f105403fb SHA512 af8082eae11587eccfc5cd572c303dc087fed5aa374fe60fcab876f1626754b1bab6a1866b3b33e1744b13087ac8c27c2d634e598ec82e3003e41448146397b9
-EBUILD qtconcurrent-5.11.2.ebuild 455 BLAKE2B 436a0f43e4e0a1107173c34d5ecaf573b9166727b95398f5677a6df87273d3d58abdea70a721e3850bfbcdfedfdfb9e0e9f0e046ddd4faa8fa7b496ec66d5a32 SHA512 509fcfc01daa203d0f3f882adb4dea59af534f123d23e7b74fa4b81a930e8b92bdd2f71459a0de42f4534ef2d943b1df14a513e312a29ec0aa7eb4bc60cb40c5
-EBUILD qtconcurrent-5.9.6.ebuild 454 BLAKE2B 4bc4517da2cd438286ff1dfe291ff3c7ce7a1980f7ccf507c58b6c70e2411b39aca015d7a32cdb6b9f9d2099f3f45c0db2af649d7f6a7d3c0f1e014f079978a1 SHA512 09e48863a11d27e7a4424500cc96178546de91570d29804d3284d5195a1fb057b33635469cc4baf7d89a305aa5dc5622c122861d2e7298f807f7729d4f8b274c
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtconcurrent-5.11.1.ebuild 451 BLAKE2B cff081ac274936eae9ed8ad606fd373702ea62064965abd6bccfbec9f1fed503ec7edbc9822f52a7ca3c6b23a72247e06962a877bb1ae9d928bb5c5c2323f11e SHA512 22e66c97f254ab35b7d5d42f393f52789eda739acde574ae016d20e7929f7389b49d93feedecfcf371f2d0973b80701c429c62a464350d73d0722fd1ad4ad325
+EBUILD qtconcurrent-5.11.3.ebuild 455 BLAKE2B 436a0f43e4e0a1107173c34d5ecaf573b9166727b95398f5677a6df87273d3d58abdea70a721e3850bfbcdfedfdfb9e0e9f0e046ddd4faa8fa7b496ec66d5a32 SHA512 509fcfc01daa203d0f3f882adb4dea59af534f123d23e7b74fa4b81a930e8b92bdd2f71459a0de42f4534ef2d943b1df14a513e312a29ec0aa7eb4bc60cb40c5
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild
index b63e75f9001e..11ac804c494b 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.3.ebuild
index 098a3a793986..098a3a793986 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.11.2.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.11.3.ebuild
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9.6.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.6.ebuild
deleted file mode 100644
index dd0317c9bb96..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.9.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 03878fcd7466..cc92bc476790 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,9 +1,5 @@
-AUX qtcore-5.11.2-export-qt_open64.patch 1215 BLAKE2B 933cd8eeaaaab8cbc0c4ee5caa422d4a0c8b49f8de717786b7dace159c07583fc83875957cb4cc8191fa675de26773e32d7ff05b495991f639cf93eca05896d3 SHA512 60089c900a690c9f6514499ea5b54230736fb89fdddcda0bba6ccfe2cbc424a36f0fab86d7b546b92316d262c5ae31dd351535b4cc7fd4f6fdcfc403cccd7a03
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtcore-5.11.1-r1.ebuild 1499 BLAKE2B 801d71a80d202eb5b44d06b3f6add2af5689a068455935ee44a45438ec32308ab22bed8ce3028d56dc68665827dbea0a06804e4a0dae189fd679df30da3e324a SHA512 30b0ec962489979874e14e42ca2f77605f71128b360c44f08e0b1d00f65f43ad363e736c2332504a677d447079da3bfe7e3643f638d291aa5efea44faff9d294
-EBUILD qtcore-5.11.2-r1.ebuild 1570 BLAKE2B 9c029ee97c2d6f132cc95727106b4c07c94789a80d7dc84324852f2fb2ed7fa00773ee86ebf15ad45cba4bb7cb97e0485db91a3bd81766fa44c5a641f7a1bf30 SHA512 74e6de58a624bc8855818d2dc5c3b75e78444f042d073c5d265df92a339f998124035092c5a6370e55cfeeff56a336e22d5b92c876fc917df58f3fef11d01d59
-EBUILD qtcore-5.9.6-r1.ebuild 1504 BLAKE2B 098e1da5ccaa1c453921fa1d50f209cdd67d9ffff8900e8d0c1a5c4ccf49d5788b4c74112931cec1967c86ac9b19a7f1a152bf04f9f6f88099461097cf54a56e SHA512 c52096cd039803fa4a33ef4845925e197938a7543f7e8418516acf4194e8110f7c91eb43572f60cd7c67ca718f8a069ad057376f2a1b6dbf48752f340ffbecbf
-EBUILD qtcore-5.9.6.ebuild 1508 BLAKE2B 34ba4a5cb00b733481fa35cb0e892f6eba653f4693d24e06f8c3dadf436255d6ab33f6327a14614453e7d88a8c4c1c988fdbc16c7690453051012215c0f50b07 SHA512 7c511688ca6323acc9d7f8e97074b69a25548a8203e2dc9c8b68a2b8c0cb6950e4e3c20fd41edc1a9dfbaa59c5394ef8f3611957624179c57ceb27a962559eaa
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtcore-5.11.1-r1.ebuild 1497 BLAKE2B dc8c05202166bc739f802e189ab1a65fdec5b5efb25481747f58bdb1ae233801518d9fbf1ce79ca9c225bf0ea4c934e24fa7476eafaa62155489b7c1912c6617 SHA512 24ffe80cff087a3d004a2708b9c7db1e3e62cbb962c658ed6130475c0e9639f69867d7ff96116c6d44f10ed7e2b6ca93a8651db99efbd89b47ec84b9d18b382c
+EBUILD qtcore-5.11.3.ebuild 1501 BLAKE2B cda3a9e84e0f6ee662512105ae86b05addc30e97923dd0721b7fe13009a0963b1e1a7655b418bb0c82bf029e760c45cfaab9493d85c607301203985ce6100493 SHA512 e5937c66ed4409b571eaa908d835fb857b3944568fe857fcbe90d46367f3033e4ec0eda59500bef2e3fe3cc53b5bdd3a1dfac74c23fd07a4e52146102a6868eb
 MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/files/qtcore-5.11.2-export-qt_open64.patch b/dev-qt/qtcore/files/qtcore-5.11.2-export-qt_open64.patch
deleted file mode 100644
index a0a6bff9f66a..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.11.2-export-qt_open64.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Fri, 21 Sep 2018 09:04:24 -0700
-Subject: [PATCH] Export qt_open64 from QtCore
-
-Other libs use qcore_unix_p.h.
-
-qopenglprogrambinarycache.cpp:function QOpenGLProgramBinaryCache::load(QByteArray const&, unsigned int): error: undefined reference to 'qt_open64(char const*, int, unsigned int)'
-
-Change-Id: I44e7d800c68141bdaae0fffd155675d15eded2e4
-Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-Reviewed-by: Eric Lemanissier <eric.lemanissier@gmail.com>
----
- src/corelib/kernel/qcore_unix_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
-index cb98bef3476..5a2a29a3273 100644
---- a/src/corelib/kernel/qcore_unix_p.h
-+++ b/src/corelib/kernel/qcore_unix_p.h
-@@ -178,7 +178,7 @@ inline void qt_ignore_sigpipe()
- 
- #if defined(Q_PROCESSOR_X86_32) && defined(__GLIBC__)
- #  if !__GLIBC_PREREQ(2, 22)
--int qt_open64(const char *pathname, int flags, mode_t);
-+Q_CORE_EXPORT int qt_open64(const char *pathname, int flags, mode_t);
- #    undef QT_OPEN
- #    define QT_OPEN qt_open64
- #  endif
--- 
-2.16.3
diff --git a/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild
index beb350110d0f..3bd30426b0df 100644
--- a/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="icu systemd"
diff --git a/dev-qt/qtcore/qtcore-5.11.2-r1.ebuild b/dev-qt/qtcore/qtcore-5.11.2-r1.ebuild
deleted file mode 100644
index e40ed0f6f4a8..000000000000
--- a/dev-qt/qtcore/qtcore-5.11.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/qfloat16-tables
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-export-qt_open64.patch" # bug 669010
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
-		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
-		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
-		XCURSOR	XFIXES XKB XRANDR XSYNC ZLIB
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.9.6-r1.ebuild b/dev-qt/qtcore/qtcore-5.11.3.ebuild
index c3da14471f41..8ebee8177121 100644
--- a/dev-qt/qtcore/qtcore-5.9.6-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-qt/qtcore/qtcore-5.9.6.ebuild b/dev-qt/qtcore/qtcore-5.9.6.ebuild
deleted file mode 100644
index 3b0b4e440477..000000000000
--- a/dev-qt/qtcore/qtcore-5.9.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/qfloat16-tables
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
-		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
-		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
-		XCURSOR	XFIXES XKB XRANDR XRENDER XSYNC ZLIB
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 2c5056404785..34e384e10261 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,7 +1,5 @@
 DIST qtdatavis3d-everywhere-src-5.11.1.tar.xz 5206688 BLAKE2B 2d5de648a9f80085f98902a8b086d5ce59c366c445b3ab80d313a537ae6b3d19924c886e4f2f3c0a219e874e4430c9327fde266e770b6ceb1f45e62f6a67aef4 SHA512 e88f2471fa39fd4f4c7900df5edadc568d000b537eb00f892fadc6cf1d7845987b9fd98adbea4c35c6469c9a9bfce087b26440a6419ca758451dbe3b669d19cd
-DIST qtdatavis3d-everywhere-src-5.11.2.tar.xz 5196328 BLAKE2B 5ef72dc6a91bf8fa34ef07e991d50350b2d315de43ba1b674c1d2ff6950426e5225b50c50ae69dba3f0a5d99587122b892a01e496c4820337e505aeca89f4c82 SHA512 ec5599d95e30a9d6b4fbed53087aed4607a4ad5f8322610ec785c970a0c65b215344ec842c6c21791f27ec015610fca47e6af2608f2682ac2e6d114b0f0b80a8
-DIST qtdatavis3d-opensource-src-5.9.6.tar.xz 5162724 BLAKE2B b6211a06b5484ddcb81fbe0f676fd4866e2e7b586ad3cd732f080c66079a2cd2b9d53eef25c536cb887686363df3ff39272272e4db621faf28c04e68ac011147 SHA512 fc209e704010e8be5fd6600f86eab5e6b45acde16472589da4945a70db320a13cf282db566182cc546191d245d258a3a227d1bdcdebbc7c7ed31ea00b929d495
+DIST qtdatavis3d-everywhere-src-5.11.3.tar.xz 5201492 BLAKE2B 6ccc679892b6e234075cad890823ce5b20c887479f306284c49b40672da54dddc1d65970e3771e05b48ea7acf3e031593c77f64ef32e52106506cf10281c6aa1 SHA512 6e672a7d07f197b86d7914d249078137ae247463c1da77ed01cedc71326e6e4009ecfc7cd59f2277c290ba1e3c84b741466f9feeae8391a11bb7fc458bd06aae
 EBUILD qtdatavis3d-5.11.1.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
-EBUILD qtdatavis3d-5.11.2.ebuild 622 BLAKE2B 1ccf7676850642c1a0109c5f9c9e2f5ccbd634fe073d16e71c84fb80d5d5cb28b111f4a15257151cdf1c582869a0303f7744fe7c8d280a184762e627fe0edb77 SHA512 664223cdc4b21f5972b1e56e4a9d7d9e9d15a2ac537b86cfa9dd1102e52727cc14d1deb3378797b84ef2d9f0cd4cee663bd32915ccd6e825a3644cd036e77fff
-EBUILD qtdatavis3d-5.9.6.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
+EBUILD qtdatavis3d-5.11.3.ebuild 622 BLAKE2B 1ccf7676850642c1a0109c5f9c9e2f5ccbd634fe073d16e71c84fb80d5d5cb28b111f4a15257151cdf1c582869a0303f7744fe7c8d280a184762e627fe0edb77 SHA512 664223cdc4b21f5972b1e56e4a9d7d9e9d15a2ac537b86cfa9dd1102e52727cc14d1deb3378797b84ef2d9f0cd4cee663bd32915ccd6e825a3644cd036e77fff
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.3.ebuild
index fb629edbad01..fb629edbad01 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.2.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.3.ebuild
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.9.6.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.9.6.ebuild
deleted file mode 100644
index 647770499acf..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.9.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="gles2 qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# eliminate bogus dependency on qtwidgets
-	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
-
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index e62d9b5173f1..5274813b20dc 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtdbus-5.11.1.ebuild 697 BLAKE2B 459b16c7b8148fc98f9b5f8cf0523ef2ab6d94f3eac6b961cf8a6ddebd5ba3a4c1aa37ffbba721b78041609c975ffbf2c6d89a50bdd55cb5ea1d6b6ed7992e62 SHA512 6600892cb8b1d36b12052e1b0b81bec2ae670a7c60714300cda853a6fb9b10224b76fbba8ef4648ba0ab403ae93d084b0508adb217245d0466e0e843330102bc
-EBUILD qtdbus-5.11.2.ebuild 699 BLAKE2B 0e6c2d9c831ffebbe0b4c441438252c847a1a3144473987864d252d4cb3d5167c924756a116f540c07d5656a1989304dbe6932869a2a1c89de803a1dc8a018d0 SHA512 61059da5b1d5be1b5188061fe45a8f5a35d4c95715287ae45fb513a9d159c5199239bfa5ae14e48135770cbb0253f7d94cc084a36a0e64296095683db692d606
-EBUILD qtdbus-5.9.6.ebuild 698 BLAKE2B e36bd662664c15e3f4349f39207655309e74e19cd32cc110dba194869df0e135bb6ada418d3efa5296f54643499b00e6771354f9c1f869b54a03311b384df306 SHA512 f27de442a099e481b51c55cb4cf2e8d6fd46c38229c5e929470e71d59eea47d7c6ad08d16c09646d4f779bf065cfb885a5ab418132b7be726f2e1a923891f3c9
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtdbus-5.11.1.ebuild 695 BLAKE2B 71e305ae9a3c723d9976ad754ef735b3d6a9c0ac1cffaf7dd8448384fad40a402e19b475709d6852a8d25d4dcb9ff2e36d2a824a20cbe2e6a8802c5ec97afcc7 SHA512 f2bb5c95fddab0b186b27e1ef20c00942b288028d56649a4797bff15e6e25b58a6e5815e9917ee79d34f8f65127a84b6ea0fd2a5fa37e8000ac16a92ec17f2d3
+EBUILD qtdbus-5.11.3.ebuild 699 BLAKE2B 0e6c2d9c831ffebbe0b4c441438252c847a1a3144473987864d252d4cb3d5167c924756a116f540c07d5656a1989304dbe6932869a2a1c89de803a1dc8a018d0 SHA512 61059da5b1d5be1b5188061fe45a8f5a35d4c95715287ae45fb513a9d159c5199239bfa5ae14e48135770cbb0253f7d94cc084a36a0e64296095683db692d606
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.11.1.ebuild b/dev-qt/qtdbus/qtdbus-5.11.1.ebuild
index 9898de235fb9..2951574d23b2 100644
--- a/dev-qt/qtdbus/qtdbus-5.11.1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdbus/qtdbus-5.11.2.ebuild b/dev-qt/qtdbus/qtdbus-5.11.3.ebuild
index d5a040659786..d5a040659786 100644
--- a/dev-qt/qtdbus/qtdbus-5.11.2.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.11.3.ebuild
diff --git a/dev-qt/qtdbus/qtdbus-5.9.6.ebuild b/dev-qt/qtdbus/qtdbus-5.9.6.ebuild
deleted file mode 100644
index 34c8c8730156..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.9.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index cbd46a4be89d..b7fe05689d89 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,9 +1,6 @@
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
-AUX qtdeclarative-5.9.5-texture-memleak.patch 2199 BLAKE2B 7b0f531e095fd80731983faf106811ef32d38ce83c2bb595683203d81d671d105720c6ee840740c4c30b0027c52825844bd1fe60a7ab52499feb2699ada92729 SHA512 20c83cd85120475fcec31c6394c149ab6d271f8f4856cd9da60346faebb67e3b119001fc3b0cbfd3f198f5237c4330e878d68d530f859192b6dd9560d7a949e5
 DIST qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053
-DIST qtdeclarative-everywhere-src-5.11.2.tar.xz 22217460 BLAKE2B 91a5619aeb09bc98dbe9c9ddc5e00b65d5cc9aac9f2d40f7e4a7001bbd2a1806a640e2a30d7de8698513b54b67d5bd4b551654ea119ecffa27cd91f3dba9327b SHA512 30d3ddfabceaf48666cb5ebc5c3a25318152daeed599b1a0a1b3c2feff353708de4760472babbe55a685582c0640a2789fa2fa239d151d17fe2b36950836f7ee
-DIST qtdeclarative-opensource-src-5.9.6.tar.xz 21417200 BLAKE2B 25d62058d85f845eb8a61ed949f7f3b2af972c0d3e97e4fe24b309fcc9570b5a00716bad012fca4cb8f65858b4aa7afb735181270be32e6a7bbe126d6a5931e4 SHA512 1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39
-EBUILD qtdeclarative-5.11.1.ebuild 1410 BLAKE2B e8b8f4709e85a283717b67844724a143529774ef173af538952c162925dc44a5a1e3b7c563d4ebe5b4c3f70a5db5fec2a81767d7ca1fc7acf24fb102a0fa56c7 SHA512 658e20956e049df0fb0e0738cd025e5d0caadf5683f6070c7280e7ab0de37cb0ea6bbb62dd7e6395dc78fe5594d31e8cfacaa4dca68dd2b5486d8d4eb93498f8
-EBUILD qtdeclarative-5.11.2.ebuild 1412 BLAKE2B 45f629e505ef268c5e296edb07694e34598c4f17b935acdc1696a25f95493910760083b3378dec25ad0f3f20b15560a4d9f6c8c90ecba366ef333ea7a4552cc1 SHA512 4ab1b083ed4b9dbcced35d66f81a04792a1342ec8cfefeb61e46591293bf46774d3d3d5c11901a2cd9dfca0a862a761385ed80cf42f84df67619e2bc8c5f6c4a
-EBUILD qtdeclarative-5.9.6.ebuild 1391 BLAKE2B 19044927b073a5f22b05ab071d1c33299503a16532884987a1b7f1ebe42de240cb13d9dde9022e689bbc76a16c7e5797ec4a9f7458f0020fe3235531b4a81bbc SHA512 4af1771d4bc4886fa2361eb65be5711f7133d9e5a1e4f9b9394690f3ddd9b0945042d93b17a08531f64297afe154535c139264300f173d1c75bde8b0c4a5598b
+DIST qtdeclarative-everywhere-src-5.11.3.tar.xz 22233024 BLAKE2B e443e578091f6f2154f4dda4384b07ff510f92757e113f07e1a6cc9a95caf6dc7994b72b8816e8fb03893ed8180058ae887031af880218e43758b49c397f58e4 SHA512 07d440b10ba2fbd700a191791cb6991fb9ce72c78787340e7f564bdb2bef24b035e15fe2aecd36d58f8794e56bd0aa35d28b350a73707e27748e54d46609e1a0
+EBUILD qtdeclarative-5.11.1.ebuild 1408 BLAKE2B 4eada134a4434034fa24aff60d0f3fbcc50e7fb9b5573420acfe38d611fc14fcea58790d3deb568b5ab262b16d97ebc9d24f6c0a3c60037e5a168e4276b3ad33 SHA512 2b0568144286812f6b7ac1a9267c1f2e946c0adb35ac74562333189ee8cce34435481a0e5def6e4d17a93257b26c71057cb38efb6fcd3e1e67de363d54557c78
+EBUILD qtdeclarative-5.11.3.ebuild 1414 BLAKE2B 41c13dbd30089ce055583b5c4f1efa404eb6be11faf288b7e12d6bbcf53b98dfc592ee3f2e5db670105536bf5d2be4d1c74aedbdbee18e948f826e5534a1e4a7 SHA512 7558d871cc6cb9316d7bed96192ce0a02618411a8e7bb96014c639ffbe2022ef0d619bc4f31a3dcf6fa023c8cc92857e8c203317649495042efffe8840b88aad
 MISC metadata.xml 811 BLAKE2B aca4ded12a2034fb5964d6c38806edeb1b2b984c182fe6ae5cf26f28db3ffa8cc942e8354971e46d7bd6f8eef600fe52ef3e0cdb5cb2aef7c7fe616fbc81d712 SHA512 0e278f92094bfc3d7a295cf559178ff093f5ff6776f03037cc9cb4e8574c9298c76f6210f84e611c8cf1c6c063cfd78f8d0c478f30798fc775d7bedcc409c711
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch
deleted file mode 100644
index c2a143ecbeda..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 839f09c65523fb5c419b62e078f72bb39285449a Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson@kde.org>
-Date: Wed, 28 Mar 2018 00:24:56 +0100
-Subject: [PATCH] Avoid marking hidden windows as updatePending in Gui render
- loop
-
-Since eeb320bbd8763f3e72f79369cc3908e999a0da3c the GL context only
-deletes textures when all windows with pending updates have finished
-rendering.
-
-renderWindow will not process any window that is not visible. This
-leaves a logic bug that we can have the updatePending flag set but
-never cleared.
-
-If we have two windows, this leaves the other window still updating
-normally, but lastDirtyWindow will always be false and we never call
-endSync.
-
-This results in an effective memory leak of all textures.
-
-This patch resets the flag on hide() a move that can be considered safe
-given the show() method will reset this flag anyway.
-
-Change-Id: Iab0171716e27e31077a66b5e36a00bf28a2e7a8c
-Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-Reviewed-by: Aleix Pol
-Reviewed-by: Andy Nichols <andy.nichols@qt.io>
----
- src/quick/scenegraph/qsgrenderloop.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
-index 60f3538662..2eaed497ef 100644
---- a/src/quick/scenegraph/qsgrenderloop.cpp
-+++ b/src/quick/scenegraph/qsgrenderloop.cpp
-@@ -305,6 +305,8 @@ void QSGGuiThreadRenderLoop::hide(QQuickWindow *window)
- {
-     QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
-     cd->fireAboutToStop();
-+    if (m_windows.contains(window))
-+        m_windows[window].updatePending = false;
- }
- 
- void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window)
-@@ -494,7 +496,8 @@ QImage QSGGuiThreadRenderLoop::grab(QQuickWindow *window)
- 
- void QSGGuiThreadRenderLoop::maybeUpdate(QQuickWindow *window)
- {
--    if (!m_windows.contains(window))
-+    QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
-+    if (!cd->isRenderable() || !m_windows.contains(window))
-         return;
- 
-     m_windows[window].updatePending = true;
--- 
-2.16.3
-
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild
index e9a3916454fe..81afe9dc24bb 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild
@@ -8,7 +8,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 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2 +jit localstorage +widgets xml"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild
index 325ae743da16..8876b08e5c0c 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild
deleted file mode 100644
index 6ad4e5617306..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-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 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="gles2 +jit localstorage +widgets xml"
-
-# qtgui[gles2=] is needed because of bug 504322
-COMMON_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=] )
-	xml? (
-		~dev-qt/qtnetwork-${PV}
-		~dev-qt/qtxmlpatterns-${PV}
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-qt/qtquickcontrols-5.7:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.9.5-texture-memleak.patch" )
-
-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
-
-	qt_use_disable_mod xml xmlpatterns \
-		src/imports/imports.pro \
-		tests/auto/quick/quick.pro \
-		tests/auto/quick/examples/examples.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index b1637868f1d9..1fc607ac4e62 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD qtdiag-5.11.1.ebuild 723 BLAKE2B 4f1e3a9aac15172f8f3c3ed8ac798df59dc4f630f617e7a45e4cd47f9bbdb92f4f0c44f7952fb1a19ddf2dd0a901d29bd4e554499c781eac7aa3fa41747ae0c6 SHA512 d165e299faf51c7cd1ed647c6612e7a28c26ba3885fbd51d43d36490df86e9cc0cec15d506aaad844ea875992bb24935c04f9df88e997665014b868730a3ad22
-EBUILD qtdiag-5.11.2.ebuild 720 BLAKE2B 2d2536796532af24f6cbf3b675a46b250b54625a860741fbd6ebfa1e8420ccdcebb303347b127c52513a6f3837492c513b39e26b23c88041ba952300bac490fa SHA512 441971de1175d6b85b2e366896ccb96784704f3484cd1e3ecea519b28d466cc9cca886174604860b405f7ff3d3548c982e46d1f9b544e6c0001078916fcc8801
-EBUILD qtdiag-5.9.6.ebuild 723 BLAKE2B 4f1e3a9aac15172f8f3c3ed8ac798df59dc4f630f617e7a45e4cd47f9bbdb92f4f0c44f7952fb1a19ddf2dd0a901d29bd4e554499c781eac7aa3fa41747ae0c6 SHA512 d165e299faf51c7cd1ed647c6612e7a28c26ba3885fbd51d43d36490df86e9cc0cec15d506aaad844ea875992bb24935c04f9df88e997665014b868730a3ad22
+EBUILD qtdiag-5.11.3.ebuild 720 BLAKE2B 2d2536796532af24f6cbf3b675a46b250b54625a860741fbd6ebfa1e8420ccdcebb303347b127c52513a6f3837492c513b39e26b23c88041ba952300bac490fa SHA512 441971de1175d6b85b2e366896ccb96784704f3484cd1e3ecea519b28d466cc9cca886174604860b405f7ff3d3548c982e46d1f9b544e6c0001078916fcc8801
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.11.2.ebuild b/dev-qt/qtdiag/qtdiag-5.11.3.ebuild
index 638fe54cee16..638fe54cee16 100644
--- a/dev-qt/qtdiag/qtdiag-5.11.2.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.11.3.ebuild
diff --git a/dev-qt/qtdiag/qtdiag-5.9.6.ebuild b/dev-qt/qtdiag/qtdiag-5.9.6.ebuild
deleted file mode 100644
index 402759de40e2..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.9.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="+network +widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
-
-src_prepare() {
-	qt_use_disable_mod network network \
-		src/qtdiag/qtdiag.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/qtdiag/qtdiag.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 2bf5eed36976..2cfe8d4785ff 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,7 +1,5 @@
 DIST qtgraphicaleffects-everywhere-src-5.11.1.tar.xz 14272760 BLAKE2B 079c4c22d222c8aae3e16a9b818ed792652692a6dce4c56afe404ba53a777e6d32afca00b2b03fee84010714d4a94dfa3ff257ab2fbb649fde4ba4a605cd72b0 SHA512 0e79eac7debfd8904063d6b03938f62ed72194b5de164e0700d27bd2aac15e390cbdd337fa9afb62435862972e488fb01ae54f08d2a492719baa21a410272297
-DIST qtgraphicaleffects-everywhere-src-5.11.2.tar.xz 14262460 BLAKE2B a46683c6e755600f80247ea29eed17257e19f5f51e41da1ebbb1ae237d798a678b301f64cc0da74d34d9ffec7ea7efcfecf27ad3c50d3c09a537c2fde1d3314b SHA512 a76bc46e6442fb66d0f99056c527593ff6df1336f24644fc6d265f21c5be3ff9329cdebb8b677b8b29e3a49fc98b90c9a5838a991ae998b81cda21028826071f
-DIST qtgraphicaleffects-opensource-src-5.9.6.tar.xz 14226968 BLAKE2B 1200c65dff266a27178bc9f30ba7717fbdf8d7d29bd25ac7edc2c45f62bfebf5748205933266edc0b3733b382f5596f513298786fb9e8e1f36a8de67ebfb946e SHA512 a319dd594bd9048242512cefddf8db0474677d48a03c7616633d7e3b7dd6637ff2c7cce206d25d3938a6b3f3cc7ffc037630e5923caea0bfa7612e99522e36ea
-EBUILD qtgraphicaleffects-5.11.1.ebuild 446 BLAKE2B 181f3d369fa84c369fa8b8a254397810e7cdb4172a091c025255b88e43da04971f5086f81a50986659b6efee2ecbde1124c5d9070811f24f4a1f7b026e5081a2 SHA512 72c5453e96fe6c74b3d7ec53eb3ca9a8549519ef08279fff4f865fb7fcd2cf620a07cf7538e750c16584ee4951c0d8ba295da0c3861909ab1f1b0cf73af350f0
-EBUILD qtgraphicaleffects-5.11.2.ebuild 448 BLAKE2B d73f17137a3f3bfe9a659397b612fdbeb03649758349dfd62c24c0a8d81733912ab5772aaee5aa893fb69bb4974f3ca89b8142411bac715c2f1f0168f88b0b77 SHA512 993675a828f4db55cf7a8ba30e983fcac4962b63ba1d115fd99927702b467cdc2c93eb5840db72d0b65bb5eb975a2e2702abf9be173628afad550e07f99a884f
-EBUILD qtgraphicaleffects-5.9.6.ebuild 454 BLAKE2B 8e69c916a4822f6a3becaed40ee7edc4921d0f8a1ec3be1554970aed72c82ee02e0d10cb002380cbf9b7df535fbca6cd14c1ae23ec2fb18b30371e304184486e SHA512 8e2482b22f22715f03d944afe0d2e75e524499afb3323e1a1e049db2dc64d66fb3f36966dc5fbc0fd94d4e2954a17d89a7883167a15c7efb8fe25656d6d622fe
+DIST qtgraphicaleffects-everywhere-src-5.11.3.tar.xz 14267588 BLAKE2B 7f64c33505681de524af4dd97707ace7cbb371b15a500516afbabb4e61a13008b2e1c418f2500539ded2dcb4cea8e625c1fc029d92568e3c85aaad5562fe046d SHA512 c07072f7b32fd4e25f80318c48ae5a7dde82a0524ab37b174a5abeb36362e9e493570e2477c11bc4184ecf668a3879df8355fa0693a709f0a06224b41c144502
+EBUILD qtgraphicaleffects-5.11.1.ebuild 444 BLAKE2B b01a46e6de70bb4ac7ca686556c4ee621bf9eeb86817ad71b13194289532003281858be26b43a9be7e6ec64b67642952599140ce74fc8681ddc31b9c4df2feba SHA512 518ccba62859a6c390d03739d58e42d036ad4b11618d3a94c89a81c04dceaae23364ec342ad321399ffa4f0cc0abef60397ed3ab84764ebd824f14d33f10fb4d
+EBUILD qtgraphicaleffects-5.11.3.ebuild 448 BLAKE2B d73f17137a3f3bfe9a659397b612fdbeb03649758349dfd62c24c0a8d81733912ab5772aaee5aa893fb69bb4974f3ca89b8142411bac715c2f1f0168f88b0b77 SHA512 993675a828f4db55cf7a8ba30e983fcac4962b63ba1d115fd99927702b467cdc2c93eb5840db72d0b65bb5eb975a2e2702abf9be173628afad550e07f99a884f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild
index 56488b580edf..c49b15eae776 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.3.ebuild
index 66e01da425ab..66e01da425ab 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.2.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.3.ebuild
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.6.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.6.ebuild
deleted file mode 100644
index f200b09a9f35..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 5f2fc9b07c0c..a3c582a91fb7 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,8 +1,5 @@
-AUX qtgui-5.11.2-qapplication-block.patch 1961 BLAKE2B ff509c7ddc68c3c330dc5ce3ff19a5fd53cc641052baba0696f6ad15d71a3c47b2516c93b3df7dde6df318d0ffd7f5f99d9ba0c99718975c4fb66017b307f97f SHA512 0651a91e6e09a9c85eb1361f9c8d94578092c2909f107fa3fb0bcb220240bd2ef24e679a84822d29114cd799623840ea130b08081fd58e1f8953c21983bf5156
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtgui-5.11.1.ebuild 3577 BLAKE2B 4debbaadcec2d65932a9de0b88853686916498788edf2f9815b6f7056a6343d185fd4d52f391dddacd85b9783f6e0702493a2cec63d765da72bb738256cb21b9 SHA512 44e0251524ff3e8f50b9a85ba1272f304ae54b90582011faac76d006f59107f85bfce0a4aabeb8cbd6a76f058bdf1581399e38a351de13c6fde7a14cf916bd93
-EBUILD qtgui-5.11.2-r1.ebuild 3649 BLAKE2B cda2b2016f8832c9a109b61f25e0318a532d1073720db41d275223b9143a6ba283496ec2a9bed1955ede3bab1d6421362131919e250e5f6760a766b1b7a108f8 SHA512 b49c0c3c0add5aaef91dfc848890a57b12594c40806f6161115adb15cc339535e43225fa17b989e7748b17bdf1412d226a4e89710951e6f569271bd6fda8a4be
-EBUILD qtgui-5.9.6.ebuild 3560 BLAKE2B 8f85331e6c6ae16810f546a993a2b19ac94f358ff84a6610f49eef9184b42329b2c1b096f857bf958ff12c122d72baddfeb00e762a63d4219ecd0e4d601b054a SHA512 ff2e051a60f35b729827e57fbe5ff0d40449536cb3dd2f79658435b747bbc72fa356c4b42e44a9b76b4725483857af90037c0773b8a05d1854aa32bc7137a217
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtgui-5.11.1.ebuild 3575 BLAKE2B 47bff9fe61825a476b46b734c2156b05afb81a798e5e381a9dec306f98e0c37726d868d0512ecfb80dc1842ef2c2c8dc3af3ec895d8f0cd0c78098eb75487f0f SHA512 1a014dc31300db62f18ad8a67a508576bd1f141355a12dd46927e26de9fcf9adb09261ecfff4099dbac182bb0aaf14ca3f79de40d4f7ed6c83b9a21341a37282
+EBUILD qtgui-5.11.3.ebuild 3579 BLAKE2B 8a184cab738d654a19c9a0b05133bd1682fb7eb5ed7b71fce057d3268d5fb9efa9f3f523213d6f7092b62c5ba5aa4315848a5d2015d2343a5e610d52c32f224f SHA512 60523f34083f85a9f6cc9f1e7544f8c755c71e622c330e071ef110bf00086235c39c38ef7b63f68b7feb18d326269683372df46507f3b64f5fae6bed3beb7edf
 MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6
diff --git a/dev-qt/qtgui/files/qtgui-5.11.2-qapplication-block.patch b/dev-qt/qtgui/files/qtgui-5.11.2-qapplication-block.patch
deleted file mode 100644
index 115b42b8e93e..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.11.2-qapplication-block.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From d4e937a6280f34bc1cce8c8cea3806a741312fbc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
-Date: Tue, 25 Sep 2018 18:45:10 +0200
-Subject: xcb: Don't get initial screen rotation
-
-"xcb_randr_get_screen_info" can be slow and in some configurations can
-cause short mouse cursor freezes (which will happen on Qt application
-startup).
-
-Initial screen rotation was used only to not handle possible redundant
-screen change event.
-
-Fixes: QTBUG-70760
-Change-Id: I9f01325a045d2c82c4dd2fce91a18a34e54a4bcd
-Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
----
- src/plugins/platforms/xcb/qxcbscreen.cpp | 7 -------
- src/plugins/platforms/xcb/qxcbscreen.h   | 2 +-
- 2 files changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
-index 7f2793b2b7..a696e2a311 100644
---- a/src/plugins/platforms/xcb/qxcbscreen.cpp
-+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
-@@ -118,13 +118,6 @@ QXcbVirtualDesktop::QXcbVirtualDesktop(QXcbConnection *connection, xcb_screen_t
- 
-         xcb_depth_next(&depth_iterator);
-     }
--
--    if (connection->hasXRandr()) {
--        xcb_connection_t *conn = connection->xcb_connection();
--        auto screen_info = Q_XCB_REPLY(xcb_randr_get_screen_info, conn, screen->root);
--        if (screen_info)
--            m_rotation = screen_info->rotation;
--    }
- }
- 
- QXcbVirtualDesktop::~QXcbVirtualDesktop()
-diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h
-index 6438669e7a..792aca4b06 100644
---- a/src/plugins/platforms/xcb/qxcbscreen.h
-+++ b/src/plugins/platforms/xcb/qxcbscreen.h
-@@ -220,7 +220,7 @@ private:
-     xcb_randr_crtc_t m_crtc;
-     xcb_randr_mode_t m_mode = XCB_NONE;
-     bool m_primary = false;
--    uint8_t m_rotation = XCB_RANDR_ROTATION_ROTATE_0;
-+    uint8_t m_rotation = 0;
- 
-     QString m_outputName;
-     QSizeF m_outputSizeMillimeters;
--- 
-cgit v1.2.1
diff --git a/dev-qt/qtgui/qtgui-5.11.1.ebuild b/dev-qt/qtgui/qtgui-5.11.1.ebuild
index 8efc3a369b4a..ddb2d1403d49 100644
--- a/dev-qt/qtgui/qtgui-5.11.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # TODO: linuxfb
diff --git a/dev-qt/qtgui/qtgui-5.11.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.11.3.ebuild
index f3b8dc42d1b8..8495f8faffad 100644
--- a/dev-qt/qtgui/qtgui-5.11.2-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.3.ebuild
@@ -71,8 +71,6 @@ PDEPEND="
 	ibus? ( app-i18n/ibus )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-qapplication-block.patch ) # bug 668994
-
 QT5_TARGET_SUBDIRS=(
 	src/tools/qvkgen
 	src/gui
diff --git a/dev-qt/qtgui/qtgui-5.9.6.ebuild b/dev-qt/qtgui/qtgui-5.9.6.ebuild
deleted file mode 100644
index 39a6ad3bc7d0..000000000000
--- a/dev-qt/qtgui/qtgui-5.9.6.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
-	jpeg +libinput +png tslib tuio +udev vnc +xcb"
-REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	xcb? ( gles2? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.0.6:=
-	>=sys-libs/zlib-1.2.5
-	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? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( x11-libs/tslib )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	xcb? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libXi-1.7.5
-		>=x11-libs/libxcb-1.10:=[xkb]
-		>=x11-libs/libxkbcommon-0.4.1[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 )
-"
-
-QT5_TARGET_SUBDIRS=(
-	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
-	eglfs
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev
-	evdev:mtdev:
-	:fontconfig
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:HARFBUZZ
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon-evdev:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib
-	udev:libudev:
-	xcb:xcb:
-	xcb:xcb-glx:
-	xcb:xcb-plugin:
-	xcb:xcb-render:
-	xcb:xcb-sm:
-	xcb:xcb-xlib:
-	xcb:xinput2:
-	xcb::XKB
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-src_prepare() {
-	# egl_x11 is activated when both egl and xcb are enabled
-	use egl && QT5_GENTOO_CONFIG+=(xcb: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 udpsocket 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)
-		$(qt_use libinput xkbcommon-evdev)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon-x11 system)
-		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 20181b56dd6c..23ca23adc93f 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qthelp-5.11.1.ebuild 654 BLAKE2B 496b878927c0a937697f28032d1712245da47e3f5419fded75c922210b637fcbed68dc4c38a1ab9fef0b754218b13ba01d57a36063bcb4e027d6f33b5f6d8ab2 SHA512 d843c0ec1707a613217a0b2127b279c6df7d14cf699e91e54e59dd805ccaba875e37df5d9ae6684520f5cb513eb7119b5c0d722da1334828cded02544040647b
-EBUILD qthelp-5.11.2.ebuild 656 BLAKE2B a4a0f91c8abf515a84c1898167a66fe7b99da75545244cbbee727860b893d3c2335dc5e3c51f5fabfcef354bddd8ee7c1fc4778533d2fbf28276b3a70f2ec9e1 SHA512 e99c4a76a774d8c487359a5f0946eea232c73609cd88620b45ea98fca7948b592f745c8d8ef73cea294ddac0c3f1ed8459e94e2c6fdd0a9788993434f34d0869
-EBUILD qthelp-5.9.6.ebuild 655 BLAKE2B 6c4f16a9090887fa0be0ff0db0f6fe75864368167340b7e4b995f931293b4ebb3334b20b7d8d9628e3aaa8cda3916b6d1910a9302aa1967393e3919cfe7ee82d SHA512 664c1eb25153d8d52b75675846e195cded8775776ddf4554e6587f97352d99bd354cdd7c4347d07eea133ba237db68fd80dbc9314c62ead80149927be8278b9d
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD qthelp-5.11.1.ebuild 652 BLAKE2B 07c0b114cb4a842a2db8b2a977b6f7c5ea7bbb23eee9362fe685eb8963c8737a3620cf305eb53e16f04b362505d9d3642cc6c6147d197f7b586969a150f0295d SHA512 82637bf23d27cf1f3f34e4518de3f30668cb6653ec7be9e9ba724609ce98814680de9a2f6092d34ffdd70a7669ca2b3351b15dc0ba2c4607308111bb49c5cfcb
+EBUILD qthelp-5.11.3.ebuild 656 BLAKE2B a4a0f91c8abf515a84c1898167a66fe7b99da75545244cbbee727860b893d3c2335dc5e3c51f5fabfcef354bddd8ee7c1fc4778533d2fbf28276b3a70f2ec9e1 SHA512 e99c4a76a774d8c487359a5f0946eea232c73609cd88620b45ea98fca7948b592f745c8d8ef73cea294ddac0c3f1ed8459e94e2c6fdd0a9788993434f34d0869
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.11.1.ebuild b/dev-qt/qthelp/qthelp-5.11.1.ebuild
index beff0018309c..ec05d1634ad5 100644
--- a/dev-qt/qthelp/qthelp-5.11.1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qthelp/qthelp-5.11.2.ebuild b/dev-qt/qthelp/qthelp-5.11.3.ebuild
index f010bb274dfa..f010bb274dfa 100644
--- a/dev-qt/qthelp/qthelp-5.11.2.ebuild
+++ b/dev-qt/qthelp/qthelp-5.11.3.ebuild
diff --git a/dev-qt/qthelp/qthelp-5.9.6.ebuild b/dev-qt/qthelp/qthelp-5.9.6.ebuild
deleted file mode 100644
index 9790203036fa..000000000000
--- a/dev-qt/qthelp/qthelp-5.9.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpconverter
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index a6d0494c5291..25ac4ba9efcd 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,7 +1,5 @@
 DIST qtimageformats-everywhere-src-5.11.1.tar.xz 2191408 BLAKE2B 7a01c6c607cdb02471c289b71151d8fcba2047778c6d499a54dd66d125a7dac29b944b2b722aa8bf8667f453e92edba20adf10cfe6c580af7ac42c41aebd3a8c SHA512 527bd6d324904d1c7c6d931fe96bfa43575a904d2b94cbda3129c4a883fb79b9bdf6f009b41d2747e8aec2c410a2b23bfa0e94fc4eea698d54a0878bc934514d
-DIST qtimageformats-everywhere-src-5.11.2.tar.xz 2183956 BLAKE2B 02686bc92e179de591c4424abaaa2152018182ff13aa4523034e2eab6f704bd3168183b99c915e14e4cc2d1abc42f1d3f6b7fd426ab357fe91d9085a6f563fcf SHA512 9de3fa9ff8b985a89806ad33ed276454429aada01119d8f36b7d571f01d23c42afd588353fe62d80cf6b9b83b6c91d53ccbf61ed1ec4d66ddc0ce4f5719bdca1
-DIST qtimageformats-opensource-src-5.9.6.tar.xz 2107828 BLAKE2B bbea8e01d7c7e4510c35a6322f72c9b531daa844745e5ea007bdc516f60bf72de48a5aa18e7209b6b25da189362b4db8be5fa3d4e8addc90f407a3879b7cc69d SHA512 c6470c1486ae9b0bc3c846c1de6ffa294810aca20ca90d9d5f40a257a7e339ff58aeafd5f76324e6939d71889044eebc48b8b001f2027dbabd15f7eeb8d8bdf8
-EBUILD qtimageformats-5.11.1.ebuild 605 BLAKE2B ab9b770c6a38630aa450bb016886fd4f61c6a0b1a043f97afba9bbc341d7a8b12c631fce61117af8c801de8b9fa5d2a4ff5ef659bc47bafd78e199bf024042a7 SHA512 baf928651a702b5cf204ddd537120096bd033590fee768b1826908f0da5eb9b7d107be760c708ef9549eb27797eae52140425d5f2f05ff3e6dca4410d4a0361d
-EBUILD qtimageformats-5.11.2.ebuild 607 BLAKE2B 0f80de2b7fdc1a3fb490527b757c3bae55d7dd93eee05d0e5875610367d5464fffc12c07dd1a6731dca0d6ad5f1da1127cac36ecbbea118f0bdff24196d02a41 SHA512 0765f575f36491d783607a7ab44a4692c645aa9e85e2864a5418eda74d16a74ca9ce39fa7df4e6b0977e3f024c815979e7edb15e7b1612bc90095b11e07a2962
-EBUILD qtimageformats-5.9.6.ebuild 607 BLAKE2B 46d3b734f62887f3adf36b6fce4f4422b0ad54ef2c134c7a75f3c751a0c47a776a3b967c0c28aa7c3cba8281b17bf2da38fd33c7acd53649905f24dc39b77b7c SHA512 b359b141e85ec32038ba234aa536feb50fff3e39b0738b9021eea2c8b2f7815314b48d89deaa39108feff02c088f7436bf9fc29e71369a5807c59b13560521bc
+DIST qtimageformats-everywhere-src-5.11.3.tar.xz 2197304 BLAKE2B 9041260c26b2ec5085a10c05a76dcab59941ae3d18475b93286028b9a4bbafc923795f6f0ec7a0e6b45cf95c21a37fbc76d0868cdbb6ed8891360310cce868b4 SHA512 5e2b83c2a7cc337ca0cc80e348ee41cfead3429245ec0aa18bdef945c85aa878ba684f5d410bca04d0183e0f6032a78b976ba89346043c0a49816c306d0235f7
+EBUILD qtimageformats-5.11.1.ebuild 604 BLAKE2B cbf2b5c20d8e504e2385902fc915e7beb77c82c042235bcb0c20f72e3dce463acc89e02611c6730ba3a86568f95c4adf446b932256ab128747e3a1001e583de5 SHA512 855a327ac234fe3b1eb359ada6062ef48e7f6f8f635ce6d5ced9086f283b10d54e9465e3666279d9c213953a6b022ef9e70fb26e5660548181aca736d061e605
+EBUILD qtimageformats-5.11.3.ebuild 607 BLAKE2B 0f80de2b7fdc1a3fb490527b757c3bae55d7dd93eee05d0e5875610367d5464fffc12c07dd1a6731dca0d6ad5f1da1127cac36ecbbea118f0bdff24196d02a41 SHA512 0765f575f36491d783607a7ab44a4692c645aa9e85e2864a5418eda74d16a74ca9ce39fa7df4e6b0977e3f024c815979e7edb15e7b1612bc90095b11e07a2962
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
index b0b7684b9fab..c1e1d336a28b 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="jpeg2k mng"
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.3.ebuild
index 89acfc3bcfa8..89acfc3bcfa8 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.11.2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.11.3.ebuild
diff --git a/dev-qt/qtimageformats/qtimageformats-5.9.6.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9.6.ebuild
deleted file mode 100644
index 0314aac9742f..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.9.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE="jpeg2k mng"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	jpeg2k? ( media-libs/jasper:= )
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	qt_use_compile_test jpeg2k jasper
-	qt_use_compile_test mng libmng
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 1cc7459f4c9d..ba8215ffe086 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,5 @@
 DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
-DIST qtlocation-everywhere-src-5.11.2.tar.xz 5584420 BLAKE2B e7b0cd716edab33d19f1b9ef519a35ea8094ccc85ce015eb7f3e26c61f62bcc7ff9419dd79da5d8ebec9f3b0630cea7c125f237ed39b7ed1917a45408cf7dc51 SHA512 84a52aedac59f1bc4372538dc0810c742f87f04b2ee599e7ed3f8f0cfe0e13d652e80d3cf7de95395bbe1285a60cc15791760e17f0975cf8399527cdadbd7c1b
-DIST qtlocation-opensource-src-5.9.6.tar.xz 5405652 BLAKE2B 001bb5ea4d73ac67a1e1a70e3218c2cd0554b02f84001da88e3109531b8c0f51264a51276edae5c899aa68b5d1ba1bf6d55ef9e3d409b3676f60657cc8deb86c SHA512 63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a
+DIST qtlocation-everywhere-src-5.11.3.tar.xz 5589440 BLAKE2B 544d90151fcbaf8a75d374e4acec9bbd78b63c2dee0258f1e08e18ffb94a86c91f63dd8c9215af96e3648d50a40fe6b66c105abec0ab6dd4473903a06f2d0253 SHA512 880cd6983bc0b4c5ac5a1edb2b3ffbe89f133bd819e4bea4fb8e91ba8d847ab80572743e3994145ee6697cb2fc24c393ac3c4ead847a022d848799eaa4982716
 EBUILD qtlocation-5.11.1.ebuild 919 BLAKE2B 2cac5157ba1cd250468e115409174f7698e677b3155be082389d391b823fde5ca828d8eb92efe1e5337a91397068fdb427035247042ce6cc8cb5734583d34440 SHA512 088d1ddc83eadfc286b904b2e0177dfb1cf119bcfce3044de97a781c6639baa427c154caffaf11d2d44d7246b029b8fb1c4af5d8a9dda4fdeeffb0f4a702ee7a
-EBUILD qtlocation-5.11.2.ebuild 921 BLAKE2B f7c7aafa6a01234b6845e70cfb512e971deaf6c58ac278eb7eecd3bf348d0e44d6ba968848dcf936e44370ac1b102b0bf6b672f8a3a63f69105a366c92104fa2 SHA512 cc7316283c4fdf3e05d0069bf30d9436eb76bce8c8c21416b87760d7cbfe93bed07dfa043f4b980fe7cd2c187741530384585152f3c9649903d67b5cc3e4b9d2
-EBUILD qtlocation-5.9.6.ebuild 922 BLAKE2B cbcea33ab0f866d580839df171c7d85cb75aeeb6c9cfdd27d8983520e38d1757bbecc899123058b18bca2a444562eee62a48d8b111be6703aad90b23ab6c4624 SHA512 26a0f3b6f88c3aebcbfaabc1da94771726c8a3181920a4f78f48770aac9ff119137099ffdc480276beeaacfeb11b375e85112482e0584615cf5bdbb6c92abd88
+EBUILD qtlocation-5.11.3-r1.ebuild 926 BLAKE2B fefdaca7b335b060c6bbc98a60af6c29f468534d8b4f28dd23cd992fc8ec85f9387a0f6a1523f16b4beb517db8204097bb9785863cc4fee03ddf7ddc070ace56 SHA512 c767af68fd05173833241ee41e0fa4b9a801755fc1d6760907d9064baef1f5c71e100909e0a8eea7f09e454016532f95e27bb7fbd6caf1f84abc172279a2458c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.11.2.ebuild b/dev-qt/qtlocation/qtlocation-5.11.3-r1.ebuild
index b6f3af24dda4..78057b719907 100644
--- a/dev-qt/qtlocation/qtlocation-5.11.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.11.3-r1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
 	~dev-qt/qtdeclarative-${PV}
 	~dev-qt/qtgui-${PV}
 	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}
+	~dev-qt/qtpositioning-${PV}[qml]
 	~dev-qt/qtsql-${PV}
 	sys-libs/zlib
 "
diff --git a/dev-qt/qtlocation/qtlocation-5.9.6.ebuild b/dev-qt/qtlocation/qtlocation-5.9.6.ebuild
deleted file mode 100644
index f228e74b4fed..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.9.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="The Location module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}
-	~dev-qt/qtsql-${PV}
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtconcurrent-${PV}
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/3rdparty/mapbox-gl-native
-	src/location
-	src/imports/location
-	src/plugins/geoservices
-)
-
-src_configure() {
-	# src/plugins/geoservices requires files that are only generated when
-	# qmake is run in the root directory. Bug 633776.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index a7b6c9f4db36..13bce144acdc 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,7 +1,5 @@
 DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c
-DIST qtmultimedia-everywhere-src-5.11.2.tar.xz 3701832 BLAKE2B 5a2cff609a46d8962de5d32dd3e63c235d7230d414410435385b51ef9c74af8efd617910af6c760ff042275ba5ba8f44761df0a319067ec355f5a02f56545de2 SHA512 f83c57ad35b713118d1d0ba27f78687aefa8f1ccd850be9b78a9c3477e0e9bb5f9a66bf39c2505f81987f0ca7d07dbc3f471d5efb4b9e4c21e41b308fc83040f
-DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f81c9a99e75748dd68112ae4fd534e038d73d1f8fa33b76119824ade231e7b1c283ff109ee2473774d08c67bffa04383e7328437539aadbf SHA512 2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207
-EBUILD qtmultimedia-5.11.1.ebuild 1445 BLAKE2B 7fe2f8608d8a064624c708c2d7b4cc59f9b1686443aebac7e949d648247ba5371be73d68c62cddb1329bd76ca690159dd3afd7e59870c51fa251df4cb85b2f04 SHA512 484a1214e69cdd519553eb90a6bcf1d0b520b97db01eaa7af8c7a535804f5e70c26368c8a97dba31848e62fd7e28b4ebc4dee3ededaf390cc5cb996b0e25cf86
-EBUILD qtmultimedia-5.11.2.ebuild 1447 BLAKE2B c33d9c5e9bb66baaaee43bebd325bb3c2bcacc1c809e8ce49584f284fee2f5a48a1c5ef4f0073fc4824fffdc8d26f38b1439d3c50c231343db4fff59298d65db SHA512 9aecd484432af6fdc650c3c82e1ca58e87555e6a7b4591eac54d207141c258dc65873ae0156fe0d02d9f45cfa9cc182fb8d44fe10254dadc27a59238a34720f2
-EBUILD qtmultimedia-5.9.6.ebuild 1453 BLAKE2B 27dd7746bfb2175d1836a4b95ee4b5f557116414f2d9cf30cfbe72bd155f5e15f0d6277cff3829bd780c221a225acec999267e2037896565d729810da8ad47a7 SHA512 945f56093cba63af3a044c642f1c80e293b170d895ec6a1ef2dec5937b8461b44b42a1862732337ad2eb082366e7478b09985dd7ab44729668133b33d2b0acc4
+DIST qtmultimedia-everywhere-src-5.11.3.tar.xz 3710012 BLAKE2B b1757e80914a41913846dcb890fd56706b402aa0498cfa3e58277e8ab50e95c597df1b32dae11f146283d42c874ec03d8d33374447fc71f529c30d0e465c14cc SHA512 1c9b8f3392ac0c7e63a05d57fb74473a89edc9f2e482d8df97761ca20efd13bca2c1c68907ab4b4af71a109a783a641c2faaf72e7df90fcbed6bcd6e13350567
+EBUILD qtmultimedia-5.11.1.ebuild 1443 BLAKE2B ddb6f0ec27097e57174187a1cce1fdc007a3c7a81ea0a74cdff3d126ae8ae2af69b8ffec9815ac50332ef6b6020a37af9c6b6b7b2f48f67525740a52366f89cc SHA512 c812b0a72e508b4548b1d0addd13143d5e149aacdab73068c37f4d9be7dd3afdaca30e8553940924a75a7c02ea45ac06daac0ac0b4edd751ec3de3308e7bffb2
+EBUILD qtmultimedia-5.11.3.ebuild 1454 BLAKE2B c47b367d595b0ae14e242b3486ec9f565c75281113cf95fdb744430af7364e31b1a1ed204fd08b17817b8c02638f52da54f265b9e2d3eda8b16c1adbfe0f62e1 SHA512 8abfc47068c92c057e8fc2d54875b40329ce12f433e1483a4d1b4d2795fa163aeb8053ef4d924612533b319157dd196cd1036d31eb25fc34bacc81fc066ed621
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
index 86ff0caa1ee7..30a3a2c588ad 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
@@ -7,7 +7,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 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
index acfab89749c7..aaac7463ffcd 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
@@ -7,7 +7,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 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild
deleted file mode 100644
index 7a5ab59350b9..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 ~amd64-fbsd"
-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 )
-	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 )
-"
-
-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/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 07d0b0b0205c..13e111293404 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtnetwork-5.11.1.ebuild 1229 BLAKE2B 8710186e3865824c3983d5eb1125ed57463a90bef975c64af6951a779d3a2aab4573a3242bde2d339c5f19fe3512333e3ced1fc07ce30a7e3131c9960831f624 SHA512 2a60819284f6645f895666de22b76dd5299efac8b92fa1f4d9553030b93c938f82d37ec9e5a943d124125f1265108133d1aedf77c7315f2c80b08d4c3e8056b1
-EBUILD qtnetwork-5.11.2.ebuild 1231 BLAKE2B e9ca316106941bd7c530220118190cc86970d6c619586df2d6fbd4e98d047c0276635ad860b88b3705c21c94b8fea3e19ed4bdff54c43d34abdc438ce1e3be91 SHA512 c67fc0bbba64519cb71232be5cddb1b5bb1a20520a381f6172aaaa3773d46f0e196e025446116a3a8cac70f6b17cc151d52e22cbad792c9c7952aaf1a687d9fe
-EBUILD qtnetwork-5.9.6.ebuild 1294 BLAKE2B f915e4805388cfa15d08d01b8015d0ba839d66978679c2f43d36bddbaac8bad8dd80f30ae8d9f5649d608fa83fc2ae116537f5be0ef2def920941041dcd66f0e SHA512 6a10aac3ce86fd5ba78378e1b2c190b68aaad9842266666ceace907ebf7260080215498baaa15ff6b7a4a854884f2c584d2592b9734a039bff4a8de5b049696a
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtnetwork-5.11.1.ebuild 1227 BLAKE2B 37b6daccdee21d56752486e8ec31294d01346be42751afb6f3484f6549c60158e694f0ce4105643e4fbb78143857388ad85aa51739e32a71cce41f49f51b3511 SHA512 e76ad2e4120cb4eb28efd1a12ea2a84e8503d3d7a484e9208c7a11610033ae51f9c43c90e41da156c8a054ad81a53b6bb3d6c7eec97399948bec94aab3bf42cf
+EBUILD qtnetwork-5.11.3.ebuild 1231 BLAKE2B e9ca316106941bd7c530220118190cc86970d6c619586df2d6fbd4e98d047c0276635ad860b88b3705c21c94b8fea3e19ed4bdff54c43d34abdc438ce1e3be91 SHA512 c67fc0bbba64519cb71232be5cddb1b5bb1a20520a381f6172aaaa3773d46f0e196e025446116a3a8cac70f6b17cc151d52e22cbad792c9c7952aaf1a687d9fe
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
index 28b505bc74ba..d4d142fd023f 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="bindist connman libproxy networkmanager +ssl"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild
index d462c11f736f..d462c11f736f 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild
deleted file mode 100644
index c2db4ac2887b..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="bindist connman libproxy libressl networkmanager +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=sys-libs/zlib-1.2.5
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:network
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(use connman || use networkmanager && echo -dbus-linked)
-		$(qt_use libproxy)
-		$(usex ssl -openssl-linked '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index fc6a2c953c7e..b4fd252e52b1 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,7 +1,5 @@
 DIST qtnetworkauth-everywhere-src-5.11.1.tar.xz 140468 BLAKE2B a64cac71f89ae44b0835b8c7d0a492c24ebd51cfbbb5a5074e33292d2e2d0260658e6086a744e21e2bfb993bb1b34b13e093fdec7a21032725b1879228282935 SHA512 1f2b55870d61027f4af00d54507baf4953f162ca63a4e571a9c6f4095daa0235c2a93f67515cac627ff0a6655d94b01a3b3ba759bbbf75f9b108efbf12777c0d
-DIST qtnetworkauth-everywhere-src-5.11.2.tar.xz 135160 BLAKE2B 70f398be8f3e1f187511ca5562321f3f6ba24b61a37405eccb80008be58e749f256bc4940e1bd3d0bdafabca5e20de2bd360518b6d358219cccdd722c58ad7dc SHA512 f723e8af1ab511f090d1830bf42899ec51b4a027a91c58c46179c16c9e635a3c3f51c13faf943936074ad768407824e57161e28d872868daaed6254c15fc852d
-DIST qtnetworkauth-opensource-src-5.9.6.tar.xz 112188 BLAKE2B e8e61071da9e619d250ea09b01e12d8dfa73ae364e2cc3a33327c027916ce4bd807987f09d58c6962ed106eb148fed639788e06a74ff4e855db3f7e2ce98903e SHA512 8badcf8170780fcd18ec38980a7571e911f13efea101852f6c78e99031668cfa481df2a2fe07f46e2e78906ff6b663c27461326e2dad981e03d42cf4f78081c3
+DIST qtnetworkauth-everywhere-src-5.11.3.tar.xz 138740 BLAKE2B d8f5dee083314bf37984063a41944b537ddcef010f31d769429136e17c09e7be43cf8fe68e41ea0cf678018f744b7d896bc07798fd545e03594c1ffe0117788a SHA512 4d7dd27b869c9c3ee6fdc745c0532b2efb2b57f7d5447798bb2eeeb62002f856cc21b1169759baf33b060b2f1253feb9c9568dd28ed4bb41cd37aadf4a784a1c
 EBUILD qtnetworkauth-5.11.1.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
-EBUILD qtnetworkauth-5.11.2.ebuild 373 BLAKE2B 645d1d2ad1fa800ff3c5411de1bb4a8ead1032d19c20d7ffabbf1fc6a9a5219d721938b195170ac646f8b613388239f5c455122a159029268327531d240c343d SHA512 92e3f6bbaa0bfb4965bfda9532cc251f284f8883965152487460e960309ad450aa5ec3a092af0701fdd0987ba45fd7a86071bc7d2a96d84553780eb346f3b15a
-EBUILD qtnetworkauth-5.9.6.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
+EBUILD qtnetworkauth-5.11.3.ebuild 373 BLAKE2B 645d1d2ad1fa800ff3c5411de1bb4a8ead1032d19c20d7ffabbf1fc6a9a5219d721938b195170ac646f8b613388239f5c455122a159029268327531d240c343d SHA512 92e3f6bbaa0bfb4965bfda9532cc251f284f8883965152487460e960309ad450aa5ec3a092af0701fdd0987ba45fd7a86071bc7d2a96d84553780eb346f3b15a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.11.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.3.ebuild
index d4809b78213f..d4809b78213f 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.11.2.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.3.ebuild
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.9.6.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.9.6.ebuild
deleted file mode 100644
index a1e6dc628e9d..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.9.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Network authorization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index a21feefbe5ac..6ad51e82404a 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtopengl-5.11.1.ebuild 650 BLAKE2B a2c95df8c2e97ebce8092083901ca3e962c0f06012b7593e9fb36234e12fd257f916c461029d747a3d9f5c3833d7d35e17dbe9d334dddfbc37583f10f13bcad4 SHA512 27c68a7c0d84921e5fc0c460c3a36409751a84449e1c47a702b813a879536625a75015091319b4a61c8fd2b59a42365cf0f0f33a3d3a0a6293bfb407a0837d5c
-EBUILD qtopengl-5.11.2.ebuild 652 BLAKE2B 03aafd597eb70c2bac25a7a94af3e68ca9a1ce6f7ddd48502f51606cac3f93573cbf70363de05dc2ace19a1210ac3d6a5e1dd3d69a614bce05c09971acd3a991 SHA512 274faed5132683be0bf18e03d0fb2583dc5bba6f3eefdc14f2ab84dcb8eaf6875321aee9ef5db579143d7bdfd3be1dcdab9d19d788f0b685b146c06556a079ee
-EBUILD qtopengl-5.9.6.ebuild 651 BLAKE2B b79d6c64085dd047dccf34b7c53252c4f57e08550c2a8af368a4b12ded037c9e7f4fdce2d2e171332a356817f12b2e3abf4983cd000b1af4d7defe4788cf7ae0 SHA512 96e941603ea047a3dc4b376c17f98f7aeb3a7e305af8144812c9034a2e6e4ff7862884703f5ea64471acbe17a5b397af4fd1d136a07d592b86d87cda4cd6ab2b
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtopengl-5.11.1.ebuild 648 BLAKE2B 29ad8b6f8a55384ce7d705381958bda385f75e38842d3106f60e1f91a7aeeae23be06d237c8101c2965e34120998c002f450a14e0c36bf73e1a42df0773d7a9c SHA512 1377840f6635c1b882f860c35603881934a8a9d317ca488f4efb8cb2616231ec02f396dd37fc2553910db9e41a9162821bdef927acec8f4d27007287c3083ea5
+EBUILD qtopengl-5.11.3.ebuild 652 BLAKE2B 03aafd597eb70c2bac25a7a94af3e68ca9a1ce6f7ddd48502f51606cac3f93573cbf70363de05dc2ace19a1210ac3d6a5e1dd3d69a614bce05c09971acd3a991 SHA512 274faed5132683be0bf18e03d0fb2583dc5bba6f3eefdc14f2ab84dcb8eaf6875321aee9ef5db579143d7bdfd3be1dcdab9d19d788f0b685b146c06556a079ee
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtopengl/qtopengl-5.11.1.ebuild b/dev-qt/qtopengl/qtopengl-5.11.1.ebuild
index eb6fbccd6680..b397caa7e2ee 100644
--- a/dev-qt/qtopengl/qtopengl-5.11.1.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.11.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2"
diff --git a/dev-qt/qtopengl/qtopengl-5.11.2.ebuild b/dev-qt/qtopengl/qtopengl-5.11.3.ebuild
index b6ad72a02f2d..b6ad72a02f2d 100644
--- a/dev-qt/qtopengl/qtopengl-5.11.2.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.11.3.ebuild
diff --git a/dev-qt/qtopengl/qtopengl-5.9.6.ebuild b/dev-qt/qtopengl/qtopengl-5.9.6.ebuild
deleted file mode 100644
index 5f154c2a1f23..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.9.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="gles2"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 42cf64402822..f4c3e8eb9801 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qtpaths-5.11.1.ebuild 411 BLAKE2B 5b4be6527a0d32502c0e420f6d999bcf03ebd40e11640596431734dabf548f89daf41033c1a5cf2d98b29023ba072f4a29275b812c54160bf94c6ca23cd06853 SHA512 740b1fe63a345585b5962e9cde642c0715aa193592888d227a71f26ce2c48616e6b3ca5eff4926cc6b9178fbb9cc817881faa4afe4cdb11a8f6b96850f96b33d
-EBUILD qtpaths-5.11.2.ebuild 413 BLAKE2B 4227ccfb463dcdedec3569d32634a7a7c0d49d25081e5fa2aa12537c1e9d624a3031be39705ca985af928457629db68f62c2ea57d657758037fc97f97aa926fa SHA512 1c98c705b9ea43af3b23023ba6534e38a96df5f6767c1a74dcaa745018af445a5313b4403ee7fad75989fe416c4fa40110e1c19b10972249db87547d578527c2
-EBUILD qtpaths-5.9.6.ebuild 412 BLAKE2B 0dbb0356a7aa2257824ebba6793a8515492d8b97fe7abf58d65a12dd1d28506077dc18a8504a3ce50c8ad6fe5fccd56b9b26edd98217d0cbedca427edf45f4b4 SHA512 cdb226d90c27627f09e4b6a8761c332f0071633c5821e092bf06da8bd8aa004954853a6ade19f6d38bbc6a28b37f6f49d7b5706c2ed4e19feca6972ad38dcff0
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD qtpaths-5.11.1.ebuild 409 BLAKE2B 309efa6b311d563f113fee2568e3f63d3ea0f5d3bf2cbf87a686b3a3a261840f02b03f3b1cd40650e008fe95b74a1d4144ee57590c669ab11a5e9c4f8f244153 SHA512 475dd23f8856dc2da125998b5be0481a27b20e3e1be131464bdfedcdee5063e13d66026b903eed9c6b5b822c978005a60b5a63992e8dad320840085d3495572c
+EBUILD qtpaths-5.11.3.ebuild 413 BLAKE2B 4227ccfb463dcdedec3569d32634a7a7c0d49d25081e5fa2aa12537c1e9d624a3031be39705ca985af928457629db68f62c2ea57d657758037fc97f97aa926fa SHA512 1c98c705b9ea43af3b23023ba6534e38a96df5f6767c1a74dcaa745018af445a5313b4403ee7fad75989fe416c4fa40110e1c19b10972249db87547d578527c2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.11.1.ebuild b/dev-qt/qtpaths/qtpaths-5.11.1.ebuild
index a215db7eca1d..fe6a2d0d28a7 100644
--- a/dev-qt/qtpaths/qtpaths-5.11.1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtpaths/qtpaths-5.11.2.ebuild b/dev-qt/qtpaths/qtpaths-5.11.3.ebuild
index 3e622fbb156e..3e622fbb156e 100644
--- a/dev-qt/qtpaths/qtpaths-5.11.2.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.11.3.ebuild
diff --git a/dev-qt/qtpaths/qtpaths-5.9.6.ebuild b/dev-qt/qtpaths/qtpaths-5.9.6.ebuild
deleted file mode 100644
index 36454707b72a..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.9.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 02c23e5d180e..28cf2bf9aa12 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD qtplugininfo-5.11.1.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
-EBUILD qtplugininfo-5.11.2.ebuild 370 BLAKE2B 5f8a61393ef67a56114aacd5d7d9145338487fb83243e12a21856313115b5a4071610030aaa1b8b6a7f92bc6ef32b957526a534bc958faab7aa810a7bd08552b SHA512 083a4c81950dcd4f84c2655c28fe5530adc6ca819f481469f312941e42f2630dc130bbcb104051f233965053add23dcbc1aad4cc12a74af9d11df3d60dda60d5
-EBUILD qtplugininfo-5.9.6.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
+EBUILD qtplugininfo-5.11.3.ebuild 370 BLAKE2B 5f8a61393ef67a56114aacd5d7d9145338487fb83243e12a21856313115b5a4071610030aaa1b8b6a7f92bc6ef32b957526a534bc958faab7aa810a7bd08552b SHA512 083a4c81950dcd4f84c2655c28fe5530adc6ca819f481469f312941e42f2630dc130bbcb104051f233965053add23dcbc1aad4cc12a74af9d11df3d60dda60d5
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.11.2.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.11.3.ebuild
index 5143d73a0c37..5143d73a0c37 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.11.2.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.11.3.ebuild
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.9.6.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.9.6.ebuild
deleted file mode 100644
index 43ae95d1cf5b..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.9.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 plugin metadata dumper"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtplugininfo
-)
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index b89640adddfc..454ef18c16af 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,6 @@
+DIST qtlocation-5.11.3-geoclue2.tar.xz 7556 BLAKE2B 2648b2e8aa8dadad467c7a3ea352014ca832021b12af0e11c563e328d4b6321df8d2784744437e9348feda1ed443c0e56882491b1811e734d43b036e6b5e7c16 SHA512 226ae607b4a0d55ed3207a19932ed685a44e688c6b27407d576fac73e29be478ac3d3b06d93a3bd594ee6443648a9c86b9746366e6765451080af4c1b2ee4264
 DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
-DIST qtlocation-everywhere-src-5.11.2.tar.xz 5584420 BLAKE2B e7b0cd716edab33d19f1b9ef519a35ea8094ccc85ce015eb7f3e26c61f62bcc7ff9419dd79da5d8ebec9f3b0630cea7c125f237ed39b7ed1917a45408cf7dc51 SHA512 84a52aedac59f1bc4372538dc0810c742f87f04b2ee599e7ed3f8f0cfe0e13d652e80d3cf7de95395bbe1285a60cc15791760e17f0975cf8399527cdadbd7c1b
-DIST qtlocation-opensource-src-5.9.6.tar.xz 5405652 BLAKE2B 001bb5ea4d73ac67a1e1a70e3218c2cd0554b02f84001da88e3109531b8c0f51264a51276edae5c899aa68b5d1ba1bf6d55ef9e3d409b3676f60657cc8deb86c SHA512 63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a
-EBUILD qtpositioning-5.11.1.ebuild 838 BLAKE2B 70d08d8cc7b986a950c302d17784c6eae194938385ecebdfebbade913c4d0c1e238def46d68cb9f0303a1cc1641637ebb3476c285dc9ddf0afb1decce985bd59 SHA512 c2ce06455609072d1e3b0a9c05d9dfe939bafb2dfe108e87365a4d14c4422ed2525ac041da9efb06e3d43481d9f67e2478abbfe3df13376b7c1b8f0d6351d7a3
-EBUILD qtpositioning-5.11.2.ebuild 840 BLAKE2B 683d9fee3e3108ee1d4e1eb6568a952b741874bed1a53afa3e45fabec7ac2942ca4401ad738f8c4e595bae71e406d1425514e6ca6fe204e8ddc64373d1eae1e2 SHA512 69db7552ea462a63b399a684d0c74fd2b4e9153419e9ea2f48db4caf371ad4bde7d176fc6fb7565680bb7d6af673b44f7260cfe654d291dd6cecf2b247e1fd25
-EBUILD qtpositioning-5.9.6.ebuild 815 BLAKE2B 64d3eac34e9fe8240532dfceb846d67abb1ce2f3ea71c350d20229a274627e3a9a9dd4f527e99f666906e116bb043814521a46ca1d3b822ca7aaead83ad1024e SHA512 b9cd28fd17ccd763741abf8c24b04987e105b2a4126aed7dbbc51af52cb362c6ff827e0ddc8614ccd72feb608772a218d9ad4221464218b54771e874a2839028
+DIST qtlocation-everywhere-src-5.11.3.tar.xz 5589440 BLAKE2B 544d90151fcbaf8a75d374e4acec9bbd78b63c2dee0258f1e08e18ffb94a86c91f63dd8c9215af96e3648d50a40fe6b66c105abec0ab6dd4473903a06f2d0253 SHA512 880cd6983bc0b4c5ac5a1edb2b3ffbe89f133bd819e4bea4fb8e91ba8d847ab80572743e3994145ee6697cb2fc24c393ac3c4ead847a022d848799eaa4982716
+EBUILD qtpositioning-5.11.1.ebuild 836 BLAKE2B 470c9b44e443dd990566d62cc182ee2f8e73a5d0f7a925e0049bdfd2078375ff33a5566e145af630bfb35477c4eeedb050e7339dd269cb4e2aa8d2c6485ca832 SHA512 dd3aff4b9153299744e2d77c49cedd5b6e108980a161c4e21bb8b60e84446b48f3a7b42c2a3e97d084fa6db2fca578cc7c9c6f174e3a05ec98c2f0efcfe2fdf4
+EBUILD qtpositioning-5.11.3.ebuild 1072 BLAKE2B 90569f5f267251c26cc9bca9aaa30fe408490fc66ad9e949579d2a847f27519aa2f23b163188377ea8a4ac17775181a3790f40d70271bd9566b77811b393b9cd SHA512 6840f358e5cb6fd54f4a539495646377cd769cc9d7dd206ef8b440c8bdffeae3ef38fb997aeaf1002b08287237f2f2a3d4c2b1c3e623200457cfb39a42645941
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild
index 5ca83e170722..14efefe89472 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE="geoclue qml"
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.3.ebuild
index 4e2637ef4795..2b26569aab74 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.11.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.11.3.ebuild
@@ -6,12 +6,13 @@ QT5_MODULE="qtlocation"
 inherit qt5-build
 
 DESCRIPTION="Physical position determination library for the Qt5 framework"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${QT5_MODULE}-${PV}-geoclue2.tar.xz"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="geoclue qml"
+IUSE="geoclue +qml"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
@@ -20,7 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 PDEPEND="
-	geoclue? ( app-misc/geoclue:0 )
+	geoclue? ( app-misc/geoclue:2.0 )
 "
 
 QT5_TARGET_SUBDIRS=(
@@ -32,9 +33,14 @@ QT5_TARGET_SUBDIRS=(
 )
 
 pkg_setup() {
-	use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+	use geoclue && QT5_TARGET_SUBDIRS+=( src/plugins/position/geoclue2 )
 	use qml && QT5_TARGET_SUBDIRS+=(
 		src/positioningquick
 		src/imports/positioning
 	)
 }
+
+src_prepare() {
+	sed -i -e "/qtHaveModule/s/geoclue/geoclue2/" src/plugins/position/position.pro || die
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtpositioning/qtpositioning-5.9.6.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9.6.ebuild
deleted file mode 100644
index dcec5cc776bb..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.9.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtlocation"
-inherit qt5-build
-
-DESCRIPTION="Physical position determination library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="geoclue qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	geoclue? ( ~dev-qt/qtdbus-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	geoclue? ( app-misc/geoclue:0 )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/positioning
-	src/plugins/position/positionpoll
-)
-
-pkg_setup() {
-	use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
-	use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
-}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index b32b922ed206..75ba8f949c9c 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtprintsupport-5.11.1.ebuild 775 BLAKE2B e5f7cde1cabf1f3e027d9c38e57951ce0f585a286ceb694a63940f18d5e07fa237715f9011a4a4b6e7e1977d3b42577522f5d89cdc0c9f9f8568b5d0a2d94e0e SHA512 57cace1f5369cb2c7198feead227cab0676c5e9097df072429e958537b16c2b701de31d53a9cf562f929aec7c68da4baaca3f73e18224177bafabd06af86246f
-EBUILD qtprintsupport-5.11.2.ebuild 777 BLAKE2B ea90c13d7ceecd077bb6fac0e410a5b992ef8993fbbb9b0c998dafa1255242850c20dfe3b240bb68e32bd0a10862d000894201c31548a50d24d6072b6c89fdb1 SHA512 0928447c4f6e434701cf7327900259e613c7faf6618c444ff6d7a5be6a7cf4cc49a90c884de9d32ffc6479cdcad2b6f9f93989e4523e1288344abc2e6eac1a5d
-EBUILD qtprintsupport-5.9.6.ebuild 776 BLAKE2B 1fee8755df583a6f9534d835cef6275b1c02e3233b9c44f4bdd0525da27212ccb250c409a61fa63b71126aabe7fc79ea5f84d8104dabe697f58cc1883baad0a5 SHA512 dc5c309683e5535f00e979e8085df9745a878f7ddd2f4298e70f32f566894d48aa971634328eb01a58197feac2305a50a7ddcaa6e05231ff09bb7b408d8fd39d
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtprintsupport-5.11.1.ebuild 773 BLAKE2B 81a9e6d9b64142e9983ff20396a347c4556f9ba232021a70d2d10d7e896ed2ba90ad7bb20b381ef776d6ba55545d5fac62a9c91547b464b80be1eeb0276ae688 SHA512 7cc39b7c8dd450fbecb0afb210f78569bdde73af3044a155b09dfa6387c84582e234c21879a8bc36e58523bc21526cb74e7a4852332a082dc7b0551a4c994896
+EBUILD qtprintsupport-5.11.3.ebuild 777 BLAKE2B ea90c13d7ceecd077bb6fac0e410a5b992ef8993fbbb9b0c998dafa1255242850c20dfe3b240bb68e32bd0a10862d000894201c31548a50d24d6072b6c89fdb1 SHA512 0928447c4f6e434701cf7327900259e613c7faf6618c444ff6d7a5be6a7cf4cc49a90c884de9d32ffc6479cdcad2b6f9f93989e4523e1288344abc2e6eac1a5d
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
index b9b7af20b52b..80fc60a6c4ea 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="cups gles2"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild
index 1d457318cd9c..1d457318cd9c 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.11.2.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.9.6.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9.6.ebuild
deleted file mode 100644
index 3484c5c647aa..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.9.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="cups gles2"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 5e6133c171d9..3fcc05f02376 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,7 +1,5 @@
 DIST qtquickcontrols-everywhere-src-5.11.1.tar.xz 6058072 BLAKE2B f49b51c72486a5d514d16faf78ffad883e3597f6337d4103bc4b93d9cbce681853c38563a2f237308f8ea2362d8486284da308d4d815388457b429f3a3eeead0 SHA512 d12cffe5a91f10e37b2ebea435fa147508fa60dc83076a1fb1c26d4ea16666c13ced0c36a5222092b6c4d6c1c723bed5b881fc33557353e09cb9aca068dde26c
-DIST qtquickcontrols-everywhere-src-5.11.2.tar.xz 6047528 BLAKE2B 37dd8ae8c3783e184b25f7f4eb19eadba709fcfc908d997e0dd0b4afd7d3da06d8e211948cc2d922b3e75018dfb8eb4a65bc1d31ab2eb696ba34278f5929caf5 SHA512 621101df5966d74232edfe0ab1130968cf311a73e020604a4b329b412062599ab5a0f4f95a4d4c2bb6c2f91143485cd760dd6efac573dbd74f787361a99d5d25
-DIST qtquickcontrols-opensource-src-5.9.6.tar.xz 6013760 BLAKE2B 5daf7e1cbf94fb6f532528b52c4b30802f27cf789b041251409ed9d730ed1539fab41cf1b94509ed63a21c479dce43c10714eb1b91cf0d2c2613a3890feb5c6a SHA512 1a48ede02a0a0ddca6475ec952684045638a61a0db9f545b8ad8b2115f93f3a5586655a24138545d168196a3990f2c6dbef18530af546c60026e1eac91ca832e
-EBUILD qtquickcontrols-5.11.1.ebuild 746 BLAKE2B 5b97e14420d32826de199195a13c865f73f932fa2eb65a1bc211a3309d7547dd00c80129cfd0e6f33f48e24e3bdab361c958855e5a6998bfe4deedc40843c9b5 SHA512 f61fc636b451b7c649ad75944cf1f3b99a1a39a50d0890ccd237bbed19b5783c2ae53ca3eaf6dcc6b02ce3f76aa7bdfca59aae50f2d528d8ebb6fe68d98931db
-EBUILD qtquickcontrols-5.11.2.ebuild 748 BLAKE2B a749502ff9aa641bc4bdc079b929c66bd54ebead51c3b053374888c05eabae87f3470ebdc4c4495e4a434a2ea8b9273dfffd2b25efe580d0876a5991248f40a6 SHA512 ffa6719e63d04d37585da6d1571a7849ceaef277176fbaa91c3abd86cfe8115d0953bcc4d0e7a6068fda0d029b32b4c264c2d0ae804bb9f2464f2f24fdf02c48
-EBUILD qtquickcontrols-5.9.6.ebuild 754 BLAKE2B c022ad5571b15140a27f2c24f26d296182d040fb7d312346061e6e19b3fb859fd3b10c6341e67206d9bd0946ccee449310cd6825755444a5699ce32d3d92b7cd SHA512 9e04b2ddae62747a64793e6c946bad58997b5348913e2dafe0b6b550bc2fb5e31971effa58ce4f445500703b20e485aad88c6aa1c9a2355de3c4b181675ab2d0
+DIST qtquickcontrols-everywhere-src-5.11.3.tar.xz 6053336 BLAKE2B 304fbc5e0028f49662dd077349a28ef974470aa4e4389d633a409b6a756c24a730a675b774429246e1923fa1ff3f6b33b8cea75e588c58c55232519c4af45500 SHA512 359a2509e35240b50dea06e7197ce974a92a7f4fe902b7f6c40b087945eaa8faa0395d3d35a6c79c3a5bc75fadc75688d36338086ac67bf2ab8be795a60905b7
+EBUILD qtquickcontrols-5.11.1.ebuild 744 BLAKE2B e5b372e09066019828e73cf2d883e5073e1225cbf129ed0ce5a35665c83bb8a7d9ec29e347ce72c549d25362dd23034143240830d9291ca92713c9521daccb20 SHA512 cf556d46fb810c10b0d2a9502d5e8634c8cb202adedfbe8568465937297e2d1d79bafd2fca358a760799f2d90e5c93235aeb208652df34412f7f247355efbd24
+EBUILD qtquickcontrols-5.11.3.ebuild 748 BLAKE2B a749502ff9aa641bc4bdc079b929c66bd54ebead51c3b053374888c05eabae87f3470ebdc4c4495e4a434a2ea8b9273dfffd2b25efe580d0876a5991248f40a6 SHA512 ffa6719e63d04d37585da6d1571a7849ceaef277176fbaa91c3abd86cfe8115d0953bcc4d0e7a6068fda0d029b32b4c264c2d0ae804bb9f2464f2f24fdf02c48
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild
index d845cc003b08..3acfb4ddea1e 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.3.ebuild
index 9c557760e183..9c557760e183 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.2.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.3.ebuild
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.6.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.6.ebuild
deleted file mode 100644
index f52ee28da490..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="+widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/controls/Private/private.pri \
-		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
-		tests/auto/controls/controls.pro \
-		tests/auto/testplugin/testplugin.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 3060d56a61f1..d50a62b0df89 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,7 +1,5 @@
 DIST qtquickcontrols2-everywhere-src-5.11.1.tar.xz 9032192 BLAKE2B 42ee81bad1cd3888c770d559ad91fa38e8ae57a72a5b6a1faced4cd8c6292e89392ea1fab14f821ed04aae5b7ac997b111f64b9725f0b35bd3b685605d367e61 SHA512 b4d42d5ec5abdd819badfef147492fecc8ed433b88705c418845d75d35ee5880b11afaf70f17e3913855ccaa9aa47b3a9d497350ecb105b4f0672cf29111eb68
-DIST qtquickcontrols2-everywhere-src-5.11.2.tar.xz 9035620 BLAKE2B b064b1733999eb770516dd81afaebdfa31294301792c5f62678b729aa4ccec36bc5ca936367010dd226fc4ef36ce5d561d7836c0ff82a884e4f141c2ee032fd1 SHA512 94e8113feb222b85fa890fc65c59a371e29eb6838c2221b12d795d9809a605478f1c0b35a75b06bc67a02b3827dbb6bc4c4bf3fdd7485ee518cd0e5c409061a6
-DIST qtquickcontrols2-opensource-src-5.9.6.tar.xz 4158180 BLAKE2B dca050d5c0939f51dbb8181d9d644e2e0c6d1e1937cd14146c16cf0452e027666ad8e4f1ba50ca118698ea4cf4afb4b7876dd562394e5f5cbd97de3d5384526a SHA512 46817c31a62de3cce4179869c3080e12d2dcb3859af9020fc476baddc184ef7a7b8dfb0ccd2501c72e689c5d64c3d9135eeb1f7dfc821f06aa124addc4dc4d7d
+DIST qtquickcontrols2-everywhere-src-5.11.3.tar.xz 9042632 BLAKE2B fa057831927bc429f2f3b906165d8fb4299d8fc260f35578c7ab5e68a99056a50848d110f337cd2440d443f123c7aff779a57990bb8232319eb1e9c8b1e91dba SHA512 b0591ac1f6948dfea2b43691f8dc5187a4d68142c61279fcc4387e7e9ea9ac1f4062d93d4adc4f8de28a39ab86a5d035f72f0c7eacb93050f2c002d7a0fc2caa
 EBUILD qtquickcontrols2-5.11.1.ebuild 600 BLAKE2B e7054d07d92b1b6e28e724cbe49523ab80fd8bbe56f02a3e8809d41c0c7de7837a5e3e9c59e2a6fd3d74e0fe57f09937451f57599b2eb9c52ee283ea6b819e55 SHA512 a7d0276b34bcc3115a56b3e63546dfe40d1216ef7b7de8a93dde85d3acaf9308d1d72fff92536cd1b3347e956de6c71f990a67a3934007854fe7de93f3f103cb
-EBUILD qtquickcontrols2-5.11.2.ebuild 602 BLAKE2B e71ab8708061c407032b8c4bfc5d8dffb331c2b2a597a9f798f0aeaad4e077e9d653a278ad7c7a35e91a3fb412750ac53989d3b4743207257c9ba7797d54d1b5 SHA512 9b7c5a6e7387a598bc535b75f2fcf3d89fb523ff14f6fdb33efc1b69d280f2ba7cc4bdd5a9f16258019a40c542701df526c5eb992e108c068fab05343bb45fb9
-EBUILD qtquickcontrols2-5.9.6.ebuild 603 BLAKE2B 31f03722c98ac29f541c1d8dfe6cee0390aaf5c118920d9bf2a442698790612d808e2ddd64f23065205ab76198df0894671e77a94e95a8fb0322460ff78219bb SHA512 7d8c43914e579c6e096590192c0db4ecd616e57cc18eda59e058aaf5b865f20cc7666211b11ebc1aee4122f8eda48e5ab403504d1e040a865f00cd766804c5d0
+EBUILD qtquickcontrols2-5.11.3.ebuild 602 BLAKE2B e71ab8708061c407032b8c4bfc5d8dffb331c2b2a597a9f798f0aeaad4e077e9d653a278ad7c7a35e91a3fb412750ac53989d3b4743207257c9ba7797d54d1b5 SHA512 9b7c5a6e7387a598bc535b75f2fcf3d89fb523ff14f6fdb33efc1b69d280f2ba7cc4bdd5a9f16258019a40c542701df526c5eb992e108c068fab05343bb45fb9
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.2.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.3.ebuild
index d8c91c45bf14..d8c91c45bf14 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.2.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.3.ebuild
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.6.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.6.ebuild
deleted file mode 100644
index 53ac04d9af39..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-IUSE="widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}
-	~dev-qt/qtgraphicaleffects-${PV}
-"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/imports/platform/platform.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 43ec9d505520..3faa41dc7a89 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,7 +1,5 @@
 DIST qtscript-everywhere-src-5.11.1.tar.xz 2671428 BLAKE2B 8cc74db4f5b33e299964f81b00e634965f7471d191726521726a5f2556a8eccf344e7277071f817a9fa0c40856acdb955258e9491966b6f773701e809b73982d SHA512 609ac6675341fb2707ad3b91e955a430846253741931ada2343ab2d1ad27169a60548b1a2621369384043a4c5b983e392c3fafcffd50237563b9f4204123e411
-DIST qtscript-everywhere-src-5.11.2.tar.xz 2661200 BLAKE2B d35cde6e628eaf8987c8dd0afd0c6f9c363a357d787f84b185963f5691de3b62b62b0814f2fd6760ab1fedb58e58f721750ae9ed3abfb9560aa9103510e19dfc SHA512 b0b4badc78cdebb3b42fe91104d112afd3bf9d4ead962c58ececa1db3db7fae6d5368f94d940195e2791ebfd09c5d6d5d892e9c4e48d64ec77dd366eddb1ab00
-DIST qtscript-opensource-src-5.9.6.tar.xz 2607812 BLAKE2B 3f11ae2270b1bdc6ac195a4a398754df16d4599211ba291fd0a5793cc7e586f0034f1f5d63a185541e35c744de1d3c8facf12bef2cbbf98abd94b3c27e40b6ba SHA512 2ddecda376b79edc8cfe9215a531a8f0b1892f3e6b39c298a679903c2600a1df43bb59baeed3392e92fefb476ec2ebdd2ffd351d14918fea00025d2cbd48da46
-EBUILD qtscript-5.11.1.ebuild 688 BLAKE2B 4a2028b8736797562ad3ee02c42ffe760ba69981a68321802047c9d16f862e75183fe9fff76ff6d8ede5979ab04dea112b310568c73590458156124c2fc16ac1 SHA512 f908c51d558b5cd10146c6e0038e9fad4d36407b3310675508be290e69c7c3820cd808fb98579bd04050a521ff66933225d19ff7be0a8670f089581a1ea7334d
-EBUILD qtscript-5.11.2.ebuild 690 BLAKE2B 33a02e3ce082f083108327860947f4dd5083b8ffcc92d97a3d9de0d8fea8dd281334dccd6d52a1fed39f90d48188002bed2c2bc7ef2b2571bd65a57224c17000 SHA512 4a87beefabae87f1c774941c7f3da0f510b2280c621a7b56968cb0867453858c89fcbcb36bb14d71a80dd4a58e9aec935579ea26d4acb6079ae4add8b35dd805
-EBUILD qtscript-5.9.6.ebuild 689 BLAKE2B 3028a7bd5a9ff47f4cd1e197fc71bb08dcc23d0d51b896cd7ad2d112a7ee28cd55d43b64dd76152a36bebd7ec98ccb10041dadbb6ebd7a5335ff9307e6518388 SHA512 ce0b31049b30c774b682029069e29af0d5cc8612721aa929dfa885c79a3de80a86837dbb43332b19179ade60a41c13face0d2b7ccc3ce635d88b398540c57125
+DIST qtscript-everywhere-src-5.11.3.tar.xz 2674692 BLAKE2B d209df1f632b9a00973eb043660c8a4a5e5c178fabd3bc715f91b37b781ea3567ea6fd7a2a12d462a63fb858c98a2e3ae703e8d7297a37c5d0dcc81d2f972d9e SHA512 987f9a13a698e3f498ea7408f4a9b2379969e901aa6b672ab2733af9d65fe79dd27af5f67aff5d7ab1903b5889c82359970ac81cf27f1eb2bad1e36eaa376b30
+EBUILD qtscript-5.11.1.ebuild 686 BLAKE2B 49dbad48bf8a63577e7cdfd6a4d8025a64ee33b7dcf84cb34119f5a000df0c9e2ad0e5a34ae9cffa9a1df949a18ae0158b969c6eed61507f62f670b8fef2c339 SHA512 ab55353c86929c1d9be2105e3d1fc495c406fd8c704217869d943c96396309393c8718173423c9a6afd1a338426d8fcfcca98e9d322858a22f9cad29a928146b
+EBUILD qtscript-5.11.3.ebuild 690 BLAKE2B 33a02e3ce082f083108327860947f4dd5083b8ffcc92d97a3d9de0d8fea8dd281334dccd6d52a1fed39f90d48188002bed2c2bc7ef2b2571bd65a57224c17000 SHA512 4a87beefabae87f1c774941c7f3da0f510b2280c621a7b56968cb0867453858c89fcbcb36bb14d71a80dd4a58e9aec935579ea26d4acb6079ae4add8b35dd805
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.11.1.ebuild b/dev-qt/qtscript/qtscript-5.11.1.ebuild
index 4c9fddf031b1..e9ee8af1c491 100644
--- a/dev-qt/qtscript/qtscript-5.11.1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtscript/qtscript-5.11.2.ebuild b/dev-qt/qtscript/qtscript-5.11.3.ebuild
index bcf1380a584b..bcf1380a584b 100644
--- a/dev-qt/qtscript/qtscript-5.11.2.ebuild
+++ b/dev-qt/qtscript/qtscript-5.11.3.ebuild
diff --git a/dev-qt/qtscript/qtscript-5.9.6.ebuild b/dev-qt/qtscript/qtscript-5.9.6.ebuild
deleted file mode 100644
index c2f09aef1ed0..000000000000
--- a/dev-qt/qtscript/qtscript-5.9.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="+jit scripttools"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	scripttools? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod scripttools widgets \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index e3a81e863839..78bffeca6c4c 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,7 +1,5 @@
 DIST qtscxml-everywhere-src-5.11.1.tar.xz 436148 BLAKE2B d26d8e54bc89685110168043ec876fa8bb34c0c23ed31c625d26f71e82283716ed70e3fd71ad02233bd69546ace02cb87549ef3270e3bd43c0758db480db3639 SHA512 d64dba323b009525078e999e0972fd09a16bb806980411ce7cc452aee0951632ee440f71c2b5124cfd6ed5020aa869d8490017aaba374a8d4b83f43c1f0b0689
-DIST qtscxml-everywhere-src-5.11.2.tar.xz 430496 BLAKE2B 7c6ec84440fa2a0c54de24587d17af9cb2b09b7c11056da32c091954c87f21b448f512aa131d9051377a9052f7e8c09f00e259b071a0879ccf244bd3f623c114 SHA512 4175d02224654a6a6b220f52937a22093be8b06e737f5575d4227b9038cb7c227f37eb17b7bb6878c16a34eae342c06e33cb2c356a389137e9f7d15886aa30ab
-DIST qtscxml-opensource-src-5.9.6.tar.xz 414120 BLAKE2B 90458c151e42308d660556871ab4ce4972a2d620d9785d2f39b2c913d0fa35522be5fcc459838f42c93b6ad6d76a0022b85cd3cf367fcdb77004f199091e0d4d SHA512 d649a43b5d9b753c431120972be93a190583315045d724ea5149ba93a73aa65724eef8a8b0d33f48a543418e045961e91af1d068774a923469f871ed3a97d4fe
+DIST qtscxml-everywhere-src-5.11.3.tar.xz 433500 BLAKE2B 7d7d961d2ec8e91dfb6e359ee3cde840094ac22f71745998b262e5a1d489f38f561ad163e36173c7758618213970bcc80a2f327cccb7e80d9b89dbf7ee0d8ecf SHA512 d162da8c11a24b764b793e446a9c1ce91068296e8f79525a874420fc97f0a9748ebef84f0fc0d615b6603025a3d8897f0ef14bcdcd95209f518d691dd457a93e
 EBUILD qtscxml-5.11.1.ebuild 369 BLAKE2B 7f37bc1afa67f7b17232814322013ed3f7c35f0427b490c00ed0d719d1489b9c9a7c3b4ec83c17688c6fe769fe1ccf608f918cbca4692f199c2aba236fc55939 SHA512 e0f7f54fe57ccf4b339bc7981dd321fe991aa48f8b3a4da081a6f60a9de52bbaf329dcf3886b53914878a801673fed5f7c132bfb05945089c5b87725df0e5b9d
-EBUILD qtscxml-5.11.2.ebuild 371 BLAKE2B 4ca727220d9f994410618f6fd83b309a4cc29404f50d63ee30468370e3ac5e122b748103eff82ff45540b93c06d5bd403f726f0a2a21877e2786554ea4ba1724 SHA512 fb150fb168b3630b421899caf5cbb7b44b39210f7c7647327b2f3f5835538007854e0db624e3b0248a1eb4a2e264f5f87395740fa0bf788dece24088953a1279
-EBUILD qtscxml-5.9.6.ebuild 372 BLAKE2B 7c3d91f44fae4d6c6d66a32247299e6ac27be20617c8c4dcdbddbb3f7b53cd7eade1033bb5013e7d3bbdad991f6a4be3ba8a6b0eebaf24d3c7194028f299f77c SHA512 ff3500bb2effa2c6f19bff568c373c461e2fecc48b7ede945abe3c8ec119bc00eacbd2a9c3bf35fd374dcea1fa6a476db859dc3e42aac02366ebc0b193852917
+EBUILD qtscxml-5.11.3.ebuild 371 BLAKE2B 4ca727220d9f994410618f6fd83b309a4cc29404f50d63ee30468370e3ac5e122b748103eff82ff45540b93c06d5bd403f726f0a2a21877e2786554ea4ba1724 SHA512 fb150fb168b3630b421899caf5cbb7b44b39210f7c7647327b2f3f5835538007854e0db624e3b0248a1eb4a2e264f5f87395740fa0bf788dece24088953a1279
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.11.2.ebuild b/dev-qt/qtscxml/qtscxml-5.11.3.ebuild
index 3a0e878ad0e3..3a0e878ad0e3 100644
--- a/dev-qt/qtscxml/qtscxml-5.11.2.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.11.3.ebuild
diff --git a/dev-qt/qtscxml/qtscxml-5.9.6.ebuild b/dev-qt/qtscxml/qtscxml-5.9.6.ebuild
deleted file mode 100644
index ca4f733913f9..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.9.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 1467e8d6328e..e0dba2f517d8 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,7 +1,5 @@
 DIST qtsensors-everywhere-src-5.11.1.tar.xz 2033508 BLAKE2B b0b99adafdb96835a019c915f57bdbdc76dd965d32081a2b8d4f1ce60a06fb9d1c450a2949a1ca2475aa303514e99ebe695dbbd0395140c7edba863731b8b32c SHA512 5da90766ec979ee51b3df97f794b1661a1103b80cc57941516171d5102b54c15bdf1cfabde21e5b94ddad324686a6a92171193312e7c6791d5de63832452010d
-DIST qtsensors-everywhere-src-5.11.2.tar.xz 2028412 BLAKE2B 870775982fdc067b55cf172d420077dc67a762a782f1c39a3328d4a3bf99748c22a629359e7ddd155465fad55ccff7cf562bd1b7b24ef92dadc96d4b24fad733 SHA512 561129563cdfb0990539cd04ba1b6f0aee884007a801a4cb0fd4dd46aac2b58245ed919b23fac3d484d01f93ee428be3d4b8896a93af18acbce73e199a58ba80
-DIST qtsensors-opensource-src-5.9.6.tar.xz 1994404 BLAKE2B 38935553d7b765e2de9b9328ecbdca6c141c687742c6981b5174261122e568c5534c44b97d67016b33a1bfa47eafb0f04a89d13c1cc43296ffcb31174290c762 SHA512 1c82b0e02bc45c914fbc620049b2f4e33bdd0ff858c2f3946d134e4e5dc5927358ff53db0b6d9fcbb6811e36d2a816aacf7f852f377ecff47280ca592eaa92c3
-EBUILD qtsensors-5.11.1.ebuild 532 BLAKE2B 964581b4beae02e6c67b60db7e4cf48cd825922d6a970a4b2e172912f1a1e9aeb4e5e3e9f33fd3da1a159fad5a95d95602bc362864caa92eed3da0704529e74d SHA512 af711d5cee1d2fb6e370d6a9d96eeaf778abb98d71e6472a54fc81c134812bbea344bf5b2f1443f8fa35817e40eeb9b6f58e3fb06ebb461c7542e989332e3054
-EBUILD qtsensors-5.11.2.ebuild 534 BLAKE2B fa1dd46f2530471e88ceacdf6de07448e5b25b65c7f32f293a10e3c236bdf81968348d2fd81a6a8bd419f37f90bb983143b7d705d7d4547557a84cb8f14174b7 SHA512 7e040cb48588c6bf703d5e431f0528ba91c223d4f810db228bb49b648da94558cd9ed81d22762fe1821c50d50ffc73358c47fe2eb875ec1a82bf0ba57f3e2f8b
-EBUILD qtsensors-5.9.6.ebuild 541 BLAKE2B aef09f5bdd62712082d440946a16fe453318b8a1dba16608857cf7f068c64f48b63310998ab30e95e07ce16a358f412b83e1f59482ea311c994c363761e75b00 SHA512 b2e06a87fbaeb95862f37eba18e95151e1b68034297468c3486204c50c3d47fa534bdfee25b44fa6e6751d4c1f6cc8e16f162e56cb3dc5af97c5a3983bdf2598
+DIST qtsensors-everywhere-src-5.11.3.tar.xz 2031168 BLAKE2B 089c77403a615dc1448646c5ef73807ad78242840569dc20367afc379aeff6aa8d925896c549568a3af913c5458a0b9e05245fa45523cccf1c89d6e3675edf90 SHA512 b0eae65b31be1c96870d29066c79b170f1f825615a78de902173f64a6d0f132678c5bf26d0033e110dce3ed3f2b99750a3b4cf23e1c13f799a9e51a6cacab10b
+EBUILD qtsensors-5.11.1.ebuild 531 BLAKE2B 2bd520d3491ea15d55955baea1d0bdd9491332dc7bcb391999455b16b94904c6affc104a02453f7b6d2f2332fb05b7e6c61e4b64578930e28f8933caf3a040d2 SHA512 205a4e7ba2c2f1e78fd612909dbc4651b4fb20837940da51673a56f71cf18ba1977ae0e93c0b98faf34ab01dac990b868df20666b76bbffaa4aacb8b78367905
+EBUILD qtsensors-5.11.3.ebuild 541 BLAKE2B 54aee1b9adfcfafe7333d5515875576bcfae3423cfa7011fbd9b1256502f861331c669b9a0ca9c5f024e81126358788257847d24bf159d9feaaa92e95fb0dde6 SHA512 4a7e4d53313c891e747fe86f90d9e53f2911bb33493f6075bf2daa0fcefd7ff414ba4ec17ecb979019192616278fc6b5abda00fcc4ebb2bd9664243617fd9f2e
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.11.1.ebuild b/dev-qt/qtsensors/qtsensors-5.11.1.ebuild
index f1f60f3380e3..4a7a7d99a6bd 100644
--- a/dev-qt/qtsensors/qtsensors-5.11.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtsensors/qtsensors-5.11.2.ebuild b/dev-qt/qtsensors/qtsensors-5.11.3.ebuild
index cfd46f98d61d..2e43bc457f32 100644
--- a/dev-qt/qtsensors/qtsensors-5.11.2.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.11.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtsensors/qtsensors-5.9.6.ebuild b/dev-qt/qtsensors/qtsensors-5.9.6.ebuild
deleted file mode 100644
index 69202dcb5268..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.9.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Hardware sensor access library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
-fi
-
-# TODO: simulator
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index 8860d732ff76..31c611c4fb17 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,7 +1,5 @@
 DIST qtserialbus-everywhere-src-5.11.1.tar.xz 320844 BLAKE2B c55bfb9858afaeb875b48f291eeca138e9aa7597eaede14b40235af0db64da4e71fafc1cad840d4717487d6f614305f9ea6f89d105006392e2324bea193ae625 SHA512 9469fe7dc6d334eb2b0737cba62db72b7bd8af56631dca47125edb595a9dbf4a89be2d4658f6daf13d13cbe6b01915d61cbeeb71cd804612825bbd78692fb682
-DIST qtserialbus-everywhere-src-5.11.2.tar.xz 315080 BLAKE2B 4b8280ea6a007e877151d7070fb66aaa2dd8b806cbe394d1d37a268b3c4b484514e1df5ab4a1be6b802ef9c7b7a56fda1ae089600b15afd5b15b7aa93bb42abd SHA512 92b2187f8cd5431cc2a9640016783edcf03fa1ac23e7008abd3007d9e7457e429011f7428e26cdc2b0828c022dcc44184180d6fc97e613d2e06ac03080cecfd4
-DIST qtserialbus-opensource-src-5.9.6.tar.xz 278920 BLAKE2B 34775b4aebaedec3e3a826c8588b8b167d617af2df5918314939d38604e3ef8781efa3e806824b93785eb527b3149fe1a49774d2bee12272e97d040f24ec0f0c SHA512 332edf0da83a20a39e65280c817b591b3b5b50710ae1dcce1bbe284233e20bc239584db634078697e87293a9811d1ad6f9d38b3ca7aa6188b9509cafe6672f6f
+DIST qtserialbus-everywhere-src-5.11.3.tar.xz 318484 BLAKE2B 5197dff9b827e58f1e7558517d38617969f8acdca04557ffe92fd2178370fa3c48a59a69b119aa56bfdb0bfde9d4dec17174425751ef32e7610c07499fd2f9ac SHA512 cef0f34bbe6f56705180eea75f4bba622931d7a596b245d8d49dc61d570cf2f163fadbd6f9bc6e84745f4d76dab9ddc6ebdfcc1ec6078f2e4a154d55f0cccc91
 EBUILD qtserialbus-5.11.1.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
-EBUILD qtserialbus-5.11.2.ebuild 372 BLAKE2B 771d10d088c56e91fbf5c3a87699e239438f4028a2514d71ad74ed5ff182646044daeb9c9b612808cdeb053da34ff8cf6c5d2dc3a453b0cac9052bdecf6e6ddf SHA512 9ec97448ba9d1616de5c064b3336bfe2b3b30480787ae7b21a59f50e09133d1a262dcc1444306d62c2bd2083bee70b8b1989dcae635c493bfd7d2f3d1e2707f0
-EBUILD qtserialbus-5.9.6.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
+EBUILD qtserialbus-5.11.3.ebuild 372 BLAKE2B 771d10d088c56e91fbf5c3a87699e239438f4028a2514d71ad74ed5ff182646044daeb9c9b612808cdeb053da34ff8cf6c5d2dc3a453b0cac9052bdecf6e6ddf SHA512 9ec97448ba9d1616de5c064b3336bfe2b3b30480787ae7b21a59f50e09133d1a262dcc1444306d62c2bd2083bee70b8b1989dcae635c493bfd7d2f3d1e2707f0
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.11.2.ebuild b/dev-qt/qtserialbus/qtserialbus-5.11.3.ebuild
index 687bebc9281a..687bebc9281a 100644
--- a/dev-qt/qtserialbus/qtserialbus-5.11.2.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-5.11.3.ebuild
diff --git a/dev-qt/qtserialbus/qtserialbus-5.9.6.ebuild b/dev-qt/qtserialbus/qtserialbus-5.9.6.ebuild
deleted file mode 100644
index c6a1fac19557..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.9.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Support for CAN and other serial buses"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtserialport-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index a138b135f9cd..eb4ceb3e7f2b 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,7 +1,5 @@
 DIST qtserialport-everywhere-src-5.11.1.tar.xz 301692 BLAKE2B 8d57503dbd16d142ac72dbc496218d57ff92212b44e8a504f3b6ba27b2bdb295061705c1318000d50c2383ce815c8420b056ea66720f62338a1b98785d37c5f4 SHA512 2f13122438dfe91c6885534e4470e119abf1c7134b1d344e9c0700661c002566f483aa2bcdde53e4860df349fff4ff8ef05bfafb0aa1bb4484d3e5d07c989404
-DIST qtserialport-everywhere-src-5.11.2.tar.xz 295876 BLAKE2B b10f33c7956bd62573da46f83129e7191e773316529cfce4897cb5dd34c40eb48f9c7626b23110936b2e464b95a560f0e816b1680011444080c61b633ade912a SHA512 babf89583fc025de511601f608300a01453e06c2eebe51c0d3cad3eb9c8179fa9cf9982690306ffaf7ce0a0abb7174ae0078a1fd36f6a34a2d5277bff9d4ea9d
-DIST qtserialport-opensource-src-5.9.6.tar.xz 268344 BLAKE2B 1aa206d12e508474c7a7aae3d16923d80170ea739e1fed74de363fa42afcd94fbdaf683e85515d5de7086a8bdf901dd03f48ba949e4429e47dd0af176861c36f SHA512 a4f5230c78772aa8899471dea90bab38a1cc021c22737f959e1a6852d18e7faeaadba4d329e49b3c9a3b7ef5fea69febb550e7fb4a9d99902d0e80a144822847
-EBUILD qtserialport-5.11.1.ebuild 549 BLAKE2B 36ce59fef499bb387e88dbeacc82f60796579d1b1c5afec3a8a1b65dd9b91ee76424cdcedfe64d59d7f4b67ea434ad2544eab3e4bc27467d936ca479f4c582b4 SHA512 dc73488f5cef789dd2453698a24263c44829e47784e6792d643367951a0282a6c9aec72d1a84db04fe2921cff7eca03c370055ce7303e6e9e569b3369a55db48
-EBUILD qtserialport-5.11.2.ebuild 551 BLAKE2B 06cb5c41e8342a618f275352267dd3f521868043a2d8ed32dbb2327270b04c9a152af086ef33a70ef3cb8a564be34079417e6f7a81039629f34f1e0ef9dc0f82 SHA512 8689337c5e2a3ee2e90cceb811a82efe233b0dcec11b17c2200b8bdd5803e3e9cebd5131a6d028de4d62d4dfb38b07c60817666f4db0cafde4d4494803c76a4f
-EBUILD qtserialport-5.9.6.ebuild 550 BLAKE2B a8e99cc63bc703a5534375e984d4da655d52cf4a807bf8be778d46a363412e11066e149fbc0e042f929e18aee59edc23722eeb96208490489f57e37a1d47b730 SHA512 c6301e4b704a20316eba844662109238d921524827380c4092935452eeedc170bf6d04c8085476956363e0e5ec0dcdad1e1d2eaa1e27bffeaf6017462232f321
+DIST qtserialport-everywhere-src-5.11.3.tar.xz 299140 BLAKE2B a10c24eedc425262145b705b7a264732db6a47d1bc080f2544bdb6873b1e7f6d1c25e9b27a3dbb5fd3eb697f06c4b057c072112090ce5f769f765d858f41860c SHA512 2c09a0e47bfebb494cdc767c5268bde77ef7dcbc665cfdaa0b17468a0cebea0208ea8019d0387622d2db63387557699fa30e043f3478dbddfd6b8fe909a7add6
+EBUILD qtserialport-5.11.1.ebuild 547 BLAKE2B 253f9918699b2c0a847d218288d3960016928901a2f591d491c807b168e78e637139a9e0fd2fee14d19b2869fc03cb1f9b6894f0a010a570022c9b54149e5ac0 SHA512 be65297a14a40d0f1679eddad08158d8eb1f339804f717e4a03f5c6b245f28d4ac9b341d0d9543a680b684fb2d227ac661b011d610122c3f13c787fec2bb7654
+EBUILD qtserialport-5.11.3.ebuild 551 BLAKE2B 06cb5c41e8342a618f275352267dd3f521868043a2d8ed32dbb2327270b04c9a152af086ef33a70ef3cb8a564be34079417e6f7a81039629f34f1e0ef9dc0f82 SHA512 8689337c5e2a3ee2e90cceb811a82efe233b0dcec11b17c2200b8bdd5803e3e9cebd5131a6d028de4d62d4dfb38b07c60817666f4db0cafde4d4494803c76a4f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.11.1.ebuild b/dev-qt/qtserialport/qtserialport-5.11.1.ebuild
index 375d697f5205..ba2dbc6be053 100644
--- a/dev-qt/qtserialport/qtserialport-5.11.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtserialport/qtserialport-5.11.2.ebuild b/dev-qt/qtserialport/qtserialport-5.11.3.ebuild
index 67478a8b8170..67478a8b8170 100644
--- a/dev-qt/qtserialport/qtserialport-5.11.2.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.11.3.ebuild
diff --git a/dev-qt/qtserialport/qtserialport-5.9.6.ebuild b/dev-qt/qtserialport/qtserialport-5.9.6.ebuild
deleted file mode 100644
index fb5436b70c62..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.9.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Serial port abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# make sure we link against libudev
-	sed -i -e 's/:qtConfig(libudev)//' \
-		src/serialport/serialport-lib.pri || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 9a4ce548a7af..4d3178ff8f02 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,8 +1,6 @@
 AUX qtspeech-5.9.4-nogui.patch 321 BLAKE2B 0b97c282f271a1ba1d7cfa2ba15f75bb2964c3eeaa0a946346ae0725e2a7a9198fd0dce4bf85ad9b0d06e49234dc11203d5a0f52e11e17b879a9dc1712014e91 SHA512 8d2dce3280948bc0451d0f753d415552c556c089d5195172953215c3abdf14100a3284699e9d5cfd0feca83466d1a35945a8bd2a863b325ea5e257b277a0e71f
 DIST qtspeech-everywhere-src-5.11.1.tar.xz 101732 BLAKE2B 2201a78f27851c4ec1d2a7056c6b0b620ff77b73be626940f6fe296baa677c5ee4a8098390be48620af77db10b75b777214b41c8dc3fd9b54f3a3cdf8f613345 SHA512 d17a0ab62083b9a8cef5f458b649b7789b0e3394a660c71f9ea6e6311c5e37edda10b16692817b8e165dd66a38cf34560e37940a63beec99ece3e2ee862adf51
-DIST qtspeech-everywhere-src-5.11.2.tar.xz 96080 BLAKE2B 90f5e519bef440916f962e5886f1bb8e1cf46a806172ce9b8024b4b4c70d581896a9e70bd42d0298803c43798e985cb345bc4c4f8b7c13b4eb1a4921de79bc6f SHA512 b3e433b308c6c3454e40e7e19a075d1bd181a33ecea9c8f970852251488c12d1227e0b92aaeb6f7f75ac0efcb04bbe22c49562c594d8b9773528a2aaf73f8d02
-DIST qtspeech-opensource-src-5.9.6.tar.xz 80716 BLAKE2B dd7b7fc52394cb9b9a9f31de3f08fe9efadc03694604f871f802b465a1bea6753be9ec2bd3843296403939dd2ae0b7e40e910b7fd01e0f8a17f82517531356ea SHA512 0a07c7cf0e58388f4fcd197d6b8f3b6a84a618974d725fc03847ab42b814dfe9e44025e8adcc5c66d9c7bb156e6b6e9457a62c8d2211e45de1ae27d89697e333
+DIST qtspeech-everywhere-src-5.11.3.tar.xz 99516 BLAKE2B cceff35946e7e8012d628b5d1093256bf68d512c750b4f5613456e225090a3108264046963ca97aeac160293d5d814db9f5286126797f22437f6fdc0e233ebdd SHA512 f4465b0eac4690fe576c098704d992fee884ede3219a6b032608b877748dc670cec6dc592aaccedaa62a0b2c9d552b9e1284bbac44af6e4cf074bd00918284be
 EBUILD qtspeech-5.11.1.ebuild 473 BLAKE2B 22ee317b691e239705c117a4bc8ead93995e7124d9e0d2400f1c6650bae61c386e09011c5ffc24006a57cba0c460522735f9ec9ebb19a1b4d0a6e7dc54a94f8e SHA512 150110b763642f1ac1a1468cf3e838b4d180f1c3d531dd2ebb79a51fc968688d6a281fc8b143aa7b4dc2f56d3e93c80fb177d1603266d4c200af2d0de11fa0ac
-EBUILD qtspeech-5.11.2.ebuild 475 BLAKE2B 3ddaf11247791abf816972351621425da73804c93130c391c469e37e8be490e0b571fcd48776be35f373f0fcf858a3e59379bed97dae94044ac9ced6fe10ca0b SHA512 1d4fde9ba6306dd994e51be814eb978f04b993844f0956245abad9c935f9ec2f4b6abd6c4503b0859a3f03b40eccee03384b1669f8ef6f532a8e7d7c1a694392
-EBUILD qtspeech-5.9.6.ebuild 476 BLAKE2B cd2475975fd575808f8a4b377a27e1d06a2dad24b116a13151043a4d1d5f7b34e8e0b8f21cc1c05c9495edba49b4b9422aae30b8f34f2465d29d3472620d4388 SHA512 70c6608ebd1f2e986eb55d4a82b7a035a5cd5dee458200e0853833e7afa0926d8fd8f675247ddc38bb89bbf6b626dda226ead53ced0f2ecaa4b240eb204813da
+EBUILD qtspeech-5.11.3.ebuild 475 BLAKE2B 3ddaf11247791abf816972351621425da73804c93130c391c469e37e8be490e0b571fcd48776be35f373f0fcf858a3e59379bed97dae94044ac9ced6fe10ca0b SHA512 1d4fde9ba6306dd994e51be814eb978f04b993844f0956245abad9c935f9ec2f4b6abd6c4503b0859a3f03b40eccee03384b1669f8ef6f532a8e7d7c1a694392
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.11.2.ebuild b/dev-qt/qtspeech/qtspeech-5.11.3.ebuild
index 690b4281a2a8..690b4281a2a8 100644
--- a/dev-qt/qtspeech/qtspeech-5.11.2.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.11.3.ebuild
diff --git a/dev-qt/qtspeech/qtspeech-5.9.6.ebuild b/dev-qt/qtspeech/qtspeech-5.9.6.ebuild
deleted file mode 100644
index 3b552c0e3d17..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.9.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Text-to-speech library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-# TODO: flite plugin - needs 2.0.0 (not yet in tree)
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/speech-dispatcher-0.8.7
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" )
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 32494eaf3cc7..d60540a4a9a8 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,8 +1,5 @@
-AUX qtsql-5.9.5-mariadb-10.2.patch 1199 BLAKE2B cb5d5079aca9f9adb0343db8691418afc1e1b43c8a425f5c8f52ab24872047c9f9bdadfe48fee9e7c85b5cd1f886951aa3777f55ccada790113150c71a77ca42 SHA512 be4d8c3569ba3007a0b512184295f12043b79e09e948651fae3af5b4a6e7e0ebcf5c5f55c32c321c64a469eefeff16ee7169bbc03d7027ee04d62d384e04288d
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtsql-5.11.1-r1.ebuild 1506 BLAKE2B 30f185e48e90ef6dcce69ca84af1ce5fdfa509b39c1fac6b7a775d87a35172572274cf802ea7df1c089c6a5ef0e387a9b054fd30139e306c39f0143545469508 SHA512 99cc1aebb01681199cb64410a5f35933beedc12a00c7f9f518f28f12b8c049cfc17f398c014ec66172e865a2728bf1a4a8d4f7f04e4d34f202c4f04323d27027
-EBUILD qtsql-5.11.2.ebuild 1508 BLAKE2B 4190f03f7b604221262e4bb0ded1a7afc3059305acf7c9c7b1560ce7448d870c0f9dc62358e98df69478ff861569d1605ce9906e1adf6ba524d61f474454da2d SHA512 c58b32fd78e9837d632bfe499f43bfd876e83634d0d9a5911a54ba0a71f148a6f835d680d5055889de4a44f108d979443d8a9ce9b7e6176467bb83ed6fad7da7
-EBUILD qtsql-5.9.6-r1.ebuild 1625 BLAKE2B 28b3b4d38223284cb2469d987754c9c7245449d64cfec867b474f935c4135858b1847926eb78d9700c8009615ca4276342fccfe5166193ea8460d7fb479562c3 SHA512 82a76b2e4c180844883edeadfea697bed04d699f35d72e9abf4e7139c087a99d4a9edcdcc60fd783220f7ac508dc2334a8a24d11d72f28c9af7154aefaa3ed5d
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtsql-5.11.1-r1.ebuild 1504 BLAKE2B 3c202a8d83c7cca11a939e91b11dd906004a0267e8c29b0a04f118912b67001a3e35f78c246b467df2417225995bfa8b954faf6174554cd77bef4cbf8854611a SHA512 580bc985a9bc13b9d7cdf4ce2de19c6db967e1aef2e00e0066c791a7bfc6338c843a472bf7c906f9473530e79b0ff0bd97ad1f443b928d0186c28308560cdeee
+EBUILD qtsql-5.11.3.ebuild 1508 BLAKE2B 4190f03f7b604221262e4bb0ded1a7afc3059305acf7c9c7b1560ce7448d870c0f9dc62358e98df69478ff861569d1605ce9906e1adf6ba524d61f474454da2d SHA512 c58b32fd78e9837d632bfe499f43bfd876e83634d0d9a5911a54ba0a71f148a6f835d680d5055889de4a44f108d979443d8a9ce9b7e6176467bb83ed6fad7da7
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch
deleted file mode 100644
index 79de44dca959..000000000000
--- a/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001
-From: Andy Shaw <andy.shaw@qt.io>
-Date: Wed, 27 Sep 2017 09:23:10 +0200
-Subject: [PATCH] Extend the MariaDB define check to cover the later versions
- too
-
-Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1
----
- src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-index 6e428fb..b2d3e85 100644
---- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-@@ -1159,14 +1159,14 @@ static void qLibraryInit()
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
- 
--#ifdef MARIADB_BASE_VERSION
-+#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
-     qAddPostRoutine([]() { mysql_server_end(); });
- #endif
- }
- 
- static void qLibraryEnd()
- {
--#if !defined(MARIADB_BASE_VERSION)
-+#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
- # if !defined(Q_NO_MYSQL_EMBEDDED)
- #  if MYSQL_VERSION_ID > 40000
- #   if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
--- 
-2.7.4
-
diff --git a/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
index 1641d48345c3..536e5dd413ae 100644
--- a/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsql/qtsql-5.11.2.ebuild b/dev-qt/qtsql/qtsql-5.11.3.ebuild
index 09b2d08531db..09b2d08531db 100644
--- a/dev-qt/qtsql/qtsql-5.11.2.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.3.ebuild
diff --git a/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild b/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild
deleted file mode 100644
index c40771bbe943..000000000000
--- a/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/libmysqlclient:= )
-	oci8? ( dev-db/oracle-instantclient-basic )
-	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
-	# See also: https://codereview.qt-project.org/#/c/206850/
-)
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usex sqlite -system-sqlite '')
-	)
-
-	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index bfe9f99067f7..f6c6978aa805 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,7 +1,5 @@
 DIST qtsvg-everywhere-src-5.11.1.tar.xz 1843216 BLAKE2B 8e5e94e706872f65189a51f0ea19a69d409de4d60c8cedd376e8e5efe74513370cc0add47d7d158ee386ce96455af27bef6ac3e29efdfc392d00dc7f5e3e7221 SHA512 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39
-DIST qtsvg-everywhere-src-5.11.2.tar.xz 1837076 BLAKE2B 58ad105dabb0c928a3df8d64df5e7f2593b5fc4ee155db45fe89f6a6745097941306aedfafd0800745539249f427b273cfd0133cfd2459041d10a297117fbd03 SHA512 d6b83bc0c4b348f65890fbb4cd4df81828fb1ef88192c13b06dca695fe499d65da6a52ba57ca289aa31f035309f10af90593cd9ee17362219cfd1337cc801c57
-DIST qtsvg-opensource-src-5.9.6.tar.xz 1778688 BLAKE2B 30084cdeaefef6c15f07fbdb9373b9cecb87fdd9676c2d89061a371439ec0c02ace2fe65b0061e518de6a1b75df9edf314adcdb6ffdc03c7be29424c92784d25 SHA512 6e86f050c07621d628f6e9440541be1fd80b3e05b034ba17bb5068afd4775d9ee08d7bf11d2ffdf03da2cb8ca66bfaf2f59b7e5e76acdb1a1e2ec25af25c65b4
-EBUILD qtsvg-5.11.1.ebuild 473 BLAKE2B 50d29136ea7071a6768bd6c84d3bd0af9f6d48414b39b429b419e45e341ea632d21f4ebe30c585f06672f31134e4327ab9af66cbab4226689171fb501a0224c8 SHA512 a2da21e976b89c7ab13c43dbf530e3d32d366774ce80e8f65a662eb0884ed2c0438118c1d5b34ae9df78c6d7617f14d5748062cbd3ae5296615c61d84d0a081f
-EBUILD qtsvg-5.11.2.ebuild 475 BLAKE2B b34bc24dae3d91410b8ffbea1ccdc7d88aea2791a622705882514566984a9e6772ac4c5ace1fe7aae13c881d22b0caf81bff1807cdccac597fb6c0c2260ff0e2 SHA512 480196ea541a23a3791637c021d1982009d1d329ce14acf7ba7ac1c4b84eaee3516748b62b652c50fad0ea9aedabce66a8aa58c394b557d47da424f70a6a7096
-EBUILD qtsvg-5.9.6.ebuild 474 BLAKE2B 5914a4da775446e7bf2034f16517e7e57e7d8566d24eaf5aced617be529572d7eda6940f68f76cb1aa3b09869cab541af5ee940c1ea08cd0444e5de66e30a2f8 SHA512 d0a04efed3a5352d70c78f6e4e93059ee2dfb61c1feb064b4e3d1cb6b421b3d08fe1e6d692428b5aa2980ea0c0732d91bceb3928509f6f045558c3ae81d4dc7c
+DIST qtsvg-everywhere-src-5.11.3.tar.xz 1845004 BLAKE2B 2e091a4803fca45923df3ce61890e9dffe4b90c4118c7bf95263698f8c5f9d6260c350c3ec40d53de0fbd4e7dc7b742fda6f6693b338d446326bd740c43573ad SHA512 1ad20b3b59e6802f960fc95421b7f4d67460fae91219316bbced0ae225ab5d0066322a49cceaa7a86a981e9e56741724bbe323ac76d3478fc1f5d0d04fdb9722
+EBUILD qtsvg-5.11.1.ebuild 471 BLAKE2B 9c70ec4988e8e64134486844a39b46480d3ef4f75f1aa3867e1bc7d373243970afa9ba74e6cab19cb6c0d35bfb751af30a83933fead7b60feb88ca812329c501 SHA512 3a97938d47438a3dbd58c01414126662370e8d0856c30cf32e48ec279695afaf7aae8aa29ba278725c5a8e8f820665dd7185ca9389ce6cd1d9041be50163b357
+EBUILD qtsvg-5.11.3.ebuild 475 BLAKE2B b34bc24dae3d91410b8ffbea1ccdc7d88aea2791a622705882514566984a9e6772ac4c5ace1fe7aae13c881d22b0caf81bff1807cdccac597fb6c0c2260ff0e2 SHA512 480196ea541a23a3791637c021d1982009d1d329ce14acf7ba7ac1c4b84eaee3516748b62b652c50fad0ea9aedabce66a8aa58c394b557d47da424f70a6a7096
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.11.1.ebuild b/dev-qt/qtsvg/qtsvg-5.11.1.ebuild
index a2342eba7001..6677b11d63a8 100644
--- a/dev-qt/qtsvg/qtsvg-5.11.1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsvg/qtsvg-5.11.2.ebuild b/dev-qt/qtsvg/qtsvg-5.11.3.ebuild
index 69df6267c770..69df6267c770 100644
--- a/dev-qt/qtsvg/qtsvg-5.11.2.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.11.3.ebuild
diff --git a/dev-qt/qtsvg/qtsvg-5.9.6.ebuild b/dev-qt/qtsvg/qtsvg-5.9.6.ebuild
deleted file mode 100644
index 1cf841d6acff..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.9.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	>=sys-libs/zlib-1.2.5
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtxml-${PV} )
-"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index e5378dcce984..52bcacc799c8 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qttest-5.11.1.ebuild 551 BLAKE2B d9ca198211ad9757ba4627165a5b1c66c2b50e72a710c128bd328793a5594e962e4b09287243b0c495739663f5d7682e78de3fe69ea06d64041d3710ae61c732 SHA512 2736656b4ff369a654896f8c9aac6be440ec956cb538e411e31088887fe7968b95882e28170c93a58fce270850def3f62262a19958741698c749f57fb73a07f8
-EBUILD qttest-5.11.2.ebuild 553 BLAKE2B a01fc5af90ccc8489d58a08e8033fbf6498ffb1aa06b0cedfa2766de13f866850167158d3a02b2dc0e2958e80f901333c36cc66d13d5ae33b0c8ed6214644960 SHA512 776cba34039c9b13bfaf313876249e7fa50d9bfc9e01dec22d729830c7c37092079ddb990ae1b2abf15f14433e4bb232b4fab96f0152175eecb04f1a9459ade5
-EBUILD qttest-5.9.6.ebuild 552 BLAKE2B fe51f031dd97723a5ee0a604ef97d7f8bdeb505f503859ea75eb3e13b21d50b6c17d58aae95c150d13ad69eb00c97c64abb3521f7cce3117ca4dbd61ec9050c1 SHA512 2e6f78f49900c3df26238be8d56dc4174b0df252b9fe55466c6ea1dac13342ccef5db5329404bba9f411a1d39d6ae2729c742283c579fb5197a17350463cc400
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qttest-5.11.1.ebuild 549 BLAKE2B 01c80ef279cd93f1c03511d2f662cb9da1202272b536263c2e05bf1565e241831697897100d39946b8f67963e525e6d4fb0798c8b435c9c323106f6a035c0ef9 SHA512 9253c373ce486df63732f1a1437fbd65581f41cdd181f8471abc17a4bfa9b3a114c39ad7c12fe74840654ea5300bbfd2299b4215ce209d399d63e6e2890564ff
+EBUILD qttest-5.11.3.ebuild 553 BLAKE2B a01fc5af90ccc8489d58a08e8033fbf6498ffb1aa06b0cedfa2766de13f866850167158d3a02b2dc0e2958e80f901333c36cc66d13d5ae33b0c8ed6214644960 SHA512 776cba34039c9b13bfaf313876249e7fa50d9bfc9e01dec22d729830c7c37092079ddb990ae1b2abf15f14433e4bb232b4fab96f0152175eecb04f1a9459ade5
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.11.1.ebuild b/dev-qt/qttest/qttest-5.11.1.ebuild
index 4400b5253eca..a84043270b65 100644
--- a/dev-qt/qttest/qttest-5.11.1.ebuild
+++ b/dev-qt/qttest/qttest-5.11.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/qttest-5.11.2.ebuild b/dev-qt/qttest/qttest-5.11.3.ebuild
index 320e8ceede8d..320e8ceede8d 100644
--- a/dev-qt/qttest/qttest-5.11.2.ebuild
+++ b/dev-qt/qttest/qttest-5.11.3.ebuild
diff --git a/dev-qt/qttest/qttest-5.9.6.ebuild b/dev-qt/qttest/qttest-5.9.6.ebuild
deleted file mode 100644
index 1c9b54b7cb1f..000000000000
--- a/dev-qt/qttest/qttest-5.9.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtxml-${PV}
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:testlib
-)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index e10e34c4cb5a..71326f8a9cad 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,7 +1,5 @@
 DIST qttranslations-everywhere-src-5.11.1.tar.xz 1428808 BLAKE2B 55a8813a471ab14f885f95df6a2205c50424c8892d060f3dfb4123d281e55a1a8f0829ad3b8f1b713bac11a1160fc22a977269bcaae877b80c985c4b2c9232ff SHA512 b817b7be585413e352271204e88730c873e0701f65dbba9f5b331f0c3e0ddc1bd2446f038991bf9eabdd79ba440ea0172d0342b5b0d8b1593d9f55ad2a0ebcc0
-DIST qttranslations-everywhere-src-5.11.2.tar.xz 1418228 BLAKE2B 66a6fa0179e9676655b54659cf1bb5fd60579d53e9cf73b6e4b7d32770eb381560a48a11f573f5b1ee5d2ca7085053335f6fcdebb51156b6f35403bfba8e696f SHA512 093733b87d368613fb66a43bc3778f53112897dde061a8178cc94c02dbbdd158428f08015e21a15013edee40b068198bc7ae02ab13eaf4799a068e8a21f0112f
-DIST qttranslations-opensource-src-5.9.6.tar.xz 1376088 BLAKE2B f85611a787fbbc5820bf0b68773ab9be1edc2f659c7861c6d8bc8158c0ca495f882dd2201406315a1f5c3caf7b4dd87b2178362e4ee9d5523112c55f590a6fd8 SHA512 caafa6fb865c73c1c43ca5d78aab21925d5cf836b3e9d8c10ac699a96e7b583e85f12101a79a55102f8d404305764acadac599cf84b97d03582684f3b9bc4ec7
-EBUILD qttranslations-5.11.1.ebuild 374 BLAKE2B 78434aeadbd9e4edc9c95e3558783ceff7eab4f1f0bfb2ce9bbd7d6b97becf7e4df1b3248e41fc643457db74c3fd6a4bd833d923a0fafcdaeeb5305cb799999a SHA512 c8cadc2a696075326234300b9d334cb1aabe0280f0c93e25d744a2d60211e0f1053a9485d3212b08dd87abbb0a129c34cc565a545297f811000062c2a7d7538f
-EBUILD qttranslations-5.11.2.ebuild 376 BLAKE2B d1c640fc1b82c4ea81740accb46b71c16ffb5c8157b9ce5d45d3e491609f81411492b62c71e333187462d25a6444a166dd5e47acfbdb81e9d688a79cdbc7c2f9 SHA512 544542ce2a63cd9dc3137b11d6c28cb362adcaeb5c9e83ea6ae9d116f9618161c5505e9c2c8a1889be79e5b38020b76ede84d37d09b788411d1e6e1ab28727c1
-EBUILD qttranslations-5.9.6.ebuild 382 BLAKE2B e48cd9bfa6760084f270ff2ac59a5e9ffc2ffa8b8987a595e78796c63f55c499bbabc8a24a66a44855554e46f82c89c7e8864b53b602606292a6a706deb278b5 SHA512 09a02e30a4c555daf85a1f361047f90a08d85231ad8bed7b85ae5a18dfeeeb56663f88cf215e46286534d96c2da2e53640169db3dcb43b77f3e16f91880e8c4a
+DIST qttranslations-everywhere-src-5.11.3.tar.xz 1424160 BLAKE2B a6ee17064d4fe8d3611e04883cbcc9d69bcf872ca4144605da20d6787c051606afdaac771716bb55f1a970dd8468b8e2aa0602d926d8757b2f9faa58db3f6f61 SHA512 eced9516f3e0ecfd11ddd99b7b0f80c47014110af1c43008c764971929405ee7f5194c3390fe07bc4be9a9ead04e7c06c62584475dbe93c96118eaa16cd542a0
+EBUILD qttranslations-5.11.1.ebuild 372 BLAKE2B cd9c27d53b422e2134f05ebcabf006bfe808ad9c3b1673e0594f689cf2af1f4684e10a775ea3689a78886c40070c0eadcb22ca6d52534e85e3d68fa38b4b5d08 SHA512 2d5cb83a699ca0eea504db8097ba274abe6e3f0252a800bab3e9a3a37175071fea0719ede79167ac8603bf60e64742bdee95bc36c970527afa5095310f8b55f0
+EBUILD qttranslations-5.11.3.ebuild 383 BLAKE2B bc1d6fc91611d3c2bcbdcc68b95b20188638b405414392e99b4d265b7fb148a8f599bc6803e635fc33a5674111ee584a4e1bb42a256c003c9bbadbb8c520946c SHA512 51a970036f4bdf74e6f05b62da5d494514f7f2206646a336202db1c8404a07127b64afef9a7cfae3073baed3b38b165573a250605805f773217d6e046e6396fe
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.11.1.ebuild b/dev-qt/qttranslations/qttranslations-5.11.1.ebuild
index 49c47e4fcc1b..82f101e39ba9 100644
--- a/dev-qt/qttranslations/qttranslations-5.11.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.11.2.ebuild b/dev-qt/qttranslations/qttranslations-5.11.3.ebuild
index a79413a78db6..94155ba10dfe 100644
--- a/dev-qt/qttranslations/qttranslations-5.11.2.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.11.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.9.6.ebuild b/dev-qt/qttranslations/qttranslations-5.9.6.ebuild
deleted file mode 100644
index 661ee28df2b6..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.9.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/linguist-tools-${PV}
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 572de0db8a3c..b0ff3d370d86 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,7 +1,5 @@
 DIST qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz 10648700 BLAKE2B 32ee4cff4951347d8cc6ca9bf34a983017520acd5692322e3409db27fa08aeef2784302eb326b95bb55ea9f23a113f20370bd2d2fc64496919205eb6d9511c13 SHA512 e3010450553cad42850b4cf1b07e157b30e9a6a74b8c551e21ab45a04da76e55e83c08b4421c081eda44e8928c8e0b69f9c8146855a4e02bbf3779f5a0e290d0
-DIST qtvirtualkeyboard-everywhere-src-5.11.2.tar.xz 10690564 BLAKE2B 99df56ad56f1472118a13b16d099de6be992b3d04718ee80b87fdcdb875299aa262afb1fb6c7a11578db1d79ed7c09a2b2edb1b6ee0ca05436999f7862072aca SHA512 1a471a719771c3a07b8d7b524692bdd085eae1787b8e91f523b224c260bc950b514ce88d885bbbe90c1556619bae15c59debfb221ec01042885d71443e046912
-DIST qtvirtualkeyboard-opensource-src-5.9.6.tar.xz 10045984 BLAKE2B 22d15eb3a6bdf8fa490eb6475785ca88a0c9f07f25e37c41d9d0171de9af71e3124567184a41c7b4e25a49edd8f794325a0cf141d8fd7f9491096b7a3bc5245a SHA512 a46dc3c387530f52be0b1f989a9bf9d01e363668d3e57142c40588b72457eda2bca2f3aca765a23db0359d070670bb6583a6c91d960ca7d87b118397ff453e5b
+DIST qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz 10698520 BLAKE2B bf4800c07e1f0f1649f81d21192bde613b20b54fd80b4d49136e7cc052f7f60d410f3014c3066e3f5c83b6a6d838f50f73a78bcd1a8df5e3d5e24fdb5875280e SHA512 cd3ce039382efca26842b8a413995d8b6bc26184e6161e8c3cad9ed326381a3f6d29798a9a42a52875886a23aa6a74bf831d70a62a7d12f852b640dd6854d2e3
 EBUILD qtvirtualkeyboard-5.11.1.ebuild 1013 BLAKE2B cd6b395131cd0668314b1ee7dbe5135ea36adaf910931a79f37732e682c6605701296354fe9bc5ad51dd23bd8443fe9b211dd92d54874e68a9e7817a5a916ffd SHA512 1fa008dffca8f53fc510040bc83db15f615210f602617a2d23be946ab18e0aaa7942be482a61076492f8e7d6a1a6f406349ef66f983d376e7e54da8797f76694
-EBUILD qtvirtualkeyboard-5.11.2.ebuild 1015 BLAKE2B 81feb6d047c1bf5acda615b83a277637aa5103506675d7804b79926fc9236a1ac74096df93757d2d41408141428de9e7238882bfd29d2d5e4cf79d9b8b892b64 SHA512 79d7a768ec4ceb0030f8c0f3e1d7d91b046963dfe083bbc7821c61ae78706fc655c23904c8c05ac1c4061d2ec2eb30466a6704c21134cfafb2b8dadfa91d1616
-EBUILD qtvirtualkeyboard-5.9.6.ebuild 1016 BLAKE2B 5260dc083a9159dcb1b3948cdea26e7d0ad6ff17322830876a90352b9955b3514e62412403cd8592e13ec4131ec4ce304b5d19deefbdf1e761fd2deb34020243 SHA512 c546cdcb5d1ffa3bd637558aa16a7147979aeb7a06e3bb49bc34754dbf70c8138d7aed9c08ea2feca4120b495dac880b76c2cdb3b895e3e82750469e19fcffc2
+EBUILD qtvirtualkeyboard-5.11.3.ebuild 1015 BLAKE2B 81feb6d047c1bf5acda615b83a277637aa5103506675d7804b79926fc9236a1ac74096df93757d2d41408141428de9e7238882bfd29d2d5e4cf79d9b8b892b64 SHA512 79d7a768ec4ceb0030f8c0f3e1d7d91b046963dfe083bbc7821c61ae78706fc655c23904c8c05ac1c4061d2ec2eb30466a6704c21134cfafb2b8dadfa91d1616
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.3.ebuild
index 402085ac38f8..402085ac38f8 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.2.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.3.ebuild
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.6.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.6.ebuild
deleted file mode 100644
index 770ad2ccfbb5..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd"
-fi
-
-# TODO: unbudle libraries for more layouts
-IUSE="handwriting +spell +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtsvg-${PV}
-	spell? ( app-text/hunspell:= )
-	xcb? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex handwriting CONFIG+=lipi-toolkit "")
-		$(usex spell "" CONFIG+=disable-hunspell)
-		$(usex xcb "" CONFIG+=disable-desktop)
-		CONFIG+="lang-ar_AR lang-da_DK lang-de_DE lang-en_GB \
-                        lang-es_ES lang-fa_FA lang-fi_FI lang-fr_FR \
-                        lang-hi_IN lang-it_IT lang-nb_NO lang-pl_PL \
-                        lang-pt_PT lang-ro_RO lang-ru_RU lang-sv_SE"
-	)
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index f7fd2d4947b9..c37c15c20405 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,7 +1,5 @@
 DIST qtwayland-everywhere-src-5.11.1.tar.xz 392200 BLAKE2B 2e65c6bd8c9ea44ae84f608312db6983d540382bfb2a22412fe054f4e7253d70e21f4d0577653b246de5b0266271e40911a7c79fc28b266cc29ff30669df280e SHA512 dc1327ef8cdc9ed9521e9db316da0bcdbe9639b714a2dda7a792c52ba5897ddb75deba1ab89e010bc05cc2a96ede781b9990f5449ce4a2f85e15466a4d6d82ad
-DIST qtwayland-everywhere-src-5.11.2.tar.xz 387644 BLAKE2B e590d0f83e89a2ea33f4782cf295df4fe8ffc5e3767dbcb81ad633a2de35eda714e28a69a9c95263786883fff66a25ce5e9b52dab9929f499a0b8dab90489cc6 SHA512 27aabe18cf876afaf9da9e9fa91c3efa2c024229a6cf4746eefc4f4ea71f125a95ca52f887a42683d7743d3f876efe927001b8ee5580123ba5f4c4d4dea24013
-DIST qtwayland-opensource-src-5.9.6.tar.xz 316152 BLAKE2B a1ebbf98eea9ca36f8229ed0bdfdeb79eb9d1519ff35eb153d7f8b7af2ad9831905e564464ec1faf793a7b11088d43d6dda6dc21b36943fccb569163c119a30a SHA512 7376f76001323d7971cb3be7592086b26c855d8d702184e84f28656b4262a9780b4cc0a0991c97ca011863570b6abd63b006c78021934e1516be65715f82ae4b
-EBUILD qtwayland-5.11.1.ebuild 902 BLAKE2B 1349980e1c109b56baee2bd2a0066dd497f8851024f1b90618d6edf67538a29763b779fd42a801781abeaff2180518eb6ba15834c55f871a49ebd58cd3adf241 SHA512 5e25d3b4c2611953f0f266b746c2285456ca3eb418dac9f759346120512583af9cbe8f296273b88da7480015a8b172f7d2cca175981c8c5e2735ffc924d8cf1e
-EBUILD qtwayland-5.11.2.ebuild 904 BLAKE2B 0bd333be3d951b0ae63e2932ed7376d638d4078b33e2fabed721fd7f28460d8308fef85f9618d870fc200165bcbd42b188fbe3bcb724a3705b219239be931fac SHA512 1842b4094dd7ee1004342ac2d50294fc8dd1860df4fb804dfbb6d2d58b39783d431e7947d3cdf853512806feac5ba42f6d472af34c0604569d0b06e3e8c8805b
-EBUILD qtwayland-5.9.6.ebuild 910 BLAKE2B 43718b86e317b59b1940328d13c634fc4283f1c307b16cb06d49a1d0c8a94fb5c7f1e02e99706e2efa403b3ec4d7bff193513669af94f641281849b4d47b8528 SHA512 4085dd400ec562b46b0f1117ad52f269e726ed62e6a8efe9597193074dccc162e9181a9d7b06eb7922e765d8a2ad3bb2c87a3cd24be31f1b4c1b9125d0d6580f
+DIST qtwayland-everywhere-src-5.11.3.tar.xz 391124 BLAKE2B 2bc90c7a6f6769bcae7e52072d71f38ad984cc931767613e7972373131c9d58c145e9882c29163190257f07a205bdda63f78833859d2be6d6478126c301b70a1 SHA512 e442a13c61a508d6021fb15a0917b7861faf139fb7dca41ac1a3967f4b8dc82da5095029e4c6120464bd36ecf559547fe2f42935d9980f19298f5875cfb5e62e
+EBUILD qtwayland-5.11.1.ebuild 900 BLAKE2B 81edc7e804f70e0ab5b126d4128e7796794ba303802414c72c35bdc36e0489c9136294c1b4d4874c597f8bd387f84d4d16f0a109a9ee4449ea398086e16b2d11 SHA512 225ccb256c0df03fe9e17ecc5091ba4fa9435f09df0d57e6dd3da8a7d27c69f7b2eb39a84410a2d0d3a12524165412456e823184b8f65dca460e1c4d2dcb79d8
+EBUILD qtwayland-5.11.3.ebuild 904 BLAKE2B 71131a4e76fca477c65bba332aefaa6d95ce749b4134cd593d34ae715898b223e56aed820239a8f32d41eccafb70ddb0191519c1c074db83fba359282de61634 SHA512 1f0127f61fdf8dec0256c0b05b5383db0715ee459a60262d2e91ac40843a869b5f5563a53ed1198e7da5423b638cbc8737b53bc0820806eac23b1cd7444765ae
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/qtwayland-5.11.1.ebuild b/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
index 0a6dfec7eea2..a1f1e6f3bda3 100644
--- a/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwayland/qtwayland-5.11.2.ebuild b/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
index ff62f71d3a79..1379e01ee01b 100644
--- a/dev-qt/qtwayland/qtwayland-5.11.2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
@@ -16,7 +16,7 @@ DEPEND="
 	>=dev-libs/wayland-1.6.0
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput?]
+	~dev-qt/qtgui-${PV}[egl,libinput=]
 	media-libs/mesa[egl]
 	>=x11-libs/libxkbcommon-0.2.0
 	xcomposite? (
diff --git a/dev-qt/qtwayland/qtwayland-5.9.6.ebuild b/dev-qt/qtwayland/qtwayland-5.9.6.ebuild
deleted file mode 100644
index c112fffaff34..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.9.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="+libinput xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput?]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_config libinput xkbcommon-evdev \
-		src/client/client.pro \
-		src/compositor/wayland_wrapper/wayland_wrapper.pri \
-		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
-		tests/auto/compositor/compositor/compositor.pro
-
-	use xcomposite || rm -r config.tests/xcomposite || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index bd05cc47e8e1..72f78c00a79e 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,7 +1,5 @@
 DIST qtwebchannel-everywhere-src-5.11.1.tar.xz 179700 BLAKE2B 05f945110ec743aee4357ee696bee4ac230489c816b8cc630c6cd1344b5c385412470e2d4c6c7ddb2f044a17e2fce70f62d4244accac0e394a97a8ce638f3c72 SHA512 e0a18919cc4fe858eb1a623fc4e79c2936b4ea390d23611a708dd8fc26aac4ecbc262a5b0194f0a4df1fbe69c53568a62183e5847e0bf4c73cbce2122170e0a9
-DIST qtwebchannel-everywhere-src-5.11.2.tar.xz 173956 BLAKE2B 8c19c56960e6c19b84c4959507779b698ebd836679e139bb0978a13b9a14407563cd6d57f6bd7c91616360147762da1b381c1d463920b60e7ca98c059d4fa271 SHA512 16603c52631180f2e84e274e509159c7c817198abc1b48a9e921134f2362aa5ececdab50212b1a1df8ab3feda4b4ec638a26e30397ee05ff27371d598f8cc643
-DIST qtwebchannel-opensource-src-5.9.6.tar.xz 147564 BLAKE2B b94d420e8b694aef37c620ccc2c8dbff31887686e8afd70ff547e7466a6dff21457872b6a2aafc15d676005db85b202fb8260529d94078279e5ec1cd3d9e06be SHA512 f2c4ceb7efba18ffbb2b3bf11b04c158c601ce82eadfcadeccbb81405db0ff2275fe4a5706872adaa6faa6ab2c1f1f6b6fdeeeb09e127e3b9dbfeac5a4eb7ab5
-EBUILD qtwebchannel-5.11.1.ebuild 567 BLAKE2B 3611f3d1d0cfdb613288aed79988d1fc55dc676fc93d46a23d9621ff1bc8f5fd706fd405ec64c473b4d619a7bb1b2ad8defd2ca8d9f13163a9e6a852be671e5e SHA512 9ba6d594fc44f92f1b7bafc3c3864f7383f5ce640b67891b11b60e31b140ed6cc59490eff808edeb4e6182e771266ab4e94443e3f84cf6a57591a888412784e3
-EBUILD qtwebchannel-5.11.2.ebuild 569 BLAKE2B 88348471bb15e24e17aa03085db485fcef9c55e434d1e36a49948761885fdb7d30ca319bbb5c681dacde1dbb510e39d908da40c00b419abd4a006dc5b1682e17 SHA512 c2847d58ab9a0219c8a5fefbcbb0577ef36ff4c3438a6a64f6c5943fcf4b16a2b28fe2dbbb5930f586ffcdf3b6ced29655149a962451f326fc69174c05e11304
-EBUILD qtwebchannel-5.9.6.ebuild 569 BLAKE2B 4d7267cc1d6fd82cc808286fde721b94bac1832c90e2068f6881a7d22a5d34a37456874facc9ea2ae9e380ebbd6f4e80dd5966e84a0108725b0dbd4d85c976c6 SHA512 b904499212ae7397168316e94742abe5e8584bbcbd0a5a15f4c1f1a50e874a18baee0ee27c3645cae9f20d55028ecded5f45f28609f9d8c1289537fb33e42409
+DIST qtwebchannel-everywhere-src-5.11.3.tar.xz 177328 BLAKE2B a3ea3c535e466629e5bf2f864967b5878e4e092d614ce05984af81ce979c5866e225d30399a0eb81f9b4b0d44c88646b1b6de2f1be524b5af5b61e995ba780ad SHA512 560d79ba00bebfd5afc238ff486ad1691eea8a1702f565cd838b07419f6fcd1f028ab5b204b32fff6a3c40c3dd13d89e3cce205076a074eebe7b1c111c669d2c
+EBUILD qtwebchannel-5.11.1.ebuild 566 BLAKE2B a9eb2f03320b17f01819381621511d7b55ae390ca174d47b06a0d1f9b3a75de34779c2c64128e19267e5c41419e5381bc9716b833dcf76d6987528d47b52f19e SHA512 a9802c600918271d0cb380109eaa3375fdc68d57ff234850226f61e2183e2169195de9007eaba2cbe622c130fcf92b716ff66c9c4681b1ac5c0d022ae7d574b5
+EBUILD qtwebchannel-5.11.3.ebuild 569 BLAKE2B 88348471bb15e24e17aa03085db485fcef9c55e434d1e36a49948761885fdb7d30ca319bbb5c681dacde1dbb510e39d908da40c00b419abd4a006dc5b1682e17 SHA512 c2847d58ab9a0219c8a5fefbcbb0577ef36ff4c3438a6a64f6c5943fcf4b16a2b28fe2dbbb5930f586ffcdf3b6ced29655149a962451f326fc69174c05e11304
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild
index b79ef36e17c1..95d996036154 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.11.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.11.3.ebuild
index d08439f261fa..d08439f261fa 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.11.2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.11.3.ebuild
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.9.6.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.9.6.ebuild
deleted file mode 100644
index c64c80942708..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.9.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 0f758081895c..37ce0c000b27 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,14 +4,9 @@ AUX qtwebengine-5.11.1-libxml2-disable-catalogs.patch 1609 BLAKE2B c3683d221556c
 AUX qtwebengine-5.11.1-nouveau-disable-gpu.patch 3710 BLAKE2B 880d63b7552973cf91bb1411f92ab3ee2d88013f144bdfcc6b5e1eec1d886bf76ab2166bc7600212701031da63a69ed2f5e03a4bc15549834a9a770ed68f35ef SHA512 a0b9592201d950ae97b92d5d0161ccc5bc675a37fbf657fe15ea0fe12870a370cf3ce54f5f033c073af23defded5c4ad0b43993c5b559024b285c5341b4673a0
 AUX qtwebengine-5.11.1-paxmark-mksnapshot.patch 1007 BLAKE2B 3f7acf876b78caa945a72a797c08da9b24cb7e6363a904734265872c382789d5aec8e67e0ece7b0e50b6e7ccd9dc15f1e8aa7936736bed3ce14897c706d07938 SHA512 9a89eda73c08279d9bd6e871d138e670f8d6fb2e9efb191effe2c9063cf4eb007c6fbbd907005ebcc57f576a8faa5cb8a5ce996b9692aa226703765ddd939c06
 AUX qtwebengine-5.11.2-paxmark-mksnapshot.patch 888 BLAKE2B d44e8772dafd8962805abe412470d94ced2d11e47d3e7e25acbfafa54669677a1e072b435a06ed093f7c9ce27d8d98fab4b042cd49862350d77c944418a335b9 SHA512 893aef4801d1f2a3fad1f4d1ef2c2b122d4004b7966e76d8e1adeb8cc5b03ce8b0ddf30d20690ca6e0b15b76074aa386b46b00d0c828b7684c6fcacc33b2865f
-AUX qtwebengine-5.9.3-paxmark-mksnapshot.patch 997 BLAKE2B e6fd8d6830ee2ca7b4e9c5586e52ce0ce577ddf6839d1de33a125606bc94bd483e4bef3008196f60e6c622074d23166a01b560dacfc5cec86e82dd360376627d SHA512 4a93fa1bdc7c4bbf22c68af4eff9473c4c9e39bc9cdc725441d5bdaec0521fd54db2b25f6900d4dc5d41a8cbeb04d5b420a85f334e3c18348d2e9dd1d9700dc3
-AUX qtwebengine-5.9.4-jpeg-9-1.patch 2782 BLAKE2B eb52d5ab51ca47603f3cdf684e0d34bdb0e6441aed99603608866d41fbfaeb812129199d28f7d01763bd9a86cf0a4e9b46199ab1b227d5e0a3add1ad7bc43329 SHA512 85f305333741e88461c792e5ab1e65f3efaa762d60c52f6afd56c6344375e3467b3268c478d51de0340d99ad2ce3ea2aa5fad83364dfeed2d665244dc84c36ab
-AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b87897e4b8df045b81090524e84a90e259d7824521e71639eec5ef8cfd86c5823302846bd1a05dff3fb39d5b988544bf46b SHA512 57551a4859791431d921fc0f514332d408f43c05ead7919468727069e01b9cf3cfe70f5ca014af57b8842f8ba745d1abe5838fa271d354b775a520ef296bd6a5
 AUX qtwebengine-5.9.6-gcc8.patch 1184 BLAKE2B aea72fb7563517f6c1f0f1330bad21ae71bbadc7b74e13b5c9280074ba5ae642be1df6c6e3014464f4b9aa26dd5620b5c5ef5b7139256c6a48fe58ed911e54e0 SHA512 21e79c6fc1575728d658c31bc68da66a5b9840c6fee7c442218ec8ac6009d5df1436bea931aa56439965987ec1ccdac32afce2b0a246c3d7bb2d0b0536717be5
 DIST qtwebengine-everywhere-src-5.11.1.tar.xz 233633572 BLAKE2B 06fb9d490377ebb4af937e0fa1688cdfeb9bfdadf6c80afeef609d20a76bdb7c4fed6c1042405b762e59b11d7b16369990c66a395ec1b6b48bbb1ea5b8cd47f2 SHA512 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
-DIST qtwebengine-everywhere-src-5.11.2.tar.xz 233642812 BLAKE2B fbf1ac14cec9a515fb9c401f1a04487aec2ebe1b64103db5ec2625791356cae71ff9a0048d3485d7fcbce4e0eb8bc77550f99b19542c7a0f8b56f902df4958cb SHA512 be8db67a9cd46bdff24a4fc3882193dbe2c7bd487822ad7345bf3464f8c21713b6e459867c9e9678bc33e9d14ea7e09cbaa171139799810c131c7b625c742e64
-DIST qtwebengine-opensource-src-5.9.6.tar.xz 216733460 BLAKE2B 6f6f4d89559899b7faa6c8a31187967e5dab357d63f6c096953bdffa9ff8e8299f22f3fe97bc5295093a89200b38f47b4b214ff91765f8da3a992c5058f06e1e SHA512 493e9b4fb7274253eca107bfbb6ff044068c78997299c48b62a504ba5511c4d3e2a7f481d986f34c75d035e4804b18f74bf6a4bf0daf0f6a5778abd8aa7ee68a
+DIST qtwebengine-everywhere-src-5.11.3.tar.xz 233678844 BLAKE2B 451a2f8361b158835f7f565aea9e7e372ea5670f56a5eef918d0340857e1b336d7147c5f87417a21ea225c248cfda8248869c2023b2e359aa9216ec472dea4b9 SHA512 323179244187b075836101eec15fc96569e31dee7ca0b28d51833cf02a55439ca0ab8e3e14acf970eb0258e1f5187b6b33fc1a35bf9056e4941a2b20be9b0431
 EBUILD qtwebengine-5.11.1.ebuild 3535 BLAKE2B e806536baec3071808ff3c0a7f5f0d7f287b1c4489bd51f76fdc5d3eb5951c047199660c5daddec7f75dee50f1d7fdfbe2e6e6859d89979e1b28c8bdb79ad686 SHA512 9fb74dedea97963bd8363c6861e92395c0a4d9152dfe1ef26f8df7ad9e55ae4c6f60858c52fc6a9df90a3c96460230fbda099fd22dbb6c2eef7899963e7c1daa
-EBUILD qtwebengine-5.11.2.ebuild 3538 BLAKE2B efa4a066cdfdc976d535a305c317032f893890c074ae3b92e35f4baa9cb28e84bbcab43b5fc9b78c332da56d2fdd689cd3be7637b49a0eaa0d8629ed054fe0f6 SHA512 a3fa0563d7615a7063776669bef280eb74ee64bb7cc21acd3e832b00936ff0e9973bb7d543816bd7b21f68b6a1a14bd41a28eb4613f8e222dcc199082b09b31c
-EBUILD qtwebengine-5.9.6-r1.ebuild 3411 BLAKE2B 146d96022668be866f724a8905c82ed139a517cb68492dd97c554c3389e97b7fa4125afa5b4ca343fe4057bccc9efa25566ebf76d26d9e40b43968838cbaa96e SHA512 6d84cc73e712355e3c0069d753556f0f9e8e64a89a4574bde151bc776fecc67f01923c973af64258163ebe9d5950582c6bb5fd02ced78c121f86e3c6907a7066
+EBUILD qtwebengine-5.11.3.ebuild 3546 BLAKE2B 792ebcd946de8cae3fabfcd191f4281887bfc93237cbc5aff4ceacadf69427ef2dabb099ccd4c4dc66c0349925a4d1f896eec88c3e0ce09117f1fc423d0b61e3 SHA512 e2706cc7a24bea4d883dd67a9022a603916fa8a7dd039fb694414b59446029d52f1fd9318f277a5ed01631826e8847490f6e9213066bd19f7ac32f1099b55bc3
 MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch
deleted file mode 100644
index ecedaf62f344..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Bug: https://bugs.gentoo.org/634220
-
---- a/src/3rdparty/chromium/v8/BUILD.gn
-+++ b/src/3rdparty/chromium/v8/BUILD.gn
-@@ -661,6 +661,7 @@ action("run_mksnapshot") {
- 
-   deps = [
-     ":mksnapshot($v8_snapshot_toolchain)",
-+    ":run_paxmark",
-   ]
- 
-   script = "tools/run.py"
-@@ -706,6 +707,28 @@ action("run_mksnapshot") {
-     args += [ rebase_path(v8_embed_script, root_build_dir) ]
-   }
- }
-+action("run_paxmark") {
-+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
-+
-+  deps = [
-+    ":mksnapshot($v8_snapshot_toolchain)",
-+  ]
-+
-+  script = "/usr/sbin/pypaxctl"
-+
-+  sources = []
-+
-+  outputs = [
-+     "$target_out_dir/mksnapshot",
-+  ]
-+
-+  args = [
-+    "-sm",
-+    "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
-+                                      "root_out_dir") + "/mksnapshot",
-+                       root_build_dir),
-+  ]
-+}
- 
- action("run_mkpeephole") {
-   visibility = [ ":*" ]  # Only targets in this file can depend on this.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch
deleted file mode 100644
index 8b739680f685..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 560a4a616f2a1307385e5e7a7d2e99b0b41775c8 Mon Sep 17 00:00:00 2001
-From: Viktor Engelmann <viktor.engelmann@qt.io>
-Date: Fri, 18 Aug 2017 14:50:20 +0200
-Subject: [PATCH] Fix improper boolean values
-
-jpeg_codec.cc contained some implicit conversions to boolean, which
-is apparently problematic for some versions of libjpeg. Patch
-taken from https://bugs.chromium.org/p/chromium/issues/detail?id=686191
-but not backported, since it has not been accepted into chromium yet.
-
-Task-Number: QTBUG-58482
-
-Change-Id: I2c5d5894493d6a7d0698a4e5a7191288a2fdfeb4
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-index 6d92637..85c7bec 100644
---- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-+++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
-   // tell libjpeg where to write the next data
-   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
-   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
--  return 1;
-+  return TRUE;
- }
- 
- // Cleans up the JpegEncoderState to prepare for returning in the final form.
-@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-   cinfo.data_precision = 8;
- 
-   jpeg_set_defaults(&cinfo);
--  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
-+  jpeg_set_quality(&cinfo, quality, TRUE);  // quality here is 0-100
- 
-   // set up the destination manager
-   jpeg_destination_mgr destmgr;
-@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-   JpegEncoderState state(output);
-   cinfo.client_data = &state;
- 
--  jpeg_start_compress(&cinfo, 1);
-+  jpeg_start_compress(&cinfo, TRUE);
- 
-   // feed it the rows, doing necessary conversions for the color format
- #ifdef JCS_EXTENSIONS
-@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
- //   set to a positive value if TRUE is returned. A FALSE return should only
- //   be used when I/O suspension is desired."
- boolean FillInputBuffer(j_decompress_ptr cinfo) {
--  return false;
-+  return FALSE;
- }
- 
- // Skip data in the buffer. Since we have all the data at once, this operation
-@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
-   cinfo.client_data = &state;
- 
-   // fill the file metadata into our buffer
--  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
-+  if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
-     return false;
- 
-   // we want to always get RGB data out
--- 
-2.7.4
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
deleted file mode 100644
index ef5f44efcf23..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix build with jpeg-9. Bug #646456
-
---- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp	2018-01-15 12:39:43.000000000 +0100
-+++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp	2018-02-06 20:55:37.455912163 +0100
-@@ -57,12 +57,12 @@
- };
- extern "C" {
- static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
--  return 0;
-+  return FALSE;
- }
- };
- extern "C" {
- static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
--  return 0;
-+  return FALSE;
- }
- };
- extern "C" {
-@@ -126,7 +126,7 @@
-     jpeg_destroy_decompress(&cinfo);
-     return false;
-   }
--  int ret = jpeg_read_header(&cinfo, true);
-+  int ret = jpeg_read_header(&cinfo, TRUE);
-   if (ret != JPEG_HEADER_OK) {
-     jpeg_destroy_decompress(&cinfo);
-     return false;
-@@ -210,7 +210,7 @@
-   }
-   cinfo.image_width = m_OrigWidth;
-   cinfo.image_height = m_OrigHeight;
--  int ret = jpeg_read_header(&cinfo, true);
-+  int ret = jpeg_read_header(&cinfo, TRUE);
-   if (ret != JPEG_HEADER_OK)
-     return false;
- 
-@@ -433,7 +433,7 @@
-   if (setjmp(ctx->m_JumpMark) == -1)
-     return 1;
- 
--  int ret = jpeg_read_header(&ctx->m_Info, true);
-+  int ret = jpeg_read_header(&ctx->m_Info, TRUE);
-   if (ret == JPEG_SUSPENDED)
-     return 2;
-   if (ret != JPEG_HEADER_OK)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
index 503918439e7a..ea4481da33d1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
@@ -85,7 +85,7 @@ PATCHES+=(
 )
 
 src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${P}-paxmark-mksnapshot.patch" )
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
 
 	if ! use jumbo-build; then
 		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
deleted file mode 100644
index aa584285a43c..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
-	media-libs/libwebp:=
-	media-libs/mesa[egl]
-	media-libs/opus
-	net-libs/libsrtp:0=
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/libcap
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( ~dev-qt/designer-${PV} )
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( <media-video/ffmpeg-4:0= )
-	system-icu? ( dev-libs/icu:= )
-	widgets? (
-		~dev-qt/qtdeclarative-${PV}[widgets]
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	sys-devel/bison
-	pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch"
-	"${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch"
-	"${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
-	"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
-)
-
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
-
-	qt_use_disable_config alsa alsa src/core/config/linux.pri
-	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod geolocation positioning \
-		mkspecs/features/configure.prf \
-		src/core/core_chromium.pri \
-		src/core/core_common.pri
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
-		$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
-		$(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-
-	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 29712811d0e0..6708d4e48bff 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,7 +1,5 @@
 DIST qtwebsockets-everywhere-src-5.11.1.tar.xz 231468 BLAKE2B d115bd37e1223fd1333515c7abdacb01a9d2e38c847eb3b655b584ec8ea833634549c74c0483bcca25a5807c650c250301b02bb6b7d05e61bdef44062d95831a SHA512 01eb3fabfa0f46c6ecedc3cd9a05e504fef91926ffeab1f534557e50c15d7fd284edaa553f545d8363343a32c0c3187e77e3e5d6edea8331e9234c05c0e318fc
-DIST qtwebsockets-everywhere-src-5.11.2.tar.xz 225948 BLAKE2B 26d71fc36b544ef90b8f1ad0653b13d362e15e05b233776c1a0810734e693f78736f7a314ed949fc8803c9aa775f1388fcd279724c1f38a6b67a46835ac391d1 SHA512 28fb4442a5e00c1aad8f7d3e9c6828030a76d7e396b1ecc7743925fb3981a2d900df9c25cbeecf3247d8d6a54a11083d979681cff1171bb0b680584e954e8fc3
-DIST qtwebsockets-opensource-src-5.9.6.tar.xz 199624 BLAKE2B 9433758ad1cc8f929baebd4a73ffcaa6130277a9832bc43746ddf999870dee7080dfbe39c75d1311ac90a1aabec5b50e5376b24618f336fd660047558198d101 SHA512 3ecb44b6046d1a57ee85d261107b332f219aaed312712f817127cf0715f22ef3688192bccd86bc2057f79b9b1d69bfbceb3b8cac97ddaa33afc4bb3284b857dd
-EBUILD qtwebsockets-5.11.1.ebuild 534 BLAKE2B 9fd30663cbeec04977f7f35ab4615b4e8db153164f4b3f3a6435b3ec49b7839753c87469911b56c048e403f3977948216cc17eb73dfca4a0902c6abd02c8b515 SHA512 91d5b7219e7af9b8275de3e280c06a54e83b56d41a2d769d150de6566db043ffecd8efe810adc760ce7c2b9d12e958bb11c9507d8f7c56360732c0f2375a75ff
-EBUILD qtwebsockets-5.11.2.ebuild 536 BLAKE2B b6d1d38b0fe99e5340be0a2a654575009df7b02bba9f4966594f5993ea95f9ecd2275fe96ca0fb7396e4aed78a82f13287688dabaec973625e020e31a7c91d8d SHA512 aa6de0da74f78d2b002030795f9081b1ad2fa62f3af9861221450f59fa7afb42453bcbf93de9cf0bc531f2bb9ea241908303624a4cb4ce457d51abdc0988f468
-EBUILD qtwebsockets-5.9.6.ebuild 543 BLAKE2B a0b04c917edb5f8ac4a436c5748b1c7edc9086b58db86714f66c2778662e24c8ececafabd1e8adfe723d3e800e17824d622228ce52f8afa87e624f705f7d0ddf SHA512 4d6633d72a3d217b6753ccbeafd5c749cca3ba15ea0884850a1ee3b4bba9061d320db40c94a85e08647db9d2793150a116a43a3c1700a8f31bb22cec8603529a
+DIST qtwebsockets-everywhere-src-5.11.3.tar.xz 229368 BLAKE2B 4308395634f0cb2fed711e5c55cdf0b035f59704178297cdefbabbfc1c59fc4561e5603d44e637b445dabd83555ddd473f705d47fb25be7ad0e8f0aa21feab72 SHA512 8a1ddb2c9ee09018e8dacb5105e24863eb52a84d69ee9792e77c1c6a498634314b24bf3e946f682c23dfe045150898a1c1124bc08416f3560223459b8d1abbfb
+EBUILD qtwebsockets-5.11.1.ebuild 533 BLAKE2B f9bae734df7ec3d4fb2e7744f79300bb9e2a4788fdf3ede3913088061c889a62588051ddbca5c2da743afc41e513279822a69dec508ecdf26e60f7c6050cc775 SHA512 4ea488787b504677055bf75501af035286c9ddb27768d75677e4bd986e1532a7a6613396eafa1241e7ca021b7d751af1de20fab772679a671dd992bb2b1dc39f
+EBUILD qtwebsockets-5.11.3.ebuild 543 BLAKE2B fac202d2fce0176d645b7f7a2d3c30ed278b0ae0924ffe6f39f15b4a6a5d09afc236b226bdd8ae67e71703e4f13abde22b31f30d8e90cb67c2c2f1bfad3af502 SHA512 85e082df9e435fdd9cb56e2aed4f7d01c86e508e1c6a0359a9b2d99316a962b07495d1442610fb0403a493036a4bb9e154cc92f3ce2206583280b11cb047cf94
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild
index 763b5c53a101..375dd3cc884b 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.3.ebuild
index 5923e0a464d1..5c34f7a37258 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.11.2.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.11.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9.6.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.6.ebuild
deleted file mode 100644
index 6a0de5f7c99f..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.9.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
-fi
-
-IUSE="qml +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index e1e2a187f395..0efdce37901c 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,7 +1,5 @@
 DIST qtwebview-everywhere-src-5.11.1.tar.xz 132948 BLAKE2B 7e6fb1544a8cdae2de4cab8d2c42a154eadc79a67a1295311f67c94c19d50d81f578db8749fb02ee741c98ae3461c638b4a8a0cc109a2d95a4670522108e4e6c SHA512 e345d89ee30ed8cc7d087236c63179f887a81f81d41d0db15cf4f838aa38fbcefcaa7b880e82d80de5703610cadf88dd30dad88d44c8b27257980c214a98d2ba
-DIST qtwebview-everywhere-src-5.11.2.tar.xz 127124 BLAKE2B a4cd730deed942779bda655e8d520b85518a7a66679e3983c35ac647bd8f3ddfee6b4b10724ebb418b75374ff10695663dee72edcdb064b1aa5e72bbab02e6de SHA512 e4ff35900a632c048423460219329b5aab8e2808fceb9ac3b981a33c4a52a2b0b371f801fb5c966f830b5d4cb2f21a5046ce61aa85444aa1ee9fc12b30ad435f
-DIST qtwebview-opensource-src-5.9.6.tar.xz 108724 BLAKE2B eaefe9d68bdd0c68f569f9f01bc403a49e36f7bc20859a79225575d13a653eaec741b986917faf91b50188052c811841c85d438104ff0ee9ed5b6a83274b0860 SHA512 dcb3e038737297efb2f58820de386e6ea349d65cf5557116aec34d3115bf7ab2de528365cdefe7433bad6b94ebbf210a282a6018557eb772db5f41909405638b
+DIST qtwebview-everywhere-src-5.11.3.tar.xz 130676 BLAKE2B bd20b19763151ab11114958812b8e711170755041d9ca63f8c34b58dad2497c43b685377d38d48a1a8ad3e3f3305896f7f4b8b3e88e83317c81357dcf785d9ff SHA512 cf926c1e066d756f92f9a3ca6b17fd3aba07aa9277bbec8ca2bce20058fc860990a7b21be6008fa9a9e87cd04208348f5804f71b82b2b7c14ab0782727817108
 EBUILD qtwebview-5.11.1.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
-EBUILD qtwebview-5.11.2.ebuild 431 BLAKE2B 96ff53e5940f693fe9161407bf19f03bda6932a0fe0344dd86018c3ba27310a1d7e7aced3775fe815e7f78f2a447839729690a38f5452911622312316008fd93 SHA512 95bd6ca33bb0e4fda5f55b9ebdb786825ac22ae39ecea9a92aea0c74a0c9a8e0cfe98020a7937fe3d843ad465b2e8e04d5beb53732badbe5729c69d01e073594
-EBUILD qtwebview-5.9.6.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
+EBUILD qtwebview-5.11.3.ebuild 431 BLAKE2B 96ff53e5940f693fe9161407bf19f03bda6932a0fe0344dd86018c3ba27310a1d7e7aced3775fe815e7f78f2a447839729690a38f5452911622312316008fd93 SHA512 95bd6ca33bb0e4fda5f55b9ebdb786825ac22ae39ecea9a92aea0c74a0c9a8e0cfe98020a7937fe3d843ad465b2e8e04d5beb53732badbe5729c69d01e073594
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.11.2.ebuild b/dev-qt/qtwebview/qtwebview-5.11.3.ebuild
index 9d9901e589b1..9d9901e589b1 100644
--- a/dev-qt/qtwebview/qtwebview-5.11.2.ebuild
+++ b/dev-qt/qtwebview/qtwebview-5.11.3.ebuild
diff --git a/dev-qt/qtwebview/qtwebview-5.9.6.ebuild b/dev-qt/qtwebview/qtwebview-5.9.6.ebuild
deleted file mode 100644
index 43288fc107ef..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.9.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwebengine-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 11f8b1b79058..4cbe0cc6ea0d 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,8 +1,6 @@
 AUX qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch 5533 BLAKE2B 1a4db674e9d65134eaa894e13e2acdeb514eb98d841515e5573543387ffcd2ed6eae46c614aabcf61804a224ffdfcf1089d354c630e8c3186496ddbd6130ddcd SHA512 854c1b18627c5a243ededf28279fa3eb8ac208e495b8db54e7768340b25ffde84de0bd9e4b90044d35784a0bc1443071256eda59eafdab71718dc1c15ceaed0c
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtwidgets-5.11.1.ebuild 1065 BLAKE2B c38be42d57296d420e751e5b2309b734b20f2b7d6a8c4c2cf1125d74431921b0bf6a3db17a96aac09d715ea98313524e734b2e14982300fc4e2ae0e132fed45d SHA512 1f816bd3138f827bdb261cb2a20627d0859c6db99d5860ada4322a44317fa12890583d0c7a2da0e9029681de672910e084fc87c2bb61a7a1b473611a78752109
-EBUILD qtwidgets-5.11.2.ebuild 1067 BLAKE2B 27b34b38540cfeaa4d2db254872cf17623a4eddf5a82f13eba0975a3ea60623f371628bb56da1b29e9a6a2732b1fdde2da35c5b1e9c05f04242b5fa028f609d6 SHA512 5f55a1d3bf881049845f6bc07031c691861714dff9d27ed985ea3e4ad55be5a1e6f1b433a3bfa42f35815fda22aa5d739ddadd3ee631dc1987799b165b75df45
-EBUILD qtwidgets-5.9.6-r1.ebuild 1140 BLAKE2B 6589dfa19127aee73971a333cc4f3a177624f1adef02b80904d4c164bbca8fbf3fbb2068b4306e725ebbe538f706ec83e8e48af7f2c6a0fcfe2b8a60b975bac1 SHA512 1b12d48f414171a38cff101b2a84215a93cb9cc43602c4a50485aabf830e461aeb3dacb9ac145a382ed7752ac6f77fbae3f73adddf4f6e299db604b64d1a1d62
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtwidgets-5.11.1.ebuild 1063 BLAKE2B 1e2277078f4c37102be7dfc2bb9a99263285730f1b18f4f57cd7d71558f47244a36f86ab5ba40084585f6f2f326a03f10ff3cb7a1535b6513e5538175b505797 SHA512 014c8736803cb064cd7e3840cf2b4f69b1f44ec85f166c3d7f3824bfc38beff471ef9f6e31887b7242dfb7534fa5fc71ef4982d00a6e867dd5f38ae257985796
+EBUILD qtwidgets-5.11.3.ebuild 1067 BLAKE2B 27b34b38540cfeaa4d2db254872cf17623a4eddf5a82f13eba0975a3ea60623f371628bb56da1b29e9a6a2732b1fdde2da35c5b1e9c05f04242b5fa028f609d6 SHA512 5f55a1d3bf881049845f6bc07031c691861714dff9d27ed985ea3e4ad55be5a1e6f1b433a3bfa42f35815fda22aa5d739ddadd3ee631dc1987799b165b75df45
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
index ae184fd6d395..f13b8bf21a43 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild
index 94499ea10ec4..94499ea10ec4 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild
deleted file mode 100644
index 0e1e4e9b17de..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
-	gtk? (
-		~dev-qt/qtgui-${PV}[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-QDockWidget-revert-restore-geometry.patch" )
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon system)
-		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 5323bf15087f..50035a7bb44e 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,7 +1,5 @@
 DIST qtx11extras-everywhere-src-5.11.1.tar.xz 116368 BLAKE2B 49cc0cbc73719186d812b376b0ae02abf68bee2f22b03ca003761681af4585243c9388d13b3ce8a1257ced8b2a0db7b71188ef10925d123327606f2fad94b335 SHA512 a5acd182e06ced304bdb9d86982c3cdb826411ed4c888dfc530e5bf005f34ac9c58812bda3c98dde66eea372c7075f9eedd62a6e36cb8b549a56b8dc7a9b19af
-DIST qtx11extras-everywhere-src-5.11.2.tar.xz 106164 BLAKE2B 6db62fd1a1897f8c3abe389ae2f7cc65b6eeb892d3d2d3940afadd536f8c0b68c5aedf38fc80a9b0116eae05047b11835fb9caefa781a3a1856fd51b96b489dc SHA512 228365bdeb9ed286b65341b2741725bb7e0f25cd569a2deebe1f18dbd7214b6a0b4144d63e09774e729237bb5ea8ba6690f1fd3d7ed0bcee9eb3c0cc6cf8ea75
-DIST qtx11extras-opensource-src-5.9.6.tar.xz 76896 BLAKE2B f8f3d8f642bff43a74ea6e58492a566e87dc0cd6f17061dd95f98fae4e3336703d03a49ba85403ccb85f02f2cfa7fa554985d6fe19b7d5f055f3fccd73ec2536 SHA512 22bb33a40e242f54caca075ef53e1401ed82f094f87526bb24e8c85227ef56364c78b0c8287a173c38aabc7ca3be833d13d5156f3b3553a57bf74ceab1831be1
-EBUILD qtx11extras-5.11.1.ebuild 447 BLAKE2B f3f0791b6c34400a73977a4b8da29d0ac6314daad40a684b744005eacc83e8d6062fe9335bfb58439d0d7dde7eeb5ff3594422a1a2569d4367bf0814ef615bb2 SHA512 b2109bed413a98a0e34d2c00fffe26d845043cd52ba8ed84c0d6c5684c3736c791dc52d222f99885d9ed6d5eb1585cffe7ae523d08f749840a2359730fe8b6b7
-EBUILD qtx11extras-5.11.2.ebuild 449 BLAKE2B 5a97daf7b680d785d0bf9c868c8c244072e70a75ab283cfa2e8f0d3dc2c904d7b4bd47a5db6b5431f629dbb4ec51b4a1f098c3ca51d4fd3aff9edbecde75a399 SHA512 af62d5a9d555095caeac03a839c47f47276f53da9105b40419c5d75c7c5ac2e6e1fafac172bdb59c0bad431e3fec8bd1e4031347fa33cd85f37d350ed58730e1
-EBUILD qtx11extras-5.9.6.ebuild 448 BLAKE2B f94c0acb5c29c42356811f9ac229a995600490a07988f07cb9bd9516e7f979d2f757cdca96d44465db8089d8af3e4174df4721023a179d211bfe6778e278a107 SHA512 d306c55ad1e89eb9f257ec16ca8967c84ad07d575565600f8d555a88f49a01d822e8f15ddfc3aeefd3e99f277a269d64a383226ea664638c943319ce377694a2
+DIST qtx11extras-everywhere-src-5.11.3.tar.xz 109496 BLAKE2B b95f2d14207a0a87d6ef95de45908351ba2171bee696cb55a9fce334e5d1525c9af968591f03d9b2a40ca1088ee626f81e15b54ef2972da68ee4e22030e16bfa SHA512 8aeae9a567d6a50071c239796e7916b22235b6e51dc56ade7914be85db610bb51fb3cc8a7d863b72ae8c9385498afb8533d3933e780fc8c764ec91dcb3de04f8
+EBUILD qtx11extras-5.11.1.ebuild 445 BLAKE2B de13c5977287b972fad0a88b857b1e80175048d4f3b98a9d2f7f5b77880806f0d28886b6d7b9847c2f881fd79980216abd4d3dab98f9275945d27f43c88d0b68 SHA512 0a37b03f66dfc3d82a80d5be6b797f3689c26b87212772ea958e44b24ae630ea6bf39f1820adedb8e49076efffedf9b3c57901dc1fc5511371ccc18dacb3fb0c
+EBUILD qtx11extras-5.11.3.ebuild 449 BLAKE2B 5a97daf7b680d785d0bf9c868c8c244072e70a75ab283cfa2e8f0d3dc2c904d7b4bd47a5db6b5431f629dbb4ec51b4a1f098c3ca51d4fd3aff9edbecde75a399 SHA512 af62d5a9d555095caeac03a839c47f47276f53da9105b40419c5d75c7c5ac2e6e1fafac172bdb59c0bad431e3fec8bd1e4031347fa33cd85f37d350ed58730e1
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild
index e1cfa79e87fb..a094bec86675 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.3.ebuild
index bd545d306b29..bd545d306b29 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.11.2.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.11.3.ebuild
diff --git a/dev-qt/qtx11extras/qtx11extras-5.9.6.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.6.ebuild
deleted file mode 100644
index 14961e068c66..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.9.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[xcb]
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtwidgets-${PV} )
-"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 095e1ebe7f47..ee8990076401 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtxml-5.11.1.ebuild 506 BLAKE2B d649346a073e35cc6e6a195419e1d4a1ff0adb707b82b26e0cf64c9ffad886a8fc5114bd718243f8ec5fa8fb69303848fb80fa18229426015abd7c147f85b873 SHA512 bfdbaa806ba293e1850e3cb0ffb738ee94922e1663af97765588ec7ea0abc46dcc85181de42076513607f61766453f00e9321121eed5be034afd6dc9de3863c3
-EBUILD qtxml-5.11.2.ebuild 508 BLAKE2B 6a98b92f5c929641f1c86646c13e283dd676653cd66bb7d01444bd9b3f46e2e87870827707c2ad500a65b6f406f59004b356068aec4878b731f781ded0b8c225 SHA512 615135d1fb97e190294c9fb8dc312cb73b2cc7002d2ed8e2dee0a32a1f2df0071f1df4c658932780f727dde4a3b23ffa09159eb982509cdc72cb6c465390b40a
-EBUILD qtxml-5.9.6.ebuild 507 BLAKE2B b572852e82ae20616836d734ecc8be38cb959449de26a8b7e26d695ea77d0f9300a0dc244e813b6df0023b8101fd63ada972d9147a653764d0b52467f661f786 SHA512 a9fddae162b13948179be9c38258a7be6b312b6bb926684eb55ad7c37034f2e47e1e8cca41dbb1e8b36cab730da77d56c60498aaf849861987167e5c95fb7386
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtxml-5.11.1.ebuild 504 BLAKE2B 3f430e3ff500f3e9571be91ce742ffafedc5a1bae783e6a89ed47d9eca4dccbe27c20c94c5c03fd9ad5f93dc28f878d577c7c0d27518a6d62cc136324c201cbb SHA512 0c7bc6d04ca187973b15a0e49dfda308f7b7f57aa56c1048c6812c7e6dc930f55d350a73f910db264f2d4a765b99c270de031bd2ef5c507cb6e022369ca9eb24
+EBUILD qtxml-5.11.3.ebuild 508 BLAKE2B 6a98b92f5c929641f1c86646c13e283dd676653cd66bb7d01444bd9b3f46e2e87870827707c2ad500a65b6f406f59004b356068aec4878b731f781ded0b8c225 SHA512 615135d1fb97e190294c9fb8dc312cb73b2cc7002d2ed8e2dee0a32a1f2df0071f1df4c658932780f727dde4a3b23ffa09159eb982509cdc72cb6c465390b40a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.11.1.ebuild b/dev-qt/qtxml/qtxml-5.11.1.ebuild
index 9989806d0ad0..a7f2477e90e8 100644
--- a/dev-qt/qtxml/qtxml-5.11.1.ebuild
+++ b/dev-qt/qtxml/qtxml-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.11.2.ebuild b/dev-qt/qtxml/qtxml-5.11.3.ebuild
index 409b8fee4ece..409b8fee4ece 100644
--- a/dev-qt/qtxml/qtxml-5.11.2.ebuild
+++ b/dev-qt/qtxml/qtxml-5.11.3.ebuild
diff --git a/dev-qt/qtxml/qtxml-5.9.6.ebuild b/dev-qt/qtxml/qtxml-5.9.6.ebuild
deleted file mode 100644
index 6c327122e02a..000000000000
--- a/dev-qt/qtxml/qtxml-5.9.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:xml
-)
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index df5dfe4bd018..0636d0d9478c 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,7 +1,5 @@
 DIST qtxmlpatterns-everywhere-src-5.11.1.tar.xz 1378340 BLAKE2B 53675d44da768d322bd6ba8de30d4ad00f370c79aa871e1a80184df4cc9ce8d45c13f6fb3a808660a42a44c034b14929fa7dbac52878642057a49a4a778d20c9 SHA512 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066
-DIST qtxmlpatterns-everywhere-src-5.11.2.tar.xz 1372836 BLAKE2B be9e825b78dcc027822318a6bce7b6e05c326e070bedff9b7d0c403e4e04b92186a1e1ce8a715acb830c14893edf5ceea119490ed4aa1a1a35369f85caddd146 SHA512 f659de3da93f83a215914a35b32dcd7d585cabae30044e8d512cbf2a29514043b18ad512e18e6de5b99546ddee2475d807f42e51baa46f15488841314372b26f
-DIST qtxmlpatterns-opensource-src-5.9.6.tar.xz 1344204 BLAKE2B 08478bdc81f49fb2e24a57a105f537000b945537b172392b56751614473bc63c8b2cc4d3c279a91b7ef0e68490d01655b6dac7f5771754baf73335fe3117a12a SHA512 c1b7983725cd208b207e366f3fcaedf073768cbe11d6c54c4569b8155e2c97e4af889792600d86769b7e6828409e0333ad7c66b8459d07c5c1a06268d28d6788
-EBUILD qtxmlpatterns-5.11.1.ebuild 429 BLAKE2B 09222957a875baaf85078386f4f7527e40d4d75dfa59cbb2b2b3a3a5a0ea472c2146ffe81945b731cf09bcfebff7ba39104b4ee8ca7dc4656c7d7b52959ffde8 SHA512 b7aae68a210d2c7d820a8ad2d91713865c79438e6dc37b7be329737807cd92bc8064ab262571b5e8d3e454884c9e8561b329a033d7f15da7a22ba5d80055ebd9
-EBUILD qtxmlpatterns-5.11.2.ebuild 431 BLAKE2B 46e600148b8fed6de9ae51db40c78b125ccfe6f2b9e286157f44eacb741a96ca1e8c2667f321e9fdef1132e98748b4a0756f7a84dbcbbad08d07fe7a9e72efc2 SHA512 5893a02063dff70b1b0ce327e6bc91108c7024aa67fb45e58fd21e8c12f9bd9a757aa09dd268b71916f3934e635de7b5bf602a847232141b16529af8ee573ab4
-EBUILD qtxmlpatterns-5.9.6.ebuild 430 BLAKE2B b929356d0737c29defd75f5067acd50ced972c1a0b00e23c3eacf0cf4199f0f61bb4ce927d545f2a26319fa93c55d147665d13cb9b172aaa11fd47ecb6ce75f6 SHA512 425b418d24e22e5d98951603b90e24f8e42ec3510fcbd9c9aa7c176a890402865083ae7da9dd66e4dc11636acd916b91083aed6d1bc13e97a7c367b4522dd08a
+DIST qtxmlpatterns-everywhere-src-5.11.3.tar.xz 1373016 BLAKE2B 6ab881ca138aa5f65aab09ff499181758c1702cd1f3dc1232f12efb756f5efd9a68dec5bce5fc812dde9d4818d0129694a26e364b2d84d9ac6fa5bbc4d089bc7 SHA512 a7a8dcd1ef0bae811f3efbbbf6bb5705b3e75c468106cf7532dde86740240cb3f1f55142706abc1ba309dfdab5edf3dcb12923f75e26c8dd43ffee22bfb73cb2
+EBUILD qtxmlpatterns-5.11.1.ebuild 427 BLAKE2B 3ce80672dcf091f381b9f6ef7e35c8121b6d076f7364a9b58120582be4ae9ccb18ee825f0b89d0f2c8138af1b96ff3283d39d18025a6f40248c15109e5ec7ea3 SHA512 0f3c4e67dad213cea731a920e72b24180386b6da34a20b7384960171226844c8c213a6ff1d6006a9aa32b90e3f17f52a5c4ece4457b9afbe7e9d0b1603a90e67
+EBUILD qtxmlpatterns-5.11.3.ebuild 431 BLAKE2B 46e600148b8fed6de9ae51db40c78b125ccfe6f2b9e286157f44eacb741a96ca1e8c2667f321e9fdef1132e98748b4a0756f7a84dbcbbad08d07fe7a9e72efc2 SHA512 5893a02063dff70b1b0ce327e6bc91108c7024aa67fb45e58fd21e8c12f9bd9a757aa09dd268b71916f3934e635de7b5bf602a847232141b16529af8ee573ab4
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild
index 45244244e037..f026a3153ea0 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.3.ebuild
index cdc8ca0fcc4b..cdc8ca0fcc4b 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.2.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.3.ebuild
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.6.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.6.ebuild
deleted file mode 100644
index a9647d1a4b6b..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-"
-RDEPEND="${DEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-qt
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)