gentoo resync : 11.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
commit: f78108598211053d41752a83e0345441bb9014ae (patch)
tree: dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /dev-qt
parent: dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)
120 files changed, 732 insertions, 1830 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index bc4f70bcce2a..2c17b29686d4 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 2c0c766c491e..cf02f12cbb00 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -2,10 +2,8 @@ AUX assistant-4.8.2+gcc-4.7.patch 500 BLAKE2B 359cb062c9406b9afd8e4a427c5da36952
 AUX disable-webkit.patch 872 BLAKE2B 3856945120fbc7c27a32acc0663e74ec8302012c2c646cadb3467505797ee0a2233d3556646d532cfe1a2d3cb1b8b1fda53ff7a94ad302fba952202baa7927ca SHA512 9c05843197aab2a5e49aefb4aaa8e1ee73b4c410ec54ede9ca958672962713b1949493447a06bf7aaa1733bf22b3a67a77f94e4063b47bb30bade1522d29830b
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD assistant-4.8.7.ebuild 1477 BLAKE2B c722e0a293112ba58f292566de3d3730e5a12430e107f9fe95ed45841e55731340a298b23dda9bbdbfcd29e3b51342077e7fc3f632755ee54fefab72f72dcb05 SHA512 2f01f97502f9990a048b3dc974e6295cdb8f97f2804f0a20a9f515e7a8a04611718d680778ce35ddac45b6406dfb4fcf05a60a7f24acdcbfd3787c3e2961eb6b
 EBUILD assistant-5.7.1.ebuild 749 BLAKE2B 1b6cd7fbcbad8dba7f72a0a4b9604ccbf3c4e97b194a4d2ba93d29731219261f44964b97e0647ffe0ee46bef04c6c1c1f2a24f11d31011f3dd8f05f446088a94 SHA512 a25bcd1d1737a0cc3368d38e0dc91a224bc37205547be3969b546a4ac6104157296e0b568a39056f1340a2c248a5867a74ec27ce3b9e965a75da89c7c3cc4f45
-EBUILD assistant-5.9.3.ebuild 756 BLAKE2B e759da77629e7b34a75580463ad04b79674b6d0d6c6a9997c7d735926835f8c35d1e95cf15861e8a8fd2415d3039a66af2ef1d69c89d7a09a787ab84b4f29652 SHA512 1e48ce8cee9555fc85bc5775e960b7367c8e1a832bad1bfdefcfd7195caeb73b5d4c70397694f0464044e8031f557f9e7b8c6d53c6b9dad417408210efc88c2a
 EBUILD assistant-5.9.4.ebuild 1198 BLAKE2B f2b40ee9a585e0a0fcb98b6999728b633a3c9cf3c9bfc767ba2f5d6948156684596bf02aa9e006008f50474def97051562faa6baad271662c33c78095e1c7f39 SHA512 cca326bf91461ef72f110f6c0c23ef13c65eb0fa51eebdce468797e89f5969846dff93ce75a93ed1d1f699044e7dc3a32b0659e922f26531b71702390f6f318c
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/assistant/assistant-5.9.3.ebuild b/dev-qt/assistant/assistant-5.9.3.ebuild
deleted file mode 100644
index 6342c0fd7069..000000000000
--- a/dev-qt/assistant/assistant-5.9.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qthelp-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	qt_use_disable_mod webkit webkitwidgets \
-		src/assistant/assistant/assistant.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 51ac788ed6fb..e7a6c674fada 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,9 +1,7 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD designer-4.8.7.ebuild 1746 BLAKE2B a6d8990f6498a02e3bc67d420ea5bdf2c942b20167e9ab9856ded2c48c115773464e4f932c7fd4fe5ec39b84055310b2758c4cd8df29f8bf55a75b1f5f4d2eb9 SHA512 69c7c89fde7f2bfb98ee87f0fa3af6bff2a815c0bf71436fc32a5d1d2e8dfa0184f2383b341be942c6581c0c218ad7d2ccef2ca2406da9b046180a7e79aba191
 EBUILD designer-5.7.1.ebuild 864 BLAKE2B 026e933a2f0b48df1361bf84062a2b66da71727b8025586dc69c78c0e32d35c4641c1375f99c0b13a34ef1b8bc729c22044d4950db8de3180faea78cfafad756 SHA512 83ff83ebc13fb2063ef779306a3739d2acac28447821601a1e2544288bb360803fd6e59a42c70fed5f3c99835122c56a9856542b5089a4b007feb87dd6f79fe8
-EBUILD designer-5.9.3.ebuild 872 BLAKE2B 732d561488184127c53122cbf2ff3cf645b4024321bbbd689f8de3e79203456bdbe09ab44a67f975e1b5a2cec7736b1ee3cdea0ee67cc1a74b476a6d968f9787 SHA512 b23acad0c04c06bba34906b1d6b0a9e9320b19f0d5542905feb78865f891952fa17cdfa1a45d805a257c2eb348123ccba7273e638c3148c382689203b25c942f
 EBUILD designer-5.9.4.ebuild 1232 BLAKE2B be709736857a63edbb041f60695eee38939b6be1d8b95eb2a364da0790c777cf732d4ca4bc90b49b291604e34ed3b0857975dc6219aa90370f900f9fbbde0eba SHA512 159e871d902f0a52af7f123ab212f47aaacef128a1d4306007440f32de7c01857cfaae9002b9e13f8097daecca4728eb77018520955ace95ba1dedc2259f2ad5
 MISC metadata.xml 879 BLAKE2B 4d8a4c31c5cb415d18d59f54243bdb9b49bdbd6c374576d7294d2db2ce6505e31fa8da57966b04d9223e9a474d06f7078bab7432051629fa0a5dafdb9ca59152 SHA512 fba36502504141e09462fb211dacbfe43db6cb6e750f699058c757c1fc24072eb5ed50bbbb20e2bbacb831f165a58c20cb9c012ccbe96665969e1fc8fc153489
diff --git a/dev-qt/designer/designer-5.9.3.ebuild b/dev-qt/designer/designer-5.9.3.ebuild
deleted file mode 100644
index d59ecd6964b9..000000000000
--- a/dev-qt/designer/designer-5.9.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit 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"
-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
-}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index e053fd6aa904..03c6ba067e93 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD linguist-tools-5.7.1.ebuild 676 BLAKE2B 891a6b8d53de45067fe730fcb40a5481dc3ed7a72f013558fafd9d085514240bce60ffa5ccf11d34583f393548061588a66436d42e871577515adc3ce2c7920d SHA512 cb62fb1f219d8ee064952132b4f208a4cd0be6d208564a26f60df53ce6f0d3f60f8b20ae626b9f1cc5edd1101d556b002589dec22052863ee37e0b9867edf64e
-EBUILD linguist-tools-5.9.3.ebuild 681 BLAKE2B 12a9ac9609bd93a0f95c0b3a5591129d981781f538259bf2df4eeed68a5b981684264dd13dc92f55f1e931a877dbed7941dc1b56df429290334229990b479026 SHA512 b7106e3943ff5c6a25419e58741a210efff46131a7da9497b16476bf514c8473b2813092f9161c5eb5a9da425f12fc549d69475b4367bac742aaab7799672769
 EBUILD linguist-tools-5.9.4.ebuild 681 BLAKE2B 6f098f8c6c58591a6b55183612cde07fa3daa1e65f5f7b504072ee3559ef717101fba491f3db4de1d7fddb5793452f85231452566e211b1f46c087fa5a35cc1d SHA512 348d9467095cfb55f4dcd3f3629ed44ff371993a4103f894f7cd62a69609bed8cc631ace7c774f8a9309bb73ddcf5bc05f9303a91197fc6fcd916cb74eac4443
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.9.3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.3.ebuild
deleted file mode 100644
index b22c78fdb479..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.9.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtxml-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index a130acb96122..d9210b46828c 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,9 +1,7 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD linguist-4.8.7.ebuild 1156 BLAKE2B 69663d5d63aeb2c60a97fb6fb16124d16683350dec8da4bfd6303d85e4afe0f1c63202fa9ad61c04cb7e18ae2a95ca665f1641124893cd93ccd297ba3af71e84 SHA512 c8468dc810ce46dcc6adbfb0d178b173299ec0bbc19936f6ff85df59759b4e710b6afe270d345653ca209e5c4d541ba03a20fafb596d3c1c83e74f46d152d9f6
 EBUILD linguist-5.7.1.ebuild 533 BLAKE2B bc33f6b78c6aabc73ffbfdb6946bcc33402b29dfff662f09778e548de3d65789a731069351b380a9e3b65c50241d810fc7a17cad523453e65dc9b32d95eebfa6 SHA512 e26d05555ead69ec45d7b748ce7cba2e303c3f133cbfb4c7af8d82be2fbad1fa2d756518658c20fc8beb671a377d351c2a499d1573f0db6c93aab96bec3317ae
-EBUILD linguist-5.9.3.ebuild 537 BLAKE2B 43248f56635dece9ff60246e39cd7a2eabb5a9581fc0025970650763adfc32e2b11e1f445be5f71e6dcdd4c977bd4003611f0c36aab0e70886c78ff92dc386e2 SHA512 b066ddf0be4a0adcba8df4e5c70e6f52eaba27cbd2b05a9f141fefd31b23e8781ee96d86610e7f8548c34c7efe08d814fe1248d46850cb913001cb9cc29b3635
 EBUILD linguist-5.9.4.ebuild 980 BLAKE2B 16659ec2b1d54ca5224e29cae216bd59fb6fa7c2c7f4b35b08712177ce8fdcbfb4428f2442f7173bc7f1ff30009e43ba73ff003ea748104eafa277deef268e20 SHA512 a771483442dd985d5f2028bd9b9010939d689e981d7066d10ba4faf113ddd12340e9fddad0905da9518f50133291377d02fbfed88087b092136b809ade20effe
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/linguist/linguist-5.9.3.ebuild b/dev-qt/linguist/linguist-5.9.3.ebuild
deleted file mode 100644
index 163c6cf68e1d..000000000000
--- a/dev-qt/linguist/linguist-5.9.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-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
-)
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 64357e1e8304..1627aa3d4349 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,9 +1,7 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD pixeltool-4.8.7.ebuild 836 BLAKE2B c2dadbdf93032d63466f13462c3610a2401effb5884353cce3b53148407a52fa2757d5396a1ee5d8aed80ddbf8aa1e8bf845d82a04234c618f89550c64e96042 SHA512 2ea3e1e6dc5a40b63108785c6e08e59f395194fcf247f8ed77ce8ab874eef04a76384444093a3878ea0d41949344a212a4fa25e84c4dde8e5a26b96a64b94fa8
 EBUILD pixeltool-5.7.1.ebuild 448 BLAKE2B 5bc9445fbe3dbfe34516717038ce5440cf26d3f29d5f5e3cba82d7f20cc305436baf40e8a6ffefa2d89f15a24a5bd622851cf19a42ea6f827e225d9de328f8bf SHA512 04a7923d304f4f6b72e9a445938238c8ab75b4985003a33043e2c34925ebde30abfc8e58548b3d902eac7ae2619947a5b345bd8fa2fc4def8cc3db641df498a0
-EBUILD pixeltool-5.9.3.ebuild 427 BLAKE2B b9ffc5ab2d74f1f186cbc39aad176076de7eba70cdb2a4e029e5ed7bacb223e5e41aae72bb70590fde8d962f51e05c4bffb455a56f20b45f91cb8aa9955fc9d5 SHA512 48da92aa47192de2eea885d84900c2434ff2396f5898c15b2af300c704efdc88e2f7f34f80db5d83cb48749334b7d01c7066c770308a9e100d101c2212862e8d
 EBUILD pixeltool-5.9.4.ebuild 427 BLAKE2B bffe3b0f18b8c401f3a8daeae201c9f43187b515ed2691c938beeb45276bc27b5d24db459f6ae83336775a50733fe41d4166963cda41ec30e9ad451e5728a0d1 SHA512 4efa3fb21649069309421a5fb10f21b474404d02d2a095bd5a978c26d357c62bd45cd8944ddb126a307f849ba5b3490685aa24a88e88b9744b739d35d7491eef
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/pixeltool/pixeltool-5.9.3.ebuild b/dev-qt/pixeltool/pixeltool-5.9.3.ebuild
deleted file mode 100644
index 84c3091587bd..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.9.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 38877a854a80..aa1cc4ec910f 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qdbus-5.7.1.ebuild 467 BLAKE2B e216eef121f71203f76aa2dd44921d227a75ba16f00303949a42fd5e88200fb6aa1c98d3367fb898d5154dfe740ab57e4d68e0f9e9cf4c153c222608fab70b34 SHA512 539e4cc0ffa8ba1bdead79b03fab0aba1db8b1667b2b3a1472319a63db3fe6337e2e9335d33e18d247ef125dbec770eff3b8c05fc687d16dc436f3d41aecc137
-EBUILD qdbus-5.9.3.ebuild 472 BLAKE2B da668efadad98d80a9e4b803d35b3a2138b685a290677e280da8bd1eef3f3f6cb0b0e60cac7f359a43e67785a1f216b3b84c31ef46e3e6af902889495f133076 SHA512 b2c4ffbb7a4eff8a4fbcc33c08b9bcf3fe3b3a44d6b493e3cf89042765c6699cba97df0060e864f5cd0c8aa3ae74ab11b0ea3eec1778b7ae043d647c7854846f
 EBUILD qdbus-5.9.4.ebuild 472 BLAKE2B 132d4466bda8eaedaf2eb9cf3b25c7e5cba5965444201365888067f53b3377bc57f54139c773f4d9ec7e9704adb187fa45c34ab568f145f8e63abe131d448b8a SHA512 f39c7eecc004e07026934a0b569b9dd0b7e71f57478400d25762f83e52f6b4437f000d3e490e0fc696e9ce773782d4b96563ffc0c88cdc4858ea3a3f4e0ff3c6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.9.3.ebuild b/dev-qt/qdbus/qdbus-5.9.3.ebuild
deleted file mode 100644
index ebe1074372ad..000000000000
--- a/dev-qt/qdbus/qdbus-5.9.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Interface to Qt applications communicating over D-Bus"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbus
-)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index cbb394b601bf..86f0bad6515e 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,9 +1,7 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qdbusviewer-4.8.7.ebuild 1174 BLAKE2B dda9669b7d58f473f583f5141f79df3175dd4830622761345809f2bfe6177528ac2b33958618ab9c7562a7df76384631a45e27e4cd1e5178c906c2d7d90a1630 SHA512 6f08b895885d8216d15a6ac7d35e8b4dccb504a7b2d9740ada1a48b2672eba530345e2af4bf7cdd4e27d01991d16c84177506f370bbf989680b62f711af828cc
 EBUILD qdbusviewer-5.7.1.ebuild 521 BLAKE2B 50b34805a4afc2ac7b5ee5aae2f2a994c7247616e91ef8b8107289e8c4ab94040e840ace1e7ba8625caa5dc78a9eaf444477e8094db455ee42deb920c275f74a SHA512 2ca60a21301ca8f5db6a4a4e87f48edfed84a3de9eef980c73c5a6aaf00410783bbc25a8abe518bf7f1e68568664b174ce2764822f3f1c608da564435668d667
-EBUILD qdbusviewer-5.9.3.ebuild 525 BLAKE2B 4b97a1a0e2ef02cd445e6d86f674b9308232d7425a5d7d022440adb258a5ef370ed1d9130301870a3573a86002c5d416a8de970b88e1e78adfb67cbfb7b8d637 SHA512 e33432316e553d54d5988626b72a88ffaa8622e992c59e5057419be3909486aa161c627e8682dd4b7e0cb0d83e2b525776d38b5ddd1bfedb64a81d7c47cfd1aa
 EBUILD qdbusviewer-5.9.4.ebuild 961 BLAKE2B b3d8acc1ccebb4dceab2cd41c7fc8588ee0a785c0e36012055c42cbd645b5ec6af3da0f92b6d943074f8f1e6e390a5e49e89559f1a669e3b13a659a41772918b SHA512 5cc06692c41a8a63b16226936cb76e5a929f6798f8e677384c51c7a427ee8ea40a943443450b7979132bcc78e69bcf49295ef5cd280588681ae415f95355d69e
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.9.3.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.9.3.ebuild
deleted file mode 100644
index d1f5a5edc7c2..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.9.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-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
-)
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index d226091c932a..f2e99ef33c73 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qdoc-5.7.1.ebuild 404 BLAKE2B ac7a1447f06626bcb05eaea2b704e100bf8b3a72745e93e3f704cbe6af1e3149169386a80b715510a17fdc3de2640e0bd9b1331920f394b2c50f09a3c520e860 SHA512 64244aff93afc21ff69ce94032b6e722cb68e21842939acaf0971353889af1fa5a8d4854ed2f3cd3c93af5c054e8dcf56a73692be314668c70da1884d36949ed
-EBUILD qdoc-5.9.3.ebuild 538 BLAKE2B 0205074187f00ade024c8057dcec161cef1145f8943e5fdc5334ac9f8a3d0d24cf3cb249da3ee5cd46e725891428cd577dc98ee09d7d89ccfebb410a4cf62b29 SHA512 f043dcba825e6096eda1a61f4a2deb969b93b4d4369999524fe6a0ce2ac05142ae6cad9843f82dce931b3e91426cac5764629a53d5e07211baf7a99aa6397af2
 EBUILD qdoc-5.9.4.ebuild 538 BLAKE2B 717a554d3d094d660b350fd7cad133ab97a695b11c7199e2ec2d1a0a7c0c7188b463b26e3fa3336de270dc103a1341e126056d0917b138f00b9195e4f4e76287 SHA512 d1872b17a326d91cae9e5edb425a0d5ed75ef3802f73f7b30ef5117636d11915686075f54ffd95f2b150cb6a6f2521a6e510a6dab27c8ef12d8c69eb34cf46ad
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.9.3.ebuild b/dev-qt/qdoc/qdoc-5.9.3.ebuild
deleted file mode 100644
index fff12942dd12..000000000000
--- a/dev-qt/qdoc/qdoc-5.9.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 6c185964e5f1..e896d408289d 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,8 @@
 DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 BLAKE2B 23c05b5e86fcbc3387cd9e8a82fb97e3b4e20182b41e2b24de7801126b0d5bbd708ca842ddcd828536fb279b6d2e4954909b8c40bfe14e050baa109095889e6d SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336
+DIST qt-creator-opensource-src-4.5.0.tar.xz 21641628 BLAKE2B 83d8ef57b87278994451d34b69a17a7d6c872b014c82940593c83c53e4a693054bdcfa38c4706083ed2bc0386ae5fa8afcea4747d1dee67a2a9b1e0a3fa6aeed SHA512 9296ebef4a3d5ae40a9fa3a4039e77b8e407dfb52af3a88b4cc615a89e163d92de420d9db614bc689adc695879f0c2e1906e9a218e7a6b96c4b222d52c94912c
+DIST qt-creator-opensource-src-4.6.0-beta1.tar.xz 23559992 BLAKE2B 20a89a2e833fd5f618cc8b7301530abe3cb2f54f687fe3f08a3881e3ffdd90f98cf32ccd7e7461bfb4b80547bd5cfbd732257626ea938a6459a69ba9a72f7958 SHA512 034735898b24884822ede430dd777066a5b93f38c383861d85268d0d65a140116f3a2d639b0c33862768127e3e0881a7b08ff710c5a210ccfa42c5e8a9fe1ff6
 EBUILD qt-creator-4.4.1.ebuild 5658 BLAKE2B baaa1e7e3d5fb610d6dba2132c3128af48fdebaf42ea36374c9cf5b49550643de0f5a0a02ca33092f6c790de3befcf6c7b747c9211061b6fd1db72af3d987bb8 SHA512 66df671ef8f81e125998a510965fbfff1fd7fa8554f57cf856ec9599d9f1517005ab721818c95fb21d01ac6b0bc0059028175e822a8421db0108e61c2600522b
+EBUILD qt-creator-4.5.0.ebuild 5659 BLAKE2B 862c67019cb1bc366e5a4ace004b14da8265d2559aa44fe005a5107b599a3d3a521d7ee63806e9659d8a6256a229135dcb7bf1a21e3b9d23d2bcaed09c9e5284 SHA512 d2a9d79d4fb736f434965b036d37d7440d4177e1370a2e8e41ae2df9c34ed33b7cb87a64ff55f9d7a277e27bf12440b96a31da9995fa44dd79cc0259ac27f1d2
+EBUILD qt-creator-4.6.0_beta1.ebuild 5641 BLAKE2B b87e90ea8fd13bc2f6500cb3adda4afddb4df9346028332de133b70db2917baef04b60596b9efb0541787fa75b608c2f13cea17d8a6aa04b47c3997aba78a65c SHA512 e3dffa25d7bf9b7f3c4f0710ca25d93e2a64351b98deb2eb43f89933067ea34975feb77e7d7e03559e70fc9792e3888528d2e28b949d500825d0b3647bd38370
 EBUILD qt-creator-9999.ebuild 5659 BLAKE2B 862c67019cb1bc366e5a4ace004b14da8265d2559aa44fe005a5107b599a3d3a521d7ee63806e9659d8a6256a229135dcb7bf1a21e3b9d23d2bcaed09c9e5284 SHA512 d2a9d79d4fb736f434965b036d37d7440d4177e1370a2e8e41ae2df9c34ed33b7cb87a64ff55f9d7a277e27bf12440b96a31da9995fa44dd79cc0259ac27f1d2
 MISC metadata.xml 2247 BLAKE2B 4cc94d6484cfccef9fd7ffa81afd642603842cc0a840bf1a710e2dba85258d7d116b3201391d62d9e974e44fc18033cae1b4d9d242bb1aa43dfdb1364e782bcc SHA512 d3e92111e1ec61fc5ea8904066eaf205000de8a4e64ccb4b8d6ba349735466c4f851bec8154f30fc8ff21756d27ec07249892136ca56bdcc12ee4e3200616368
diff --git a/dev-qt/qt-creator/qt-creator-4.5.0.ebuild b/dev-qt/qt-creator/qt-creator-4.5.0.ebuild
new file mode 100644
index 000000000000..38641edea7de
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.5.0.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils toolchain-funcs virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.2:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	clangcodemodel? ( >=sys-devel/clang-3.9:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.9.1 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
+src_unpack() {
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
+			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
+			die "GCC >= 4.9 required"
+		fi
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/\(dumpers\|offsets\)\.pro/ d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
+	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix path to some clang headers
+	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
+	# fix translations
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild
new file mode 100644
index 000000000000..609adb4c9e7f
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils toolchain-funcs virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS=""
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.2:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	clangcodemodel? ( >=sys-devel/clang-5:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.9.1 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
+src_unpack() {
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
+			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
+			die "GCC >= 4.9 required"
+		fi
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/\(dumpers\|offsets\)\.pro/ d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
+	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix path to some clang headers
+	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
+	# fix translations
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index e0eff42c5851..fbb777594825 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,13 +1,13 @@
 DIST 5.7.1-0qt-everywhere-documentation-5.7.1.7z 173336041 BLAKE2B 3153398ee4cc9addb2bfec3f2da617d42762d073372d23c17b4c100fc7683f91ff122987ab0d76a18f78e3eaa5e891bc5057e5c747b52a470f2acd1ed6e897f6 SHA512 4fcbfcd29aa48937229d01d47569a5fcd81459b9444058c725bdbac14dd2b9c67c9e04944c74d351f4bca7d972e23c3832ba2dd8e979cc4e9fe677e2d51561e0
-DIST 5.9.3-0-201711211135qt-everywhere-documentation.7z 212308542 BLAKE2B 35f85ff13e0c3b75ddfbcab5f71fc2dd5afc19d8f4064b384eb9fd05005fc629cc67be03da87ddffdabb866f54118d0fbcbb07de142ac39de92983059172076b SHA512 d1e1dfc3b1f6affa060e06fff8e773505924bdd3dc93985fa09f47ca4287f53d238f81e781dc9dbfb89f01be9dcabbc4268d2cd4309addd0af2959ff38696fa7
-DIST 5.9.3-0-201711211135qtcharts-documentation.7z 9069062 BLAKE2B 17bae2a55e923f722551f91ba0ab24369bb20a2be92d80071874f86f9b8e6db4a571536fad3c7a87c9c29452f1f22d439420891ec67fcb774b350a7aaf44dbb4 SHA512 47b913ebc80f9db60a0b832f9fa3a66781f5ffa914f8977b83c39c30cb46381135c03e8be79dd70237cffe5607016b6287bceb51d73e84dbdf39aeb1c4f2cebf
-DIST 5.9.3-0-201711211135qtdatavisualization-documentation.7z 6617018 BLAKE2B 93c03a6a4420f56b664689f475fdaeb6e8ef5626727c63deffa35eb0ceddceacbb30c75dcd37a0bf3041ce72924cff11c119ec05ea82e18b11bcce957dfa4440 SHA512 7accc73e8a4e38a35af370b819d12ed9585747643cc2da8dbc1cca7d308ef474f1705d3dbf54d0ee19bf8ae3f9e70bbf304b40eb01783ecdfb6b0984521c982c
-DIST 5.9.3-0-201711211135qtnetworkauth-documentation.7z 259690 BLAKE2B 83b3a02483010b5b9ed93fefafe0b232ee02171ad796c47629c29ed3cb4873dac4605eda02bcf5144da2755ca6e7a34b4e49c2bba12e3283d823f22a706fe1b3 SHA512 d617accec29ee8a728c1237fa2dc6f45b8007d1ce7f87040b6a03e1fbbefa6895a82cf9574aaa99b5afc68615cd46f6ad8aa9c0eb5ce6fb8727ab51d7bacb7ba
-DIST 5.9.3-0-201711211135qtscript-documentation.7z 721831 BLAKE2B a951439668fdca762fd97e8a2701999b5ee22997283d61003d1786de05ab3bcef7394b0e099be0977b0278fb115e05ccb9f39787799eaac8d8939ae2ac5e8b2c SHA512 67273143ec892b04a915372c4ad699743d18f2bd9ba8c0b61dc1a63079cce876929d8ff40ffc7686c02de55c6f62a8e57f74523e172a6fb8ebd2d6d7b6ece11b
-DIST 5.9.3-0-201711211135qtscripttools-documentation.7z 76325 BLAKE2B 439b2efb2f6399f06a579b67f538e0c0e8e726f503fe67928410ad1f5a11e8ba598f43fcab4f264aade5650f988b4634f6998289a76a3da91fbef5c965120c62 SHA512 3f386c6f8641496d8dc42c465cb79426194bceee411a11131e256193cef5b40fee36f6308f0eeef5eddeb23b8573410c6de2958f3f7d0f7939770c9e9ded5331
-DIST 5.9.3-0-201711211135qtspeech-documentation.7z 148944 BLAKE2B 5831ef05ca71febbeb1f2b21b6c157ef6718bc4cc9e499e9b46fe8b7c502d144a427c79e23723a84a12e941cd799ceb15bf90ecdc57f3af02e130b877b4ad33e SHA512 7b8f91b9313b7099d5d18ff8e3d0b5619e2229c4f18716daac592df7ad25388920e58d812ac216318d56781e354be722d35e456ee6cf0c8ea248f4dc31d456d4
-DIST 5.9.3-0-201711211135qtvirtualkeyboard-documentation.7z 449976 BLAKE2B 6db1024bd3de666bda8c3c20d30118d95a9d20f2c9de81a3051f0f194a55cac30baa1bb32e90e39f96a4be2f8decdfa1ba9d1464d75626c72056fa749f184854 SHA512 db5e28c49f27ecec525101e3c095b19d5c4c3d6ec65132a4e5d0a00cbe1fa389d9b80235f89b6c8e3a1d80b429482e6418f52d1816b2069eb7f4a5755628fac4
-DIST 5.9.3-0-201711211135qtwebengine-documentation.7z 3380235 BLAKE2B 6b067d099ae82192ffa2f5fe50c56cf68602d02be28021d4c768fe8408ada5df6d9925ab6af17d50e50ca899e953d7ea9fce06176e8b9f08e3ff022050be46d0 SHA512 128e9f76491c09007f71f0f156d7bd766e7d96d023728c728a7963d117ef60dfc69576a8671bad2b17a51ec1874b07176722e918f31341c18a0b0c0f23f3c2bd
+DIST 5.9.4-0-201801220610qt-everywhere-documentation.7z 213285230 BLAKE2B 9ff6df25cef33164afb515f34238bb689b85582fdca106f4d6341a5cfd179d557b9497f8092018151e67bb28d420b12bbcc9d9c395e0fcfc3132b2db6f193f09 SHA512 b843c78200dfc9c5f0ebd656267ca2d0d0efcdb589be0735137b5ba0a15ad90c9dc7daedcfa6c595ec1fcd7fc60523c5d8d504c34d642ffa1219cbeba8d0f27a
+DIST 5.9.4-0-201801220610qtcharts-documentation.7z 9070277 BLAKE2B bab608541ef8b236257bd640bfa4cdd6d3b75b867de55570ced3c1be87938a66ed4711b1c1ef8349eb6e361a1d26c93deed7e49addf56335ea9eadf614b044dc SHA512 3d2825fe9356a34abaf42aea3efa4e27d83c6acf12fb100f3c5aa4cd3faf25fbc1f2e2b3481fe95845a5c0c2b88924c8de19af9e9d5689c702f56252c2620df1
+DIST 5.9.4-0-201801220610qtdatavisualization-documentation.7z 6615754 BLAKE2B 757ed0c5c50e82bf3c8c5927306001c1226385bdd0fa343a342fe83acaf61c10255fd14684a3fe15f5a4c325c8503f74f5e6e13a17d4d7597435ae3b30671293 SHA512 75515a40880f890c5a4c725bb96a093d8af3ad03d52bd22a5f7fb0cd068e8f589eedd8c4560d5eaa8f968d599a223a438a4b447b5ed79083989d995e7c265365
+DIST 5.9.4-0-201801220610qtnetworkauth-documentation.7z 259668 BLAKE2B e9271460bd8e89a963020928c9272acc52e851b07c230207c44c926516a9bdf9fab6d5ebd7b507806002c9d4ba1c69911eade79ff20b11a59b606a6dc2c28780 SHA512 a42f526ed5d241ca7f5e0bc8ffd1e2b5289d4fdafe4c8116b69ca8da91cf1a2e4de07f8cf0b6a0d63adfbad6246b4ef8c605909166473e55e79f3d953fc1c2fc
+DIST 5.9.4-0-201801220610qtscript-documentation.7z 721873 BLAKE2B a6db56c9b4106c33803d0750538c3af70d6f7902157ff4936b6fbe0249dc9f1afc4deb4547baecdcb0d4d645dc658bc2044b39eab37bc1f15294cd4709d7dd91 SHA512 47356bf66b6abc8f7ed5f841e5655b722bfa2bec7ac09e076f3e4afb46a41c3c5eb83e4ba490c6b0ae2a0a527e5f45ec504fc3eb5513e2cc6ad2609edb20ee88
+DIST 5.9.4-0-201801220610qtscripttools-documentation.7z 76290 BLAKE2B 998230165da013b0c851a39cb3981856fac319dabd2ff8c16dd077d3acf5297797954cb895f052f01c8059c09ae383a686d7b2fd76ecf0b5b01beb2cb5e5779b SHA512 ef6a188f3e7adaa1fbbc0381f109b1cb9a8747b68abb3fcc938f68c617ac993261c81df2d5833ac1e12dcb9fad38658643f33aac3d32b1f4258aa3c3edb78a61
+DIST 5.9.4-0-201801220610qtspeech-documentation.7z 148926 BLAKE2B a1727de25d2e2ad13c2c0cc1d075d9ee28f913a5c788e55b5c25d4b976a4f9f775e4b2b2e96d71d2a51f124c4a6ee1b24762292a9f134a25fb8ae87128c80098 SHA512 437d2ce4172d823be6fbfca644ee9085c34a9e3a0abcd2783edda492647fe98e62d40abf81d519a15b7250491801bab48888de7d406c262e5444a4530df4e73d
+DIST 5.9.4-0-201801220610qtvirtualkeyboard-documentation.7z 449521 BLAKE2B 33cd1477544a0bfe8753b7027eb97eda72687b3624267953592a6e45c5f5d7cc7601b65ca3394e418d589af8a9386cfa78afc95b177bf6f30fa2d7c5eabab30e SHA512 927f7161cbd9d400bb2077ad1342962350e0b96c09ff83cec2eb00d961372de305e1a84840993cebc7c4243379f201dcda864773654060ff021f44e20723c71e
+DIST 5.9.4-0-201801220610qtwebengine-documentation.7z 3378943 BLAKE2B f3b37fc3105a02cf8a09191b21898e4cf64d1201069832af3e24e25ef7873b6a722ec3a202183c0f7e234a53e14f3db18b9a15bcd74d5b3c68f0ab8699bf0702 SHA512 b4232c9312bfd659135a4f7895cf7b6695afd4eb71457e2bcab0fa08a281e9bf2cc44b7a775452af91ba64cc2089181fc38acd9b22f92290ce1aeb2df16e02f6
 EBUILD qt-docs-5.7.1_p0.ebuild 900 BLAKE2B 9d30b855b116c99c3c01739ffcdc7bbb7eb09c4333c49ae59ffb986b3ed40ce2190c0fef5b8d7e9410a90aff88b30c7730645f727aa7406576a5d08633af8c74 SHA512 960e35f696593acdb0a2db5ee840b3cb276abf25d92a2ca66d17a161529170ccf2240d82ec102c6a43a0a8ae424d3c49f385aa4ce762e5989a6d31494366a90a
-EBUILD qt-docs-5.9.3_p201711211135.ebuild 1636 BLAKE2B 1df23f3ede91ad022d6bcb29060ef461739f8c80dba2deb6a5cb682929a24aa601be2d528a738b0ecea0b8ad527d25850f1677a435de2486c92b48c00a1c508a SHA512 b7d923575aa87025ab70885a69182d13114a99c6c8c8dbae02955185f9288bdb119f93ec21336581c1154210b01fa4fdb547df1a8ae2401298bf537b703caa66
+EBUILD qt-docs-5.9.4_p201801220610.ebuild 1636 BLAKE2B 6a8117ecf6e305ee729bb982fd1f35c2098b02d469c1f9bcb4916f160406280af4e10ab1e0279856add20095784a3baf133d7985d9bd727f25af66b3ff11fb07 SHA512 afb48f933d83b8fb02fa053ea508b0e4fee336f1dbcfb7f29c5c5f0c386e936fa51b2e7ae61332e87134ddabce00be39ef23d1b14cdf7791752a67522ac19e24
 MISC metadata.xml 978 BLAKE2B d2732b8f9b6160a7bbc7fdac5ed9db5d76bac4965df284e2ccd11aa49c4c2936386a258ce3ce7219898064069b76fe244362e6a3e4b8cdd6da775486b861539f SHA512 ed280d83f2ceda62d36dc7a95b4ad4bc356929692dd0084627aba8af47518e736d76d1bdd8402e8e2772fea4d69ad6476f0f34d9502f8bf181efc75d6e380fb6
diff --git a/dev-qt/qt-docs/qt-docs-5.9.3_p201711211135.ebuild b/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild
index 5a8da7a92abb..58d73f53a8fb 100644
--- a/dev-qt/qt-docs/qt-docs-5.9.3_p201711211135.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 2ee912d3813d..39dd9c4d13b7 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,7 +1,5 @@
 DIST qt3d-opensource-src-5.7.1.tar.xz 19474848 BLAKE2B 9d922fe496bb2a44d146d989be1b7f7eaa453ac1e130dca3dbde94426f2bf275d90e4b1e71ffb3d747c90b7fe001c7d90bd8c8be71bb394657691107773f6be8 SHA512 fe124b939709185d9ac755d017f850a3f3d97f7f58c863a3da3df5dcac25391ca79e97830142fb263618e7afcb4bf43f363511539d508ec2a45a8a99f0e1a8a7
-DIST qt3d-opensource-src-5.9.3.tar.xz 28000420 BLAKE2B 6441d217fa8cd23549d2ec2d02f7846e9d0d216bca730fe225fd4ed3e9a4ec13dd76ff6d1b0ed1af5eef0824b2bfa46a4cff8cb1ac2c6d40448ca4c019fd658e SHA512 885cd32b707087e710c0630dbf30a9638aafcb278e6312e53b850f26bf0f18b1c980d6206d33290418cc6c0478215e88022129450dbf1608c9a74d08e3cd7822
 DIST qt3d-opensource-src-5.9.4.tar.xz 28007244 BLAKE2B ea38270a01460045e7cb57ee5c750149553fc3eab5ca7773ea68104f97a12c81a8125c9375edf5f8c35e2b13ef0a56da01c0370a6acc2ff9f0a03d0cd40d20be SHA512 1887d9e4e2669b15e42ebc2db9c040e1f344f14a4cb2691821be2773c70d63bf6ec152a3dd0572748f77a09aed8067e6bff022fcd5dfc4bd5108af75e626d829
 EBUILD qt3d-5.7.1-r1.ebuild 598 BLAKE2B 96fd958dffe64740980f5b4f91baa5656ef9a220c1dcea35ddce489b0a46962369c4e8ec13992f1407e3c236ba218b3bf47b74d02827b0d2f16702c9cdca9e4a SHA512 cc06b602224b4f7bc375de93765419ee2a211ce8713e35d81e50482f3ee0a5702b357d6a20872a852de8f1dba753da1e5e4955ac7975b727854d806082ab8040
-EBUILD qt3d-5.9.3.ebuild 641 BLAKE2B 93f3c2a9e2cb39d95e0f9193a51382bc3cce8fd7f257ec6dfe92bfe2029545a145958a1599c0cf081f1fb3a40bef82a0eb4d13f3080961a448e00c8ee01a8103 SHA512 41c24cfd97ad7ff7b91c0b395e7f7cb83b84ca70d6344b8f5cec86c643f137e00e1208abb356b08f8c182e92a33c0ae2f8a610fa23afcf2bd3104e65b56aca29
 EBUILD qt3d-5.9.4.ebuild 641 BLAKE2B c9ddbaddd5e05d1f3fe761cc7a20f6f8d594b0baaa0341c509b996c7ad5d4592a7f787502e70ca512f9e8c8fc8061b6f944155d6041c7f8f7c03af1c11682b31 SHA512 12379a62770e6b366876b72bc495598bba964b6adbda033ccc3afdf932fee0e2adca8fc198503ba85f4281560856cd2c19affdc541e41943fcecf1004294ff1a
 MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
diff --git a/dev-qt/qt3d/qt3d-5.9.3.ebuild b/dev-qt/qt3d/qt3d-5.9.3.ebuild
deleted file mode 100644
index 02ffa8ef61d7..000000000000
--- a/dev-qt/qt3d/qt3d-5.9.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="The 3D module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# TODO: gamepad, tools
-IUSE="gles2 qml"
-
-DEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	>=media-libs/assimp-4.0.0
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 7d6fff652c9f..7353eb80f3f9 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,7 +1,5 @@
 DIST qtconnectivity-opensource-src-5.7.1.tar.xz 2690688 BLAKE2B 4e9d0c11408224f03e6d0a4ce0b54b1c28cbe760459d7be3eb00477ee3f87b3108a8f4d3d84777944913c17ff6529c1c79eb80c84a37e045e9c6942f9c43c2b2 SHA512 3550be2ce365c7eea2adb41b6db63d0867ff1eaae15d6f4d22345bfdd8e4ac9c2f3983e5d3e897d5c4d7d32e466929c2cfdfac0921c0927c3955f021d37d9e61
-DIST qtconnectivity-opensource-src-5.9.3.tar.xz 2723456 BLAKE2B b3b18b90d09b612789b65a14937178ebde2ff423ef7931d2b4272f5f61b7fc9df52645d888e10fa135d03a72fcedb398ce95ddd7916a8382b35d6bc3cf79a179 SHA512 28fe6ac8e9480e52cffec7bddd6db95ed4bc96858e7b7e6f1ecb325f2ebb48442f7ec3e820579e9c0654aac48ee91ad734e51f0eb65faeaa592eb7a0875854f5
 DIST qtconnectivity-opensource-src-5.9.4.tar.xz 2724048 BLAKE2B c401cd0d3a5b064667f7114b2e95a6bedfcc3b686c37a9962527b4c8a5e73f194a2f07b45408756c38550e4c09f79321f698f017556a33ac2cc7af40dfafea9a SHA512 d4cb67279555872f8f0ba0a9d746774f393711727aec058ab9ee59c783a645d53fc76a8ddcd857b0beed1dfdbc16ee7b4a214b3e95e1d5ba23e66e942d041a2c
 EBUILD qtbluetooth-5.7.1.ebuild 636 BLAKE2B 8c6c8393c94cc634febcb426340b342a558c51a4aa0d57a14f95619ab4099316bf2b0811a0a83d91352e13a881fa403f98a65cc5fcbe27f8692db4cb4206b7e4 SHA512 ec143dc4467c7d38946d360622bfbb94c23e22ec35d990985c45fdff6c06c1cf509784833bd126b71da73bc0eb095e9a3dcceca9a8a1dca81e1f61aa27e17d37
-EBUILD qtbluetooth-5.9.3.ebuild 641 BLAKE2B 0f20fa0940eb16dd5cf571b979956c5eb2e6b2b2688a492fa57c685f510422a246d59979b00e868b262250adc80cc49d646c50ba6fd3ae879ded3b6fd85cb698 SHA512 9c93e43ecd45455c09d311f6f4778bd177edf71e179b2b35cb0f005c9e4e7eb04d010d339eaf05ded16d80e4663b47b61628cff2842470f5694f245faf800f9c
 EBUILD qtbluetooth-5.9.4.ebuild 641 BLAKE2B 922e93e07d44ed1f07466bf8f52af6908c2732894630e3920b8046727b03dfdfebe7841c03e66a5f60aaa69502595691748241d76469ece63250ac3fdc6bca16 SHA512 ea8e27764a21856845dbc2b805136b4f1b9386c60b1859d6782f7dd986591eba6af492887b4f56438599e8fda57c38dd64a04019a42c612aa94d463d0e7cffac
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.9.3.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.3.ebuild
deleted file mode 100644
index e7665bb6b262..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.9.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	>=net-wireless/bluez-5:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtnetwork-${PV}
-"
-
-src_prepare() {
-	sed -i -e 's/nfc//' src/src.pro || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 627691d1a35c..d3b79a64a69d 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,7 +1,5 @@
 DIST qtcharts-opensource-src-5.7.1.tar.xz 4086256 BLAKE2B 21b8e072b11955ec6fcb05355c3cc5903d916e8476a13529b2b71fae23aaa5f339fa56afe305ed39510d088d3db54cb142b069334257b7ee5c3e0dd454fa58b1 SHA512 2db2c5a956e84b4e080df71f6ba8bdf48ad3a456d334f59d50525a10cb7358129d7cf7855a11342192d03c10ab1cb84d94faaf94ce02f6786d32fe655bc8558c
-DIST qtcharts-opensource-src-5.9.3.tar.xz 4157772 BLAKE2B 9f1c783e89848bde42978a8f4a307cd8ba8e4d5bffd012f3e1953b8825a598f12f4fd6274bcdf9e719c0130a1e0e33dcc706789ef7017cc2645426e0725a03d5 SHA512 394806f9e2abfe5c36772efdbad576f7b8372f8cdd3e171bca320b8e35159f11a8022752f789038f98a63c448473200fcdc8b636781af8a417dce30184402355
 DIST qtcharts-opensource-src-5.9.4.tar.xz 4158264 BLAKE2B 6e6ecfe3e8b7fc87f1211ef2a03fc7310cc2f4cc6b9711c9da69d8ad83e062137a371c74f6ca882143a5adf516e4caf4dfdab31a40c036fb79add2b80022156e SHA512 4d93d2f3a3c51967e0377a1fd1397109b0cc621644ca90ed587d45950b9a49971738132223a55b45d6ed45685d5bb8e77e159505bd96148ac495047178a4f35b
 EBUILD qtcharts-5.7.1.ebuild 521 BLAKE2B f2eb1cacabd96e3995125de8cfc7da8d451b1b41021b97f88021183e47795102b91d2b392106bc1eeb94bb6523efd39aaa530ba9d4b1c2a64317193eb7cbf91a SHA512 5dbc46795ec80a1dfd98d3aeae5e54e37582a1e26fcfb7d3b48531e1652fbfcc25872677a61683458c733e4dbb376f4262a3a186f460e5e453b93afdd0f39c10
-EBUILD qtcharts-5.9.3.ebuild 521 BLAKE2B 8f9d2ce61fa67edad269f8e89904502dcb18ea91e26507cbf7e9cade743313d24e4c78a6d1ff46a22de813ffb6d8003bdbb41b8a0827cc2cfd48bb4174a95b19 SHA512 e43774aee68235c06734967248ad655ffa5657fd6fe1e89691999037f76cbb8ff0e782d4b14fa45fcd39400bdc006411dba1d4d69667cb0c11764abe4bd4ee13
 EBUILD qtcharts-5.9.4.ebuild 521 BLAKE2B 17aa09bc8a5b7ff63922550b51b3b2d84d75568196a888201891151bd81297144859a9859b1a2ad483c8a5021074d060fe291a9b85c4d7161f43a84e2244f6af SHA512 772a45a02f813d6bc3fd2976415c58396f81ee33fa37e71eec3abc4d3f16aa658bcf0db3eca75cf57e5a6577317c6bf8ae4e27d533702c82d5c2b17a2bf0f1e7
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.9.3.ebuild b/dev-qt/qtcharts/qtcharts-5.9.3.ebuild
deleted file mode 100644
index 87959af467ec..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.9.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 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 df8e6e0db478..394e2e656733 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtconcurrent-5.7.1.ebuild 434 BLAKE2B d70d97815a7124d999c113371707607a8f6f81c41b09f25456c9c8e36b1e67bd1a95d7dba22f53108cf833f50275619d1c2dab0bb858a41eccf62adc088b7a91 SHA512 a426a48a5c65b76fc2acd8d02a8f3efb14663b476ffcfe5474bb2079245d564b8881f017dea0b3a7b3437b673e66e9dbd57ab28ad4ce7f85ccc88271b41b5fbc
-EBUILD qtconcurrent-5.9.3.ebuild 439 BLAKE2B bd8dcf198ac0b72c86e2f8e05fa95c13254cdd4d7a8528a99e0d0a68b6f53ff59582d2116978e0582672c674ffb3153a6b8bae230fa02fbb9bc05eac68123123 SHA512 ad76fe37bf7289c57a1415fde23402c394e6c5733ae18096aa57e4dabc8fe17ff12f0c52288ba9d97efdf1d32ff7ecf2224e41f2b491922bc9b6260338f6d09c
 EBUILD qtconcurrent-5.9.4.ebuild 439 BLAKE2B e11d39dfc7a138ef50ee4a52fdf2a6f19da545a5ce941f5820137e75b9d913edb167aa6998169b46a844c5a8377541890eb2b00e35ef961b9aaa605a6db9534c SHA512 e500e5042b2015c235ad25ee2b9a00420a6f8bbbb43b7e8cbf7ff7952290fe6ad46f22b0458c94bcf057e72ccc7355d56d4b6e4319971a58e8e141db1afb8a3b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9.3.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.3.ebuild
deleted file mode 100644
index 2886524bfa18..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.9.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 2e29b8680993..c5034524dc88 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -6,13 +6,10 @@ AUX qtcore-5.6.2-plugins.patch 3264 BLAKE2B 232cbd215d8c93475c08f614c74ce0227d23
 AUX qtcore-5.7.1-qipm.patch 5915 BLAKE2B 7b1c6550d39f55b91462e8139e8a0d662b28b6fe2648a860fc8c72d4b0cbbdfd117ceb8c15c63a87a46958a316692a6127afbaf95314b257c15d09a1310df21f SHA512 807c030c2059cddcd159cb537ba2e4be68d6f612f45e1e7b844fc045f661739aea7bc35743735cee364d692d51774e17edced1aac8d444abaa4e4435117a5b3d
 AUX qtcore-5.7.1-qsfpm-1.patch 8922 BLAKE2B 8f5003cbd4bce102219856c310eb79a84752c2405a155eab33e6988958e5c79f69f04fbcda481c54eb19283f90f3a7873fd3d1a816ad73e7f2d0bdfe2a3115f4 SHA512 3854fffa1181cebe4683c54d5e774301a8710bf784dcc18367d04d193a7ce76fc6f634096b6986af41c3f5e4432b702873181a8900fd18e7617ea472d23d6d92
 AUX qtcore-5.7.1-qsfpm-2.patch 7812 BLAKE2B d2cafac754d28cb7a13a15cf75dcb323a5de84400ce1b586ddd7c129c4b32db133f5828c4407144d3d10d3a01bb885819339836792639103be25e59408a88e13 SHA512 38b141aa7d30011d71ed9044c69f79b56698320600a64ed3cc37e8dd9d22bb9ec2f33f8348d074552a5046c2855e948e325d5421384cb4c66c0bbd566500174d
-AUX qtcore-5.9.3-avx.patch 2740 BLAKE2B 9af6d58583e9bb49217b76e54c139b7c13dd7ddfbab2a7c88bbcc46b5ade4a52fb1790722476d68a785aa4d7a24707049d14be86e056900599b40e30489f7b11 SHA512 44ee123b4634c1b613cf5fef82f01ae35fb8b55679355e10032f52d55d72529d00283c94514515d311590cf09cd33a59335d2d35d4e821e3deaacf3390a58eb4
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtcore-4.8.7-r3.ebuild 2866 BLAKE2B 323682baab556e3eca23f3c31d872fdb0b7d06d95be41b132b76793d4b3c99b983fba67861629a2cbef3f997b6d46c22816a43c30031f3f9fd1a399c72e9cfc0 SHA512 fe03ae3835572bf39090010e9740e3174c0b5eb2d1ea92b5fadc7d498c29c8ebfe21d86bc9b2783ab2c6957a28f0e65f1a57c36b903ce16bdb9e2cb0328e1875
 EBUILD qtcore-5.7.1-r3.ebuild 896 BLAKE2B 5d6c21f0a1de4db39fb89d34c2112fbb4f88130f884d5dc2b9bb8b4d4ceec7d265c68a210689b3ca7ac48c726954846e6512bacc0e4707fa51cdd7a3a8c12791 SHA512 bd5fd8e6a9a189773f4c5473d0073709f034b661a28296a8f4d3cac4d26eaf63f04e4b0d08028810b77ca10bfe8c67aaf6c4cf2da7a436e2b29f9b04024cb158
-EBUILD qtcore-5.9.3.ebuild 1431 BLAKE2B 31e75dd8b0faab83f94e367b53562d49ae5f54d674420d025f5538978263924dcb3316175c8148556e49e9ab0f2869f99d9c5b33da66c153e4a6a89d70e0c762 SHA512 df1750e83202647e21abae00b5e01eaf206d8c3a98005fa81f7ea48db1d91a8451a48de6b2085990ed944d87c944620efc3ed982ca85fe5c4c2828a1300fd541
-EBUILD qtcore-5.9.4.ebuild 1456 BLAKE2B 683bf2694e07d7b2001d2fd54c75f8b02e7dcddb8c0039afcfbcc1e24b0a10926a4e3d6996972cc483110705cee145fa31b21514775d78fa5417faf69323dd3b SHA512 f36f179bb03923aa32b5d42f6ce3e9bbe62372bc43ca300c1d9d5eb1c143d1a395ce7595fcd245dcddbce57d683bc846af21eb0badf6f75c1cd1d146ea484c8b
+EBUILD qtcore-5.9.4-r1.ebuild 1464 BLAKE2B dbf7cf4f18ba4fdd005d0a86f74aab67f3cb4d711a715a0fb8098b85f4694ee898b7c030b8d199b6cdc9cd9a251483456b8c3ed92b1c0f1609839dbe741fc7c9 SHA512 27aff99d26259f42bf9abb266c101559d679c123ee18b459fb45526a56af4a48b2964ea6d98b796c9fd0cdf46ffefd616f3a81e988fe6d5b9cbabf3679cb9011
 MISC metadata.xml 924 BLAKE2B 6be074e378d4e63efe0c6ff55cb99c3ab1318c1d05d8208f4deb8a54a3cc9ded99b63e788336d83633b03eb5d857394e189472a374184d852d3c5851e27555b6 SHA512 c9786a997109a6156ed4879cd94e3e368b7ce095fc43fced168bdc5fbc846411c145318020d0eab7024aa64003403435a6cad222ab3569d838b9450c526c8ddb
diff --git a/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch
deleted file mode 100644
index be18433be209..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From d813c66bfcfac1837814ec4d174d0389172f0d4c Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Tue, 25 Apr 2017 12:02:09 -0300
-Subject: Fix the build when AVX2 is enabled but __F16C__ isn't defined
-
-If -mavx2 is used, __AVX2__ is defined, which enables the F16C code
-after commit 280e321e52fd4e86545f3f0d4bd4e047786a897e, but that was
-wrong since we aren't allowed to use the F16C intrinsics with either
-Clang or GCC (we can only do that with GCC 4.9 and Clang 4.8, and only
-with an __attribute__ decoration).
-
-With ICC and MSVC, we are allowed to use the intrinsics, but the
-#include was missing.
-
-[ChangeLog][QtCore] Fixed a compilation issue with qfloat16 if AVX2
-support is enabled in the compiler. Since all processors that support
-AVX2 also support F16C, for GCC and Clang it is recommended to either
-add -mf16c to your build or to use the corresponding -march= switch.
-
-Task-number: QTBUG-64529
-Change-Id: I84e363d735b443cb9beefffd14b8ac1fd4baa978
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- src/corelib/global/qfloat16.h | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
-index 89a62a93db..a0aa9496b4 100644
---- a/src/corelib/global/qfloat16.h
-+++ b/src/corelib/global/qfloat16.h
-@@ -44,7 +44,16 @@
- #include <QtCore/qmetatype.h>
- #include <string.h>
- 
--#if defined __F16C__
-+#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
-+// All processors that support AVX2 do support F16C too. That doesn't mean
-+// we're allowed to use the intrinsics directly, so we'll do it only for
-+// the Intel and Microsoft's compilers.
-+#  if defined(Q_CC_INTEL) || defined(Q_CC_MSVC)
-+#    define __F16C__        1
-+# endif
-+#endif
-+
-+#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__)
- #include <immintrin.h>
- #endif
- 
-@@ -116,7 +125,7 @@ QT_WARNING_DISABLE_CLANG("-Wc99-extensions")
- QT_WARNING_DISABLE_GCC("-Wold-style-cast")
- inline qfloat16::qfloat16(float f) Q_DECL_NOTHROW
- {
--#if defined(QT_COMPILER_SUPPORTS_F16C) && (defined(__F16C__) || defined(__AVX2__))
-+#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__)
-     __m128 packsingle = _mm_set_ss(f);
-     __m128i packhalf = _mm_cvtps_ph(packsingle, 0);
-     b16 = _mm_extract_epi16(packhalf, 0);
-@@ -134,7 +143,7 @@ QT_WARNING_POP
- 
- inline qfloat16::operator float() const Q_DECL_NOTHROW
- {
--#if defined(QT_COMPILER_SUPPORTS_F16C) && (defined(__F16C__) || defined(__AVX2__))
-+#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__)
-     __m128i packhalf = _mm_cvtsi32_si128(b16);
-     __m128 packsingle = _mm_cvtph_ps(packhalf);
-     return _mm_cvtss_f32(packsingle);
--- 
-cgit v1.1-6-g87c4
-
diff --git a/dev-qt/qtcore/qtcore-5.9.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild
deleted file mode 100644
index 5442d7c47bf9..000000000000
--- a/dev-qt/qtcore/qtcore-5.9.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-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}"
-
-PATCHES=( "${FILESDIR}/${P}-avx.patch" )
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/qfloat16-tables
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-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 XCURSOR
-		XFIXES XKB XRANDR XRENDER XSYNC ZLIB
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.9.4.ebuild b/dev-qt/qtcore/qtcore-5.9.4-r1.ebuild
index 54eb30f5d38f..368fe44dbac8 100644
--- a/dev-qt/qtcore/qtcore-5.9.4.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.4-r1.ebuild
@@ -56,8 +56,8 @@ 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 XCURSOR
-		XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+		XCURSOR	XFIXES XKB XRANDR XRENDER XSYNC ZLIB
 	)
 
 	for flag in ${flags[@]}; do
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 0320fc7736f3..8a65be2ccb3e 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,7 +1,5 @@
 DIST qtdatavis3d-opensource-src-5.7.1.tar.xz 5155740 BLAKE2B bd0fbd04367dfbc328d1d63fe5e2557a491f8d2dddbca4efadc190bdfa640f3ae2c7db1b29ec9ff07e3b8e03cab2b4caa4cae2ffa396d82d4db728aff252dbbc SHA512 2739f7ddcf81fa53a2673e7073c1dac54ea15b70175e19697c7711d652101f0f9a41dc5f89ea33bc5675605ba760667ead8cfde10940dbad8ec75f6897c67b5a
-DIST qtdatavis3d-opensource-src-5.9.3.tar.xz 5163104 BLAKE2B 22502bc5c365afd1d1e65ab0c01d1aa744ec78413714d16c5ef6611b07f797f075b20c59d31ee80d30a5b20c68688e9222597305634355f79296593ab3837634 SHA512 2e549ed5dc6aeb92325c3a26a3084865ba6b6bfbb48c3e415dd8dafd54f248a8b61d4a49e376c77eae214fa91df55b3f960ad6400209fbff52708382e154c873
 DIST qtdatavis3d-opensource-src-5.9.4.tar.xz 5164120 BLAKE2B e8e9586da6e261f22ac6dba12b530755b1b6914f702a33d196968f7c8812e4d5a6b86dd7584c109385fa2e9bc33fcfc067b2538f8d4cff69d3a0624a26822a8e SHA512 8e314d4b0324b6d9aa9a4a63bd3e21010545ce7ffa250614ceea6052b37d7519036a4e13ce1b3cd264e5ce00453bceb774234932cf3c3a49bcded0988d4110c2
 EBUILD qtdatavis3d-5.7.1.ebuild 625 BLAKE2B 83a990e7da20777008fa1f8db5ef6e0850d0d1764ae763cb0063e7b8198277225ab00ffb6895317fe6800c34bee77f08f76177a690020f72e382ef0d9889c5e6 SHA512 6498e8bc0b6baaf227a22c047e9e2587d08b632d3bd9ed747af513b8ef607e2bc7faa420a0147cc67be744ef8468696488863282c4ab23824bad42375a0b56eb
-EBUILD qtdatavis3d-5.9.3.ebuild 625 BLAKE2B 5bfdfb3600b882ac63e22ea74f69855b6a2b48af98806eb6731a659395ab46a2bb8abfe397fa781e660efaa7e03a02d0225620ab87183fa73a34ce77adc212bb SHA512 971fe6b40e1f7beeea40feb2b2234c5d6727f1cd1e4abbcaf1b67a713adc88ff0b117564677d86cf1c7fc7b03d341ebad326f79490c28552de6d858aab82fe67
 EBUILD qtdatavis3d-5.9.4.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.9.3.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.9.3.ebuild
deleted file mode 100644
index 4ce3a82a3a95..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.9.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="gles2 qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# eliminate bogus dependency on qtwidgets
-	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
-
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 694b803c4c4c..90d68af7be79 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -2,10 +2,8 @@ AUX qtdbus-4.7-qdbusintegrator-no-const.patch 543 BLAKE2B c5db96f9b2b84e8da8ce82
 AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 BLAKE2B 079b0ce31ab06ab26ac14d94a88ee524ee9459d62e25b5d4e5f16d95a2ded69a1d257de4af8d2f304fbb3eaf5a0aa194aaef7322cb4f65debd283865c5b2475c SHA512 b3135450bcd7ab50e5b559b0e8619606053845852159853498756e50777cfbe8b5871bd7b0c178b3de038dc9229f3564c4827b35fcb67b354f0814ca1b2c58e3
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtdbus-4.8.7.ebuild 856 BLAKE2B 45206407be68ca357eeaab6a5d6cf5e6f614c333bf7f094e54d32468d6dba97cf86042ca2230ad98d71382e35ede4609f1e2fdb2d64a0b4f1c2fec998727d594 SHA512 5e1a3bfa62a290548f111fa9ad6bcda6faf67a718cb689a8420bebc4154d8d7d194ba5de5485219f77e7e844ccce897b5f34fe3bca3d9b0ce8ab87f336ed2a4f
 EBUILD qtdbus-5.7.1.ebuild 626 BLAKE2B 0300dee0d4e838bd29c16e098ad3362d9dac83de816560334469ecf4ed75550deda4ae6f487a531ddca73e4620d33095ab6a8b975d6a44795a3cebd8f211895e SHA512 73b433dc98af92d58dd0aec68dbfa73afe1830068790120fe0e809562ef41fa413145d0d917e07d7c8861bfc7f4ca34e7db0b3c6947f19a32b86f089d23134d7
-EBUILD qtdbus-5.9.3.ebuild 631 BLAKE2B 9b78e9e769c572cf2a06527aebd28149ae5782c7597414e2ba4ffc69a4b01269b0389b3fff86e6f4d40788d05859fc76474ab7e99f34ecf4b3c99b456c2179aa SHA512 d70446d80b998541d703312c0dcb5db8957f8ca6e086f57754030745d1ea37b1fa69f277142fd6ee0c462976cc5c77b4d8e9573b5e2901ff041185869ec0b1c0
 EBUILD qtdbus-5.9.4.ebuild 683 BLAKE2B 95a9165bb2b85fc66d91e466726fa19fa220da5af71f5891b184428df67d2e3fb292fd37cf551554cef8e212a8ddb1c3733b184519ff5b6af230f411245fdd35 SHA512 af48f9a79c34aa67541505858dc6154989a76aae8c83eb03b85ebd79925834ac75dcf91be04e831d3972b223f3ae8e1dd1c97683ffbc31fdaffdc0f4382c3d9f
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qtdbus/qtdbus-5.9.3.ebuild b/dev-qt/qtdbus/qtdbus-5.9.3.ebuild
deleted file mode 100644
index d7d8945c5257..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.9.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-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:
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index c6ffecddad18..79ab82d65c1d 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,11 +1,9 @@
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtdeclarative-opensource-src-5.7.1.tar.xz 18976920 BLAKE2B f451622bd896445b21db99c0896a58051b8cd78b98062ff9ae71285ea66a692b7f236e0c8b69ee9b7a2685f46344525554caf73f6a9d5b45ef7d6df15f8e4b17 SHA512 8c56099a13103f4831a7ceb29223722c1f8efb0e9a87a4c1fdf0b55a3c5b4cedfdac6e06960ea5d03df4184b3d1c6bc3f21bdcdbd2400591143930aa8e32a2ab
-DIST qtdeclarative-opensource-src-5.9.3.tar.xz 21443328 BLAKE2B acf201966b55f748e516d0f32c2fae0c3990d00ff5b2f31d72d012840ecff4328ba693eb96a800fa6eaefad285a72edfbaae93343e4d664792c561e78ba56882 SHA512 933caf5848437cde45b4bbf0c70b6cafbc690657c651508b28138b2f90d2f823f4842bc709f4726e2c88d3913a92240b0dcd9248d83af0d06d7127b9a8211b24
 DIST qtdeclarative-opensource-src-5.9.4.tar.xz 21454140 BLAKE2B a7e792406c2eb42422aba1b779e2249f081840c8237a119cf4d9a001fa34d1f5e48e30216c08be431a89bca52dd56d4241d92cdfdb8b684b0912449bd0c9301e SHA512 e9e425665df42826c2525566e08b3588aa73b0efea295eed301ba5caeea7208b90c5a91a55cc16986ea9e0ceb9c6658bd59f56a3a276601ad5780f2c67f5ad5c
 EBUILD qtdeclarative-4.8.7.ebuild 1493 BLAKE2B 1fc9ba56b9dd67fb840611e38e19a5bbc4b5f50d16cf7afbf9f384367ea03728f2d44aa1d14adf11ab44f8fba5532ce5f742803a5139f3ed25cf4f404e117d51 SHA512 b01c643b5d27f41e862260743be6701464ed145063ebb6642f5887b648b2f6e8c92c960d81e221a46c8aa7abc9461588953756390f080a7c6a02c53011338ca1
 EBUILD qtdeclarative-5.7.1-r1.ebuild 1599 BLAKE2B 4eb6b7c1e0908d58b3d2d354c46896abb86a82166ef36283465ee5738949584fd35ea8a613e383988bf2910faf5f0bacadeeba032c7f29b7e9451f8a5498b907 SHA512 6d73bf168ea19e07999cbc9b74957415485e176597c5d706afe55f884aab186bda425bc247aaa343fbb04c1d3836d973306441c05dd213c5d119cddbc2dc6864
 EBUILD qtdeclarative-5.7.1.ebuild 1327 BLAKE2B d9cd172eda38ee091a4e40d603425f2d3abbf0a8850c06676fabe94dcc09867f9944239fb3776c8ce942cb5dd0f1bd96e425ab25d48a5a7adaa06356d201a0ad SHA512 64f80c5f910c30dd09967e2b3dabfb21a4d7b4fb109bdc6512ded41ab6922f3a4034bb4567a7efd065ddd28eb2ca8a9763c283e82829d26e3e44600aa9880942
-EBUILD qtdeclarative-5.9.3.ebuild 1315 BLAKE2B ccb4987e5e25a416e766d1d072684c6d37e693d1d986be94cab18aad30fffdc9204aa936a8554b8bb99cc5789d73f9898a20b2d4dd9d8b04f242c2f4ab0b2d72 SHA512 669613878211da2684dfa59a72a69a932e0a984dc8d2eb4a38b8868e7d6f6fa15d8ab5a45366d3fd2c42123db3eafa7e72bd5fce288aa89b6cb0319b8dc75ffc
 EBUILD qtdeclarative-5.9.4.ebuild 1315 BLAKE2B a73070cd34611690b47802758d80f00d5d1343e5b3515282cf77d5492045e115670d0ae9d292efe1afd291816dcd015950b494f1e6863fe04d04542b23557879 SHA512 befb7a05f78cacd0ae874746d1a0fac905b7e3a9a2808fbaa78ea465ba50e64cb2c99f2a7799604722e7fda956e2c131e7ffe5eac5868200b5cfe5094ce8e549
 MISC metadata.xml 1154 BLAKE2B 838bd6238e0b647adb40c4e0d73221104b2f26f160039a014c4576fbbbf51648ec1497e1833987ff298c4d42159c8ad2b2264b8f8a1a5c1d509e321e543709fc SHA512 fe0fdc462c9337726df24de8b8a13660da81a2cbd7cd3d122fadb3a6926e2cd6213d8eedc12185bf4dd1012ab1062ac59fa3cad3055b32e71012072aa31ef415
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild
deleted file mode 100644
index f3759a5dc3f6..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="gles2 +jit localstorage +widgets xml"
-
-# qtgui[gles2=] is needed because of bug 504322
-COMMON_DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
-	xml? (
-		~dev-qt/qtnetwork-${PV}
-		~dev-qt/qtxmlpatterns-${PV}
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-qt/qtquickcontrols-5.7:5
-"
-
-src_prepare() {
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt_use_disable_mod xml xmlpatterns \
-		src/imports/imports.pro \
-		tests/auto/quick/quick.pro \
-		tests/auto/quick/examples/examples.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 5a2f0b4550d7..ebadde76700c 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qtdiag-5.7.1.ebuild 485 BLAKE2B 6314a5d4ce429af5278ac7882322a8695b7faaec8f26a29c6db4a8c5343890286bba1a68e3e2f8c8bc9d354411543e7e63978ad15f68b5d4fb5047c86ef37d1f SHA512 42d93ab515ab238de2bced22e53d32087a878617bac64357748ca727d8f83d99c7a585bc8cd17633592762c676cf65bc86417250902725c768c62ca8bf67f283
-EBUILD qtdiag-5.9.3.ebuild 716 BLAKE2B 1ca31612dac6b9c94402c56675169439aa9853f8a2e80bdb1a75e540a13cd4df4851aec8c50eef08c9580377902a31cc33408898c3621e439ae656d12dbcb5de SHA512 9cb162951d86e733622162630d6258458a7053f4ba7a3dd2fbd63feffb3e0a361091d45c10c0bf182c4aefcd7e17815f84908ca98b291c6331adf18902a9c74a
 EBUILD qtdiag-5.9.4.ebuild 716 BLAKE2B d55f92d3fd1e005b7e156404d74d09137ca66da313e26b387e14780da28ff157957d13c6e460a36bdfd9167fe876fce79ff57618ea4e5a3375527dcddc7f27a5 SHA512 d795a0f96ca8fce4d58f8d5e79544956784f507a6b5bc35e141e104486dae1b8c25a8ac27b26726a44b9fa391897bfcc6dc55238f68bca2db1757224e7716f6d
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.9.3.ebuild b/dev-qt/qtdiag/qtdiag-5.9.3.ebuild
deleted file mode 100644
index 18a8d907b609..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.9.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="+network +widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
-
-src_prepare() {
-	qt_use_disable_mod network network \
-		src/qtdiag/qtdiag.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/qtdiag/qtdiag.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 04e86f8f6caf..2ae59890b94c 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,7 +1,5 @@
 DIST qtgraphicaleffects-opensource-src-5.7.1.tar.xz 14486948 BLAKE2B 62e0f19fdce08561848ab87768bfc56502d6f243769ee1b847dec018cbc231b1b64f95ca4032bc2fb1e6a73fb7f85dc51ebde2d551ec8be3b6571d07bfcd97e9 SHA512 2eb5fa078be65fbf1b57aca7106cd77c840aea3f13671445552ea4a5e0c6ff1625e30f58ca4919ea6dd76229931a307a77f172b604a55fc115569c4e446b5a3d
-DIST qtgraphicaleffects-opensource-src-5.9.3.tar.xz 14480348 BLAKE2B 187e048db6cefa7a862c291f11c5490788162dceccd14cbf772c61ac530292ca95e2b18f4da53aa3fbe1ae38fdd3fc6d45a120b3d768313afcc6f12f3e408664 SHA512 4695f91b03feba279e62653d5794e175d436c40e1a0acbfd1e3caab9473830f3583dd2a9821f2fd0e0b7d354ad6ae8dd486eb95893118caaf1518cdc64f7a03d
 DIST qtgraphicaleffects-opensource-src-5.9.4.tar.xz 14480512 BLAKE2B 1ec184f4b42bdd775dbeaf627844670c0f6316469f269d66845c84286b21dff94badb50e2f5a7e0f4335db0b04b12e37ae2b220cfee950e3eadbd6a2c2efffb1 SHA512 efe4d0fc022bff8e9f20b1224ed624a9499bae069576db957dd73c1da98922cc98e4c1e556180bc3512215631116581d1f76030b11ac9ece4f29a64564fdc6b7
 EBUILD qtgraphicaleffects-5.7.1.ebuild 446 BLAKE2B 9a1d9b17096ff197c0eeaedce020777d32846ab0c08e87f2384c4902fca9cf6d07a25f8a3d05bddad6b4f622ff4463a7e29ee831ec199947a35bc30afa2b11ad SHA512 30184a13d86002cf18b3e9d5929021210134de9e08aee6e5a7c204ddb8a999fb5dfc936871f2d6720e69c19c03794a76678f6a49a80cedf4b520e4a2bdb7d210
-EBUILD qtgraphicaleffects-5.9.3.ebuild 451 BLAKE2B c2c7bcdb0f7728aa79d1fa47b9629dfdbda2c25c5a27a40c29a7e9af33abcfb8bdaf1d153c088dab817f21d3e918cc56b0e6d28665bb550e1e416d73b068a116 SHA512 edeaecf449d131818ae4b2a82cb6a0a8824d5562b32ccd13e4eae739a97e6627d1267b1543fade38dc8e5c5da8227c3c58d8159e0d7b4337873731e1c46ff470
 EBUILD qtgraphicaleffects-5.9.4.ebuild 451 BLAKE2B b46592374ae4e7fd7c3bb609ec72b9718f62fa502148fb48a83fccf1e702d84c36a41fae24ed7365928545afd8431f28830116ee3a9557bb08321b109153a32b SHA512 ac77df06caaceac667ce524e3d22fe6a5831cf2d0cc9c2d59105e3b67b4983bbc426a6745eb7253effedf5472f1b7a4271679936608327fdccfe0ada5b4aff97
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.3.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.3.ebuild
deleted file mode 100644
index d98f845ccc99..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 0db86677415a..822226f1d0da 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -3,15 +3,15 @@ AUX qtgui-4.8.5-disable-gtk-theme-check.patch 1166 BLAKE2B 638fa282166a5ede48ff2
 AUX qtgui-4.8.5-qclipboard-delay.patch 1135 BLAKE2B 5972ab258ba5c60346f83a0c402edd39ea3c1fa777c59c6691e793d300956f1d966f37f6f35c187c95074872f8ccfb4b4cac8b255da462ddd3744cc67bc21108 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517
 AUX qtgui-5.7.1-qclipboard.patch 1791 BLAKE2B a7753b78631bab6774ab5bd20deba153ee44dd41202531824571ff0596f9b731958b125a75fe464d8039bc327e5588f53f70b3be4c5a4eb640bf77af554d5552 SHA512 c765e7f1cf2e10b4fa90b2c4e3a4a39c9001996d4837eb86c1d298531dd30fc1f6a215addfd1bec88526451d7b2ff3ba8a53a330776c94851e79b1964336759c
 AUX qtgui-5.7.1-x32.patch 1161 BLAKE2B 5d475369d8a6312f0a2ab205b64739c9d7fd8b44132b10b00d29fb774ad837c45d6f50b4af776f7fa5fc2b19de9068922d1df5951084c5770e8a23f57b14f9c9 SHA512 61f6cc40c2897e17c0a71cb1d79bf8e6c69cbacf6409ae0d96f485584bd6a930484ecff709c208ca78335418e022c68151d096505f5db2179cb6c4c8b065c116
+AUX qtgui-5.9.4-libinput-pixeldelta.patch 3597 BLAKE2B 88f54e4c832f132472aea296e8bcc4cf318456af48db3e260eed30b620acf98af0cfa2abd6d396a1396be678e133f5721cccbc79877d4f8934606aba6a0d6d39 SHA512 47aa0fb3971cd956d08fac4ace0b98b4034178d00c89db3fe31060d548acb8a075621dc2fb43ef0357dee79a927f82a7626e6cdf784b009028ae1435f68176d4
 AUX qtgui-5.9.4-qsimpledrag.patch 6887 BLAKE2B 9da87acfe69c1cb8b1dd92b05a7b919d01227d0aa1316adfe97261bd59a7e0eb3b1e6d9b0896cc2f6a6a64eac3f31f72039a3acc2767998a668656acc8d8ffc2 SHA512 8229b87a40287c3c6e74d5aec9bfc346a1e0f7002687ba661573566ff5f700c99819850fc97f07d3a36d63ba83348f2ab315f835e44abce22242b4d1f29e7c7b
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 BLAKE2B 2b57d485c9ceb2b7e23cd6f8aa3be955e70d779ab0ca849148435e2a212a2db48948dc689c06eb8aea484513081df56d86584cb98ad4d64fb86ceb15eb802f38 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679
 EBUILD qtgui-4.8.7.ebuild 5656 BLAKE2B 4f91f3c72d65000c97d04dbc443b0a1214486f0c429a70592d19cc338ebca5052fe52a3b0a68f30094fa0610b85ef6ad9fc0a7899211cfc22b9515f579f6fddf SHA512 2298d7ef9176166dd21f24ce690c61d7ae4c0d5016908a9c4119f1c8f66a51d143cddf8f6b5bb4232815f5e2bf842abe0de72432bd487629b3cb6ca938d7cee7
 EBUILD qtgui-5.7.1-r1.ebuild 3792 BLAKE2B 0a65c076358bcacde64a74df90e471d4fdde27308b88556c7dc66563f9ffaafae2cf2d073cfd6232a31a488f240f357960a9daa8989c203bc904b710b8d7555f SHA512 f8d57932f30b17ea72cdebe7aa268e022df15a29bc3c3e2789f8c68b54a29e89d8c9b9a489cd6d5492e88dbc6f35cd9872d02ce920ef7b8d17878bfbfee10a7e
-EBUILD qtgui-5.9.3.ebuild 3501 BLAKE2B 44db6447d096a35dc08e6faf86fd7b72c311710daa7c0804bb4ea97b44b4a063c7b44cdf20cfe5c1c0fb2caa060327453d66d023c7a3e3e2afed3f00742bc9e5 SHA512 9c770692dab57be3a295ef287885928ae337ddc4aa0976147be3b808e9b2b8ff1700de8a2f2250eb503e51d4f0aafed64073e7cb035540fae0a836e3294b2b8f
 EBUILD qtgui-5.9.4-r1.ebuild 3610 BLAKE2B 0b8403f242e97209bca6e2fad465b878d24be22e1616b5b30c01a15c6ff08de8843eaffdc7e3b3c74ab942c2b8a4e77ea833a529740801a3b878a39672ca53ab SHA512 03d925259cfee10866fecebf77db94f022c29e28321668c28ac7a29aad4eae444e30084ef8871161821f520f54dbec609f1298931ab57dda1b9a8a20222f8041
+EBUILD qtgui-5.9.4-r2.ebuild 3670 BLAKE2B 5778249b6d54bddf3884a4a779d82051361f4ae09057296652068511a7332cb8e12e752ecd3ee5b31b7d667c9a3a64b36f77a84bd84cbe180473f45fb00dc851 SHA512 00468fc85218311e9995768bba0fd6eeebbfdc2b941ed41f829b9c26c31705cde9737cdce4652a57b8d65016ab8d581e6b6df0899d5b6072a9fec87ff47bfea8
 EBUILD qtgui-5.9.4.ebuild 3545 BLAKE2B fb542e056bdc514c590b44916fe4b0cd7abbe482e5c01a684414a75071bfada21aa1af2ebdda35ded51f9aac4ef065411ba9e7f5ddddb818980479ff4205076e SHA512 5a23e97f9b44365c28ebc73cfde6f2656c78a2b0fa18073f4107e2bec61b4147771cf8a87f59f29e8ae39385a389f92150b7881a54b6ceb9fb45b110b5221df0
 MISC metadata.xml 1862 BLAKE2B 062b123eab07ca09b1b6d63a9ce814a921b523c1861552a4f12903ccc8f627cf78e240d322c52b3a404ff154822a9cb42f894da5bc74a924d89dd51a42576115 SHA512 cba45629873eba71f152885640e51ad324b0dbb702c45811b4a1785a0af3baa7ce39923dfd0dbf7748d604e9a053d6580defdad75ad5ae228d37424d9b54e530
diff --git a/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch b/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch
new file mode 100644
index 000000000000..b9adb8b2f623
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.9.4-libinput-pixeldelta.patch
@@ -0,0 +1,68 @@
+From d196036024697a75868c1f1626525710495ca428 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Thu, 23 Nov 2017 14:25:04 +0100
+Subject: [PATCH] Avoid providing bad pixelDeltas on X11
+
+With libinput we now get a hardcoded resolution that is unrelated to
+the hardware. So avoid using that as a real pixel delta and document
+pixel deltas as being driver specific and unreliable on X11.
+
+Task-number: QTBUG-59261
+Change-Id: I9fe86d80e7ccd290ed2e4091d7eafa52cb537d34
+Reviewed-by: David Edmundson <davidedmundson@kde.org>
+Reviewed-by: Marco Martin <mart@kde.org>
+Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
+---
+ src/gui/kernel/qevent.cpp                        |  1 +
+ src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 14 ++++++++------
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
+index 06d52aa..c68f9af 100644
+--- a/src/gui/kernel/qevent.cpp
++++ b/src/gui/kernel/qevent.cpp
+@@ -971,6 +971,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
+     \li scrolling is about to begin, but the distance did not yet change (Qt::ScrollBegin),
+     \li or scrolling has ended and the distance did not change anymore (Qt::ScrollEnd).
+     \endlist
++    \note On X11 this value is driver specific and unreliable, use angleDelta() instead
+ */
+ 
+ /*!
+diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+index d1d97af..94f543f 100644
+--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
++++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+@@ -953,10 +953,12 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
+                     double delta = scrollingDevice.lastScrollPosition.y() - value;
+                     scrollingDevice.lastScrollPosition.setY(value);
+                     angleDelta.setY((delta / scrollingDevice.verticalIncrement) * 120);
+-                    // We do not set "pixel" delta if it is only measured in ticks.
+-                    if (scrollingDevice.verticalIncrement > 1)
++                    // With most drivers the increment is 1 for wheels.
++                    // For libinput it is hardcoded to a useless 15.
++                    // For a proper touchpad driver it should be in the same order of magnitude as 120
++                    if (scrollingDevice.verticalIncrement > 15)
+                         rawDelta.setY(delta);
+-                    else if (scrollingDevice.verticalIncrement < -1)
++                    else if (scrollingDevice.verticalIncrement < -15)
+                         rawDelta.setY(-delta);
+                 }
+             }
+@@ -965,10 +967,10 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
+                     double delta = scrollingDevice.lastScrollPosition.x() - value;
+                     scrollingDevice.lastScrollPosition.setX(value);
+                     angleDelta.setX((delta / scrollingDevice.horizontalIncrement) * 120);
+-                    // We do not set "pixel" delta if it is only measured in ticks.
+-                    if (scrollingDevice.horizontalIncrement > 1)
++                    // See comment under vertical
++                    if (scrollingDevice.horizontalIncrement > 15)
+                         rawDelta.setX(delta);
+-                    else if (scrollingDevice.horizontalIncrement < -1)
++                    else if (scrollingDevice.horizontalIncrement < -15)
+                         rawDelta.setX(-delta);
+                 }
+             }
+-- 
+2.7.4
+
diff --git a/dev-qt/qtgui/qtgui-5.9.3.ebuild b/dev-qt/qtgui/qtgui-5.9.4-r2.ebuild
index 2a71b40d0e61..35f85253adaf 100644
--- a/dev-qt/qtgui/qtgui-5.9.3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,7 +54,7 @@ RDEPEND="
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
-		>=x11-libs/libXi-1.7.4
+		>=x11-libs/libXi-1.7.5
 		>=x11-libs/libxcb-1.10:=[xkb]
 		>=x11-libs/libxkbcommon-0.4.1[X]
 		x11-libs/xcb-util-image
@@ -71,6 +71,11 @@ PDEPEND="
 	ibus? ( app-i18n/ibus )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-qsimpledrag.patch" # QTBUG-66103
+	"${FILESDIR}/${P}-libinput-pixeldelta.patch" # QTBUG-59261
+)
+
 QT5_TARGET_SUBDIRS=(
 	src/gui
 	src/openglextensions
@@ -119,6 +124,10 @@ QT5_GENTOO_CONFIG=(
 	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)
@@ -148,6 +157,7 @@ src_configure() {
 		-fontconfig
 		-system-freetype
 		$(usex gif '' -no-gif)
+		-gui
 		-system-harfbuzz
 		$(qt_use jpeg libjpeg system)
 		$(qt_use libinput)
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 43ecf5e1e437..c33bf9746d22 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -4,10 +4,8 @@ DIST qt-assistant-compat-headers-4.7.tar.gz 448 BLAKE2B ca3318ff64a4484faec0254d
 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 BLAKE2B b84c207a7633229a1b06aee1560f969bc5088ef65d1c6366ac817017a5713c6c50915df95109fa1a8fadef4bf8c2de22d16dc95e36325a92f419051c1dcfe5b3 SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qthelp-4.8.7.ebuild 3122 BLAKE2B 5c8e30e3826be0493b2304890022648b2073a2e30bcea15c620aef22763dd0f7bbb6805553f44b411482dbfdab8bd83ba7412a331a605c29bbbb845d0d88c46f SHA512 d06253208591e380d378db2e3496c42940581b781c1c4e82fdd3dba9d2bea6623161d4ada16b80bd6fcf503d78f0eb83972932e3ada501104539587857261d58
 EBUILD qthelp-5.7.1.ebuild 658 BLAKE2B a3b7559c278fc42b516582809f5fe2ed375ddba547eef32e484b08874b2e6978af1be0c95c738d00b3430f3fd8a7892c208b717e638a35cfed523cb1c91048c7 SHA512 40143c4add608d5971d4abeb557513f55e4c345ac3bc1ff4e38532267c8a9a9ec5a8c73eb29bc6e6146f839a2142e58067dc3fbe215231fd2888b6eed8dc5806
-EBUILD qthelp-5.9.3.ebuild 640 BLAKE2B aa9d1b9bd3183acd5e73a01a9ac9f8724be5b2894d9fbdb891882d71dea5487398d324cd9ea446fb9fffd9ba85a0b2ccd3d99f674d32f5fe2210ebb75c9ed135 SHA512 c95c42fa6f6687f6ab9c1aedda8abc8aff9dab4287df0570997b5b225b462585ae974dc4d5dcdaa071538ac310cf389cae95e3d93887a3244e2b6d9b9e52422b
 EBUILD qthelp-5.9.4.ebuild 640 BLAKE2B 14e84c6eeed3993378c312ac1086ef2ef2b662fd8a1c4e7f32e43819ab6725847b82516ba6b223be3d184c692255dc4c99cb1499a41e7be9f4802e3644d77122 SHA512 cec09fa719088dc538c25631ab3b3fc3a8489603d53ff3813dca310b7f4807735e6dcac8495ba47e0a7bf1f56ab510dd35ff5c734dbc1fa966ceca24ccd8b477
 MISC metadata.xml 825 BLAKE2B de978b130ccf71032fb98469ae3562a483b4fd791a13bab4f0d34990ad5638325c90b2ae057e870cc9d4af156114b90498d13828ea51dd2cbe9d3f1c3709b9a7 SHA512 54d474dfe7325966022026beab59b144932f523ced472f0d5d49f72727f6129923af821211fff3d42bc8dd02701e80f313e9e8c0f34e2cf18db1888ad8907026
diff --git a/dev-qt/qthelp/qthelp-5.9.3.ebuild b/dev-qt/qthelp/qthelp-5.9.3.ebuild
deleted file mode 100644
index 07c54abf9c7f..000000000000
--- a/dev-qt/qthelp/qthelp-5.9.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpconverter
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 5a77104b1b97..511466f3a198 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,7 +1,5 @@
 DIST qtimageformats-opensource-src-5.7.1.tar.xz 2004376 BLAKE2B 9cc015133ca70dc6d6e542e9c10921352b5c1e529ea03165e0b0443e679fee8987d2fb4f4ec430d0ae164b77b50029e61f149e063501a6f855fcc78050cfc4c9 SHA512 b70fe30b20da8f613f05ae68bf879956341206005d1eff3c34fc279da6b219ff7983d41c2c0c057c85500a2c5826286c63f4c209dc2db84d03848241257be553
-DIST qtimageformats-opensource-src-5.9.3.tar.xz 2102504 BLAKE2B 46fdbb00177e6feb7fdf38595026bb4b87053b6158e20ab06d7150e1b9ed88ef6ebca93cc396240194f2c6feca9613153abd88f49949f1e4956f9665d368e2a4 SHA512 521c805635084fba3746ee86ac7dfc94d2446114dd76aecad6a6f0cb97f49e443f078f2e0439a10a9d3d5fcd285136959b740707fb8d7776b0450f964950a864
 DIST qtimageformats-opensource-src-5.9.4.tar.xz 2106852 BLAKE2B 31f0f5d6c545f04b2be4bd657acce63adb15a45d4b0471b249e39063ae47635a8c5338f44cc0af88ca0c960d399384a911add12f7cd2815c808ddc28d7f5e924 SHA512 91ebe0d4cc67b3d3c55da4dd5d08028f7046819fdc4034ed0ddec075443ebe3775690856a7aa7704ee3ad8893948f79bdc72467fdfea6a0a8ce6fb16b3f5ab5a
 EBUILD qtimageformats-5.7.1.ebuild 455 BLAKE2B 55d81da37a7f8c55bda94fe77d7a7411217e738bf32d0a93f632e1cefea47c29d30877ff36a55cb61481e9f0b47c2e70641d1bff1abd4541cd0dcda25b0049e4 SHA512 e0b66f1116601b4782913cda26836d42e13170887f00e5a74ab0983bdf1d53c9c60c98499b75a556e627df106268b40f0f8a0f5cc5b3877e6b1896cf33fd55b9
-EBUILD qtimageformats-5.9.3.ebuild 459 BLAKE2B 0a62d9094f6439c107dc723099de0d545d76636bbe98aa43fedd089cb63e6f4d7978824373a799710cfcb49c5eb1c609391d701564d5523bdb4902ff52bcbf60 SHA512 7b14f36690a5617a6e08f297ce015d1b227e0afc1e6b37313bb50c96424efb5d3d04029b88a4266b57a1c35dc9579b02e63fee8cd72627f71fd3c71b3bea1439
 EBUILD qtimageformats-5.9.4.ebuild 603 BLAKE2B cec8884f77d29bdbe71a53356ceb70d9ba84ad1d835d04c822228def82139a37232e38699cdbb32dce0ce13def2bf8aa18e2bdd773b582ebfc6f98a1eb3eba08 SHA512 32f9dc774d5a0ac1837384975a7487f75a12aed24f059d7c17a1d377a5085b363c0d1992dee852f79b143a92366e4533db326db447dbb4e8e9c517425be19d09
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.9.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9.3.ebuild
deleted file mode 100644
index 3285265ebe1a..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.9.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/jasper:=
-	media-libs/libmng:=
-	media-libs/libwebp:=
-	media-libs/tiff:0
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index daedb12cce5f..b03ffcaac040 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,5 @@
 DIST qtlocation-opensource-src-5.7.1.tar.xz 3194112 BLAKE2B b5ac3bed420507c4a03b382c23d02cf0638c64e4921872930ec22394c3eaef7b7abaf7830d40c3aa2c9888e91724d5795b17a6d2a37f2f21b97285ef7d0dfd69 SHA512 a3e0318ad348edd6d9cb4762d4fc6230a47984fcf526f55cc2c9bc00e2e70fdb1380866ec8906e3f58669c62464f8747c948d85107a2d30be1e98da27c7739d4
-DIST qtlocation-opensource-src-5.9.3.tar.xz 5374552 BLAKE2B d8f7449daf02d98b9ad3ccc93a547f6d0cbe25f4d17637f1efada9cf6d00e84a082845c16a488a6653570b33a2c3be9c8f2dfc6881cba5a10e35e1a96f23893a SHA512 11bf2c6000fc2db92dc857cc6f271e7ff19f500fde14520678e9af57fac41debde4c4b937dbab4fe1f7d5744e1bd0fc25ea32fceecf97d32cecdbbc8e2105373
 DIST qtlocation-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
 EBUILD qtlocation-5.7.1.ebuild 537 BLAKE2B 8180f414cf9ce74285e91eed2aad13b298496e07ec5739bf09d22142a00db0fa546b1ac623820efc6702a66e1398408617bbc991fbac339a1ec21ec7e2889c68 SHA512 fd686ef629bcbdee03a9738b2a2d75464c2099830a38f165427ce475f386b5a459621a033e0ef0044fc10da2ca7d545a78e82a23b7328338ecc38407b53151a8
-EBUILD qtlocation-5.9.3.ebuild 924 BLAKE2B 110c23ae161fb2d150f9cd3d8cebe54d27b480c5fbfd85531979c3e4ba9ae233670ef08b703b3b9a0bb31996f093fdf889ec45544320642a6bae47bb6b04019d SHA512 c8ce925b2e821f6ef28f95a3b4afda5c42e9f6da66e8b5b5583c8258c0129e22d74b4a48be328bdd000ee57e9b9b4014c4c92f199a1d08fb04a2488996cc894c
 EBUILD qtlocation-5.9.4.ebuild 924 BLAKE2B 29c9eab14fd35bd299e880fb12d06df88f44c9ffea761f04f92d119224ea5554620cd044c66a9b0ef0f51a9b26162788fd4d48873353680ccbda8a20e17223a0 SHA512 df70b1dd13f3953790803cb768e84a53dfb05d988d4ce135c2c5828b1736f9f9b2a0df710eb2141396e4cb3633025e938ac99d46e1cdb92b3ae82fb3d096adcb
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.9.3.ebuild b/dev-qt/qtlocation/qtlocation-5.9.3.ebuild
deleted file mode 100644
index 06c3a9a1206f..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.9.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="The Location module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}
-	~dev-qt/qtsql-${PV}
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtconcurrent-${PV}
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/3rdparty/mapbox-gl-native
-	src/location
-	src/imports/location
-	src/plugins/geoservices
-)
-
-src_configure() {
-	# src/plugins/geoservices requires files that are only generated when
-	# qmake is run in the root directory. Bug 633776.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index e9b44ae5936a..a8c084dc5380 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -2,10 +2,9 @@ AUX qtmultimedia-4.8.0-alsa.patch 2155 BLAKE2B 23b713531f7e4c63f568fd284d7458650
 AUX qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch 6852 BLAKE2B fb9507a5ee7793c20e435896e553df808860f0ba1a1a9495325b8ecd06b06b0070f03bcec9313c509cad0cef8dc844ff48e00073d8c5b320b980ff8d9b694fef SHA512 ff513b5c68a02179e0a36803367b4dfe9f8c351fb76296570a2b382d2a1dd43fcb99033ab7844c52253c95124e2246cb81d68aa8e64e16c89d37bccaffcd9dea
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtmultimedia-opensource-src-5.7.1.tar.xz 3563676 BLAKE2B 51ff5ef507ae82eda236143326b2c553038ee01d77f70c3bd756160ce30851509e989244ca19edbfc18a9cdbe20189c8c84715c3ed79b76604e9c82144b51f92 SHA512 1415a4c29416ead2528ddb040a3c69480408509c6ba573f44295513bfe2aa62b8e8bb97cbd33713e605f094e1c1e1337507904d2b0c6480ddf9cf75393d8e97f
-DIST qtmultimedia-opensource-src-5.9.3.tar.xz 3598216 BLAKE2B 9f9e88272d4b3746ba3a235e44fc11b5b7074b371093600fd8f5f19b57a651224aa3ab44f9496d2add78d0ad355f6ea1ed13c172c8d6ad469d962d0aca8aca11 SHA512 fc00650473ff5eb8f61342e144c97a6988d60b663efee27b58361c705ee482790df2442b58d1f44a069ea95a39b6ed792cff6ee12db848f1738b526e3afbacae
 DIST qtmultimedia-opensource-src-5.9.4.tar.xz 3608792 BLAKE2B ac377b3cf33d727fa129fe623cc9ba9ea75555b2af7f70cf07524598d4044a94617b3627f7fd3a915596e51ac53040b9d72a5fcaa2faf316150a2c1ead220def SHA512 7a60434736f655900d00e70a68e5781f336446938f4f2b617e1d93205b7319bf01be987c001a9e6838ba5fd9e3afe3f20137597b6c27f6f77ee55486e283d425
 EBUILD qtmultimedia-4.8.7.ebuild 1298 BLAKE2B 2e78e5f2f0dfbf43aaabd1abcf06fb05a3612029bb9ed2f1007cda90ed32665cea64b2f56e7b64b879400a3a66ba4907fbacefa5bd431fce1a08b0db3c61c8cc SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0
 EBUILD qtmultimedia-5.7.1.ebuild 1501 BLAKE2B 4927749777c09c932c9545d6526c9a02de0ae716fd078676142b3115441adaa530434523939dce7988ba90da647650f29919115f1214ff1b55369a04b30b5f18 SHA512 42e79f343a023a6311b7aa1a6a459b220f65e9857c890303528f8906c2a685ca55d48d645f953cbacdbed04a60506be4b92864c2669245eb45e5928c0db561c1
-EBUILD qtmultimedia-5.9.3.ebuild 1352 BLAKE2B 98539aceb67071bed64593f2e6a3d1e50fbf672ba460e094fd63d6affd1d4fd0b0efacde1d303d3fb4c92d9ca641e441d2ab7264902892f4f1c9c2851ed51364 SHA512 16551b7f0d8f0e4f696c6a1ea77b823052517f9a4077dea3f5e61ac691a738088c1964658374a9f9b306ec82ba29fa12679253abc9577a612e8ec1630197b0e9
+EBUILD qtmultimedia-5.9.4-r1.ebuild 1453 BLAKE2B 1ac1a3fc23222d3b428500b8fe6ee4f3cbbafca6589a9f3e7e0b4c2bb88a8535df00d4bf625da7e68eb486cc2e4afae3a99f8faba93a9a5c70aa175440d05916 SHA512 90d3f4514ffda0d996c640549de91c39a813b04b67b742714ec15a1b8e9ccdd48eb1e75380c38b72299a156d39dd98180cafe5702b7b8a296c3c9fbcd5fc95d9
 EBUILD qtmultimedia-5.9.4.ebuild 1352 BLAKE2B fca975ebd9f54edfd10b502176a77e9f40d90db24116fae5b9ff5d77dee19d2adee66d50cbec1f7758f5c66397da7b64e47c0570bc586f57fc81a832941f565f SHA512 97aa003e75c8a3116aa974892b8535d3931548d4b3121df439836079d3d3dde186d0a846a13ec0fbefcdc61a1f5b6fcb4616baab1a881133b5e4f11958cfeff7
 MISC metadata.xml 937 BLAKE2B 804145c6bfe640955c5de227bdf2ba51570749541d5febec508b874fa823a2386da52648b2ba2bff959de2ef1371fa6384007591606410829d6fe4c12afd7ce4 SHA512 b5007c578748a64091105fd04aec3133587dcf0f8cf22b758520776e903699de80555fa2e69206edaf8415dad037018f8c169966fb48c1d402118a6e32509d31
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
index d0626551922b..e5a416d9fbfe 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,6 +39,10 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	# bug 646756
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
 	qt_use_disable_config openal openal \
 		src/imports/imports.pro
 
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 255f500c3618..42a0eb61e1ca 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtnetwork-5.7.1.ebuild 1168 BLAKE2B 09b253aa055853e7a88ee0bf57a0a97b6cc7cbfa2b55f30a751c819a7be8b539f68aebe44e45bb3a85c03ebc9cc569bd0f4ecd45928da057e4e0b01223d16e0c SHA512 0d7d306fbc0dd47d697709e738a7f65f478d1fe2213aae5e5054151aedb1c2e8b0f1de2a40b1f19087d57cc98b84418b8e9df6f491af31742ab637f9ce9b53fe
-EBUILD qtnetwork-5.9.3.ebuild 1174 BLAKE2B ed1b4997679c2954ed321965304b71f7358786ea676d7cdccddef4ecdc63dda6481f834034580258778f1bf9ab2b55e639739306390e1029ade04dc79ff6457f SHA512 9180653e11c99762a603e601475a8bb8acd343a7e8183f9c3e0909cec04f82495d34daa201a2d14de05a88ce64aa9a5d56b57469a6bd7a72a4ed125bef9c46df
-EBUILD qtnetwork-5.9.4.ebuild 1215 BLAKE2B 97f34d3ec1b3c4c7b41763bc9d5c8d22fd57b26acf323a92b5bba22120bc7d593e206a9b8c8ca778ea11ab97b65b79b75d4cff3322d52da93d7c532f389c2ee7 SHA512 8fde1bbda8c9d705695f7f5768c92de5d4328ba15e362f596ae87733a92d13ef6434ad500a84902560c37ddfa93240c28ee728f6fe6059440c33e163b555c478
+EBUILD qtnetwork-5.9.4.ebuild 1279 BLAKE2B f6affc1078e11d03a26ee14f419a3b1ca3f6a30ea4cd03ddd3b964717fcf5ad496f488682c0ca1fd62e005ca5bac7ba96959df38eaea19c57d2937eef50f7e2a SHA512 23ae9457ac3ddd0327f964e777bff6688b6694c98216c2ec5cc529ba0078c9ba77a98dcbd9d3105b304c329c3f3c16e0b10c56aaf4afb3ca4ca0d19092d67e9b
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.3.ebuild
deleted file mode 100644
index 48c13b15cd29..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.9.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-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
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(use connman || use networkmanager && echo -dbus-linked)
-		$(qt_use libproxy)
-		$(usex ssl -openssl-linked '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
index 3cb593402d37..94849a21a390 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="bindist connman libproxy networkmanager +ssl"
+IUSE="bindist connman libproxy libressl networkmanager +ssl"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
@@ -19,7 +19,10 @@ DEPEND="
 	connman? ( ~dev-qt/qtdbus-${PV} )
 	libproxy? ( net-libs/libproxy )
 	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	ssl? ( dev-libs/openssl:0=[bindist=] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
 "
 RDEPEND="${DEPEND}
 	connman? ( net-misc/connman )
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index f690e3996526..d129e1618581 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,3 @@
-DIST qtnetworkauth-opensource-src-5.9.3.tar.xz 112280 BLAKE2B 153f41bdeaff72c7d00aaaf4b10dfa0461a1c42e2c935ae2a266e989fb11094f665944fa355251fd741d7b2e225bf904cfd286a4e10fb2c12a8e44533b6bca90 SHA512 cd884160895746a8f3cf75167559f5aceb8f87fda09823352c09c83209aef40b212589e66e76d74c736573b23e0ec7e0741d3e90f8f83cbb64c697a76beaf5eb
 DIST qtnetworkauth-opensource-src-5.9.4.tar.xz 112244 BLAKE2B 9e75f8f11062b064b98421d9b9ed73cc18351eec788398922b22fa5b528f34baf2290c0595e2cdcad6afe6a0061ddbf37d9bbd2ec977a5ba713c692a125fca6d SHA512 a38e0cd3619ec25b2f7c749522b42f72bb024ef2415449349f7cdceaa9cdf5905c78c6b82bb7ce58b0c8f00ff883d2d79d11e12a9bfead014b553d431190abb2
-EBUILD qtnetworkauth-5.9.3.ebuild 376 BLAKE2B d56d0ce3ca4f3f189189c6b49fb0254d6eb275e2d49c6cfefa9e2392e3ba02098b70b977ecff82f8fa8b92225ff4056eb00c2da14d50a4b492a62d5d3464b7c6 SHA512 b5ec9ac2a341536c3a260d3a705e6f216b38fe5ea2101a18058db9c61b6d77882bbd6f8a0890d4e1c5f57feb15963959816a41ba69a19ed5753112882c186b50
 EBUILD qtnetworkauth-5.9.4.ebuild 376 BLAKE2B 400e205f282b4ffb1cd525fa64f2b25920010f33f85e46f4b91252612b65d7212aa3aa404ac91bb0e9780cbf4b1ad3b7f07993e2f639398a08590ba13b3f2e5f SHA512 52c1e8060e6a2a3b5325bd683455d16a0098a64fb826d38b106efd85e54e916b3c7cf98f5f8874eacdebe779d12b98a00d495c0a04fd41dbe53cd8aef8f468c6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.9.3.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.9.3.ebuild
deleted file mode 100644
index ec54a2f00cf7..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.9.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 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 c5859ba3075e..9f463af2071d 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,9 +1,7 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtopengl-4.8.7.ebuild 1100 BLAKE2B 38f986aed1ac6fc40b6037cb17fece5ab7d759a2f79d0d28ba18e3ac09691673ce0dab0942301d06bcb11675c96b48cde6435c80a9e22f865884f5b5559e1558 SHA512 d099ac28dc473121906eae72560d5a100a8a085a110d82ebeb87ca8e9109dcd62c5cb4dae107b0adf15d2ee34b0a13de095de00096a3dc0bfc7f535d97bbaf01
 EBUILD qtopengl-5.7.1.ebuild 631 BLAKE2B f2893aaee38cd132a7ce775da1ca7c5dce8eb6b1a8af8a68337d363723063cc4f761f98b8698e631f42e9a2d4a23080e841504de3a2e7ba92004d95614394e2f SHA512 d99c51bd8dcae9977a0e209893afeda6f2355a550960fbf4ba86afffa5c12a3dc7017b4a7b947eee259bc631ce5e1eafa285cc131923afcfd9a2e8fa3652b21e
-EBUILD qtopengl-5.9.3.ebuild 636 BLAKE2B 77e4fa58f7d3b7ef4de3d5be69ab7465d1b429570fab2cbad3bd4b714a5646a177a28459b911df2b442dd23341b5deed65facab6e941ebb3b37c3aac116595ad SHA512 109c0c3f5b8bf7719c1d09e8c83f8c47d6e8d76edce60f0b2bab6d66e1adbd9b182a63569cc58556488206a977603a16c3b7f697913e492859fa72a42efc9383
 EBUILD qtopengl-5.9.4.ebuild 636 BLAKE2B 11db1282edcd952d3f0bd7c3dd381e9b9b685dcd860d10bc71c5d816f605fc8cd00dc022e4df86cb8032c51aeb95769349db2008dac0a0c277f7601d30d773dc SHA512 ff1bcb023f0f7a2199ecd71c5e479750075726aaaa3be693e0def28ccb8d0f9ba28e92a79e194a52c08a4a2f0cf9f79b55b7219e61a0f9f1618f6d1897ca58d6
 MISC metadata.xml 849 BLAKE2B 626ede10341fed23cd36a62710da3423c49fa4421d4f8dd883df3c1a0d157f4a4d343632763c542093566a8967050bb4a3cccac015f4aedba25471a4e03a591a SHA512 98644de5d50d3392db4099551755340012a29ef9ae129038eb64ff1aca49f2de34442d7fd8e4f6c457366148a7d9288843f7ea023d0759a71aadab3a419aad41
diff --git a/dev-qt/qtopengl/qtopengl-5.9.3.ebuild b/dev-qt/qtopengl/qtopengl-5.9.3.ebuild
deleted file mode 100644
index 7e85dc2c3591..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.9.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="gles2"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index fb7fb1bc57f9..753655d59ffb 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qtpaths-5.7.1.ebuild 404 BLAKE2B 0f596a191ca7bd305b49b454d7a21b450cb0d75ad7ff0785c16abc0757fd78ae65ad67d1d964bc562aa321c8f1c045d4ceb1863032cce41ba48536c35cb88bf1 SHA512 e9e081e62b191f26395b65fafed9c98a5ab2e173985dafc610cbc1f86297e589188c803761f767d37f6a0ec23eb65bc8250bf8fe896d33d156219477e780f9a6
-EBUILD qtpaths-5.9.3.ebuild 409 BLAKE2B ef5a8e634ae05b47a4455ba8b9b1fad6a0903dd1690b22600b9ec4326bfe06f0f6d1e09235794cc061b0dc89f8d286cf630cb0a0ef03b3fcf2e5d5f1894051e4 SHA512 edbc1d1beaf8c0f6cc4855be89b20f8df561fe6e0c5187b155f3aceb0bd58fa0b4bccf8574ccf8c36b25adb7c3394c6a04cbf2a126ddd02395b39e301cc86ff3
 EBUILD qtpaths-5.9.4.ebuild 409 BLAKE2B 820f78dbae4037a591f1488a58215769ea69fb16c585df730f80e7ae33dbf599a42ab36cc645e88ec4dd704a470918ff3825aa17a380e5f7c534dda3b46e94bf SHA512 14ebdcb7dfc35806c5fc91eb01bfb9bb01134ff4003e43ec5e5b5aeaa292942be461893e0e792bbac90a9de612f0cf5b4680b7c925ae51e21f55ace890eb8740
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.9.3.ebuild b/dev-qt/qtpaths/qtpaths-5.9.3.ebuild
deleted file mode 100644
index c6c9ac70a54a..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.9.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index d2bc55d03bbf..181bf04573ba 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
-DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 EBUILD qtplugininfo-5.7.1.ebuild 373 BLAKE2B 9ca1694a0fe8c2221ade025b3955439cc4d34baeed01472c8107baf22715ce5aaa89b9b0b75d79764f3cee6e2a1ca988d6b94db0fadcb9aea3d1a133ee9a65c8 SHA512 8825a6140078e4caad4ba8187c06f6840038b027c7cb989532f5a01c4008119d4c8f8285df269056d33e4111f82bdf024f04657c46d07c595fc48f49d0c18309
-EBUILD qtplugininfo-5.9.3.ebuild 373 BLAKE2B f3223f199c7653d35135208afb7c2b910abe01bbdc5bae343d30bef18055f86ba34f47ca7d6549c826111be6a1ac345549bbf7ab59d9229ecbcdc9d996995136 SHA512 af4bae833123b5d2e2e319907be4f1616e158ff949f25dc45a251460946428b04a4fe8a186d0a43163779c44b39f9f0ca412a308a340d8e783dc94f0e465d933
 EBUILD qtplugininfo-5.9.4.ebuild 373 BLAKE2B de7b3383736620b4ff0d4e81e891e5c303224a9d49d53bedf07294a6defa830d8f87f592c2e4c0b938b92958ae5ee71882e072a72bc8c39853a715d5d91c43c1 SHA512 80df596ed4e4eff084568d21fe97bf4ad6aeb230f5356b0e3a5b513e221a5832ef9d2a13f2895f2367c2e980fa7e985847175bd10fb22bd41759074e0ae64076
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.9.3.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.9.3.ebuild
deleted file mode 100644
index f411fc0cb905..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.9.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 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 755c3dc5ff41..1c93d48d84f8 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,5 @@
 DIST qtlocation-opensource-src-5.7.1.tar.xz 3194112 BLAKE2B b5ac3bed420507c4a03b382c23d02cf0638c64e4921872930ec22394c3eaef7b7abaf7830d40c3aa2c9888e91724d5795b17a6d2a37f2f21b97285ef7d0dfd69 SHA512 a3e0318ad348edd6d9cb4762d4fc6230a47984fcf526f55cc2c9bc00e2e70fdb1380866ec8906e3f58669c62464f8747c948d85107a2d30be1e98da27c7739d4
-DIST qtlocation-opensource-src-5.9.3.tar.xz 5374552 BLAKE2B d8f7449daf02d98b9ad3ccc93a547f6d0cbe25f4d17637f1efada9cf6d00e84a082845c16a488a6653570b33a2c3be9c8f2dfc6881cba5a10e35e1a96f23893a SHA512 11bf2c6000fc2db92dc857cc6f271e7ff19f500fde14520678e9af57fac41debde4c4b937dbab4fe1f7d5744e1bd0fc25ea32fceecf97d32cecdbbc8e2105373
 DIST qtlocation-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
 EBUILD qtpositioning-5.7.1.ebuild 738 BLAKE2B 630a0eb0edc9b54fe80b3860578a497d9be346e55c0cdbdc36c6ed76fbaaa93e48f2cbe4580926787aa3ec19962c646d49e2f17df5872696ef6c1059adfd1f63 SHA512 1dd5a1827a28584cf35ef6f7d38cd6adce0602587bf618bd4e1f927868f08d3557d02d4f70910cb7f68c16a8e4bd53547b2bed4dc24194290d3a457668ddda32
-EBUILD qtpositioning-5.9.3.ebuild 810 BLAKE2B dde933259a8c22bf5fab9b527aefb4025e450785904ccd236616e10067a97e473d0a735b5049ce0cbe676c34481ee30ec0cba3a35fd4927dfcc3e50287321d40 SHA512 f5fa845f12bd35df1329f76fef2b78cc9196f18f7d6421e3fb5717dd2438120193e628772f7db30f82548b87674f547a106435ede85acf06d45b55509ede3aca
 EBUILD qtpositioning-5.9.4.ebuild 810 BLAKE2B 86651857bcf1c8fe233d659b49c0d0b2fb85864b2177523df59b6495475eba2a7d78ccab5d73654131e50930425693bbdcd3afe1b4a7104c5a8d3162c2245f7b SHA512 acb350332bc1eac288607d78a287cc64a562e0e984cea7e9df2becd41f7f7e6b5f19288d3ede58354c48c64d0776a734fb2511635a6a47b3667303dc5c68fe39
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.9.3.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9.3.ebuild
deleted file mode 100644
index ccf6ea6d6bc3..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.9.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtlocation"
-inherit qt5-build
-
-DESCRIPTION="Physical position determination library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="geoclue qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	geoclue? ( ~dev-qt/qtdbus-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	geoclue? ( app-misc/geoclue:0 )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/positioning
-	src/plugins/position/positionpoll
-)
-
-pkg_setup() {
-	use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
-	use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
-}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 61cc0ae8b5df..c4edf2ba3c75 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtprintsupport-5.7.1.ebuild 756 BLAKE2B 67dd32b9d0cc05c81f076a3547a69143c222b60970950d8d9b615ea83f290c789a20b9bf26b1975895bee71b7dc522f96a6722ab5bdd5b31357747a453d9cf02 SHA512 ec05254864dc55d52b3a773b019d37341f136c607ace697873926abeba01b08b9871e0ef5867bdde5a474c8cf4ad0728cdc89e02ff0de33c71700f4fb0c69561
-EBUILD qtprintsupport-5.9.3.ebuild 761 BLAKE2B 5cf9df201c7445222c7df0252f3b32d530b823c6cf4f0d1f6fe8aa8781c99f2388d18efd26a9aba01b07453994b204f0d66b4a4c452c925a89e2602388f9dd63 SHA512 1dd17adb85e348a45451d11b896960643592ceae9824d37c97fea7ae274ad80fdf0e8f45885d7df7494f1ecad89daff52a61ed14c81d8e05d5bc9a9edcc1a061
 EBUILD qtprintsupport-5.9.4.ebuild 761 BLAKE2B f8b41d4099a64fd0e30314a1e7174ea55cfb53003426c79c8a91550ddc4ab6535c943b58e8d8b8764ce70cf57a6b5d9ace881f3f56fe40080085945896dba6d6 SHA512 1844eeef0ac7d35e75f7d35659a53c8458066fdca34f34e4763ba7d41aedb128b77671b95c11e2913b24ba19566833d33edb139daabcf256d10a88d10bfeb6d9
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.9.3.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9.3.ebuild
deleted file mode 100644
index 71b61e387963..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.9.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="cups gles2"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index afd05a5a88f8..c447f84f8a86 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,7 +1,5 @@
 DIST qtquickcontrols-opensource-src-5.7.1.tar.xz 5943024 BLAKE2B d30320a19f58fe1c9ceec4be7f00a7aa1eb087b1a062169442fd6d97903fbfb428a57ef9632b23d7a5d202c4384c223903cca5bdca13c21762e28e30d608a198 SHA512 7f5d3a2fcb1da3ba5299f57935156e34dd61d019b29892794927148c7bda99e8e298522f1a7d807f2c2b9746efcc9418a9f89c6322257749036b046e03471368
-DIST qtquickcontrols-opensource-src-5.9.3.tar.xz 5946216 BLAKE2B a0c5aefa3f5cf8bb4e6dd8a84551a8b42d99f0a7f4e745cfb0052698af8772f95692679e7471a4c1dfb1dd6b0647755122caf0658f61ec5fd0e1e9eaa6e3970b SHA512 dc57c1960e598b81190924e35380bbb14e6696d72bdfa1db3ecca0715f930a53ae61daa7884f4c56af2b6f5896ee3b4b409cdae6192e82e6fa69d49a08b1db06
 DIST qtquickcontrols-opensource-src-5.9.4.tar.xz 5945756 BLAKE2B 9b22cbed8e92a9264a67777cd18eee2f8b20a9f2360ea376948563933852015b9b44f9c94410c73f09d2f7958b61228ae3634a6c2e0ad5de7e92249f26196461 SHA512 62f7578fa5253e85b8cb04fec295e1044a6b5946e4041e758f788643aa3336c9c48300dafbd5ab21b0e4b74e184344ad62a9d06f3bcb7466fbea79b0e165070d
 EBUILD qtquickcontrols-5.7.1.ebuild 746 BLAKE2B 7dc043cf9716224e6c868f129987537a3c297788397d563e28e961e90a9e9a3858525afc0d09ed2d613f7f5dac81169cbe0c1ae1e7704db40897fe8f18e27441 SHA512 a178ab0c0c0b963af3be4cf32fc12573a452c8f10d3ef533606c4809689bc617823c231371e2cdff4d42e204d2d4c75d6e985cc1c23ad2dd838145f9ec735b47
-EBUILD qtquickcontrols-5.9.3.ebuild 751 BLAKE2B 5c45e55586cdfd44794fc5ac73070d40a8badb8ce22ba1c8f8587aa796514c7392d005ce8c023376d89c2e53e46ee664d2f1e804f024896b49d4a0d15cfd69fe SHA512 8cf039f5fd036f1c9a90b284aecaddbc4b9c53699d47b07d870e73be761ba23f36ba26398777cac9d0423e09fbeee1f7bd902faae012cf6c68157a59dda4e029
 EBUILD qtquickcontrols-5.9.4.ebuild 751 BLAKE2B ffe5e136301939ea58a170a7382281ba2efe195963e2b0af6c04d6e156e399c108424a606d5fefc7b3cad952f366bcf9dc473fae32bd2448e1569c8ddc1c0077 SHA512 9ad5ed5880f169fbaaa028349a8065e393ab7deaf37e1435b0d5fc76b51049709977436f4ba88c38d1e8e66284881c57bd9e9ce2a942894b4940316a7a2f4026
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.3.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.3.ebuild
deleted file mode 100644
index ac6ab02eea2a..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="+widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/controls/Private/private.pri \
-		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
-		tests/auto/controls/controls.pro \
-		tests/auto/testplugin/testplugin.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 533d3d258882..03d73c28e8ca 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,7 +1,5 @@
 DIST qtquickcontrols2-opensource-src-5.7.1.tar.xz 2212812 BLAKE2B 2af8643f254aeacc101546e05136ba7e40fbb2602eebe7ce03a0f7d263f26d03c47533d79c7da4cb789c74399f0aa890cafcf6a5c2d37d340300935c868458d5 SHA512 24b142f60f3dbc52084906249e261ea8b788135a3dc2e45bb3fc885fe14f9281178025433b28e227891070adff3fe4b64c8a1f83ac4c9bde7f4a6048ea44370e
-DIST qtquickcontrols2-opensource-src-5.9.3.tar.xz 4123332 BLAKE2B 624b0ad282dbdd18c73466637ad3897b83209d76460bc72e3cf572bae6345f2ccf0ee8ef5ec0cb0cec864ac58f3e19346355d63cf2ea57da7e36ccf20dc5394d SHA512 34bec1d3c68eb86ff078fded6d19f463ee78f4929adae54beb2a1c0b1dc3f5b1a7e73210ac05e3a7e3391919c37892dde4aff88cf20e2fb148cb2a03401856ee
 DIST qtquickcontrols2-opensource-src-5.9.4.tar.xz 4153488 BLAKE2B 39fab418b0875fd080228e8dc4103884d862924b2ab12d630303eae366294ec8c97b744db58aee1b00bc923d9abda1db4f7d73931699f3961cc2a28eac2e2e84 SHA512 17704cfd14dbc14d2971b82a81786bd7a5cfdd4e6ae6bc0c5b26c6a6a36d8391ba1ac9969cc5614c8d0fff8ed3b238ef57a481927f82fda509023838d3692762
 EBUILD qtquickcontrols2-5.7.1.ebuild 433 BLAKE2B 489ff65898823f54b6c14da03c43c599ea0cde6b6ef95d66a646e6b0d6cdae0d5374ccff1b70c221bf7bceb41740197ddc09bae3fa2cc3fd5fbcfec7170b4f3c SHA512 a9a3396d6b63faee06d93c3596c68756b21dae17f6ff2c2725f28f33c87d3bef29ed2a8335f627f30a660530572d09b36f96a6a1e6828952a0112be87e12e70b
-EBUILD qtquickcontrols2-5.9.3.ebuild 598 BLAKE2B e1bac498d59738c3cb2b30cfb458609e489a391e639643f1acc9707cfd086461db859b94284d137937d167e80fdda939fef1cc0891b4628c356e3d26d14c7317 SHA512 e5235edebdd976b707ab9b7a02191caefbc4df5612c03586d4c6787b528c9a82494c4d1afdfa1a8db37f20cfe3afe83a9eafac2e67d6980ab71bd2bca4cd34b9
 EBUILD qtquickcontrols2-5.9.4.ebuild 598 BLAKE2B 25ce54b376c5cc0b2764d708eb5f8c4f7d9799df29ee64565c7a93032916b4cc3062e2327ed468c35fe686112c32ad79089a68da736feb918d4a23c6ce67f983 SHA512 f50c64059e38db572cfec45fbf372c7038a08e8d2089e7a040652cdedd5c6e299962e3e2f878dacb992da2485edf5cdaf575c9ad34c8293b98a8f6c276cee035
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.3.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.3.ebuild
deleted file mode 100644
index af1973c274ad..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~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 e7a7a153927d..1cb3772d7ace 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,10 +1,8 @@
 AUX 4.8.6-javascriptcore-x32.patch 1826 BLAKE2B 2a695f9c563675e0d1a36c9edda8b01dd83db6b377a4e72dd3b6ced8d11d0c206aadf56c35423d11841407452ab3e8f4ff3509a803e757536ad76cb87eaea76a SHA512 9b93ebdb9c474ad4e4d09de9d99d97351022863ae3a58fb0b03d1cd103dd012d0a12643f6e00f60cf0a9a4ac24db98039e87d5dd9a1afcf8dc65696b4bcd4efb
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtscript-opensource-src-5.7.1.tar.xz 2608180 BLAKE2B ac9f51c9bd67f1f2412d8c8fccb630ae3f6fcefc71c0c9bafee7e2e16f75997673c55960ddc26f8a11be646d78514802d4ba71f5b0d7d9559a1e5a894237a04a SHA512 6bde4add16745475d42c0fda0d3451a77717b14dca12b40a4e3cebc9e2b6edb04da23ebf9af46010135066524dd8ea0453a07420cf42228fd7ed5249b633a95c
-DIST qtscript-opensource-src-5.9.3.tar.xz 2612056 BLAKE2B 54cc954038899cccff54b806363fb778ff90c3f1d599adaf2309237b1554fa615d5660c21a51bb84bbb94a9fd72c310bb9f187de31b6ce437eee71cd91735200 SHA512 a1a320780dbb83e8c5889c528648cd5cace79b29561902474f03e2dfeeef4ab451ac101fecff19130d8b55809f8e457b9198608153a91deed039f529d21a3006
 DIST qtscript-opensource-src-5.9.4.tar.xz 2612372 BLAKE2B 8213e2b70e23dfa6e42ffd0aaa1818a4794670de24fa5b30cdf4c7bd17f1a438d9d6a8bf9c03f2995a60b6e3ad6d57bf0273c6e1027ed3d0b77fc2987d285603 SHA512 e0c49e1286c4b1de6d197c42d8e4bcd82a5ea07e8c89f6f222fa62579b5d466336a5baa50372e5a9b514bd8be098e80f3793123cae09d7a923c4d1466b0e13c9
 EBUILD qtscript-4.8.7.ebuild 1072 BLAKE2B eb4d2995271b4c1b3b083df9b9b657b49a6aebc66bdceddf78269590db9ae47f99a72112f6d2c2de9cd737cabffa8679eaa6545af5c509a58b5c7a962d2a5adf SHA512 c3b6a2933cbf054228051ae4eddc50940915a269aa5130dccdb9bbfc895678632cbdb3935f061565eed532faa48aa661c194549b62fb1c83c11057512afad8e5
 EBUILD qtscript-5.7.1.ebuild 664 BLAKE2B eb6a292ee6724d823d7f8dc1bd33726dfc1fb5b54fc7200a098ab5800fe70debbabfcffaa8487ac9d7efdc9d40672dc55ffddd3c0f375701361afb19242b95cd SHA512 d068ca8ac446cfef1c8b6e4421b243f2f0e4476baa2003ef1487b46a1989284ddcd2bb806d381e2c87de49de094fdec750699cbf4138c7d0f44fb2043b77df49
-EBUILD qtscript-5.9.3.ebuild 674 BLAKE2B 7ed0dc76604a3c06114d900fe5df1625d5dc5fffc821325efb7d5f0c7aef3a78577e289b31ebc70a326edf83316c0a2293d99d27896c13098b8ca173d751e20b SHA512 a183c06e6c4268195d2100fc404a941b559c7b6e6154d2ec36d7b391a59135563c29d96f159e14c6d334cdbc7ce170c475e9259fb6ad033b317ced1748bee101
 EBUILD qtscript-5.9.4.ebuild 674 BLAKE2B c774a7a901f9c798132e3f049bb86ae9fb4680c7a2d7da0d65079fc7918ef0360b80cd3fa21ecee0f53889641da7a5631820ad1c83cf975ba704a7732979c618 SHA512 d0483167a368b96184f47d0936f442cf6197115a62bf2051ae680712746c1e9184c1d6b231cc506e2a5b2847b9087f40d0f58d8976dcb7cd23d000437d1c4edb
 MISC metadata.xml 714 BLAKE2B ad5f2175907ab5167fa16d75c1c538e4e66fcfb96d4a2dd2d19d92ccc39fc3283dc7b67505636834ea772727e5e50aaefc8468b9ecdc448fff33e6806c93d805 SHA512 8324b4dc7a26ce06a5c8af58768e337f1e96a2077b65f5996a4af535a07ac3a13c05af2fb0c89796335ea106eb82d0857dc20cb9d4c8131907313557a0319b6e
diff --git a/dev-qt/qtscript/qtscript-5.9.3.ebuild b/dev-qt/qtscript/qtscript-5.9.3.ebuild
deleted file mode 100644
index d04b08861560..000000000000
--- a/dev-qt/qtscript/qtscript-5.9.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="+jit scripttools"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	scripttools? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod scripttools widgets \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 70af95746ec6..946f866807d9 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,7 +1,5 @@
 DIST qtscxml-opensource-src-5.7.1.tar.xz 346948 BLAKE2B 58dde6373c5901abcc73906085ab7896e6717094dcf2dc6d1aff0770a5f2a64b9bc4c21abcaf0531ef16a2576d188222a174c39759027d4ffb7eacb5440aa3dc SHA512 f5e2d6882a36dc08470502ede82862f4cd95f21b5b354e20ef5a2f9b458dbfdd35c1629a89217606aea5aead1d76d03c80e76387e1ee202bf73fe5c2022f1bb7
-DIST qtscxml-opensource-src-5.9.3.tar.xz 414128 BLAKE2B 28f945f53827b9adae09a1582745c851b41c784b09ac1f388bfadd3fe7d844635da00503066918238629884a6ba5e0eeb01acc5a3d5c0d65b52e505808e8c6ff SHA512 da5fb6266cd0cacaa3b815c17e1d7a356206b4a8ed10507584927231c1a84b032ae88a3edaac897c6e01b14b38cb83fccc4c81dd94396b9d967d9b833f4732c0
 DIST qtscxml-opensource-src-5.9.4.tar.xz 414280 BLAKE2B 6fcea56794febf65b7e21b79893e9c3a849278ad6d4ad24a8f8e272ec101fdee72fe29d21bd99b1ba4d977e52dd3acc026660ce6d5a6ecc684590a8d190615b7 SHA512 e000411b82dfef08fbd5fce601530548a9b5959a4980309434572ec3475e6bc9cdf870cb82bfd5208b533d66a7e46dddf52f5ceaedaf3f0d438c4a4c8260c9b6
 EBUILD qtscxml-5.7.1.ebuild 372 BLAKE2B fdef97048759cb3b128867a7d5cf5b8f8dbcbfc543693ad0045af78c68a0254b9f8424c1d758188c325596cbae9f0c5a097d54925182fdad396ccb8d37a30ca8 SHA512 eb5ba8623820f82531258a9b76321f50680779e29a518ca2e6973bdef8d27b50e3ad250f2b43460454123664c9bd63a072fc679dad97caf521134ea412cfdbb3
-EBUILD qtscxml-5.9.3.ebuild 374 BLAKE2B 0e5738f42adb88ea047163ae8c6adf42b0ac417cdab8bd6d7a2daaf9ace1414b7a24f65e1029da0b9890dbf76a2414d5d62515145840f0ab54ad7637e6ad677e SHA512 f91c79dd8fec8355db089c7b91f5a0b1244f3180f9ac0db1a7d1d6c7ea0e0b2b2aeae7cfbf61054487c75fdaf05953d10e1fdffff9c7914db7aa8a53b7c75ac5
 EBUILD qtscxml-5.9.4.ebuild 374 BLAKE2B f8297445522e981b840f4aee9e954bdc1f77e10a5bb7a8731f01539d2bbeeb1f7564c5a8df64f5170e2a7221191cc00bae435dd78f51fc8187de474840804b7b SHA512 55bc53954466df3f19a7a1378736538a8156df60f838f9cc783bc833cb91fab8339aea34d344327723efc3a60270a6c2656ca2f7e32f15f090292bdc05596ce6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.9.3.ebuild b/dev-qt/qtscxml/qtscxml-5.9.3.ebuild
deleted file mode 100644
index e8f77a2e9a86..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.9.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index bdaa09cad425..70acc7f6ca95 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,7 +1,5 @@
 DIST qtsensors-opensource-src-5.7.1.tar.xz 1987144 BLAKE2B 324af53f8875c406f60d1316fb87dbdf5075099c4c86ed8d9dfe25c1074f51e41f9fd86d8d1c3d73c319cc5917bd22fa86aff63e98dadb453f28145b681568b7 SHA512 5dff126e59f0bae4e5a8b1d3b971dc1c7318169f82dcb05907bad5dd460f2edadb317ffd111047af5a2d1db3a2c3adc204e5f8ec2b792c912a8e7e987f596914
-DIST qtsensors-opensource-src-5.9.3.tar.xz 1994812 BLAKE2B 81defcf70941d8d6f93d522f572300e0145cc2d5bac25a9654c8821d9005a1f528fc2c544651159395b039886aa8fdfde0a2ee0d5c7aafbaf64cd4260e10f747 SHA512 848184de2c914c0240f3ecffe96ab267fb24693d16a55c1c757d83af9f282bc6f6c5cd762cb42fc389bc02e301c21a6da7b178260f534db35f0abe277f638ea9
 DIST qtsensors-opensource-src-5.9.4.tar.xz 1994992 BLAKE2B a7464ea11b7e74cf491a4629058f142f9e85d57e08e8b7fd1708cfe47951d0345445f853c89f8f8d0e4700eaa452e0c1ea00f4ebe12eda643fe512afc7dd6969 SHA512 10b0d4595ced97888c28ddb36626657250ed839004ee61cbb244326529d25c181acbad774e7d40733d9ac48485320e72e52bf52f10f2a18089a6a4ce4fa3097a
 EBUILD qtsensors-5.7.1.ebuild 488 BLAKE2B 6f4134731d4c9eef7694b52cd5913aa21dad9b18d3028241596400a5a81ab293f9595034acdb95dadbc779bbea776c5ef9dfde180d291375e3a62d929815b12c SHA512 d944b6c4be0bf4703941580b87a19aa737cadb8960fd59f1426bb4e51045cf0cf138cff7b028bcac139fc7652ce38997a4aa90cc71d880b08069e7ed7b14f80c
-EBUILD qtsensors-5.9.3.ebuild 532 BLAKE2B 1263381693e188750fd406a72320738aa492a9f542a47c1aeda5f2ef4f92589fd4820fd920b496646e8ab896543f88f3a81ce9bdd99f1a7fb3ff61e4db6d2d47 SHA512 71e96030b39faa323fddc237c891840a99f0a4a7cdac68768adea74de518b363e05b49b0fa74544488aa86265a5832d9d4c9225aa24f367b550c1da749d67db9
 EBUILD qtsensors-5.9.4.ebuild 532 BLAKE2B 21e26e655c125242a339bb2b035bd7aa0a2ff71471eac52905c460c8836a038c4380605eefe5bfb5d56816d09a9c392a5335496e96c63ef34eab93100fd49ecf SHA512 6eed64f50257523e54a1ab7605e29627ebd60a37d599c0b8616c7494ddb72f08b7fa702620e4ccda71891eabf86a268f7197448981c507e07f4e4ad9112fc5fe
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.9.3.ebuild b/dev-qt/qtsensors/qtsensors-5.9.3.ebuild
deleted file mode 100644
index c09362836fcf..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.9.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Hardware sensor access library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-# TODO: simulator
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index 478681f9e8d0..456a5228b603 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,5 +1,3 @@
-DIST qtserialbus-opensource-src-5.9.3.tar.xz 279060 BLAKE2B a5aef9773b31e82c654eb23d0be578ed95126b4c38ccd1c3cae70cdbdbf4a0880988c760df470466f8e1dadc1d7dca78a85e6b1053439acf2ec1c095fe521880 SHA512 d50bbd96896dba7f79c1f4546438ec33419631aacc0f91e23ce7a5e8e2aaff0499caca29cbc92f31b6af1d9ac60c2e4cb52a304142d9655e0aac0214ed7df78b
 DIST qtserialbus-opensource-src-5.9.4.tar.xz 279352 BLAKE2B 145154d86de8d968c26103c7eab21f2928e8666123c0d8ab20e9459bd86dbe54e70f4d83ff7f9c6203f078f2ab3ce21cd2d08ed268e0af29b0578d0b08e6dba9 SHA512 d4f09d67edc69b9063be114007eb7200ee043f37bbbad9bbe392249b37ec766bc2d0f5725e9af2df2fd68095ecedf71196ffaac30569bdf5ee2606a8fddc4321
-EBUILD qtserialbus-5.9.3.ebuild 375 BLAKE2B cce5fe2e4d9308f99bbfe2cfa2b256ac0eb11ebb5a8bcab7b5bd4848496114d9e5c57e645333462067bdfb27bce71200255df0d1cda9fe784123a9f84075ff53 SHA512 eaed83c16c24d79ef34c3b0514040a84cf6e2dd4521ddc129915dee733f6b9da50553a3357330c77f1c42fd60a9bae9b55521fbb39958e42b752bd25d486be67
 EBUILD qtserialbus-5.9.4.ebuild 375 BLAKE2B b0f62792e49f7949fbb2960a0c24e387a8ef7434a10d61ae0b9e22168150d00aa195ef41248cdc9db957098dd981c86e4c6ee34c53d5349062a0aa7d8e14f65e SHA512 6b68deeef0af5d0685d5aaba58d99462276a6beca52eff7b1de826c30ffbb6a62b443efdae08f80342b4d2400e8b410588d9ed06b78a40dd6dc8c9a19b576302
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.9.3.ebuild b/dev-qt/qtserialbus/qtserialbus-5.9.3.ebuild
deleted file mode 100644
index 60ddee17fe51..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.9.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 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 18bf9d1821e6..34d77223d05d 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,7 +1,5 @@
 DIST qtserialport-opensource-src-5.7.1.tar.xz 265616 BLAKE2B 43f3e8bdde334cd0f2a1df0b9aa4dec9033c8de96567e4877637f77163cc64ce8043e6bc99fdfab40f5e28f2c4143b2613dd6268c829f60cc4656cdaa6cf520d SHA512 090015dc2652399bee7c7d30c9f127be695e4c002b18dba1089d4bec555513774a587864989f33ad4059ff7b9b2bf24c387394c03a4024e2640b3642bc89ccbf
-DIST qtserialport-opensource-src-5.9.3.tar.xz 273152 BLAKE2B 4d7e251011e06b556651a51852f55f749b04d3166c52adf88016fe18a45506bb62344b77b2eeaa4e7581ecff79e5e6d1409c449dd2206f6bcc167e75c0550467 SHA512 40ab6e7f0815f0f2c38062858e185d9a04cdd1bb360f677b7370bd902019346223e8bf7ee34079718bbb36b793ef773ecbb8b2eca5f5f5996c77729d7da77aeb
 DIST qtserialport-opensource-src-5.9.4.tar.xz 273252 BLAKE2B dc9a97465ac22521346da8d676ac31f48fbe1a8b1070e7c774e1d4ee8ea1fe713688775d590205e6149cd276427b35e7c503cfe5fb81cc0eb5063656ff92f745 SHA512 8eb6b850440e6e16ab0a9389259b15ccd7bd783755a6964a3d1ca07260821807c7a3e52237b69ed4e0e6333a74046b03c28e92a2e4e34c1140163af287b5f344
 EBUILD qtserialport-5.7.1.ebuild 551 BLAKE2B a2e927ff88dff94421c1d55f9299f2ab7d1645a987316ec33293f10a519f68f3d0c2d136b1484c8f48e3afc0a0141c7b1915ad80fc96d872006035803cc44afd SHA512 97fccd4fcace165cb2f4241f2e8b44f137ef69fe7f02b5178d4812102839bb01dc33212766a25557d1978cf0459b151f8ab7ced897ffa574498c5b8fa19ef34f
-EBUILD qtserialport-5.9.3.ebuild 542 BLAKE2B e22117ebed4deef3a2d6a9abd3c71f11ec0e91841ee94b0937f406d75dc0bb6479393b25bd18cf2a8df092859a8e60afb5aea27efc8c727e15cf90b983499c86 SHA512 d076dbd3cb3b10e54b1cbaf6c897fb9d81cf389fcc4fcce97d769e0c17b30e2e42f40816265c40aaf3c46a2b7585f9b7829f9a00208e34108d930032b8194efb
 EBUILD qtserialport-5.9.4.ebuild 542 BLAKE2B e4294b0bd51fcfd1d6c605e26ca0496121dcd06fba63b8cf8870a0bc2a1e0292766210d0da7fbe38514c2db1245f5baf24c36a913db0165eefa34c3634cf2762 SHA512 724d9d28f4f2f75518685652207385f9a1d40845b744952e3f225ba08f6973cc5b306ac6919474fe02b454b3a85b7f0cd2ecffb43f6420d26f14c3d1246ce44f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.9.3.ebuild b/dev-qt/qtserialport/qtserialport-5.9.3.ebuild
deleted file mode 100644
index f0e771072aef..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.9.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Serial port abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# make sure we link against libudev
-	sed -i -e 's/:qtConfig(libudev)//' \
-		src/serialport/serialport-lib.pri || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index d41a8785ed90..1d2cc16b71c3 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,5 +1,3 @@
-DIST qtspeech-opensource-src-5.9.3.tar.xz 80832 BLAKE2B 56a75db8830938517952fa0c92d66db86f09ce1f65c1d5b09e89eccd33cd54d90abc04fea745712cbfe0b898668164611013895a10dd79d3505031546c1a8678 SHA512 faa2c4e8dea22ba64e8dc93ebbce0d7e8775915591a39c2824d0f7c9da40de9df4dbef6e79b9e541773ee917caf3bef0c11ce6df163c0d91711f8f1394f7381e
 DIST qtspeech-opensource-src-5.9.4.tar.xz 80860 BLAKE2B 8556d375edc5bf0e3edd9745cef6bccab3e2457efee1fa4cc3f6d4feb90da3f651135ba9034caac474ef2e9888bbb3a41771d85b4f8a13b16867ba516a42f47b SHA512 6e2913b23c57cb0dd407b09db78fbb9b6b15c721f6d7af65c744d71f8a66f235a1069b1098eb5cd8b35449255ef94af2a96b2c4a1c550fe0e03000e023c393d9
-EBUILD qtspeech-5.9.3.ebuild 427 BLAKE2B e523e43249c52a2da21949642def2d23ee3d030f8d97d187c85dcee31594046f10bbcec324c9afb9de00944e7231d67a2358a97948a46883574af67610138e62 SHA512 69e0714d5426673ab7323fa38cf25edce8b18721db70e0b6242ed2144091e3d51ea8ab958b1ba8225f47b36ede9795901a25b7422919aa5e4ea34fdf0d6e22a5
 EBUILD qtspeech-5.9.4.ebuild 427 BLAKE2B 674217ea6465669714459ef7e20c57e625996a952586c8c07e9f3d9f0dc4314fa11ae1343ca0937051547b10433f1ff8d8db4eb10a2f064b72bb9fdaa96248c7 SHA512 2c8f32cb24dcb60b81e853a380273e41b3def6c23acc77bf87c3ce41db74e8ddda0fb621bab8107f8f780399334cda73bf9ef9b6de1ca1f0724bc99fc4905ea1
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.9.3.ebuild b/dev-qt/qtspeech/qtspeech-5.9.3.ebuild
deleted file mode 100644
index df046ce25c61..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.9.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Text-to-speech library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# TODO: flite plugin - needs 2.0.0 (not yet in tree)
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/speech-dispatcher-0.8.7
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 3b59b8b48f55..526c3ee5f1d0 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,10 +1,8 @@
 AUX qtsql-5.7.1-mariadb.patch 1888 BLAKE2B bd8a93f2b28ac9db84c1da1d294c974f1bed0a87a99177c0ac9738d4057d168be7d563d1c34ba40c2695dad47c83b16a6d9d05257dd1e768e1f3c5049fe1cc65 SHA512 4fb0e066eaf848feb7379d4f0f92e26a1e60e9003d77b8976588036df09c04cc24431335cfe08616a4c23b10975ba44e6c25b92417a8f285308bc8f0b46c2c78
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtsql-4.8.7-r1.ebuild 2261 BLAKE2B 24e39792f5fd56b5d61a7b61dee71f00cae4a45436e74137de29460d89c5c13235811142dfb8f5499eea483890c4c39ff2fd9d86f0ac9e52f05d08499b1ac8ce SHA512 a81056b36b8a081403824b1102883d7d35e181c05bc6b8e56e29c227ec832fe712a1dde8a4178a30bad5454798aa17eaf33890403c15b08b67cb221487b8e4ca
 EBUILD qtsql-5.7.1-r1.ebuild 1467 BLAKE2B 113ce8884c0b442c4fb6ec7c651f4cc25d735ebe115e86647dab0bdfdf73fd2361a9e6c4c74defaf16ca32c627e6de7c4f785bc413d3df3a8c69441e8d8f8831 SHA512 c5512de8111d6546f1c3525e85e9c15602515b704bfacf978bb0025c13b20c9dd791468f10b7fb2f22210d2dff12e7ccdbf834704f2bb37247b37f6c425b155f
-EBUILD qtsql-5.9.3.ebuild 1419 BLAKE2B 468469c3056b9f9b8ccdd3fd51773c13860020584fe27d454aa37a40aaebc7995fe95a05732eccd5772c53b79d860c370b067708665d3b38d517e1dccd4e320d SHA512 5339d5c51acabe4ddd2ab80ddeaf14bf679531026b1603b70d3671967827523b1909b3a6982a21c64df4e16df8d08f010a877ed88bb45d4a56f683b5d879ba43
 EBUILD qtsql-5.9.4.ebuild 1456 BLAKE2B 46ae59edf6e4a1fc333b05151212f3c1f08058567f1a41725d3f71e39d71ae5343ca2b37d7054967dbc42fb27ad5e32aa127df9dce27a4d6a34d101598b2dc62 SHA512 dd030b452b255c0c732d24e0471f1c8f2971d34aab5486bd6ee0fa53d5200ca63c070c98b5335932bfa0467aa1209b3ff549967cf3aaaf78bb4e4fb200d20d3e
 MISC metadata.xml 701 BLAKE2B b9f31dc4bdb158bda952ca941dc3a5f70004800c8874e310a2a9634223dde59e799df9b4f9d424d89870c191fe041ec29ecbab79c1f04be55c786170d921c10e SHA512 c807e5c85d7e4f23f15ef9f95f4bed3e303e25e355a096ee118e4846330948957dc44d16c97d3c687ee30a5895c511e9d1480a39ddf2360f8989d06daf0b91b8
diff --git a/dev-qt/qtsql/qtsql-5.9.3.ebuild b/dev-qt/qtsql/qtsql-5.9.3.ebuild
deleted file mode 100644
index 0560c4a2739a..000000000000
--- a/dev-qt/qtsql/qtsql-5.9.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-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
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usex sqlite -system-sqlite '')
-	)
-
-	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 366620f36722..e6d4ccc9e121 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,9 +1,7 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtsvg-opensource-src-5.7.1.tar.xz 1751536 BLAKE2B c883dc94700b9dc442da403dfd5f9d690b98787a8710a24960a9ee65848327ed9741825e126a063c60aa1302879dfea8cd5fcd36860ce30e204eda79dc528849 SHA512 b4ba18a81ddf381f635c608f2ca6f339859b964aedf310fea9b4845d50154b5256759583abe14126e6bb86a9daad8a6e597910ce2036af26ae221b925817e260
-DIST qtsvg-opensource-src-5.9.3.tar.xz 1778224 BLAKE2B 90ea03ee31aaf0971976cf5c64b05a1767f207498bb95d7fbef75189b203a02571e807f0bc81caf0df2f325b5296b4f9826bdfd1264b47fffba33a171d6e9424 SHA512 6612dbac0aed400befa81ce513dd7be133e4d3a1ada77782178aea4b4946730d3059810fb564366c942a26e3b2335679d6470149cedbf6acb00b82a8451a2978
 DIST qtsvg-opensource-src-5.9.4.tar.xz 1778072 BLAKE2B 077ca02c7a43cc5cc6170e0c24ee155e3d190033837494c58804934881361f738709f0aed9d876dada19c48b194624b90a759cf509c9e1fb9c566514a4f5c430 SHA512 242a471ba8b1b3fe45d53e0dbdd2bcba0ffe129f7658fa3608fb0f8ee72bf56244522861c12315eabc401f389031bea2027eb106eec67688f141ea8550b6b2b5
 EBUILD qtsvg-4.8.7.ebuild 1147 BLAKE2B 2c640fadf3d57b7c745be9dd822be6db9a070dd077026197df9eabb9c398ee66a22a9bd9e9223c1ab99e9da6985a33cfdf47cd68c5350abb3614711d48f04226 SHA512 68e74c1c97a630ad57c2e6aeaa7d5a73b90c13eb29e9bf513a7b19b26b990b234e16d77c04231b59f8aa53110551c7b9844aae1f60f0f0bc8b94322911a6f583
 EBUILD qtsvg-5.7.1.ebuild 454 BLAKE2B 81377e33484f58c852798548593f274643c89570f061c50cbe9b76312cbad886436250d3dc703408f204a72cf0fd5ebc0ff2ead25f6596eec34fcbaff6dc33fc SHA512 164521f4c694bac7e803203f1e80c50cb937aabf56a6b2e36ec27f376173328daf621080ec0bb8577cb00720c41ef208ef7c4225193bc667329a3b1c06dfe8bf
-EBUILD qtsvg-5.9.3.ebuild 459 BLAKE2B c53b4a4ee005b34e4636c11aee33665c896433ea8a1d2bf5e8cd6b1e1d84b15e5d253b5a9291ec4053672529e5871f2cfa781b8ee5138c48d66b330d0fddacd6 SHA512 43d4fa342fb5795ada673d1838d97556246f9266beef688c1946b0f7b831fc41c82412f193b9aaab599d3f49ce2b46b3880b5b20941d822f1527065e7081bb67
-EBUILD qtsvg-5.9.4.ebuild 459 BLAKE2B 1fa66560522a28a10356181bf4cf964d9a85640593b06a87c710a6d77995dac0ef48ad6e9ca01a548433413096e6ade5bd62d5e71604f1f644a6515dce693513 SHA512 32b0c4f8eca6ad911ede1b1018cc63019ebf8921ca88906113d37d1bf8ef9e866071407b3f5d61b24c78456fe4d599f61aef40da2bb8c729ff5d3359edc283cd
+EBUILD qtsvg-5.9.4-r1.ebuild 480 BLAKE2B 3b94b7076fb1e08c03d2573eb3d439581304e1c703b629004fa0871e8611b6b82b2ec0f07e8cec503dd1ce78c51c19e7ee8b44d3c3d6105d52a4c2309cd13907 SHA512 4be8f8d2d264d713637725db35b2a7367fda90215396c13052e15fcac76ead93026331e44154d819db63515397a418d622cd2402573958a7b92448f87f731aa5
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qtsvg/qtsvg-5.9.3.ebuild b/dev-qt/qtsvg/qtsvg-5.9.3.ebuild
deleted file mode 100644
index 2667ef7e76df..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.9.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-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.9.4.ebuild b/dev-qt/qtsvg/qtsvg-5.9.4-r1.ebuild
index 90c02c0bbca8..c2c09ebafb0b 100644
--- a/dev-qt/qtsvg/qtsvg-5.9.4.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.9.4-r1.ebuild
@@ -13,9 +13,9 @@ fi
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}
+	>=dev-qt/qtcore-${PV}-r1:${SLOT}
 	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
+	>=dev-qt/qtwidgets-${PV}:${SLOT}
 	>=sys-libs/zlib-1.2.5
 "
 DEPEND="${RDEPEND}
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 0cb81ad9ad47..6ea0742e14e4 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,9 +1,7 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qttest-4.8.7.ebuild 933 BLAKE2B 234731d6bc636f8aafa311de9cfb8a89e3e6bdb5bab4b1fc2fd4b78bdead1eb3fa29df292e9bae5b73cad6b8c364984b6a16e76dff8b4e98621adf9e74333297 SHA512 7d2f377603287d0aff165aac7017622e0b8e4445103696911d6784c108cb4d9f1f04200c1baaf6aaaebb865c5038ce0d393240c91e6da06968c91171d93568e8
 EBUILD qttest-5.7.1.ebuild 491 BLAKE2B 0eba13b68fe2eb637ec8516a2969c59c28959493dd57c62744f4e4d4e1596c75710cd0b4e06560df9232520ead8aa02c4d2fde0a3b362971a27476e3a4da3b4b SHA512 8709179f307e0c8a179fb13d947762807db80fdd81ad4fefd54fc88d95b98fa4efca98e41a6deaca734e99df4e581705e36bbb0d92a0a5c357e01e7efcc878d6
-EBUILD qttest-5.9.3.ebuild 496 BLAKE2B 1b37cb86f5da7e66430e1ac4a09eaad7884d0e57721ea1919db07a0d6ef8ae756415b3bbb79e175691f1dc718ad61815d412fc59ab6a564084fcd77a38c3c0d2 SHA512 9404b0261e85b73b653b6b7a673fcda3b28472682273befe5dd81d2003aa029143ca476b3e274461ecc3c2d3cce3a88482061944800332b8ce100f25d109db5d
 EBUILD qttest-5.9.4.ebuild 537 BLAKE2B 97e78f02587dcf8433d8bea181ab5aec8457fb416b79bde96e2089e8a628e475764c30c80a7cc440a94706fe160e9d611d178d4c837fb18830d231ee10ee0ce6 SHA512 bbb46ba76cc500da9a11420955f6708e2349ae8e05b401cfa2b33423ca1d8d3a05f2facf30a9afebead5e11d8223847efd630b59087e9ba48b58811405464564
 MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360
diff --git a/dev-qt/qttest/qttest-5.9.3.ebuild b/dev-qt/qttest/qttest-5.9.3.ebuild
deleted file mode 100644
index 1db027438864..000000000000
--- a/dev-qt/qttest/qttest-5.9.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtxml-${PV}
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 5ba91f4c38f2..b35b805e6acf 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,9 +1,7 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttranslations-opensource-src-5.7.1.tar.xz 1206116 BLAKE2B 071d703ed32eed88d34318617e00bae96ec0c1a3e75a4880d76a9f952fe5449c2cc9234433234d013e0971696c1f7ae677f14cf5c6a6ecb8df438ef2db1918ea SHA512 8d7705d1fb2569f90bb7fbb9bdfe7ffdbf7a8746ee4da634f66fb7f70c14b91f7257165b6ac041cbe4918b88e6ec344c8e554f1e7339257e7e1b9a06e78ba837
-DIST qttranslations-opensource-src-5.9.3.tar.xz 1414192 BLAKE2B 800a841a6724bcfb81656b5c553c2289e6438294fc1895eb49b07d8019c6ec9ec1b0c1d7cfc2362d1c0535ea44655975af0f5bf27381211e98129638594eb74c SHA512 b8577d33596e6df7a491d40f4c40889ea1d8ccb422e132affc66d78a8e137c5e96754d642fb08e328ba079e675286b875b1806048361c6faaf0c1b13cba4a5c5
 DIST qttranslations-opensource-src-5.9.4.tar.xz 1451972 BLAKE2B f859c764d63673866bc8be88d4e5f9e2956b3bd08a883268a0c9cbca45a7132578a87b98eadf592944864da2d70cbbff0b46a75665faaa72c4f6a723f203cdb6 SHA512 74375ee78e40e8de2349e575306c729d90d80de089f44d4ff57506085c748d5eb5d0699a769d4379f7dd23c48ab88b7e5a8227044ce07d6ae12b0d3ac19450f0
 EBUILD qttranslations-4.8.7.ebuild 773 BLAKE2B cd0ea1b0a67d8d9d8ee6fd5d5bf4c2bd37aa42ab5e7250ade8f4fe689bed011caccecf51dce162b2c445eef3b725ca183a37831e03d5e11d88687e5071c9d597 SHA512 1f833bde8f1dcdbd7838cee55c193738203bf74d0ef55865bfe511e3f5749675d216669af2476530e3b27e3b12ef481e092e7866e6fffafe9d8bfba75d3a52ab
 EBUILD qttranslations-5.7.1.ebuild 362 BLAKE2B 8f10c534af773d6935f5d1918b866eaef3a8234e5d971239e69410c74372455144bf609a6a741b16b44339831272b6f897b562368b8e82e29af79e7d545c6cd6 SHA512 f5e75b59fc5457b491084946657acd1268f1fc64b723f5a91564b4a21606569ab45137913618ab3501a58fefea59793a298c241f0be462279a857ad836ae34e1
-EBUILD qttranslations-5.9.3.ebuild 367 BLAKE2B ac5a5184435433afe0f2bad96c22eb1e4f61464279e19c956ea0ca5b152cac16dbbd825468f893dfbe15bf7f23a2c2761461b49c83d90367f385ec2c0c6ec224 SHA512 5fee74bf66f818592d441d46dc379f391d50097f530e04d9e3bce8288d4f221d56632473e6bfd86974bc342a833206e1c27c15bbda31fee36f6bb829df494415
 EBUILD qttranslations-5.9.4.ebuild 367 BLAKE2B 9e53bc079dabcd203087670b5bae8c8547200715b3a644a28f03c883bb2e19899bf710b5ee372d5b68322337bf889f8d469070167b0c0018397179682fd79389 SHA512 042418121d824f29c2adf7aa19bd1d9241ea556a931aee57be2eea252361424652c4d5a676e8bedbcd21393e8a14fd5f664d18d737654c5fbcb15902f2cffd3b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.9.3.ebuild b/dev-qt/qttranslations/qttranslations-5.9.3.ebuild
deleted file mode 100644
index 2cd296662734..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.9.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/linguist-tools-${PV}
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index fb6c50756ba5..222acd7a7d14 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,7 +1,5 @@
 DIST qtvirtualkeyboard-opensource-src-5.7.1.tar.xz 10014088 BLAKE2B 02f460a58d1dd26bdfff788003857c2a0b9e37cab3001fcf18edf0c9f26a8bbedcd96391300f20a89f3ab5021f977bc7a4cdccb1851ba594e9b64950b4a090aa SHA512 31481a88b91ef936437e54c863d39a63917496bd5701670ed38f1695c7cc6d867b8cc0eede62a523d5fea3819bc2688845277c9737349a0982de711cc464f00f
-DIST qtvirtualkeyboard-opensource-src-5.9.3.tar.xz 10030260 BLAKE2B 9199493c747f4cd7e8a8ce3965ede6b4e2943ddf4cdace9b61b3ec4380a7be958687e1e39e2005ca154ea73d2129a0e9268969f6c2a86b5cce6e7d156fb49efa SHA512 feac25b2f88e182e58431a92e27436149072e2dd2eb09abbb69b732a6c3e484c4259759a99f730856993c6d50260bf5ef234f29f6f7e2a4fddbe77d15838b5c8
 DIST qtvirtualkeyboard-opensource-src-5.9.4.tar.xz 10026856 BLAKE2B 7097d8243d11bb7b3cbc9f85cb124ca587e6652a67877e3c771a5c5dcca9c20f952474ffe8ab434caa6d2620e66e381829dc23e3dec927c1776f31a76b599d30 SHA512 6c10d3432cdb61a800c0eba436e135908cc44b5d36d14c93230e7284aae6fd671e116ddb976e610b37c4251c0b6ce4325be4464fec73d042eb9e9f29ee4397e6
 EBUILD qtvirtualkeyboard-5.7.1.ebuild 997 BLAKE2B d961e5a79c9bbbe52c52a940a24e4d933cfc69a43cf7ddcf93cf46ba6e3e4bb3b64a2f998a90c37c81c445031628acbb4cb7fc60b9cb49ef937c116c30cc8633 SHA512 1bad77e24919a9d2b7d3aa4f4568ff491b9edddeaf2812f2f5cc93fe11dd0c24c747e82db263650f972821c3aa2e660a75ed40c21cb7dd8642dbe9b4f863d3ca
-EBUILD qtvirtualkeyboard-5.9.3.ebuild 999 BLAKE2B 05db2274557522afe45a841f8e90485187dd56b2af6d3bd24cdc3b50cbb624a36bde10f4e8caa1c6a882f6024ac46d4bb4d2626a606881108ddd40766f66ff19 SHA512 12c1349bd9625fad53e113867d18f9995fbfd1feed30daf67af36b1cba37907fb51fb806e0116f91474f238898793d8f6ebc1203c8dc309e56b6891e2a772e0a
 EBUILD qtvirtualkeyboard-5.9.4.ebuild 999 BLAKE2B fe2cdccebf625ae538a9a1491c70f702d439830e779ea96d01f31f58f10d3856b8c15d6661d98f96f9d5d64e602b930f20180eadc68a1c783f80a6c7d903a9b5 SHA512 07ffb9e107e47aabd322c437d6b09349fcf4576cda6dbd0e6a952349997d962ea2279577c3fec5a2e41701fe5a83d142cb1dc6c80f240130e7280b7b8323d6fe
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.3.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.3.ebuild
deleted file mode 100644
index 852cb2cb27d1..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-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 d712229b342b..02a836536455 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,7 +1,7 @@
+AUX qtwayland-5.9.4-qquickwindow-crash.patch 3408 BLAKE2B c37b4bf3612509d08de1437181db18fe0c5abafbe447010ec092fe7657cf6b2536e2cb181a3741f52eb4dff30c39946602861ecf6916a9a4b6ad576aa7d24a72 SHA512 33f660550904e2811d8f2816c7e62020a342007f6ea444bd62a3560a74c1f5816a40c99df42b5923f4871b10828c8bff5155fa197db1f1cb7432ead02cd56477
 DIST qtwayland-opensource-src-5.7.1.tar.xz 291776 BLAKE2B 06aba415e33ed971ef4de975e8677a52c4fcc81922f978cc1bde7e9a7ebdea32cd1c7dca59b67493bc96edfd997027f630c05c93ce31ae4ba87a55580495997a SHA512 41a6699b9048a859bb0cb1e37cd0a3977f52a5a223d4f6a4ce5e1402c5b829cc907593ce2b70f4ec24dfad147251bb2f20e889eae26072cf53e774b4585f2921
-DIST qtwayland-opensource-src-5.9.3.tar.xz 314652 BLAKE2B 56dbb8baa3642144d7021ca4361f4a574efe520f759dcc09867e4f114fc449ebd011099fb852c758c524e79539d5e6365cd3863921dc42339ba9c770586d21d7 SHA512 1deb41d3a2e081fa434167211b975019840c56cbf04c8fc18325d405818c2ecee6d65c9376f498ddacc1587455d310b815d56124d6a7734b2857399abfb3b659
 DIST qtwayland-opensource-src-5.9.4.tar.xz 314932 BLAKE2B de90fb47af0d07e0b6476b84de2f51900e4e09ecd57aee800534998d3a2e733501da877f912c4b0ce671d417f543eb44bc1607225af0a134ba5702d17efae431 SHA512 93d43bdcc39fd471cdd335c0699c5e5dd77cd0bc2d15f2a1170d8ccd103d84e2c7e657575a370ac6c678b52c2b617fb2c80ce4d226264cb6c857064452f7dc10
 EBUILD qtwayland-5.7.1.ebuild 623 BLAKE2B 2f60f19423ac6038c61ed09d8764cc2ec46e71edc18189eef873391cdc79aa68ad05f32716cc2deae59bf1db1228ef731e323f6df87060af67e078f14288020a SHA512 8768c4014b155e6a5918d93228c2281e4742354f706089bc94355d8eedc939d5d32471163652cc6ce640beb719516b71832100d9d5e255ee90b38a3f68edc022
-EBUILD qtwayland-5.9.3.ebuild 907 BLAKE2B 69735789f1eb7272eee9f587a110a50352480d4c221d834daa60e1c16157368ee90ee2359f7d2d69f2861d327ca0e6b71c505887f77ed27c153bfeffb61278b7 SHA512 8f36a62cdd003781b58b70214de5593afd3ddce625a53e088ca1e4d19e270bc1afb65fb669f1cdd6173079661220c05280f19ae4ac394bec825f27d656bb0a61
+EBUILD qtwayland-5.9.4-r1.ebuild 977 BLAKE2B 05a452e02b0d281a1402dc8150b718ca8aacbe8ca1c3f0bb48ba80ea8bc6ef36ff83b57161cc7d822d5a7df4bc0f71b37ef82dce6f01f0488a18c4909ad00585 SHA512 aed5848b763db50cb55d0666fc833c98940a2b44284a30d05a9cc4debcbc260bc45bfa0df6fbaabf24c23f4ef2f27fedff698492acf3bdedc0faadb85b6444cb
 EBUILD qtwayland-5.9.4.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch b/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch
new file mode 100644
index 000000000000..40f2a6dff4e0
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.9.4-qquickwindow-crash.patch
@@ -0,0 +1,109 @@
+From bf09c7a1493c01a65ee0f110b37a04e653edc08e Mon Sep 17 00:00:00 2001
+From: David Edmundson <davidedmundson@kde.org>
+Date: Wed, 3 Jan 2018 19:18:42 +0000
+Subject: [PATCH] Don't recreate hidden egl surfaces
+
+QWaylandEglWindow deletes surfaces when a window changes from hidden to
+visible, presumably as a result of us not having a valid wl_surface
+object. By extension it doesn't make sense to create a surface whilst a
+window is still hidden.
+
+This fixes a crash where a QQuickWindow hides and then is destroyed. In
+QQuickWindow destruction we have to create a valid context in order to
+delete any textures/assets owned by the scene graph; as the wl_surface
+has gone this causes an error in the EGL libs when we create an EGL
+surface.
+
+Task-number: QTBUG-65553
+Change-Id: I9b37a86326bf2cd7737c4e839c1aa8c74cf08116
+Reviewed-by: Johan Helsing <johan.helsing@qt.io>
+---
+ .../client/wayland-egl/qwaylandglcontext.cpp       |  2 +-
+ tests/auto/client/client/tst_client.cpp            | 37 ++++++++++++++++++++++
+ 2 files changed, 38 insertions(+), 1 deletion(-)
+
+diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+index 2a9e39e..f4dd6f4 100644
+--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
++++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+@@ -407,7 +407,7 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface)
+         window->createDecoration();
+ 
+     if (eglSurface == EGL_NO_SURFACE) {
+-        window->updateSurface(true);
++        window->updateSurface(window->isExposed());
+         eglSurface = window->eglSurface();
+     }
+ 
+diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
+index 3897bd3..aed601d 100644
+--- a/tests/auto/client/client/tst_client.cpp
++++ b/tests/auto/client/client/tst_client.cpp
+@@ -35,6 +35,8 @@
+ #include <QMimeData>
+ #include <QPixmap>
+ #include <QDrag>
++#include <QWindow>
++#include <QOpenGLWindow>
+ 
+ #include <QtTest/QtTest>
+ #include <QtWaylandClient/private/qwaylandintegration_p.h>
+@@ -112,6 +114,25 @@ public:
+     QPoint mousePressPos;
+ };
+ 
++class TestGlWindow : public QOpenGLWindow
++{
++    Q_OBJECT
++
++public:
++    TestGlWindow();
++
++protected:
++    void paintGL() override;
++};
++
++TestGlWindow::TestGlWindow()
++{}
++
++void TestGlWindow::paintGL()
++{
++    glClear(GL_COLOR_BUFFER_BIT);
++}
++
+ class tst_WaylandClient : public QObject
+ {
+     Q_OBJECT
+@@ -149,6 +170,7 @@ private slots:
+     void dontCrashOnMultipleCommits();
+     void hiddenTransientParent();
+     void hiddenPopupParent();
++    void glWindow();
+ 
+ private:
+     MockCompositor *compositor;
+@@ -409,6 +431,21 @@ void tst_WaylandClient::hiddenPopupParent()
+     QTRY_VERIFY(compositor->surface());
+ }
+ 
++void tst_WaylandClient::glWindow()
++{
++    QSKIP("Skipping GL tests, as not supported by all CI systems: See https://bugreports.qt.io/browse/QTBUG-65802");
++
++    QScopedPointer<TestGlWindow> testWindow(new TestGlWindow);
++    testWindow->show();
++    QSharedPointer<MockSurface> surface;
++    QTRY_VERIFY(surface = compositor->surface());
++
++    //confirm we don't crash when we delete an already hidden GL window
++    //QTBUG-65553
++    testWindow->setVisible(false);
++    QTRY_VERIFY(!compositor->surface());
++}
++
+ int main(int argc, char **argv)
+ {
+     setenv("XDG_RUNTIME_DIR", ".", 1);
+-- 
+2.7.4
+
diff --git a/dev-qt/qtwayland/qtwayland-5.9.3.ebuild b/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild
index 43c33faf510b..16a5d921047c 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-qquickwindow-crash.patch" ) # 5.9 branch
+
 src_prepare() {
 	qt_use_disable_config libinput xkbcommon-evdev \
 		src/client/client.pro \
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 0b56126ae27c..ec7db7dff61f 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,7 +1,5 @@
 DIST qtwebchannel-opensource-src-5.7.1.tar.xz 122436 BLAKE2B 29bd6a5d09cb91d7ea7d5d2bc6ebef62851569a867b7949d2c79cdf1a52fc6abb8181814ade499d2ba31d305567a82556118bdad3fb59700b6895c9e7afcf5ae SHA512 643ca738e07c9a719d1d17ee23faf0d7bb3a62e6ee03e5b4f78e1cdf8d1b13ed71416b86bbb40c93d121a6569dc55d0373f1cb0961c8db07762c93592ca49af8
-DIST qtwebchannel-opensource-src-5.9.3.tar.xz 147404 BLAKE2B e1e6211cec2d6058ed55161d3b97c54102ae5f7953dd14c769bb706376a664ea5e2f88ebbaf32295515a14c643171cc2c865fec929d57ad1b9487f3e2bda7772 SHA512 d03a091121256532aac1ab4492b83ba29c847729f2628a2bc7a76b064d197e72cfdab50f0ec2314eac01cc47e2255bfef17f2e010d7b2c3d408b9af74c9ea136
 DIST qtwebchannel-opensource-src-5.9.4.tar.xz 147456 BLAKE2B 703bb44c12bb856f311561c772ebe8b716dcbae9f75ac47d7b702f459d47a621431a5eb2cd15c44f60c8f178d6fb6d8405f1c79c5e5501a28ac566298959b58a SHA512 932b56c9e9944e0f639163c4e484ed5260bdc7a186e81a2a6cfa113d14892414cd5b81f2767132695fb2f251c91e4d5ec9711cba10983215baa6e8014689dfbb
 EBUILD qtwebchannel-5.7.1.ebuild 563 BLAKE2B d0a9c4bd8cad8c0afe46da2a60c7989b0bbf2cab997bef478c7c97d0131fe9ba8701ee514aeb4abc22f4368bdac5ddc4e0748a3635e886089bf60e562e5a7105 SHA512 741eb20f2e08d421c4b254801edaf84319c0cb380c2e6debeac88ec633099b78839120d5cfca28500d825d0191db6518522b757d8ab7748709a0a69648dae5ac
-EBUILD qtwebchannel-5.9.3.ebuild 567 BLAKE2B 788eb3e961a4b2344058132d6a919f1eb8f9ecd70bdddb640544b17ec14f310cd02276f79854b35a44bd9a2bad977cfe0be8dae39279685c925a07ca1b0b38ff SHA512 5d4f9958cc1d6810c1b5b7d99aa9af0d20e840fd77cab5662ab5ecf7fbc0979fd5832a88757e624857080bb0e74c90761435785250c138024ae87f11a7d7e145
 EBUILD qtwebchannel-5.9.4.ebuild 567 BLAKE2B 0c2571b19cbdac1eadcc41c8989423580cc0744f6303834e321ac9ee8159dcfe23467bfc70909cced0657ad4e97005dee5ba42326c509cde3639b3e84db8b3cd SHA512 38902c94bf7b214c3d784dc0788fe4257cbfea895a6ad7dac73dfb52546f55bb16c6e84e20192c8e30c0bb57c2716ef8860d79ea0d71df33f3d3aab2a2542263
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.9.3.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.9.3.ebuild
deleted file mode 100644
index 42caf288363f..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.9.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 772db31a843e..cd0a391bdb95 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,11 +5,11 @@ AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 BLAKE2B 0567ca41667c62c794c9
 AUX qtwebengine-5.7.1-gcc-7.patch 5612 BLAKE2B 2ee8a7411dcdd397e9dfd17af0b0081fd16b16da4598ba976e94b3b14d4e1a3fbfc7abed83204e472d5f9a8aea60bc402ca98c3d355f653117556a6047a1393f SHA512 a2824a8ea4b2499fb6f5b583349c3b3428a3a99e5f534d624e00c7820f7a70c824ffc90fc9abd0f981fd707e5361b1d466de1094f65d5c1c8d62db9dc118be0a
 AUX qtwebengine-5.9.3-icu-60.1.patch 664 BLAKE2B eb36ee21a907677d6599dfd7fa3960619492ca0616cace73e475ceba64b1f43631d6f81b303801d934dc6e4a71bf7dc4c4b43fc73d3d048ca51bd7ceea13bc68 SHA512 9652916b675ae2d94f761ebd1e13effbb7545d14bda130a61122d082ea7e826da1be1d22d9063f5e3a4a3b2bb3bc51edb7a98a51869ec8bb9db9089e4c31dd5b
 AUX qtwebengine-5.9.3-paxmark-mksnapshot.patch 997 BLAKE2B e6fd8d6830ee2ca7b4e9c5586e52ce0ce577ddf6839d1de33a125606bc94bd483e4bef3008196f60e6c622074d23166a01b560dacfc5cec86e82dd360376627d SHA512 4a93fa1bdc7c4bbf22c68af4eff9473c4c9e39bc9cdc725441d5bdaec0521fd54db2b25f6900d4dc5d41a8cbeb04d5b420a85f334e3c18348d2e9dd1d9700dc3
+AUX qtwebengine-5.9.4-jpeg-9-1.patch 2782 BLAKE2B eb52d5ab51ca47603f3cdf684e0d34bdb0e6441aed99603608866d41fbfaeb812129199d28f7d01763bd9a86cf0a4e9b46199ab1b227d5e0a3add1ad7bc43329 SHA512 85f305333741e88461c792e5ab1e65f3efaa762d60c52f6afd56c6344375e3467b3268c478d51de0340d99ad2ce3ea2aa5fad83364dfeed2d665244dc84c36ab
+AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b87897e4b8df045b81090524e84a90e259d7824521e71639eec5ef8cfd86c5823302846bd1a05dff3fb39d5b988544bf46b SHA512 57551a4859791431d921fc0f514332d408f43c05ead7919468727069e01b9cf3cfe70f5ca014af57b8842f8ba745d1abe5838fa271d354b775a520ef296bd6a5
 AUX qtwebengine-paxmark-mksnapshot.patch 1478 BLAKE2B 99f99e8264c0bd534e5efe0dce1d2bd58662f83e35f3426cf3daba0ea49d28689723c59c14ed2d357102d8eefbc4c7afcce298efa516f82710bcabe930a6e566 SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019
 DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 BLAKE2B 624df9c61b887ed393d8021db4e7bd058544abab3a13341fd0bb76fa3c00cf2692c4e08c2058e1576dfe5c62f9e9bc9ac8a1b5a4a640a204e74ba88516fb4ffd SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a
-DIST qtwebengine-opensource-src-5.9.3.tar.xz 217344496 BLAKE2B 51701dfa8a804ad7723d296fb8ba11df821041c60e4c96459b7851b3ba1ca683e83207c3020a5a54e401779186daf46049a1167649b930cc04151b6d0474aaeb SHA512 0db532b4d54540da1ca63de1cc4d561d72f052211535f75f60b99c1858ec0819ab0f831a3326d58da6350066748634000fe7ad0719ca545e12f3ed249a6eb90a
 DIST qtwebengine-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9
 EBUILD qtwebengine-5.7.1-r2.ebuild 3109 BLAKE2B 5ecfaf15205fb4d3ea2a2a688c1fedf312efcfb44140de281738ae45f16ec38f4a81bf37fd963c6847c94d64b7b013580056feea224d40cfe56dc1a10ca3cf0c SHA512 618c00c7d5edc4d9fcae5b25e61f957ada6555afe53a2e52164eb7cf22c05a6a015041b2ead744624fd8eeb9c35edbd951786337cb2d3ebd4a1747af339bd730
-EBUILD qtwebengine-5.9.3.ebuild 3103 BLAKE2B 3d4c326b27f54799faa38ea36bc5147e1299483be0bed1214758cfbb0f7952b46cfc83b10b780edc834cc2d82ff5568bf1b7265f69e875b2b9be09b168897630 SHA512 ef109193825017c7c2e762c1e046b3667397aa56f3a87490b19f261b04651a68191f79e43c277eb0ee91fb837532167ee7bdc2a1580ac90af7889ae7a4999545
-EBUILD qtwebengine-5.9.4.ebuild 3110 BLAKE2B 9bfb19630207aabb381557a6ff7d5ff3a3396dcee19411606f7392067408473dff0d014fbcb75639b2efbd35503bb3c5fbb91a5c8cfc10e8f95ced63e251fd59 SHA512 4a9f787397dd4ffa2081724125c77a437fa077a7c060a6998d1d2d08eccd2ba491c0aac3ee31b41421b35a9bd8b6666dfa06cc460af39ed0c87ae8535413038d
+EBUILD qtwebengine-5.9.4.ebuild 3225 BLAKE2B 830c8ef36096ea0ba82d5e880907bdfd7ca7c7e5458484b69e7f1009a2b89327aa7defedd15e2e1792b5779f38d22ef249bfb9bbe31ecf5db8ea6e942306efbe SHA512 57bb75821490db5da70dda740a691a0048fbbad6868ba11eb666c4c16e216dab55fe0b975242fb8c221f1a00522f3ef710d514eb5827ad27369316092ca71aec
 MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch
new file mode 100644
index 000000000000..8b739680f685
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch
@@ -0,0 +1,70 @@
+From 560a4a616f2a1307385e5e7a7d2e99b0b41775c8 Mon Sep 17 00:00:00 2001
+From: Viktor Engelmann <viktor.engelmann@qt.io>
+Date: Fri, 18 Aug 2017 14:50:20 +0200
+Subject: [PATCH] Fix improper boolean values
+
+jpeg_codec.cc contained some implicit conversions to boolean, which
+is apparently problematic for some versions of libjpeg. Patch
+taken from https://bugs.chromium.org/p/chromium/issues/detail?id=686191
+but not backported, since it has not been accepted into chromium yet.
+
+Task-Number: QTBUG-58482
+
+Change-Id: I2c5d5894493d6a7d0698a4e5a7191288a2fdfeb4
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+index 6d92637..85c7bec 100644
+--- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
++++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
+   // tell libjpeg where to write the next data
+   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
+   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
+-  return 1;
++  return TRUE;
+ }
+ 
+ // Cleans up the JpegEncoderState to prepare for returning in the final form.
+@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
+   cinfo.data_precision = 8;
+ 
+   jpeg_set_defaults(&cinfo);
+-  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
++  jpeg_set_quality(&cinfo, quality, TRUE);  // quality here is 0-100
+ 
+   // set up the destination manager
+   jpeg_destination_mgr destmgr;
+@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
+   JpegEncoderState state(output);
+   cinfo.client_data = &state;
+ 
+-  jpeg_start_compress(&cinfo, 1);
++  jpeg_start_compress(&cinfo, TRUE);
+ 
+   // feed it the rows, doing necessary conversions for the color format
+ #ifdef JCS_EXTENSIONS
+@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
+ //   set to a positive value if TRUE is returned. A FALSE return should only
+ //   be used when I/O suspension is desired."
+ boolean FillInputBuffer(j_decompress_ptr cinfo) {
+-  return false;
++  return FALSE;
+ }
+ 
+ // Skip data in the buffer. Since we have all the data at once, this operation
+@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
+   cinfo.client_data = &state;
+ 
+   // fill the file metadata into our buffer
+-  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
++  if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
+     return false;
+ 
+   // we want to always get RGB data out
+-- 
+2.7.4
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
new file mode 100644
index 000000000000..ef5f44efcf23
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
@@ -0,0 +1,46 @@
+Fix build with jpeg-9. Bug #646456
+
+--- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp	2018-01-15 12:39:43.000000000 +0100
++++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp	2018-02-06 20:55:37.455912163 +0100
+@@ -57,12 +57,12 @@
+ };
+ extern "C" {
+ static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
+-  return 0;
++  return FALSE;
+ }
+ };
+ extern "C" {
+ static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
+-  return 0;
++  return FALSE;
+ }
+ };
+ extern "C" {
+@@ -126,7 +126,7 @@
+     jpeg_destroy_decompress(&cinfo);
+     return false;
+   }
+-  int ret = jpeg_read_header(&cinfo, true);
++  int ret = jpeg_read_header(&cinfo, TRUE);
+   if (ret != JPEG_HEADER_OK) {
+     jpeg_destroy_decompress(&cinfo);
+     return false;
+@@ -210,7 +210,7 @@
+   }
+   cinfo.image_width = m_OrigWidth;
+   cinfo.image_height = m_OrigHeight;
+-  int ret = jpeg_read_header(&cinfo, true);
++  int ret = jpeg_read_header(&cinfo, TRUE);
+   if (ret != JPEG_HEADER_OK)
+     return false;
+ 
+@@ -433,7 +433,7 @@
+   if (setjmp(ctx->m_JumpMark) == -1)
+     return 1;
+ 
+-  int ret = jpeg_read_header(&ctx->m_Info, true);
++  int ret = jpeg_read_header(&ctx->m_Info, TRUE);
+   if (ret == JPEG_SUSPENDED)
+     return 2;
+   if (ret != JPEG_HEADER_OK)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
deleted file mode 100644
index e8a3d5f814e8..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/protobuf:=
-	dev-libs/re2:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
-	media-libs/libwebp:=
-	media-libs/mesa
-	media-libs/opus
-	net-libs/libsrtp:0=
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/libcap
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( dev-libs/icu:= )
-	widgets? (
-		~dev-qt/qtdeclarative-${PV}[widgets]
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	sys-devel/bison
-	pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" )
-
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
-
-	qt_use_disable_config alsa alsa src/core/config/linux.pri
-	qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
-
-	qt_use_disable_mod geolocation positioning \
-		mkspecs/features/configure.prf \
-		src/core/core_chromium.pri \
-		src/core/core_common.pri
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
-		$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
-		$(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-
-	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
index e36ea1ca7b3b..6545b759d29d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
@@ -77,7 +77,12 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.9.3-icu-60.1.patch"
+	"${FILESDIR}/${P}-jpeg-9-1.patch" # bug 607424
+	# TODO upstream:
+	"${FILESDIR}/${P}-jpeg-9-2.patch" # bug 646456
+)
 
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index f1b640b1cdc6..55a7b5b54701 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,7 +1,5 @@
 DIST qtwebsockets-opensource-src-5.7.1.tar.xz 193204 BLAKE2B 8ab0cc108ec57dbeaaf55a23e44efef319ff861bf70e043d5507ee371e116b108afe27ba2ee98e8bb1036c6a8125ffcbc54c3e26297713e5d90ba05c9bc10849 SHA512 3cca317d71513a0b11d5b46d6caee44d77a7f65eff09dbd6c180ad682a0271924e05efc28e6d31c9e982b6ab0b3fe1370606eea372e2fefd4525237496d2c7c9
-DIST qtwebsockets-opensource-src-5.9.3.tar.xz 199420 BLAKE2B 0c0ed7e193422ca0459e0f77850ddbc28dc0e16f72171476bd2ea33cf2809798811720cb927a6d2ed2a812e80d06d587d0d5cdf02b0313766237f6ff5415a6d8 SHA512 64eb131a0640229ae7553c0e8b9ec04a3f83862d3f48c38464928b8a7a9ca999ed0cba5b0fb91174a9ae8e8e3d6fa844a2aaf62a96b95fefc383361793f8b5de
 DIST qtwebsockets-opensource-src-5.9.4.tar.xz 199492 BLAKE2B c8e7b32a3ae5f74294006ea0c47e10d34753cf3221484c398bb64b246ac7139a5adbde73b001c9d4e18d1cafb636f57d0b12c30620e777c0472f93dc4ef98b4f SHA512 ecf4dbbaf7da1c69cd649e599118231cca47e7c63a83d40cef15133a0ecc6c4d32e15faac8e545f5672c9e1be15b38c1458a5a5541e680ee1ebb2fc1281260f9
 EBUILD qtwebsockets-5.7.1.ebuild 530 BLAKE2B 02db8a061894415b65629e71e9df69e4f1a1f73c6bbd18865fd5519076ae7b629e27d5dfab73bddd7b8a7ac145eb6cf33165ab886b6d5c5ac86d1ff9875e8b57 SHA512 47d050f3ef32e91e9bf87330d2bb7b752d39579d4a586a56ed66f51bd648e11c74d015e75159dc027dda1f4792d9db6800b44bc02e1bbc7bfcfdc4141d6fdf2d
-EBUILD qtwebsockets-5.9.3.ebuild 534 BLAKE2B dc981a25c9e38b62d589305992a3f2c7532db4fba921c09469028f59c65629030e61f247f8509dabc6fd03b525fe6b01f9da1f01bdd2b2ea38589342590bceee SHA512 103cf47730e37e0351e97822e387262e3deca1367ef0b1f4955810bbdd71f54a801704bee58f22a549ed90221ce2f7ba961589298fcb9c0de68139a4cb9de59b
 EBUILD qtwebsockets-5.9.4.ebuild 534 BLAKE2B c76a76e0afa33140ec7d9cb11ef00b831ed39793ec1f406cbfac2f504b4e65ab916ca367c8ebc31bcc1a0dbc45bc87365d66bf9d87ccb8cbec84ef7959550886 SHA512 7bb5be749d4308840922d502b55ef8fa7e1ebd55ebcedcd25096171227535d732cde405cce6e3dede58c92cfbb059f3c5c79f9bd8b5ebdb2ba365e9e20337e39
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.3.ebuild
deleted file mode 100644
index edf0d08a8c4f..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.9.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="qml +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 4d192c90fb77..2a4e259b0b47 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,7 +1,5 @@
 DIST qtwebview-opensource-src-5.7.1.tar.xz 107388 BLAKE2B 8b5016da53ede661a0f1cc0892f3f3c4b5ddf59d04b88dfaa8cf4ea092e12f1df2abd885e08e059ab8ed6c23df5bcfead5bf27dde7f7e29f97a1c886e073685e SHA512 a0ed2c203e3638b3fa1e8fc051bc8dec51ca32b16da684fbf73c6f342e579c11a382c799797c593abb35df438699124fa169d1463affa1a2d0b55af57f05a011
-DIST qtwebview-opensource-src-5.9.3.tar.xz 108092 BLAKE2B 79d381c8e0cac6f07f4dcb0d83b0b9b1ebdbe894aaabd331bf4614fdc17ac9e00bdc17594c564274bd3633fc174fe0c296612167927cede4ce0d3dbc9ec35396 SHA512 f4cfbcdf41d28f6f479fa8cd08aa3e6d0ced0e57b86e563a8792d086f9aa28f1c246610369617fb62a577c41ebad78874d723b604c45df82eddd826d77ce9194
 DIST qtwebview-opensource-src-5.9.4.tar.xz 108684 BLAKE2B cb660595d88da5a8c9f9e951e4a13ebb265271f0dfe081c5cb19658674f0bc206b2852b83da8a21855ba176f70d93ab20013e373393169aa4a03b478e1ced39c SHA512 e59e8bc50672ea54631b3ac510291b57a6d4d66250819fbae61b7cb814e7653301d55a42c8225a46d106f92736035e039ac7d2e97f3ef13f50bc5874c7e8602f
 EBUILD qtwebview-5.7.1.ebuild 435 BLAKE2B d8147187c383d8fb4e1083dff2a755ca99e736f75641e24f21d68a1a1c451edd07ef46a14d16ab1b582a88a44640ecd52eda755f5953bc43032e1e7581586429 SHA512 b617e25fc5e34d3a2e78db3c81ab89e303392b54dd2d7604a35a8ecbb37ebafc8d1ad15ba51292fcf3ebda8b2f038d657c0e579012529569dc5bc33317f963a3
-EBUILD qtwebview-5.9.3.ebuild 434 BLAKE2B fa041bf360fef2075b0692828e749411c0aa6205fa0244a3f2bdc6a45845ff88ac5deb5a54a35b159550048e58c3d11e26d0f9e3840b14a5c58d2b4401352c88 SHA512 e7653020d0fa86cecfacf8ef867dcf6c6b70fcfb9b5b94437874cf98297d379f8437d7b981e622ad6f8ad26b7eb8ae7958b4890703238f884fbe6386e1d15234
 EBUILD qtwebview-5.9.4.ebuild 434 BLAKE2B 47b5ad913ee20f42470549b1612d20ccddcb89324cc712765542ccd955d107b39aff12d2792c09774cd96521f1c99fed9259a474838f2cfac22835ef12c166ec SHA512 74b4635832a00046926d5a65ebd3f2e6aad75b45b3f003c7317a3d7963cac708c378426800d53d0aa58786de9a41969b671ce70445a5fe9f46b7e0798ed83e98
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.9.3.ebuild b/dev-qt/qtwebview/qtwebview-5.9.3.ebuild
deleted file mode 100644
index 95f5a9dc76be..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.9.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 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 ece98d5ee769..f46619eb7d66 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtwidgets-5.7.1.ebuild 834 BLAKE2B 4647cabd5daa38c160a9872977a31e84b4761304faf8c68d29c26aa9e76143ffffb6fcaf03e7c348bf75fff60250315b3cf9d100ce3671a896f6d2dd3b244f0c SHA512 29890730308f8bf264098bfb70fabd6d4212290b9090ffede33bd6a4baa3eb9f3a71178850f1355ff6c12a90c7b41793aca224b7b95671fec3142c81e4667832
-EBUILD qtwidgets-5.9.3.ebuild 981 BLAKE2B 313b50d94bd428d27eb92df55021d6d2b627474b0eb81828f44ef0835bac77d137e5e138564615cb779982538826e906a464bc388e794f8c272dd37c81fd5906 SHA512 f48b4ea1e674f2773818a37f6dc5f1691dde365f531f02e07e6bd8bac0425031a4273721cefc9c4489a31a46788f965728cbb781d838b146427e17a0236a18cf
-EBUILD qtwidgets-5.9.4.ebuild 1040 BLAKE2B da7a33d8977ff636f37be5d5cb338964b4bce03ef98d98b6da792e46ef8e100232c009f54cd0bb78646ad36c0a34c1ba0412e3c5d36fea30afaae7c09d3f01b6 SHA512 1bb1b674c875ea7d409432b6e4f315674c09e199b5fa9f442ad6492ffc3db1422a9093f9a5f4e3365a26eb8e458aec2efe27e46bef1982276e777cabdb9008af
+EBUILD qtwidgets-5.9.4-r1.ebuild 1051 BLAKE2B 96d9631ad31c34991365f94bd81e2f6233c5bb3d4a3f79c89eef5b6ef8ee1e4b496706163c192ae2eadc86949f7848b0c0423885c82fbc71f6fd2221ed1272a9 SHA512 e43e4ef8c77ba7b3f765ed55ac2cbe760857051f7418ae219fba5b84e52a8f6e006df7ce6ca590e34e0fd20b829c9558158460c187f78682052c0b894cd2bbff
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild
deleted file mode 100644
index b82ca24ad9f8..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.9.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-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:
-	!:no-widgets:
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use gtk)
-		$(qt_use png libpng system)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon system)
-		$(usex xcb '-xcb-xlib -xinput2 -xkb' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild
index 4b650e6c3d4d..ccb0c529572d 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild
@@ -34,6 +34,7 @@ QT5_TARGET_SUBDIRS=(
 
 QT5_GENTOO_CONFIG=(
 	gtk:gtk3:
+	::widgets
 	!:no-widgets:
 )
 
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index aac94330b6f9..f8cd45baad68 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,7 +1,5 @@
 DIST qtx11extras-opensource-src-5.7.1.tar.xz 59656 BLAKE2B 641f66238450ed30a9923fb87aa56d4d4bf41ab634e8e3bf335da844041069af58d709019bd3b1161eff4a35b41aa582c53143bd02e3a20210a279ea497c4f3d SHA512 04359d85fad3dd51d6364c5218d5f76a384ec0d2082cefc7c67c5a8899cb19df3c9ce750b6707acfecf0a5ea57fb8cb737e5a8d2af3c63345f167f24712aaaee
-DIST qtx11extras-opensource-src-5.9.3.tar.xz 76612 BLAKE2B 8d31d78c161311bcbb5b98b448e54b9c140c0851ec029f3a2642700ed9ad355c36fbde16eae2542c441759b39ab39edd91a17cb6f879401e36b0bd855a6e3ebf SHA512 0d1547e25f5d051daa8b20f54ca146bc5a6ad6fdae2c9b9e90dae574840a350bc3ac82b05ddb93b7a544e689fc06e633e57a40f31475cd118e156fad78e91d6c
 DIST qtx11extras-opensource-src-5.9.4.tar.xz 76604 BLAKE2B cffb9870ec726edebbfbb2ed39206c8f1522e6f11d3429dbb0861501fed0d8dd3552f23ba363f3704ff1b6e9af89a91e68e90f2f7ccf80b150598778d26dfea3 SHA512 f05a273db98f95f998c681eab9f8d4a5d132342282bf63d1104ad718c424602fdc8dc71e14940999692449d3fea1442a5932c08cab3d6c0a9acbbf0403fee23c
 EBUILD qtx11extras-5.7.1.ebuild 428 BLAKE2B a3792a688222ae4fd97d73ab9ce8e561e509c103ba84130ab35b4be820cc7c978f8206d3a63b2bc314aa72eebdcf04ee1f6e10604a3f571d410e42347aa9e2f6 SHA512 9ed63fdb17f983617259c75e0812fc4d3dda36d8a9a78b4c24a0cd436835f741903a77ecba71fc9a5ec33260505bf0f7d111577cde41a80862394741815fa83c
-EBUILD qtx11extras-5.9.3.ebuild 433 BLAKE2B 4feb7eaca2e72f70c79a29a04bb1453596591234e07b97eb0c454bd21a4935b9cab68593591664de3aba888ddc205631093a003e071c49eca1b8b72810211034 SHA512 ca9758a4db6c04ed0c8adadb952449dbe07631816aa462af34eec6e3f29bc7d9579ba7b67a06aaa25c0a264e41b7ce60feab9969c9aef37e5d076753d5de6cf5
 EBUILD qtx11extras-5.9.4.ebuild 433 BLAKE2B 4a9d18c4941662e00aede624407415cb0c20cab9129a4fe017836d4502656a16982e0f20f1286fe13630383fd077a8fd363dcc60153c5ba866196e4cc76ab1a1 SHA512 6bbd4550620766a2319c10c0e322000b407c80a85978348f5c6eb3825795d65a93a6b79d3cedc2ada181a17d658b4845bc4f9d0fbf811e505a3884791c4a858a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.9.3.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.3.ebuild
deleted file mode 100644
index 545409027ab6..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.9.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[xcb]
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtwidgets-${PV} )
-"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 14241b5ccd80..c8ed021fe8ba 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtxml-5.7.1.ebuild 450 BLAKE2B 1b3d962fefa2cbfc881dc7a7de8f5fb4c4566b4c61ec2469ac8359e55ee900a0538f54cb4c531ee2fee964aa9fde3fb06bfd84a3eb70b753384fc6dfc587500a SHA512 a670d6c8cc7b93b36458ddb4aa0238f0bf6b4ebb5ba929bf1c46f1b95dc525e1d9820167b0604e9e7d948f3cfd192d88b656f4b448924262d8c3220d7607ba9c
-EBUILD qtxml-5.9.3.ebuild 455 BLAKE2B bb7edd9da7b69e30a7a922a0ae658ede0c43a1356e4a5f15a7ecd3ce1ea7832e026dcf7bcf85b9a66b73a01503fd6697bc8dbe9c4b8cda316ea4ea2076ca4879 SHA512 c149fb67be41674f8d9ce5e1537eb6352f82ff25e7af3a5dca67abe5bddd3d8fab9bff6ecc369c90cff3679e653cb1e54a5150aa3b872f6c5830485224170691
 EBUILD qtxml-5.9.4.ebuild 492 BLAKE2B 8e2cbcef9db666e2e38cbf49c3ea09987c28e971a1de030b0a4c111863adffc871a33ed613c83b6119439ac3c1f555ba4fdafab6b91a60a34c45f5b6948387f2 SHA512 afd7c879b4ea3820045f115967b60073afb4540642076cd956a84a2db9d0e15e89434252c207ccacc577bf39aeb07b12012c7a3c71326260b04d245b2d48be94
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.9.3.ebuild b/dev-qt/qtxml/qtxml-5.9.3.ebuild
deleted file mode 100644
index d19aa52bbb5a..000000000000
--- a/dev-qt/qtxml/qtxml-5.9.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 8775ef9b004c..ffcc1f577b49 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,9 +1,7 @@
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtxmlpatterns-opensource-src-5.7.1.tar.xz 1352472 BLAKE2B 3b65a4b8a76631ca31d48ab176b38818246e21fc247064821a221affa5f6fa1b6763e0784b9b37789aa50f3f4f4606a2ed976d7449d7e3f7f5c072a4765f401a SHA512 2acdee1e49a154dd111be6afcb7f765d98fc17c49f79cf08c5fc03cda7e0cab7537e2dd57d976ee13b72c46a577bad2ac8466444ec46b3f14130f71756ac63a2
-DIST qtxmlpatterns-opensource-src-5.9.3.tar.xz 1360880 BLAKE2B 52b3840c0351e305afa402520811e770979617274e1cad00e39d66b6fd685d3322fe0828347298245a7a519ba9bfb1e273f9645649113e43da9d495f8f672c57 SHA512 4b345940cc66cfd14de365f2802e49a3ad88c25a46e4c36765e31586728496f3bc5aa9a856a78b79b583e577a70dca5c70534d9689627773e142e9c7e421de01
 DIST qtxmlpatterns-opensource-src-5.9.4.tar.xz 1361036 BLAKE2B 74fae07ff780bb44eaffc56822585c5dd2dc36c13237ae23666f8286488a837cafccf01c14d9efe4d151435235965b923bad1889ed604ebb2781237d8674db26 SHA512 c2789e7ca32f29f025b72704be49d9cfd3c02bfa61bf3df4145ea03b5df4fc60b2498bcf7e45090b36141aace91c645b0648b99c54e1b3fe6aec486e7fbe0dad
 EBUILD qtxmlpatterns-4.8.7.ebuild 679 BLAKE2B e26f0d2bb630e377f932c37e8e9399c40c722c2f4e7dcb68d42c3ee8c08bba1ef9263e6b704e33dc6ec402356e8829d004e007c20e91a49b93001c743f8182a5 SHA512 dde6d5ada8f3c9546bfed8a0b4f6c3f118794fa4fa382219a3f6b8ee75b8c5e8fc5913a2a0421a8904ba52dadbc707a3fd17c2ddbe4a1ec758b00d8fb0c2aecf
 EBUILD qtxmlpatterns-5.7.1.ebuild 410 BLAKE2B d2fade547a1a9577632ee0230d2e6be902f362f1418ae54206f9188c760abc28d9fcf5985f7fff7f78005d2521455dfacb63b0507e50b68f9e51b388e2bf4c73 SHA512 fe95936636e83b41c90212726ab666433bf8ee0a7de2388292f400c1019e9ed074da0a5dd4a2ffb49ceb6ba48681c6bf5f59a3dd5a7417e3bc7f5cdb1c54f4a9
-EBUILD qtxmlpatterns-5.9.3.ebuild 415 BLAKE2B ae747418ce312031479a3c9eaff4523e1ee3a7e897b68301d5f7b504a2242df00dbd55c1dbdffe1b5b1e4b94007a73796073b85c501f12920762472601c83503 SHA512 90ebbad52ced272539de159205c4b5f5a14ae26502a084829dcfd9b52030eb4819cf8dba832e6523d103050005325c0ed7072774c53fe462f61e31735ad1d4aa
 EBUILD qtxmlpatterns-5.9.4.ebuild 415 BLAKE2B 9225f7a4ed4064ceb100e564dac53adc5ef74a60fd78035e6c753c21e9319fc5ef3a40946c0aeaf18772cafc50e0bdfe98c2fd9537da18e77fded8ec64d98042 SHA512 49d66ce00be9596818a7b78b26671ba0f0aeaeecfc558f4a81356c43907aa664cd32db562edba201f2b2a8023acc639430f30ebf860f3311ee587e9ef983982c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3.ebuild
deleted file mode 100644
index 4cd0f9311e9c..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-"
-RDEPEND="${DEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
commit	f78108598211053d41752a83e0345441bb9014ae (patch)
tree	dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /dev-qt
parent	dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)