gentoo resync : 16.02.1018

142 files changed, 61 insertions, 2595 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 8e00b0e7d30a..c00c8a2fb178 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index cc31ac1e1ce5..fbc6b28a026f 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD assistant-5.11.1.ebuild 1199 BLAKE2B 4a6f39fa05a11d658396d185f1fe58b78b3ff39cf6924c2142ed6cda3474fb7f633747323502d168119b3b8201a9a16301ef95a5fe2702bab80f205b6a81854f SHA512 73a3d7bd27d51920436c5160438f0330553ba97e50569e036d612287dcc2bfe7ed836a7fa30fafd87fbc94f61d1d2ba0e54c296e7b6bfd2089684cbb20c72224
 EBUILD assistant-5.11.3.ebuild 1199 BLAKE2B d0d2c32af3904215f9c1bb9cc1b3fd916e6fa55a1707a0d6959816faafaced118ac30b946df5fe8250ce19058a9b66ba0ecdd37adb3a5d11640ad9be397bc187 SHA512 f675d5c910754521aafcca73d44645f4e45948a8f9ce13689d7fa558c270383b493b2d42ba8fad4d78bb65e3dbf6e8115980a3d677c641671959e25832303f06
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.11.1.ebuild b/dev-qt/assistant/assistant-5.11.1.ebuild
deleted file mode 100644
index c641c4397da8..000000000000
--- a/dev-qt/assistant/assistant-5.11.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~sparc 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 eec92c50461e..b6e8e726540c 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD designer-5.11.1.ebuild 1237 BLAKE2B 78fafc4bf17f03f904161e0db22f1a0821adf3f7326997f1126824325d60951504613fa6be16885ec1600f65b1e6d4df7844961fa4020987aa6a40a247bea4a6 SHA512 379e29b9a3d2339a9c63728ac7870837e7fbaeee52207b1eab0e683ca5ab47d8465b3ff4e3ca3ccd028fc682b29095c0e14b7def40e1d212afb4bb61230b5e48
-EBUILD designer-5.11.3.ebuild 1238 BLAKE2B d0c429e259df4fad6ea7c351bd07737de5cbb64d2a565a3781963f07bc51c39dc97d742eaf15ffdf27487296687cd7fe328b59b48fbe3f362184003b77052f9a SHA512 c3e6ec16ccc8ff5cfa47ff98ddcb6591292d26baa9ad5304ec26dd91a7d61b4c0e4448354f3ec8eda74ba5155e5e03b5e14236fcfd676c65b67baab19b07f439
+EBUILD designer-5.11.3.ebuild 1237 BLAKE2B d359737ae3770e66e9784f814c57ec1741c6db6ae10f6f2e918cdb0ce65a5ea7b27d736433f3e7335add56d17b4598814f58f0163c4c5cc767a07dee63987769 SHA512 6808aa8956d242fb6ecf97bf913d76c0477fe075c2a530a07158321d35a8b6538f037d46ee3b824e688bfb8251119cf2ebba99e016c1b8ebbd1b293f88820b3f
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.11.1.ebuild b/dev-qt/designer/designer-5.11.1.ebuild
deleted file mode 100644
index 0ab9ea09952c..000000000000
--- a/dev-qt/designer/designer-5.11.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.11.3.ebuild b/dev-qt/designer/designer-5.11.3.ebuild
index dee05be1b36b..8591ca4d2aa2 100644
--- a/dev-qt/designer/designer-5.11.3.ebuild
+++ b/dev-qt/designer/designer-5.11.3.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 9f9d7621f873..eb7434bb1be0 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD linguist-tools-5.11.1.ebuild 686 BLAKE2B 0c074d8adee642f3ca40db27ae772ec0f057b68358d9ad8c3803c988fdc19e4d6fcd6fb303fb60df60ddd25eadd9044763099b750891110f64deae372ca065b7 SHA512 8060eeb217c514a041da421cf229504e30b823e528be998f734062bec5e10fa5418b949389ef045d72575c92fc896da3f11335cd59b07fdc2de7ae7dca0e035a
-EBUILD linguist-tools-5.11.3.ebuild 694 BLAKE2B 2e317f8b9ad1bf02ce68a1ee570c6d68d8f042e380df0cbfc0dab76f7f526f978f2a0708d99e9a7e34614463776ffe9d7e3deb0c3105f6bb4d9303e39d88d0c2 SHA512 6f324dec37934e0a5b6f2fb04237ac7f9c8b98264ba6282d7dfab699497ec577bb71c93e3f7bfa773ab08bd6ba72d343a2f181af73090d5f8c13dd6f25f3dd7c
+EBUILD linguist-tools-5.11.3.ebuild 693 BLAKE2B 02c29b87f2fce39227a46d046b17181195202f581d3a75a7afabee687065956738df2b1aab924a0d6b11d2836bb6c9fe90a498d2622fc6242eaa6cf9d4dea455 SHA512 70499218b1aa368c430278915d4aed82221836bdb8f1638adfaa086b571bb20bdbdc98926ce87c3ef30f0dae1cc8d2681421e805c3e0b2f616bf7c0a4c02eb7d
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild
deleted file mode 100644
index dbdec6829d22..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.11.3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.3.ebuild
index e1802e12f98c..349a9a7a0208 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.11.3.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.11.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~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 c69c2787b9f0..c8f68b32b3f5 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD linguist-5.11.1.ebuild 986 BLAKE2B eb757ff71a0c0501e36b50c252ba9e18ba7029e489af2a7e2b766fff5f4623a08e90016478bb5bd6681278a879a2b6e56ed5882aac929bdfa11e64a32f8476d4 SHA512 563d8364aa2c8415094d175592a0266c0845a5c83d1920ca9fcdcc23d3dc5fd07537ba06108f478da9bb1d2ab1071ed7d3bbb7f949418c60eb5c9348e7b94117
 EBUILD linguist-5.11.3.ebuild 986 BLAKE2B 54982f6360b53d293e40d34896a7776cf170f57736a08582f49e1d6807e5ecc024abc95eaef7f66b5c2293cc016679946d9b350fced9ad76d68a9d56c2da201f SHA512 de7b35827fc28c919c160078666956708f23459f36a412ed437db0ddc1d1aa3e767b532f4f6d5b2420c1bb590a03a9cb65e03fbc73cece9938a5a91e0d8db1ab
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.11.1.ebuild b/dev-qt/linguist/linguist-5.11.1.ebuild
deleted file mode 100644
index 13cebe35f706..000000000000
--- a/dev-qt/linguist/linguist-5.11.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 4aa9aa3e9b67..b7b499fdf14c 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD pixeltool-5.11.1.ebuild 428 BLAKE2B ed2167af73fb9eae2ed5b19f7f313449b026f2ee025b4694a800fe697a5a3d448733b3981bfaecefd72f4167855797d98936528397d98fbba6621de420c85c77 SHA512 2b753cd79eb42bee31114ce6b541a9bcf33fd81bc9eb0719983184e2f3be069d0847984447b0a57163b9bb7e467b1e82ca8d49185010633defb783f79fd452d6
 EBUILD pixeltool-5.11.3.ebuild 428 BLAKE2B 1e35b6315507d84814796595c57a29ff051741098784b0f6a4429b9ad971f5356d14b061d64d628553a0b7f773b7e3792b488f9889a5de65e0b18fd866bea1a5 SHA512 3e5a94fce4c66749c840d47f750cbb2a47e982bdf8aa0010e05547cbd42995c0068ddb3a5380fec6b174904e5bd0ae97e97baeb6c22c1107fcd2de502e77819f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.11.1.ebuild b/dev-qt/pixeltool/pixeltool-5.11.1.ebuild
deleted file mode 100644
index 1464980f8fe4..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.11.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~sparc 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 e795cbd998eb..b518ac5b3621 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD qdbus-5.11.1.ebuild 472 BLAKE2B 83dac03c954255a98ef7a7865f54b86fc9a407155f987390f3be6171dd029521c105e772414f3b47af751031e7edbc52eafb27a21d78ae9b6a3ec5524cda87b8 SHA512 105cd084d6980ea574e3276898a8d1d64d9fac33a50c78503064828e06e5ae430639aea0d3d58437437413dc6a0c6a34cf0744ac16a37d68ad3ffcfea733540b
-EBUILD qdbus-5.11.3.ebuild 473 BLAKE2B d597ca6040b952544e1698802df218fab44c617dfbd335533d3c7e243c2f7579858ad7d601c83748eb2bd59a6fb0a82c81e863f4c111ba18beec39e3003e67ab SHA512 f2807ebb1fbfb49bed27e4de17f76361f2f702f75a55825b13e14ac5cee74c84da0a24f9cd4ff2e44a55f2675be2793ee577c3e685c17613cc3a94fed96c9b43
+EBUILD qdbus-5.11.3.ebuild 472 BLAKE2B 149435b6760f7d8b627b6715734b994e3f92dd4369eda7b479b6c755228da69d5db0fffe6a47f919fc7b4254ba13e47530233b190173dc47ff268b291d2a6bbc SHA512 d7eeb8a01de0b55364f3da79f9c34e704f9694fc0cd4816d1bfbf2ee9f14fd47f02637f70380d1f8ab3ebc957de20a63f955596edc6bdd4e7fc9579b08ffe4f3
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.11.1.ebuild b/dev-qt/qdbus/qdbus-5.11.1.ebuild
deleted file mode 100644
index fa76f30f9eea..000000000000
--- a/dev-qt/qdbus/qdbus-5.11.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~sparc 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.11.3.ebuild b/dev-qt/qdbus/qdbus-5.11.3.ebuild
index 987a154dac7b..1a055380fe8e 100644
--- a/dev-qt/qdbus/qdbus-5.11.3.ebuild
+++ b/dev-qt/qdbus/qdbus-5.11.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 54c1534d0491..b2015f5f3761 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD qdbusviewer-5.11.1.ebuild 974 BLAKE2B 40a1b55d7dd289837746148770da2f8616f796311d0219dfe844135559bc5454d19dd604f5adfeb559933304fc78dc5b900ab39270510963e6bb9fc298e09175 SHA512 8fb4d50175478957008670adb21e1458c0ea831ebb65f2030a7a192cea28630952143c7b171bb6418371e558f9ebd3a81ac6ea22aadce236a90b3b7b6d63b9c1
 EBUILD qdbusviewer-5.11.3.ebuild 974 BLAKE2B e09257a50b04104b7df3faa6af15cdfa1890ea647bfd3bf56fc0b774a5953c374eb25733fb33ce3f3d8f51330dce1e22db874f77eb3165366b700dd26859d642 SHA512 cc669f6430835675d12801a10627c6a273b2e06d213d2f2337e32b1571e71c97f99c6cd3e48551d828c8dac63973aa2a574a6d95ca3d07972b6ffce722d30882
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild
deleted file mode 100644
index 895b9900447f..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~sparc 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 4ad8b0379456..ce48d71c4b96 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD qdoc-5.11.1.ebuild 760 BLAKE2B 2a20cbbdf7fe7dc786dfabd71638bb9058a8b5c40760099b063491b3131bc0f306acf7549f6e6236d4dcf2bcd4d56896baadb6161b8e5ce7fdab30e1b6520cc5 SHA512 33f0140c4a8252338650348e801029e01f20632ac9346537739dbf77c1e51a4b535ccd0979c63bc3cd49b8cc685454000e9f271bde3fc4c0e6f3579c39bc7e07
 EBUILD qdoc-5.11.3.ebuild 760 BLAKE2B 830ed12c105003967539020517cfc00eb24ff96166ac431963ac0e359da435a743fc152f3ff1864b266cdfc3eada6e1a6f4e98fb84dbe6af675100b4d15df0f2 SHA512 b2d4025624b5980faff4fbcb294e241b9f7a48625796d31dc2cc94e907351b84d259b6dea3637ae3bb93419313495fed6bd55fa04c80b9ba1eaabefb34ea9efd
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.11.1.ebuild b/dev-qt/qdoc/qdoc-5.11.1.ebuild
deleted file mode 100644
index 0549109119e3..000000000000
--- a/dev-qt/qdoc/qdoc-5.11.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	sys-devel/clang:=
-	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
-
-	export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
-	# this is normally loaded in qttools.pro, so skipped by using
-	# QT_TARGET_SUBDIRS causing build to fail
-	sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 6b555c3da6ca..79cfaf44d2d1 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,11 +1,3 @@
-DIST 5.11.1-0-201806180847qt-everywhere-documentation.7z 195754941 BLAKE2B d9a5acc81bad5653f0c645321936d1a300f3e70ced154c2b700c36cb5edd66e1006953d637e8b0ec750935cc2ddc2c93c3558e67a7edf80344ee9521bc12f120 SHA512 49b5db9ebf63ba5e607e6a667c835f6d2b90916115bbb4aababf8dd25faaa37575b4bfdb27facc8225d6c8ca73b1f6898a7680fed788189904b1588095b73fbb
-DIST 5.11.1-0-201806180847qtcharts-documentation.7z 9203418 BLAKE2B 833c14923dc3bcd3696d761e675095770b4f843168199065831638ec0f6fcd5d630c8cb79a7a9d6870b0b2a6266c97e7067f619d803cdb07a10d9335cb40140d SHA512 ccf84c9df4e6561af58738e8740a51b38a56cb512224f2cb4dbcda26e8c9fa9110835e5b4499be38ff55f8d1f13deaebb18ad468ef91d8ea5c4a3c690fa82f57
-DIST 5.11.1-0-201806180847qtdatavisualization-documentation.7z 7605605 BLAKE2B 951edc6ecbf231132fedd96cb8d711fef18fb2bd3022bfa14bf8dc56244543f7b02bbad1e1ac24e26a79b93787212df0a2a9487759126be95c2dead06bf5d369 SHA512 7cb7ad1d0a71169ff8dd7508e8a2d89477f5203820c247369d2606dc00b9cfab97ab0e4df6fc568d1e356cc9c94c71ecfcef351605f09d0c2d7961def28c9f27
-DIST 5.11.1-0-201806180847qtnetworkauth-documentation.7z 293012 BLAKE2B 58fdb896ecdcaf9b95bdcd6e300f3bfa0dfde17b91bdbc539feb85d40353a4c76cacab5e934e6a721b9d786c842633d53a444007c8e225dedd651ef6b9b24ffb SHA512 3c7793921b331a9e233da56470d1f8d70e7004525a68bf1a692bdb9127846dfb2986b8da6c277816945304abf106bc8250bc586947406b19543c6d10b0992c81
-DIST 5.11.1-0-201806180847qtscript-documentation.7z 721409 BLAKE2B c1a36f60bc5a276ad57f5483bc045bdfbc21dff8fd309c0d39bd0c0f5a22d329ca5afc1c1edf42dc9b0f210e239c8e4afa9550cafa31452d4a8bb4fcae61797e SHA512 b7a7bee2390461fae49677b2df5920a411228eee885f47f6e1cd4338cd28edc99ec76584d4e4d7df646eacb58cb45825294b66fa121b0f657d34f6dc009964c2
-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.11.3-0-201811291914qt-everywhere-documentation.7z 250344112 BLAKE2B 08564b52167fce5456fab3e78c72b7eff458b6f8609c48872ed67c020c80b568e0a06018c3ba22f24728d4c949db71d1873afe332012ed64a2681a947c79ec97 SHA512 902a68b200a0deee445113dcc3308e5ecddf36b922cd23909f59a90a6a2eeafeb169ed67203fd0e516a33507456696cae4a97492f473f539532deb2a8842f70f
 DIST 5.11.3-0-201811291914qtcharts-documentation.7z 9204607 BLAKE2B 0fabe007d70f4ec85428862db1d9c48719ecaef3f9bd4cffe2c70574f77d337178c5df8928f74eabee218cdb62cde23c3ae0c826556e4682b4b8dc46f29ca86f SHA512 48a1fb4c0d5e2f46c9639eb2cf3a27cfad378abb8a6f480b1bc71f591b0417e4b05c615ac3b684912c6da861eca77a41e6cfb346e881eb306997d7c3257f8d78
 DIST 5.11.3-0-201811291914qtdatavisualization-documentation.7z 8359648 BLAKE2B 1c396c2d71ca2574e340b948dfc9364c78e3db8cf5482ce2df5a6f3949f01cb13db2eb3a3d17fd95b3796f4cf15ff51a95a2872256f16eb67d6433373849ee9a SHA512 1482f01b94fcac9a602c5cbf1072a96a40ce15becabe248e5506ad29747bd53d0e47f54ecc847999e8b67cbfd26b9aa70036428c72efbd3897af241e77494b1d
@@ -14,6 +6,5 @@ DIST 5.11.3-0-201811291914qtscript-documentation.7z 722145 BLAKE2B 97abb8f938b07
 DIST 5.11.3-0-201811291914qtscripttools-documentation.7z 88994 BLAKE2B 10d3593bd8261deefcb080b7602a24e2044e43d463a2cc2cef0a795d9fba3d307c3421d7cf07e238a8f7c129dbaccb713c2594bc8411a852fbf052ce4b796bd1 SHA512 29196525e15b3602ed38f03e02036c99fe1c2a2edb45a0c6f061e68c965d049e923ad4e8534c1580895e6b74d72f7f099e3c5771de61c229ec5812680b3b2a50
 DIST 5.11.3-0-201811291914qtvirtualkeyboard-documentation.7z 1637961 BLAKE2B a4c46e635563a6f37c6184a93f8eb1aaa345052873a43bfaf805e3790847324298161229c07420e8665347b45797455cb6ef56cbfdf8240840ccf9e1e8e2982a SHA512 fc48123592a7502abc05f5c8ecfb33d12e041f3f278a1dbc27d3bc8653bb3e2464da89a8f14ef4bf07f786b80c26104dfcc89034a44f62a5810d4a01bf578c88
 DIST 5.11.3-0-201811291914qtwebengine-documentation.7z 3654309 BLAKE2B abd0799f31f0f00af0faaa335ae821e68cbf7f90d0e2027c866bcf2a397fc57efa8a12556eb685d09cc4e65653af1e15946d7f9530b82de10bbe1c2d6ee5c606 SHA512 e61e3d410e39e78b02c7afd86877e7b3d3f18102d7cf07adecf420f84a991ee28edb98b5413b03f3f5248edd68eba33d4273630abd8f8c915c9761f7e8c9da3f
-EBUILD qt-docs-5.11.1_p201806180847.ebuild 2024 BLAKE2B 2c4bf3175b42df76156adc97f9478624f8b3c3d20dbc994d613952150f42b29e651f76f693729f338802cd92956c0706f19d968271515b57b1eebd8071559cdb SHA512 d6da3044733f2e66c341aecb4f6031ac8964bee37211914bffe3479d49c87b0f98c0289cd84927c6159b7bcb4a092a19ff34eea765ab0b9f44fe41bfc2bc7218
 EBUILD qt-docs-5.11.3_p201811291914.ebuild 1935 BLAKE2B ebc4b6a01d96ca7537acb4230b45804cce6fef838aec8b222052657cfb48a95032e269363d138e2e6f981ed48b4b4ac6d2449283c9a253c710951cf30fec01d9 SHA512 83663ab9abeac780df98fd0f5f975705a267efddb5c3780c2b9200d89099be83d615c5fbde3ddd315e56de751337e1cd1c558ec3719d555fcc2c63e2c2cd49c2
 MISC metadata.xml 1716 BLAKE2B 1a50a8c7b4b2125df82206b03fad6e9721495a0748bbb98ccf059628b03c19dc2e180fe92dd2ce71195357dde2df8717726721afbc6c3cb53687384d13c931fa SHA512 6f7b54859302dd8f7364e7be60e7750286c0326d22debc6488029e4c144d8935dd1c6042d28d31c41cd67b3ab83cbfcd9cc3f9a1d5d0bed66d65a42de61bada5
diff --git a/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild b/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild
deleted file mode 100644
index 8c5bb124afe3..000000000000
--- a/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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://doc.qt.io/"
-
-PV_FULL=${PV/_p/-0-}
-PV_NODOTS=$(get_version_component_range 1)$(get_version_component_range 2)$(get_version_component_range 3)
-BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
-SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
-	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
-	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
-	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
-	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
-		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
-	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="3d bluetooth charts datavis declarative graphicaleffects +html location
-	multimedia networkauth +qch script sensors virtualkeyboard webengine"
-REQUIRED_USE="|| ( html qch )"
-
-DEPEND="app-arch/p7zip"
-
-S=${WORKDIR}/Docs/Qt-${PV%_p*}
-
-src_prepare() {
-	default
-
-	# bug 597026
-	rm -r global || die
-
-	# bug 602750
-	rm Makefile || die
-
-	use 3d || rm -r qt3d* || die
-	use bluetooth || rm -r qtbluetooth* || die
-	use declarative || rm -r qtqml* qtquick* || die
-	use graphicaleffects || rm -r qtgraphicaleffects* || die
-	use location || rm -r qtlocation* || die
-	use multimedia || rm -r qtmultimedia* || die
-	use sensors || rm -r qtsensors* || die
-}
-
-src_install() {
-	# must be the same as QT_INSTALL_DOCS
-	local dest=/usr/share/doc/qt-${PV%_p*}
-	insinto "${dest}"
-	use html && doins -r */
-	use qch && doins *.qch
-	docompress -x "${dest}"
-}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 3fcb31af2a8a..b9573d70be80 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,3 @@
-DIST qt3d-everywhere-src-5.11.1.tar.xz 84763568 BLAKE2B 92510ae0cbc4627a9d0517bfe3a17c4efc6538cd04787b3fcbf5b0f381558deecb96a70f488d797719852b625bb47827ad630692934aad5574865e63f77f589a SHA512 d1a07586d6b64ff3b1e85c41c8b3b86f6327e9e63f5f45344a65a6136179f6a8361ca9da80944b244d8edc53d8b0e9f8b646d613f6b42faac6cb724f49573a8a
 DIST qt3d-everywhere-src-5.11.3.tar.xz 84944236 BLAKE2B f1db5cdb569777603868081bd97b0c1b4e68bdb4ec51e133d1078e23796eadd25ecef73caa23872f264aab51ec4b7cfd1d2af087445a8f826c2659fdec5e1a5d SHA512 d75d9b9ddb456d8a0163b35e9417c313c56ca1332fd742cb9a682d3e9d6c68e8cc6603bd900f8c634baf79522a00c0ba9aa82ce3db3b65c4656fef2c71c908af
-EBUILD qt3d-5.11.1.ebuild 636 BLAKE2B 488a2a0915778d7ea337d1d54ce058dd61a94c21d52a48cf1177b1fca282ad43ab1ab20f9c668cf0d6b2d2700dd35554ba35a082377f8f35f72ec1385b0cffa3 SHA512 bedf4da6c6a3ec4e1365042416dacdbe9727679bdbefe122478e33a629f061392d3722bb75e18b6b8021ec353e0de94583af74be24c24c294aba282eb4db0ace
 EBUILD qt3d-5.11.3.ebuild 636 BLAKE2B d8b9ed4a9f9805f1e1f312ec700c2f28206bc06d72a10c1354ad900a64c974d5aa48ca621bcd41f727b7978cbdfae2ddbe88082092856b332a5150a338861077 SHA512 c7a749e2bafed72cd7adf42274dace66ce32dafdb26c0acf313ca57d249123c5c9fc9a1182724f978687e6998282c8469a6934f4be68c2d80cb9b246e4582a0b
 MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
diff --git a/dev-qt/qt3d/qt3d-5.11.1.ebuild b/dev-qt/qt3d/qt3d-5.11.1.ebuild
deleted file mode 100644
index 344f30dcc2c5..000000000000
--- a/dev-qt/qt3d/qt3d-5.11.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 a686d711565f..80aa41758ae2 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,5 +1,3 @@
-DIST qtconnectivity-everywhere-src-5.11.1.tar.xz 2734864 BLAKE2B 7bd22542f06f6a46689b176181e83a315569690e3e5ce20f95d473af6d8513c03d47f2c7801cfbce522f49e25e1183e7553e104c7aaa7d071b86719236847438 SHA512 3533b117a6d028ef7bf4fe89b9ee42409b7a6eb62e60bca84e5f1323f6cd9892234d2c9b213ac806cda29cf36c8c6c646dec145933534664d376cda5bff94d8d
 DIST qtconnectivity-everywhere-src-5.11.3.tar.xz 2729800 BLAKE2B 30c86277eb6f997b52bd6ee42d1c420bba88b78bd65e4bab6fb6c38b8d9d61e14da3ca0148f364b981636920452915dd4889a528276c711eeedea507ebfeb7e7 SHA512 e44f2438792733f633c2788e7bc1910e7fdd72af660137cba8aff37deb92c01253b3f4b5663e1bc381e63bcf7a4b469f2682f8c85e6885af423df3d4a5fb055a
-EBUILD qtbluetooth-5.11.1.ebuild 636 BLAKE2B b4f9856710aec096d0b61ad5c7be8da02af6a4ba87b0629de39e056e185d8c046081a65b35cdcf506092807220e4664a183143696fbc32a73ad1e56d04deda0e SHA512 79b6162387e3b3f052d3ac4bb4aaba5453b1e4803cf2bf5276653d025b14070469ebbd1870fd638bb9d8171dde751c51b6f2e6b20d29baeec3fdf42618568127
 EBUILD qtbluetooth-5.11.3.ebuild 636 BLAKE2B a4fd115127c1203cf775fda4d01d3ab8b5998b70bd3b208b172e5a256db77e82f1a449eb4146cc8b14d8c7d96464059cf55389064af7d3b0a422ac8d9f1c0325 SHA512 10690f04f72baf9a37f666f906fe2e5d292ef509fb31b33239e99675649c0213840b399f0d12d7a13d091ca4097f4f59a7655661afdc12613472e4f050bf190e
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild
deleted file mode 100644
index f67286f91942..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 d1c18945fd24..7b0de7d58e07 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,5 +1,3 @@
-DIST qtcharts-everywhere-src-5.11.1.tar.xz 4245496 BLAKE2B 92c1d9330d2da96524505186cd39c34765fc65ba5e5947d27f0bc7e275bc044112d3cd9fcef0c5455b20d0fb931d3bf15f8961381e47a7d537e47d1dffcbe5ee SHA512 e3c02ea9bd985a8d051e305dd04e58711de3b666128a695011afd65271a2c7bcb11763c18fe201045ce03df96326490ca7322bdc0f77e97988ec59427505886b
 DIST qtcharts-everywhere-src-5.11.3.tar.xz 4239348 BLAKE2B 4b601e466f6e9bf3c9f90ace35b4c698a51dda7a3be964fdb68928cce1d5bac95c83f6586656a61bc5c014ccd35bae8223c86503eab200036e466a0cd4bd7b21 SHA512 9fc639e210fee95356deaf564967435a6f29a0d2c4a5599ce271c1bd5e5e2300eb1ec4637f20034630a5cfacea9117ebfcd9ae7c2f3c55adf7f4dce34984bd39
-EBUILD qtcharts-5.11.1.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
 EBUILD qtcharts-5.11.3.ebuild 518 BLAKE2B 6b48d374a365faff7e44b4190d3dd1421144f9c8dc3aa030da0f4e7f6111084fab241b9632f5ef2f8b9fee0c397816d2877698c791833aaafeea351264636a10 SHA512 ee27dc7acb7b44744e9ae32e4579e4fa78a7050ebea4a9859214e75c7a95428e05a7df9907acb305d6fef8a04cd68a7efea7151ca6fc9bf8f267b2de910443df
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.11.1.ebuild b/dev-qt/qtcharts/qtcharts-5.11.1.ebuild
deleted file mode 100644
index ff3df69c0911..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.11.1.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 3cde63de20db..03add4a3b682 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qtconcurrent-5.11.1.ebuild 451 BLAKE2B cff081ac274936eae9ed8ad606fd373702ea62064965abd6bccfbec9f1fed503ec7edbc9822f52a7ca3c6b23a72247e06962a877bb1ae9d928bb5c5c2323f11e SHA512 22e66c97f254ab35b7d5d42f393f52789eda739acde574ae016d20e7929f7389b49d93feedecfcf371f2d0973b80701c429c62a464350d73d0722fd1ad4ad325
-EBUILD qtconcurrent-5.11.3.ebuild 452 BLAKE2B 5af2bdbf0b8ea5cb4af7e748490bd18b1a8e5a754c1ad738621dbeeb0d0baa7e14682b5e6ccaaf874251bfbfff3bec18f6f4bc5d88ffc7df059161783e5fc768 SHA512 a0c303f5bdf6df9164184f29a6891f8d3628214f9ffcd45d0da455bd4b6af9ef7b6c64ef823064c0fc299f35f0b0ed730a283c4891feb3fb04dfb12af6a3e1b3
+EBUILD qtconcurrent-5.11.3.ebuild 451 BLAKE2B 2ade2cf3231f6315388e10f9e09d5f47761cc7ed1b8e9603706102d03f58a2e73443aacf4ae0402b53b47a3cec93acc197f176e38c8cc2a303baae9241006c12 SHA512 719fc7c3ee2be54d6d39e473fc913b4e5eae0c83de036a40d9e558cdcda84d1ba775dee0d82945f38339c9a5aeaef353f5e750e629f60a19c0aee8cad2453b6a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild
deleted file mode 100644
index 11ac804c494b..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.3.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.3.ebuild
index 55cb5002b58a..dab9ec0c8075 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.11.3.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.11.3.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 9a06e66de19d..5a28f03503dc 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qtcore-5.11.1-r1.ebuild 1497 BLAKE2B dc8c05202166bc739f802e189ab1a65fdec5b5efb25481747f58bdb1ae233801518d9fbf1ce79ca9c225bf0ea4c934e24fa7476eafaa62155489b7c1912c6617 SHA512 24ffe80cff087a3d004a2708b9c7db1e3e62cbb962c658ed6130475c0e9639f69867d7ff96116c6d44f10ed7e2b6ca93a8651db99efbd89b47ec84b9d18b382c
-EBUILD qtcore-5.11.3-r2.ebuild 1697 BLAKE2B d933c25ad2f388c0ecae65bf2aac313a9f40a1af196cf9895a19387e9dbbab161cda0b427fcb923077c26713469ac9868266095dd41c0aaacb9414bee9d91667 SHA512 de29c5729bc097f5338913193bd1593122081aa686c8e3c84e159f5ff0548a0018022b0947573cf653ce46a006d6c7aa33f16759e69395104dee5c013348f287
+EBUILD qtcore-5.11.3-r2.ebuild 1696 BLAKE2B 0ed0908ebec92f06ce7f08dcd1ac641fac7e2ed275dee3ff85855058768fb04de0e8b1003ba882e028c32c0b5e2ac5c8ad7c7e3a12829946e00414b589e3e966 SHA512 988a1d13d55958aece06b9f88443586d3090bf4e146ed723338c6b48d510ae3e5a638ca31b2040cf58500db6764a229d6d2f0d28695a17d95697ee208c467de2
 MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild
deleted file mode 100644
index 3bd30426b0df..000000000000
--- a/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/qfloat16-tables
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
-		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
-		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
-		XCURSOR	XFIXES XKB XRANDR XSYNC ZLIB
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.11.3-r2.ebuild b/dev-qt/qtcore/qtcore-5.11.3-r2.ebuild
index c8a30f8a58a5..621af944cdca 100644
--- a/dev-qt/qtcore/qtcore-5.11.3-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.3-r2.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 34e384e10261..cbb90820cc91 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,3 @@
-DIST qtdatavis3d-everywhere-src-5.11.1.tar.xz 5206688 BLAKE2B 2d5de648a9f80085f98902a8b086d5ce59c366c445b3ab80d313a537ae6b3d19924c886e4f2f3c0a219e874e4430c9327fde266e770b6ceb1f45e62f6a67aef4 SHA512 e88f2471fa39fd4f4c7900df5edadc568d000b537eb00f892fadc6cf1d7845987b9fd98adbea4c35c6469c9a9bfce087b26440a6419ca758451dbe3b669d19cd
 DIST qtdatavis3d-everywhere-src-5.11.3.tar.xz 5201492 BLAKE2B 6ccc679892b6e234075cad890823ce5b20c887479f306284c49b40672da54dddc1d65970e3771e05b48ea7acf3e031593c77f64ef32e52106506cf10281c6aa1 SHA512 6e672a7d07f197b86d7914d249078137ae247463c1da77ed01cedc71326e6e4009ecfc7cd59f2277c290ba1e3c84b741466f9feeae8391a11bb7fc458bd06aae
-EBUILD qtdatavis3d-5.11.1.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
-EBUILD qtdatavis3d-5.11.3.ebuild 622 BLAKE2B 1ccf7676850642c1a0109c5f9c9e2f5ccbd634fe073d16e71c84fb80d5d5cb28b111f4a15257151cdf1c582869a0303f7744fe7c8d280a184762e627fe0edb77 SHA512 664223cdc4b21f5972b1e56e4a9d7d9e9d15a2ac537b86cfa9dd1102e52727cc14d1deb3378797b84ef2d9f0cd4cee663bd32915ccd6e825a3644cd036e77fff
+EBUILD qtdatavis3d-5.11.3.ebuild 620 BLAKE2B 1e2f2c6cf6ce23820b1e9ccc329c27e3d1c0aae454914e14d6775a507874e8096e7bf41def92c3fda65ebe0a7ef3df2992e7780e67408c8767e9ebe806ce8e5b SHA512 814aa60e87a25a688fe87c9283006c5deb21af8c24bea0639c8b5aa9336ac8b97d3beb8b0a9ad24b6a979f941f586bc1e93c8023be78598bd526ce2c2e44b5c3
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1.ebuild
deleted file mode 100644
index 647770499acf..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1.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/qtdatavis3d/qtdatavis3d-5.11.3.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.3.ebuild
index fb629edbad01..21a6c303f73e 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.3.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 IUSE="gles2 qml"
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 8bc2ed68e8c7..3b3e3d92a02b 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qtdbus-5.11.1.ebuild 695 BLAKE2B 71e305ae9a3c723d9976ad754ef735b3d6a9c0ac1cffaf7dd8448384fad40a402e19b475709d6852a8d25d4dcb9ff2e36d2a824a20cbe2e6a8802c5ec97afcc7 SHA512 f2bb5c95fddab0b186b27e1ef20c00942b288028d56649a4797bff15e6e25b58a6e5815e9917ee79d34f8f65127a84b6ea0fd2a5fa37e8000ac16a92ec17f2d3
-EBUILD qtdbus-5.11.3.ebuild 696 BLAKE2B a4a092012e79a59e3c30f38d63f27f187e72dae6b11821b3c51ec2bead480513bb26ef1434d5cc5ff988901307ac6b1505db3b005c107eb4f9f93b4fac41a8b8 SHA512 ffa3cdd0dc25bd1298e51782512581a1674d269d8b1754c4656a02c190cf7dcf067a631b8ecc0d29e8af52189885a7f42ac89885c7ddf061363e395630313691
+EBUILD qtdbus-5.11.3.ebuild 695 BLAKE2B a758ac03aa38b45532a27432680596acc49f4302c6e1f05aaad8f5f7db2db85a4fe88fcf01336a9eb2368d7e4b14035a1a70efdd393a36fd524d97c453df78b8 SHA512 7ccf7748c0e8bc940385f1a3617fad8136581dca25d616cf59dbe9032a3a735a4738306ee3051e3e6f7ccfec6476d20a85387a3b91b2a2d560d3fcd81524b8dc
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.11.1.ebuild b/dev-qt/qtdbus/qtdbus-5.11.1.ebuild
deleted file mode 100644
index 2951574d23b2..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.11.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdbus/qtdbus-5.11.3.ebuild b/dev-qt/qtdbus/qtdbus-5.11.3.ebuild
index e62d638a12e6..af98a58d81d3 100644
--- a/dev-qt/qtdbus/qtdbus-5.11.3.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.11.3.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 19a33e943d11..f871444ddf40 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,6 +1,4 @@
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
-DIST qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053
 DIST qtdeclarative-everywhere-src-5.11.3.tar.xz 22233024 BLAKE2B e443e578091f6f2154f4dda4384b07ff510f92757e113f07e1a6cc9a95caf6dc7994b72b8816e8fb03893ed8180058ae887031af880218e43758b49c397f58e4 SHA512 07d440b10ba2fbd700a191791cb6991fb9ce72c78787340e7f564bdb2bef24b035e15fe2aecd36d58f8794e56bd0aa35d28b350a73707e27748e54d46609e1a0
-EBUILD qtdeclarative-5.11.1.ebuild 1408 BLAKE2B 4eada134a4434034fa24aff60d0f3fbcc50e7fb9b5573420acfe38d611fc14fcea58790d3deb568b5ab262b16d97ebc9d24f6c0a3c60037e5a168e4276b3ad33 SHA512 2b0568144286812f6b7ac1a9267c1f2e946c0adb35ac74562333189ee8cce34435481a0e5def6e4d17a93257b26c71057cb38efb6fcd3e1e67de363d54557c78
-EBUILD qtdeclarative-5.11.3.ebuild 1411 BLAKE2B 7d3ddb1af71c8db62f2aea722f30fc98eeacfbd8724a10a3ba2bdef1b9dac7f519b64193b27fb00cfd827045dacdb1c2053a7da8e9a80ed284750daa37329ec6 SHA512 c0f0ab0df1c3441e3aaa52f74b46c9987074ca94dac02b206ea51e02868cf99d315f8d20d43a8aaec9d1d43ef00b316a80202a01bbb030c6de80cdb510870141
+EBUILD qtdeclarative-5.11.3.ebuild 1410 BLAKE2B f2b757558f8dc171ed3172076d25cdadbc3086699fbb41adfd42909bdb06dedf652d74e035e82a9ab39798b0cc7e4cd2175037b96c8f9047a1c6be0abe38950f SHA512 b5a304b55127ccc13e70871ae29bcd2a94a711391952408a551ac0ce5c2f637099c47578194d186a63f20b1d6225287d75d9db3980cd1531140864c267f1e116
 MISC metadata.xml 811 BLAKE2B aca4ded12a2034fb5964d6c38806edeb1b2b984c182fe6ae5cf26f28db3ffa8cc942e8354971e46d7bd6f8eef600fe52ef3e0cdb5cb2aef7c7fe616fbc81d712 SHA512 0e278f92094bfc3d7a295cf559178ff093f5ff6776f03037cc9cb4e8574c9298c76f6210f84e611c8cf1c6c063cfd78f8d0c478f30798fc775d7bedcc409c711
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild
deleted file mode 100644
index 81afe9dc24bb..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild
index 379bc78a5168..1ea72b10ee4d 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild
@@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2 +jit localstorage +widgets xml"
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 1fc607ac4e62..f1e414483a4c 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD qtdiag-5.11.1.ebuild 723 BLAKE2B 4f1e3a9aac15172f8f3c3ed8ac798df59dc4f630f617e7a45e4cd47f9bbdb92f4f0c44f7952fb1a19ddf2dd0a901d29bd4e554499c781eac7aa3fa41747ae0c6 SHA512 d165e299faf51c7cd1ed647c6612e7a28c26ba3885fbd51d43d36490df86e9cc0cec15d506aaad844ea875992bb24935c04f9df88e997665014b868730a3ad22
 EBUILD qtdiag-5.11.3.ebuild 720 BLAKE2B 2d2536796532af24f6cbf3b675a46b250b54625a860741fbd6ebfa1e8420ccdcebb303347b127c52513a6f3837492c513b39e26b23c88041ba952300bac490fa SHA512 441971de1175d6b85b2e366896ccb96784704f3484cd1e3ecea519b28d466cc9cca886174604860b405f7ff3d3548c982e46d1f9b544e6c0001078916fcc8801
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.11.1.ebuild b/dev-qt/qtdiag/qtdiag-5.11.1.ebuild
deleted file mode 100644
index 402759de40e2..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.11.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="+network +widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
-
-src_prepare() {
-	qt_use_disable_mod network network \
-		src/qtdiag/qtdiag.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/qtdiag/qtdiag.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 82aef3c79486..6c74fa7d5f55 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,3 @@
-DIST qtgraphicaleffects-everywhere-src-5.11.1.tar.xz 14272760 BLAKE2B 079c4c22d222c8aae3e16a9b818ed792652692a6dce4c56afe404ba53a777e6d32afca00b2b03fee84010714d4a94dfa3ff257ab2fbb649fde4ba4a605cd72b0 SHA512 0e79eac7debfd8904063d6b03938f62ed72194b5de164e0700d27bd2aac15e390cbdd337fa9afb62435862972e488fb01ae54f08d2a492719baa21a410272297
 DIST qtgraphicaleffects-everywhere-src-5.11.3.tar.xz 14267588 BLAKE2B 7f64c33505681de524af4dd97707ace7cbb371b15a500516afbabb4e61a13008b2e1c418f2500539ded2dcb4cea8e625c1fc029d92568e3c85aaad5562fe046d SHA512 c07072f7b32fd4e25f80318c48ae5a7dde82a0524ab37b174a5abeb36362e9e493570e2477c11bc4184ecf668a3879df8355fa0693a709f0a06224b41c144502
-EBUILD qtgraphicaleffects-5.11.1.ebuild 444 BLAKE2B b01a46e6de70bb4ac7ca686556c4ee621bf9eeb86817ad71b13194289532003281858be26b43a9be7e6ec64b67642952599140ce74fc8681ddc31b9c4df2feba SHA512 518ccba62859a6c390d03739d58e42d036ad4b11618d3a94c89a81c04dceaae23364ec342ad321399ffa4f0cc0abef60397ed3ab84764ebd824f14d33f10fb4d
-EBUILD qtgraphicaleffects-5.11.3.ebuild 445 BLAKE2B 1a8c69e18afbb8dc84fa53d2b119b98350f13a761d487f042e7e14244b28f4584bc3f9e3331952e06e78cdfcc6afcfd63f622f70635bf511131102c4308bf0d1 SHA512 3651a209b3021cf10fe2dd431ffce312fb932b918cbd28bd41e9471cf6a0d6c8d17c6f25a7400a5cbad929ebe30de9e34d0dc264881af5267569d57f9a4bdf19
+EBUILD qtgraphicaleffects-5.11.3.ebuild 444 BLAKE2B 6c01170366e3e07214e52ecfeb78bfa4b344cd4b739e3af0f0606e81ceddbdbfaf7b575f5f59ee58f8f581ec3ee06930df4a33a577e5b081ad0a4fac7919b54a SHA512 46ba9c0728c7f6b607a8da784f82115af398be4f50545a46ea27ef0ac4b6e26b5b8fdca48f9dce0e027e1b7aff16b2db420e9a1d2b4343942d04057a50e7f6ae
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild
deleted file mode 100644
index c49b15eae776..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.11.3.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.3.ebuild
index 3b39ae44f171..1d67e8999223 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.3.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 8d25e4502600..7c493dae7c79 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qtgui-5.11.1.ebuild 3575 BLAKE2B 47bff9fe61825a476b46b734c2156b05afb81a798e5e381a9dec306f98e0c37726d868d0512ecfb80dc1842ef2c2c8dc3af3ec895d8f0cd0c78098eb75487f0f SHA512 1a014dc31300db62f18ad8a67a508576bd1f141355a12dd46927e26de9fcf9adb09261ecfff4099dbac182bb0aaf14ca3f79de40d4f7ed6c83b9a21341a37282
-EBUILD qtgui-5.11.3.ebuild 3576 BLAKE2B d988bee3611871ed434803a791f1782d38e0caf17cb5bb0c6cafb59f0cf265dc9cf708dc5a08ab5a6c825d53c95328f846095f9f88ba9bf2e98e2d8091e37de2 SHA512 fc46b37fc011833607bbb8d13125568457166b9b35e0f087975a87d192e86cd4e0bf6411ee423e18d082c89e586f4b64149e3f3e0d2b814d9b3df0d4034576d6
+EBUILD qtgui-5.11.3.ebuild 3575 BLAKE2B 9b0746b66b81bbd94a7e5a72f078a4de06452fde77ae86a9a3197d0618af58fab8c9b42d8d0360409745cae9fc4413d9340851f207727a556fb92ce6e6777104 SHA512 ee369ccfc47f02a316eec53b4a23e9dc651bb105e4571e15c65d8afe077b3bea6f115ffa982d244bc7c53a130fd954d50c6f31eb8ae961fd78e3ba1ec9d89c3e
 MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6
diff --git a/dev-qt/qtgui/qtgui-5.11.1.ebuild b/dev-qt/qtgui/qtgui-5.11.1.ebuild
deleted file mode 100644
index ddb2d1403d49..000000000000
--- a/dev-qt/qtgui/qtgui-5.11.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
-	jpeg +libinput +png tslib tuio +udev vnc +xcb"
-REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	xcb? ( gles2? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.6.0:=
-	>=sys-libs/zlib-1.2.5
-	virtual/opengl
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gles2? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( x11-libs/tslib )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	xcb? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libXi-1.7.5
-		>=x11-libs/libxcb-1.10:=[xkb]
-		>=x11-libs/libxkbcommon-0.4.1[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl
-	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 tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usex eglfs '-gbm -kms' '')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(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.11.3.ebuild b/dev-qt/qtgui/qtgui-5.11.3.ebuild
index dd51c4a18ca7..185e212a1922 100644
--- a/dev-qt/qtgui/qtgui-5.11.3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.3.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 1e7d4b8f2602..abf4aa046117 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD qthelp-5.11.1.ebuild 652 BLAKE2B 07c0b114cb4a842a2db8b2a977b6f7c5ea7bbb23eee9362fe685eb8963c8737a3620cf305eb53e16f04b362505d9d3642cc6c6147d197f7b586969a150f0295d SHA512 82637bf23d27cf1f3f34e4518de3f30668cb6653ec7be9e9ba724609ce98814680de9a2f6092d34ffdd70a7669ca2b3351b15dc0ba2c4607308111bb49c5cfcb
-EBUILD qthelp-5.11.3.ebuild 653 BLAKE2B eb850bef6700089d0de198e763bd937bf08b6b93509136aad18727614ba0e5994e8cdcd89ee3cdcbd5b41cef26efefb5e4192e17754840ccccf2957cb5329d18 SHA512 ada24fd683e39aeb22d1127a24afc56fbc4f18dbe42256a4dcc34800cf1c77fdb3cbc72e127278cea4f78a500105ab50cc47e4299adfde0d69521c014e8051c6
+EBUILD qthelp-5.11.3.ebuild 652 BLAKE2B cb1225df44f4a8dad23c78e6ea0bb12e8bb98ca7d8de0f96327219a25007032441c31fd982c7457b02447c432949581ce2a7d6a4b55a20e84faa4d6656cad22b SHA512 61cea3b47303b4c3e39428f23fc0ce53d7097c38e86c89818040c0b52f4f2b2aabad481f1e41ab49e9c30ae8e824f41e4bc7f9bdb19d8fe4b7bf20d5bd259990
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.11.1.ebuild b/dev-qt/qthelp/qthelp-5.11.1.ebuild
deleted file mode 100644
index ec05d1634ad5..000000000000
--- a/dev-qt/qthelp/qthelp-5.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpconverter
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qthelp/qthelp-5.11.3.ebuild b/dev-qt/qthelp/qthelp-5.11.3.ebuild
index a1aa8122d141..9d441ee0bd1e 100644
--- a/dev-qt/qthelp/qthelp-5.11.3.ebuild
+++ b/dev-qt/qthelp/qthelp-5.11.3.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 bb186236c158..b55a63f64b65 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,3 @@
-DIST qtimageformats-everywhere-src-5.11.1.tar.xz 2191408 BLAKE2B 7a01c6c607cdb02471c289b71151d8fcba2047778c6d499a54dd66d125a7dac29b944b2b722aa8bf8667f453e92edba20adf10cfe6c580af7ac42c41aebd3a8c SHA512 527bd6d324904d1c7c6d931fe96bfa43575a904d2b94cbda3129c4a883fb79b9bdf6f009b41d2747e8aec2c410a2b23bfa0e94fc4eea698d54a0878bc934514d
 DIST qtimageformats-everywhere-src-5.11.3.tar.xz 2197304 BLAKE2B 9041260c26b2ec5085a10c05a76dcab59941ae3d18475b93286028b9a4bbafc923795f6f0ec7a0e6b45cf95c21a37fbc76d0868cdbb6ed8891360310cce868b4 SHA512 5e2b83c2a7cc337ca0cc80e348ee41cfead3429245ec0aa18bdef945c85aa878ba684f5d410bca04d0183e0f6032a78b976ba89346043c0a49816c306d0235f7
-EBUILD qtimageformats-5.11.1.ebuild 604 BLAKE2B cbf2b5c20d8e504e2385902fc915e7beb77c82c042235bcb0c20f72e3dce463acc89e02611c6730ba3a86568f95c4adf446b932256ab128747e3a1001e583de5 SHA512 855a327ac234fe3b1eb359ada6062ef48e7f6f8f635ce6d5ced9086f283b10d54e9465e3666279d9c213953a6b022ef9e70fb26e5660548181aca736d061e605
 EBUILD qtimageformats-5.11.3.ebuild 604 BLAKE2B 7c45447e5e3bb32ab169001cb87497bf3b46b47fe3b16eb192f3836a6f0bf005571bc6422966835b06182fd1856bfccb3e40dd7c39633f72e8d7a2925b7f64de SHA512 5695724e7476fff4f2fbfd10632df877d6d53e4abf8b310905a5c6f48ca9c5d2d247b9afee3370aa4d54b96cdcc6c2ceb1add55063374ac0e6c5d227a5e0bf44
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
deleted file mode 100644
index c1e1d336a28b..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE="jpeg2k mng"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	jpeg2k? ( media-libs/jasper:= )
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	qt_use_compile_test jpeg2k jasper
-	qt_use_compile_test mng libmng
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 563b4a37ddb4..a24b4da69a7e 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,5 +1,3 @@
-DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
 DIST qtlocation-everywhere-src-5.11.3.tar.xz 5589440 BLAKE2B 544d90151fcbaf8a75d374e4acec9bbd78b63c2dee0258f1e08e18ffb94a86c91f63dd8c9215af96e3648d50a40fe6b66c105abec0ab6dd4473903a06f2d0253 SHA512 880cd6983bc0b4c5ac5a1edb2b3ffbe89f133bd819e4bea4fb8e91ba8d847ab80572743e3994145ee6697cb2fc24c393ac3c4ead847a022d848799eaa4982716
-EBUILD qtlocation-5.11.1.ebuild 919 BLAKE2B 2cac5157ba1cd250468e115409174f7698e677b3155be082389d391b823fde5ca828d8eb92efe1e5337a91397068fdb427035247042ce6cc8cb5734583d34440 SHA512 088d1ddc83eadfc286b904b2e0177dfb1cf119bcfce3044de97a781c6639baa427c154caffaf11d2d44d7246b029b8fb1c4af5d8a9dda4fdeeffb0f4a702ee7a
 EBUILD qtlocation-5.11.3-r1.ebuild 924 BLAKE2B 0608a37072401e2d5b4872976abc693f040c81cf8baa71dc1e7be5d3b229b44a4c794f36731a7885c297d4531f35aa057889da32f02f1c7575df1a315b5b32e1 SHA512 85a0f48a04d7dea9d07715599d21d7b1c2a334d2b338082296787f15fdc9b8654a11992ee1ee612e1d5cce2befe3dd267efd2efc28d69ba339eb4b6296a4774f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.11.1.ebuild b/dev-qt/qtlocation/qtlocation-5.11.1.ebuild
deleted file mode 100644
index c16615160746..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.11.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 298f600a82ae..8af4a3862f3b 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,3 @@
-DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c
 DIST qtmultimedia-everywhere-src-5.11.3.tar.xz 3710012 BLAKE2B b1757e80914a41913846dcb890fd56706b402aa0498cfa3e58277e8ab50e95c597df1b32dae11f146283d42c874ec03d8d33374447fc71f529c30d0e465c14cc SHA512 1c9b8f3392ac0c7e63a05d57fb74473a89edc9f2e482d8df97761ca20efd13bca2c1c68907ab4b4af71a109a783a641c2faaf72e7df90fcbed6bcd6e13350567
-EBUILD qtmultimedia-5.11.1.ebuild 1443 BLAKE2B ddb6f0ec27097e57174187a1cce1fdc007a3c7a81ea0a74cdff3d126ae8ae2af69b8ffec9815ac50332ef6b6020a37af9c6b6b7b2f48f67525740a52366f89cc SHA512 c812b0a72e508b4548b1d0addd13143d5e149aacdab73068c37f4d9be7dd3afdaca30e8553940924a75a7c02ea45ac06daac0ac0b4edd751ec3de3308e7bffb2
-EBUILD qtmultimedia-5.11.3.ebuild 1451 BLAKE2B daf9c6029f91bdd7a654034c7d7d19dc4827de26507d2d4331709d398c9c5cfc74d0cf13af56edc9ea968a17d73ba6c8269e1b1cedba7cfd66f52abf703c7cac SHA512 ba3f754e1c95b3dcd773a464c96bdb2eb7930184e5227446e3eaf324619e0a9487c67b0a5e859d46810822c857bf842d68843dd73fbccca684aefd9bfd1934ed
+EBUILD qtmultimedia-5.11.3.ebuild 1450 BLAKE2B 4c0e7773c5d567e64332db5c2d743c1e8701701a291367bf87fb6c7d10e258e1ccb7a47fc0c82bfb1c01909b8def86077f4ba6c1b04fefe9a30e0216876d506d SHA512 d09dc048fe5c44f41abef3c27a57467ad1cc5e102f3d486fc36331a55735875fce8e638747f297d789db80e3fcb0e894e255b7fbd57e06d43d4ccb391a2b2cc4
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
deleted file mode 100644
index 30a3a2c588ad..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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() {
-	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.11.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
index 3baf64bca048..15657ad568a7 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~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 13e3fc3c6990..580ec3d9c156 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qtnetwork-5.11.1.ebuild 1227 BLAKE2B 37b6daccdee21d56752486e8ec31294d01346be42751afb6f3484f6549c60158e694f0ce4105643e4fbb78143857388ad85aa51739e32a71cce41f49f51b3511 SHA512 e76ad2e4120cb4eb28efd1a12ea2a84e8503d3d7a484e9208c7a11610033ae51f9c43c90e41da156c8a054ad81a53b6bb3d6c7eec97399948bec94aab3bf42cf
-EBUILD qtnetwork-5.11.3.ebuild 1228 BLAKE2B e914d81cba62eb99ac113488a0f2e26ec07fadb2b7c7afd17bc2e4c007fbc607d07390147db2a4124e23ef56270f63ce3b6d5ca86c6f89887c188d2bd6ea0219 SHA512 4595953168e8cab73245edb31eae4a5d9d4e6b2606e95a0c8d45e381a486bd3982faeb769ab77b446b5a6e579470aa04812b9f58f85a45287256212f0acf43a8
+EBUILD qtnetwork-5.11.3.ebuild 1227 BLAKE2B 9ee94a463d49b4235a6752ed7599f89fc3ed60ca5de71e5e44d6f5a11de13412ab3c3f42082b4b728dc72338d0c9bca15a26153422ff6a11765f3bf84e601446 SHA512 a3e150b835b2504663b103fa4fcd80410e2a9ba65a0eccf668a27d4258652d4a75024725bf5c072a2f11692bcfa46311b123554b564aa80eeb1f566fc1594c26
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
deleted file mode 100644
index d4d142fd023f..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="bindist connman libproxy 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? ( dev-libs/openssl:0=[bindist=] )
-"
-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.11.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild
index 885278b0ad73..65b450ed454d 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="bindist connman libproxy networkmanager +ssl"
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index b4fd252e52b1..ed32738f22dc 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,3 @@
-DIST qtnetworkauth-everywhere-src-5.11.1.tar.xz 140468 BLAKE2B a64cac71f89ae44b0835b8c7d0a492c24ebd51cfbbb5a5074e33292d2e2d0260658e6086a744e21e2bfb993bb1b34b13e093fdec7a21032725b1879228282935 SHA512 1f2b55870d61027f4af00d54507baf4953f162ca63a4e571a9c6f4095daa0235c2a93f67515cac627ff0a6655d94b01a3b3ba759bbbf75f9b108efbf12777c0d
 DIST qtnetworkauth-everywhere-src-5.11.3.tar.xz 138740 BLAKE2B d8f5dee083314bf37984063a41944b537ddcef010f31d769429136e17c09e7be43cf8fe68e41ea0cf678018f744b7d896bc07798fd545e03594c1ffe0117788a SHA512 4d7dd27b869c9c3ee6fdc745c0532b2efb2b57f7d5447798bb2eeeb62002f856cc21b1169759baf33b060b2f1253feb9c9568dd28ed4bb41cd37aadf4a784a1c
-EBUILD qtnetworkauth-5.11.1.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
 EBUILD qtnetworkauth-5.11.3.ebuild 373 BLAKE2B 645d1d2ad1fa800ff3c5411de1bb4a8ead1032d19c20d7ffabbf1fc6a9a5219d721938b195170ac646f8b613388239f5c455122a159029268327531d240c343d SHA512 92e3f6bbaa0bfb4965bfda9532cc251f284f8883965152487460e960309ad450aa5ec3a092af0701fdd0987ba45fd7a86071bc7d2a96d84553780eb346f3b15a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.11.1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.11.1.ebuild
deleted file mode 100644
index a1e6dc628e9d..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.11.1.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 1c1b33a5173a..c80f0dc5b37b 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qtopengl-5.11.1.ebuild 648 BLAKE2B 29ad8b6f8a55384ce7d705381958bda385f75e38842d3106f60e1f91a7aeeae23be06d237c8101c2965e34120998c002f450a14e0c36bf73e1a42df0773d7a9c SHA512 1377840f6635c1b882f860c35603881934a8a9d317ca488f4efb8cb2616231ec02f396dd37fc2553910db9e41a9162821bdef927acec8f4d27007287c3083ea5
-EBUILD qtopengl-5.11.3.ebuild 649 BLAKE2B c65905e74c8d295fd84fb36bb51f33011a478ec7b7ce54dd8c978b958ed6ebd11200c5bc1cab555046cad0273baee30c381cc738ee851fa2a7f86d7e422d9d66 SHA512 24bac4b4af06cc31ee3ca23c4e475ddcfaa384406b764738efa9aee4d303e6443efb29dce056b4187f8096375e39bff68278193d0868a55f8698e6fb6a7c4aa9
+EBUILD qtopengl-5.11.3.ebuild 648 BLAKE2B de74bb381a195b5efceecbc51f5f8c7c2a281a8a0c2f88b9ac069d5de4f0e22753d27f4a5b3268987a65a268d94094c559d4a391dfb4eef4954b98844146b4b0 SHA512 65c30d83589fb9a4ab82c4f47aeb3d2c9019226c4536785b25e9f57e0fc3b9a643292e944acc118a0acb4d9c14b86d840766eccd8f179ebe19a71fc1f515066f
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtopengl/qtopengl-5.11.1.ebuild b/dev-qt/qtopengl/qtopengl-5.11.1.ebuild
deleted file mode 100644
index b397caa7e2ee..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.11.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="gles2"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtopengl/qtopengl-5.11.3.ebuild b/dev-qt/qtopengl/qtopengl-5.11.3.ebuild
index b2b041559326..60d9f277572d 100644
--- a/dev-qt/qtopengl/qtopengl-5.11.3.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.11.3.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 7edb155e257d..bd66f041cc88 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD qtpaths-5.11.1.ebuild 409 BLAKE2B 309efa6b311d563f113fee2568e3f63d3ea0f5d3bf2cbf87a686b3a3a261840f02b03f3b1cd40650e008fe95b74a1d4144ee57590c669ab11a5e9c4f8f244153 SHA512 475dd23f8856dc2da125998b5be0481a27b20e3e1be131464bdfedcdee5063e13d66026b903eed9c6b5b822c978005a60b5a63992e8dad320840085d3495572c
-EBUILD qtpaths-5.11.3.ebuild 410 BLAKE2B 826bec44cafc609c8a13decaefb36f7b432be922e331d8a9c6d42e10100a39695eaf86a63b1141fd58143eb63ad08ae5bf0f733f147fdddbaa7c1998b37844b8 SHA512 621f4d900af702f38e231ed44c2fada35164d469acc116a28b2557c71d8d2cb4f8c698dc07747562c3362a69f0baef883ee4659cd3b46d97d43b1ad2aaf643a4
+EBUILD qtpaths-5.11.3.ebuild 409 BLAKE2B 76a13915e6303e211a8333ab3ff36f87af44da44d02c38685845298e11a14dec91a1e897dd283c7fb03380551d312798ba36a8a5774ddbd9e86ea3f9637fa89c SHA512 8cc000649802ee5f6adb4d8ed51b5714d8c9d938a20e7ab0c6ae37982f75cc3cef8be0a9b737d31d39028aa9a7a487f4cdd217d034a9c9d360d6358de6988422
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.11.1.ebuild b/dev-qt/qtpaths/qtpaths-5.11.1.ebuild
deleted file mode 100644
index fe6a2d0d28a7..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.11.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
diff --git a/dev-qt/qtpaths/qtpaths-5.11.3.ebuild b/dev-qt/qtpaths/qtpaths-5.11.3.ebuild
index c4bb438a6013..2c5adce63321 100644
--- a/dev-qt/qtpaths/qtpaths-5.11.3.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.11.3.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 28cf2bf9aa12..e0c248aa11aa 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD qtplugininfo-5.11.1.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
 EBUILD qtplugininfo-5.11.3.ebuild 370 BLAKE2B 5f8a61393ef67a56114aacd5d7d9145338487fb83243e12a21856313115b5a4071610030aaa1b8b6a7f92bc6ef32b957526a534bc958faab7aa810a7bd08552b SHA512 083a4c81950dcd4f84c2655c28fe5530adc6ca819f481469f312941e42f2630dc130bbcb104051f233965053add23dcbc1aad4cc12a74af9d11df3d60dda60d5
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.11.1.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.11.1.ebuild
deleted file mode 100644
index 43ae95d1cf5b..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.11.1.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 6f0cb18e3770..ae57cf6f811b 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,6 +1,4 @@
 DIST qtlocation-5.11.3-geoclue2.tar.xz 7556 BLAKE2B 2648b2e8aa8dadad467c7a3ea352014ca832021b12af0e11c563e328d4b6321df8d2784744437e9348feda1ed443c0e56882491b1811e734d43b036e6b5e7c16 SHA512 226ae607b4a0d55ed3207a19932ed685a44e688c6b27407d576fac73e29be478ac3d3b06d93a3bd594ee6443648a9c86b9746366e6765451080af4c1b2ee4264
-DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
 DIST qtlocation-everywhere-src-5.11.3.tar.xz 5589440 BLAKE2B 544d90151fcbaf8a75d374e4acec9bbd78b63c2dee0258f1e08e18ffb94a86c91f63dd8c9215af96e3648d50a40fe6b66c105abec0ab6dd4473903a06f2d0253 SHA512 880cd6983bc0b4c5ac5a1edb2b3ffbe89f133bd819e4bea4fb8e91ba8d847ab80572743e3994145ee6697cb2fc24c393ac3c4ead847a022d848799eaa4982716
-EBUILD qtpositioning-5.11.1.ebuild 836 BLAKE2B 470c9b44e443dd990566d62cc182ee2f8e73a5d0f7a925e0049bdfd2078375ff33a5566e145af630bfb35477c4eeedb050e7339dd269cb4e2aa8d2c6485ca832 SHA512 dd3aff4b9153299744e2d77c49cedd5b6e108980a161c4e21bb8b60e84446b48f3a7b42c2a3e97d084fa6db2fca578cc7c9c6f174e3a05ec98c2f0efcfe2fdf4
-EBUILD qtpositioning-5.11.3.ebuild 1069 BLAKE2B 57491cb531e81a9435f0d3c0e0d8cadc5431097e1c1d94902c73c93d39c8d5114bcb1cd323fec6e78949dad88c3f8e1356ff120375919a71cf95d169eef47588 SHA512 991d6836f9403cadb1dc8de9ca4161970e838d5a6bbcfe682d6744c17dc9b9bd0040412670151736c49234cf6fdffa1fce845bd0b352b4a532072805b5d19b75
+EBUILD qtpositioning-5.11.3.ebuild 1068 BLAKE2B e10fcc7a02f6f9287f613d3dfc7d67e713283ef9cd7cc65a1b2d9cd73372940aeb18767ed6e09c62bb957cf7ad0c1b9d2fbe3b21388c3525656056ce07af8125 SHA512 a27137f174f07758935d3c22049da9b592961e6ea10a502edd6ca3af7353af0f23e1d44f908943ff2a49629b7bb58eb1a2fb2682c1bca01e379f1754e2cf68ea
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild
deleted file mode 100644
index 14efefe89472..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtlocation"
-inherit qt5-build
-
-DESCRIPTION="Physical position determination library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 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/positioningquick
-		src/imports/positioning
-	)
-}
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.3.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.3.ebuild
index 31c6fb8b3b8e..02f5a6b70f29 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.11.3.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.11.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Physical position determination library for the Qt5 framework"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${QT5_MODULE}-${PV}-geoclue2.tar.xz"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index a7510ee1b94f..ee9d5d498de3 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qtprintsupport-5.11.1.ebuild 773 BLAKE2B 81a9e6d9b64142e9983ff20396a347c4556f9ba232021a70d2d10d7e896ed2ba90ad7bb20b381ef776d6ba55545d5fac62a9c91547b464b80be1eeb0276ae688 SHA512 7cc39b7c8dd450fbecb0afb210f78569bdde73af3044a155b09dfa6387c84582e234c21879a8bc36e58523bc21526cb74e7a4852332a082dc7b0551a4c994896
-EBUILD qtprintsupport-5.11.3.ebuild 774 BLAKE2B ad5156df8b02d202e789dedc075e57aa38270dd3a8c136bb91071c4862b381d894b8c2e805ebf3d68453658ac305f1a0851e69c9e95ca67de3d25e4a8984dd27 SHA512 0cbe6840873b6b61c9bc2ff16bc66a3a983a728c8d1f964d41b983a5947b6b08fe985f53db7eb01eeb7c6c536ebd2b7454f040050d24fda0482d4fad250b6875
+EBUILD qtprintsupport-5.11.3.ebuild 773 BLAKE2B 515f24847c2214fb77ef2b9b333a0d438fb9324d40bf8825026cc725ba31e3f70481f1f813c7869e5af4480e821a267bf366a0e63f47e6f8af7084c6bce41d39 SHA512 6ebb680db791e15139ccadae6ac32e0d43a95bb4e83c0945e8be7982de9436868310d524fbed743b67c9ffad493f1da109760fc4902ef467cdcbabfe812e2f11
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
deleted file mode 100644
index 80fc60a6c4ea..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="cups gles2"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild
index 8e16869817a8..fe044af955a9 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.3.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 1e998ddb2007..14f6db7e5f0f 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,3 @@
-DIST qtquickcontrols-everywhere-src-5.11.1.tar.xz 6058072 BLAKE2B f49b51c72486a5d514d16faf78ffad883e3597f6337d4103bc4b93d9cbce681853c38563a2f237308f8ea2362d8486284da308d4d815388457b429f3a3eeead0 SHA512 d12cffe5a91f10e37b2ebea435fa147508fa60dc83076a1fb1c26d4ea16666c13ced0c36a5222092b6c4d6c1c723bed5b881fc33557353e09cb9aca068dde26c
 DIST qtquickcontrols-everywhere-src-5.11.3.tar.xz 6053336 BLAKE2B 304fbc5e0028f49662dd077349a28ef974470aa4e4389d633a409b6a756c24a730a675b774429246e1923fa1ff3f6b33b8cea75e588c58c55232519c4af45500 SHA512 359a2509e35240b50dea06e7197ce974a92a7f4fe902b7f6c40b087945eaa8faa0395d3d35a6c79c3a5bc75fadc75688d36338086ac67bf2ab8be795a60905b7
-EBUILD qtquickcontrols-5.11.1.ebuild 744 BLAKE2B e5b372e09066019828e73cf2d883e5073e1225cbf129ed0ce5a35665c83bb8a7d9ec29e347ce72c549d25362dd23034143240830d9291ca92713c9521daccb20 SHA512 cf556d46fb810c10b0d2a9502d5e8634c8cb202adedfbe8568465937297e2d1d79bafd2fca358a760799f2d90e5c93235aeb208652df34412f7f247355efbd24
-EBUILD qtquickcontrols-5.11.3.ebuild 745 BLAKE2B 5ff3fc7f2cb1c6642636fde02187495ee5e9e3292269f516c5a30838c0264563f33ccf6b553bad17da40ea157dce3fa3d1b093c2a556f70a510bb0e073435c37 SHA512 74e759b6e404d010eddfaf83fd4ec628cffaa49e9be05430293bf935d0316a3053dae6504a035048046630b27daa0cd130166d633e3a28c1457ba42f91b8c1b5
+EBUILD qtquickcontrols-5.11.3.ebuild 744 BLAKE2B a2852819d287a0992f4eaca8d5e0a1931d5de6ab67b9f4b19586a48047dc79813f563f97df48f43f4fd1e2aefed579bc1a8bc7c33607325b4e467aa1b239ddba SHA512 3efd926e5484f5390a05251b18c64e4117059103bc25aaa29c0c39081abb23b1b482d22aae480e161452ff502b3d0fe88094380c330d8933af886c22f80922c4
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild
deleted file mode 100644
index 3acfb4ddea1e..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.11.3.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.3.ebuild
index d907c114366e..94fdd72f8eeb 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.3.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index c0fb08824b7f..7161084b9b03 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,3 @@
-DIST qtquickcontrols2-everywhere-src-5.11.1.tar.xz 9032192 BLAKE2B 42ee81bad1cd3888c770d559ad91fa38e8ae57a72a5b6a1faced4cd8c6292e89392ea1fab14f821ed04aae5b7ac997b111f64b9725f0b35bd3b685605d367e61 SHA512 b4d42d5ec5abdd819badfef147492fecc8ed433b88705c418845d75d35ee5880b11afaf70f17e3913855ccaa9aa47b3a9d497350ecb105b4f0672cf29111eb68
 DIST qtquickcontrols2-everywhere-src-5.11.3.tar.xz 9042632 BLAKE2B fa057831927bc429f2f3b906165d8fb4299d8fc260f35578c7ab5e68a99056a50848d110f337cd2440d443f123c7aff779a57990bb8232319eb1e9c8b1e91dba SHA512 b0591ac1f6948dfea2b43691f8dc5187a4d68142c61279fcc4387e7e9ea9ac1f4062d93d4adc4f8de28a39ab86a5d035f72f0c7eacb93050f2c002d7a0fc2caa
-EBUILD qtquickcontrols2-5.11.1.ebuild 600 BLAKE2B e7054d07d92b1b6e28e724cbe49523ab80fd8bbe56f02a3e8809d41c0c7de7837a5e3e9c59e2a6fd3d74e0fe57f09937451f57599b2eb9c52ee283ea6b819e55 SHA512 a7d0276b34bcc3115a56b3e63546dfe40d1216ef7b7de8a93dde85d3acaf9308d1d72fff92536cd1b3347e956de6c71f990a67a3934007854fe7de93f3f103cb
 EBUILD qtquickcontrols2-5.11.3.ebuild 600 BLAKE2B 9a7767dd29d2dee265782b08d341b7c113d0cbd3843b0dc3bbef865f91f3b2d66c0beb1b67115bd753b23e70b7b9b22a656092870a863caf1b98cbd809c62814 SHA512 83527f3763478a3f65b085b90002d04d34be9f93c82b490e44860def7a73eca94e93632ab70a561b423c62a8686c429c37353f0f09347ea20a2d82cafd5aa99d
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1.ebuild
deleted file mode 100644
index 36e20ea2d6fd..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 341c7814410f..c794e8e8f5fb 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,3 @@
-DIST qtscript-everywhere-src-5.11.1.tar.xz 2671428 BLAKE2B 8cc74db4f5b33e299964f81b00e634965f7471d191726521726a5f2556a8eccf344e7277071f817a9fa0c40856acdb955258e9491966b6f773701e809b73982d SHA512 609ac6675341fb2707ad3b91e955a430846253741931ada2343ab2d1ad27169a60548b1a2621369384043a4c5b983e392c3fafcffd50237563b9f4204123e411
 DIST qtscript-everywhere-src-5.11.3.tar.xz 2674692 BLAKE2B d209df1f632b9a00973eb043660c8a4a5e5c178fabd3bc715f91b37b781ea3567ea6fd7a2a12d462a63fb858c98a2e3ae703e8d7297a37c5d0dcc81d2f972d9e SHA512 987f9a13a698e3f498ea7408f4a9b2379969e901aa6b672ab2733af9d65fe79dd27af5f67aff5d7ab1903b5889c82359970ac81cf27f1eb2bad1e36eaa376b30
-EBUILD qtscript-5.11.1.ebuild 686 BLAKE2B 49dbad48bf8a63577e7cdfd6a4d8025a64ee33b7dcf84cb34119f5a000df0c9e2ad0e5a34ae9cffa9a1df949a18ae0158b969c6eed61507f62f670b8fef2c339 SHA512 ab55353c86929c1d9be2105e3d1fc495c406fd8c704217869d943c96396309393c8718173423c9a6afd1a338426d8fcfcca98e9d322858a22f9cad29a928146b
-EBUILD qtscript-5.11.3.ebuild 687 BLAKE2B c624eeaf0ffb01c704d1a4e8bf039729c8990a533b4111b9fd20efd8b6c2b116b115c2a61346887bfd882d1a3f39ce5176b3cd7ae7d3b404a8f8c3c09bb27c5b SHA512 f6ffa490ef7f7c37e8f3c949d5b20d4762294506e474a5f19e2e684fc686025aa0dc42ed85d3fc5b23e31b68e1fc6e7b2da1e7a4598a26e1698d65f1e4ebf5b9
+EBUILD qtscript-5.11.3.ebuild 686 BLAKE2B ea02e32bb1a8e4ecff7407d6b62b936d4499fe0318047b2c454e78a5536aa2ad5c0451447a9523678b47b8da2552ff5c90c7332f05bfa288451e47841a80c088 SHA512 b2755460d26423256636273dac2f29306737dc75f08c46c1104fdaae4efd0b6f1fc1e11b177762b446ca9e8c5fd2854713f3e2f28022c3591990582eb464f284
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.11.1.ebuild b/dev-qt/qtscript/qtscript-5.11.1.ebuild
deleted file mode 100644
index e9ee8af1c491..000000000000
--- a/dev-qt/qtscript/qtscript-5.11.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="+jit scripttools"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	scripttools? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod scripttools widgets \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtscript/qtscript-5.11.3.ebuild b/dev-qt/qtscript/qtscript-5.11.3.ebuild
index e139a2f6f447..22ced077510f 100644
--- a/dev-qt/qtscript/qtscript-5.11.3.ebuild
+++ b/dev-qt/qtscript/qtscript-5.11.3.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 90ba19d42143..cf8f4065d4f7 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,3 @@
-DIST qtscxml-everywhere-src-5.11.1.tar.xz 436148 BLAKE2B d26d8e54bc89685110168043ec876fa8bb34c0c23ed31c625d26f71e82283716ed70e3fd71ad02233bd69546ace02cb87549ef3270e3bd43c0758db480db3639 SHA512 d64dba323b009525078e999e0972fd09a16bb806980411ce7cc452aee0951632ee440f71c2b5124cfd6ed5020aa869d8490017aaba374a8d4b83f43c1f0b0689
 DIST qtscxml-everywhere-src-5.11.3.tar.xz 433500 BLAKE2B 7d7d961d2ec8e91dfb6e359ee3cde840094ac22f71745998b262e5a1d489f38f561ad163e36173c7758618213970bcc80a2f327cccb7e80d9b89dbf7ee0d8ecf SHA512 d162da8c11a24b764b793e446a9c1ce91068296e8f79525a874420fc97f0a9748ebef84f0fc0d615b6603025a3d8897f0ef14bcdcd95209f518d691dd457a93e
-EBUILD qtscxml-5.11.1.ebuild 369 BLAKE2B 7f37bc1afa67f7b17232814322013ed3f7c35f0427b490c00ed0d719d1489b9c9a7c3b4ec83c17688c6fe769fe1ccf608f918cbca4692f199c2aba236fc55939 SHA512 e0f7f54fe57ccf4b339bc7981dd321fe991aa48f8b3a4da081a6f60a9de52bbaf329dcf3886b53914878a801673fed5f7c132bfb05945089c5b87725df0e5b9d
 EBUILD qtscxml-5.11.3.ebuild 369 BLAKE2B bc24e3bbc9353ffe7deb038410700c21bd8a4592c6f60d36400c7026bba0073c0ae61a4fdc805cb065e486059dec6c720c1220cd8cfcb74fd26212add21bdbc6 SHA512 5ae35dd30a95e8e93fed6b502d801f32a7253be91363e4eece69f9cee6d01afb687c04a84a58f7ebdc1ecc9c8389f4ac2dcccf052b72d97df721e4ba33df6c54
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.11.1.ebuild b/dev-qt/qtscxml/qtscxml-5.11.1.ebuild
deleted file mode 100644
index b0ec2d3036f1..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.11.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 b7e23e4228f5..f251e15b7994 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,3 @@
-DIST qtsensors-everywhere-src-5.11.1.tar.xz 2033508 BLAKE2B b0b99adafdb96835a019c915f57bdbdc76dd965d32081a2b8d4f1ce60a06fb9d1c450a2949a1ca2475aa303514e99ebe695dbbd0395140c7edba863731b8b32c SHA512 5da90766ec979ee51b3df97f794b1661a1103b80cc57941516171d5102b54c15bdf1cfabde21e5b94ddad324686a6a92171193312e7c6791d5de63832452010d
 DIST qtsensors-everywhere-src-5.11.3.tar.xz 2031168 BLAKE2B 089c77403a615dc1448646c5ef73807ad78242840569dc20367afc379aeff6aa8d925896c549568a3af913c5458a0b9e05245fa45523cccf1c89d6e3675edf90 SHA512 b0eae65b31be1c96870d29066c79b170f1f825615a78de902173f64a6d0f132678c5bf26d0033e110dce3ed3f2b99750a3b4cf23e1c13f799a9e51a6cacab10b
-EBUILD qtsensors-5.11.1.ebuild 531 BLAKE2B 2bd520d3491ea15d55955baea1d0bdd9491332dc7bcb391999455b16b94904c6affc104a02453f7b6d2f2332fb05b7e6c61e4b64578930e28f8933caf3a040d2 SHA512 205a4e7ba2c2f1e78fd612909dbc4651b4fb20837940da51673a56f71cf18ba1977ae0e93c0b98faf34ab01dac990b868df20666b76bbffaa4aacb8b78367905
 EBUILD qtsensors-5.11.3.ebuild 538 BLAKE2B 6e539621dce97d8fdbf23eefdd1cb49c9ec0e7ef80edf9dfdcbfde3fab5bb58921d12053f1ef81856de5649023f49f06a396522250a1df7bf230ea81ace59339 SHA512 80ea7ebbf72b8baabfabda6d5c814a3eb80240264d344817afb0b6c0e9c2e3bdd8987ffec836681e85cec34e3e2fc0a800189862f216899e5313854d89244b01
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.11.1.ebuild b/dev-qt/qtsensors/qtsensors-5.11.1.ebuild
deleted file mode 100644
index 4a7a7d99a6bd..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.11.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Hardware sensor access library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 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 31c611c4fb17..a994b144aed7 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,5 +1,3 @@
-DIST qtserialbus-everywhere-src-5.11.1.tar.xz 320844 BLAKE2B c55bfb9858afaeb875b48f291eeca138e9aa7597eaede14b40235af0db64da4e71fafc1cad840d4717487d6f614305f9ea6f89d105006392e2324bea193ae625 SHA512 9469fe7dc6d334eb2b0737cba62db72b7bd8af56631dca47125edb595a9dbf4a89be2d4658f6daf13d13cbe6b01915d61cbeeb71cd804612825bbd78692fb682
 DIST qtserialbus-everywhere-src-5.11.3.tar.xz 318484 BLAKE2B 5197dff9b827e58f1e7558517d38617969f8acdca04557ffe92fd2178370fa3c48a59a69b119aa56bfdb0bfde9d4dec17174425751ef32e7610c07499fd2f9ac SHA512 cef0f34bbe6f56705180eea75f4bba622931d7a596b245d8d49dc61d570cf2f163fadbd6f9bc6e84745f4d76dab9ddc6ebdfcc1ec6078f2e4a154d55f0cccc91
-EBUILD qtserialbus-5.11.1.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
 EBUILD qtserialbus-5.11.3.ebuild 372 BLAKE2B 771d10d088c56e91fbf5c3a87699e239438f4028a2514d71ad74ed5ff182646044daeb9c9b612808cdeb053da34ff8cf6c5d2dc3a453b0cac9052bdecf6e6ddf SHA512 9ec97448ba9d1616de5c064b3336bfe2b3b30480787ae7b21a59f50e09133d1a262dcc1444306d62c2bd2083bee70b8b1989dcae635c493bfd7d2f3d1e2707f0
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.11.1.ebuild b/dev-qt/qtserialbus/qtserialbus-5.11.1.ebuild
deleted file mode 100644
index c6a1fac19557..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.11.1.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 5372d5926d6f..515a5fe59dea 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,3 @@
-DIST qtserialport-everywhere-src-5.11.1.tar.xz 301692 BLAKE2B 8d57503dbd16d142ac72dbc496218d57ff92212b44e8a504f3b6ba27b2bdb295061705c1318000d50c2383ce815c8420b056ea66720f62338a1b98785d37c5f4 SHA512 2f13122438dfe91c6885534e4470e119abf1c7134b1d344e9c0700661c002566f483aa2bcdde53e4860df349fff4ff8ef05bfafb0aa1bb4484d3e5d07c989404
 DIST qtserialport-everywhere-src-5.11.3.tar.xz 299140 BLAKE2B a10c24eedc425262145b705b7a264732db6a47d1bc080f2544bdb6873b1e7f6d1c25e9b27a3dbb5fd3eb697f06c4b057c072112090ce5f769f765d858f41860c SHA512 2c09a0e47bfebb494cdc767c5268bde77ef7dcbc665cfdaa0b17468a0cebea0208ea8019d0387622d2db63387557699fa30e043f3478dbddfd6b8fe909a7add6
-EBUILD qtserialport-5.11.1.ebuild 547 BLAKE2B 253f9918699b2c0a847d218288d3960016928901a2f591d491c807b168e78e637139a9e0fd2fee14d19b2869fc03cb1f9b6894f0a010a570022c9b54149e5ac0 SHA512 be65297a14a40d0f1679eddad08158d8eb1f339804f717e4a03f5c6b245f28d4ac9b341d0d9543a680b684fb2d227ac661b011d610122c3f13c787fec2bb7654
-EBUILD qtserialport-5.11.3.ebuild 548 BLAKE2B 2e65a4c343362a52fde649d73d15f1d45bba18da223add202ad227b39c73377cb8f1a153a3fbfaae52c2996ba525ad4dd81e7af8b676f6bd43abdc4c420a1ea1 SHA512 e2e7c381e6f7a30b28efd59702c4a11156531b88d1ea111580c3ff70c039b2e5e2cba9733108ee55a914369d088fd46f0e86bacf5309402fbd3d60bdd2098e8f
+EBUILD qtserialport-5.11.3.ebuild 547 BLAKE2B f8a77c7196c05e46d927185541d4aed490a075667731a52f367e2d2c46c1f963c64c713b96032f43678df9043b30774319a7529c0dd65907614639cdf4fdfe32 SHA512 232c5218ce78bd45489b573f8a35f0375c28200a89dfcc333bd0dbd998ed02ec8c5d1b11c00e5d411582ccc3c22acc3775ee1a00f0b26f84f17154b722876f78
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.11.1.ebuild b/dev-qt/qtserialport/qtserialport-5.11.1.ebuild
deleted file mode 100644
index ba2dbc6be053..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.11.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Serial port abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# make sure we link against libudev
-	sed -i -e 's/:qtConfig(libudev)//' \
-		src/serialport/serialport-lib.pri || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtserialport/qtserialport-5.11.3.ebuild b/dev-qt/qtserialport/qtserialport-5.11.3.ebuild
index f999ffd45cdc..aa235b06f951 100644
--- a/dev-qt/qtserialport/qtserialport-5.11.3.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.11.3.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 669ebcbd233e..ff2b8a11f7b0 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,6 +1,4 @@
 AUX qtspeech-5.9.4-nogui.patch 321 BLAKE2B 0b97c282f271a1ba1d7cfa2ba15f75bb2964c3eeaa0a946346ae0725e2a7a9198fd0dce4bf85ad9b0d06e49234dc11203d5a0f52e11e17b879a9dc1712014e91 SHA512 8d2dce3280948bc0451d0f753d415552c556c089d5195172953215c3abdf14100a3284699e9d5cfd0feca83466d1a35945a8bd2a863b325ea5e257b277a0e71f
-DIST qtspeech-everywhere-src-5.11.1.tar.xz 101732 BLAKE2B 2201a78f27851c4ec1d2a7056c6b0b620ff77b73be626940f6fe296baa677c5ee4a8098390be48620af77db10b75b777214b41c8dc3fd9b54f3a3cdf8f613345 SHA512 d17a0ab62083b9a8cef5f458b649b7789b0e3394a660c71f9ea6e6311c5e37edda10b16692817b8e165dd66a38cf34560e37940a63beec99ece3e2ee862adf51
 DIST qtspeech-everywhere-src-5.11.3.tar.xz 99516 BLAKE2B cceff35946e7e8012d628b5d1093256bf68d512c750b4f5613456e225090a3108264046963ca97aeac160293d5d814db9f5286126797f22437f6fdc0e233ebdd SHA512 f4465b0eac4690fe576c098704d992fee884ede3219a6b032608b877748dc670cec6dc592aaccedaa62a0b2c9d552b9e1284bbac44af6e4cf074bd00918284be
-EBUILD qtspeech-5.11.1.ebuild 473 BLAKE2B 22ee317b691e239705c117a4bc8ead93995e7124d9e0d2400f1c6650bae61c386e09011c5ffc24006a57cba0c460522735f9ec9ebb19a1b4d0a6e7dc54a94f8e SHA512 150110b763642f1ac1a1468cf3e838b4d180f1c3d531dd2ebb79a51fc968688d6a281fc8b143aa7b4dc2f56d3e93c80fb177d1603266d4c200af2d0de11fa0ac
 EBUILD qtspeech-5.11.3.ebuild 473 BLAKE2B c9853f6f33d29449a864cc183a7aaa51c48b72062cb44331460b1b602ec2df616794dca0bb2d32ad2e014241d9c54178c936b665e1d168e9e597254b696d3d2b SHA512 ee7813a376d775866fabb6cad08bd9f2c179f596f95bda3e671b6c62b6eb02e5efa3f5d76fc729f86a9f17deec0461375b0f8ac429c574d354faebeb89261394
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.11.1.ebuild b/dev-qt/qtspeech/qtspeech-5.11.1.ebuild
deleted file mode 100644
index bc7a94c8aced..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.11.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 d69697d4ebf8..7e0331b7dcc6 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qtsql-5.11.1-r1.ebuild 1504 BLAKE2B 3c202a8d83c7cca11a939e91b11dd906004a0267e8c29b0a04f118912b67001a3e35f78c246b467df2417225995bfa8b954faf6174554cd77bef4cbf8854611a SHA512 580bc985a9bc13b9d7cdf4ce2de19c6db967e1aef2e00e0066c791a7bfc6338c843a472bf7c906f9473530e79b0ff0bd97ad1f443b928d0186c28308560cdeee
-EBUILD qtsql-5.11.3.ebuild 1505 BLAKE2B 10ee353e0422eec86a407388ac09d037bf5cb00fa35b21cada2f9aaf785cd2ced1904157952e0516e41b665bf66c3890ac768240c2d8946ba0ec01e4a0eb0788 SHA512 b3e41f361a0aa307a9916b988e673782ac6101627c784981fd61e612fccfa738c84f4d0403abc4663dc7a51c9c204e0adb4d8cdf871eb08d97e6b96d10abe9e5
+EBUILD qtsql-5.11.3.ebuild 1504 BLAKE2B c2c9b5485ebb341b471c67713b1fd21c8eb7553a770f9a327038b5e661538374d62c2d891890bbc0527bc8994c90770febb06bda856e9fb1fb2cc55c31919643 SHA512 c685fe64b4925208f648140aa918249a0b2008b6a21cbb8b9386567b2c7b760d404cbfe403f1b289ccaaf6fa23144526fccc4f805bc134707335bf3bbb021e52
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
deleted file mode 100644
index 536e5dd413ae..000000000000
--- a/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/libmysqlclient:= )
-	oci8? ( dev-db/oracle-instantclient-basic )
-	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-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.11.3.ebuild b/dev-qt/qtsql/qtsql-5.11.3.ebuild
index 666f6b31816d..3e177179aa09 100644
--- a/dev-qt/qtsql/qtsql-5.11.3.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.3.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 60b6af78d840..a77235ad5870 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,3 @@
-DIST qtsvg-everywhere-src-5.11.1.tar.xz 1843216 BLAKE2B 8e5e94e706872f65189a51f0ea19a69d409de4d60c8cedd376e8e5efe74513370cc0add47d7d158ee386ce96455af27bef6ac3e29efdfc392d00dc7f5e3e7221 SHA512 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39
 DIST qtsvg-everywhere-src-5.11.3.tar.xz 1845004 BLAKE2B 2e091a4803fca45923df3ce61890e9dffe4b90c4118c7bf95263698f8c5f9d6260c350c3ec40d53de0fbd4e7dc7b742fda6f6693b338d446326bd740c43573ad SHA512 1ad20b3b59e6802f960fc95421b7f4d67460fae91219316bbced0ae225ab5d0066322a49cceaa7a86a981e9e56741724bbe323ac76d3478fc1f5d0d04fdb9722
-EBUILD qtsvg-5.11.1.ebuild 471 BLAKE2B 9c70ec4988e8e64134486844a39b46480d3ef4f75f1aa3867e1bc7d373243970afa9ba74e6cab19cb6c0d35bfb751af30a83933fead7b60feb88ca812329c501 SHA512 3a97938d47438a3dbd58c01414126662370e8d0856c30cf32e48ec279695afaf7aae8aa29ba278725c5a8e8f820665dd7185ca9389ce6cd1d9041be50163b357
-EBUILD qtsvg-5.11.3.ebuild 472 BLAKE2B e9cc423a53df9570009b6f111767a09ebace20ebaa10ee98268ff7a13dd83abc65c1680d69e47f1931d826cf203195b3112525ca0a95e7a5d080601384b873ec SHA512 1f3cf90d7d9b1837652c8e48d4a2b36b5e9a38aeb086d5f4810b3c3d34b7773a11592a25a8587921f9ddf23801bb81cc6911d12da2a022733cc3fef05a0a37f8
+EBUILD qtsvg-5.11.3.ebuild 471 BLAKE2B 6834f3e959d3a56eea4ad574447747a9bb8e1026fec477b72455476d125daebcf28915b16a81778596393fdc8ec684415530100952201e8761b1dd8a3f4a9721 SHA512 0b1f74954cbcd0aedcfd4b38348efeb8bb916f694f61831cc7dbe635cf644767bab9e2920cecae1b5beb0a63585668e5c5442b49226bc57b2fb8cee463e84f63
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.11.1.ebuild b/dev-qt/qtsvg/qtsvg-5.11.1.ebuild
deleted file mode 100644
index 6677b11d63a8..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.11.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	>=sys-libs/zlib-1.2.5
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtxml-${PV} )
-"
diff --git a/dev-qt/qtsvg/qtsvg-5.11.3.ebuild b/dev-qt/qtsvg/qtsvg-5.11.3.ebuild
index 850a21d5d89f..ec904b1267d4 100644
--- a/dev-qt/qtsvg/qtsvg-5.11.3.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.11.3.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 563b11786ca0..d748b8b84279 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qttest-5.11.1.ebuild 549 BLAKE2B 01c80ef279cd93f1c03511d2f662cb9da1202272b536263c2e05bf1565e241831697897100d39946b8f67963e525e6d4fb0798c8b435c9c323106f6a035c0ef9 SHA512 9253c373ce486df63732f1a1437fbd65581f41cdd181f8471abc17a4bfa9b3a114c39ad7c12fe74840654ea5300bbfd2299b4215ce209d399d63e6e2890564ff
-EBUILD qttest-5.11.3.ebuild 550 BLAKE2B 290f550f75c31ee8ffbeb2284616be230828ccd5413c8ffe93a6b738da69962364a8ce02adbba69b1b59f83c7dd6d301a70156c675dff321a584923b6fc0020b SHA512 4c6aa61fb61d815b5bd741b4d75ced066b3158a3fb3d16f5dcf6766f58903efcf6a30f5511028289224dfb051dbf3d900f0340ad2fd81b26230f091d3f25a3e7
+EBUILD qttest-5.11.3.ebuild 549 BLAKE2B 369a9d327f7f34d425d37726b5380c10c86d7ab9c3d1207064e8478f7629950a995a1eb639c68ff1972439b1ed9ea95c75548689719ce971ca1d2c17a96589ff SHA512 bf2cbd8b8fc34c4fa617be697b6b47b4d3f1bc3850bc542f249d97b0fc2cb59f6ce674747e03c38fbb09821a6b008ce9444ba5a5e4b9776d6b196a8ad82f468f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.11.1.ebuild b/dev-qt/qttest/qttest-5.11.1.ebuild
deleted file mode 100644
index a84043270b65..000000000000
--- a/dev-qt/qttest/qttest-5.11.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtxml-${PV}
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:testlib
-)
diff --git a/dev-qt/qttest/qttest-5.11.3.ebuild b/dev-qt/qttest/qttest-5.11.3.ebuild
index e552027c5d04..45b589046bde 100644
--- a/dev-qt/qttest/qttest-5.11.3.ebuild
+++ b/dev-qt/qttest/qttest-5.11.3.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 3983d6379766..7d7faa648214 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,3 @@
-DIST qttranslations-everywhere-src-5.11.1.tar.xz 1428808 BLAKE2B 55a8813a471ab14f885f95df6a2205c50424c8892d060f3dfb4123d281e55a1a8f0829ad3b8f1b713bac11a1160fc22a977269bcaae877b80c985c4b2c9232ff SHA512 b817b7be585413e352271204e88730c873e0701f65dbba9f5b331f0c3e0ddc1bd2446f038991bf9eabdd79ba440ea0172d0342b5b0d8b1593d9f55ad2a0ebcc0
 DIST qttranslations-everywhere-src-5.11.3.tar.xz 1424160 BLAKE2B a6ee17064d4fe8d3611e04883cbcc9d69bcf872ca4144605da20d6787c051606afdaac771716bb55f1a970dd8468b8e2aa0602d926d8757b2f9faa58db3f6f61 SHA512 eced9516f3e0ecfd11ddd99b7b0f80c47014110af1c43008c764971929405ee7f5194c3390fe07bc4be9a9ead04e7c06c62584475dbe93c96118eaa16cd542a0
-EBUILD qttranslations-5.11.1.ebuild 372 BLAKE2B cd9c27d53b422e2134f05ebcabf006bfe808ad9c3b1673e0594f689cf2af1f4684e10a775ea3689a78886c40070c0eadcb22ca6d52534e85e3d68fa38b4b5d08 SHA512 2d5cb83a699ca0eea504db8097ba274abe6e3f0252a800bab3e9a3a37175071fea0719ede79167ac8603bf60e64742bdee95bc36c970527afa5095310f8b55f0
-EBUILD qttranslations-5.11.3.ebuild 380 BLAKE2B 98a1486b103c38606d63b90c3a07d7b27b756fac99fa17a95711f306349bf37fa58fa7a7872f482218dd5e696bd4a6b6436d1897ce08719d9a0024a943181bd3 SHA512 c31d5956536aadf3e691f59e568f72c5dc0a31418d3c3dbda40827890d99c182c8dbe6aa5a17ee69c0c4fa80b30dafdd9a99aea21ba04941985c61236debe1e8
+EBUILD qttranslations-5.11.3.ebuild 379 BLAKE2B b28ea149a8f9a00eb918556dfa9850a5f6ba2190840ab80f9a97b05a1ff13912902ebf3e170f4af671b0fb95d943628c47b454c10f23ae60782210dbad3dfe56 SHA512 0336864a135d283c4517a1eed7ae166730487ed5eba6a2a289fe5263579b6abcd41f419907c8cf1c1f3fd1350bc6ca197f507844b85728f504a65af6311922dd
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.11.1.ebuild b/dev-qt/qttranslations/qttranslations-5.11.1.ebuild
deleted file mode 100644
index 82f101e39ba9..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.11.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.11.3.ebuild b/dev-qt/qttranslations/qttranslations-5.11.3.ebuild
index ea82948c511b..5dd5b4c7e238 100644
--- a/dev-qt/qttranslations/qttranslations-5.11.3.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.11.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~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 796e30c1d1b8..29369763f7b5 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,3 @@
-DIST qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz 10648700 BLAKE2B 32ee4cff4951347d8cc6ca9bf34a983017520acd5692322e3409db27fa08aeef2784302eb326b95bb55ea9f23a113f20370bd2d2fc64496919205eb6d9511c13 SHA512 e3010450553cad42850b4cf1b07e157b30e9a6a74b8c551e21ab45a04da76e55e83c08b4421c081eda44e8928c8e0b69f9c8146855a4e02bbf3779f5a0e290d0
 DIST qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz 10698520 BLAKE2B bf4800c07e1f0f1649f81d21192bde613b20b54fd80b4d49136e7cc052f7f60d410f3014c3066e3f5c83b6a6d838f50f73a78bcd1a8df5e3d5e24fdb5875280e SHA512 cd3ce039382efca26842b8a413995d8b6bc26184e6161e8c3cad9ed326381a3f6d29798a9a42a52875886a23aa6a74bf831d70a62a7d12f852b640dd6854d2e3
-EBUILD qtvirtualkeyboard-5.11.1.ebuild 950 BLAKE2B 1f76495c7a076aba6c712baa9fc8767b76c296a9e348f624aa1143fbf24578ae0f97898ec21ccbce16f6c12297ba4e8b3bb75d770bbb383d40c8a7fb64be7c51 SHA512 5e91cabab67c114e797e6a34fbe61579a3dfe5ced0a00034b82c15ef1c70075125e4e4aeef874edeb1aad02493924c9f232765ab9aaa0f346bf404f2d30e6923
 EBUILD qtvirtualkeyboard-5.11.3.ebuild 950 BLAKE2B ca0f8b17d29994560b0e1064447710a752028b6ceec0192ca41a1f0e4c5d9564ac46638810c9d87ea3419c7f38cf20be78ae6909e3436d35694c5420271507d6 SHA512 d13ab77891f16720e9db29554b85092e8dc94851ce12d71d9caf34d97ab0bf8b14e52c38a843fb548c1dabbaaec9639eff5f9a582155bac7a3f3cc678ed0d21a
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1.ebuild
deleted file mode 100644
index 4151ccd9c712..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 9a2d56ded07a..d5fbf8e185b6 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,5 +1,3 @@
-DIST qtwayland-everywhere-src-5.11.1.tar.xz 392200 BLAKE2B 2e65c6bd8c9ea44ae84f608312db6983d540382bfb2a22412fe054f4e7253d70e21f4d0577653b246de5b0266271e40911a7c79fc28b266cc29ff30669df280e SHA512 dc1327ef8cdc9ed9521e9db316da0bcdbe9639b714a2dda7a792c52ba5897ddb75deba1ab89e010bc05cc2a96ede781b9990f5449ce4a2f85e15466a4d6d82ad
 DIST qtwayland-everywhere-src-5.11.3.tar.xz 391124 BLAKE2B 2bc90c7a6f6769bcae7e52072d71f38ad984cc931767613e7972373131c9d58c145e9882c29163190257f07a205bdda63f78833859d2be6d6478126c301b70a1 SHA512 e442a13c61a508d6021fb15a0917b7861faf139fb7dca41ac1a3967f4b8dc82da5095029e4c6120464bd36ecf559547fe2f42935d9980f19298f5875cfb5e62e
-EBUILD qtwayland-5.11.1.ebuild 900 BLAKE2B 81edc7e804f70e0ab5b126d4128e7796794ba303802414c72c35bdc36e0489c9136294c1b4d4874c597f8bd387f84d4d16f0a109a9ee4449ea398086e16b2d11 SHA512 225ccb256c0df03fe9e17ecc5091ba4fa9435f09df0d57e6dd3da8a7d27c69f7b2eb39a84410a2d0d3a12524165412456e823184b8f65dca460e1c4d2dcb79d8
-EBUILD qtwayland-5.11.3.ebuild 901 BLAKE2B c9ec2030cfd5ff2c7885870cedf30fbc809cd615370127a6bb18bd72d4b51c6fe6c39131b9cedc5c5f2ff698e61680c657731129e94fd061fec4a2f0f01d70e8 SHA512 cef9477b7940a2c40885f57ed3d5fd7a77cd1d187d44a0956c845d720afdbfd300dc2d7f28993d7160da3c30786153da17f01d6f722d5def3bfd9c0f9e81d081
+EBUILD qtwayland-5.11.3.ebuild 900 BLAKE2B 5ca9b8b36a7430adc85e566ed4e02d9a54268e683f2871588b1f72dd9c333b7d7328ca9bf4afc707ea74731ea84be78a1c0420b8b4bf162835bf5aa68eb27be4 SHA512 698fabd9d97312675317d0b336562c49c11420af417e5534a89397d1f08de7dd522774c1d8ea462172f80d6e898fac2497275aa648eaca4576dea7d676a40ab8
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/qtwayland-5.11.1.ebuild b/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
deleted file mode 100644
index a1f1e6f3bda3..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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}"
-
-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.11.3.ebuild b/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
index b750c12f0af6..40732e909df7 100644
--- a/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index d29f26976aa8..aad50cb67089 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,5 +1,3 @@
-DIST qtwebchannel-everywhere-src-5.11.1.tar.xz 179700 BLAKE2B 05f945110ec743aee4357ee696bee4ac230489c816b8cc630c6cd1344b5c385412470e2d4c6c7ddb2f044a17e2fce70f62d4244accac0e394a97a8ce638f3c72 SHA512 e0a18919cc4fe858eb1a623fc4e79c2936b4ea390d23611a708dd8fc26aac4ecbc262a5b0194f0a4df1fbe69c53568a62183e5847e0bf4c73cbce2122170e0a9
 DIST qtwebchannel-everywhere-src-5.11.3.tar.xz 177328 BLAKE2B a3ea3c535e466629e5bf2f864967b5878e4e092d614ce05984af81ce979c5866e225d30399a0eb81f9b4b0d44c88646b1b6de2f1be524b5af5b61e995ba780ad SHA512 560d79ba00bebfd5afc238ff486ad1691eea8a1702f565cd838b07419f6fcd1f028ab5b204b32fff6a3c40c3dd13d89e3cce205076a074eebe7b1c111c669d2c
-EBUILD qtwebchannel-5.11.1.ebuild 566 BLAKE2B a9eb2f03320b17f01819381621511d7b55ae390ca174d47b06a0d1f9b3a75de34779c2c64128e19267e5c41419e5381bc9716b833dcf76d6987528d47b52f19e SHA512 a9802c600918271d0cb380109eaa3375fdc68d57ff234850226f61e2183e2169195de9007eaba2cbe622c130fcf92b716ff66c9c4681b1ac5c0d022ae7d574b5
 EBUILD qtwebchannel-5.11.3.ebuild 566 BLAKE2B c7c779aecf92cfa4dc6f1daebea899a2da5595d5bd06e18dfa5100969f32521598a251efb851a725513f79660cec7e69137280335e7672c519231ba5579b374b SHA512 dd8af79dfdcd8489c82f9245b5fd86d9a13db732c9eefc5de5f0a7564c338d16cbd509caa32d04669ebc73bee829c339d36149be3e01168ce6e1da6f028c68a9
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild
deleted file mode 100644
index 95d996036154..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.11.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 132dc4b05602..d535debf4502 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,12 +1,6 @@
-AUX qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch 2517 BLAKE2B 8339355528656eee5a86866017173aac5036db853c92679d83fa8036561af49cd980022099912c58a7384cd9f3b95e26b8adeb22683fc7848d20cb4e4352f616 SHA512 f6fc127d80e9db6cbe971bcdfb3ddf7ec44c083b9f30fb415ec4e04cb263b3d3087e7dfbf984ad33782ae0ea769e4038acb3f2777a2f164d9d81bb9ac319ffc9
-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.11.1-paxmark-mksnapshot.patch 1007 BLAKE2B 3f7acf876b78caa945a72a797c08da9b24cb7e6363a904734265872c382789d5aec8e67e0ece7b0e50b6e7ccd9dc15f1e8aa7936736bed3ce14897c706d07938 SHA512 9a89eda73c08279d9bd6e871d138e670f8d6fb2e9efb191effe2c9063cf4eb007c6fbbd907005ebcc57f576a8faa5cb8a5ce996b9692aa226703765ddd939c06
 AUX qtwebengine-5.11.2-paxmark-mksnapshot.patch 888 BLAKE2B d44e8772dafd8962805abe412470d94ced2d11e47d3e7e25acbfafa54669677a1e072b435a06ed093f7c9ce27d8d98fab4b042cd49862350d77c944418a335b9 SHA512 893aef4801d1f2a3fad1f4d1ef2c2b122d4004b7966e76d8e1adeb8cc5b03ce8b0ddf30d20690ca6e0b15b76074aa386b46b00d0c828b7684c6fcacc33b2865f
 AUX qtwebengine-5.9.6-gcc8.patch 1184 BLAKE2B aea72fb7563517f6c1f0f1330bad21ae71bbadc7b74e13b5c9280074ba5ae642be1df6c6e3014464f4b9aa26dd5620b5c5ef5b7139256c6a48fe58ed911e54e0 SHA512 21e79c6fc1575728d658c31bc68da66a5b9840c6fee7c442218ec8ac6009d5df1436bea931aa56439965987ec1ccdac32afce2b0a246c3d7bb2d0b0536717be5
-DIST qtwebengine-everywhere-src-5.11.1.tar.xz 233633572 BLAKE2B 06fb9d490377ebb4af937e0fa1688cdfeb9bfdadf6c80afeef609d20a76bdb7c4fed6c1042405b762e59b11d7b16369990c66a395ec1b6b48bbb1ea5b8cd47f2 SHA512 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
 DIST qtwebengine-everywhere-src-5.11.3.tar.xz 233678844 BLAKE2B 451a2f8361b158835f7f565aea9e7e372ea5670f56a5eef918d0340857e1b336d7147c5f87417a21ea225c248cfda8248869c2023b2e359aa9216ec472dea4b9 SHA512 323179244187b075836101eec15fc96569e31dee7ca0b28d51833cf02a55439ca0ab8e3e14acf970eb0258e1f5187b6b33fc1a35bf9056e4941a2b20be9b0431
-EBUILD qtwebengine-5.11.1.ebuild 3535 BLAKE2B e806536baec3071808ff3c0a7f5f0d7f287b1c4489bd51f76fdc5d3eb5951c047199660c5daddec7f75dee50f1d7fdfbe2e6e6859d89979e1b28c8bdb79ad686 SHA512 9fb74dedea97963bd8363c6861e92395c0a4d9152dfe1ef26f8df7ad9e55ae4c6f60858c52fc6a9df90a3c96460230fbda099fd22dbb6c2eef7899963e7c1daa
-EBUILD qtwebengine-5.11.3.ebuild 3544 BLAKE2B 382c76fc2a7b2f43be68049375e4fd5683033991396469450a2863fa83bd7622645cd68fbfbe014dd06d68898936867d71321899afabfee713303e098ec41e8d SHA512 9b8b726e68eb159c1d9a460595a9234d0c172a6e3d0fcd8421edb9c8f1b57ebff310a07d6ba05dc3d3e039994daf57190de07e13c427d8ba22d7fd665aaaf618
+EBUILD qtwebengine-5.11.3.ebuild 3568 BLAKE2B b28e34024ea8fdddf8cff922ff4c653f0f4839c8e2248edb2e6982319429f5dda4e77feddbd4a15122ba6fe976821087930bf3e1792c6aa31217096a2b06eac9 SHA512 aa530bbaf18ad6f3430b4f3fecb28d49c640b5846ec372242acfe213bf8604267fafb1debf1f7e6cbf19ee32d686a100c3ee420038a1f542d929a99e182318db
 MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
deleted file mode 100644
index 4b2676faa6a0..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a66d4cd82972996d76edff52d17464c150dec6a6 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Mon, 11 Jun 2018 16:16:55 +0300
-Subject: Add fallback lookup for eglGetProcAddress
-
-Use the GLContext to find address for eglGetProcAddress symbol, if it's
-not found with dlopen.
-
-Change-Id: I3f5330c21ecc9b66e5e376d50d3fc6965b227f85
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
----
- src/core/gl_context_qt.cpp | 11 +++++++++++
- src/core/gl_context_qt.h   |  1 +
- src/core/gl_surface_qt.cpp |  4 ++++
- 3 files changed, 16 insertions(+)
-
-diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp
-index 9ed1db8b..95491709 100644
---- a/src/core/gl_context_qt.cpp
-+++ b/src/core/gl_context_qt.cpp
-@@ -155,6 +155,17 @@ QFunctionPointer GLContextHelper::getGlXGetProcAddress()
-     return get_proc_address;
- }
- 
-+QFunctionPointer GLContextHelper::getEglGetProcAddress()
-+{
-+     QFunctionPointer get_proc_address = nullptr;
-+#ifndef QT_NO_OPENGL
-+    if (QOpenGLContext *context = qt_gl_global_share_context()) {
-+        get_proc_address = context->getProcAddress("eglGetProcAddress");
-+    }
-+#endif
-+    return get_proc_address;
-+}
-+
- QT_END_NAMESPACE
- 
- #if defined(USE_OZONE) || defined(OS_WIN)
-diff --git a/src/core/gl_context_qt.h b/src/core/gl_context_qt.h
-index 8ffdad58..cecceabc 100644
---- a/src/core/gl_context_qt.h
-+++ b/src/core/gl_context_qt.h
-@@ -63,6 +63,7 @@ public:
-     static void* getXDisplay();
-     static void* getNativeDisplay();
-     static QFunctionPointer getGlXGetProcAddress();
-+    static QFunctionPointer getEglGetProcAddress();
- private:
-     Q_INVOKABLE bool initializeContextOnBrowserThread(gl::GLContext* context, gl::GLSurface* surface, gl::GLContextAttribs attribs);
- 
-diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
-index 7e579246..4d38d7c2 100644
---- a/src/core/gl_surface_qt.cpp
-+++ b/src/core/gl_surface_qt.cpp
-@@ -227,6 +227,10 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
-               base::GetFunctionPointerFromNativeLibrary(library,
-                                                         "eglGetProcAddress"));
-       if (!get_proc_address) {
-+          QFunctionPointer address = GLContextHelper::getEglGetProcAddress();
-+          get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>(address);
-+      }
-+      if (!get_proc_address) {
-         LOG(ERROR) << "eglGetProcAddress not found.";
-         base::UnloadNativeLibrary(library);
-         return false;
--- 
-cgit v1.1-6-g87c4
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
deleted file mode 100644
index e9ef452a8d95..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001
-From: Xiaohan Wang <xhwang@chromium.org>
-Date: Mon, 29 Jan 2018 21:28:28 +0000
-Subject: [PATCH] media: Increase DecoderBuffer::kPaddingSize to 64
-
-AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64 in FFmpeg:
-https://github.com/FFmpeg/FFmpeg/commit/6e80079a2840ee407c5d126030eb1066bcbfdfc5
-
-BUG=777484
-
-Change-Id: I1bd68d1c1b0c3131f28d6e07e1444b89800c09db
-Reviewed-on: https://chromium-review.googlesource.com/889686
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#532593}
----
- src/3rdparty/chromium/media/base/decoder_buffer.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h
-index 0341e5784f725..60ffba708b0e5 100644
---- a/src/3rdparty/chromium/media/base/decoder_buffer.h
-+++ b/src/3rdparty/chromium/media/base/decoder_buffer.h
-@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer
-     : public base::RefCountedThreadSafe<DecoderBuffer> {
-  public:
-   enum {
--    kPaddingSize = 32,
-+    kPaddingSize = 64,
- #if defined(ARCH_CPU_ARM_FAMILY)
-     kAlignmentSize = 16
- #else
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
deleted file mode 100644
index 8ac5b90b72c8..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/config.tests/xml2/xml2.cpp
-+++ b/config.tests/xml2/xml2.cpp
-@@ -27,9 +27,6 @@
- ****************************************************************************/
- 
- #include <libxml/xmlversion.h>
--#if defined(LIBXML_CATALOG_ENABLED)
--#error "libxml catalog enabled"
--#endif
- #if !defined(LIBXML_ICU_ENABLED)
- #error "libxml icu not enabled"
- #endif
---- a/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
-@@ -28,6 +28,10 @@
- 
- #include <libxml/parser.h>
- #include <libxml/parserInternals.h>
-+#include <libxml/xmlversion.h>
-+#if defined(LIBXML_CATALOG_ENABLED)
-+#include <libxml/catalog.h>
-+#endif
- #include <libxslt/xslt.h>
- #include <memory>
- #include "core/css/StyleEngine.h"
-@@ -538,10 +542,6 @@
- static bool ShouldAllowExternalLoad(const KURL& url) {
-   String url_string = url.GetString();
- 
--  // libxml should not be configured with catalogs enabled, so it
--  // should not be asking to load default catalogs.
--  CHECK(!IsLibxmlDefaultCatalogFile(url));
--
-   // The most common DTD. There isn't much point in hammering www.w3c.org by
-   // requesting this URL for every XHTML document.
-   if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml"))
-@@ -646,6 +646,9 @@
-   if (did_init)
-     return;
- 
-+#if defined(LIBXML_CATALOG_ENABLED)
-+  xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
-+#endif
-   xmlInitParser();
-   xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
-   xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch
deleted file mode 100644
index 352deefb22ac..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Bug: https://bugs.gentoo.org/634220
-
---- a/src/3rdparty/chromium/v8/BUILD.gn
-+++ b/src/3rdparty/chromium/v8/BUILD.gn
-@@ -661,6 +661,7 @@ action("run_mksnapshot") {
- 
-     deps = [
-       ":mksnapshot($v8_snapshot_toolchain)",
-+      ":run_paxmark",
-     ]
- 
-     script = "tools/run.py"
-@@ -706,6 +707,28 @@ action("run_mksnapshot") {
-     args += [ rebase_path(v8_embed_script, root_build_dir) ]
-   }
- }
-+action("run_paxmark") {
-+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
-+
-+  deps = [
-+    ":mksnapshot($v8_snapshot_toolchain)",
-+  ]
-+
-+  script = "/usr/sbin/pypaxctl"
-+
-+  sources = []
-+
-+  outputs = [
-+     "$target_out_dir/mksnapshot",
-+  ]
-+
-+  args = [
-+    "-sm",
-+    "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
-+                                      "root_out_dir") + "/mksnapshot",
-+                       root_build_dir),
-+  ]
-+}
- 
- action("run_mkpeephole") {
-   visibility = [ ":*" ]  # Only targets in this file can depend on this.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
deleted file mode 100644
index 72de09bfac98..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
-	media-libs/libwebp:=
-	media-libs/mesa[egl]
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/libcap
-	sys-libs/zlib[minizip]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( ~dev-qt/designer-${PV} )
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-60.2:= )
-	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.6-gcc8.patch" # bug 657124
-	"${FILESDIR}/${P}-libxml2-disable-catalogs.patch" # bug 653078
-	"${FILESDIR}/${P}-ffmpeg4.patch"
-	"${FILESDIR}/${P}-eglGetProcAddress-fallback-lookup.patch" # 5.11 branch
-	"${FILESDIR}/${P}-nouveau-disable-gpu.patch" # bug 609752
-)
-
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${P}-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 webengine-alsa src/core/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod geolocation positioning \
-		mkspecs/features/configure.prf \
-		src/core/core_chromium.pri \
-		src/core/core_common.pri
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-opus
-		-printing-and-pdf
-		-webp
-		$(usex alsa '-alsa' '')
-		$(usex bindist '' '-proprietary-codecs')
-		$(usex pulseaudio '-pulseaudio' '')
-		$(usex system-ffmpeg '-ffmpeg' '')
-		$(usex system-icu '-webengine-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/qtwebengine/qtwebengine-5.11.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
index d61f504ee127..9b56288c1289 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	>=media-libs/libvpx-1.5:=[svc]
+	<media-libs/libvpx-1.8
 	media-libs/libwebp:=
 	media-libs/mesa[egl]
 	media-libs/opus
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 1955f9c47f1b..7c1f2ee59dc8 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,3 @@
-DIST qtwebsockets-everywhere-src-5.11.1.tar.xz 231468 BLAKE2B d115bd37e1223fd1333515c7abdacb01a9d2e38c847eb3b655b584ec8ea833634549c74c0483bcca25a5807c650c250301b02bb6b7d05e61bdef44062d95831a SHA512 01eb3fabfa0f46c6ecedc3cd9a05e504fef91926ffeab1f534557e50c15d7fd284edaa553f545d8363343a32c0c3187e77e3e5d6edea8331e9234c05c0e318fc
 DIST qtwebsockets-everywhere-src-5.11.3.tar.xz 229368 BLAKE2B 4308395634f0cb2fed711e5c55cdf0b035f59704178297cdefbabbfc1c59fc4561e5603d44e637b445dabd83555ddd473f705d47fb25be7ad0e8f0aa21feab72 SHA512 8a1ddb2c9ee09018e8dacb5105e24863eb52a84d69ee9792e77c1c6a498634314b24bf3e946f682c23dfe045150898a1c1124bc08416f3560223459b8d1abbfb
-EBUILD qtwebsockets-5.11.1.ebuild 533 BLAKE2B f9bae734df7ec3d4fb2e7744f79300bb9e2a4788fdf3ede3913088061c889a62588051ddbca5c2da743afc41e513279822a69dec508ecdf26e60f7c6050cc775 SHA512 4ea488787b504677055bf75501af035286c9ddb27768d75677e4bd986e1532a7a6613396eafa1241e7ca021b7d751af1de20fab772679a671dd992bb2b1dc39f
 EBUILD qtwebsockets-5.11.3.ebuild 540 BLAKE2B ee59b1e1a8a424c5c26515d77e40ef0b6da7c648c00d35c60820e17c0f3fab7202fbf8a4d827b4040aa14294b8b77559806acff89840f662ba087473a7bad6a7 SHA512 ba6e1e77835966fd2cb8f673d46fb7ad6e13a3d77c851a9ba57ccbeb6a340d3935fdf32cc4c8df04c95e7b760d1f3e141265bf233a311903eefd7d539bb1c89d
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild
deleted file mode 100644
index 375dd3cc884b..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.11.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 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 0efdce37901c..9dc0364614fb 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,5 +1,3 @@
-DIST qtwebview-everywhere-src-5.11.1.tar.xz 132948 BLAKE2B 7e6fb1544a8cdae2de4cab8d2c42a154eadc79a67a1295311f67c94c19d50d81f578db8749fb02ee741c98ae3461c638b4a8a0cc109a2d95a4670522108e4e6c SHA512 e345d89ee30ed8cc7d087236c63179f887a81f81d41d0db15cf4f838aa38fbcefcaa7b880e82d80de5703610cadf88dd30dad88d44c8b27257980c214a98d2ba
 DIST qtwebview-everywhere-src-5.11.3.tar.xz 130676 BLAKE2B bd20b19763151ab11114958812b8e711170755041d9ca63f8c34b58dad2497c43b685377d38d48a1a8ad3e3f3305896f7f4b8b3e88e83317c81357dcf785d9ff SHA512 cf926c1e066d756f92f9a3ca6b17fd3aba07aa9277bbec8ca2bce20058fc860990a7b21be6008fa9a9e87cd04208348f5804f71b82b2b7c14ab0782727817108
-EBUILD qtwebview-5.11.1.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
 EBUILD qtwebview-5.11.3.ebuild 431 BLAKE2B 96ff53e5940f693fe9161407bf19f03bda6932a0fe0344dd86018c3ba27310a1d7e7aced3775fe815e7f78f2a447839729690a38f5452911622312316008fd93 SHA512 95bd6ca33bb0e4fda5f55b9ebdb786825ac22ae39ecea9a92aea0c74a0c9a8e0cfe98020a7937fe3d843ad465b2e8e04d5beb53732badbe5729c69d01e073594
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.11.1.ebuild b/dev-qt/qtwebview/qtwebview-5.11.1.ebuild
deleted file mode 100644
index 43288fc107ef..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.11.1.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 0840cddde8f1..11901942c536 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,6 +1,3 @@
-AUX qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch 5533 BLAKE2B 1a4db674e9d65134eaa894e13e2acdeb514eb98d841515e5573543387ffcd2ed6eae46c614aabcf61804a224ffdfcf1089d354c630e8c3186496ddbd6130ddcd SHA512 854c1b18627c5a243ededf28279fa3eb8ac208e495b8db54e7768340b25ffde84de0bd9e4b90044d35784a0bc1443071256eda59eafdab71718dc1c15ceaed0c
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qtwidgets-5.11.1.ebuild 1063 BLAKE2B 1e2277078f4c37102be7dfc2bb9a99263285730f1b18f4f57cd7d71558f47244a36f86ab5ba40084585f6f2f326a03f10ff3cb7a1535b6513e5538175b505797 SHA512 014c8736803cb064cd7e3840cf2b4f69b1f44ec85f166c3d7f3824bfc38beff471ef9f6e31887b7242dfb7534fa5fc71ef4982d00a6e867dd5f38ae257985796
-EBUILD qtwidgets-5.11.3.ebuild 1064 BLAKE2B 09024fcb7fccd3400844e55b7cd52bb5536ab4b46c66d6cc99f28f0f8db0d57e127f5e05fa0c484fd1738c0f8a8172ba381df2e2ac1f67d18fa36e13872aef56 SHA512 f181b872568a05979a0fe6d4bdfea1b8f3f808c707e5ef7b913f63572e9a5a9a2e007a8b730bfd80cd34b35e74317587534e7a886ddddb336315c1d12d6222a1
+EBUILD qtwidgets-5.11.3.ebuild 1063 BLAKE2B e69f93f29a53ffbdfcadfadb9254e12917241f3a78f68264c169ed432ca7b6908f4a66988c349fe6a580cc3d38460bd6236ad18c2a6a123616261197d5f92fc8 SHA512 f65237271ea9f7de9f444c3eef9b86a1acd42dc6d8f49771cb789a6c3448cc2a1ca524bb33540fbbcf7bb3764f15876e098f6571e07cfc285db8c48370f4589d
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch b/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch
deleted file mode 100644
index 3123fc3e50f5..000000000000
--- a/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 57bc08dac38b02128031357976436fa0f68bd574 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 Jun 2018 20:18:11 +0200
-Subject: [PATCH] Revert "Fix restoring geometry of dockwidget"
-
-See also: Regression caused by the fix for QTBUG-16252
-QTBUG: https://bugreports.qt.io/browse/QTBUG-68939
-
-This reverts commit cbfb6bda1d1ce3e169db6a0deb9bd901076653e4.
----
- src/widgets/widgets/qdockarealayout.cpp | 20 ++------------------
- src/widgets/widgets/qdockarealayout_p.h |  1 -
- 2 files changed, 2 insertions(+), 19 deletions(-)
-
-diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
-index bef7214c75..21d1d4cb85 100644
---- a/src/widgets/widgets/qdockarealayout.cpp
-+++ b/src/widgets/widgets/qdockarealayout.cpp
-@@ -226,7 +226,7 @@ static quintptr tabId(const QDockAreaLayoutItem &item)
- static const int zero = 0;
- 
- QDockAreaLayoutInfo::QDockAreaLayoutInfo()
--    : restoredSizeHint(0,0), sep(&zero), dockPos(QInternal::LeftDock), o(Qt::Horizontal), mainWindow(0)
-+    : sep(&zero), dockPos(QInternal::LeftDock), o(Qt::Horizontal), mainWindow(0)
- #if QT_CONFIG(tabbar)
-     , tabbed(false), tabBar(0), tabBarShape(QTabBar::RoundedSouth)
- #endif
-@@ -236,7 +236,7 @@ QDockAreaLayoutInfo::QDockAreaLayoutInfo()
- QDockAreaLayoutInfo::QDockAreaLayoutInfo(const int *_sep, QInternal::DockPosition _dockPos,
-                                             Qt::Orientation _o, int tbshape,
-                                             QMainWindow *window)
--    : restoredSizeHint(0,0), sep(_sep), dockPos(_dockPos), o(_o), mainWindow(window)
-+    : sep(_sep), dockPos(_dockPos), o(_o), mainWindow(window)
- #if QT_CONFIG(tabbar)
-     , tabbed(false), tabBar(0), tabBarShape(static_cast<QTabBar::Shape>(tbshape))
- #endif
-@@ -407,9 +407,6 @@ QSize QDockAreaLayoutInfo::sizeHint() const
-     if (isEmpty())
-         return QSize(0, 0);
- 
--    if (!restoredSizeHint.isNull())
--        return restoredSizeHint;
--
-     int a = 0, b = 0;
-     int min_perp = 0;
-     int max_perp = QWIDGETSIZE_MAX;
-@@ -2376,7 +2373,6 @@ bool QDockAreaLayout::restoreState(QDataStream &stream, const QList<QDockWidget*
-         stream >> size;
-         if (!testing) {
-             docks[pos].rect = QRect(QPoint(0, 0), size);
--            docks[pos].restoredSizeHint = size;
-         }
-         if (!docks[pos].restoreState(stream, dockwidgets, testing)) {
-             stream.setStatus(QDataStream::ReadCorruptData);
-@@ -2678,8 +2674,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
-         center_rect.setBottom(rect.bottom() - docks[QInternal::BottomDock].rect.height() - sep);
- 
-     QSize left_hint = docks[QInternal::LeftDock].size();
--    if (!docks[QInternal::LeftDock].restoredSizeHint.isNull())
--        left_hint = docks[QInternal::LeftDock].restoredSizeHint;
-     if (left_hint.isNull() || fallbackToSizeHints)
-         left_hint = docks[QInternal::LeftDock].sizeHint();
-     QSize left_min = docks[QInternal::LeftDock].minimumSize();
-@@ -2687,8 +2681,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
-     left_hint = left_hint.boundedTo(left_max).expandedTo(left_min);
- 
-     QSize right_hint = docks[QInternal::RightDock].size();
--    if (!docks[QInternal::RightDock].restoredSizeHint.isNull())
--        right_hint = docks[QInternal::RightDock].restoredSizeHint;
-     if (right_hint.isNull() || fallbackToSizeHints)
-         right_hint = docks[QInternal::RightDock].sizeHint();
-     QSize right_min = docks[QInternal::RightDock].minimumSize();
-@@ -2696,8 +2688,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
-     right_hint = right_hint.boundedTo(right_max).expandedTo(right_min);
- 
-     QSize top_hint = docks[QInternal::TopDock].size();
--    if (!docks[QInternal::TopDock].restoredSizeHint.isNull())
--        top_hint = docks[QInternal::TopDock].restoredSizeHint;
-     if (top_hint.isNull() || fallbackToSizeHints)
-         top_hint = docks[QInternal::TopDock].sizeHint();
-     QSize top_min = docks[QInternal::TopDock].minimumSize();
-@@ -2705,8 +2695,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
-     top_hint = top_hint.boundedTo(top_max).expandedTo(top_min);
- 
-     QSize bottom_hint = docks[QInternal::BottomDock].size();
--    if (!docks[QInternal::BottomDock].restoredSizeHint.isNull())
--        bottom_hint = docks[QInternal::BottomDock].restoredSizeHint;
-     if (bottom_hint.isNull() || fallbackToSizeHints)
-         bottom_hint = docks[QInternal::BottomDock].sizeHint();
-     QSize bottom_min = docks[QInternal::BottomDock].minimumSize();
-@@ -3288,10 +3276,6 @@ int QDockAreaLayout::separatorMove(const QList<int> &separator, const QPoint &or
-     int delta = 0;
-     int index = separator.last();
- 
--    for (int i = 0; i < QInternal::DockCount; ++i)
--        if (!docks[i].restoredSizeHint.isNull())
--            docks[i].restoredSizeHint = QSize(0, 0);
--
-     if (separator.count() > 1) {
-         QDockAreaLayoutInfo *info = this->info(separator);
-         delta = pick(info->o, dest - origin);
-diff --git a/src/widgets/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h
-index ea397e00ac..82244c192e 100644
---- a/src/widgets/widgets/qdockarealayout_p.h
-+++ b/src/widgets/widgets/qdockarealayout_p.h
-@@ -189,7 +189,6 @@ public:
- 
-     QMainWindowLayout *mainWindowLayout() const;
- 
--    QSize restoredSizeHint;
-     const int *sep;
-     mutable QVector<QWidget*> separatorWidgets;
-     QInternal::DockPosition dockPos;
--- 
-2.17.1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
deleted file mode 100644
index f13b8bf21a43..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
-	gtk? (
-		~dev-qt/qtgui-${PV}[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-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.11.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild
index ae7ab906d497..576902a822cc 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.3.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 07b2efd1f03e..de8df2fb7420 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,3 @@
-DIST qtx11extras-everywhere-src-5.11.1.tar.xz 116368 BLAKE2B 49cc0cbc73719186d812b376b0ae02abf68bee2f22b03ca003761681af4585243c9388d13b3ce8a1257ced8b2a0db7b71188ef10925d123327606f2fad94b335 SHA512 a5acd182e06ced304bdb9d86982c3cdb826411ed4c888dfc530e5bf005f34ac9c58812bda3c98dde66eea372c7075f9eedd62a6e36cb8b549a56b8dc7a9b19af
 DIST qtx11extras-everywhere-src-5.11.3.tar.xz 109496 BLAKE2B b95f2d14207a0a87d6ef95de45908351ba2171bee696cb55a9fce334e5d1525c9af968591f03d9b2a40ca1088ee626f81e15b54ef2972da68ee4e22030e16bfa SHA512 8aeae9a567d6a50071c239796e7916b22235b6e51dc56ade7914be85db610bb51fb3cc8a7d863b72ae8c9385498afb8533d3933e780fc8c764ec91dcb3de04f8
-EBUILD qtx11extras-5.11.1.ebuild 445 BLAKE2B de13c5977287b972fad0a88b857b1e80175048d4f3b98a9d2f7f5b77880806f0d28886b6d7b9847c2f881fd79980216abd4d3dab98f9275945d27f43c88d0b68 SHA512 0a37b03f66dfc3d82a80d5be6b797f3689c26b87212772ea958e44b24ae630ea6bf39f1820adedb8e49076efffedf9b3c57901dc1fc5511371ccc18dacb3fb0c
-EBUILD qtx11extras-5.11.3.ebuild 446 BLAKE2B b8e712b4a7d260b2b0a39b41997a20b931a2db9a671c7da7a3dcc6dd1554eaa01209335a3224afa0497261b46c92fed0bea2d0187ae611298708c785e15749d1 SHA512 02b3bfec7e6c60213b6684efc6c93eb0159c99020687e10fc7bb8476063b7745d973a574c7b9f43e998d204a7523bc303a7cee5a637658e35fc1bf32bd2cdd5d
+EBUILD qtx11extras-5.11.3.ebuild 445 BLAKE2B c90c02f76802b7d4956905580d83cfefab733661c9cba35f641bf1e7db0c1e986cfb1d315eacaf4257197479513c2fb1edfe462d15f42dff97387dc425f5524c SHA512 2a59b111347a9b70a704fb6f5fb7820c79536b64cc6554121d07a88df6b3f52cce6890c445d7047bd343c60b4e663023fae23ae77e1ebb9a75297628b7a60ffd
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild
deleted file mode 100644
index a094bec86675..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.11.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[xcb]
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtwidgets-${PV} )
-"
diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.3.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.3.ebuild
index 0a69183fe631..128a9e8289c2 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.11.3.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.11.3.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 6dec8e34865d..8db952be79d9 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
-EBUILD qtxml-5.11.1.ebuild 504 BLAKE2B 3f430e3ff500f3e9571be91ce742ffafedc5a1bae783e6a89ed47d9eca4dccbe27c20c94c5c03fd9ad5f93dc28f878d577c7c0d27518a6d62cc136324c201cbb SHA512 0c7bc6d04ca187973b15a0e49dfda308f7b7f57aa56c1048c6812c7e6dc930f55d350a73f910db264f2d4a765b99c270de031bd2ef5c507cb6e022369ca9eb24
-EBUILD qtxml-5.11.3.ebuild 505 BLAKE2B 9a72e044e58fd627fab4309b8078783d78c9db056197d94e593fed1584f1e70910b8bb0e84b3b8104f1c4c924c93ce5a437cdd28c77f115b79eadd62af9f49b1 SHA512 403e452993062d084ea772e3533e3627e7f615aadc8644cb3105022dd1a7f84bb8fcbcc9dc49ab2b50ba469c331ab55e9206e2a76cf4d69fb17dd5683baf3d12
+EBUILD qtxml-5.11.3.ebuild 504 BLAKE2B 0b3517c6381602fae8a545ae20e7da0131b7888966c035c180a63d05b24ba11bb01d57459587b25a4ce65694a1c1c71cbd0baa85676981e2b66abc9757d7528a SHA512 cf1ba11063181bed951b38da12b71c7691072dd0300915ed35d230941228aea4b058e378100d6a3a8029fe10706dc96c8e86b2b383ffe0e6c9b2164b478b0e45
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.11.1.ebuild b/dev-qt/qtxml/qtxml-5.11.1.ebuild
deleted file mode 100644
index a7f2477e90e8..000000000000
--- a/dev-qt/qtxml/qtxml-5.11.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:xml
-)
diff --git a/dev-qt/qtxml/qtxml-5.11.3.ebuild b/dev-qt/qtxml/qtxml-5.11.3.ebuild
index 26ba50d539d8..6c8bf4e94054 100644
--- a/dev-qt/qtxml/qtxml-5.11.3.ebuild
+++ b/dev-qt/qtxml/qtxml-5.11.3.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 7fc36c2c4db5..c469d92ee658 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,3 @@
-DIST qtxmlpatterns-everywhere-src-5.11.1.tar.xz 1378340 BLAKE2B 53675d44da768d322bd6ba8de30d4ad00f370c79aa871e1a80184df4cc9ce8d45c13f6fb3a808660a42a44c034b14929fa7dbac52878642057a49a4a778d20c9 SHA512 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066
 DIST qtxmlpatterns-everywhere-src-5.11.3.tar.xz 1373016 BLAKE2B 6ab881ca138aa5f65aab09ff499181758c1702cd1f3dc1232f12efb756f5efd9a68dec5bce5fc812dde9d4818d0129694a26e364b2d84d9ac6fa5bbc4d089bc7 SHA512 a7a8dcd1ef0bae811f3efbbbf6bb5705b3e75c468106cf7532dde86740240cb3f1f55142706abc1ba309dfdab5edf3dcb12923f75e26c8dd43ffee22bfb73cb2
-EBUILD qtxmlpatterns-5.11.1.ebuild 427 BLAKE2B 3ce80672dcf091f381b9f6ef7e35c8121b6d076f7364a9b58120582be4ae9ccb18ee825f0b89d0f2c8138af1b96ff3283d39d18025a6f40248c15109e5ec7ea3 SHA512 0f3c4e67dad213cea731a920e72b24180386b6da34a20b7384960171226844c8c213a6ff1d6006a9aa32b90e3f17f52a5c4ece4457b9afbe7e9d0b1603a90e67
-EBUILD qtxmlpatterns-5.11.3.ebuild 428 BLAKE2B c4596c1c7a3b549fa362819352df29f11cc864d7c6874b1886c938f372704bcd562c4cf28e1d91f5de25e201c878439301c89be76a4c419377b3d38427ffa41d SHA512 4ea77ed2f23ec3e8fd03c5905baffe4dfc613563c7f0e60fe9bf3de5405601c71256427d60e8ab66f3ab98d622ef2c7dea08514445dfb68fedfaa22455354e02
+EBUILD qtxmlpatterns-5.11.3.ebuild 427 BLAKE2B 4dc03f71c4ab722a055b86b24958e156f1d3085ddda598dab40bc5d1c2f73c86a748453328ea229ef172ffa9c9e94c5915c0835874c36fae8379e91a713912fe SHA512 6a6abd19c8ec32dbe631113960ce6d8f5c77c99d67e110a57369f73cd543fccdc02d240f95511eab880ec71e70e704b79ad85bb60f48bd01490ae0fcc465dacb
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild
deleted file mode 100644
index f026a3153ea0..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.3.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.3.ebuild
index bde30b1851d8..46e741e29b18 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.3.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.3.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=""