Revert "dev-qt : bump to 5.9.5"

This reverts commit e237be2025e6eb302f4267576a245b7c65576ebc.

68 files changed, 107 insertions, 235 deletions

diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 7d05c46f..0e0d4950 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1 +1 @@
-DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
+DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
diff --git a/dev-qt/designer/designer-5.9.5-r1000.ebuild b/dev-qt/designer/designer-5.9.3-r1000.ebuild
index 38ce5cd0..c1d1f1af 100644
--- a/dev-qt/designer/designer-5.9.5-r1000.ebuild
+++ b/dev-qt/designer/designer-5.9.3-r1000.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build-r10000
+inherit qt5-build-r10000
 
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
@@ -38,20 +38,3 @@ src_prepare() {
 
 	qt5-build-r10000_src_prepare
 }
-
-src_install() {
-	qt5-build-r10000_src_install
-
-	doicon -s 128 src/designer/src/designer/images/designer.png
-	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
-}
-
-pkg_postinst() {
-	qt5-build-r10000_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build-r10000_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 7d05c46f..0e0d4950 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1 +1 @@
-DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
+DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.9.5-r1000.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.3-r1000.ebuild
index 98f11ed5..98f11ed5 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.9.5-r1000.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 6ead9fa8..4ec7756a 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1 +1 @@
-DIST qtconnectivity-opensource-src-5.9.5.tar.xz 2712036 BLAKE2B 2f0eae70d857f0804660da5fc1e134d8bc1d27dd6a2e725d182b8e856ecd47a0b51a928ef1e1a371da48f9bcb831bec9858d5df837eae38c256f29e52fc7accf SHA512 def2dd384c50667eff73aea5a905dd004c39b975826713f6ef2b28bb041e8c1a85252220c7d8f491e0c2eb967ca055af29b9cf902d4dd187ffb6e7380c9d21f0
+DIST qtconnectivity-opensource-src-5.9.3.tar.xz 2723456 BLAKE2B b3b18b90d09b612789b65a14937178ebde2ff423ef7931d2b4272f5f61b7fc9df52645d888e10fa135d03a72fcedb398ce95ddd7916a8382b35d6bc3cf79a179 SHA512 28fe6ac8e9480e52cffec7bddd6db95ed4bc96858e7b7e6f1ecb325f2ebb48442f7ec3e820579e9c0654aac48ee91ad734e51f0eb65faeaa592eb7a0875854f5
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.9.5-r1000.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.3-r1000.ebuild
index 66bece29..66bece29 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.9.5-r1000.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 01e5312b..66e8bc45 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1 +1 @@
-DIST qtcharts-opensource-src-5.9.5.tar.xz 4155904 BLAKE2B 991b535139d7cd7b4b9d8e6f954af2a99dfc504d4d040a9e44e43a85d6d5b175b27b42ebda3b5eabd56e476266d93f9488823a1ea564b4ff0e11a79593b2fbed SHA512 bbb2f8056d42293d71d82799a18d2a0d9444ef52572972603332899e94f0c1730a5a4bd227e97879591b03c4eb0872184fecbc0e925287856247172d812febab
+DIST qtcharts-opensource-src-5.9.3.tar.xz 4157772 BLAKE2B 9f1c783e89848bde42978a8f4a307cd8ba8e4d5bffd012f3e1953b8825a598f12f4fd6274bcdf9e719c0130a1e0e33dcc706789ef7017cc2645426e0725a03d5 SHA512 394806f9e2abfe5c36772efdbad576f7b8372f8cdd3e171bca320b8e35159f11a8022752f789038f98a63c448473200fcdc8b636781af8a417dce30184402355
diff --git a/dev-qt/qtcharts/qtcharts-5.9.5-r1000.ebuild b/dev-qt/qtcharts/qtcharts-5.9.3-r1000.ebuild
index 90eac620..90eac620 100644
--- a/dev-qt/qtcharts/qtcharts-5.9.5-r1000.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9.5-r1000.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.3-r1000.ebuild
index 4d470735..4d470735 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.9.5-r1000.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch
new file mode 100644
index 00000000..be18433b
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch
@@ -0,0 +1,69 @@
+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.5-r1000.ebuild b/dev-qt/qtcore/qtcore-5.9.3-r1000.ebuild
index 6b17e40a..58ee5179 100644
--- a/dev-qt/qtcore/qtcore-5.9.5-r1000.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.3-r1000.ebuild
@@ -24,6 +24,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-avx.patch" )
+
 QT5_TARGET_SUBDIRS=(
 	src/tools/bootstrap
 	src/tools/moc
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qtdbus/qtdbus-5.9.5-r1000.ebuild b/dev-qt/qtdbus/qtdbus-5.9.3-r1000.ebuild
index 00ef1532..00ef1532 100644
--- a/dev-qt/qtdbus/qtdbus-5.9.5-r1000.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index bec84aca..ece3b29a 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1 +1 @@
-DIST qtdeclarative-opensource-src-5.9.5.tar.xz 21413796 BLAKE2B d8b365654eda101d5fa62736d6ed523c097310cce8c9a1ed4854b694903f9084aebf408c8f4a6a021175d6ee00763928201a071a798caf46c4245a9fda45436a SHA512 0d04b9f7ee299d1bad125dd839cac850c11ee8dff06192852489c5e8c8054b5b6e256bc20866ce45e3dad3eb0e11796994d649052645c6ff6fb289485038dcd4
+DIST qtdeclarative-opensource-src-5.9.3.tar.xz 21443328 BLAKE2B acf201966b55f748e516d0f32c2fae0c3990d00ff5b2f31d72d012840ecff4328ba693eb96a800fa6eaefad285a72edfbaae93343e4d664792c561e78ba56882 SHA512 933caf5848437cde45b4bbf0c70b6cafbc690657c651508b28138b2f90d2f823f4842bc709f4726e2c88d3913a92240b0dcd9248d83af0d06d7127b9a8211b24
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch
deleted file mode 100644
index c2a143ec..00000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 839f09c65523fb5c419b62e078f72bb39285449a Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson@kde.org>
-Date: Wed, 28 Mar 2018 00:24:56 +0100
-Subject: [PATCH] Avoid marking hidden windows as updatePending in Gui render
- loop
-
-Since eeb320bbd8763f3e72f79369cc3908e999a0da3c the GL context only
-deletes textures when all windows with pending updates have finished
-rendering.
-
-renderWindow will not process any window that is not visible. This
-leaves a logic bug that we can have the updatePending flag set but
-never cleared.
-
-If we have two windows, this leaves the other window still updating
-normally, but lastDirtyWindow will always be false and we never call
-endSync.
-
-This results in an effective memory leak of all textures.
-
-This patch resets the flag on hide() a move that can be considered safe
-given the show() method will reset this flag anyway.
-
-Change-Id: Iab0171716e27e31077a66b5e36a00bf28a2e7a8c
-Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-Reviewed-by: Aleix Pol
-Reviewed-by: Andy Nichols <andy.nichols@qt.io>
----
- src/quick/scenegraph/qsgrenderloop.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
-index 60f3538662..2eaed497ef 100644
---- a/src/quick/scenegraph/qsgrenderloop.cpp
-+++ b/src/quick/scenegraph/qsgrenderloop.cpp
-@@ -305,6 +305,8 @@ void QSGGuiThreadRenderLoop::hide(QQuickWindow *window)
- {
-     QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
-     cd->fireAboutToStop();
-+    if (m_windows.contains(window))
-+        m_windows[window].updatePending = false;
- }
- 
- void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window)
-@@ -494,7 +496,8 @@ QImage QSGGuiThreadRenderLoop::grab(QQuickWindow *window)
- 
- void QSGGuiThreadRenderLoop::maybeUpdate(QQuickWindow *window)
- {
--    if (!m_windows.contains(window))
-+    QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
-+    if (!cd->isRenderable() || !m_windows.contains(window))
-         return;
- 
-     m_windows[window].updatePending = true;
--- 
-2.16.3
-
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.5-r1000.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.3-r1000.ebuild
index 8186bb3b..937e98cc 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.5-r1000.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.3-r1000.ebuild
@@ -33,8 +33,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<dev-qt/qtquickcontrols-5.7:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-texture-memleak.patch" )
-
 src_prepare() {
 	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
 
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 3fc2c8f9..b70a9b19 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1 +1 @@
-DIST qtgraphicaleffects-opensource-src-5.9.5.tar.xz 14226764 BLAKE2B e10589a569a164a3a1795e5db3038eea2b5e26809f26bdea634dd832376b0072ebb4887f245a518112b1bd22e061809e5182f41dc0ddaf48f04d7fba2b78fb7d SHA512 3707ce790802554862193b06bdcc7cb77d206ec071555feae69c3acada8c1b81396483a9ec07168d9203c382a7b2af694931ce15cb49738d3d1cfb48f66d333f
+DIST qtgraphicaleffects-opensource-src-5.9.3.tar.xz 14480348 BLAKE2B 187e048db6cefa7a862c291f11c5490788162dceccd14cbf772c61ac530292ca95e2b18f4da53aa3fbe1ae38fdd3fc6d45a120b3d768313afcc6f12f3e408664 SHA512 4695f91b03feba279e62653d5794e175d436c40e1a0acbfd1e3caab9473830f3583dd2a9821f2fd0e0b7d354ad6ae8dd486eb95893118caaf1518cdc64f7a03d
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.5-r1000.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.3-r1000.ebuild
index 1742e358..1742e358 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.5-r1000.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qtgui/qtgui-5.9.5-r1000.ebuild b/dev-qt/qtgui/qtgui-5.9.3-r1000.ebuild
index 79917fc4..f3beb685 100644
--- a/dev-qt/qtgui/qtgui-5.9.5-r1000.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.3-r1000.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
-		>=x11-libs/libXi-1.7.5
+		>=x11-libs/libXi-1.7.4
 		>=x11-libs/libxcb-1.10:=[xkb]
 		>=x11-libs/libxkbcommon-0.4.1[X]
 		x11-libs/xcb-util-image
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 7d05c46f..0e0d4950 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1 +1 @@
-DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
+DIST qttools-opensource-src-5.9.3.tar.xz 9777804 BLAKE2B a1e05555f2c47e62e3a5cb65eebfa7a7e72ca6c591f2c48a026c4206d0f80f7625b318dda8b0a68cba15c5927c099ab69826f2538ad8d0fc6a0e2fbbcb622c32 SHA512 5d4a4d6b6dcf17b7244ed761850f622b8006c8028dbe6b0f0e95e2c19132d2420c062d4737ebeb1c342f53337fdce2137cf89ae3edb82755e68c846efffe4c8f
diff --git a/dev-qt/qthelp/qthelp-5.9.5-r1000.ebuild b/dev-qt/qthelp/qthelp-5.9.3-r1000.ebuild
index 5d62d649..5d62d649 100644
--- a/dev-qt/qthelp/qthelp-5.9.5-r1000.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 6cec150f..621a401e 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1 +1 @@
-DIST qtmultimedia-opensource-src-5.9.5.tar.xz 3585644 BLAKE2B 38815c4668c70294f27fb7a6522ee4c3443636eb52d9beec3a640fce5a78b4be511ed5d632b5ae1346040554ccec961aab733f57fe314639a227e957fd5e117d SHA512 4e320c4f8a55b7801aac36f87e16a0284e0d0e6d7812318b56a1f82970e14794cf431bfdf19d24606d985a4d98e670baf2cd812edf8ced92d85b72aae4749a56
+DIST qtmultimedia-opensource-src-5.9.3.tar.xz 3598216 BLAKE2B 9f9e88272d4b3746ba3a235e44fc11b5b7074b371093600fd8f5f19b57a651224aa3ab44f9496d2add78d0ad355f6ea1ed13c172c8d6ad469d962d0aca8aca11 SHA512 fc00650473ff5eb8f61342e144c97a6988d60b663efee27b58361c705ee482790df2442b58d1f44a069ea95a39b6ed792cff6ee12db848f1738b526e3afbacae
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.5-r1000.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.3-r1000.ebuild
index 3c3ebb9a..3c3ebb9a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.5-r1000.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.5-r1000.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.3-r1000.ebuild
index 045a503d..045a503d 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9.5-r1000.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qtopengl/qtopengl-5.9.5-r1000.ebuild b/dev-qt/qtopengl/qtopengl-5.9.3-r1000.ebuild
index 90491532..90491532 100644
--- a/dev-qt/qtopengl/qtopengl-5.9.5-r1000.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 9b583e7e..8ff542de 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1 +1 @@
-DIST qtlocation-opensource-src-5.9.5.tar.xz 5405920 BLAKE2B cd405d3a1eeed95c1c9f8759cc0d3c34d532de6f11c030296cb652e37aba66628578551fc73d5e283a373426b1e7b816b092cad1329d0a61f349650e88836a53 SHA512 80d8a8f3e82238c8a7f3e37999d5f118857e0037e60979de00219db45b3c716e6ac092f0b848c00cccbeb0ac19a1a2f4479bf92c7db701de1b3d239161d46d15
+DIST qtlocation-opensource-src-5.9.3.tar.xz 5374552 BLAKE2B d8f7449daf02d98b9ad3ccc93a547f6d0cbe25f4d17637f1efada9cf6d00e84a082845c16a488a6653570b33a2c3be9c8f2dfc6881cba5a10e35e1a96f23893a SHA512 11bf2c6000fc2db92dc857cc6f271e7ff19f500fde14520678e9af57fac41debde4c4b937dbab4fe1f7d5744e1bd0fc25ea32fceecf97d32cecdbbc8e2105373
diff --git a/dev-qt/qtpositioning/qtpositioning-5.9.5-r1000.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9.3-r1000.ebuild
index 0639fd82..0639fd82 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.9.5-r1000.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.9.5-r1000.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9.3-r1000.ebuild
index 12135604..12135604 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.9.5-r1000.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index bf077688..def98e0c 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1 +1 @@
-DIST qtquickcontrols-opensource-src-5.9.5.tar.xz 6014724 BLAKE2B 260160c126950e95bcb9745e7d98d5a145157bc3cde1ef0a395fb08217de7a354b6af88bf10714c84dead2357b1723ed3c64760213c58b2bcf95a04e4a74e24b SHA512 0134973c2c47d4d89984dc9b3eb2186641c604c3fc0a7e5697336843417d22d04bbb4bbbf5a7da10b01248149875e5465b629387949e255555b7c4be275f8427
+DIST qtquickcontrols-opensource-src-5.9.3.tar.xz 5946216 BLAKE2B a0c5aefa3f5cf8bb4e6dd8a84551a8b42d99f0a7f4e745cfb0052698af8772f95692679e7471a4c1dfb1dd6b0647755122caf0658f61ec5fd0e1e9eaa6e3970b SHA512 dc57c1960e598b81190924e35380bbb14e6696d72bdfa1db3ecca0715f930a53ae61daa7884f4c56af2b6f5896ee3b4b409cdae6192e82e6fa69d49a08b1db06
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.5-r1000.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.3-r1000.ebuild
index 462644ca..462644ca 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.5-r1000.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index c9a41f53..2f84f685 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1 +1 @@
-DIST qtquickcontrols2-opensource-src-5.9.5.tar.xz 4158380 BLAKE2B fa930195d1f36fad316d624b9acf5aae34bf8e985d0b40f80ae7276edf4e461729fde68c15e52573a5f04d8876e7ba03b3a82642b00036fd4df716a95891d571 SHA512 3ae498a9db816ef9e0a10801be85813fa69ed740d6a48770f858472d6c679a4d1ac802f3095d0c0d8cb9b1a004626e3abab6aa2a1d9845923f7600edd4ec8236
+DIST qtquickcontrols2-opensource-src-5.9.3.tar.xz 4123332 BLAKE2B 624b0ad282dbdd18c73466637ad3897b83209d76460bc72e3cf572bae6345f2ccf0ee8ef5ec0cb0cec864ac58f3e19346355d63cf2ea57da7e36ccf20dc5394d SHA512 34bec1d3c68eb86ff078fded6d19f463ee78f4929adae54beb2a1c0b1dc3f5b1a7e73210ac05e3a7e3391919c37892dde4aff88cf20e2fb148cb2a03401856ee
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.5-r1000.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.3-r1000.ebuild
index 79e99fb0..79e99fb0 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.5-r1000.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 6a0cf83a..dc4f3240 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1 +1 @@
-DIST qtscript-opensource-src-5.9.5.tar.xz 2608320 BLAKE2B d4765ee7cb0b8807933c7b048b55c2bcb02459ce72c905ff3dd4d7e003fa085e6c7e5f101d4d2dc83f82c3434186809b8bf54ff9aca519ead72c6592a80af790 SHA512 5404ec7d2754588ba8dfddd2c69bbe7010c43125c97c84d83a95ee001192ab40f2331f86d4c2d20ffcdd59b9aecfb72425bd63ecd35691dc1672a235747895e7
+DIST qtscript-opensource-src-5.9.3.tar.xz 2612056 BLAKE2B 54cc954038899cccff54b806363fb778ff90c3f1d599adaf2309237b1554fa615d5660c21a51bb84bbb94a9fd72c310bb9f187de31b6ce437eee71cd91735200 SHA512 a1a320780dbb83e8c5889c528648cd5cace79b29561902474f03e2dfeeef4ab451ac101fecff19130d8b55809f8e457b9198608153a91deed039f529d21a3006
diff --git a/dev-qt/qtscript/qtscript-5.9.5-r1000.ebuild b/dev-qt/qtscript/qtscript-5.9.3-r1000.ebuild
index b26907b9..b26907b9 100644
--- a/dev-qt/qtscript/qtscript-5.9.5-r1000.ebuild
+++ b/dev-qt/qtscript/qtscript-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index f6b58706..1af049c1 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1 +1 @@
-DIST qtsensors-opensource-src-5.9.5.tar.xz 1994612 BLAKE2B 8b65b0781dd784942cec15456eab14453aac308ed948f62dd515fbefb8cae084f74b87736740a0a47043e22bcb82954cf0407209a7843445f6fc3cf47d791af5 SHA512 1413b15287d4dabf3a7541032f622a27b52ddb64b114bcb4a83641f9272f7785324a84c151b723568ad7106b07aaada32d1a006a9613f50532ca14b82886790a
+DIST qtsensors-opensource-src-5.9.3.tar.xz 1994812 BLAKE2B 81defcf70941d8d6f93d522f572300e0145cc2d5bac25a9654c8821d9005a1f528fc2c544651159395b039886aa8fdfde0a2ee0d5c7aafbaf64cd4260e10f747 SHA512 848184de2c914c0240f3ecffe96ab267fb24693d16a55c1c757d83af9f282bc6f6c5cd762cb42fc389bc02e301c21a6da7b178260f534db35f0abe277f638ea9
diff --git a/dev-qt/qtsensors/qtsensors-5.9.5-r1000.ebuild b/dev-qt/qtsensors/qtsensors-5.9.3-r1000.ebuild
index 1167edb8..1167edb8 100644
--- a/dev-qt/qtsensors/qtsensors-5.9.5-r1000.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qtsql/qtsql-5.9.5-r1000.ebuild b/dev-qt/qtsql/qtsql-5.9.3-r1000.ebuild
index e976c6df..e976c6df 100644
--- a/dev-qt/qtsql/qtsql-5.9.5-r1000.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 293a5178..e771d726 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1 +1 @@
-DIST qtsvg-opensource-src-5.9.5.tar.xz 1778820 BLAKE2B 14d3250e0636e1be55cac97b0dfcc9e642cf4aec378e7544538b13b0e77ef3a240791099ee18391385266ef495353634c7a3e6423e54d85c93b7aa32317d6932 SHA512 e087f07d76833a8d215225cc7499e40ec56aac979bdaec2018918bccc89ee9eb2fcf3f41584694e29c73ab4ea531e33cf1652380e8b8f75e4b16547b17a9fd20
+DIST qtsvg-opensource-src-5.9.3.tar.xz 1778224 BLAKE2B 90ea03ee31aaf0971976cf5c64b05a1767f207498bb95d7fbef75189b203a02571e807f0bc81caf0df2f325b5296b4f9826bdfd1264b47fffba33a171d6e9424 SHA512 6612dbac0aed400befa81ce513dd7be133e4d3a1ada77782178aea4b4946730d3059810fb564366c942a26e3b2335679d6470149cedbf6acb00b82a8451a2978
diff --git a/dev-qt/qtsvg/qtsvg-5.9.5-r1000.ebuild b/dev-qt/qtsvg/qtsvg-5.9.3-r1000.ebuild
index 5d9f2d7b..5d9f2d7b 100644
--- a/dev-qt/qtsvg/qtsvg-5.9.5-r1000.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.9.3-r1000.ebuild
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qttest/qttest-5.9.5-r1000.ebuild b/dev-qt/qttest/qttest-5.9.3-r1000.ebuild
index 8b34461a..8b34461a 100644
--- a/dev-qt/qttest/qttest-5.9.5-r1000.ebuild
+++ b/dev-qt/qttest/qttest-5.9.3-r1000.ebuild
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index c2e43b0d..d88a1081 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1 +1 @@
-DIST qttranslations-opensource-src-5.9.5.tar.xz 1376184 BLAKE2B 3f3173d30fd1f7457abd7034e3e5abbe0495c6f13c9192577686cbea52378d895bea0d4b8f7331c96a019ae891930898c01f19ff132eded907114f0fa87647e8 SHA512 29aa5704d5ce30c013732ab51964ecd869c1765618343e6cf3c89d4f1cdf3ce1c06a4c15ad24a6e4f690d0770daaffea6a1f24214976de38087e7de3eb32c1ce
+DIST qttranslations-opensource-src-5.9.3.tar.xz 1414192 BLAKE2B 800a841a6724bcfb81656b5c553c2289e6438294fc1895eb49b07d8019c6ec9ec1b0c1d7cfc2362d1c0535ea44655975af0f5bf27381211e98129638594eb74c SHA512 b8577d33596e6df7a491d40f4c40889ea1d8ccb422e132affc66d78a8e137c5e96754d642fb08e328ba079e675286b875b1806048361c6faaf0c1b13cba4a5c5
diff --git a/dev-qt/qttranslations/qttranslations-5.9.5-r1000.ebuild b/dev-qt/qttranslations/qttranslations-5.9.3-r1000.ebuild
index 97db5f48..97db5f48 100644
--- a/dev-qt/qttranslations/qttranslations-5.9.5-r1000.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index b1dedb68..761a0f46 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1 +1 @@
-DIST qtwayland-opensource-src-5.9.5.tar.xz 316056 BLAKE2B bd270a3c2a87874e533f8ec772b6435834f2eca1130d4efccd3543cd1170064950020e62910f6e80e6be1bcc20133a240ac9d89a9afe86db4e267c1718bccaf2 SHA512 31b8c8fb0c1e7172006053fc1added67a4312aec364b0d762bd9ff5fd451b298cdf34a47dc043af8e5212f856f79efd32014ac4c35e0ff7661d83e19c6fd1289
+DIST qtwayland-opensource-src-5.9.3.tar.xz 314652 BLAKE2B 56dbb8baa3642144d7021ca4361f4a574efe520f759dcc09867e4f114fc449ebd011099fb852c758c524e79539d5e6365cd3863921dc42339ba9c770586d21d7 SHA512 1deb41d3a2e081fa434167211b975019840c56cbf04c8fc18325d405818c2ecee6d65c9376f498ddacc1587455d310b815d56124d6a7734b2857399abfb3b659
diff --git a/dev-qt/qtwayland/qtwayland-5.9.5-r1000.ebuild b/dev-qt/qtwayland/qtwayland-5.9.3-r1000.ebuild
index 2f7c06cb..2f7c06cb 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.5-r1000.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 94f13735..69b91a9f 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1 +1 @@
-DIST qtwebchannel-opensource-src-5.9.5.tar.xz 147564 BLAKE2B d66c190cae43875cf2845231c47ba5040db7b31724ea88333a8d818c111be9860c43fb7f0b3c16a3f139429361e6a1660ecfb1b2edb1a2e5a1c0f3e48797c4f6 SHA512 d5a3914c20fe541401a662e30f7277d9a57f9f4b9114832fa9b0425003542f646c295b63f31ae02c6cb69a45b88966f80f036f80b7df9a15fbc223a135d3944f
+DIST qtwebchannel-opensource-src-5.9.3.tar.xz 147404 BLAKE2B e1e6211cec2d6058ed55161d3b97c54102ae5f7953dd14c769bb706376a664ea5e2f88ebbaf32295515a14c643171cc2c865fec929d57ad1b9487f3e2bda7772 SHA512 d03a091121256532aac1ab4492b83ba29c847729f2628a2bc7a76b064d197e72cfdab50f0ec2314eac01cc47e2255bfef17f2e010d7b2c3d408b9af74c9ea136
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.9.5-r1000.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.9.3-r1000.ebuild
index 451bb8b6..451bb8b6 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.9.5-r1000.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 6fb6baa6..9b6b0c4a 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1 +1 @@
-DIST qtwebengine-opensource-src-5.9.5.tar.xz 216767300 BLAKE2B 9c05c808d18ed27833b48deaab1c0a6d12a7fa17288a522a8aa04c9b06746e9d69ba06467297369353979844e94efad354a124e28dae94d3128e853a8218e6d7 SHA512 74aa2a36ba5a56d0870f5269f93b54c036fccabf60d906b5b0f0db38afb8582d8794be4025ecea28e4c5b8c4c9beda345e3c2b2155e77bbedfe688308009de2a
+DIST qtwebengine-opensource-src-5.9.3.tar.xz 217344496 BLAKE2B 51701dfa8a804ad7723d296fb8ba11df821041c60e4c96459b7851b3ba1ca683e83207c3020a5a54e401779186daf46049a1167649b930cc04151b6d0474aaeb SHA512 0db532b4d54540da1ca63de1cc4d561d72f052211535f75f60b99c1858ec0819ab0f831a3326d58da6350066748634000fe7ad0719ca545e12f3ed249a6eb90a
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch
deleted file mode 100644
index 8b739680..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 560a4a616f2a1307385e5e7a7d2e99b0b41775c8 Mon Sep 17 00:00:00 2001
-From: Viktor Engelmann <viktor.engelmann@qt.io>
-Date: Fri, 18 Aug 2017 14:50:20 +0200
-Subject: [PATCH] Fix improper boolean values
-
-jpeg_codec.cc contained some implicit conversions to boolean, which
-is apparently problematic for some versions of libjpeg. Patch
-taken from https://bugs.chromium.org/p/chromium/issues/detail?id=686191
-but not backported, since it has not been accepted into chromium yet.
-
-Task-Number: QTBUG-58482
-
-Change-Id: I2c5d5894493d6a7d0698a4e5a7191288a2fdfeb4
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-index 6d92637..85c7bec 100644
---- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-+++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
-   // tell libjpeg where to write the next data
-   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
-   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
--  return 1;
-+  return TRUE;
- }
- 
- // Cleans up the JpegEncoderState to prepare for returning in the final form.
-@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-   cinfo.data_precision = 8;
- 
-   jpeg_set_defaults(&cinfo);
--  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
-+  jpeg_set_quality(&cinfo, quality, TRUE);  // quality here is 0-100
- 
-   // set up the destination manager
-   jpeg_destination_mgr destmgr;
-@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-   JpegEncoderState state(output);
-   cinfo.client_data = &state;
- 
--  jpeg_start_compress(&cinfo, 1);
-+  jpeg_start_compress(&cinfo, TRUE);
- 
-   // feed it the rows, doing necessary conversions for the color format
- #ifdef JCS_EXTENSIONS
-@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
- //   set to a positive value if TRUE is returned. A FALSE return should only
- //   be used when I/O suspension is desired."
- boolean FillInputBuffer(j_decompress_ptr cinfo) {
--  return false;
-+  return FALSE;
- }
- 
- // Skip data in the buffer. Since we have all the data at once, this operation
-@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
-   cinfo.client_data = &state;
- 
-   // fill the file metadata into our buffer
--  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
-+  if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
-     return false;
- 
-   // we want to always get RGB data out
--- 
-2.7.4
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
deleted file mode 100644
index ef5f44ef..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix build with jpeg-9. Bug #646456
-
---- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp	2018-01-15 12:39:43.000000000 +0100
-+++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp	2018-02-06 20:55:37.455912163 +0100
-@@ -57,12 +57,12 @@
- };
- extern "C" {
- static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
--  return 0;
-+  return FALSE;
- }
- };
- extern "C" {
- static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
--  return 0;
-+  return FALSE;
- }
- };
- extern "C" {
-@@ -126,7 +126,7 @@
-     jpeg_destroy_decompress(&cinfo);
-     return false;
-   }
--  int ret = jpeg_read_header(&cinfo, true);
-+  int ret = jpeg_read_header(&cinfo, TRUE);
-   if (ret != JPEG_HEADER_OK) {
-     jpeg_destroy_decompress(&cinfo);
-     return false;
-@@ -210,7 +210,7 @@
-   }
-   cinfo.image_width = m_OrigWidth;
-   cinfo.image_height = m_OrigHeight;
--  int ret = jpeg_read_header(&cinfo, true);
-+  int ret = jpeg_read_header(&cinfo, TRUE);
-   if (ret != JPEG_HEADER_OK)
-     return false;
- 
-@@ -433,7 +433,7 @@
-   if (setjmp(ctx->m_JumpMark) == -1)
-     return 1;
- 
--  int ret = jpeg_read_header(&ctx->m_Info, true);
-+  int ret = jpeg_read_header(&ctx->m_Info, TRUE);
-   if (ret == JPEG_SUSPENDED)
-     return 2;
-   if (ret != JPEG_HEADER_OK)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.5-r1000.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3-r1000.ebuild
index dc9bbdad..ee253d3b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.5-r1000.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.3-r1000.ebuild
@@ -77,12 +77,7 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.9.3-icu-60.1.patch"
-	"${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch"
-	"${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch"
-)
-
+PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" )
 
 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 0e5bb720..dd69899f 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1 +1 @@
-DIST qtwebsockets-opensource-src-5.9.5.tar.xz 199632 BLAKE2B ac174f9b005ed2fe31395dae844ea5e331603b7320e31d0efb186381f41aa9a3a465eb1f339e1969c8914ae27e6ad494a1197676a6b54881a75af58d2278d75f SHA512 20a1a259fa41b0a743673d1af046b7aa655c375d2ef6dc34b9ea9958650f5288594519291188228b8531631809f21dbb599d333d2edc2c3a516fc0d85cfaaecd
+DIST qtwebsockets-opensource-src-5.9.3.tar.xz 199420 BLAKE2B 0c0ed7e193422ca0459e0f77850ddbc28dc0e16f72171476bd2ea33cf2809798811720cb927a6d2ed2a812e80d06d587d0d5cdf02b0313766237f6ff5415a6d8 SHA512 64eb131a0640229ae7553c0e8b9ec04a3f83862d3f48c38464928b8a7a9ca999ed0cba5b0fb91174a9ae8e8e3d6fa844a2aaf62a96b95fefc383361793f8b5de
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9.5-r1000.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.3-r1000.ebuild
index 4b528d5c..4b528d5c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.9.5-r1000.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.5-r1000.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.3-r1000.ebuild
index 300cfc74..300cfc74 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.5-r1000.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 6c9c19e3..694f92c2 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1 +1 @@
-DIST qtx11extras-opensource-src-5.9.5.tar.xz 76864 BLAKE2B 138db8967adf1aa7b2b6a24e2c569d9fcfcf16c46e31b78e6e927e5d363879b053f182c0ee04df14da9dbe37b414fd350f9eb95eeb0d561143c29c08b98ec577 SHA512 633f34f1ddbbcfc5cb01ab703a29fcabe5699f36c4d565020cfcb4bcdd9ae88588598d2431e93394645d929ab7511fee612ca432a52e75741b5e84f654df4d57
+DIST qtx11extras-opensource-src-5.9.3.tar.xz 76612 BLAKE2B 8d31d78c161311bcbb5b98b448e54b9c140c0851ec029f3a2642700ed9ad355c36fbde16eae2542c441759b39ab39edd91a17cb6f879401e36b0bd855a6e3ebf SHA512 0d1547e25f5d051daa8b20f54ca146bc5a6ad6fdae2c9b9e90dae574840a350bc3ac82b05ddb93b7a544e689fc06e633e57a40f31475cd118e156fad78e91d6c
diff --git a/dev-qt/qtx11extras/qtx11extras-5.9.5-r1000.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.3-r1000.ebuild
index 9bfe92fb..9bfe92fb 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.9.5-r1000.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 0381b6db..44ceaa0b 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1 +1 @@
-DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
diff --git a/dev-qt/qtxml/qtxml-5.9.5-r1000.ebuild b/dev-qt/qtxml/qtxml-5.9.3-r1000.ebuild
index cda700b4..cda700b4 100644
--- a/dev-qt/qtxml/qtxml-5.9.5-r1000.ebuild
+++ b/dev-qt/qtxml/qtxml-5.9.3-r1000.ebuild
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 9c1fc998..bfe2e47e 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1 +1 @@
-DIST qtxmlpatterns-opensource-src-5.9.5.tar.xz 1344548 BLAKE2B edd65de866be0aec6dd8da672bb6713b5384d09ab0ad074efc731ab7aca843882db19d678de75bc9f9662802a7164148f66f3b5e3d0d67c313049b84481e948a SHA512 ed4e335b474e76d05ea811b86b2bcaece9ccb6c9e358704ab974024593d40a80465dba48074ffbaaacf9850c0bc9844c0715c114e677c980ab3b39c65e79fd2f
+DIST qtxmlpatterns-opensource-src-5.9.3.tar.xz 1360880 BLAKE2B 52b3840c0351e305afa402520811e770979617274e1cad00e39d66b6fd685d3322fe0828347298245a7a519ba9bfb1e273f9645649113e43da9d495f8f672c57 SHA512 4b345940cc66cfd14de365f2802e49a3ad88c25a46e4c36765e31586728496f3bc5aa9a856a78b79b583e577a70dca5c70534d9689627773e142e9c7e421de01
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.5-r1000.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3-r1000.ebuild
index 5c174556..5c174556 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.5-r1000.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.3-r1000.ebuild