gentoo resync 08.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
commit: 3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree: a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /dev-qt
parent: 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)
143 files changed, 59 insertions, 2756 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 4791c19b74e2..5bcae233816e 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 0e75f5a0c1fe..103a6bc21ee9 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD assistant-5.11.1.ebuild 1205 BLAKE2B f9516972ac2c473ccb5905fc5b87bc7cc4dafd49e200da6c21a340f3b14534371a3dfc1f9edd917846cce07716e5f7efde64cb8a63213859879ebaa1575c48a0 SHA512 c2419c99e7f15b7696d53e5e542c38a32223ff74ff6dea6c3957532a0079fa31e95623a280a6c9788d3d061b00fbffa89e60c9dab6e7624d290c30fbcb7d4a89
-EBUILD assistant-5.9.4.ebuild 1195 BLAKE2B 9fd15cfd04a7544046cccdc503169417f53ee3a808aeb58a745063e62acb3deed5d761275c1c9a812c92a38427c447f542a77feb312517556c15b4da7681a2b3 SHA512 9139269fee4450c028b112203655a5917beefe83ef07544c8c129c4efee9815448af5cb59312b53821d0c2fa53214e439f02343b84952207a1f8cb57c3e09ee6
 EBUILD assistant-5.9.6.ebuild 1195 BLAKE2B 9fd15cfd04a7544046cccdc503169417f53ee3a808aeb58a745063e62acb3deed5d761275c1c9a812c92a38427c447f542a77feb312517556c15b4da7681a2b3 SHA512 9139269fee4450c028b112203655a5917beefe83ef07544c8c129c4efee9815448af5cb59312b53821d0c2fa53214e439f02343b84952207a1f8cb57c3e09ee6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.9.4.ebuild b/dev-qt/assistant/assistant-5.9.4.ebuild
deleted file mode 100644
index 4757150b4f37..000000000000
--- a/dev-qt/assistant/assistant-5.9.4.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 887c6217a9f1..4be6732ab630 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD designer-5.11.1.ebuild 1244 BLAKE2B ad0534b8270814a5be1fd476da3a03c9eaaacca6c9188a3fe01237e7fa78dccf2734b5fab06e2a7aa40590229ed7cf18df208dbbf3c9a7bcce1ee5bf0cb34e99 SHA512 892e94e9ed8c3d90462f8141a18ae68304b8d096383a6d5d1dbf09ca439480ca6f289f0b59e16734477a845ae1a742235decdcb3b5f6224e2b2d8f65e7cafffc
-EBUILD designer-5.9.4.ebuild 1240 BLAKE2B 4e9a38c065ef1952e11e1aecb64641713a60158fb871366148b2a14e38f37f3bba3dd851af6785c60c4abb724a3f665a4420b04f6b4b94b0d95d0b2de3f57a6c SHA512 ce7311a632c53fac6ef6203136ca190518e5463f47536aa6bf32cfe9f06b8f2984889c23a0452c5f7c95d1f1e70df5ff20f133b9555c4546faf21b3c68be9a23
-EBUILD designer-5.9.6.ebuild 1241 BLAKE2B 9891c41dddf3da9e8998bc2bf94aa23aea5398a5e9ea4a18dd47da29e4dea494057b9b71445e8dd535a3a0756164e6810d7dd13a24a672f8958331f2eea725f1 SHA512 a0db009bbf60a2f6433ee00b27893bf7dadc511292d883dbc035219ada0acfb2c68962bcc38c50bfb12fa5dc16d2562aefd27db6c3634ff294611f0bb179bb69
+EBUILD designer-5.9.6.ebuild 1240 BLAKE2B 4e9a38c065ef1952e11e1aecb64641713a60158fb871366148b2a14e38f37f3bba3dd851af6785c60c4abb724a3f665a4420b04f6b4b94b0d95d0b2de3f57a6c SHA512 ce7311a632c53fac6ef6203136ca190518e5463f47536aa6bf32cfe9f06b8f2984889c23a0452c5f7c95d1f1e70df5ff20f133b9555c4546faf21b3c68be9a23
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.9.4.ebuild b/dev-qt/designer/designer-5.9.4.ebuild
deleted file mode 100644
index 8d195002c7d9..000000000000
--- a/dev-qt/designer/designer-5.9.4.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/designer/designer-5.9.6.ebuild b/dev-qt/designer/designer-5.9.6.ebuild
index d7630bdd20f7..8d195002c7d9 100644
--- a/dev-qt/designer/designer-5.9.6.ebuild
+++ b/dev-qt/designer/designer-5.9.6.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/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index a4f5aad071fb..e66531565e5a 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD linguist-tools-5.11.1.ebuild 693 BLAKE2B 39864f535257e8a5a878e9e1bada7bf211ca59c25a873bbd719f0f754ea44ca73b6bf60bf40e84956e9ab80c783d4d8f544ff1fe160ad5287fbda01b884e000a SHA512 9fbaa96994c68ba5cf1ad2c50cfde9c5ce1f3aad36a3c7072a8e9104f5e085d4fb6c5698e720a120b8c963c106cb228926499360734f6092a7dc3b301ee80306
-EBUILD linguist-tools-5.9.4.ebuild 689 BLAKE2B a9c6a757c7a558d2d29ec22f75be9be7d692706017422a5ea0020ec2b5eaf685a23d9894acbedf5ce493a094bbe5b23dfbf26bd4ba45cb669d6eb5395f61f265 SHA512 e4c747c0b392fda0a754a40832db8e7d6ee98b4caca74a07e608690497fbf5d09297ecd5a6dc1ea970a01075d064eea9cc889e57b5f4ddae6ebcafdd9019fd86
-EBUILD linguist-tools-5.9.6.ebuild 697 BLAKE2B dd9ac2855c52b0ed3eb5ae13d9f05d7ee233b05e036eb8f4c86332ce54ce68eae22230b4bc53a7b92784d2b75d76db5137856902480bba359135e719efd24425 SHA512 8f7923b02d1eebd291ea2a0a1df20e442445c4228cb6e70ccc3f1fde6a8a24813d1a0f800e2293dede8e4972cf1b6ab6bad73b27a10c453af9b3cc5a557ef1b5
+EBUILD linguist-tools-5.9.6.ebuild 696 BLAKE2B 84dc96b8c8b7039af136be737689c68be4878322deb002cc28b59dceafb9b0a27920a7e2d9a79416f64af244e008c4f7e4e35a38755952252c27b17a8a8f4127 SHA512 eef4e1a0302525eab0195fc1f334db7bcbc4ed98ccc12b10504e01713555b69ac9ed83e2c0bd22f24f5bcc94a2578d7c94700d7cdfdc4ab09f3c0ea7333426cb
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild
deleted file mode 100644
index 75f3f4396c89..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.9.4.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 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-tools/linguist-tools-5.9.6.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.6.ebuild
index ab852bf17d49..974ad6a3cf3f 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.9.6.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.9.6.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 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 931952955f07..b3c1c06bbcee 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD linguist-5.11.1.ebuild 992 BLAKE2B 5db73329127034e7a71336bb845b7fe68ed45becabbe1206f24972ac1b4302923c504953198389da8d8021d415498460054c8d1191b1f13bf0c9f8685f3feab5 SHA512 25cac8c8a214be7467b58c73543693cd2165e6055516f74ac64fe6e33263da564b64957fa7c801be7d1ccb70c2673752ca4653c12821247dec56d8e7ffa4551d
-EBUILD linguist-5.9.4.ebuild 989 BLAKE2B d3766d1ec8f65abc86909647bab3e4d28666f8ee11d27aa52138844d0b738bd522154e5f461f6540c856bce00377515caf9cb62035ac67d34e6600f053669be3 SHA512 11a3cad892735e439d1f2851c320bd54e3a2fa89f1b9c4901b0bd445e54709342d4bcb7792e7a14c332326e6e2a6bc1eaf93534298029972e59316735f836a85
 EBUILD linguist-5.9.6.ebuild 989 BLAKE2B d3766d1ec8f65abc86909647bab3e4d28666f8ee11d27aa52138844d0b738bd522154e5f461f6540c856bce00377515caf9cb62035ac67d34e6600f053669be3 SHA512 11a3cad892735e439d1f2851c320bd54e3a2fa89f1b9c4901b0bd445e54709342d4bcb7792e7a14c332326e6e2a6bc1eaf93534298029972e59316735f836a85
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.9.4.ebuild b/dev-qt/linguist/linguist-5.9.4.ebuild
deleted file mode 100644
index bbe1091a67dc..000000000000
--- a/dev-qt/linguist/linguist-5.9.4.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 b1b80b668c3b..f9d353b2e012 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD pixeltool-5.11.1.ebuild 434 BLAKE2B 7731f05f0184bc590629a2d0262ad9ccd2a97e46fda4e1bc0b79a4b275958397d41bde7120eeadd1212c6c3ba3df9ed0052dded5b360fe84ac8d12a48d518da3 SHA512 1d4b3837d72f8357bf2da0e41dc365c495f7e03c38f32781e0d0db328692f94ae0f93cb6709627df656fc40f7e9e897ba5171ba8a3fd2d6b724d13ec44babd1e
-EBUILD pixeltool-5.9.4.ebuild 424 BLAKE2B f70a57ed314ef84a525eeadef282b1f8b526ece30980904fe79c5bb5a1b80d9cc0fabb79847e1eef9d70d419076c19ebad0a5d23ecd2b9d1b5832df5ed824721 SHA512 420f8831d949332c2f2f4625019476853f3073228fcd5a6e4173240647f340b80bf845dd0526ee5d0be466352d6faed48df3b18c67f59441cca06b81ed3411af
 EBUILD pixeltool-5.9.6.ebuild 424 BLAKE2B f70a57ed314ef84a525eeadef282b1f8b526ece30980904fe79c5bb5a1b80d9cc0fabb79847e1eef9d70d419076c19ebad0a5d23ecd2b9d1b5832df5ed824721 SHA512 420f8831d949332c2f2f4625019476853f3073228fcd5a6e4173240647f340b80bf845dd0526ee5d0be466352d6faed48df3b18c67f59441cca06b81ed3411af
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.9.4.ebuild b/dev-qt/pixeltool/pixeltool-5.9.4.ebuild
deleted file mode 100644
index 76868a50145c..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.9.4.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 c42ac39dc45e..f094e656e644 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD qdbus-5.11.1.ebuild 479 BLAKE2B 389c2775be985a7059044a1db31c7fc7679e88872f574d6d5bec61e2d463672469bd14069c493c72ac5f69e35630e91aa525156d6fecd730ca467fa08b4aad81 SHA512 2d5979f90be338e5bb2246a9463a1035e2175cdb0c5d30fc88e2dbad2d5ff868ade80dac28ec0dd359ea741b3d291c82f844278caebfae11882b09f2a636befb
-EBUILD qdbus-5.9.4.ebuild 468 BLAKE2B 837861ba04ef44dfbcf8ac57956ef460c538a62706f80740ede9555afd3a668776b2da9a49ff45dffe70ef6016961ca987d0407b3f019e6d5c65ffcea8c0ea35 SHA512 371019253aaa5eec2f7b310ccd8378fb3c2516e95cfa9cfd3a39de4e7fc0251cae8b4a29f7801e9421e47bd016729f77fefe603eda385a49b655e1f8d69c9d91
-EBUILD qdbus-5.9.6.ebuild 470 BLAKE2B f95c85ac1e580f0b2b129606049c6ac26dbd81f03c7b80aeaa4abdf29251900d1651caa221ed3f72dc45cd7bebda6100e27fc7dea5aecfe6bbaa20e7a860e8d5 SHA512 e8988656a375cb1bcfa2629f62e026977e39ac1f194c86317bb1a3a99e7b86844565dec9be8292069868423a54feeea4e00ada21aa37239a4457286550d5cb30
+EBUILD qdbus-5.9.6.ebuild 469 BLAKE2B 95a5873acaf5b7144802f0d48d6dc5644a4a2d717582572f118f9873aa5e706e71598b6cdae9f76464c9eac9403ad93cacb0871329c5e496742feb14ae300e4b SHA512 d8383e9e3a899ac6f7b13ecc5196bd86d0a1f96144157b6597d6bae265b654fb4362498cf9ba81930bc2118acc50f16cf7db73c290c01dbff71147d6f9c2eb29
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.9.4.ebuild b/dev-qt/qdbus/qdbus-5.9.4.ebuild
deleted file mode 100644
index 04705d7e8490..000000000000
--- a/dev-qt/qdbus/qdbus-5.9.4.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/qdbus/qdbus-5.9.6.ebuild b/dev-qt/qdbus/qdbus-5.9.6.ebuild
index ad7898f20f85..8655c74acdff 100644
--- a/dev-qt/qdbus/qdbus-5.9.6.ebuild
+++ b/dev-qt/qdbus/qdbus-5.9.6.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 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index ab5737d46622..b24289728420 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD qdbusviewer-5.11.1.ebuild 980 BLAKE2B cbe7affa54c3cf095e16abcf089a770b5c9b077884a8b05c3ec1bd968f2e7474ddd94b64f8266bd200e3737623a7b133edcdcdec4fab3acbab83179741936690 SHA512 70448c4b97151d0c5e7ce6b7a09a5dfe5c9dbbb954c73f9027b362dc8ab6aaea2e634985dfd47ddb7ff6eb25c00e3bdc91eb57882222b1673466d6ad9c2e6e0b
-EBUILD qdbusviewer-5.9.4.ebuild 970 BLAKE2B ef175f6e87bcee9a13ff081c8501ce41317fe0e2a45cc8489593cf79a3298480a1f0e70cf95b507fa56739f364ba53ccfcb5ab215cce8625d4c2a01b7f3c7648 SHA512 5fecd7efe36d0dd9cf956ffe573b2a395d32323c0096996e0afd153af7224094cc74926c3473ead047ccf3a2ab079e0a9c78c82427ddebfe567ae90e1c79040a
 EBUILD qdbusviewer-5.9.6.ebuild 970 BLAKE2B ef175f6e87bcee9a13ff081c8501ce41317fe0e2a45cc8489593cf79a3298480a1f0e70cf95b507fa56739f364ba53ccfcb5ab215cce8625d4c2a01b7f3c7648 SHA512 5fecd7efe36d0dd9cf956ffe573b2a395d32323c0096996e0afd153af7224094cc74926c3473ead047ccf3a2ab079e0a9c78c82427ddebfe567ae90e1c79040a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild
deleted file mode 100644
index 72acdeb623c8..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.9.4.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 aca436be4cc6..62ab9b1f4e34 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD qdoc-5.11.1.ebuild 753 BLAKE2B a25c8f934982505e93a78e05b8772eb1476e31f4f3e3b315698aa518da2ed8dbec86867491bc5694ec1d6dd16e62869bd7d0b8abd59d39e7b8f9208053b14b4a SHA512 91546d1b9c02e16338186c56875222ac7fee28f99479f320d7cd1734908b96b9af036ea3c8dfe4a0f5d713a0731514bdeafe08e5542ca59ecc97cd51ba2036e1
-EBUILD qdoc-5.9.4.ebuild 534 BLAKE2B 3817288c91c7c034346c8b9d093d243cbb37229c411117d20efad801fd483730f51de736fffd3f697a081b8be2a083b5e9ee50a1e73d646100aa409306389eb8 SHA512 ab20a092b666c13b4e248c6abe9e2fff6a79d740ee3ea996cd3aecd72b23857e950b9555fb0293908c49b4719f923876b5035247e28210bbd82cf19a99e3c57d
-EBUILD qdoc-5.9.6.ebuild 535 BLAKE2B 173af7b16777a70c548db5617fb7aee25ea0454addb85232d38a5c751859b45e8e733a2f4d2aff36f51986881ab0fdd4f027f6d1f521160094793a346c0c14fa SHA512 db35595a29c796874e694b536f7ac1991f2d1be16c3bcdce2416bf53ed8e5cacb30163321a97acdbb3466d75e13ab68b4079cb71418a9059a182e0b428d00c65
+EBUILD qdoc-5.9.6.ebuild 534 BLAKE2B 3817288c91c7c034346c8b9d093d243cbb37229c411117d20efad801fd483730f51de736fffd3f697a081b8be2a083b5e9ee50a1e73d646100aa409306389eb8 SHA512 ab20a092b666c13b4e248c6abe9e2fff6a79d740ee3ea996cd3aecd72b23857e950b9555fb0293908c49b4719f923876b5035247e28210bbd82cf19a99e3c57d
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.9.4.ebuild b/dev-qt/qdoc/qdoc-5.9.4.ebuild
deleted file mode 100644
index 1b3aa1abfe23..000000000000
--- a/dev-qt/qdoc/qdoc-5.9.4.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/qdoc/qdoc-5.9.6.ebuild b/dev-qt/qdoc/qdoc-5.9.6.ebuild
index a4fba4fa82e9..1b3aa1abfe23 100644
--- a/dev-qt/qdoc/qdoc-5.9.6.ebuild
+++ b/dev-qt/qdoc/qdoc-5.9.6.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 11827a3b2283..c577ac92ba3e 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -6,15 +6,6 @@ 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.4-0-201801220610qt-everywhere-documentation.7z 213285230 BLAKE2B 9ff6df25cef33164afb515f34238bb689b85582fdca106f4d6341a5cfd179d557b9497f8092018151e67bb28d420b12bbcc9d9c395e0fcfc3132b2db6f193f09 SHA512 b843c78200dfc9c5f0ebd656267ca2d0d0efcdb589be0735137b5ba0a15ad90c9dc7daedcfa6c595ec1fcd7fc60523c5d8d504c34d642ffa1219cbeba8d0f27a
-DIST 5.9.4-0-201801220610qtcharts-documentation.7z 9070277 BLAKE2B bab608541ef8b236257bd640bfa4cdd6d3b75b867de55570ced3c1be87938a66ed4711b1c1ef8349eb6e361a1d26c93deed7e49addf56335ea9eadf614b044dc SHA512 3d2825fe9356a34abaf42aea3efa4e27d83c6acf12fb100f3c5aa4cd3faf25fbc1f2e2b3481fe95845a5c0c2b88924c8de19af9e9d5689c702f56252c2620df1
-DIST 5.9.4-0-201801220610qtdatavisualization-documentation.7z 6615754 BLAKE2B 757ed0c5c50e82bf3c8c5927306001c1226385bdd0fa343a342fe83acaf61c10255fd14684a3fe15f5a4c325c8503f74f5e6e13a17d4d7597435ae3b30671293 SHA512 75515a40880f890c5a4c725bb96a093d8af3ad03d52bd22a5f7fb0cd068e8f589eedd8c4560d5eaa8f968d599a223a438a4b447b5ed79083989d995e7c265365
-DIST 5.9.4-0-201801220610qtnetworkauth-documentation.7z 259668 BLAKE2B e9271460bd8e89a963020928c9272acc52e851b07c230207c44c926516a9bdf9fab6d5ebd7b507806002c9d4ba1c69911eade79ff20b11a59b606a6dc2c28780 SHA512 a42f526ed5d241ca7f5e0bc8ffd1e2b5289d4fdafe4c8116b69ca8da91cf1a2e4de07f8cf0b6a0d63adfbad6246b4ef8c605909166473e55e79f3d953fc1c2fc
-DIST 5.9.4-0-201801220610qtscript-documentation.7z 721873 BLAKE2B a6db56c9b4106c33803d0750538c3af70d6f7902157ff4936b6fbe0249dc9f1afc4deb4547baecdcb0d4d645dc658bc2044b39eab37bc1f15294cd4709d7dd91 SHA512 47356bf66b6abc8f7ed5f841e5655b722bfa2bec7ac09e076f3e4afb46a41c3c5eb83e4ba490c6b0ae2a0a527e5f45ec504fc3eb5513e2cc6ad2609edb20ee88
-DIST 5.9.4-0-201801220610qtscripttools-documentation.7z 76290 BLAKE2B 998230165da013b0c851a39cb3981856fac319dabd2ff8c16dd077d3acf5297797954cb895f052f01c8059c09ae383a686d7b2fd76ecf0b5b01beb2cb5e5779b SHA512 ef6a188f3e7adaa1fbbc0381f109b1cb9a8747b68abb3fcc938f68c617ac993261c81df2d5833ac1e12dcb9fad38658643f33aac3d32b1f4258aa3c3edb78a61
-DIST 5.9.4-0-201801220610qtspeech-documentation.7z 148926 BLAKE2B a1727de25d2e2ad13c2c0cc1d075d9ee28f913a5c788e55b5c25d4b976a4f9f775e4b2b2e96d71d2a51f124c4a6ee1b24762292a9f134a25fb8ae87128c80098 SHA512 437d2ce4172d823be6fbfca644ee9085c34a9e3a0abcd2783edda492647fe98e62d40abf81d519a15b7250491801bab48888de7d406c262e5444a4530df4e73d
-DIST 5.9.4-0-201801220610qtvirtualkeyboard-documentation.7z 449521 BLAKE2B 33cd1477544a0bfe8753b7027eb97eda72687b3624267953592a6e45c5f5d7cc7601b65ca3394e418d589af8a9386cfa78afc95b177bf6f30fa2d7c5eabab30e SHA512 927f7161cbd9d400bb2077ad1342962350e0b96c09ff83cec2eb00d961372de305e1a84840993cebc7c4243379f201dcda864773654060ff021f44e20723c71e
-DIST 5.9.4-0-201801220610qtwebengine-documentation.7z 3378943 BLAKE2B f3b37fc3105a02cf8a09191b21898e4cf64d1201069832af3e24e25ef7873b6a722ec3a202183c0f7e234a53e14f3db18b9a15bcd74d5b3c68f0ab8699bf0702 SHA512 b4232c9312bfd659135a4f7895cf7b6695afd4eb71457e2bcab0fa08a281e9bf2cc44b7a775452af91ba64cc2089181fc38acd9b22f92290ce1aeb2df16e02f6
 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
@@ -25,6 +16,5 @@ DIST 5.9.6-0-201806072055qtspeech-documentation.7z 148960 BLAKE2B f26ad95fbd75f0
 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
 EBUILD qt-docs-5.11.1_p201806180847.ebuild 2029 BLAKE2B 4d48f98c7a891124c33ce0a08c1af452725282bc9a2360bd7fc9d06c667bd1b6ec26213c10e756ca329a6ae68c5f18b33b945e45014c65c06dd7f66d9870445f SHA512 9754bf952bb8f9af7b7bded2a58c390730347fa6109f10e2a07227d112e3a1e3ce7a94b7e14f1a96c2ad287ec0b5804f8e115df5e94fd8c2bc44e1f3468a3b94
-EBUILD qt-docs-5.9.4_p201801220610.ebuild 1634 BLAKE2B 3e1aca6d063fdf9859bb9e175049472c9afeea6a8e36c201428d7d6c8a84183074d2f1fe917f4dd85dd9b80d1e988d94cb1afb16c3fd577520decc7a1203d77e SHA512 95a705d2c003e01b213f912e0dd862ca10c79d6ac06e6ab3c7fea6f37c01215ef6afe4151597f1825edd111be8544dc6363943ce6043e60f70144aa024ea04a8
 EBUILD qt-docs-5.9.6_p201806072055.ebuild 2100 BLAKE2B b76b031a1e4a72cf86c2135d7f7f3eed9288ab647e4f4ef6817ef4dc83e5b80764c0e590d072c1ee9dcdd5960f9311e876590a4ce20b0de32eae32aad41ff787 SHA512 a883ade826c6e40e49bb68669c9f4cd3b2daa83cf99e4cc5dcef988f124c9938198780c7f1891a09ebb328fac72d194b3790a4cb9d3f482441a2cc099f17b80e
 MISC metadata.xml 1798 BLAKE2B eeb4fd398c6b8c9422c2be3445149f4745d6658c78d16f3ac92b25bf3b622d7fa0a914f5abcfe9170978853c033c8752eaa3afdbf3c2bc41f66df69f86173de4 SHA512 e8ff00579cbba2f2d0fd2d91a370e0c2f4f83dda0ddd4812850f50f7cae2add0fedde9a8ecad9c2fd7219ee344aebcc64ac85860127fea93e430224d45c6fe1d
diff --git a/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild b/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild
deleted file mode 100644
index afd30f95aa81..000000000000
--- a/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
-HOMEPAGE="https://www.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"
-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"
-
-IUSE="charts datavis networkauth script speech virtualkeyboard webengine"
-
-DEPEND="app-arch/p7zip"
-
-S=${WORKDIR}/Docs/Qt-${PV%_p*}
-
-src_prepare() {
-	default
-
-	# bug 597026
-	rm -r global || die
-
-	# bug 602750
-	rm Makefile || die
-}
-
-src_install() {
-	# intentionally not using ${PF}
-	local dest=/usr/share/doc/qt-${PV%_p*}
-	insinto "${dest}"
-	doins -r *
-	docompress -x "${dest}"
-}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index b6efb835c8e1..af26d282cca0 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-opensource-src-5.9.4.tar.xz 28007244 BLAKE2B ea38270a01460045e7cb57ee5c750149553fc3eab5ca7773ea68104f97a12c81a8125c9375edf5f8c35e2b13ef0a56da01c0370a6acc2ff9f0a03d0cd40d20be SHA512 1887d9e4e2669b15e42ebc2db9c040e1f344f14a4cb2691821be2773c70d63bf6ec152a3dd0572748f77a09aed8067e6bff022fcd5dfc4bd5108af75e626d829
 DIST qt3d-opensource-src-5.9.6.tar.xz 83722792 BLAKE2B bd101674c83a52a9df7a0aab738cebd9500a6d4aa4b5d2c2d4ab2f049f9e643d81ccd48273f089fb04c6c5d0417f9bcdaca0948ecc73972870d8fea472f38655 SHA512 6a882e79c7e0e36f620f9ee77d5943b8b0b4d3e1ee94ab08b70fc30c0bd4774967c656d38c489d9478f8feb91fc83614f639e13933b756ada3c12d6123c907de
 EBUILD qt3d-5.11.1.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
-EBUILD qt3d-5.9.4.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
 EBUILD qt3d-5.9.6.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
 MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
diff --git a/dev-qt/qt3d/qt3d-5.9.4.ebuild b/dev-qt/qt3d/qt3d-5.9.4.ebuild
deleted file mode 100644
index e65630904901..000000000000
--- a/dev-qt/qt3d/qt3d-5.9.4.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 fb72760456b7..c532b630b31d 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-opensource-src-5.9.4.tar.xz 2724048 BLAKE2B c401cd0d3a5b064667f7114b2e95a6bedfcc3b686c37a9962527b4c8a5e73f194a2f07b45408756c38550e4c09f79321f698f017556a33ac2cc7af40dfafea9a SHA512 d4cb67279555872f8f0ba0a9d746774f393711727aec058ab9ee59c783a645d53fc76a8ddcd857b0beed1dfdbc16ee7b4a214b3e95e1d5ba23e66e942d041a2c
 DIST qtconnectivity-opensource-src-5.9.6.tar.xz 2712048 BLAKE2B 8eec7fcbbb90f147c28de44203e1d584f0aa3efef996a3a9ebfcafbba8bc2d2dbee8779610e44dfb293898c79666a0e82b40707802f76887f8f3f3fdc86beb2f SHA512 6503013cccea89d56ea8f31e3d1c6f8928c101cbbe0311ad8463e7c49421015a731c7f33e41bbac608d5714a8821cc82a4d6e5596db86e00e60c79ba9dac4399
 EBUILD qtbluetooth-5.11.1.ebuild 641 BLAKE2B 922e93e07d44ed1f07466bf8f52af6908c2732894630e3920b8046727b03dfdfebe7841c03e66a5f60aaa69502595691748241d76469ece63250ac3fdc6bca16 SHA512 ea8e27764a21856845dbc2b805136b4f1b9386c60b1859d6782f7dd986591eba6af492887b4f56438599e8fda57c38dd64a04019a42c612aa94d463d0e7cffac
-EBUILD qtbluetooth-5.9.4.ebuild 639 BLAKE2B cc1e3489fce5a48b5965d387e34597ff602a15ec1834bc4e4f528700e91b3f171c23cce9134938a83205a938df91442e068b8f4ecea148d85e18fc4f9d39a4ef SHA512 8e4a38ede0f82c8ca87421bb297d2cf0023d863c3da155f11f4c7d8b5fe7e587160e8b93d5ac40db21ebc098c52108b81b212aa2756ee16f4160eda185177857
 EBUILD qtbluetooth-5.9.6.ebuild 639 BLAKE2B cc1e3489fce5a48b5965d387e34597ff602a15ec1834bc4e4f528700e91b3f171c23cce9134938a83205a938df91442e068b8f4ecea148d85e18fc4f9d39a4ef SHA512 8e4a38ede0f82c8ca87421bb297d2cf0023d863c3da155f11f4c7d8b5fe7e587160e8b93d5ac40db21ebc098c52108b81b212aa2756ee16f4160eda185177857
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.9.4.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.4.ebuild
deleted file mode 100644
index a290372bd854..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.9.4.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 c9594de14d34..494b726b84de 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-opensource-src-5.9.4.tar.xz 4158264 BLAKE2B 6e6ecfe3e8b7fc87f1211ef2a03fc7310cc2f4cc6b9711c9da69d8ad83e062137a371c74f6ca882143a5adf516e4caf4dfdab31a40c036fb79add2b80022156e SHA512 4d93d2f3a3c51967e0377a1fd1397109b0cc621644ca90ed587d45950b9a49971738132223a55b45d6ed45685d5bb8e77e159505bd96148ac495047178a4f35b
 DIST qtcharts-opensource-src-5.9.6.tar.xz 4155980 BLAKE2B 975ed87424954502184c0d09cfd51f19b5908e4f297b47b5cfe5e40c5818816843d5c90c4012340b8731fbb306eeeb1edd6ba94a7db755604bc8ef6e8cedb168 SHA512 6d6ed9eca5611774ec683a85164858acb9071f74a0b2ade6976edd406232f51915e5fc1d144c9ba7ec69d36a4ab4840aa6d542214cd70673b3a3b8e6a0b88d68
 EBUILD qtcharts-5.11.1.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
-EBUILD qtcharts-5.9.4.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
 EBUILD qtcharts-5.9.6.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.9.4.ebuild b/dev-qt/qtcharts/qtcharts-5.9.4.ebuild
deleted file mode 100644
index ff3df69c0911..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.9.4.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/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 2125c182dc1f..425a3354bffc 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-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtconcurrent-5.11.1.ebuild 458 BLAKE2B f7eaabc0a85b205482a21d03d381d1da5caa1ce243f7b1245cea0c8246f8f1d789e67b759c21f95920612247595d8efde568669691f5d6da1e135f3261ce24ad SHA512 d1ed4c1ea5d7ee9d12800902f43864d6b7b1966f3d0acb95b37664b33f234b053394a5b82d32f24cefe0055e57fded41fd80fba87d4b0985722418e29cd9c194
-EBUILD qtconcurrent-5.9.4.ebuild 447 BLAKE2B a2129ce135f8fe310e72e731bfbc99e8478815b8e6f67731ff7ff92a0de439808f828fcdba17ffc192fd0e5320bd4b79b31777150280b8ab8015116b9fdff862 SHA512 8993a8af2e1e394340faf5e3d6987c690739cb76a2aeb21b3684aaeee4b000db473c507e2d3b40cc25b56f078b9ca08111f3e2b2310e66b02297711fe42c84f5
-EBUILD qtconcurrent-5.9.6.ebuild 455 BLAKE2B 5d56c0d9d082de67ab743649bfac29d5c3c58709d2bfc566c87d3fb39df53dc4025df295e22105ac4920f0dff426072187fe693a5c6c5a71e715b740ce8ac957 SHA512 43f48118b217f086aae8c2002ec3238e742280c6f20c35cccddd08cd6b1377d55064a15662fed02512850b4cbe4dee20650684d929f3c26ca9ac77ad586fd724
+EBUILD qtconcurrent-5.9.6.ebuild 454 BLAKE2B 4bc4517da2cd438286ff1dfe291ff3c7ce7a1980f7ccf507c58b6c70e2411b39aca015d7a32cdb6b9f9d2099f3f45c0db2af649d7f6a7d3c0f1e014f079978a1 SHA512 09e48863a11d27e7a4424500cc96178546de91570d29804d3284d5195a1fb057b33635469cc4baf7d89a305aa5dc5622c122861d2e7298f807f7729d4f8b274c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9.4.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.4.ebuild
deleted file mode 100644
index 9c95c6791b35..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.9.4.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 x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9.6.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.6.ebuild
index 4f8edd145c0f..dd0317c9bb96 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.9.6.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.9.6.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/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 2aa245dcf472..00fed7bc28b3 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtcore-5.11.1.ebuild 1512 BLAKE2B e0a3c39ed489a4b685d6aa1a100b6c20589b1b8b72b564a15697bceb842928159566d290ab4c26bd6fac09d23057fe0150defdcbfb0485d9aa575a4c95f7aa4c SHA512 40946d4b88a0d1f7ca883b13c162c9866105a76ed01ba5c941d2c5041ce379b982793d0b29b359f38e7d027a82bc92949bdb718f52cf0cd1b6845b4411161905
-EBUILD qtcore-5.9.4-r2.ebuild 1501 BLAKE2B dce6d23557075493060d6899b641e01a30423bc8bf6144c036399c41b2decba8accf17a5e7b0af61f4f85be28c7eda77093fd6b3b770cd097c0c1ecba5130563 SHA512 21d2daaae4b90d677e568e8d7ad9c43582f22fdd2589d45685426b779c5ae8b01aac06996071c317cc5c37601c9a51cb042973f6189a34b23b1af947eed3ca4e
-EBUILD qtcore-5.9.6.ebuild 1509 BLAKE2B e86b886cd7f27cfea951d4630f0f855d0f046304df3adda739a499ffeac5067236acee721c5a9a737632d2940ad1d96700f6b540990954bae5d8865f6cfe88d9 SHA512 95503c6d89bf09f6e0c2b8db3f514eb4cd160324559e0358938ea7f8af61f71061bdfd2d479c2818122303ed5920dc0fe28e2481b4a611dd388c34f68927db52
+EBUILD qtcore-5.9.6.ebuild 1508 BLAKE2B 34ba4a5cb00b733481fa35cb0e892f6eba653f4693d24e06f8c3dadf436255d6ab33f6327a14614453e7d88a8c4c1c988fdbc16c7690453051012215c0f50b07 SHA512 7c511688ca6323acc9d7f8e97074b69a25548a8203e2dc9c8b68a2b8c0cb6950e4e3c20fd41edc1a9dfbaa59c5394ef8f3611957624179c57ceb27a962559eaa
 MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild b/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild
deleted file mode 100644
index b772d996b0fb..000000000000
--- a/dev-qt/qtcore/qtcore-5.9.4-r2.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 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/qtcore/qtcore-5.9.6.ebuild b/dev-qt/qtcore/qtcore-5.9.6.ebuild
index 2a1f6980a8c6..3b0b4e440477 100644
--- a/dev-qt/qtcore/qtcore-5.9.6.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.6.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/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index eaf1abf9a44b..0f07057df8b9 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-opensource-src-5.9.4.tar.xz 5164120 BLAKE2B e8e9586da6e261f22ac6dba12b530755b1b6914f702a33d196968f7c8812e4d5a6b86dd7584c109385fa2e9bc33fcfc067b2538f8d4cff69d3a0624a26822a8e SHA512 8e314d4b0324b6d9aa9a4a63bd3e21010545ce7ffa250614ceea6052b37d7519036a4e13ce1b3cd264e5ce00453bceb774234932cf3c3a49bcded0988d4110c2
 DIST qtdatavis3d-opensource-src-5.9.6.tar.xz 5162724 BLAKE2B b6211a06b5484ddcb81fbe0f676fd4866e2e7b586ad3cd732f080c66079a2cd2b9d53eef25c536cb887686363df3ff39272272e4db621faf28c04e68ac011147 SHA512 fc209e704010e8be5fd6600f86eab5e6b45acde16472589da4945a70db320a13cf282db566182cc546191d245d258a3a227d1bdcdebbc7c7ed31ea00b929d495
 EBUILD qtdatavis3d-5.11.1.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
-EBUILD qtdatavis3d-5.9.4.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 EBUILD qtdatavis3d-5.9.6.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.9.4.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.9.4.ebuild
deleted file mode 100644
index 647770499acf..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.9.4.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 91de1011fa6d..57eb54649404 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-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtdbus-5.11.1.ebuild 702 BLAKE2B de3e2236a5685d935eb20e0b4d1d9a19edaaaf874a2e953dbee4321793df6b79e947d1085067935271416e04a65c8f6ff124f2d81ef153917500ad4a3d6a9a18 SHA512 1616bdec772c779d73b4f4c428d519f8d45ac15ca8a76ce40d01782a326585434e98df62a43fe32b78a9b435be86df701520f6aebe4eaffed85135aec6cf6dec
-EBUILD qtdbus-5.9.4.ebuild 691 BLAKE2B 64f68d852a92951dacbb397743fc5f6df49e11a49fd58ee8c9665f571be28133bdde594afe0c874eb80b1dafd65ad926adca7e88845b621d62426645f364baf9 SHA512 f25adcbd53b903dfdeff2fde800419c11b8b42df29d44f40b7b5b4cfad08233ef64f6e467ab65b2610e2415b44d0994f549355d13df306d90cfee6f0bb1766ad
-EBUILD qtdbus-5.9.6.ebuild 699 BLAKE2B e6592c20597995c81c9cdb1f621811aa61a8b3b67e031427dcde49ca0a3ea3e3291a34f4ae102473f1aff5d4fa6c84d7b17fd768d689423592be6d59f8cd2503 SHA512 afa644b9f2787575036c35fb83cfa2824dcfd2f71dfcebb2e5ea63d579445dd166bd67789d3c92f00ad719cb801402e8dda8f29f6d257d9a2320ef25685971de
+EBUILD qtdbus-5.9.6.ebuild 698 BLAKE2B e36bd662664c15e3f4349f39207655309e74e19cd32cc110dba194869df0e135bb6ada418d3efa5296f54643499b00e6771354f9c1f869b54a03311b384df306 SHA512 f27de442a099e481b51c55cb4cf2e8d6fd46c38229c5e929470e71d59eea47d7c6ad08d16c09646d4f779bf065cfb885a5ab418132b7be726f2e1a923891f3c9
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.9.4.ebuild b/dev-qt/qtdbus/qtdbus-5.9.4.ebuild
deleted file mode 100644
index 961e906e5c81..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.9.4.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 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/qtdbus/qtdbus-5.9.6.ebuild b/dev-qt/qtdbus/qtdbus-5.9.6.ebuild
index fcd375218f46..34c8c8730156 100644
--- a/dev-qt/qtdbus/qtdbus-5.9.6.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.9.6.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/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 5d0fb8b7e0f9..2f7113ab84e6 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,9 +1,7 @@
 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-opensource-src-5.9.4.tar.xz 21454140 BLAKE2B a7e792406c2eb42422aba1b779e2249f081840c8237a119cf4d9a001fa34d1f5e48e30216c08be431a89bca52dd56d4241d92cdfdb8b684b0912449bd0c9301e SHA512 e9e425665df42826c2525566e08b3588aa73b0efea295eed301ba5caeea7208b90c5a91a55cc16986ea9e0ceb9c6658bd59f56a3a276601ad5780f2c67f5ad5c
 DIST qtdeclarative-opensource-src-5.9.6.tar.xz 21417200 BLAKE2B 25d62058d85f845eb8a61ed949f7f3b2af972c0d3e97e4fe24b309fcc9570b5a00716bad012fca4cb8f65858b4aa7afb735181270be32e6a7bbe126d6a5931e4 SHA512 1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39
 EBUILD qtdeclarative-5.11.1.ebuild 1415 BLAKE2B e7d19fe7f65ae602510a2bdf1c3a76ceb0081caedf59f5a9f0bf9ed416c02ac4289c1bf079b84074ee377b6b8dbf8a18389c551710b55845692d4ec7978a08bc SHA512 b627a0c784670d6a4d660160b131b42ad7fb11874965535cd631836e0cc8bdba0ac46d9c790ec3d58e9bd6eb1af27c02d1ec7a2c7991bd8005cd75175befe603
-EBUILD qtdeclarative-5.9.4.ebuild 1323 BLAKE2B ca629dea8c113c90fc4e6da40be37bcc43d89fa240cd836eb162e70268f329c6050eabbacc00575ba22084639bcf9a577648c46f5dffe6be740806dd965f19a3 SHA512 a6ecf2a3c673529b97c08fe45596dc84b5378797c14c8afc8eb7ed48bf6013c8f70aee4948a6d7b7c16cfaf070d147f70473c7dd03f1fe4de9a2006977b1c175
-EBUILD qtdeclarative-5.9.6.ebuild 1392 BLAKE2B a4e3e80784740f1ea114794278f505ee638ee6e27682472940c9f60cde3e1534c66428dfac65d5399d98404bc9fbdb37b72496450410af653e7516aa0a6ca19b SHA512 d010e0aefe11e30cb928aa2aa836434fb6e0796d4e111006d4c4cf6b2847b7f11863c3cae797748a52c9e9fa77f3e3e54b4d0736bec23d56e9cdf74dc2a9a8ae
+EBUILD qtdeclarative-5.9.6.ebuild 1391 BLAKE2B 19044927b073a5f22b05ab071d1c33299503a16532884987a1b7f1ebe42de240cb13d9dde9022e689bbc76a16c7e5797ec4a9f7458f0020fe3235531b4a81bbc SHA512 4af1771d4bc4886fa2361eb65be5711f7133d9e5a1e4f9b9394690f3ddd9b0945042d93b17a08531f64297afe154535c139264300f173d1c75bde8b0c4a5598b
 MISC metadata.xml 811 BLAKE2B aca4ded12a2034fb5964d6c38806edeb1b2b984c182fe6ae5cf26f28db3ffa8cc942e8354971e46d7bd6f8eef600fe52ef3e0cdb5cb2aef7c7fe616fbc81d712 SHA512 0e278f92094bfc3d7a295cf559178ff093f5ff6776f03037cc9cb4e8574c9298c76f6210f84e611c8cf1c6c063cfd78f8d0c478f30798fc775d7bedcc409c711
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild
deleted file mode 100644
index 4d887b297f23..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild
+++ /dev/null
@@ -1,56 +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 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
-"
-
-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/qtdeclarative/qtdeclarative-5.9.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild
index f74bcf437991..6ad4e5617306 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.6.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 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2 +jit localstorage +widgets xml"
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index f8c1c3e45609..2da6d569d2a7 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD qtdiag-5.11.1.ebuild 723 BLAKE2B 4f1e3a9aac15172f8f3c3ed8ac798df59dc4f630f617e7a45e4cd47f9bbdb92f4f0c44f7952fb1a19ddf2dd0a901d29bd4e554499c781eac7aa3fa41747ae0c6 SHA512 d165e299faf51c7cd1ed647c6612e7a28c26ba3885fbd51d43d36490df86e9cc0cec15d506aaad844ea875992bb24935c04f9df88e997665014b868730a3ad22
-EBUILD qtdiag-5.9.4.ebuild 716 BLAKE2B d55f92d3fd1e005b7e156404d74d09137ca66da313e26b387e14780da28ff157957d13c6e460a36bdfd9167fe876fce79ff57618ea4e5a3375527dcddc7f27a5 SHA512 d795a0f96ca8fce4d58f8d5e79544956784f507a6b5bc35e141e104486dae1b8c25a8ac27b26726a44b9fa391897bfcc6dc55238f68bca2db1757224e7716f6d
 EBUILD qtdiag-5.9.6.ebuild 723 BLAKE2B 4f1e3a9aac15172f8f3c3ed8ac798df59dc4f630f617e7a45e4cd47f9bbdb92f4f0c44f7952fb1a19ddf2dd0a901d29bd4e554499c781eac7aa3fa41747ae0c6 SHA512 d165e299faf51c7cd1ed647c6612e7a28c26ba3885fbd51d43d36490df86e9cc0cec15d506aaad844ea875992bb24935c04f9df88e997665014b868730a3ad22
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.9.4.ebuild b/dev-qt/qtdiag/qtdiag-5.9.4.ebuild
deleted file mode 100644
index 85c0174e71a2..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.9.4.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 ~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 73af91268481..cad2de3e6373 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-opensource-src-5.9.4.tar.xz 14480512 BLAKE2B 1ec184f4b42bdd775dbeaf627844670c0f6316469f269d66845c84286b21dff94badb50e2f5a7e0f4335db0b04b12e37ae2b220cfee950e3eadbd6a2c2efffb1 SHA512 efe4d0fc022bff8e9f20b1224ed624a9499bae069576db957dd73c1da98922cc98e4c1e556180bc3512215631116581d1f76030b11ac9ece4f29a64564fdc6b7
 DIST qtgraphicaleffects-opensource-src-5.9.6.tar.xz 14226968 BLAKE2B 1200c65dff266a27178bc9f30ba7717fbdf8d7d29bd25ac7edc2c45f62bfebf5748205933266edc0b3733b382f5596f513298786fb9e8e1f36a8de67ebfb946e SHA512 a319dd594bd9048242512cefddf8db0474677d48a03c7616633d7e3b7dd6637ff2c7cce206d25d3938a6b3f3cc7ffc037630e5923caea0bfa7612e99522e36ea
 EBUILD qtgraphicaleffects-5.11.1.ebuild 451 BLAKE2B b46592374ae4e7fd7c3bb609ec72b9718f62fa502148fb48a83fccf1e702d84c36a41fae24ed7365928545afd8431f28830116ee3a9557bb08321b109153a32b SHA512 ac77df06caaceac667ce524e3d22fe6a5831cf2d0cc9c2d59105e3b67b4983bbc426a6745eb7253effedf5472f1b7a4271679936608327fdccfe0ada5b4aff97
-EBUILD qtgraphicaleffects-5.9.4.ebuild 447 BLAKE2B f072e4fc5a96c5915f39f9db34a5df078ce6a7ef0aa329e7c19cf0bc27f3988e89ac44e1d9b03936c60573ccbee43ea23942d65353ace51e53ef8d9172688def SHA512 8081f61362bd69b686b3e26e26da1e9c074f3196a48171d50f72d5e31204ab05584af5f7b6074e598709efde88e05821b665d8413de9a8f9547ea14f07b72a1c
-EBUILD qtgraphicaleffects-5.9.6.ebuild 455 BLAKE2B 214cc3c38250a32fe619568200c4d6c4f3305bbf6d40f5d563c8113fbe29e1a4f0620805d23d3214d88a01490a71d5cba2a11b78ad8377571148b78147412e6c SHA512 d96e968212003b4dd19907e3d3541f15b886b6607a7d2942520a5b559e7293a8450fe05355717b7bec8f1f79572fed774a86bb4fc72ed06c4693852f8b32d359
+EBUILD qtgraphicaleffects-5.9.6.ebuild 454 BLAKE2B 8e69c916a4822f6a3becaed40ee7edc4921d0f8a1ec3be1554970aed72c82ee02e0d10cb002380cbf9b7df535fbca6cd14c1ae23ec2fb18b30371e304184486e SHA512 8e2482b22f22715f03d944afe0d2e75e524499afb3323e1a1e049db2dc64d66fb3f36966dc5fbc0fd94d4e2954a17d89a7883167a15c7efb8fe25656d6d622fe
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild
deleted file mode 100644
index 65b80f45cdd7..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.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 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.6.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.6.ebuild
index 34dd9f8ddcf5..f200b09a9f35 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.6.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.6.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 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 229686469021..8808dcf702da 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,10 +1,5 @@
-AUX qtgui-5.9.4-libinput-pixeldelta.patch 3597 BLAKE2B 88f54e4c832f132472aea296e8bcc4cf318456af48db3e260eed30b620acf98af0cfa2abd6d396a1396be678e133f5721cccbc79877d4f8934606aba6a0d6d39 SHA512 47aa0fb3971cd956d08fac4ace0b98b4034178d00c89db3fe31060d548acb8a075621dc2fb43ef0357dee79a927f82a7626e6cdf784b009028ae1435f68176d4
-AUX qtgui-5.9.4-opengl.patch 3586 BLAKE2B 56e5192b0455c8d6ccd307466fe9583c7ac8f3a6114bc3bfed62dad36aa7f72eb505452da4fd2af1ea3b2bb24241ac1716332064e5a97d0c97951ea92ddd55a6 SHA512 d77fbd4e44d32f70b9047f7ae4531684e7d142b659be03ead0bce0252635a6bd35eaa8cd5d0cbcca59a19ee740f809ca6ad950dd199805fa6a379e41fbb68582
-AUX qtgui-5.9.4-qsimpledrag.patch 6887 BLAKE2B 9da87acfe69c1cb8b1dd92b05a7b919d01227d0aa1316adfe97261bd59a7e0eb3b1e6d9b0896cc2f6a6a64eac3f31f72039a3acc2767998a668656acc8d8ffc2 SHA512 8229b87a40287c3c6e74d5aec9bfc346a1e0f7002687ba661573566ff5f700c99819850fc97f07d3a36d63ba83348f2ab315f835e44abce22242b4d1f29e7c7b
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtgui-5.11.1.ebuild 3582 BLAKE2B afd6e3826fd0174918df37a35cc2b302c916e4604d73d2d393bfa22af246f2db6aab41ecf93a5914bac689e28c9030cd964a7f472a5cdcd8596a9f1729f26cc9 SHA512 a2738fa9656b28c7b7de86ef0a08d29746f3fd614b3244e6d19b45d4c9bf5082d8328d19f714859fc050910a575fc31c5dadf522bf2c509f71e652cb394cff79
-EBUILD qtgui-5.9.4-r3.ebuild 3725 BLAKE2B d83d8e0c8407a8d4e9c0b7ab22f9c5bea55d4ebccba03b17ea70d22d00bff15ffe9bf8bedc1c8ce860d3f80ccbe38bfbef60ba656c0524d6a4dddac95c0f7488 SHA512 9d1e09c76bc4581c54a17b635de66a478a95dbc23072c27e593f4fad0b207b4825ccd2ccac83c873f68cc4ecbd97cfe10cec40c07f784e2420c0d245656e877b
-EBUILD qtgui-5.9.6.ebuild 3561 BLAKE2B e13ce2fbc4bbd9ffad3441f6ad58750b3ab51a6767235df8db21d67c76e0c55373f08c42ea5c76c2e0442f2931dcd7c920c0a810d2636fa04f743a7ff67e45dc SHA512 538be305b7dd0571ab5956d9fc8d48374854a719afb78637c0c1b1d095e5397ec1c702439a9232504aac2eb87527f7b4f545da239e20b39dcd18a309552eb722
+EBUILD qtgui-5.9.6.ebuild 3560 BLAKE2B 8f85331e6c6ae16810f546a993a2b19ac94f358ff84a6610f49eef9184b42329b2c1b096f857bf958ff12c122d72baddfeb00e762a63d4219ecd0e4d601b054a SHA512 ff2e051a60f35b729827e57fbe5ff0d40449536cb3dd2f79658435b747bbc72fa356c4b42e44a9b76b4725483857af90037c0773b8a05d1854aa32bc7137a217
 MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch b/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch
deleted file mode 100644
index b9adb8b2f623..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From d196036024697a75868c1f1626525710495ca428 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Thu, 23 Nov 2017 14:25:04 +0100
-Subject: [PATCH] Avoid providing bad pixelDeltas on X11
-
-With libinput we now get a hardcoded resolution that is unrelated to
-the hardware. So avoid using that as a real pixel delta and document
-pixel deltas as being driver specific and unreliable on X11.
-
-Task-number: QTBUG-59261
-Change-Id: I9fe86d80e7ccd290ed2e4091d7eafa52cb537d34
-Reviewed-by: David Edmundson <davidedmundson@kde.org>
-Reviewed-by: Marco Martin <mart@kde.org>
-Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
----
- src/gui/kernel/qevent.cpp                        |  1 +
- src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 14 ++++++++------
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
-index 06d52aa..c68f9af 100644
---- a/src/gui/kernel/qevent.cpp
-+++ b/src/gui/kernel/qevent.cpp
-@@ -971,6 +971,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
-     \li scrolling is about to begin, but the distance did not yet change (Qt::ScrollBegin),
-     \li or scrolling has ended and the distance did not change anymore (Qt::ScrollEnd).
-     \endlist
-+    \note On X11 this value is driver specific and unreliable, use angleDelta() instead
- */
- 
- /*!
-diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-index d1d97af..94f543f 100644
---- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-@@ -953,10 +953,12 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
-                     double delta = scrollingDevice.lastScrollPosition.y() - value;
-                     scrollingDevice.lastScrollPosition.setY(value);
-                     angleDelta.setY((delta / scrollingDevice.verticalIncrement) * 120);
--                    // We do not set "pixel" delta if it is only measured in ticks.
--                    if (scrollingDevice.verticalIncrement > 1)
-+                    // With most drivers the increment is 1 for wheels.
-+                    // For libinput it is hardcoded to a useless 15.
-+                    // For a proper touchpad driver it should be in the same order of magnitude as 120
-+                    if (scrollingDevice.verticalIncrement > 15)
-                         rawDelta.setY(delta);
--                    else if (scrollingDevice.verticalIncrement < -1)
-+                    else if (scrollingDevice.verticalIncrement < -15)
-                         rawDelta.setY(-delta);
-                 }
-             }
-@@ -965,10 +967,10 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
-                     double delta = scrollingDevice.lastScrollPosition.x() - value;
-                     scrollingDevice.lastScrollPosition.setX(value);
-                     angleDelta.setX((delta / scrollingDevice.horizontalIncrement) * 120);
--                    // We do not set "pixel" delta if it is only measured in ticks.
--                    if (scrollingDevice.horizontalIncrement > 1)
-+                    // See comment under vertical
-+                    if (scrollingDevice.horizontalIncrement > 15)
-                         rawDelta.setX(delta);
--                    else if (scrollingDevice.horizontalIncrement < -1)
-+                    else if (scrollingDevice.horizontalIncrement < -15)
-                         rawDelta.setX(-delta);
-                 }
-             }
--- 
-2.7.4
-
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch b/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch
deleted file mode 100644
index 2a447414c215..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.9.4-opengl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From b63aeba4a88088c7de61c1664a510c02d38ade84 Mon Sep 17 00:00:00 2001
-From: Antonio Larrosa <alarrosa@suse.com>
-Date: Fri, 16 Feb 2018 13:18:42 +0100
-Subject: [PATCH] opengl: Bail if cached shader fails to load
-
-QOpenGLProgramBinaryCache::setProgramBinary() should check
-GL_LINK_STATUS after glProgramBinary(), but doesn't.
-
-In practice, this means that SDDM is a white screen, and KDE is just
-a gray task bar.
-
-So far, Qt tries to check this using its internal ::link() function.
-But in case the cached binary fails to load, Qt currently attempts to
-link the inexistent program, resulting in a zero-length, fixed
-pipeline shader.
-
-Checking this already in ::setProgramBinary() makes the call to
-::link() superfluous, so we remove that as well.
-
-Done-with: Max Staudt <mstaudt@suse.com>
-Done-with: Michal Srb <msrb@suse.com>
-Done-with: Fabian Vogt <fvogt@suse.de>
-Task-number: QTBUG-66420
-Change-Id: Iabb51d0eb2c0c16bde696efff623e57d15f28d82
-Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
-Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-(cherry picked from commit fa091640134b3ff99a9eb92df8286d15203122bf)
----
- src/gui/opengl/qopenglprogrambinarycache.cpp | 20 ++++++++++++++++++--
- src/gui/opengl/qopenglshaderprogram.cpp      |  8 +-------
- 2 files changed, 19 insertions(+), 9 deletions(-)
-
-diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp
-index 06373e1..d16173d 100644
---- a/src/gui/opengl/qopenglprogrambinarycache.cpp
-+++ b/src/gui/opengl/qopenglprogrambinarycache.cpp
-@@ -161,10 +161,26 @@ bool QOpenGLProgramBinaryCache::setProgramBinary(uint programId, uint blobFormat
-     QOpenGLExtraFunctions *funcs = QOpenGLContext::currentContext()->extraFunctions();
-     while (funcs->glGetError() != GL_NO_ERROR) { }
-     funcs->glProgramBinary(programId, blobFormat, p, blobSize);
--    int err = funcs->glGetError();
-+
-+    GLenum err = funcs->glGetError();
-+    if (err != GL_NO_ERROR) {
-+        qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, "
-+                                  "format 0x%x, err = 0x%x",
-+                programId, blobSize, blobFormat, err);
-+        return false;
-+    }
-+    GLint linkStatus = 0;
-+    funcs->glGetProgramiv(programId, GL_LINK_STATUS, &linkStatus);
-+    if (linkStatus != GL_TRUE) {
-+        qCDebug(DBG_SHADER_CACHE, "Program binary failed to load for program %u, size %d, "
-+                                  "format 0x%x, linkStatus = 0x%x, err = 0x%x",
-+                programId, blobSize, blobFormat, linkStatus, err);
-+        return false;
-+    }
-+
-     qCDebug(DBG_SHADER_CACHE, "Program binary set for program %u, size %d, format 0x%x, err = 0x%x",
-             programId, blobSize, blobFormat, err);
--    return err == 0;
-+    return true;
- }
- 
- #ifdef Q_OS_UNIX
-diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
-index cc8af16..3b82bac 100644
---- a/src/gui/opengl/qopenglshaderprogram.cpp
-+++ b/src/gui/opengl/qopenglshaderprogram.cpp
-@@ -3824,13 +3824,7 @@ bool QOpenGLShaderProgramPrivate::linkBinary()
-     bool needsCompile = true;
-     if (binCache.load(cacheKey, q->programId())) {
-         qCDebug(DBG_SHADER_CACHE, "Program binary received from cache");
--        linkBinaryRecursion = true;
--        bool ok = q->link();
--        linkBinaryRecursion = false;
--        if (ok)
--            needsCompile = false;
--        else
--            qCDebug(DBG_SHADER_CACHE, "Link failed after glProgramBinary");
-+        needsCompile = false;
-     }
- 
-     bool needsSave = false;
--- 
-2.7.4
-
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch b/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch
deleted file mode 100644
index 60d2ec424f47..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.9.4-qsimpledrag.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 4a7771f206d4b29be549d3827c36a46679d90de6 Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein@kde.org>
-Date: Sun, 7 Jan 2018 13:02:01 +0900
-Subject: [PATCH] QSimpleDrag: Fix mouse release coords for delayed event
- transmission
-
-On platforms such as XCB, the drag cursor pixmap is shown via a window
-(a QShapedPixmapWindow) under the cursor.
-
-The mouse button release event at the end of the drag is received in
-this QXcbWindow, but intercepted by an event filter that QSimpleDrag
-installs on the QApplication. It then resends it unmodified(!) after
-the drag has ended and the drag pixmap window destroyed, causing it to
-be delivered to the new top-level window.
-
-The local coordinates in the unmodified QMouseEvent are local to the
-drag pixmap window and don't match the window it is delayed-transmitted
-to.
-
-This ends up having fatal, user-visible effects particularly in Qt
-Quick: QQuickWindow synthesizes a hover event once per frame using
-the last received mouse coordinates, here: the release posted by
-QSimpleDrag. This is done to update the hover event state for items
-under the cursor when the mouse hasn't moved (e.g. QQuickMouseArea::
-containsMouse). The bogus event coordinates in the release event then
-usually end up causing an item near the top-left of the QQuickWindow
-to assume it is hovered (because drag pixmap windows tend to be small),
-even when the mouse cursor is actually far away from it at the end of
-the drag.
-
-This shows up e.g. in the Plasma 5 desktop, where dragging an icon
-on the desktop will cause the icon at the top-left of the screen (if
-any) to switch to hovered state, as the release coordinates on the
-drag pixmap window (showing a dragged icon) fall into the geometry
-of the top-left icon.
-
-QSimpleDrag contains a topLevelAt() function to find the top-level
-window under the global cursor coordinates that is not the drag
-pixmap window. This is used by the drop event delivery code.
-
-This patch uses this function to find the relevant top-level window,
-then asks it to map the global cusor coordinates to its local
-coordinate system, then synthesizes a new QMouseEvent with local
-coordinates computed in this fashion. As a result the window now
-gets a release event with coordinates that make sense and are
-correct.
-
-Task-number: QTBUG-66103
-Change-Id: I04ebe6ccd4a991fdd4b540ff0227973ea8896a9d
-Reviewed-by: Eike Hein <hein@kde.org>
-Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
----
- src/gui/kernel/qsimpledrag.cpp | 32 +++++++++++++++++++++++++++-----
- src/gui/kernel/qsimpledrag_p.h |  6 +++---
- 2 files changed, 30 insertions(+), 8 deletions(-)
-
-diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
-index a1e25dc..87d3ba5 100644
---- a/src/gui/kernel/qsimpledrag.cpp
-+++ b/src/gui/kernel/qsimpledrag.cpp
-@@ -58,6 +58,7 @@
- 
- #include <QtCore/QEventLoop>
- #include <QtCore/QDebug>
-+#include <QtCore/QLoggingCategory>
- 
- #include <private/qguiapplication_p.h>
- #include <private/qdnd_p.h>
-@@ -69,6 +70,8 @@ QT_BEGIN_NAMESPACE
- 
- #ifndef QT_NO_DRAGANDDROP
- 
-+Q_LOGGING_CATEGORY(lcDnd, "qt.gui.dnd")
-+
- static QWindow* topLevelAt(const QPoint &pos)
- {
-     QWindowList list = QGuiApplication::topLevelWindows();
-@@ -94,10 +97,10 @@ static QWindow* topLevelAt(const QPoint &pos)
- */
- 
- QBasicDrag::QBasicDrag() :
--    m_restoreCursor(false), m_eventLoop(0),
-+    m_current_window(nullptr), m_restoreCursor(false), m_eventLoop(nullptr),
-     m_executed_drop_action(Qt::IgnoreAction), m_can_drop(false),
--    m_drag(0), m_drag_icon_window(0), m_useCompositing(true),
--    m_screen(Q_NULLPTR)
-+    m_drag(nullptr), m_drag_icon_window(nullptr), m_useCompositing(true),
-+    m_screen(nullptr)
- {
- }
- 
-@@ -161,6 +164,7 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e)
-             return true; // Eat all mouse move events
-         }
-         case QEvent::MouseButtonRelease:
-+        {
-             disableEventFilter();
-             if (canDrop()) {
-                 QPoint nativePosition = getNativeMousePos(e, m_drag_icon_window);
-@@ -169,8 +173,25 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e)
-                 cancel();
-             }
-             exitDndEventLoop();
--            QCoreApplication::postEvent(o, new QMouseEvent(*static_cast<QMouseEvent *>(e)));
-+
-+            // If a QShapedPixmapWindow (drag feedback) is being dragged along, the
-+            // mouse event's localPos() will be relative to that, which is useless.
-+            // We want a position relative to the window where the drag ends, if possible (?).
-+            // If there is no such window (belonging to this Qt application),
-+            // make the event relative to the window where the drag started. (QTBUG-66103)
-+            const QMouseEvent *release = static_cast<QMouseEvent *>(e);
-+            const QWindow *releaseWindow = topLevelAt(release->globalPos());
-+            qCDebug(lcDnd) << "mouse released over" << releaseWindow << "after drag from" << m_current_window << "globalPos" << release->globalPos();
-+            if (!releaseWindow)
-+                releaseWindow = m_current_window;
-+            QPoint releaseWindowPos = (releaseWindow ? releaseWindow->mapFromGlobal(release->globalPos()) : release->globalPos());
-+            QMouseEvent *newRelease = new QMouseEvent(release->type(),
-+                releaseWindowPos, releaseWindowPos, release->screenPos(),
-+                release->button(), release->buttons(),
-+                release->modifiers(), release->source());
-+            QCoreApplication::postEvent(o, newRelease);
-             return true; // defer mouse release events until drag event loop has returned
-+        }
-         case QEvent::MouseButtonDblClick:
-         case QEvent::Wheel:
-             return true;
-@@ -349,7 +370,7 @@ static inline QPoint fromNativeGlobalPixels(const QPoint &point)
-     into account.
- */
- 
--QSimpleDrag::QSimpleDrag() : m_current_window(0)
-+QSimpleDrag::QSimpleDrag()
- {
- }
- 
-@@ -373,6 +394,7 @@ void QSimpleDrag::startDrag()
-         updateCursor(Qt::IgnoreAction);
-     }
-     setExecutedDropAction(Qt::IgnoreAction);
-+    qCDebug(lcDnd) << "drag began from" << m_current_window<< "cursor pos" << QCursor::pos() << "can drop?" << canDrop();
- }
- 
- void QSimpleDrag::cancel()
-diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h
-index 0b8a0bc..bbd7f7f 100644
---- a/src/gui/kernel/qsimpledrag_p.h
-+++ b/src/gui/kernel/qsimpledrag_p.h
-@@ -105,6 +105,9 @@ protected:
- 
-     QDrag *drag() const { return m_drag; }
- 
-+protected:
-+    QWindow *m_current_window;
-+
- private:
-     void enableEventFilter();
-     void disableEventFilter();
-@@ -132,9 +135,6 @@ protected:
-     virtual void cancel() Q_DECL_OVERRIDE;
-     virtual void move(const QPoint &globalPos) Q_DECL_OVERRIDE;
-     virtual void drop(const QPoint &globalPos) Q_DECL_OVERRIDE;
--
--private:
--    QWindow *m_current_window;
- };
- 
- #endif // QT_NO_DRAGANDDROP
--- 
-2.7.4
-
diff --git a/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild b/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild
deleted file mode 100644
index 33dfa6703cc0..000000000000
--- a/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild
+++ /dev/null
@@ -1,175 +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 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 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qsimpledrag.patch" # QTBUG-66103
-	"${FILESDIR}/${P}-libinput-pixeldelta.patch" # QTBUG-59261
-	"${FILESDIR}/${P}-opengl.patch" # QTBUG-66420
-)
-
-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/qtgui/qtgui-5.9.6.ebuild b/dev-qt/qtgui/qtgui-5.9.6.ebuild
index 5716168faaf7..39a6ad3bc7d0 100644
--- a/dev-qt/qtgui/qtgui-5.9.6.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.6.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/qthelp/Manifest b/dev-qt/qthelp/Manifest
index bc0fcad0fd1b..cc1a61d7b915 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD qthelp-5.11.1.ebuild 659 BLAKE2B dcb5041a1f0b66ab276795b67c5d3caa9a7561359b6da189eee47250a977a4ce6a1c4b1d2ae52440feead78ff7ed5ce33b57ff35de7cf30e36baf2ca147508ac SHA512 fda8358830dabe3d7141b5be5917e459a8d63bb7d99490dd87c01f7a98224cccfa01cca3f04272d2ff98b5960d3304c6833783a929cf0f60dab199f89c2b09a7
-EBUILD qthelp-5.9.4.ebuild 648 BLAKE2B 0d520f2d3f9d4670aebc9fe0f1d33298f90802818363f0314fbe0a8500be839adf3433ecdc436bae0944190b24de11a114fbd117f83a412b753c2dad0d517962 SHA512 cd10ec0a0413197b7558a0b3749ba70f8100316faae82df3b92c2bcc2389cf8e934623d06e905c04269211cbd563020e320e007e02ce45a24ff3dd3f087cb88b
-EBUILD qthelp-5.9.6.ebuild 656 BLAKE2B e9adb88e2ebf10683f9bff44c6017ce837d577a8ba037e47865de994056022f1c8ae76ad9f845f970d20aa0baef6569dde8295294458c69d0e474103b8e307ca SHA512 98e182508e7bb2c409028914e7ce4bf14d5e7d369841e6ab7ab08cf82b0920d8ed3c5812b209709c3637cb0d9af1c9de84ed9118f6d8db1f5aacbfebeb7fea50
+EBUILD qthelp-5.9.6.ebuild 655 BLAKE2B 6c4f16a9090887fa0be0ff0db0f6fe75864368167340b7e4b995f931293b4ebb3334b20b7d8d9628e3aaa8cda3916b6d1910a9302aa1967393e3919cfe7ee82d SHA512 664c1eb25153d8d52b75675846e195cded8775776ddf4554e6587f97352d99bd354cdd7c4347d07eea133ba237db68fd80dbc9314c62ead80149927be8278b9d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.9.4.ebuild b/dev-qt/qthelp/qthelp-5.9.4.ebuild
deleted file mode 100644
index fdda00079f8c..000000000000
--- a/dev-qt/qthelp/qthelp-5.9.4.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 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/qthelp/qthelp-5.9.6.ebuild b/dev-qt/qthelp/qthelp-5.9.6.ebuild
index 91049e608621..9790203036fa 100644
--- a/dev-qt/qthelp/qthelp-5.9.6.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9.6.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/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 129b33b3c30a..f6369cf40f27 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-opensource-src-5.9.4.tar.xz 2106852 BLAKE2B 31f0f5d6c545f04b2be4bd657acce63adb15a45d4b0471b249e39063ae47635a8c5338f44cc0af88ca0c960d399384a911add12f7cd2815c808ddc28d7f5e924 SHA512 91ebe0d4cc67b3d3c55da4dd5d08028f7046819fdc4034ed0ddec075443ebe3775690856a7aa7704ee3ad8893948f79bdc72467fdfea6a0a8ce6fb16b3f5ab5a
 DIST qtimageformats-opensource-src-5.9.6.tar.xz 2107828 BLAKE2B bbea8e01d7c7e4510c35a6322f72c9b531daa844745e5ea007bdc516f60bf72de48a5aa18e7209b6b25da189362b4db8be5fa3d4e8addc90f407a3879b7cc69d SHA512 c6470c1486ae9b0bc3c846c1de6ffa294810aca20ca90d9d5f40a257a7e339ff58aeafd5f76324e6939d71889044eebc48b8b001f2027dbabd15f7eeb8d8bdf8
 EBUILD qtimageformats-5.11.1.ebuild 610 BLAKE2B 849d8dd2a75b1c8c729f4bc020ed3aa1acc42bd64544ddab790b8efcf438fbe6d617a53c8c83b5cf22a3101a625819f41467df7a1fdb7555febc156a092dd6ad SHA512 7959070fdc4a50c1d64a4be6bac9e4a6e5c3b37fe70b1babe39c6d1ddeee6b02866969937f13948ed9b3bdea208a74f5a5c2cacc3249bb0d12a2dc00128dea29
-EBUILD qtimageformats-5.9.4.ebuild 600 BLAKE2B 39cf7f793293f6096eceaa89c41425b4ecb88cb063e5d1c44d0e42e2f4b183cc94e6f1638961296cec7974fb2ee3b20345d3d444ec8f4ae0b7644d084c5205c4 SHA512 aadcee78707fca3ca8fc643fe48b32f0b9fda320ddaec62766ab012fc0e7b9eeb43f4dfe384b2eb302421f56d87e1b7576b52acedadde039ff3349cb8564314f
 EBUILD qtimageformats-5.9.6.ebuild 607 BLAKE2B 46d3b734f62887f3adf36b6fce4f4422b0ad54ef2c134c7a75f3c751a0c47a776a3b967c0c28aa7c3cba8281b17bf2da38fd33c7acd53649905f24dc39b77b7c SHA512 b359b141e85ec32038ba234aa536feb50fff3e39b0738b9021eea2c8b2f7815314b48d89deaa39108feff02c088f7436bf9fc29e71369a5807c59b13560521bc
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild
deleted file mode 100644
index e1a31be8ab9c..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.9.4.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 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 01e8b4235003..d7df787583aa 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-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
 DIST qtlocation-opensource-src-5.9.6.tar.xz 5405652 BLAKE2B 001bb5ea4d73ac67a1e1a70e3218c2cd0554b02f84001da88e3109531b8c0f51264a51276edae5c899aa68b5d1ba1bf6d55ef9e3d409b3676f60657cc8deb86c SHA512 63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a
 EBUILD qtlocation-5.11.1.ebuild 924 BLAKE2B 29c9eab14fd35bd299e880fb12d06df88f44c9ffea761f04f92d119224ea5554620cd044c66a9b0ef0f51a9b26162788fd4d48873353680ccbda8a20e17223a0 SHA512 df70b1dd13f3953790803cb768e84a53dfb05d988d4ce135c2c5828b1736f9f9b2a0df710eb2141396e4cb3633025e938ac99d46e1cdb92b3ae82fb3d096adcb
-EBUILD qtlocation-5.9.4.ebuild 922 BLAKE2B cbcea33ab0f866d580839df171c7d85cb75aeeb6c9cfdd27d8983520e38d1757bbecc899123058b18bca2a444562eee62a48d8b111be6703aad90b23ab6c4624 SHA512 26a0f3b6f88c3aebcbfaabc1da94771726c8a3181920a4f78f48770aac9ff119137099ffdc480276beeaacfeb11b375e85112482e0584615cf5bdbb6c92abd88
 EBUILD qtlocation-5.9.6.ebuild 922 BLAKE2B cbcea33ab0f866d580839df171c7d85cb75aeeb6c9cfdd27d8983520e38d1757bbecc899123058b18bca2a444562eee62a48d8b111be6703aad90b23ab6c4624 SHA512 26a0f3b6f88c3aebcbfaabc1da94771726c8a3181920a4f78f48770aac9ff119137099ffdc480276beeaacfeb11b375e85112482e0584615cf5bdbb6c92abd88
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.9.4.ebuild b/dev-qt/qtlocation/qtlocation-5.9.4.ebuild
deleted file mode 100644
index f228e74b4fed..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.9.4.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 0bf642df1f30..3abdb2e4e340 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-opensource-src-5.9.4.tar.xz 3608792 BLAKE2B ac377b3cf33d727fa129fe623cc9ba9ea75555b2af7f70cf07524598d4044a94617b3627f7fd3a915596e51ac53040b9d72a5fcaa2faf316150a2c1ead220def SHA512 7a60434736f655900d00e70a68e5781f336446938f4f2b617e1d93205b7319bf01be987c001a9e6838ba5fd9e3afe3f20137597b6c27f6f77ee55486e283d425
 DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f81c9a99e75748dd68112ae4fd534e038d73d1f8fa33b76119824ade231e7b1c283ff109ee2473774d08c67bffa04383e7328437539aadbf SHA512 2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207
 EBUILD qtmultimedia-5.11.1.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
-EBUILD qtmultimedia-5.9.4-r1.ebuild 1460 BLAKE2B e845058b50a99d2744c32adc8044b0144988bfe898770e9f5f7a316eee2e5ed17974a36ad1e9ddef786ae8f789b16221534d56eea9d84ca713b7960e8810a764 SHA512 f5f1131f8915e62c8978663187f3a02b4f19fcb8285b4557f809fa1bef9c4277d7b2fe8b4c6fe92b3f55333bea1e4244f94e5af52539968aa15b98b810d55c5a
-EBUILD qtmultimedia-5.9.6.ebuild 1454 BLAKE2B 3296e204446616c1946b17bb96e4564c6e8643743c5267dc0859b3179f4dd8f18460827da043ed9dad5e9d5ee443f4f328046d81e3de5aba4061d98db15ff9d3 SHA512 4220d06b0fe81c170f4f8969b56a774647eadd1716f2d3f832f2b3cf72639c4cbea057f3cfa598559f0d8a007ccf4ad093c7db56c387adae106acacbb2528032
+EBUILD qtmultimedia-5.9.6.ebuild 1453 BLAKE2B 27dd7746bfb2175d1836a4b95ee4b5f557116414f2d9cf30cfbe72bd155f5e15f0d6277cff3829bd780c221a225acec999267e2037896565d729810da8ad47a7 SHA512 945f56093cba63af3a044c642f1c80e293b170d895ec6a1ef2dec5937b8461b44b42a1862732337ad2eb082366e7478b09985dd7ab44729668133b33d2b0acc4
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
deleted file mode 100644
index 07c0609fcc71..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
+++ /dev/null
@@ -1,69 +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 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() {
-	# bug 646756
-	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/qtmultimedia/qtmultimedia-5.9.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild
index 3dcac24d4aa4..7a5ab59350b9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.6.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 ~sparc 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/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 2260d08033ac..3fe16f4ade71 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-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtnetwork-5.11.1.ebuild 1234 BLAKE2B e8fb412c0ac65ed5863cec2645321592af1dbede3000b50b91a635101fb9db0e79af243423dc7304f2fbf33c1a5cb3faacef7be22cc8df3dd88b7d6b401473f6 SHA512 f8b7076c2d22fa2350ae6d96bd6e643f725088897d1497f36b5576eb4d3abc9c4fc9e26300d28b4b6d7e74e7c27ce80bd6d50b4c167a65a6e5f8a32a676e820d
-EBUILD qtnetwork-5.9.4.ebuild 1287 BLAKE2B 970af30659e4e4df96b619d5db6d052d3141c4736ee8e5a6893d72208785f19af48008d5dd614b631429d38d4fb04aef2193093288eee8051b93d97e52bd05b2 SHA512 4e39ee832dba2c0de5210366e59d05b4acd917b67f3d09d5bf8e1f602626edb0f25afaad4f8f2d06ba52fdb0454d461b9d35cd6028e61a63f92df86a8ea7485b
-EBUILD qtnetwork-5.9.6.ebuild 1295 BLAKE2B e72dbd51542821de3a5f2e2e8dd6b90af35ebc5207c5d19c9afcafbf759a8752f29c5c5e653c4740dce5763280991442ad3e66e58dbd63644027a11797c43b5a SHA512 e4ee5876986a7afd7b068d7bb1cb3e7b6ece30958e4984a82dae6548f69557c671051a48ab87639e668378a96f10dc58d2ca8d1d097f08252f7fa49eafc656c9
+EBUILD qtnetwork-5.9.6.ebuild 1294 BLAKE2B f915e4805388cfa15d08d01b8015d0ba839d66978679c2f43d36bddbaac8bad8dd80f30ae8d9f5649d608fa83fc2ae116537f5be0ef2def920941041dcd66f0e SHA512 6a10aac3ce86fd5ba78378e1b2c190b68aaad9842266666ceace907ebf7260080215498baaa15ff6b7a4a854884f2c584d2592b9734a039bff4a8de5b049696a
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
deleted file mode 100644
index 3a3a82834ea5..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.9.4.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 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/qtnetwork/qtnetwork-5.9.6.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild
index c6a76d2e4bf3..c2db4ac2887b 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.6.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 libressl networkmanager +ssl"
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index a4a50e07a6d7..be05f2c93ffd 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-opensource-src-5.9.4.tar.xz 112244 BLAKE2B 9e75f8f11062b064b98421d9b9ed73cc18351eec788398922b22fa5b528f34baf2290c0595e2cdcad6afe6a0061ddbf37d9bbd2ec977a5ba713c692a125fca6d SHA512 a38e0cd3619ec25b2f7c749522b42f72bb024ef2415449349f7cdceaa9cdf5905c78c6b82bb7ce58b0c8f00ff883d2d79d11e12a9bfead014b553d431190abb2
 DIST qtnetworkauth-opensource-src-5.9.6.tar.xz 112188 BLAKE2B e8e61071da9e619d250ea09b01e12d8dfa73ae364e2cc3a33327c027916ce4bd807987f09d58c6962ed106eb148fed639788e06a74ff4e855db3f7e2ce98903e SHA512 8badcf8170780fcd18ec38980a7571e911f13efea101852f6c78e99031668cfa481df2a2fe07f46e2e78906ff6b663c27461326e2dad981e03d42cf4f78081c3
 EBUILD qtnetworkauth-5.11.1.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
-EBUILD qtnetworkauth-5.9.4.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
 EBUILD qtnetworkauth-5.9.6.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.9.4.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.9.4.ebuild
deleted file mode 100644
index a1e6dc628e9d..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.9.4.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 1e0a88d7539e..09554ae4031d 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-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtopengl-5.11.1.ebuild 655 BLAKE2B 2e90f74b04e8c9acdf961d05e9bf63257561590c52d393a5545755260f048f1309a8b54bba6232f10ec7d46b0e34ecf64d871225e706b9b016addab13ba89c30 SHA512 f72e009be1ba58455bb633ad684cd6ab53f8338928e94b3401d0accddedf245b57cd464caaee8e14bf08806b5dd4fe72848d23e6ae3ba8c2a278627cc783851a
-EBUILD qtopengl-5.9.4.ebuild 644 BLAKE2B 39c9006f5b9bf93fc18b0e78b18026d0bf15ded8281c3b5327fcd8030b3fcbfd05443d7e7e37a5b8eabf8ab7086cb98fe786fb5ca601621b51b6f6ca2a8c4ecc SHA512 e7e3b6b1a7c5e708b150387416ae0435f52833dc070a193ed232bb531a3cf6d69acc32f267dde7afe96dc0eeeca618f564ff7112b4b1ca96c189f055c46c189a
-EBUILD qtopengl-5.9.6.ebuild 652 BLAKE2B 83840489bf5e781505b3dac4814a11cb2a9ab47e6abab3ae7abecfe0cdd87b26490e73dc4ea76a4253d0c4e810d2acebe413173a11e64d975ec3cb9e96633f18 SHA512 6e835738c29583e40454e0a6ed3287036275901715706ed789febc7b712dcf48eb5904c0680bea80a7caeb657245795e049574e0603965f94de3f8ce2ecf3b9e
+EBUILD qtopengl-5.9.6.ebuild 651 BLAKE2B b79d6c64085dd047dccf34b7c53252c4f57e08550c2a8af368a4b12ded037c9e7f4fdce2d2e171332a356817f12b2e3abf4983cd000b1af4d7defe4788cf7ae0 SHA512 96e941603ea047a3dc4b376c17f98f7aeb3a7e305af8144812c9034a2e6e4ff7862884703f5ea64471acbe17a5b397af4fd1d136a07d592b86d87cda4cd6ab2b
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtopengl/qtopengl-5.9.4.ebuild b/dev-qt/qtopengl/qtopengl-5.9.4.ebuild
deleted file mode 100644
index d7fc20f91c1f..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.9.4.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 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/qtopengl/qtopengl-5.9.6.ebuild b/dev-qt/qtopengl/qtopengl-5.9.6.ebuild
index a72efebc60ff..5f154c2a1f23 100644
--- a/dev-qt/qtopengl/qtopengl-5.9.6.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.9.6.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/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 1aa7514b9e6a..1a84399cf734 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD qtpaths-5.11.1.ebuild 416 BLAKE2B 0de2f95c087d7265cdd9f21e5b57cdecacd05ecd5ff1c4fae91c72ca73bf3fd3de7b99c8f6e1ee3689250c22f0fff25b42b4be689ced766dc2e4f2815df7bf64 SHA512 fe8765810ce058ca73f6443beef771f0033d1e01ceef319809bc9747ce264d5b4131944aa46d9a5a31d5bfddb419259546af64b5a092a04e58aa44e0903a7b95
-EBUILD qtpaths-5.9.4.ebuild 405 BLAKE2B 252aeaf3802e11f568ac54422fedc8d4b0c4d9b2af8f3884667b2bcaf182282f5cdcb69e84a8e7acb5d4f34702c8a2b2943d2be7dc25e5101f2eb7b01f07aec7 SHA512 a4a79854b5eb0f48745d8a8af9244614ba33d89fdda7cf670b26c1bd25beb5b6df33f2a045934b150f17ef3ffe193c2210df3749b3c6f5f62bcbf91c11cdc9fe
-EBUILD qtpaths-5.9.6.ebuild 413 BLAKE2B c000edd7fc03334253e54b7233a3f38d5d03bb1cf2bc51d53247905ba95c35724066dedeb25821ed46246927f70b9474cf981dfa9615ab19a0defb5b9ffd6213 SHA512 a4da2a422fb0f2b8c4eb93f8ff4d9f5a1297cb753030328d806b835dfa6d4cfb284e3b0bd8c105cf7b0f1c509cc50eb48274273f6391efca5d071915c2b812a3
+EBUILD qtpaths-5.9.6.ebuild 412 BLAKE2B 0dbb0356a7aa2257824ebba6793a8515492d8b97fe7abf58d65a12dd1d28506077dc18a8504a3ce50c8ad6fe5fccd56b9b26edd98217d0cbedca427edf45f4b4 SHA512 cdb226d90c27627f09e4b6a8761c332f0071633c5821e092bf06da8bd8aa004954853a6ade19f6d38bbc6a28b37f6f49d7b5706c2ed4e19feca6972ad38dcff0
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.9.4.ebuild b/dev-qt/qtpaths/qtpaths-5.9.4.ebuild
deleted file mode 100644
index 03766d245935..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.9.4.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 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
diff --git a/dev-qt/qtpaths/qtpaths-5.9.6.ebuild b/dev-qt/qtpaths/qtpaths-5.9.6.ebuild
index 399123d63683..36454707b72a 100644
--- a/dev-qt/qtpaths/qtpaths-5.9.6.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.9.6.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/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 83a07b978f6d..faa0508fb17b 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-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD qtplugininfo-5.11.1.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
-EBUILD qtplugininfo-5.9.4.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
 EBUILD qtplugininfo-5.9.6.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.9.4.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.9.4.ebuild
deleted file mode 100644
index 43ae95d1cf5b..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.9.4.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 9889ef67da39..887d17938ef1 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,5 @@
 DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
-DIST qtlocation-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
 DIST qtlocation-opensource-src-5.9.6.tar.xz 5405652 BLAKE2B 001bb5ea4d73ac67a1e1a70e3218c2cd0554b02f84001da88e3109531b8c0f51264a51276edae5c899aa68b5d1ba1bf6d55ef9e3d409b3676f60657cc8deb86c SHA512 63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a
 EBUILD qtpositioning-5.11.1.ebuild 843 BLAKE2B ad120bb0a2cd8a0655d3b5e271037d7a9e5f4e8bd9e99ebb161bcb1c24e1133c87582b0b0e928607bf7b2f9cdbe0c0e260b518755baeaa646304f6ddfd863ebd SHA512 99d5f6f66130cd18819c3ca6f5f57617ea9848ed73519020981c059faa5ceb8c53a5a945cf073c9e5349b78743ff8c8e1190ba424d3f3bad8f6d9aae96c3e922
-EBUILD qtpositioning-5.9.4.ebuild 807 BLAKE2B 7cd8b965a356bd9ca259d82c1ec4c8b86a722f6b4b3401d30ab99ee92633ee35c88c34e52b04d1a04ed144720ce3ffbbf5ed16967258ce1ca458666e855acb98 SHA512 54c4d3c712ced3fa5bf1755b2df18a74303cf979ba21f5df24157f00e89b1c271fcf045d05492eb851bb31918476a0329cd7e2e09d153c07293093a6329ba584
 EBUILD qtpositioning-5.9.6.ebuild 819 BLAKE2B 5a0fabf81c6e4900505c0c28cfcfe7f70bc61ee1a47c8fd563d0f6de1706a0213fc30c653f14906f7643b090ae23abe8628b8adefccb4761a4e7888d9e20c3a1 SHA512 143e3f568411a3c0ec1af5e8530fdd1485457d14f49bd863f46a3dce9657f4a3292f1ef1c43ec8e9017f58e7e7a73f1b7f5147739e95288a66cb965c227ff582
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild
deleted file mode 100644
index c5c94f7ffba3..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ppc64 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 03b39187cd01..1301ee367441 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-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtprintsupport-5.11.1.ebuild 780 BLAKE2B 9bc6b1c82687724c8ec74022d2c3ec1a405de9578667c32ef955e4c0bd92b37819a5de9a22b2df3e81ddad70df030f59584efdc592d935f3bc04fb0c67eba6e7 SHA512 f7d8f87dc41971ceaf4a1bc4a05594a813266ffb611b285309d58182bbfa41c800e1901251e2e33908815966e2f4becd526b6858bd960b296a4ac35fb210e4db
-EBUILD qtprintsupport-5.9.4.ebuild 769 BLAKE2B d1e8987e2228f6c7218dd48b8aa85dcd3a9c83d2ce04fa3b26da6a8e9241bd68fa1c1b777d5e80fdb9d08bc0ddb7c6a7a89c1381630faf83029ae24ccb3cc836 SHA512 e4190edb33773bcc786519ed580e570f49fc4f29d7ebad5c87148e388cfc6d1219f5929ea179a495c5a507a24422b57b770dfddfab013844f0b9b1e52d43193d
-EBUILD qtprintsupport-5.9.6.ebuild 777 BLAKE2B 5a44d4d6ac8efb6b77ddd2a1a5a485370ed63affeba1611f15bb1d1466f43e68242de520d6fc1c2484b0995a8664ddf9d64318c4b81763e4cba934e6f4a4108e SHA512 fbb11200cf6f168289f9e93b3da540c831f5d23bd6b46073930cab7064a28b68beea7dcda7774d9c846a10bcdabf221c301608d069a915ceacc23f5fb0643c7c
+EBUILD qtprintsupport-5.9.6.ebuild 776 BLAKE2B 1fee8755df583a6f9534d835cef6275b1c02e3233b9c44f4bdd0525da27212ccb250c409a61fa63b71126aabe7fc79ea5f84d8104dabe697f58cc1883baad0a5 SHA512 dc5c309683e5535f00e979e8085df9745a878f7ddd2f4298e70f32f566894d48aa971634328eb01a58197feac2305a50a7ddcaa6e05231ff09bb7b408d8fd39d
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.9.4.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9.4.ebuild
deleted file mode 100644
index d83ecf4b578e..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.9.4.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 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/qtprintsupport/qtprintsupport-5.9.6.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9.6.ebuild
index c2b1ed787e65..3484c5c647aa 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.9.6.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.9.6.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/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 2d3a140d3948..2ec64e6d8fb4 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-opensource-src-5.9.4.tar.xz 5945756 BLAKE2B 9b22cbed8e92a9264a67777cd18eee2f8b20a9f2360ea376948563933852015b9b44f9c94410c73f09d2f7958b61228ae3634a6c2e0ad5de7e92249f26196461 SHA512 62f7578fa5253e85b8cb04fec295e1044a6b5946e4041e758f788643aa3336c9c48300dafbd5ab21b0e4b74e184344ad62a9d06f3bcb7466fbea79b0e165070d
 DIST qtquickcontrols-opensource-src-5.9.6.tar.xz 6013760 BLAKE2B 5daf7e1cbf94fb6f532528b52c4b30802f27cf789b041251409ed9d730ed1539fab41cf1b94509ed63a21c479dce43c10714eb1b91cf0d2c2613a3890feb5c6a SHA512 1a48ede02a0a0ddca6475ec952684045638a61a0db9f545b8ad8b2115f93f3a5586655a24138545d168196a3990f2c6dbef18530af546c60026e1eac91ca832e
 EBUILD qtquickcontrols-5.11.1.ebuild 751 BLAKE2B ffe5e136301939ea58a170a7382281ba2efe195963e2b0af6c04d6e156e399c108424a606d5fefc7b3cad952f366bcf9dc473fae32bd2448e1569c8ddc1c0077 SHA512 9ad5ed5880f169fbaaa028349a8065e393ab7deaf37e1435b0d5fc76b51049709977436f4ba88c38d1e8e66284881c57bd9e9ce2a942894b4940316a7a2f4026
-EBUILD qtquickcontrols-5.9.4.ebuild 747 BLAKE2B 41e87081cd3ecd0b2eeba5db2253ed4ef667fe748320c8911a3f74da279eece1b5247e9bed2e1ad0abd9e2a0c7685726091a56aa95f182e09c1d917a99bfc774 SHA512 414b59b57e1917d77c03f584795438c157459920532372adcc04e13059a75fcf04892d5d6ae72621f679675e932988073b3ae0d12d915a5b524c086644ac0b07
-EBUILD qtquickcontrols-5.9.6.ebuild 755 BLAKE2B 49cfe8bfde0586f959c5b9b4588d7e0b901700d76263b54e452df081e508bd85d1869b6923269d14935d6fcc713d11428347126e79936a71e0aeace065b4255c SHA512 b510b9ab2eed4dfc30c6bebf64e7fa20675d1412e9ded8dbae11498492ec0d5873094f777cff07da804cc93e8c118193e9afabae220a366723f2015e58411bba
+EBUILD qtquickcontrols-5.9.6.ebuild 754 BLAKE2B c022ad5571b15140a27f2c24f26d296182d040fb7d312346061e6e19b3fb859fd3b10c6341e67206d9bd0946ccee449310cd6825755444a5699ce32d3d92b7cd SHA512 9e04b2ddae62747a64793e6c946bad58997b5348913e2dafe0b6b550bc2fb5e31971effa58ce4f445500703b20e485aad88c6aa1c9a2355de3c4b181675ab2d0
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild
deleted file mode 100644
index e01b5b3d3527..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.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 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/qtquickcontrols/qtquickcontrols-5.9.6.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.6.ebuild
index 4e45b1294e35..f52ee28da490 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.6.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.6.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 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 08d8a87f1838..93d56bd6f00d 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-opensource-src-5.9.4.tar.xz 4153488 BLAKE2B 39fab418b0875fd080228e8dc4103884d862924b2ab12d630303eae366294ec8c97b744db58aee1b00bc923d9abda1db4f7d73931699f3961cc2a28eac2e2e84 SHA512 17704cfd14dbc14d2971b82a81786bd7a5cfdd4e6ae6bc0c5b26c6a6a36d8391ba1ac9969cc5614c8d0fff8ed3b238ef57a481927f82fda509023838d3692762
 DIST qtquickcontrols2-opensource-src-5.9.6.tar.xz 4158180 BLAKE2B dca050d5c0939f51dbb8181d9d644e2e0c6d1e1937cd14146c16cf0452e027666ad8e4f1ba50ca118698ea4cf4afb4b7876dd562394e5f5cbd97de3d5384526a SHA512 46817c31a62de3cce4179869c3080e12d2dcb3859af9020fc476baddc184ef7a7b8dfb0ccd2501c72e689c5d64c3d9135eeb1f7dfc821f06aa124addc4dc4d7d
 EBUILD qtquickcontrols2-5.11.1.ebuild 605 BLAKE2B 386fa9c9e06b1ec5ff1fbbe204c3325a957ddc426c84a1ae2c85cb5943ead40195740a7becfc3054cd36ece82e2e6dbb45ce550138b6eecc9b32fca8e4ad7a52 SHA512 32a3b349c5afcc20162d2c42dfbf147eae4aa12a974fcb89add625f932d50f730ae3134aab0e3db143aea2dff2dfeb71970eae7a5b504f5e90222a8f7cb61a44
-EBUILD qtquickcontrols2-5.9.4.ebuild 603 BLAKE2B 31f03722c98ac29f541c1d8dfe6cee0390aaf5c118920d9bf2a442698790612d808e2ddd64f23065205ab76198df0894671e77a94e95a8fb0322460ff78219bb SHA512 7d8c43914e579c6e096590192c0db4ecd616e57cc18eda59e058aaf5b865f20cc7666211b11ebc1aee4122f8eda48e5ab403504d1e040a865f00cd766804c5d0
 EBUILD qtquickcontrols2-5.9.6.ebuild 603 BLAKE2B 31f03722c98ac29f541c1d8dfe6cee0390aaf5c118920d9bf2a442698790612d808e2ddd64f23065205ab76198df0894671e77a94e95a8fb0322460ff78219bb SHA512 7d8c43914e579c6e096590192c0db4ecd616e57cc18eda59e058aaf5b865f20cc7666211b11ebc1aee4122f8eda48e5ab403504d1e040a865f00cd766804c5d0
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild
deleted file mode 100644
index 53ac04d9af39..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.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 155803519d01..782a8596f99c 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-opensource-src-5.9.4.tar.xz 2612372 BLAKE2B 8213e2b70e23dfa6e42ffd0aaa1818a4794670de24fa5b30cdf4c7bd17f1a438d9d6a8bf9c03f2995a60b6e3ad6d57bf0273c6e1027ed3d0b77fc2987d285603 SHA512 e0c49e1286c4b1de6d197c42d8e4bcd82a5ea07e8c89f6f222fa62579b5d466336a5baa50372e5a9b514bd8be098e80f3793123cae09d7a923c4d1466b0e13c9
 DIST qtscript-opensource-src-5.9.6.tar.xz 2607812 BLAKE2B 3f11ae2270b1bdc6ac195a4a398754df16d4599211ba291fd0a5793cc7e586f0034f1f5d63a185541e35c744de1d3c8facf12bef2cbbf98abd94b3c27e40b6ba SHA512 2ddecda376b79edc8cfe9215a531a8f0b1892f3e6b39c298a679903c2600a1df43bb59baeed3392e92fefb476ec2ebdd2ffd351d14918fea00025d2cbd48da46
 EBUILD qtscript-5.11.1.ebuild 693 BLAKE2B c4497f6e0ad5f1b61c02d3ad897a621cf84bc35e915b8e6cd3f0165eff3688ae84edbd99ecf9394827514cc16e7c63c87440472604d7ad15edcbf3589e26fa41 SHA512 71e078d3307b6ab8c7358503eb64371498e05f697a8ab63ea8f9383701ef2cb9903294dc11a1720c71381a9cc75e0897cd894d99783c5d3c7fd2874ec611fa45
-EBUILD qtscript-5.9.4.ebuild 682 BLAKE2B fc04d73b06779e8abfec714ae6b59e59a72237b56fbcf48eb24a5cceaf9860e5fc88ad36b68d9cacb6dc470a795c7d783908a55b638b1e884faf4bd3a143df05 SHA512 91eb46966db41a9718404c74cc2f18b723b9630fbd9b2a3fbbc42bc2eaf0edca796a0fcb72e32731880a3c13631eb7b92241180161b94f88a7f5cda949f6a75d
-EBUILD qtscript-5.9.6.ebuild 690 BLAKE2B 85933bc17a6d6817771541ab39985d2b131cc1052a62363318d5f0ee275b7e0b28913d118c5492998b025a85d0fb7930e28dc92294a711a0c8d3e4e4326ff923 SHA512 3c100a3e1456da7eb1ddf8d2a1e73eeba7f0c4c16f048231bfa1351efeaf7d44ccab49ab8422269ea89785f2ab8b159a469722a2708ae4130025e0769580f2ff
+EBUILD qtscript-5.9.6.ebuild 689 BLAKE2B 3028a7bd5a9ff47f4cd1e197fc71bb08dcc23d0d51b896cd7ad2d112a7ee28cd55d43b64dd76152a36bebd7ec98ccb10041dadbb6ebd7a5335ff9307e6518388 SHA512 ce0b31049b30c774b682029069e29af0d5cc8612721aa929dfa885c79a3de80a86837dbb43332b19179ade60a41c13face0d2b7ccc3ce635d88b398540c57125
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.9.4.ebuild b/dev-qt/qtscript/qtscript-5.9.4.ebuild
deleted file mode 100644
index 54141c4a6bac..000000000000
--- a/dev-qt/qtscript/qtscript-5.9.4.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 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/qtscript/qtscript-5.9.6.ebuild b/dev-qt/qtscript/qtscript-5.9.6.ebuild
index aa0e1df6e688..c2f09aef1ed0 100644
--- a/dev-qt/qtscript/qtscript-5.9.6.ebuild
+++ b/dev-qt/qtscript/qtscript-5.9.6.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/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 5d5b5c86b67d..bc9eb3d62f2b 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-opensource-src-5.9.4.tar.xz 414280 BLAKE2B 6fcea56794febf65b7e21b79893e9c3a849278ad6d4ad24a8f8e272ec101fdee72fe29d21bd99b1ba4d977e52dd3acc026660ce6d5a6ecc684590a8d190615b7 SHA512 e000411b82dfef08fbd5fce601530548a9b5959a4980309434572ec3475e6bc9cdf870cb82bfd5208b533d66a7e46dddf52f5ceaedaf3f0d438c4a4c8260c9b6
 DIST qtscxml-opensource-src-5.9.6.tar.xz 414120 BLAKE2B 90458c151e42308d660556871ab4ce4972a2d620d9785d2f39b2c913d0fa35522be5fcc459838f42c93b6ad6d76a0022b85cd3cf367fcdb77004f199091e0d4d SHA512 d649a43b5d9b753c431120972be93a190583315045d724ea5149ba93a73aa65724eef8a8b0d33f48a543418e045961e91af1d068774a923469f871ed3a97d4fe
 EBUILD qtscxml-5.11.1.ebuild 374 BLAKE2B f8297445522e981b840f4aee9e954bdc1f77e10a5bb7a8731f01539d2bbeeb1f7564c5a8df64f5170e2a7221191cc00bae435dd78f51fc8187de474840804b7b SHA512 55bc53954466df3f19a7a1378736538a8156df60f838f9cc783bc833cb91fab8339aea34d344327723efc3a60270a6c2656ca2f7e32f15f090292bdc05596ce6
-EBUILD qtscxml-5.9.4.ebuild 372 BLAKE2B 7c3d91f44fae4d6c6d66a32247299e6ac27be20617c8c4dcdbddbb3f7b53cd7eade1033bb5013e7d3bbdad991f6a4be3ba8a6b0eebaf24d3c7194028f299f77c SHA512 ff3500bb2effa2c6f19bff568c373c461e2fecc48b7ede945abe3c8ec119bc00eacbd2a9c3bf35fd374dcea1fa6a476db859dc3e42aac02366ebc0b193852917
 EBUILD qtscxml-5.9.6.ebuild 372 BLAKE2B 7c3d91f44fae4d6c6d66a32247299e6ac27be20617c8c4dcdbddbb3f7b53cd7eade1033bb5013e7d3bbdad991f6a4be3ba8a6b0eebaf24d3c7194028f299f77c SHA512 ff3500bb2effa2c6f19bff568c373c461e2fecc48b7ede945abe3c8ec119bc00eacbd2a9c3bf35fd374dcea1fa6a476db859dc3e42aac02366ebc0b193852917
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.9.4.ebuild b/dev-qt/qtscxml/qtscxml-5.9.4.ebuild
deleted file mode 100644
index ca4f733913f9..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.9.4.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 43a4774c37f1..74e14c715d35 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-opensource-src-5.9.4.tar.xz 1994992 BLAKE2B a7464ea11b7e74cf491a4629058f142f9e85d57e08e8b7fd1708cfe47951d0345445f853c89f8f8d0e4700eaa452e0c1ea00f4ebe12eda643fe512afc7dd6969 SHA512 10b0d4595ced97888c28ddb36626657250ed839004ee61cbb244326529d25c181acbad774e7d40733d9ac48485320e72e52bf52f10f2a18089a6a4ce4fa3097a
 DIST qtsensors-opensource-src-5.9.6.tar.xz 1994404 BLAKE2B 38935553d7b765e2de9b9328ecbdca6c141c687742c6981b5174261122e568c5534c44b97d67016b33a1bfa47eafb0f04a89d13c1cc43296ffcb31174290c762 SHA512 1c82b0e02bc45c914fbc620049b2f4e33bdd0ff858c2f3946d134e4e5dc5927358ff53db0b6d9fcbb6811e36d2a816aacf7f852f377ecff47280ca592eaa92c3
 EBUILD qtsensors-5.11.1.ebuild 537 BLAKE2B e560851f2ddb5f429f5d760e1c287f6b6eaeae49013c02ae54c66c13f4ff071ab0665d411a7c53589ca9eaf77a7fa72165730deba2aa2f1617ce2ac831897e22 SHA512 e190d35f102385927cbef9d5b1d685e8261a96cfa3bec1cf7a206ce9405e699af15a31f8437358deeca205acdfadc8821a2e30eedecd20771ffd22d3c4613143
-EBUILD qtsensors-5.9.4.ebuild 529 BLAKE2B 6ea55cffff0218bf22db4721a22de169bf4b19aa56af940cf1cb615efb501a3b599e4a8e492d79d1a136fde81b4941b240d138cafccbb8a06daccb53c07acde7 SHA512 4d1dc97c80a8b984f60d23514db8bc13baf8006e08bf72f0c3a45deb75f9c140940e7b6bef4373823695c2b0a9ab526f16ab06608097fbffe3a0a08cb55aae55
 EBUILD qtsensors-5.9.6.ebuild 541 BLAKE2B aef09f5bdd62712082d440946a16fe453318b8a1dba16608857cf7f068c64f48b63310998ab30e95e07ce16a358f412b83e1f59482ea311c994c363761e75b00 SHA512 b2e06a87fbaeb95862f37eba18e95151e1b68034297468c3486204c50c3d47fa534bdfee25b44fa6e6751d4c1f6cc8e16f162e56cb3dc5af97c5a3983bdf2598
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.9.4.ebuild b/dev-qt/qtsensors/qtsensors-5.9.4.ebuild
deleted file mode 100644
index 861d1633b0e3..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.9.4.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 ppc64 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 8314bda383bb..a4fd0fa47109 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-opensource-src-5.9.4.tar.xz 279352 BLAKE2B 145154d86de8d968c26103c7eab21f2928e8666123c0d8ab20e9459bd86dbe54e70f4d83ff7f9c6203f078f2ab3ce21cd2d08ed268e0af29b0578d0b08e6dba9 SHA512 d4f09d67edc69b9063be114007eb7200ee043f37bbbad9bbe392249b37ec766bc2d0f5725e9af2df2fd68095ecedf71196ffaac30569bdf5ee2606a8fddc4321
 DIST qtserialbus-opensource-src-5.9.6.tar.xz 278920 BLAKE2B 34775b4aebaedec3e3a826c8588b8b167d617af2df5918314939d38604e3ef8781efa3e806824b93785eb527b3149fe1a49774d2bee12272e97d040f24ec0f0c SHA512 332edf0da83a20a39e65280c817b591b3b5b50710ae1dcce1bbe284233e20bc239584db634078697e87293a9811d1ad6f9d38b3ca7aa6188b9509cafe6672f6f
 EBUILD qtserialbus-5.11.1.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
-EBUILD qtserialbus-5.9.4.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
 EBUILD qtserialbus-5.9.6.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.9.4.ebuild b/dev-qt/qtserialbus/qtserialbus-5.9.4.ebuild
deleted file mode 100644
index c6a1fac19557..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.9.4.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 5a8ec58ca929..c57790fe278d 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-opensource-src-5.9.4.tar.xz 273252 BLAKE2B dc9a97465ac22521346da8d676ac31f48fbe1a8b1070e7c774e1d4ee8ea1fe713688775d590205e6149cd276427b35e7c503cfe5fb81cc0eb5063656ff92f745 SHA512 8eb6b850440e6e16ab0a9389259b15ccd7bd783755a6964a3d1ca07260821807c7a3e52237b69ed4e0e6333a74046b03c28e92a2e4e34c1140163af287b5f344
 DIST qtserialport-opensource-src-5.9.6.tar.xz 268344 BLAKE2B 1aa206d12e508474c7a7aae3d16923d80170ea739e1fed74de363fa42afcd94fbdaf683e85515d5de7086a8bdf901dd03f48ba949e4429e47dd0af176861c36f SHA512 a4f5230c78772aa8899471dea90bab38a1cc021c22737f959e1a6852d18e7faeaadba4d329e49b3c9a3b7ef5fea69febb550e7fb4a9d99902d0e80a144822847
 EBUILD qtserialport-5.11.1.ebuild 554 BLAKE2B 0cf645222636741080c2f3c17e06a8cfb66581831beadb655c1a055452679eb3c82862868008045285535ab27c33f8d44c94bf944f2ac448d3a3d5f570c991f0 SHA512 f4c4acdbda4f511fbd8caaf3c095ae4692fe0db9ea774325ed3c9a43e5c45e7f29a4ec07dbd92538d207bcb44eaa5bb0ca575f4b65ebcd0473a34195ba276580
-EBUILD qtserialport-5.9.4.ebuild 539 BLAKE2B c2128a79328ce2effe83b6c2135fc07a1e1eeaf00d85b4148116fc30b9e6a459ca7b66983b9051f9e027d7af5ab3e2d39b04b888a730e24a219f4ee092542ba3 SHA512 200bf31da4b42d7ac46e684b2218b94ddb415988967ea175321dba67f4327693db43d86093d13bba151f045d601baf242824802cb1920379b1d3993a4bb214ab
-EBUILD qtserialport-5.9.6.ebuild 551 BLAKE2B a55e5f764e904c9ac26cc85406dbbf19edf574ac4b2dae318983e4c2b0da92cd41609fcac902aab5d6035c18760cb1f1cf12810088c736d43609a21759918f2f SHA512 dac0810f3d86b12deba38d2d7b6334a3127a323b5da8c2bf4501e9b1483b995edbd0eed037996c1aaf668c1cd68c95e3258e47ce2ed8feea9aa5810437664c12
+EBUILD qtserialport-5.9.6.ebuild 550 BLAKE2B a8e99cc63bc703a5534375e984d4da655d52cf4a807bf8be778d46a363412e11066e149fbc0e042f929e18aee59edc23722eeb96208490489f57e37a1d47b730 SHA512 c6301e4b704a20316eba844662109238d921524827380c4092935452eeedc170bf6d04c8085476956363e0e5ec0dcdad1e1d2eaa1e27bffeaf6017462232f321
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.9.4.ebuild b/dev-qt/qtserialport/qtserialport-5.9.4.ebuild
deleted file mode 100644
index bccdd88491a8..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.9.4.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 ppc64 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/qtserialport/qtserialport-5.9.6.ebuild b/dev-qt/qtserialport/qtserialport-5.9.6.ebuild
index d7a5126cc5f4..fb5436b70c62 100644
--- a/dev-qt/qtserialport/qtserialport-5.9.6.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.9.6.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/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 200dd428765a..1ade226f0b2a 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-opensource-src-5.9.4.tar.xz 80860 BLAKE2B 8556d375edc5bf0e3edd9745cef6bccab3e2457efee1fa4cc3f6d4feb90da3f651135ba9034caac474ef2e9888bbb3a41771d85b4f8a13b16867ba516a42f47b SHA512 6e2913b23c57cb0dd407b09db78fbb9b6b15c721f6d7af65c744d71f8a66f235a1069b1098eb5cd8b35449255ef94af2a96b2c4a1c550fe0e03000e023c393d9
 DIST qtspeech-opensource-src-5.9.6.tar.xz 80716 BLAKE2B dd7b7fc52394cb9b9a9f31de3f08fe9efadc03694604f871f802b465a1bea6753be9ec2bd3843296403939dd2ae0b7e40e910b7fd01e0f8a17f82517531356ea SHA512 0a07c7cf0e58388f4fcd197d6b8f3b6a84a618974d725fc03847ab42b814dfe9e44025e8adcc5c66d9c7bb156e6b6e9457a62c8d2211e45de1ae27d89697e333
 EBUILD qtspeech-5.11.1.ebuild 478 BLAKE2B 258c4717dcc4774fd9fd621b5514fe8d042be51c7042cc2c9a8a17aa471b839a92026886384d5f9a53afa23285e66727c611f832dc60ebb0fedd97dd29680986 SHA512 50a9e1c505337b086db5b9ec4d734acd18559c768732f161aa7b936b3fb5c29866657bcd96995298440431881913892eca7e60447460ca09e64bad9f3155539a
-EBUILD qtspeech-5.9.4.ebuild 476 BLAKE2B cd2475975fd575808f8a4b377a27e1d06a2dad24b116a13151043a4d1d5f7b34e8e0b8f21cc1c05c9495edba49b4b9422aae30b8f34f2465d29d3472620d4388 SHA512 70c6608ebd1f2e986eb55d4a82b7a035a5cd5dee458200e0853833e7afa0926d8fd8f675247ddc38bb89bbf6b626dda226ead53ced0f2ecaa4b240eb204813da
 EBUILD qtspeech-5.9.6.ebuild 476 BLAKE2B cd2475975fd575808f8a4b377a27e1d06a2dad24b116a13151043a4d1d5f7b34e8e0b8f21cc1c05c9495edba49b4b9422aae30b8f34f2465d29d3472620d4388 SHA512 70c6608ebd1f2e986eb55d4a82b7a035a5cd5dee458200e0853833e7afa0926d8fd8f675247ddc38bb89bbf6b626dda226ead53ced0f2ecaa4b240eb204813da
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.9.4.ebuild b/dev-qt/qtspeech/qtspeech-5.9.4.ebuild
deleted file mode 100644
index 3b552c0e3d17..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.9.4.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 3073154b30e2..d67db0ba58d9 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,9 +1,6 @@
-AUX qtsql-5.9.4-mariadb-10.2.patch 1187 BLAKE2B 1ee0a4ad020a1d0e5bcaa19ac987eb5b472f9701adf876024003e377ca40060a52323bdfd3ec8213e6e8e199336bbfd92c7aab716be38b46fd105628eea447f6 SHA512 3ad71a5c3a31bb60484de09bb6503fd1c35f6e55aa2116f5ea468314a3c72cc43ddcfde6da01f479f91c381fbf2f2e64024ab88cf0e8f2e0a3edbda45bd44609
 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-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtsql-5.11.1-r1.ebuild 1511 BLAKE2B 3f6739bbf341be963b37c5fd229da3c3500becbc7ce50d142fa96d96bef17787b6affb043d67993ce1e3675ffb6ba785102b6d5765d17b1ab9e78dc667543717 SHA512 64ddb7416cf078ae7768cdbc5dc074970d8da6d22b5c57c1bd6acec6426291c0d96a24bce1fa616cd2cd524fecce97c08c3059684bf403d4c7329c740f86c176
-EBUILD qtsql-5.9.4-r1.ebuild 1576 BLAKE2B e87c3461b70676298963c099fa518a622e05cf054f5dfebb707584ba6c629c37844b3d29c5dd846128f38295abdf26b016347a2b34ff9b1592dbcda74d89fdd6 SHA512 d33dca9366dc91e4410eed715aa3e31028dfc4be35f3cdc9dc266d3a83ba12c77e210362320a5e78ae9d9f8d3e77ea08cba9409b4a79e1317daa1aa7c7f8569a
-EBUILD qtsql-5.9.6-r1.ebuild 1626 BLAKE2B 80f68dbbd6573103ff44d0dad2331c028f95e0f5e9ca4eba42266256e1561e07321e06930cf8dff853c70cb31b98b58fd14bb22a9f499c616d457c0160f5fc62 SHA512 81f453028b918f0e37c87346ab5e3b7aeba82965b21b87f1efe2fd5d32ca9c1b605c4b505e2f62644fa594c6719f84261dcc45bbeebeaa97929dae4dd0848d01
+EBUILD qtsql-5.9.6-r1.ebuild 1625 BLAKE2B 28b3b4d38223284cb2469d987754c9c7245449d64cfec867b474f935c4135858b1847926eb78d9700c8009615ca4276342fccfe5166193ea8460d7fb479562c3 SHA512 82a76b2e4c180844883edeadfea697bed04d699f35d72e9abf4e7139c087a99d4a9edcdcc60fd783220f7ac508dc2334a8a24d11d72f28c9af7154aefaa3ed5d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/files/qtsql-5.9.4-mariadb-10.2.patch b/dev-qt/qtsql/files/qtsql-5.9.4-mariadb-10.2.patch
deleted file mode 100644
index bfd0c903bc35..000000000000
--- a/dev-qt/qtsql/files/qtsql-5.9.4-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.9.4-r1.ebuild b/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild
deleted file mode 100644
index ca002e4eca0f..000000000000
--- a/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild
+++ /dev/null
@@ -1,62 +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"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 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}/${P}-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/qtsql/qtsql-5.9.6-r1.ebuild b/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild
index 16fe859ba37c..c40771bbe943 100644
--- a/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9.6-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/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 0472d4f08c27..f4f0332e1b17 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-opensource-src-5.9.4.tar.xz 1778072 BLAKE2B 077ca02c7a43cc5cc6170e0c24ee155e3d190033837494c58804934881361f738709f0aed9d876dada19c48b194624b90a759cf509c9e1fb9c566514a4f5c430 SHA512 242a471ba8b1b3fe45d53e0dbdd2bcba0ffe129f7658fa3608fb0f8ee72bf56244522861c12315eabc401f389031bea2027eb106eec67688f141ea8550b6b2b5
 DIST qtsvg-opensource-src-5.9.6.tar.xz 1778688 BLAKE2B 30084cdeaefef6c15f07fbdb9373b9cecb87fdd9676c2d89061a371439ec0c02ace2fe65b0061e518de6a1b75df9edf314adcdb6ffdc03c7be29424c92784d25 SHA512 6e86f050c07621d628f6e9440541be1fd80b3e05b034ba17bb5068afd4775d9ee08d7bf11d2ffdf03da2cb8ca66bfaf2f59b7e5e76acdb1a1e2ec25af25c65b4
 EBUILD qtsvg-5.11.1.ebuild 478 BLAKE2B 36035c3a7280cca642a157ee5792bcf272bcf4b3ad1b4ddf8e09964360e3004bc0d2e3ff86cd50b2bfcb71a071468d88f59ed3d885cc85531855a40b763619aa SHA512 c5306dd98f1c4293edf9499deb15e14af155e287372420198b6556d7b40753a9e4d4fed56964e0d532c78581776fab18d6499bf96192db887032bf5ff85d9925
-EBUILD qtsvg-5.9.4-r2.ebuild 491 BLAKE2B 1f78d69d00c5ff09b09581769de621315a993c709ed19c09064fde88008c924d0ec59779946d3b3f6385787586a406e63cf91b1db33dc531fb02574f296565b4 SHA512 0eee956fca2fcbf1b2ec2c934e0c76a289941ca7112f37cc66f41807290a3e640299972e5239bc8682d87ebb639ce30db27d6b0c34184d5f4c21ad01d9eabcb1
-EBUILD qtsvg-5.9.6.ebuild 475 BLAKE2B a16324e9da2dee7f5f611f449a29b70bcf9cf81f1af5fa8989387eb4a8890d0856242eebad26b791c7c145ca4bb96d894be0665c37fa6d4e7a3be873483cd412 SHA512 fcb7fe8f587d997f5de141f0851e2f49651778f4ea3517ba20b1c413c7ae056949c8054fecb188b12350839f6f55086ad1058573ff2d76764697ed5913b910c0
+EBUILD qtsvg-5.9.6.ebuild 474 BLAKE2B 5914a4da775446e7bf2034f16517e7e57e7d8566d24eaf5aced617be529572d7eda6940f68f76cb1aa3b09869cab541af5ee940c1ea08cd0444e5de66e30a2f8 SHA512 d0a04efed3a5352d70c78f6e4e93059ee2dfb61c1feb064b4e3d1cb6b421b3d08fe1e6d692428b5aa2980ea0c0732d91bceb3928509f6f045558c3ae81d4dc7c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.9.4-r2.ebuild b/dev-qt/qtsvg/qtsvg-5.9.4-r2.ebuild
deleted file mode 100644
index 9fe32a7d8818..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.9.4-r2.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 x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtcore-${PV}-r1:${SLOT}
-	~dev-qt/qtgui-${PV}
-	>=dev-qt/qtwidgets-${PV}-r1:${SLOT}
-	>=sys-libs/zlib-1.2.5
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtxml-${PV} )
-"
diff --git a/dev-qt/qtsvg/qtsvg-5.9.6.ebuild b/dev-qt/qtsvg/qtsvg-5.9.6.ebuild
index 526f0641faeb..1cf841d6acff 100644
--- a/dev-qt/qtsvg/qtsvg-5.9.6.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.9.6.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/qttest/Manifest b/dev-qt/qttest/Manifest
index 98c85547b446..fa140165ab90 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-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qttest-5.11.1.ebuild 556 BLAKE2B b4129e403c03f101c3b28bd82b0164852c35f2cdb4f919892386c7a2d9836e55c4a9b13d4f6dbbdf5b1f8564d3ee291765061fc20575b250e4b81e6046dc920d SHA512 49e403932475909d751e1a31f5767d0764bb01d639a99c874774bae23232d15243a4e8de32d9e5f78eb74c50c26281829b83edbdb2aa79e099de137b1c1a4089
-EBUILD qttest-5.9.4.ebuild 545 BLAKE2B 85bbb66b553452f36b6afbd85eeb571008e7b9e0b243307a1cca65068f8ae7e0f50d2d9c65b65d4b70af4966495e57a093382d05afa69b112b0974c1aa14a224 SHA512 50a40c8669a267cfaaed421d9e5d48b22ac6cfeb502bc63b49abba6062f022b52c8141868c388a1a3c1f9fcf819070f29796fd0d229090b9a3eac39b8a4dcbb6
-EBUILD qttest-5.9.6.ebuild 553 BLAKE2B ce63af2624045c63a16a0f98b8bccb93b516875e8fc1688d0d82401ecdac02a06bff444f5a9ec31ca93e8e34a18b1eb3d59ee63e7aa6eb3b7f814ea85559f6b5 SHA512 5cc3876fc9cb88479091202365a3068f579bdccd28d5ac1da140e295685e78d7a0becc2c1020a029cd23fbb5a012f14634757a2926d18c5bb73869ced7f15ab4
+EBUILD qttest-5.9.6.ebuild 552 BLAKE2B fe51f031dd97723a5ee0a604ef97d7f8bdeb505f503859ea75eb3e13b21d50b6c17d58aae95c150d13ad69eb00c97c64abb3521f7cce3117ca4dbd61ec9050c1 SHA512 2e6f78f49900c3df26238be8d56dc4174b0df252b9fe55466c6ea1dac13342ccef5db5329404bba9f411a1d39d6ae2729c742283c579fb5197a17350463cc400
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.9.4.ebuild b/dev-qt/qttest/qttest-5.9.4.ebuild
deleted file mode 100644
index 2cedc2d60395..000000000000
--- a/dev-qt/qttest/qttest-5.9.4.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 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/qttest/qttest-5.9.6.ebuild b/dev-qt/qttest/qttest-5.9.6.ebuild
index 459b0bda1906..1c9b54b7cb1f 100644
--- a/dev-qt/qttest/qttest-5.9.6.ebuild
+++ b/dev-qt/qttest/qttest-5.9.6.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/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 43cced9d339c..ce8f4f680927 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-opensource-src-5.9.4.tar.xz 1451972 BLAKE2B f859c764d63673866bc8be88d4e5f9e2956b3bd08a883268a0c9cbca45a7132578a87b98eadf592944864da2d70cbbff0b46a75665faaa72c4f6a723f203cdb6 SHA512 74375ee78e40e8de2349e575306c729d90d80de089f44d4ff57506085c748d5eb5d0699a769d4379f7dd23c48ab88b7e5a8227044ce07d6ae12b0d3ac19450f0
 DIST qttranslations-opensource-src-5.9.6.tar.xz 1376088 BLAKE2B f85611a787fbbc5820bf0b68773ab9be1edc2f659c7861c6d8bc8158c0ca495f882dd2201406315a1f5c3caf7b4dd87b2178362e4ee9d5523112c55f590a6fd8 SHA512 caafa6fb865c73c1c43ca5d78aab21925d5cf836b3e9d8c10ac699a96e7b583e85f12101a79a55102f8d404305764acadac599cf84b97d03582684f3b9bc4ec7
 EBUILD qttranslations-5.11.1.ebuild 379 BLAKE2B 983cfd8e6e4342992f7d945371452484b3208909b390595036f98cac87d1199f82ff53f12c449eabdfad1dc4f4f88538b2a77490c20dbe1ea7f85b85eb28fc06 SHA512 66c2e18d13961fcaae9ca45a04772f13e18a08f1097ae543a4b2828ad9d8d91526259fb978d2476b67804068c8f3b48466ab2f1fd840debeabf43174111201b1
-EBUILD qttranslations-5.9.4.ebuild 375 BLAKE2B 1eb759e922cfdd8c16db5a2a275bd51b700369aaa0cc660cf80996506826f223dc1441c817bb5bc7ca2ab4d5eca57e71d2311821e257fd4371e254b3b30d6fba SHA512 6d72e2552b8fd5746029c4d76e43fa62162e520eed2a091d2ef605e9b6ffbede380dc9d6b6ac64774b309776346cbb6e71a889d1d647ef23d6700a28ae29e8b3
-EBUILD qttranslations-5.9.6.ebuild 383 BLAKE2B 06388185d527fa4ab31547c4671e15abdb3c3d9bf2334024bc9494f76464c14af8e68c99e99a551b2fe5f0ded933e0d412048d42c2e032a523d7e289987dff24 SHA512 412da157c749efcb7eb345958a863e545cbc7400cceb462761afe42902576a4c64bb2007e50554908f14f9158a73b2c51380fdf2fba9e319ae41a2b683306714
+EBUILD qttranslations-5.9.6.ebuild 382 BLAKE2B e48cd9bfa6760084f270ff2ac59a5e9ffc2ffa8b8987a595e78796c63f55c499bbabc8a24a66a44855554e46f82c89c7e8864b53b602606292a6a706deb278b5 SHA512 09a02e30a4c555daf85a1f361047f90a08d85231ad8bed7b85ae5a18dfeeeb56663f88cf215e46286534d96c2da2e53640169db3dcb43b77f3e16f91880e8c4a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.9.4.ebuild b/dev-qt/qttranslations/qttranslations-5.9.4.ebuild
deleted file mode 100644
index c404aeb37701..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.9.4.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 x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/linguist-tools-${PV}
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
diff --git a/dev-qt/qttranslations/qttranslations-5.9.6.ebuild b/dev-qt/qttranslations/qttranslations-5.9.6.ebuild
index 454d9326a4bc..661ee28df2b6 100644
--- a/dev-qt/qttranslations/qttranslations-5.9.6.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.9.6.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 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index c91803f51de3..2e49694e9c04 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-opensource-src-5.9.4.tar.xz 10026856 BLAKE2B 7097d8243d11bb7b3cbc9f85cb124ca587e6652a67877e3c771a5c5dcca9c20f952474ffe8ab434caa6d2620e66e381829dc23e3dec927c1776f31a76b599d30 SHA512 6c10d3432cdb61a800c0eba436e135908cc44b5d36d14c93230e7284aae6fd671e116ddb976e610b37c4251c0b6ce4325be4464fec73d042eb9e9f29ee4397e6
 DIST qtvirtualkeyboard-opensource-src-5.9.6.tar.xz 10045984 BLAKE2B 22d15eb3a6bdf8fa490eb6475785ca88a0c9f07f25e37c41d9d0171de9af71e3124567184a41c7b4e25a49edd8f794325a0cf141d8fd7f9491096b7a3bc5245a SHA512 a46dc3c387530f52be0b1f989a9bf9d01e363668d3e57142c40588b72457eda2bca2f3aca765a23db0359d070670bb6583a6c91d960ca7d87b118397ff453e5b
 EBUILD qtvirtualkeyboard-5.11.1.ebuild 1018 BLAKE2B 5d12341e9ad1471f01d690b428e0c197951744a3bc67ca4a5cc0403825b1eec9518eac44d531f511558f63889ae7bce2ae19c3281ee8eb195c3b419620efc109 SHA512 2b63dec804b4583f9bfe66f4babb537b2bc408bd8e09dd25c1f63a67c9d8d6a03e251f56bdcf05a3909a680d0a20c9280d7036de5edf1afc68f5bc8752296905
-EBUILD qtvirtualkeyboard-5.9.4.ebuild 1016 BLAKE2B 5260dc083a9159dcb1b3948cdea26e7d0ad6ff17322830876a90352b9955b3514e62412403cd8592e13ec4131ec4ce304b5d19deefbdf1e761fd2deb34020243 SHA512 c546cdcb5d1ffa3bd637558aa16a7147979aeb7a06e3bb49bc34754dbf70c8138d7aed9c08ea2feca4120b495dac880b76c2cdb3b895e3e82750469e19fcffc2
 EBUILD qtvirtualkeyboard-5.9.6.ebuild 1016 BLAKE2B 5260dc083a9159dcb1b3948cdea26e7d0ad6ff17322830876a90352b9955b3514e62412403cd8592e13ec4131ec4ce304b5d19deefbdf1e761fd2deb34020243 SHA512 c546cdcb5d1ffa3bd637558aa16a7147979aeb7a06e3bb49bc34754dbf70c8138d7aed9c08ea2feca4120b495dac880b76c2cdb3b895e3e82750469e19fcffc2
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild
deleted file mode 100644
index 770ad2ccfbb5..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.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 7d96fe6c7671..d7f4f6b310ff 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,8 +1,5 @@
-AUX qtwayland-5.9.4-qquickwindow-crash.patch 3408 BLAKE2B c37b4bf3612509d08de1437181db18fe0c5abafbe447010ec092fe7657cf6b2536e2cb181a3741f52eb4dff30c39946602861ecf6916a9a4b6ad576aa7d24a72 SHA512 33f660550904e2811d8f2816c7e62020a342007f6ea444bd62a3560a74c1f5816a40c99df42b5923f4871b10828c8bff5155fa197db1f1cb7432ead02cd56477
 DIST qtwayland-everywhere-src-5.11.1.tar.xz 392200 BLAKE2B 2e65c6bd8c9ea44ae84f608312db6983d540382bfb2a22412fe054f4e7253d70e21f4d0577653b246de5b0266271e40911a7c79fc28b266cc29ff30669df280e SHA512 dc1327ef8cdc9ed9521e9db316da0bcdbe9639b714a2dda7a792c52ba5897ddb75deba1ab89e010bc05cc2a96ede781b9990f5449ce4a2f85e15466a4d6d82ad
-DIST qtwayland-opensource-src-5.9.4.tar.xz 314932 BLAKE2B de90fb47af0d07e0b6476b84de2f51900e4e09ecd57aee800534998d3a2e733501da877f912c4b0ce671d417f543eb44bc1607225af0a134ba5702d17efae431 SHA512 93d43bdcc39fd471cdd335c0699c5e5dd77cd0bc2d15f2a1170d8ccd103d84e2c7e657575a370ac6c678b52c2b617fb2c80ce4d226264cb6c857064452f7dc10
 DIST qtwayland-opensource-src-5.9.6.tar.xz 316152 BLAKE2B a1ebbf98eea9ca36f8229ed0bdfdeb79eb9d1519ff35eb153d7f8b7af2ad9831905e564464ec1faf793a7b11088d43d6dda6dc21b36943fccb569163c119a30a SHA512 7376f76001323d7971cb3be7592086b26c855d8d702184e84f28656b4262a9780b4cc0a0991c97ca011863570b6abd63b006c78021934e1516be65715f82ae4b
 EBUILD qtwayland-5.11.1.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
-EBUILD qtwayland-5.9.4-r1.ebuild 973 BLAKE2B 11a8749fecdbc4fc8035ad2001dd4614e17d2577f194d6ba10a02fc5929e31e65488e86857498ea822590b098295722938096c2901c391cad97e78ab0c477de8 SHA512 7288dd998a999c98eb2053f21c82f9d0518ce6d79a6992bea0b1a58c6bfedcc530cdea0e0b501751df0e07c8afdee4a21a6bcadc945cb8dcdd0a07cb6ef2e4a8
-EBUILD qtwayland-5.9.6.ebuild 911 BLAKE2B 3310f8c17e47b6defee1924846eb606a35c02b4916a1b985726a2426664d14765e946c279a185d14077104be6300229700071a4e0d27fde4b7b29acea0f8a7b5 SHA512 7f3b2aa96bdabcd928d13e3d91c65c55a0aae5b18bb39ccb215cb47021c58bd59243bcf7e6cf3da7c82a383b1b1479dbb19034a3f7950e593c0f70ec13e006de
+EBUILD qtwayland-5.9.6.ebuild 910 BLAKE2B 43718b86e317b59b1940328d13c634fc4283f1c307b16cb06d49a1d0c8a94fb5c7f1e02e99706e2efa403b3ec4d7bff193513669af94f641281849b4d47b8528 SHA512 4085dd400ec562b46b0f1117ad52f269e726ed62e6a8efe9597193074dccc162e9181a9d7b06eb7922e765d8a2ad3bb2c87a3cd24be31f1b4c1b9125d0d6580f
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch b/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch
deleted file mode 100644
index 40f2a6dff4e0..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From bf09c7a1493c01a65ee0f110b37a04e653edc08e Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson@kde.org>
-Date: Wed, 3 Jan 2018 19:18:42 +0000
-Subject: [PATCH] Don't recreate hidden egl surfaces
-
-QWaylandEglWindow deletes surfaces when a window changes from hidden to
-visible, presumably as a result of us not having a valid wl_surface
-object. By extension it doesn't make sense to create a surface whilst a
-window is still hidden.
-
-This fixes a crash where a QQuickWindow hides and then is destroyed. In
-QQuickWindow destruction we have to create a valid context in order to
-delete any textures/assets owned by the scene graph; as the wl_surface
-has gone this causes an error in the EGL libs when we create an EGL
-surface.
-
-Task-number: QTBUG-65553
-Change-Id: I9b37a86326bf2cd7737c4e839c1aa8c74cf08116
-Reviewed-by: Johan Helsing <johan.helsing@qt.io>
----
- .../client/wayland-egl/qwaylandglcontext.cpp       |  2 +-
- tests/auto/client/client/tst_client.cpp            | 37 ++++++++++++++++++++++
- 2 files changed, 38 insertions(+), 1 deletion(-)
-
-diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
-index 2a9e39e..f4dd6f4 100644
---- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
-+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
-@@ -407,7 +407,7 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface)
-         window->createDecoration();
- 
-     if (eglSurface == EGL_NO_SURFACE) {
--        window->updateSurface(true);
-+        window->updateSurface(window->isExposed());
-         eglSurface = window->eglSurface();
-     }
- 
-diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
-index 3897bd3..aed601d 100644
---- a/tests/auto/client/client/tst_client.cpp
-+++ b/tests/auto/client/client/tst_client.cpp
-@@ -35,6 +35,8 @@
- #include <QMimeData>
- #include <QPixmap>
- #include <QDrag>
-+#include <QWindow>
-+#include <QOpenGLWindow>
- 
- #include <QtTest/QtTest>
- #include <QtWaylandClient/private/qwaylandintegration_p.h>
-@@ -112,6 +114,25 @@ public:
-     QPoint mousePressPos;
- };
- 
-+class TestGlWindow : public QOpenGLWindow
-+{
-+    Q_OBJECT
-+
-+public:
-+    TestGlWindow();
-+
-+protected:
-+    void paintGL() override;
-+};
-+
-+TestGlWindow::TestGlWindow()
-+{}
-+
-+void TestGlWindow::paintGL()
-+{
-+    glClear(GL_COLOR_BUFFER_BIT);
-+}
-+
- class tst_WaylandClient : public QObject
- {
-     Q_OBJECT
-@@ -149,6 +170,7 @@ private slots:
-     void dontCrashOnMultipleCommits();
-     void hiddenTransientParent();
-     void hiddenPopupParent();
-+    void glWindow();
- 
- private:
-     MockCompositor *compositor;
-@@ -409,6 +431,21 @@ void tst_WaylandClient::hiddenPopupParent()
-     QTRY_VERIFY(compositor->surface());
- }
- 
-+void tst_WaylandClient::glWindow()
-+{
-+    QSKIP("Skipping GL tests, as not supported by all CI systems: See https://bugreports.qt.io/browse/QTBUG-65802");
-+
-+    QScopedPointer<TestGlWindow> testWindow(new TestGlWindow);
-+    testWindow->show();
-+    QSharedPointer<MockSurface> surface;
-+    QTRY_VERIFY(surface = compositor->surface());
-+
-+    //confirm we don't crash when we delete an already hidden GL window
-+    //QTBUG-65553
-+    testWindow->setVisible(false);
-+    QTRY_VERIFY(!compositor->surface());
-+}
-+
- int main(int argc, char **argv)
- {
-     setenv("XDG_RUNTIME_DIR", ".", 1);
--- 
-2.7.4
-
diff --git a/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild
deleted file mode 100644
index 5a6da39c498d..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild
+++ /dev/null
@@ -1,41 +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 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}"
-
-PATCHES=( "${FILESDIR}/${P}-qquickwindow-crash.patch" ) # 5.9 branch
-
-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/qtwayland/qtwayland-5.9.6.ebuild b/dev-qt/qtwayland/qtwayland-5.9.6.ebuild
index 9cbed2819213..c112fffaff34 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.6.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.6.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 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index cfa3762c8bfa..e95949d23268 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-opensource-src-5.9.4.tar.xz 147456 BLAKE2B 703bb44c12bb856f311561c772ebe8b716dcbae9f75ac47d7b702f459d47a621431a5eb2cd15c44f60c8f178d6fb6d8405f1c79c5e5501a28ac566298959b58a SHA512 932b56c9e9944e0f639163c4e484ed5260bdc7a186e81a2a6cfa113d14892414cd5b81f2767132695fb2f251c91e4d5ec9711cba10983215baa6e8014689dfbb
 DIST qtwebchannel-opensource-src-5.9.6.tar.xz 147564 BLAKE2B b94d420e8b694aef37c620ccc2c8dbff31887686e8afd70ff547e7466a6dff21457872b6a2aafc15d676005db85b202fb8260529d94078279e5ec1cd3d9e06be SHA512 f2c4ceb7efba18ffbb2b3bf11b04c158c601ce82eadfcadeccbb81405db0ff2275fe4a5706872adaa6faa6ab2c1f1f6b6fdeeeb09e127e3b9dbfeac5a4eb7ab5
 EBUILD qtwebchannel-5.11.1.ebuild 572 BLAKE2B f1c0e3733716fde195c07c6b5902259a7f036552727a4ac893c683ac6c1ab09b82ded3ca27f1ff5bda111830112fc73c7538f9b015d7c8389bcc8990683891e7 SHA512 f05966782c48702b6523f159d3b5d138b4c85946ee947834c4fba0325c2260d5e633b0fadf5a43c7ad60d678e67864bda3556c35ed5dea8ff16a9ad8d8b6a1b9
-EBUILD qtwebchannel-5.9.4.ebuild 564 BLAKE2B 841c1280a0faeb5fe4d2df74b87f359aab2152272e56286a7faf7af0206247a15a50f979a252c2b57a5acb9b5c72991ce3d9582fd4471c2132b465532c935afc SHA512 24facdba59179122b01c05f03d67ddeacbc6d2333057ab36101685128ca80037e63e11d74752236c4cd83a573d74c75f2d94e3a7165333cd7a295ca2fade415c
 EBUILD qtwebchannel-5.9.6.ebuild 569 BLAKE2B 4d7267cc1d6fd82cc808286fde721b94bac1832c90e2068f6881a7d22a5d34a37456874facc9ea2ae9e380ebbd6f4e80dd5966e84a0108725b0dbd4d85c976c6 SHA512 b904499212ae7397168316e94742abe5e8584bbcbd0a5a15f4c1f1a50e874a18baee0ee27c3645cae9f20d55028ecded5f45f28609f9d8c1289537fb33e42409
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.9.4.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.9.4.ebuild
deleted file mode 100644
index 4ab90dad0123..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.9.4.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 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 50c28135c0b4..fe8506b3fed3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,15 +2,12 @@ AUX qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch 2517 BLAKE2B 8339
 AUX qtwebengine-5.11.1-ffmpeg4.patch 1261 BLAKE2B 1c076c83921f223b6001d2bd71039637ffe7cab8c2f88c3ba6aa78a4ec6f8cbfc6fcdba6a89e8c8cb2d6e8f38dc06bcd28e9012931632d7af2d0157bdaaa1579 SHA512 64c64db96b1270d157c08fe572cde7e559700ced28b5b350a46ce1f1f0007a871f165547ef8a2d26b2269bd592b92c3aa2655618917c4f3c2d4f02165eef2c91
 AUX qtwebengine-5.11.1-libxml2-disable-catalogs.patch 1609 BLAKE2B c3683d221556c6051874c7a7d9d36caaebd86a9689682a19ea8f16df68ff9403a5d182a33ae5bc9b5efbb485bbdd335e81757642f1a71f562fb3ae2533af5d67 SHA512 284fbee4559a38a64e7426be272f4d4362613d8a55c6aef2123c12ddfef3f5c2cfb534bd11ba4c698b6c2bf29bc58fb4c6a06eef7bdf7e766d99673c2434dcf5
 AUX qtwebengine-5.11.1-nouveau-disable-gpu.patch 3710 BLAKE2B 880d63b7552973cf91bb1411f92ab3ee2d88013f144bdfcc6b5e1eec1d886bf76ab2166bc7600212701031da63a69ed2f5e03a4bc15549834a9a770ed68f35ef SHA512 a0b9592201d950ae97b92d5d0161ccc5bc675a37fbf657fe15ea0fe12870a370cf3ce54f5f033c073af23defded5c4ad0b43993c5b559024b285c5341b4673a0
-AUX qtwebengine-5.9.3-icu-60.1.patch 664 BLAKE2B eb36ee21a907677d6599dfd7fa3960619492ca0616cace73e475ceba64b1f43631d6f81b303801d934dc6e4a71bf7dc4c4b43fc73d3d048ca51bd7ceea13bc68 SHA512 9652916b675ae2d94f761ebd1e13effbb7545d14bda130a61122d082ea7e826da1be1d22d9063f5e3a4a3b2bb3bc51edb7a98a51869ec8bb9db9089e4c31dd5b
 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-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9
 DIST qtwebengine-opensource-src-5.9.6.tar.xz 216733460 BLAKE2B 6f6f4d89559899b7faa6c8a31187967e5dab357d63f6c096953bdffa9ff8e8299f22f3fe97bc5295093a89200b38f47b4b214ff91765f8da3a992c5058f06e1e SHA512 493e9b4fb7274253eca107bfbb6ff044068c78997299c48b62a504ba5511c4d3e2a7f481d986f34c75d035e4804b18f74bf6a4bf0daf0f6a5778abd8aa7ee68a
 EBUILD qtwebengine-5.11.1.ebuild 3568 BLAKE2B 736d9eceb5303b8cde3e5d27a43614384bb5721b2a2b1be188b74573c4dc3c90df0bfb52c3bbc562cbe6243a0512bd294aa9bfc307ad93ab1d639d491ac484d2 SHA512 b80cfda48edf3e64e008ce9f6c812e684fe18ac9bd585e9a3888031638b88bc314472612326b3643e7b4158bf7f3fc04d7ab4ea96d271955f14e015f73df0f12
-EBUILD qtwebengine-5.9.4.ebuild 3228 BLAKE2B e9028450e30f0ba3d9756ed933b03182de04e38b4f465be7256c5d9d40c494a8b6e35758b9028e532347423123a814867e95a308511a1a6bd7fc0117b0b7b67c SHA512 ed99c3d3ff0f5b3bb49cd78bf5463852b42f44775d98b6fad0412b4ae0f768ea5cd7d96562cb7c261e6e3168c4413233b2ec5a973ef2d4c48e4492c99415ac57
 EBUILD qtwebengine-5.9.6-r1.ebuild 3411 BLAKE2B 146d96022668be866f724a8905c82ed139a517cb68492dd97c554c3389e97b7fa4125afa5b4ca343fe4057bccc9efa25566ebf76d26d9e40b43968838cbaa96e SHA512 6d84cc73e712355e3c0069d753556f0f9e8e64a89a4574bde151bc776fecc67f01923c973af64258163ebe9d5950582c6bb5fd02ced78c121f86e3c6907a7066
 MISC metadata.xml 1096 BLAKE2B a4b3f106b5a3ea4468e6b1b5b458b69f310b0a89b02ab6720d13a6df727686570385f065caf84e782a4043b9027823dbabc5ab67fec209db97139aad64aae1ed SHA512 e3864852c1da88f27b5d384ac2b63b2e93551db73242be03283dd2a23dc27835f05cd7ad8655053b24a06a7d402c3ba1142f49d3ae72a2cdd4cb778b09e8404a
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
deleted file mode 100644
index 9866ab929194..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build with >=ICU-60
-
-Bug: https://bugs.gentoo.org/639220
-Bug: https://bugreports.qt.io/browse/QTBUG-64925
-
---- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
-+++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
-@@ -488,7 +488,7 @@
-   // are added to the allowed set. The list has to be updated when a new
-   // version of Unicode is released. The current version is 9.0.0 and ICU 60
-   // will have Unicode 10.0 data.
--#if U_ICU_VERSION_MAJOR_NUM < 60
-+#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT)
-   const icu::UnicodeSet aspirational_scripts(
-       icu::UnicodeString(
-           // Unified Canadian Syllabics
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
deleted file mode 100644
index b3c814f5d936..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
+++ /dev/null
@@ -1,127 +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 geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu 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/protobuf:=
-	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 )
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg: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.3-icu-60.1.patch"
-	"${FILESDIR}/${P}-jpeg-9-1.patch" # bug 607424
-	# TODO upstream:
-	"${FILESDIR}/${P}-jpeg-9-2.patch" # bug 646456
-)
-
-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 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/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 8daeac3610f5..4f2fd1c44cb9 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -4,6 +4,6 @@ AUX qtwebkit-5.5.1-disable-jit.patch 460 BLAKE2B a5ec0644d7f4341993cfbec916bc3c9
 AUX qtwebkit-5.8.0-disable-gstreamer.patch 714 BLAKE2B 3bb7ec6976934e20d016fc6fa0421cab5d6ce51731a0c5a12b92b6e1611a75396f9db751074f7d9ffdb1c000b1964689d69606ba16e29f3ee5329d141dd3c90a SHA512 7b47d5e549f8bc0113bdff596a191fff3f8c6deafd6ebc456e224c1657a07e0208c478fdd49b9790ef618371cb969ae8aaaf08f9c5f9eb10b5841817f0f8736d
 DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
 DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
-EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3667 BLAKE2B e3ad28e501011ea9196a8d8b882c19851d5ce4da44f27b506250571d8153fb52f8e512b126061592e13e3292783da6e0a430d8deb819483da574983a4c11f528 SHA512 dbb45888740314be77a463ed8bc3c102b5763f0a2c10d1f637184ee03d79f330c3c51d8bbfd671d7183e13cecd4191b91fd1e822c79c5aeb325d99f81d865b8b
+EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3734 BLAKE2B 968071383f299ca4247a7d69a708171180716441e62696d4b2b5eec1dd7a442acf12c22f9aabf7063813a8d288886741f2a7c45954fa34de416b72e030ac7f43 SHA512 b3c6e91bb5309121527cb85d6ee68024cee948fc36f6222f2774810faded9d1dfd074ae38e7daf701978224cd5f340ddc11f2e79327ace05cc791290089b2725
 EBUILD qtwebkit-5.9.1.ebuild 3503 BLAKE2B 0bed04771bb14fbea809c3a2db5254943883f34b971b459c3c2a3f008660b24c4813b800cd14bc4a47c1d807ed17725e16eddc30f6f50ed62cf678931d6e2f87 SHA512 5b80352dcf1f6be843cd94b90c90552c06662494359b1d84a91e495274674fc3bc9a807e8e86d67da96ca28e00c7a74590a250e74d845183ff53fd002bec51c9
 MISC metadata.xml 1374 BLAKE2B 582f07a66b4dd4ff72e865c69596a364247bffbe1c11ea4a77c38c8b1dd6af6062a97889116387a251e890aee572724f2293e7b281fb5200fa3b3c1b91d4ccde SHA512 6f845148e018566a18f4dc86f1ff2224c45e5a135083263f7335fb0bb7a5ebba620787485ac1746f5207854b752be9ab3e5385b4fed63251359172bd4c196742
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
index 98972468ba2d..038f92f9ecc6 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -106,12 +106,14 @@ src_configure() {
 	local mycmakeargs=(
 		-DPORT=Qt
 		-DENABLE_API_TESTS=OFF
+		-DENABLE_TOOLS=OFF
 		-DENABLE_GEOLOCATION=$(usex geolocation)
 		-DUSE_GSTREAMER=$(usex gstreamer)
 		-DENABLE_JIT=$(usex jit)
 		-DUSE_QT_MULTIMEDIA=$(usex multimedia)
 		-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
 		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_PRINT_SUPPORT=$(usex printsupport)
 		-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
 		-DENABLE_WEBKIT2=$(usex qml)
 		$(cmake-utils_use_find_package webp WebP)
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 471559c6bd8a..43f9ce40e546 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-opensource-src-5.9.4.tar.xz 199492 BLAKE2B c8e7b32a3ae5f74294006ea0c47e10d34753cf3221484c398bb64b246ac7139a5adbde73b001c9d4e18d1cafb636f57d0b12c30620e777c0472f93dc4ef98b4f SHA512 ecf4dbbaf7da1c69cd649e599118231cca47e7c63a83d40cef15133a0ecc6c4d32e15faac8e545f5672c9e1be15b38c1458a5a5541e680ee1ebb2fc1281260f9
 DIST qtwebsockets-opensource-src-5.9.6.tar.xz 199624 BLAKE2B 9433758ad1cc8f929baebd4a73ffcaa6130277a9832bc43746ddf999870dee7080dfbe39c75d1311ac90a1aabec5b50e5376b24618f336fd660047558198d101 SHA512 3ecb44b6046d1a57ee85d261107b332f219aaed312712f817127cf0715f22ef3688192bccd86bc2057f79b9b1d69bfbceb3b8cac97ddaa33afc4bb3284b857dd
 EBUILD qtwebsockets-5.11.1.ebuild 539 BLAKE2B ef00dfefc365b70159695f236af006dfe992a50274970b1a93ce1cc5141f891887c75fdd4a99b00d37c85980897e03928d3f006192cf31665abca761f5e29dd5 SHA512 f91f054e63e2db29e3ba473d0a9c8f9c3d183eb878d816cd209438cc9cc2d882aa80c2f6774c43d14a1aff82026f55d403f881ba4be90efb11e73f3cd63969aa
-EBUILD qtwebsockets-5.9.4.ebuild 531 BLAKE2B effc25681c849666974ce5c934d2407c70d0f8854ac9af3f80105ff0dafda5c59d11b6c37e9daeb34c7dbab4ea07253ec4de6111fefe92b8f30d4d04a5fcd5d3 SHA512 f116ba3147571fa035701be18ef0fb25747df8e135bda4c2cb75fce0acff9062ee73fff3c814d0c05bc37b8a98a670c39154cf97e26a1e4b3c740c16987d15ee
 EBUILD qtwebsockets-5.9.6.ebuild 543 BLAKE2B a0b04c917edb5f8ac4a436c5748b1c7edc9086b58db86714f66c2778662e24c8ececafabd1e8adfe723d3e800e17824d622228ce52f8afa87e624f705f7d0ddf SHA512 4d6633d72a3d217b6753ccbeafd5c749cca3ba15ea0884850a1ee3b4bba9061d320db40c94a85e08647db9d2793150a116a43a3c1700a8f31bb22cec8603529a
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9.4.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.4.ebuild
deleted file mode 100644
index d4e1bda01754..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.9.4.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 ppc64 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 96fcaddb5134..1b7f35172e13 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-opensource-src-5.9.4.tar.xz 108684 BLAKE2B cb660595d88da5a8c9f9e951e4a13ebb265271f0dfe081c5cb19658674f0bc206b2852b83da8a21855ba176f70d93ab20013e373393169aa4a03b478e1ced39c SHA512 e59e8bc50672ea54631b3ac510291b57a6d4d66250819fbae61b7cb814e7653301d55a42c8225a46d106f92736035e039ac7d2e97f3ef13f50bc5874c7e8602f
 DIST qtwebview-opensource-src-5.9.6.tar.xz 108724 BLAKE2B eaefe9d68bdd0c68f569f9f01bc403a49e36f7bc20859a79225575d13a653eaec741b986917faf91b50188052c811841c85d438104ff0ee9ed5b6a83274b0860 SHA512 dcb3e038737297efb2f58820de386e6ea349d65cf5557116aec34d3115bf7ab2de528365cdefe7433bad6b94ebbf210a282a6018557eb772db5f41909405638b
 EBUILD qtwebview-5.11.1.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
-EBUILD qtwebview-5.9.4.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
 EBUILD qtwebview-5.9.6.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.9.4.ebuild b/dev-qt/qtwebview/qtwebview-5.9.4.ebuild
deleted file mode 100644
index 43288fc107ef..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.9.4.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 d56a88d901b3..357ccf0a3aa7 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-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtwidgets-5.11.1.ebuild 1070 BLAKE2B e6559941e58f529bb08555dfa7d4452d21c8e98393270fee2fee5ca05b42eb311cf84e393a79cf7a486b082c49feafc01a13e8bcd7688f32a60191464a546518 SHA512 9bc6750a0e51dbc327975c78fe83a0cbac8c58792b2ec05796e1801e10e7c5c30f9311174c48272bb00f1d208e3eb5d8f18f64297aae86330723c26c92e6c9b6
-EBUILD qtwidgets-5.9.4-r1.ebuild 1059 BLAKE2B c1c09e2e1aa5d3634ec45185b4280a86b2b2cf2cb68f949fb7389220c0f1a112f168667b52da4e2f0f9477fd58d0da98e0acada386655ba1299824fcefccd978 SHA512 8fbef18c9dd5ec033eb53f599d1078336dc357c59e8b95e4833266f579bc4242f74755f04c4d30db0c3cf5dff94a9b1343c6aeeba6d754f25c458f3395e4cb2e
-EBUILD qtwidgets-5.9.6-r1.ebuild 1141 BLAKE2B 76ac022e6ce5d1825d81b583ce83d136efb699035e8eae2865304909732621aa8d02fca6c4c708130deb966f61ed297d171f402fbeef9de503cb6f4efacb3f68 SHA512 b855d4720ef0646e133973874ce8f09682feff98fbe04a68681661564fbedc3fcac582be8f81bef61b10200fe15560115d835a8b3f981b0b36e002d579cb70a3
+EBUILD qtwidgets-5.9.6-r1.ebuild 1140 BLAKE2B 6589dfa19127aee73971a333cc4f3a177624f1adef02b80904d4c164bbca8fbf3fbb2068b4306e725ebbe538f706ec83e8e48af7f2c6a0fcfe2b8a60b975bac1 SHA512 1b12d48f414171a38cff101b2a84215a93cb9cc43602c4a50485aabf830e461aeb3dacb9ac145a382ed7752ac6f77fbae3f73adddf4f6e299db604b64d1a1d62
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild
deleted file mode 100644
index 227aec0b741d..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.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="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 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}"
-
-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/qtwidgets/qtwidgets-5.9.6-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild
index 81c0af342ea4..0e1e4e9b17de 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.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/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 71ec87cf8397..cd69eb862513 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-opensource-src-5.9.4.tar.xz 76604 BLAKE2B cffb9870ec726edebbfbb2ed39206c8f1522e6f11d3429dbb0861501fed0d8dd3552f23ba363f3704ff1b6e9af89a91e68e90f2f7ccf80b150598778d26dfea3 SHA512 f05a273db98f95f998c681eab9f8d4a5d132342282bf63d1104ad718c424602fdc8dc71e14940999692449d3fea1442a5932c08cab3d6c0a9acbbf0403fee23c
 DIST qtx11extras-opensource-src-5.9.6.tar.xz 76896 BLAKE2B f8f3d8f642bff43a74ea6e58492a566e87dc0cd6f17061dd95f98fae4e3336703d03a49ba85403ccb85f02f2cfa7fa554985d6fe19b7d5f055f3fccd73ec2536 SHA512 22bb33a40e242f54caca075ef53e1401ed82f094f87526bb24e8c85227ef56364c78b0c8287a173c38aabc7ca3be833d13d5156f3b3553a57bf74ceab1831be1
 EBUILD qtx11extras-5.11.1.ebuild 452 BLAKE2B 03e4b6931467751ff2b42e014bac822559d13a42fe619ecb238bfc94c027ee4dd657dd641e0222f997a9945fd71a945781b19e5bec2dd743cada0f2553987bbf SHA512 31b82272df6a7043a9ca2e35b43250cd9ed2a37bb94575e630c3a88f4019a709cebbdc56347df18d995e62fc172636d9a98d25fe2a8de6f923672a09373738d2
-EBUILD qtx11extras-5.9.4.ebuild 441 BLAKE2B c560a683ef4337df6299dc36b466cf9e8280d67440643a88baa33a4e7e5a3aed765e96ece849fa24c9f7096e118877f0a90ae395656d6c3219280c7db57b1841 SHA512 393fe8df2f9b16076119762e282e12d4be9dc07b1d1b889e2db357aa26000525be99a08280578e708909b2f9b96457fa3095788e46b16b2fd106a3df1424afa8
-EBUILD qtx11extras-5.9.6.ebuild 449 BLAKE2B 247a102dee5b8ce37d5fa1ca6b204cf6c087c57101b09063d5d739da5fe2bf163aa1d7c83839a146785281bd26911744932eff659375bbc05231572de76710f9 SHA512 853a607f9c65e89a20da4c4081cac2db5d5777fcff0ffd92521c1328eda42fdbcf601f89ba7448be92b06e3fb6cbc466b6d659e5e95403576c4c4cc98c9b2169
+EBUILD qtx11extras-5.9.6.ebuild 448 BLAKE2B f94c0acb5c29c42356811f9ac229a995600490a07988f07cb9bd9516e7f979d2f757cdca96d44465db8089d8af3e4174df4721023a179d211bfe6778e278a107 SHA512 d306c55ad1e89eb9f257ec16ca8967c84ad07d575565600f8d555a88f49a01d822e8f15ddfc3aeefd3e99f277a269d64a383226ea664638c943319ce377694a2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild
deleted file mode 100644
index 5dec8a1d9172..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.9.4.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 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/qtx11extras/qtx11extras-5.9.6.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.6.ebuild
index 489497a7a140..14961e068c66 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.9.6.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.9.6.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/qtxml/Manifest b/dev-qt/qtxml/Manifest
index d5ac9df64ddf..f9c87084d6bc 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-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtxml-5.11.1.ebuild 511 BLAKE2B 0da6673cd01121e0789d9f60caa191d803874fb136084893b246a9f11bd0919a94ff0f2e75c63c5719c804ec0b295c7dc7b9d462b6244cf9139b10b91b0a1f09 SHA512 35c035c4dd3c782166f4cfe9fd3bb76cb8ea0e0e3f95f974b57d9a2a684f924193377b211e8ad2ae30c968aca144197713b311dd19b947681170ffeaf8be1c1b
-EBUILD qtxml-5.9.4.ebuild 500 BLAKE2B a8c227d6065e6c8a16d9ab9cb4ff3684fc9016a9e9dc8903431a34a2cafef7cb9d3a7d36c7ad8a4b311c7fa35fe3431a5221a214e3fdd315482fad478b863dc3 SHA512 a1d121e4f44472f93b4d37bbf30e73f55e03546cb4fe441d0915c51afc728265cc8fb816bf3306908139d39e0513ff9e532585d801c29632defe662e9e73c8b4
-EBUILD qtxml-5.9.6.ebuild 508 BLAKE2B ca5fd1fb9d0e68f02ebc50816faf44d56e260df2b4d8f2522f554e29bf24d2e90cd48fa066150951fd43b26bb931402164c30a5dfea8153e1fea8f5a1700bf8d SHA512 9ccf907541bf40724a53dd8254b72db07366c8f6f59c81596da5803f9eade557111dade37a0d8bc866260de48a5bb08b586f494e4af0af0e46cd2a41a2845112
+EBUILD qtxml-5.9.6.ebuild 507 BLAKE2B b572852e82ae20616836d734ecc8be38cb959449de26a8b7e26d695ea77d0f9300a0dc244e813b6df0023b8101fd63ada972d9147a653764d0b52467f661f786 SHA512 a9fddae162b13948179be9c38258a7be6b312b6bb926684eb55ad7c37034f2e47e1e8cca41dbb1e8b36cab730da77d56c60498aaf849861987167e5c95fb7386
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.9.4.ebuild b/dev-qt/qtxml/qtxml-5.9.4.ebuild
deleted file mode 100644
index a8415869254c..000000000000
--- a/dev-qt/qtxml/qtxml-5.9.4.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 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/qtxml/qtxml-5.9.6.ebuild b/dev-qt/qtxml/qtxml-5.9.6.ebuild
index 36a25d95f354..6c327122e02a 100644
--- a/dev-qt/qtxml/qtxml-5.9.6.ebuild
+++ b/dev-qt/qtxml/qtxml-5.9.6.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/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index f358aaf7b688..4cb06c9a4007 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-opensource-src-5.9.4.tar.xz 1361036 BLAKE2B 74fae07ff780bb44eaffc56822585c5dd2dc36c13237ae23666f8286488a837cafccf01c14d9efe4d151435235965b923bad1889ed604ebb2781237d8674db26 SHA512 c2789e7ca32f29f025b72704be49d9cfd3c02bfa61bf3df4145ea03b5df4fc60b2498bcf7e45090b36141aace91c645b0648b99c54e1b3fe6aec486e7fbe0dad
 DIST qtxmlpatterns-opensource-src-5.9.6.tar.xz 1344204 BLAKE2B 08478bdc81f49fb2e24a57a105f537000b945537b172392b56751614473bc63c8b2cc4d3c279a91b7ef0e68490d01655b6dac7f5771754baf73335fe3117a12a SHA512 c1b7983725cd208b207e366f3fcaedf073768cbe11d6c54c4569b8155e2c97e4af889792600d86769b7e6828409e0333ad7c66b8459d07c5c1a06268d28d6788
 EBUILD qtxmlpatterns-5.11.1.ebuild 434 BLAKE2B d7656992726ff06b9e31b8c6026ea0ab9c94ad945ede3c5fc13e2fe1593b5def96b2095b9d82feaa85e3d52cf5581ca71dd640865bedad6813f2ab84ea4e677b SHA512 c86e7b47f605504322770d3ba3c153b3fe518bfbd60d9ec530da19897689671e524b0a96dad7c01dbd24ec858179d6b54cd6aca4bae2800adda620f53738e942
-EBUILD qtxmlpatterns-5.9.4.ebuild 423 BLAKE2B 29a95538e2450fd50671dd1dd93e8605ad958de12901c20469aa4a8ab632a80d7f3cdc5beb08c63fe2ff57ce1e6ed8b8958edf401b6401faf57ab17542c90722 SHA512 eb6cf00eca1dbbbb50542e9c5ac7a872bb9aa74f93104b9abc892f44378cbcf4130474da14d69b613e1eaad6b72e12f11ed9e01a4c7f12ca24119795f8abf17a
-EBUILD qtxmlpatterns-5.9.6.ebuild 431 BLAKE2B 0e9148727e5c388d8547cae7d49f52bd1895d1a1fea4f83c50e5658aee3581d4b8a2fc9b35b158d607b8a5570d58680e533b2c9bc811096182ae880e4c2bc07f SHA512 c4c98ce89ab74696e4a603f0f1bec0fd1f6ef90015d3d86bff277c6660c084f515aa6887ef94109e9015f23e9ad964996668c7c491394062f6c35e4b77861bf6
+EBUILD qtxmlpatterns-5.9.6.ebuild 430 BLAKE2B b929356d0737c29defd75f5067acd50ced972c1a0b00e23c3eacf0cf4199f0f61bb4ce927d545f2a26319fa93c55d147665d13cb9b172aaa11fd47ecb6ce75f6 SHA512 425b418d24e22e5d98951603b90e24f8e42ec3510fcbd9c9aa7c176a890402865083ae7da9dd66e4dc11636acd916b91083aed6d1bc13e97a7c367b4522dd08a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild
deleted file mode 100644
index c1c76807184c..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.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 x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.6.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.6.ebuild
index 4292e82b561a..a9647d1a4b6b 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.6.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.6.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=""
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
commit	3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree	a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /dev-qt
parent	12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)