dev-qt: Drop Qt 5.12.4

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

118 files changed, 0 insertions, 2923 deletions

diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/assistant/assistant-5.12.4.ebuild b/dev-qt/assistant/assistant-5.12.4.ebuild
deleted file mode 100644
index ad1fb3981efb..000000000000
--- a/dev-qt/assistant/assistant-5.12.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qthelp-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	qt_use_disable_mod webkit webkitwidgets \
-		src/assistant/assistant/assistant.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 32 src/assistant/assistant/images/assistant.png
-	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
-	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/designer/designer-5.12.4.ebuild b/dev-qt/designer/designer-5.12.4.ebuild
deleted file mode 100644
index dd3e48ec9a90..000000000000
--- a/dev-qt/designer/designer-5.12.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-fi
-
-IUSE="declarative webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt_use_disable_mod webkit webkitwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 128 src/designer/src/designer/images/designer.png
-	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/linguist-tools/linguist-tools-5.12.4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.12.4.ebuild
deleted file mode 100644
index 9f4191f4c007..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.12.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtxml-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/linguist/linguist-5.12.4.ebuild b/dev-qt/linguist/linguist-5.12.4.ebuild
deleted file mode 100644
index b09b8354b377..000000000000
--- a/dev-qt/linguist/linguist-5.12.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist/linguist
-)
-
-src_install() {
-	qt5-build_src_install
-
-	local size
-	for size in 16 32 48 64 128; do
-		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
-	done
-	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/pixeltool/pixeltool-5.12.4.ebuild b/dev-qt/pixeltool/pixeltool-5.12.4.ebuild
deleted file mode 100644
index d6c1525a4c8e..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.12.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/qdbus/qdbus-5.12.4.ebuild b/dev-qt/qdbus/qdbus-5.12.4.ebuild
deleted file mode 100644
index 4e1b43628c58..000000000000
--- a/dev-qt/qdbus/qdbus-5.12.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Interface to Qt applications communicating over D-Bus"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbus
-)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.12.4.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.12.4.ebuild
deleted file mode 100644
index 7fa795f0a0a9..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.12.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
-	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/qdoc/qdoc-5.12.4.ebuild b/dev-qt/qdoc/qdoc-5.12.4.ebuild
deleted file mode 100644
index b7f1696614f9..000000000000
--- a/dev-qt/qdoc/qdoc-5.12.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	sys-devel/clang:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	# src/qdoc requires files that are only generated when qmake is
-	# run in the root directory. bug 676948; same fix as bug 633776
-	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 08ac2a9795fa..2ee3dcda515b 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -6,60 +6,6 @@ DIST 5.12.3-0-201904161302qtscript-documentation.7z 723395 BLAKE2B 19fa5dae06f95
 DIST 5.12.3-0-201904161302qtscripttools-documentation.7z 90350 BLAKE2B 1c66f210f85449e5c69638d989905057c7fd0893746921891b262ea7c8439b25fd77c76413c7e5dbf4283a3779c12cc5bc08c03268aef0b0b228f908b9fe261b SHA512 e3a00e9046225599d1a46247815355f55bbc5b5124a90d6040ac94b13e7ecfed2808948182e48a0c3854bbaf05951fa6c6e1a50f397bd58f3e779d1090ca42d3
 DIST 5.12.3-0-201904161302qtvirtualkeyboard-documentation.7z 2090456 BLAKE2B 441efc066138c3a74ea51d23f277b7190a38111494d05446d32150b6e36868c110893e14c16d65394709e3dc24574ebecfbe877bce64c6cd44564799b783e30a SHA512 6707760c1139ee66bc294f8407ec43057aac02593aef939c9e03138cd3874f02d5523f31470ac0ca90e320187feb55a8f23dad8396a4d62026af651e23e7379b
 DIST 5.12.3-0-201904161302qtwebengine-documentation.7z 3831360 BLAKE2B bf7277a93a56f6282c078665c7254266452d09f6495fd9dd8f22946d9fe55f774bdf012df15d43e258cdd0a38a49ba2dd3b350b150b2b480f5dda2ccf3f54eb0 SHA512 9102aa1392a6f87bf8be8e4ac212fca002c9a20cfdddfff0e7df7653781696cfd8d44edf52147b2e389796e05e7576c97bcb9f961c60979f8cd57fff974a965a
-DIST 5.12.4-0-201906140200qdoc-documentation.7z 547017 BLAKE2B ce523a09bfbf44afbbb94e01340c91638be0ff9e14f9c8a31aedda479af066ed176e1e312d4701722f6a52293af7d1ea757928cfdababf32deffc0c10c9bb80c SHA512 931440d7efa1b5538d58e03bc311f296ede96d79a6ca345d76be02cccee2459cc040d760a59452f8ac70c1585ef6919e08715f4c4d6b665a43b4d85a1c55b389
-DIST 5.12.4-0-201906140200qmake-documentation.7z 335940 BLAKE2B 5b26601e6f72b089cf5aec21449c8830ad86494528eac09c25776a24f810766a3da3e38b6ae7808a516f127d01844b60fee107d818a75ee07ac19df8599d3a4f SHA512 8ff9a8f8899e4c873e565ab755206772754e22b210127af765c2c30e77ba8977dbbd0c9d99fe4e8e178b21e7b5028b163b8e95202096ba3e323c5b8bbf4a91c3
-DIST 5.12.4-0-201906140200qt3d-documentation.7z 39586521 BLAKE2B 47eaabfdb8ccda408b576e561347d7b347db96ddd5beadd61fbcf87f3bb4d06f541901f4c37a8d5a5df55bffe8ee8da03ffc7cc601daa333c6317def2286e250 SHA512 18a2967f110fd67a5e93592d6957465a38283728f115ef455e1b390c46b840ba023be16f2e56bcb7292a66c3cd071d0d6f8e39c6f38d36c1f6b2cdd3c0dad828
-DIST 5.12.4-0-201906140200qtassistant-documentation.7z 1101798 BLAKE2B f3142970e6c9e1a9293ff64217d9a40a85a5e985070fbbe5764706500e388026048f4336e8dd2fa56235a9fa7b8653d6fdcf41926ea4ff55a28a48309cf610bf SHA512 29875f65e400eac39bd7831823a8ad86310e63eaf7f044d7886a036497ff94082fe46070404ffc662121591566ee93cc3fb25c7982793d97827f4cd8ff1a753f
-DIST 5.12.4-0-201906140200qtbluetooth-documentation.7z 2793274 BLAKE2B a8e3472a4fe8b1582b339e860fb6e5d0c6304614d441ce2de95668172f82da12cee58f55f6ce0f2ca516112b78c9b9578715b619d65a5412d1a782d67524e45b SHA512 0374ac103369f2532fe8248a1592e9ca038f4944a2d16a5d9b1c9845e86094f40f8d560bfc02c307bca09985dbafebb4217c4f77911a19d1f01fe31f587e253e
-DIST 5.12.4-0-201906140200qtcharts-documentation.7z 9255546 BLAKE2B 48d315a1400c98b13a38b0ee4f8b0c79cf8dbff76057b393acc73c7f193c85c71ff2555f558ffd2ee9ec76fcab8cef43b642c25fbecce0b4f9624b41a41755a1 SHA512 112d47d00b50216ca0e75cd3bc66e82a54cf6ab52b5a3312c58200cc54f8c21ebd518a431bc7db48979a9fc70f8820d22c0160edd2dac480426558a4e1842df4
-DIST 5.12.4-0-201906140200qtconcurrent-documentation.7z 159480 BLAKE2B 9095b8d22fd2c26992e4786e67f4450647f97c275d53e4c3dc46933cbd44886ef4d60bf5b5e56f0cd2ffacf8406ff9a6c7b954779c248cf234f35597627db542 SHA512 5aa10494d1d01fe7fb3c87c3f923741d23a03151464192943580b312cfbc42905a3c3a1d76fcb54543e3f19a5fd8ad8c685b1391f74b3bb2a94d7988300b0509
-DIST 5.12.4-0-201906140200qtcore-documentation.7z 6708808 BLAKE2B da7f2458c8e3ca9e3e7d4b55e6843b9bdbd50fd00d2d7733ca5724b0bd6925823c18435cfc05c312314ec6a5890727b483ae5a88cfc9aa5c56bfcf4d26be2da8 SHA512 4a1b04c8fbe50f7f3dd314dcb96105368017d9d809ccec68f6131bda5ca0b5567b8cec879c8006076f716f5e2e106f6f653bd34e7cf3aa46bb97bfa9d096ba4d
-DIST 5.12.4-0-201906140200qtdatavisualization-documentation.7z 8390654 BLAKE2B ccf71584e39296fba57334f69cb10069d232db28dcacceab72516245264f1fd57247f72c97f4485701e922ba8abed50fc2375096e9a5c10380cebdb7608c9882 SHA512 9c55876345975b0c5678ca42fb38ed1154f765296cfeefcef021b2b36ad7bbba3c4295586e8622cb63423eb7eb96dd3963c2798b112510c23a31a54b02a6c1a3
-DIST 5.12.4-0-201906140200qtdbus-documentation.7z 479677 BLAKE2B d8d73877874170e6e3e0ffe19124c3c8bf8f45799aecf3d71ae2ec1e7916bd090792907669999c295124650f71a05e68ff33e69020ced1f5215a6f56b25912d4 SHA512 7bb493a56064c22b9133d243c511b83370b9a59535d4425878a52969ea4bcc8bcabcb7c310823ce31de06218b6419df5af7da6ffa18bb67f88cd50ca0d0edc76
-DIST 5.12.4-0-201906140200qtdesigner-documentation.7z 4338291 BLAKE2B 787953894e0f01de11ecf65b1e491d5082439f7bc4d4b63f6f36c11dafe4ba833aadc9d795343e759f0f8f7695880a868c8008c703936bcedd1b55c7ec119254 SHA512 2210e7abc6ce5170f0bc41c3e6bc648fd6bfe4b6bdd3c0d233b6c9cbe909737b86a0ec3217a9ac8fa84bb774ea59eeb4ae8dcf33475a67474c8374d96b1e7e51
-DIST 5.12.4-0-201906140200qtdoc-documentation.7z 10115658 BLAKE2B 045195415aef085b1fc26dac924e979e0b4a5ef56f413ede5b80c6c08450fa182759c315e36368a5f58fc5cfffe307ba3a672b537acf14a6ed0ba6e68aa21051 SHA512 15b3e20fde3163f13efad2cf7d18195c8dfb5acdf5a2a53a8a1590486ae1d5c3a8009874128b1235f0e57b2d6dc07cbced4a688f5be48f14e454530f8021eebe
-DIST 5.12.4-0-201906140200qtgamepad-documentation.7z 784189 BLAKE2B 6d669c67f02ae18e41bdb57e53ca71ca28f56140228329322b266fdd86c80299fa88e126709a12b47a248d81cb6a98e5ba2143c194f7ef38abc195878258e9e6 SHA512 ca88402b040290bb0603a3f2969ef34f10b56ee4373c7a66a7971441901d1a380cd80e12f690d9557ad59e2b2719b000fcbe3bacb152c2ca9852582c3ba4b510
-DIST 5.12.4-0-201906140200qtgraphicaleffects-documentation.7z 15992690 BLAKE2B 11b398c962af72a6b0d29fd19e3a17830f577f988a8f73a2aaac34ebaf8e0ff768abe0cbe84c69ecd9e3f7c204eea85eb1f66aca07c2f4910bec4de75d62b065 SHA512 edb32bd58323a0a073837362ef1eb29b266077df85aca7f2fc2ad497b473e1e5ec993d1dba831ca0ea516104fd5fd6c11e38cf3619e528c96d7d317ec34e4865
-DIST 5.12.4-0-201906140200qtgui-documentation.7z 9032686 BLAKE2B a8fabb606aef389bb3da8ec3b163e7648ebe4f94ba5c9f98ca4f47e83c67098d28897563bf57058eda281f2a5b362972798fa0ce337c73c4721c6be4889f2c46 SHA512 1db1add888cd644482fe225199b4dcaa385213b292f185bb4a55ba8353366bf5e1b5f0964bdd0f7b7cbb5f537be3d8dad37d798c25707b82dc6be965a7222a96
-DIST 5.12.4-0-201906140200qthelp-documentation.7z 216698 BLAKE2B e1dd591e44b1f1ce59cfc1963c869cc2030764d346d9121e1bdc1c85622106212339cc60f8adf4b71891e0807508babc9871cf7fafa2cc4719edfb03f70bfe18 SHA512 067e619850dff0edacc2cbef74e34e95540985ef8216937799a71acd14238d0a42632fb54ee6dc1a995b6cb6a9162f3ef7703bd19197635d16110ba72afe80a5
-DIST 5.12.4-0-201906140200qtimageformats-documentation.7z 29235 BLAKE2B d9bd26434376f80bce22345e5fa683f16f1f9da95bbcd6e28373b9b146f913903ec91c20bcce6c77b0cae60da94ebcb53c8867c404ff6ea553f20ef2e9b546a7 SHA512 96d77eb994931a8eac5bbb0ec3b41e1661791f4e7eb9cc19c918adbc44e2d2a7ffdfc792908ac8b71ac533ede4494377d436edcee2d4c13e132d64c753af9d32
-DIST 5.12.4-0-201906140200qtlinguist-documentation.7z 998582 BLAKE2B 78250fb9fde324a5a6f185f140cf68cc480c14a8595926a005cff808de89a80a063bef340458224e98080b0036e605b19305e62c4e855014a2dcec223aed0a27 SHA512 fa252a59a0991268b6cf7e5e8d4737574d65809802ff835e44d643c9705dcef211f1c0a28331589cdc369cb1cef2dc70cbb7b8f77eb7866d1ca52a79f1b61295
-DIST 5.12.4-0-201906140200qtlocation-documentation.7z 3212202 BLAKE2B c69e81cd65b6d80acabdaa89fec4b83ded6e77f96d1c797e68b7b22c616c2a0cea173b27fb41e7d1cf9b0936e31dd8d1e65ead960ca3912060d2d1a579ad5a90 SHA512 b1dd5668b9349e87bacaa684481660433f5de68bc27e8e9d93a56b5ecde5d21571f0eab4d799f8b7e40c6914fc82bd290227bc09ba42dffc59c2ab3d67c30090
-DIST 5.12.4-0-201906140200qtmultimedia-documentation.7z 4272883 BLAKE2B 776884864dce297388a168760593e3e1c5293afad540a7cfb3ad5a8ba64ad3658afb1065143f6b49589eac4e2db940e1b1920215e3c77cfabe472c17546252cd SHA512 e7ec99cc30598d4fa8567c8a1603557626d7f60cb874ebd3172770bba2d189f657d001d870dcddeba9274a99fb4db719341bf25c970b0c0ecb6fd6cb05a45137
-DIST 5.12.4-0-201906140200qtnetwork-documentation.7z 1988517 BLAKE2B 36b9a84c3e63731caa1347806fed56a4acdf14b7debb1fe790234d8338d769b19dc7bb13d6a44607bc5f8627f270da989aff75d4439c729304c05175a0ee52f1 SHA512 1c58b0442e7541fdc9fd6ddbff21c754fbf72f8fbebb114557f3d7de5d0c6b61e9c98393d789aff9257c2952d8ade11671a6d8294acb2416e966b9d0ad93626d
-DIST 5.12.4-0-201906140200qtnetworkauth-documentation.7z 300101 BLAKE2B 0e92e16e9d44277f0d384d8d10d4308668f0347049dff74358636d323028b92bef7c651fb973642167b5aece8e1d683c39be7be893acdecb1cc6f281e3fe7330 SHA512 ca772ea3e6cafe53ba022ffbc9ff1a0e13ad8c52812523aad5b80be838d8a73a6a473e7503b919cc9cca85a25ded685300f4161a1112b24d59530202b8f524c3
-DIST 5.12.4-0-201906140200qtopengl-documentation.7z 1034185 BLAKE2B 23c1ef83bdf2d4274279dbd1d1ae14cd9dfb4df110249dadb2feb51aa46a1f51404cc03dbb0c5c999be0c822e17aa40925a0d8bbf17074231a7395801f85caa6 SHA512 4e52ccc9b8dee64be882a605ecb61ad77ce3338769d04b0939bbbaf080f2e92958644c1e334c088ac75541e84c634564f22a24bfab9ac0fdf35a011931019857
-DIST 5.12.4-0-201906140200qtplatformheaders-documentation.7z 78010 BLAKE2B a0692263b849200f1c92b9d7e0644827df98d7e2c55a4ed4dbcb3ca964449a260c49aaf9f3e535449979d7e23c40024feb93a1edb1693e5fb6e8b6448a53c59b SHA512 26719aa3dd3c67d13a4c7f7074e9919a7e4cbb9f698e4f4c10e4b4d543808cf7d8613a41203379fe43ddbb6aac2362fe06f3f726cde08bd3ecdbd444afdc97fd
-DIST 5.12.4-0-201906140200qtpositioning-documentation.7z 2366865 BLAKE2B 4b048305e438da79330593e5f725b56bec352f81f6e361d46021015eaab812b6fd9cb62fae0275d83dc15c4183089720c8a6dd594480126de16ec5e3e66fa712 SHA512 97136fc5588160f05a3200bbf7e5862455197b3dcd279ac0b6e8255344a4f8be95fad80050c334c88f901255b1dfd828d6c4617e6cad7d53d6c191054c0d1642
-DIST 5.12.4-0-201906140200qtprintsupport-documentation.7z 390130 BLAKE2B 4b37dea1f7288369846e246f20bd4c9cdbe72a520ebf3fe69868a93b19d9726acd948dcca113668aca5c739c8043e301d5d659a4242e6860c4f8e57e4225bc7a SHA512 b8d80894d2e790937d5b403f4b1d342461cb417ce6494548fd587a1910db03c1e34b45480e377b1b317ecc813323128c3f9a23caea474764bf14e496fdf99056
-DIST 5.12.4-0-201906140200qtqml-documentation.7z 2110776 BLAKE2B 67d5e467b9b7fa5c4a8f05b32463fbe3eb34bb79c982871632bebe4b8723769c32f6c4189054c5c5e5c3d02a76fd46e23c5ca7bd7f9ff28810f5984e07c2e042 SHA512 bdb6940105aabcd3eb7cf036abf7f68dd1b73cc2d06e59f394c00868cb9034ccfb8775d16993a81bfc94e784db4886e60458f41de43ff739656f8446de85074f
-DIST 5.12.4-0-201906140200qtqmltest-documentation.7z 30411 BLAKE2B 5f5d49556acbcc93351f6982faedea7fc8cc0412b4561b3c0ec677a0fb3abc56ae83407c7e03281c2b2132378bbe9683b0156a17658ec901cb1d6945262bc8f5 SHA512 227b1b492c8fb3a13fb4142774c6232f2b573c339371f35700e6ebf54da8885659a16e5a5fe354a956d20023c484e41f1017b303b117b0fcb169e69394c30f68
-DIST 5.12.4-0-201906140200qtquick-documentation.7z 21057807 BLAKE2B 2e51230e369b34792ea2c1bfccac71c1983b9940db1602cb5008bf4b6692cfd2297cd86329b8085ee4cc782ecce0e6e1eaee19c4aec185db2326a3de3323a2b7 SHA512 42f994a678d50294676f673c9dd920b9cfd6a6c5e43e7b0d14f86a119ce59dbc1739481bcc39e273e4eed8b1be9ba93d1f8a9e1bae2b514759ca407d04e67cbc
-DIST 5.12.4-0-201906140200qtquickcontrols-documentation.7z 14919105 BLAKE2B eaae742a31d612b9d26cf95ce17aab0941e612cd046a2f2f3c9271a6e03538fb0850bd6cb5aa496507cce55968812bdf5d263e1e3d65c2dea4b8b57423731ec1 SHA512 253e6f79e7ab94ba09e2a1ff36f6c2d742838f9a16286db7c010ab6bf5827a3ab9e9c945928bd5677fdd191f4094ad57d5fd7f717b89bf215b5c780d29c486fb
-DIST 5.12.4-0-201906140200qtquickcontrols1-documentation.7z 2230127 BLAKE2B c755b08c1c601baece00ec247b62ea16cccf73062227e87f0f819cbf793e0e0cd5835431c18134a5631761842506be8e5b80fb433bf28ad1d8d4f224477aea91 SHA512 ae24133fa5e6d50bc565a235371baaea25a080964cb2f75ac75bdcb52cd698ddefa615cf303d1ff414e6c570628b886f0c150e69032198d0c57ea5b06d5be9c7
-DIST 5.12.4-0-201906140200qtquickdialogs-documentation.7z 219721 BLAKE2B 7a78b7a4a67507136055374a7c37d12b2c1a253c34137ed94d51f803af493e9cc86a226106fa9e88d8227594f96d3b246b99a2b8f69e158e9d85b8a70c37fcce SHA512 fa710433b9d94632d73c92939621e66ce2930a9b5114fc7fc55f27c4a14da9147f5e515d21c11c56b7d08e9680e1d5effe7cf2914c8f5f900a7afbef9433a5a1
-DIST 5.12.4-0-201906140200qtquickextras-documentation.7z 5719477 BLAKE2B deba1322e167e158f8d2b5ae9dda7db815c2742297dc1164317c62b66963a1ee00d7addab82c326e768a16790be02ecba6b6e0da1d9523c718ae9a1b75db397c SHA512 202cb8c354b907790e17ab557c4157a71dd8bae01d145504bc1a0f18648663e7b01fec915ce8da72154b87e4b263e652f07ea8e1121b9ecd39aafb307747c58b
-DIST 5.12.4-0-201906140200qtscript-documentation.7z 723590 BLAKE2B ce75743d29af93003a97e739ec830d9ad88457d65fa2c3565caf4fb85995b9929a8ff690c1ca96fcfc716ced9154d738a0fda3e850b2fe49357a18a588dd87d5 SHA512 febacfe841dcfb22cbb2b20c41b432e553f7dca88bc33b92c40ab3de2be87475e362a5ce029ff4b36ef2f6ccd3da3a45daf5f478db5105100d51855c057159a6
-DIST 5.12.4-0-201906140200qtscripttools-documentation.7z 90331 BLAKE2B d93039b8a7e7108aaf5e674ae19e4f3bfaecd3f4ac7cf931a3290ffc24968a42d2ced0a83030eeeabb3b380491762543b7bb59a7208ae0b31e409a5eebf065bb SHA512 f8a884099f26f8177b5dbc0c1dc06f320fccad3ef403c37526a5120d9c1568eea974912a0f94ce7340c29a246185b1d9406231ffa3ed5552a03283adb6943f70
-DIST 5.12.4-0-201906140200qtscxml-documentation.7z 817461 BLAKE2B d96126a5774477d8fcd9094fe681c2bc860f9d190761892b63eb70ca8fbcf12a831bfbd285bed294da0c687c652ece2cadfb12d5fdb6b56a5e3787213f750869 SHA512 dd2da573cd36960525ed67a6abe99f5b75efa4c674b12665a3d21aed2162b54832fb395a4806331e0ca597b6ff026ee7b31025edd98acd47f25391965d159fa8
-DIST 5.12.4-0-201906140200qtsensors-documentation.7z 3732163 BLAKE2B b302e90aa9be9c2c182e5c3ec7cec04f8ca044ac16730822c0d8adda7a880d6198af1d86a6a202ff4cecaaf4c466c627533914080a84daa57aa7a0beac5a2444 SHA512 f1c0fd6bf7221f7020e85c87fd5f63845c07d28c86412dea827bef4d78a479d154e441aa477962c1a9797894ef1218dc07b4b0a0568cc0762ca3f06aad6e4272
-DIST 5.12.4-0-201906140200qtserialbus-documentation.7z 609459 BLAKE2B e174daf8d87d57b6ff92934f1ba94433699adffc864448999ff05d9936cd9223a20effa60ea1719c657d25accc882e8b14d70cac4e1b8293b1d69e287d119a5c SHA512 9871902b3902a9bd3a06cc984088e4aeff4ebf96811019b80c87851da6636cda6f5b4b6bcceed968580979f6352f91045cb73b7ff5b2647705e35b5b43ef3474
-DIST 5.12.4-0-201906140200qtserialport-documentation.7z 507245 BLAKE2B a9df1c5fc8edb0bf31ee08698b34b401864853d5aa1e37ecbdffd770947c7ad1ae8e3594d84404d128886d319d2c267a062dd83e9e195b825eed4e5e8a3a252c SHA512 b0321bb43062326e0ae3c8f856874867dd985cfd648023dcca44e67351cfb8baf36fa51e362cbf9837247261a5ce8998302c440aefbc9463eaaa8e0f655392fe
-DIST 5.12.4-0-201906140200qtspeech-documentation.7z 157965 BLAKE2B ac962332138e7fa86e80bfa239dffa0e0767189a7ca4b7502a4d710d7aad2797d3bf87f28b6d0fdb5d5e19eecf24ed33c735c56d64f50802d705727d937dceed SHA512 d82541c572df9a5821406e8f4ef12c505f5f3da07fb98d9e54b0d32c3fff790725b91cb77de2096a7a6b06ed4bd27ced0a3e5c95e96b91a5014d4f0c6536febc
-DIST 5.12.4-0-201906140200qtsql-documentation.7z 1285172 BLAKE2B 0e97c0245a584f32156a678a9d681e1491a30e5c222cbe740d3c27dea0df2f464b0dd6173d853752155855e1769e7b46ab20eba390d77ba108dff4a69a06050c SHA512 d0fa7230d8b83637267b669124176aee33488da9b1f846e9ac249f00e7a8be84d47fc010cdb89ee0689077cc8a232cbfd8c07dbf84d579028f27a91f75454276
-DIST 5.12.4-0-201906140200qtsvg-documentation.7z 346046 BLAKE2B 06c355382fd96d69c52699a4e9b0a09c8f678f18ddc9d0d3bc1921f200d058f677532627ea27d74b6da43aa56d801a0688f61951d866a14edc79a51b392438a6 SHA512 56ba141eb48c80131f08d2dbba04fa858d71e13c5e80b8269c30007057f6ef2342037dd87583139214fbef4f2c2b4d0c37c335b6a0a607dc88a9fdf249c458ff
-DIST 5.12.4-0-201906140200qttestlib-documentation.7z 210495 BLAKE2B dc350ac9b06e9d05de5bf64100d0331797aa13e92bac13294981158200b0ba39348d171d9a50284820c6e5d99874eed64ed5e8e20c0fb25359669ca7b81c280c SHA512 d83f9bafcbee4cc5472ba7c3dcb3b99e064fe544dc87b66f209e7d27b7bb6b1cd9d426bc857a5944a4ff7a7e3638c10935f6c2a204eade44beba0286730a6eb3
-DIST 5.12.4-0-201906140200qtuitools-documentation.7z 188198 BLAKE2B dfe11b7fbd1c77d63e5a58c33d45ce647d815336bc2058476c657a9c0c53ebf2f297641bbbe87c07b561ba46b48721fcbe92e03f07971cb38d69584cf1f86aaa SHA512 12fb9d2537078f3fcd6255c5affa339fdf802f69b27076375592b183e871bc4f2342e58ec6739e9a796f80d6fe228d563b1f20b517426619cbf083e2a27df1d5
-DIST 5.12.4-0-201906140200qtvirtualkeyboard-documentation.7z 2090699 BLAKE2B 3a8eee02559dad0e3099ddaa1927245dc09320dbdbf5d9eb18713be5f8fd3e0209518038ddc558d6c4fb759cb75175527963eba59b1a77b574a2de66a66c8975 SHA512 9ccbe7d735157d933298fcdbfbacb64ed53959468322d2c4928f1b2cb0b8c5cbfaa94e48ef47ca6f45c0d60024e4dff94c6b32e438a1b0d6c5b3f49dd4c226e4
-DIST 5.12.4-0-201906140200qtwaylandcompositor-documentation.7z 762093 BLAKE2B 956aa752107a500619561b26eed2c24b9385068089e5b6e748a9da42c838f2d1ce9024530a942182277e5ff8fba58a7dbbb3cdfeeccf2a574dc88d94e7824b9c SHA512 57c16edebda27dd54233ee3ce30aa678303cfa0605acbbd401c497df0d60f9df9177907e39e1fa3817186f24262495471f0748b50f5aa353d0c7899f7803b573
-DIST 5.12.4-0-201906140200qtwebchannel-documentation.7z 217422 BLAKE2B dbc0111ab7ff779efb4341bcf79ccf1c1f13822e0979ba98365262a5ea0954fc784a3703ffbc7d93d5bc06449c8c1dd7b3ef43887cbcce3c53fe7b01839052c3 SHA512 dadcb1b1a13814384dfdf83e8f677ac9158a5ef3d61f5d986f6d2e0df45a673a9455d10a4422d4b3cc4acdd35c91d6903fdd4767beb4ac3fd31635885fec48fa
-DIST 5.12.4-0-201906140200qtwebengine-documentation.7z 3924175 BLAKE2B 18110b7b0126a46d7e343f3d01ee928bc181114d88a6bc53ece8035f4b8911bac537dbb8d25037042c338b53f2d040f86a53bb1dc03a7f064456171c1fd3e806 SHA512 898d9be1794c0d8cd07fde9195b54a2259e2f3ccd3d92ecda0e39a1b6afd82f51bc613ff5147f1c0a6b6873dcbe822fbda1325b89d5e99e3b121a6251fbc60d8
-DIST 5.12.4-0-201906140200qtwebsockets-documentation.7z 391563 BLAKE2B a9ea3a0b9efce8d9efba3b5c5428170790a66eeb0ed20f01334a20d847d856bc1bbde7c854aa91716b83ffa81d01fad054528f53f5891629314e3c03e84c13de SHA512 e8142c65716ec78af74428beae35c9cb20b8941769dbc06840dc1a09e6e29e305d6eb7f7be9c62a68d8aa7bfc619c6da2d84320f4bad7b8e69c99711176a0d23
-DIST 5.12.4-0-201906140200qtwebview-documentation.7z 142972 BLAKE2B 258469e38442ab513774add1de8a7b2e920f6ebb72f2d194fe0dfa2d21505d1180f20671b3627597f7c5ecbfb488f82c387bbb40491306a2e88626ed78f31f78 SHA512 d66f65d2e263eb98be8d2e2896356d674814eda04ce1c15f6c5ad6276662bd49d1efb04f98f9c34414c1d876e5a70ae14e0c3ab3c69814b045ae46ef3b89936b
-DIST 5.12.4-0-201906140200qtwidgets-documentation.7z 33151839 BLAKE2B 4897d74422c68482da615383a4d906a8d0c2c1175b52515b7fec77dc213c299b1e9c5f4e45f460de9e43fa832ce6629dd3dc61e87e499a68dc9e0d12fffb9c51 SHA512 f072a069825beaf46747c29833a53ff2802fd2da30c2a4ad64410251e0caa74cee49587f96bcd7a59001316cadd638942dd1b5e88d3ffa703e8f38008b3b7286
-DIST 5.12.4-0-201906140200qtx11extras-documentation.7z 37019 BLAKE2B 3c8163e4e7dbcdfe5e23c7c086ea47ec55e43ad6abd2d7220d33e6d05536ba6c889acc41c8acb6acef70ff90ea526b45bc12a043c916558e42c939d1397435dd SHA512 4601b86fd7eab0a73524a132cf885e6a27df616fb0d87ef37ac5e58858e2f6596f04ebb4ad08e213908d8e6e26a017ec7159560d53808dfecd3e2f2160baadec
-DIST 5.12.4-0-201906140200qtxml-documentation.7z 581086 BLAKE2B eb4bb19c19a434ce67370d50d41a74d215daee899484511b75f0020cc5983a50b787302494c3a7cf3bd4b1b8a4602b7497cfcd327f1fd5c6d9a26724e464a586 SHA512 2678d0a6a3cfb0292335940bb761c14ad64f3f244823f766f331bd7a0cec677a60e90827bebd347b9882b09ec816b6a9a25ac778a0cef51bf4d9b0e6b5d5aff8
-DIST 5.12.4-0-201906140200qtxmlpatterns-documentation.7z 1247517 BLAKE2B 1b18a079fbeb40155fd8d4b5d926ddf1dbbcc79dc36392b32a9127eb425796c559e293a0b4bf6773dea3e0866954e15b2fa9e70fdcb853422c3b58108060ca3e SHA512 00cc421a0737c91a7006adef1135c7d707d7cb720e5d1870035aa00411c1dea6d960a17898ff9c64414a4bd824d709fcaed3e9b49d6cfbf613ba8d8856f92625
 DIST 5.12.5-0-201908230013qdoc-documentation.7z 547195 BLAKE2B 02d43752c15ef11f6c404b3315206011625798d1a30ce1784d94c349468de249ab0c1a59b3056aa73be8ef8cb8c5e3c2864215cce13e3ab0db877030b26f76cf SHA512 71aa5749a37c83388eb912ec4ccc1cff225bf7f5805461dbe1862107d4c8f847e2486259ab21ddf3954573fd749c50bb911e486b6070ce0a547fc4174272ea49
 DIST 5.12.5-0-201908230013qmake-documentation.7z 336280 BLAKE2B 9e29ee3c42c7d7f19679e34f9ef3fd7bca83303a2968cbb1caa17ca21fd0905b726c55d90a0dac9c235d48dda1dcd1f78dbe2d5b4289124a42669a8a0e80c7fa SHA512 c48d5271e5d7f1ca96e43d111dca52af064a992434b420fa74337d67bacb5a2a9b6b41d7082e1b21c38bc0f821e874b1d5db4a7adfd4f97f1ea11a29723589e6
 DIST 5.12.5-0-201908230013qt3d-documentation.7z 39601379 BLAKE2B 5269e50a5535820f0dda3ae25b3791d1564f9f62ee36fbe6f35f3abf43219bcc7492b53e9a8052f18dcc9a66a743fc555f4fa389654ded20aea9892e453d2141 SHA512 b9784a2230799ed44c2863451d508404bd6cf328735888706cbed271989c3c7202368ddefdfdd66a193098a9eb191715849498786ae90f49eeb6d7f1e5784e9d
diff --git a/dev-qt/qt-docs/qt-docs-5.12.4_p201906140200.ebuild b/dev-qt/qt-docs/qt-docs-5.12.4_p201906140200.ebuild
deleted file mode 100644
index e2850d500dcf..000000000000
--- a/dev-qt/qt-docs/qt-docs-5.12.4_p201906140200.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PV_FULL=${PV/_p/-0-}
-PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
-BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
-
-declare -A QT5_DOCS=(
-	[3d]="qt3d"
-	[assistant]="qtassistant"
-	[bluetooth]="qtbluetooth"
-	[concurrent]="qtconcurrent"
-	[core]="qtcore qmake qtdoc"
-	[dbus]="qtdbus"
-	[declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
-	[designer]="qtdesigner qtuitools"
-	[gamepad]="qtgamepad"
-	[graphicaleffects]="qtgraphicaleffects"
-	[gui]="qtgui qtplatformheaders"
-	[help]="qthelp"
-	[imageformats]="qtimageformats"
-	[linguist]="qtlinguist"
-	[location]="qtlocation"
-	[multimedia]="qtmultimedia"
-	[network]="qtnetwork"
-	[opengl]="qtopengl"
-	[positioning]="qtpositioning"
-	[printsupport]="qtprintsupport"
-	[qdoc]="qdoc"
-	[quickcontrols2]="qtquickcontrols"
-	[quickcontrols]="qtquickcontrols1"
-	[scxml]="qtscxml"
-	[sensors]="qtsensors"
-	[serialbus]="qtserialbus"
-	[serialport]="qtserialport"
-	[speech]="qtspeech"
-	[sql]="qtsql"
-	[svg]="qtsvg"
-	[test]="qttestlib"
-	[wayland]="qtwaylandcompositor"
-	[webchannel]="qtwebchannel"
-	[websockets]="qtwebsockets"
-	[webview]="qtwebview"
-	[widgets]="qtwidgets"
-	[x11extras]="qtx11extras"
-	[xml]="qtxml"
-	[xmlpatterns]="qtxmlpatterns"
-)
-
-DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
-HOMEPAGE="https://doc.qt.io/"
-
-LICENSE="FDL-1.3"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine"
-REQUIRED_USE="|| ( html qch )"
-
-SRC_URI="
-	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
-	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
-	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
-	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
-		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
-	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
-	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
-"
-
-for DOCUSE in ${!QT5_DOCS[@]}; do
-	IUSE+=" +${DOCUSE}"
-	for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
-		SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
-	done
-done
-unset DOCTAR DOCUSE
-
-BDEPEND="app-arch/p7zip"
-
-S=${WORKDIR}/Docs/Qt-${PV%_p*}
-
-src_install() {
-	# must be the same as QT5_DOCDIR
-	insinto /usr/share/qt5-doc
-	use html && doins -r */
-	use qch && doins *.qch
-}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 7d85668cad32..800e2fa4cbe0 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,3 +1,2 @@
 DIST qt3d-everywhere-src-5.12.3.tar.xz 84941692 BLAKE2B 245e62dad28fb6c5e75cbefb5153fb139c8b4114fdfebd6987f82b5b2b627614d1b444bcefa002d09dcdbbb6801cace6a9ae56eac99e26d15794ff04e75ea675 SHA512 679c2dbc60fc53c1c5469369f25244bd844c2e6e723a1b451f7cbb50bfa018e6fb715214e5a5df6fb32d7c7936bb6c99d85e299fe2b76344bcf774c93ed0acd0
-DIST qt3d-everywhere-src-5.12.4.tar.xz 84960856 BLAKE2B 3e0f32facd7b500dace5d0240ec1f5fea8b2049910073e9d5e9f29169571252ae3ba7bcb006abc20fa1d097d9e99eb7bad2facab6870a2bd0824b66b9be58b5e SHA512 aa93d3661d092dc020e7903242964b7daba1e42882deb0d5fd45abff3c11e971f49a497ae5a1b7420fd497e6986daca4da0a217c94821ef8432cc3d8c617d291
 DIST qt3d-everywhere-src-5.12.5.tar.xz 82075068 BLAKE2B b842d9f8bef8b70a5a9ace52d38b3aea78dacb75c589019c224204309b9eb0bf1899cd0e26c84f662a470120c7430f33de70dd7ee683e7b8122244dc9231db0d SHA512 8cc23417b4a41bf9d19052e05c7e3be8773be062f1f5998a7784573ef9c35a04da50ce67a65b3709065bb3cf243aac8ede4bea60f0420a5400cbe6c9c7bdf05b
diff --git a/dev-qt/qt3d/qt3d-5.12.4.ebuild b/dev-qt/qt3d/qt3d-5.12.4.ebuild
deleted file mode 100644
index 0f61b94290a1..000000000000
--- a/dev-qt/qt3d/qt3d-5.12.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~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 0878932e9d46..f4eaf879494c 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,3 +1,2 @@
 DIST qtconnectivity-everywhere-src-5.12.3.tar.xz 2750144 BLAKE2B 1c287d15713fc2155cb5b07517fdedf566a686601681efde84b096f8e052dc36a872a8c9d263d54ac38dee0c69b8966f877fd698144b5ef897ff290a50ee0aa5 SHA512 4da406d88c3cf216d53c524d3896f50b19dae124baec904233dbb67163a30a955dee29148b5f5b71c35cb28638912423bb1cf4d38c62aeefa7353bd29e97a269
-DIST qtconnectivity-everywhere-src-5.12.4.tar.xz 2751984 BLAKE2B cdd7bd33c63ed38b68852f1656cb8baf7028d845b4d42c4a16fe20e655c8665f99202f194686661aec237415c7cd474e5b0e81624a25295e3c74ac150f8b41c4 SHA512 e1076c5883f29cb394d9929a52c3bfce97952cef11b1f82d1fcca59440354d1a29ab19d628f6359ca02f3318fb526b3ca78d691af6dc0f4c06741b2306c8e571
 DIST qtconnectivity-everywhere-src-5.12.5.tar.xz 2752252 BLAKE2B 0e2da5249206bb7064b65d1c7ed0a9c2be6e44908102e9b421c0c03a3cbb5eb895b538b0b32f6b48ac9ade548ada83103d4ec9b654f397d57d27d3909d282dc5 SHA512 96cdb27aa0e439094e3f1de0c7a680973c3ce2c65bbbff38affe25a3708c9e4e3c1c6a403d698303f77a5f261b44ac657e01a769b62a1565e0a8c64c8ac80bd5
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.12.4.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.12.4.ebuild
deleted file mode 100644
index 6f8451cd6b64..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.12.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 12a8d3fcdf08..c09937a6e6f5 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,3 +1,2 @@
 DIST qtcharts-everywhere-src-5.12.3.tar.xz 4242512 BLAKE2B 5e2d2c5cb263aebefee409087176db55b31405dabf7e83d075c78482a7fe956394f8f2e3e6ff2f6a321dba2f7b867d35e95b0b2f1ec8ec832905f52952696ff0 SHA512 f5940589c7a2dc5fcd3484397613f13ab41311c8ffb70a3484e64dc5bad24e18c94c9ebbe6716c1ec7c81b7863113ebfdb593f2d194608b2e3fb0b0b5c9c9102
-DIST qtcharts-everywhere-src-5.12.4.tar.xz 4242592 BLAKE2B 827252bdc35739146b67e34cf732f8ebea6a23321a7332ec0e4f63518fc26f31335f8d7329895bd6647405350028f594bfbdc021c6e510cbf37bf31886fc8267 SHA512 d9c46f59d15377098427647cbd3c3fc2d7ff33fb9940581360db3be5e895b50bee0fe23a41c0af6b157e905b04b1bc13666c1736b047a405b21aab3a2bdbe60b
 DIST qtcharts-everywhere-src-5.12.5.tar.xz 4243464 BLAKE2B ad1087bfa59aa69942a4ac5346b1484ad2d1e44a03ade42a7e8717f25b8a70fae46d3f0342a78a10f62d75b15f8a388ceb9b4594f733ef4b1346f142d352b43d SHA512 a3ba8c6a606430cd87f85661116dbb2692e0bb472f0a73310aca1950f4437563d04ee950437a48a399b1a4881dd264cd1e6fdd4f30b6c3110704ec48d1467da1
diff --git a/dev-qt/qtcharts/qtcharts-5.12.4.ebuild b/dev-qt/qtcharts/qtcharts-5.12.4.ebuild
deleted file mode 100644
index 44f40be187e9..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.12.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.12.4.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.12.4.ebuild
deleted file mode 100644
index eaf03f74aedc..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.12.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtcore/qtcore-5.12.4.ebuild b/dev-qt/qtcore/qtcore-5.12.4.ebuild
deleted file mode 100644
index 661a57a24435..000000000000
--- a/dev-qt/qtcore/qtcore-5.12.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/qfloat16-tables
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		-no-feature-statx	# bug 672856
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 967810c04c48..554e2e950abb 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,3 +1,2 @@
 DIST qtdatavis3d-everywhere-src-5.12.3.tar.xz 5200668 BLAKE2B bbcc3b21c9f604c16c862c7e7fe1b3a3d7f0d1f4b8a0da4b67e56d6912e377d1496f7a399a94cb697f117ae23123b3d6370b47c4cb7223ff8af1b584838c588a SHA512 cb295deb9aa33132294d7d7f4daaa53dd9ab4815e2d3a2c916d88e1882e018a49d8d66db9088f69375d8da759a3f3566f251802aaba82d74cad2eb45d9bbbcff
-DIST qtdatavis3d-everywhere-src-5.12.4.tar.xz 5201284 BLAKE2B 17944f903ecd80c10602706c8ca92400122386bcaac879791f00781653c4108ac107ea1de9131ecbefc19d9245617c212c93320cfaa4d4b74c4df04e71905f1b SHA512 e5041e4b666fa4e7ce8b12fd522be3ace144b43bf68fa2d45add67dfc6afc6e5788c5fac5eed81e9fa631cf6d372ce0aed8287fa139488406612322e5fd7e550
 DIST qtdatavis3d-everywhere-src-5.12.5.tar.xz 5200204 BLAKE2B dda8eacb7955b39c00abd10577a800186cdf0de3fde97f2780357b4cc13c4e97dbc056f1f2616de03d18f7a487886e0edc6aecaf81c18e9ff8e006b7a5287f39 SHA512 7911d911678827ca4a704b824b8841c8e8508484fb83265d4d05e64787ac1184387b9ed0870090b3233c736f5e484adc7776ba12a1173da0fceeaac46845c6f4
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.12.4.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.12.4.ebuild
deleted file mode 100644
index c68634fc6eda..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.12.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~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 a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtdbus/qtdbus-5.12.4.ebuild b/dev-qt/qtdbus/qtdbus-5.12.4.ebuild
deleted file mode 100644
index 6a6570fb4862..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.12.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 2a0f18c7acd4..d6f9ca98c70e 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,3 +1,2 @@
 DIST qtdeclarative-everywhere-src-5.12.3.tar.xz 20513544 BLAKE2B b6c622cb4728d54d0cf382a5a50af4652755ebd1f8e7ebc8bf07a5f3e3355931703ffa443be11dcf36a132b2f3eacb5fce150088209d173f2ca84bc387096026 SHA512 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20
-DIST qtdeclarative-everywhere-src-5.12.4.tar.xz 20502292 BLAKE2B 7945a7f62a5bf792f6706e0ea6544e705d1c796a597ef94020bf3f142a6e8f100a2eab3e7e6fd63514af23c5a0c3ef3cd9bad1c7271811752b864f394eba2c60 SHA512 953b0dac76b73a7a21b393ab88718da12d77dfc688dc07c55c96ea1658bc14acd9097bef60df4a95d2923d3fb1e02b46499c032aa53844d4fd344b0037514671
 DIST qtdeclarative-everywhere-src-5.12.5.tar.xz 20512492 BLAKE2B 3e8175217bb9e654db8c57cee55080ea630452fe8c225db5350da00b5fb6c9cb6269b075939eab411cd750a1a431a423522c1bb536b2a1f708bd497d90817301 SHA512 026c5024c06e44b6e91099d1ee912f38017f314ae0125227010d25d733447c692299cc7c47edc1a4bf39366a9c9c9fe77d3a249905f2ae982d0725317d824b9b
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12.4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12.4.ebuild
deleted file mode 100644
index c208c86f7c04..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.12.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-fi
-
-IUSE="gles2 +jit localstorage +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2=] is needed because of bug 504322
-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=] )
-"
-RDEPEND="${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
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/qtdiag/qtdiag-5.12.4.ebuild b/dev-qt/qtdiag/qtdiag-5.12.4.ebuild
deleted file mode 100644
index 11ddd15e1ab9..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.12.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="+network +widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
-
-src_prepare() {
-	qt_use_disable_mod network network \
-		src/qtdiag/qtdiag.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/qtdiag/qtdiag.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 810a050c0f00..65e993a4b41e 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,3 +1,2 @@
 DIST qtgraphicaleffects-everywhere-src-5.12.3.tar.xz 14270884 BLAKE2B 2eae4d2ff7125e57685cbd7aa723e763462a9f5d466ea3b8890d4657ce960233868aa0ecddac37d2dba31a1845c5cab1a33f26ad31d8057067b079454cc7ae49 SHA512 3c5e6d7dc51a92d48cce8424ab1fe60ee75b71ebe2e6bb22e719a35bdaf2210b03f90ac066569f5c086ed67ed1463510625307328299310fad7c587e9fd8b385
-DIST qtgraphicaleffects-everywhere-src-5.12.4.tar.xz 14271080 BLAKE2B 3083fe8fc3a78f1bd5138000a033b2709cd4f7eac04db109bb61f589cd8aa6102f841fcd4396db4c7633df1202d1f2aafca4853bd15eb1a6a8117fa3650fce32 SHA512 fe78cb01cfbe00226709a7faa2e754abb8e41bd677d15611221fbb9e53bf876e60d244eb6660b6b03403d31be2d9155a763ad34e4c4d2d1490fa6810f54bad0c
 DIST qtgraphicaleffects-everywhere-src-5.12.5.tar.xz 14271472 BLAKE2B 1ab3aa490cdbeee4ebbdcf9161c3de8c746a358a8354041783735fe63fa1befc2c7fc2f237969a57efa26d76d6d584153c9e5d3477e8ab9dc7fdbbb9b1783038 SHA512 489a308af5f56ff2b023375ddf705f8a1b15c0e1fb1ec3bc6e5f66a80b5863d63aa0e57a3aef025ab965694add8d71424123bca120ce8d8b8448e7218f7fc640
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.4.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.4.ebuild
deleted file mode 100644
index 23d9db6e5c32..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtgui/files/qtgui-5.12.4-fix-highdpi-crash.patch b/dev-qt/qtgui/files/qtgui-5.12.4-fix-highdpi-crash.patch
deleted file mode 100644
index 57a8b1985a71..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.12.4-fix-highdpi-crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6d61b10f65cd276e009a02cec563cc469245e1f2 Mon Sep 17 00:00:00 2001
-From: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Date: Wed, 19 Jun 2019 08:28:14 +0200
-Subject: [PATCH] High DPI: Fix crash in QWindow::mapFromGlobal()
-
-With Web Engine, QQuickWidget or similar, the code can hit on the offscreen
-window, when its handle is null. Add a check.
-
-Amends 3af7b279177f7fb092f0e0fb9ffc8e8d846ed774.
-
-Fixes: QTBUG-76440
-Change-Id: I123633d18386efd3dbfb22aad6072e4f0877a62e
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- src/gui/kernel/qhighdpiscaling.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp
-index 4f8e9a38176..93fcb1a2160 100644
---- a/src/gui/kernel/qhighdpiscaling.cpp
-+++ b/src/gui/kernel/qhighdpiscaling.cpp
-@@ -400,7 +400,7 @@ QPoint QHighDpiScaling::mapPositionToGlobal(const QPoint &pos, const QPoint &win
- QPoint QHighDpiScaling::mapPositionFromGlobal(const QPoint &pos, const QPoint &windowGlobalPosition, const QWindow *window)
- {
-     QPoint windowPosCandidate = pos - windowGlobalPosition;
--    if (QGuiApplicationPrivate::screen_list.size() <= 1)
-+    if (QGuiApplicationPrivate::screen_list.size() <= 1 || window->handle() == nullptr)
-         return windowPosCandidate;
- 
-     // Device independent global (screen) space may discontiguous when high-dpi scaling
--- 
-2.16.3
diff --git a/dev-qt/qtgui/qtgui-5.12.4.ebuild b/dev-qt/qtgui/qtgui-5.12.4.ebuild
deleted file mode 100644
index 81db316f4805..000000000000
--- a/dev-qt/qtgui/qtgui-5.12.4.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
-	jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
-REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	xcb? ( gles2? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.6.0:=
-	sys-libs/zlib:=
-	virtual/opengl
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gles2? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( x11-libs/tslib )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	xcb? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=[xkb]
-		>=x11-libs/libxkbcommon-0.5.0[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( ~dev-qt/qtwayland-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	xcb:xcb:
-	xcb:xcb-glx:
-	xcb:xcb-plugin:
-	xcb:xcb-render:
-	xcb:xcb-sm:
-	xcb:xcb-xlib:
-	xcb:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES+=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${P}-fix-highdpi-crash.patch" # QTBUG-76440
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and xcb are enabled
-	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usex eglfs '-gbm -kms' '')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use xcb xcb system)
-		$(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
-	)
-	if use libinput || use xcb; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/qthelp/qthelp-5.12.4.ebuild b/dev-qt/qthelp/qthelp-5.12.4.ebuild
deleted file mode 100644
index e3a0a1991175..000000000000
--- a/dev-qt/qthelp/qthelp-5.12.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index b858b543d0b9..87b4ec8514aa 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,3 +1,2 @@
 DIST qtimageformats-everywhere-src-5.12.3.tar.xz 1793076 BLAKE2B 59dced7576a50441c704c8debf4a86bb4db7cfb752922020d2932ee2295805b27ece866f3f86e3f89b308e28cfb720fb9c6fa782f29f45e1c3b14fd733096c87 SHA512 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc
-DIST qtimageformats-everywhere-src-5.12.4.tar.xz 1793912 BLAKE2B b74d328bc8ae7a56294734d8f52f2d7a845f9026d246672927298971a01d0f5942b5ff84121a19acbd7359f8768d3248895a16290da7b26eca5a66b8201dc824 SHA512 e9adab3b7e1f5a0679e1924eb08718f2c6c53073f83018c9243886f7e1b084940bb9a642f46d76fae21552c4a76c655482536ae873cd4cfead4876a3561ebe8f
 DIST qtimageformats-everywhere-src-5.12.5.tar.xz 1795824 BLAKE2B 3b5d3a4be8933d1af7d0fb6feb1cd37318cbc69840cc82de50fb81f63156251f768347bf5ae31b6f255dc9e02a53d64ab98aef8a27749331071482d729ac811d SHA512 9fa76b7eec083596c45f68642b49dc88c2759a28cb9359935c3a64604082acea9adecee49bb0828cc587b86d469aec7169f8f72f83a15194c4fc10f0ca25fae0
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.4-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.4-r1.ebuild
deleted file mode 100644
index a7eace7d6d78..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.12.4-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="mng"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -e 's/qtConfig(jasper)/false:/' \
-		-i src/plugins/imageformats/imageformats.pro || die
-	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index f02ac486e1d1..1ec71a4cf262 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,3 +1,2 @@
 DIST qtlocation-everywhere-src-5.12.3.tar.xz 5905856 BLAKE2B b52b9eaea77b4b429db90768d97c7f4d1319c7a860e864acb5afc5c35c0b2c7425afe64909751b2063bad747fe3aa6d899b39532a72065d4cd87935219a196f1 SHA512 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082
-DIST qtlocation-everywhere-src-5.12.4.tar.xz 5909156 BLAKE2B 9afb944d4ca6b5566852309cd4d7709862a377b26d7293141e308f85b28641bef17e0a40ac094b8e94fa1ab2c4709415177bcaf104a7deebeac1f43845240224 SHA512 b03380feb2e6767dabb0a75f9234c52a9adc580d53b692c356b04293195f6cdd49d9c7e8eb91404b5a7e4c7507498078dd8f41de014330d35f0e99e034b8cf3a
 DIST qtlocation-everywhere-src-5.12.5.tar.xz 5905880 BLAKE2B 67cbe02ad42cfde9bdff9285bc7b8e4d4edb8d4c295cb5e1ca9bbeb077d017762d93d1bf31da67b29506f634bd6f9f909aaf9ecbdc20c480e59bafb3ff539380 SHA512 fe82194e4e6bc2a2e6e3c55e3360afdfd56a6495a8d87bfbdceb29255430954d4c1adc62f1f82e63b23778f0bf03b0a50d6f5d2a963bd786f2cf2fbed7450ccc
diff --git a/dev-qt/qtlocation/qtlocation-5.12.4.ebuild b/dev-qt/qtlocation/qtlocation-5.12.4.ebuild
deleted file mode 100644
index e1e230b43e26..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.12.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Location (places, maps, navigation) library 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}[qml]
-	~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 03b214be5976..febb07f09a45 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,3 +1,2 @@
 DIST qtmultimedia-everywhere-src-5.12.3.tar.xz 3742244 BLAKE2B 65cc184c2625c998ec0f12d5d2f72401693521c9b5e1f27db342279724789e88e0bd6c6cb741ccf28939e8edbb657dde391ceb24ab0cb97c786c114e7e95743d SHA512 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963
-DIST qtmultimedia-everywhere-src-5.12.4.tar.xz 3743264 BLAKE2B c468c674e441ca6b400bf2149b4c56851697df5d644486f7ec902a175ecc2260fb0e7e3c366aaf7d542a2b263731c622702bf9b2f04a5257a5e1d8e985c9507c SHA512 28eaaf4a704649616cd77ae5560ddd6298c82e525f59fa4d5a0178826fe2d6c9b77dcb067f2b5b56e88da7d6043a3f8e34b5c810d12751c74fdc65e5440586fa
 DIST qtmultimedia-everywhere-src-5.12.5.tar.xz 3744764 BLAKE2B 47e7c09ddc4961ea2c479835732cc31139a4ecb577571a9b804a946909292439ef6bd85d5f8afdae0caacf3491391a8b45b2bfdd113dd18902fa097a0dc36253 SHA512 a59983d887c8de462399fd53beb640c1b865c17f8b1a83635c2e1d27903861dd588eb64935d7c02d733c51c9a21174065e70a5fc1aa78600e5540c489b7695a3
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch
deleted file mode 100644
index 1e5d7551d30c..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001
-From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
-Date: Mon, 17 Jun 2019 15:20:22 +0200
-Subject: [PATCH] Fix compile issue when no opengl in QVideoSurfacePainter
-
-error: invalid use of incomplete type 'class QGLContext'
-
-Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9
-Fixes: QTBUG-76405
-Reviewed-by: Andy Shaw <andy.shaw@qt.io>
----
- src/multimediawidgets/qpaintervideosurface.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
-index 440d5c858..6af0c7588 100644
---- a/src/multimediawidgets/qpaintervideosurface.cpp
-+++ b/src/multimediawidgets/qpaintervideosurface.cpp
-@@ -57,10 +57,6 @@
- #ifndef GL_RGB8
- #define GL_RGB8 0x8051
- #endif
--#endif
--
--#include <QtDebug>
--QT_BEGIN_NAMESPACE
- 
- static void makeCurrent(QGLContext *context)
- {
-@@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context)
-     if (handle && QOpenGLContext::currentContext() != handle)
-         handle->makeCurrent(handle->surface());
- }
-+#endif
-+
-+#include <QtDebug>
-+QT_BEGIN_NAMESPACE
- 
- QVideoSurfacePainter::~QVideoSurfacePainter()
- {
--- 
-2.16.3
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild
deleted file mode 100644
index 8a896cd1ccfe..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtnetwork-${PV}
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-no-opengl.patch" )
-
-src_prepare() {
-	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-		src/multimedia/multimedia.pro || die
-
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild
deleted file mode 100644
index a8f3a81d4048..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE="bindist connman libproxy networkmanager sctp +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	sys-libs/zlib:=
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	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:libproxy:
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:network
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(usex connman -dbus-linked '')
-		$(qt_use libproxy)
-		$(usex networkmanager -dbus-linked '')
-		$(qt_use sctp)
-		$(usex ssl -openssl-linked '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index dcf0a78edef6..dac9706e6434 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,3 +1,2 @@
 DIST qtnetworkauth-everywhere-src-5.12.3.tar.xz 139092 BLAKE2B ee8c09ce890010b0ff6424ea74210749fdd0b4ba42fafd0e372ed2719830ce073085f1d5a8d5fbfbb98901f84cd81b105483f310ff6ff056f16430eef6ea1a5c SHA512 07bf159360fe126c23387c6ed5b955218771ac37848ddb83542733c786b415f9aa5c22fd4a965fff591869d2d819bba420b69718e487df3cce382f411f493142
-DIST qtnetworkauth-everywhere-src-5.12.4.tar.xz 139112 BLAKE2B 971fb0f0902545a0ef9e8ebc8033cdd28980c1ac53e8e34bf9a43930156fbf6fc0054771350ac7c5b22e8cca1bf612ad6d300c2805d77cc8fdda1ccd6873520e SHA512 0f36530393abe5315154bf95d0cae1330a8af1af8af5a525d20336d4227f11aa9133b7e3258f651be6f212593ad7e0d2d5d15536fab3c07392a94f2954afe7c8
 DIST qtnetworkauth-everywhere-src-5.12.5.tar.xz 139116 BLAKE2B 38adab02544dff25d52ebb64a2adae090f265a5c23cfeb48e5288beb2153f4cd9973601aee23faaf074d91fdea1924f201864d6ce2773989d5e2844c79096135 SHA512 d7849518614a7bdb2ddbcf92b773f5e7c26f1af4ba07f0304b4634ed69bf3c17798509d28af2c49aba0cfad35a1cad5bda27acdbde3aa8d86038efeb9f5001e0
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.12.4.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.12.4.ebuild
deleted file mode 100644
index 7fbd2442415a..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.12.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Network authorization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~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 a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtopengl/qtopengl-5.12.4.ebuild b/dev-qt/qtopengl/qtopengl-5.12.4.ebuild
deleted file mode 100644
index 15897af68b46..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.12.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE="gles2"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/qtpaths/qtpaths-5.12.4.ebuild b/dev-qt/qtpaths/qtpaths-5.12.4.ebuild
deleted file mode 100644
index ec3e1e7d8678..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.12.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 85fcd87ade33..586c07da1add 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,3 +1,2 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
 DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.12.4.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.12.4.ebuild
deleted file mode 100644
index 85a22f1729a1..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.12.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 f02ac486e1d1..1ec71a4cf262 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,3 +1,2 @@
 DIST qtlocation-everywhere-src-5.12.3.tar.xz 5905856 BLAKE2B b52b9eaea77b4b429db90768d97c7f4d1319c7a860e864acb5afc5c35c0b2c7425afe64909751b2063bad747fe3aa6d899b39532a72065d4cd87935219a196f1 SHA512 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082
-DIST qtlocation-everywhere-src-5.12.4.tar.xz 5909156 BLAKE2B 9afb944d4ca6b5566852309cd4d7709862a377b26d7293141e308f85b28641bef17e0a40ac094b8e94fa1ab2c4709415177bcaf104a7deebeac1f43845240224 SHA512 b03380feb2e6767dabb0a75f9234c52a9adc580d53b692c356b04293195f6cdd49d9c7e8eb91404b5a7e4c7507498078dd8f41de014330d35f0e99e034b8cf3a
 DIST qtlocation-everywhere-src-5.12.5.tar.xz 5905880 BLAKE2B 67cbe02ad42cfde9bdff9285bc7b8e4d4edb8d4c295cb5e1ca9bbeb077d017762d93d1bf31da67b29506f634bd6f9f909aaf9ecbdc20c480e59bafb3ff539380 SHA512 fe82194e4e6bc2a2e6e3c55e3360afdfd56a6495a8d87bfbdceb29255430954d4c1adc62f1f82e63b23778f0bf03b0a50d6f5d2a963bd786f2cf2fbed7450ccc
diff --git a/dev-qt/qtpositioning/qtpositioning-5.12.4.ebuild b/dev-qt/qtpositioning/qtpositioning-5.12.4.ebuild
deleted file mode 100644
index cc8b4e331240..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.12.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtlocation"
-inherit qt5-build
-
-DESCRIPTION="Physical position determination library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="geoclue +qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	geoclue? ( ~dev-qt/qtdbus-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	geoclue? ( app-misc/geoclue:2.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/geoclue2 )
-	use qml && QT5_TARGET_SUBDIRS+=(
-		src/positioningquick
-		src/imports/positioning
-	)
-}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.12.4.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.12.4.ebuild
deleted file mode 100644
index 0fb87884db76..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.12.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE="cups gles2"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 11227ff5011c..2c5f60139e95 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,3 +1,2 @@
 DIST qtquickcontrols-everywhere-src-5.12.3.tar.xz 6057512 BLAKE2B ebe1f4a431cd58891c8550ac1e50992d290c18df54b6710912397f6856ada50f8807cb52d0fbe43f376d187ba6c3f53a0b826babe10fded480d4088bf842f566 SHA512 23410fb82088591a8bed7e8e4127d13929a03adc0dfd18f7e2f906acdac21f7dcbb15cb2257272b893d937bbb54860992667c11aa0c6157d4a3b871616c4641c
-DIST qtquickcontrols-everywhere-src-5.12.4.tar.xz 6057224 BLAKE2B 7dc7183247727500333749385109b7f5edbb160795641818ebe902b26286a4a22cb5170f529488e26d447b543a4ff89bc72ce41d71ccecb27e61cb5099dfbd81 SHA512 315f711d856a4f2882c4e60435bd5fc77623b4ba3bd10fea8e8d052e0a183556c4b5342236b18fade0bbae3a45df8b1426a26a87b1d7b071bb3e5846585775f6
 DIST qtquickcontrols-everywhere-src-5.12.5.tar.xz 6056164 BLAKE2B 92fb8c605f6d9633ddf758b9d323b06f52024b024f572d2906e2f6507b05badacbf117da7c1e3b6a320629bad8efcf9bc97440466e8817006af8ab5f5a68daa9 SHA512 4539a6ce1ee20f71f6bf48271bc3fe1125bd21899cf36142d1c3d41a68ba56211f27d6e4403c69e86bd4698c7c7c79bc60f2a78ef1b19c5eab5b8690d1a01037
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.4.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.4.ebuild
deleted file mode 100644
index 25f8d80d48a9..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
-
-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 b42f1ead87a5..399996c3cfe4 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,3 +1,2 @@
 DIST qtquickcontrols2-everywhere-src-5.12.3.tar.xz 9297300 BLAKE2B 53ec7eb16cdbc77d60316dfebd47f0372ce90bc9781dcdb1f0b9360774379138cf3483b52ebae9598bebf7460b300b388663fe35292264007d1f240ccf2bbff6 SHA512 afc1ae9a5a046845b085d5cf0019b79d99914a2d285676bd4d8966f1302513078c8279b71134281c03b2c1209295bca438b9e255774574520498b0b5385bad27
-DIST qtquickcontrols2-everywhere-src-5.12.4.tar.xz 9299120 BLAKE2B 021df7d65898aa0df45095005ef3f37150e36da64b0a52bbe69cf177a8f31e3e6ae2b65b81bec5f2ac3d01b92cef4d3b0d6904d9e26474d3fd9cc557f4f9bf47 SHA512 41e44ee733ef3ac5021543407b472750c7b8d61bdeb6960d043477f0c5604699cafb5cca4f755a26ce3cfef1f948e85bb85623ecd21e70c876bd5a8c1f5547bf
 DIST qtquickcontrols2-everywhere-src-5.12.5.tar.xz 9299520 BLAKE2B 66be3a4c67fc0821ea6cbbac9986fad2baa67dff6533217462646146f22bad35fe5c291ad7dc5e38fcfc23fda581a135f21eb587e5ad2ec6b71805a64e3071d8 SHA512 afbd742783d83eabf182031e218c2f611709cd66f2b4886317bd356ffff2afabe820e1f552f478a0c3f74daf6fd1f5256900448f5445b84792d6a71b42ccd20a
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.4.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.4.ebuild
deleted file mode 100644
index 4babc06b58ec..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-IUSE="widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}
-	~dev-qt/qtgraphicaleffects-${PV}
-"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/imports/platform/platform.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index c8f66ea65912..93806874088d 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,3 +1,2 @@
 DIST qtscript-everywhere-src-5.12.3.tar.xz 2674896 BLAKE2B 9f655989505c288d22c9d961e79227cee84ce4d91f6a61b7038e3b993da6f610c3703ad24b2146931c7d46b1765b60f73af8adea6d55823d0b973a99b61adac8 SHA512 4c4498acb39536bdc03643fb1717c7a47c82b1734cf67d17d40bc216084f01e837648d261f7f69e317387f9c6efa9aaa6b0df8f5532f55615252c95b1089ca1a
-DIST qtscript-everywhere-src-5.12.4.tar.xz 2675028 BLAKE2B 7cae53222aa776992c54635b9590b2eea7504905d033266b7f6bc18bea4a8bc74e0714f37ba3e0fba022c2b22d4e93982cb370311e25d9fdd7a1ac5f43110e80 SHA512 6d3b802c7cdfb270318b9210df4ad9dbd2d29f485d9194051dbf278a48c25cc5c6311adeaf56b4fe2a7746dbc10234544e75e61a2e9c86f653aed0a92e07e717
 DIST qtscript-everywhere-src-5.12.5.tar.xz 2675432 BLAKE2B 76c681e5d1e9311cd11a9701cab5486c80f61dd552030a0e0c4e0df5025f84d5d7e140bddee5dfb0de7f0ad1564b784f4267342e6fa355bd09feaa47b7541449 SHA512 a422e47873ddf4c84adf00f51b721465acedfac535b0daeede63eac0d41c6f4f07d5a5f86513c86e981f3a0024020be03730670befab2a20cd4d6564c98d6c90
diff --git a/dev-qt/qtscript/qtscript-5.12.4.ebuild b/dev-qt/qtscript/qtscript-5.12.4.ebuild
deleted file mode 100644
index c5092df8b111..000000000000
--- a/dev-qt/qtscript/qtscript-5.12.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-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 1676d120b5ae..7256fcbc0524 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,3 +1,2 @@
 DIST qtscxml-everywhere-src-5.12.3.tar.xz 434176 BLAKE2B 8059a28cbd642089408077064bdb0df3d7018872c711283e11a1ca194b7c89d370bf54cbded67feba635c0190f52aaa96f75e6f63362b6af0c62f06246b439c4 SHA512 d515506d90ace5eedfe8bf3439dad0853dbbdbd36dfb509dfa13e3358838353de66d5f6245afe4eeebd19dd3f0ab0ce5e4c3e6fe5d40e5ab46763c453a562a49
-DIST qtscxml-everywhere-src-5.12.4.tar.xz 434312 BLAKE2B 0aafb4e34c7a15686c024fa0a24a472961cc9cc10afeb41723b241996dc24afa3234063cace84bc7d1e75e1ec2092a4f92f20669fe3634580c1d1a2d98da0139 SHA512 45bf18c1bece80120b2a8f81357afda86584ad5455a49b0db0658b4dd7f0a4ef53c7cc7ef8fff26842f476661b162752db7e8a48ed3566342ad0c1537d4ac8f9
 DIST qtscxml-everywhere-src-5.12.5.tar.xz 434260 BLAKE2B d518785715a01e70bcf40dcc37207211fb458a979d2d12dc2c52e1add31fd8de24127be04bde938a3e1bc2b6550afa864d946b5eba96b4b2a6f812d2f6a3c61d SHA512 23d340994af3e217ae58698dd0cd38f30d67d74a042d58cabbd0f38a6c13a8d64d6238cd6dee246ce0f99d5206bc210749941b88e5f745d3b92207eab06730b1
diff --git a/dev-qt/qtscxml/qtscxml-5.12.4.ebuild b/dev-qt/qtscxml/qtscxml-5.12.4.ebuild
deleted file mode 100644
index 5fe2d2ce1fea..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.12.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~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 cd5e7d7da771..ccaa08b62605 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,3 +1,2 @@
 DIST qtsensors-everywhere-src-5.12.3.tar.xz 2037212 BLAKE2B 1f75ceea8fdf8e020e73f2cd8377ca13128bf9aafc71146ad96e7cb1f69df83af2889b5a5684fdfd0abb18553332cdda2f9d8753233ed743d0a136a625941909 SHA512 cf0c8c58bbb84debd6b464bd9b91af7e79a301031613b8a2d0715fa276573dafea0a1c8e472fa2a2d4debd9b26f86a5e6efa9a8d57f7ab9102b1314d609579e5
-DIST qtsensors-everywhere-src-5.12.4.tar.xz 2035464 BLAKE2B 2a64bd6c830087ce750286eb47a6dabb34786c6ecf6a20bc1c86d3d59252b610d47666afb387b2a6d4958341d2639104a89f9fed1e2d50885b1b438fef8f458b SHA512 39bc6b2a435dd54d574f6c19ccc15698f8ade3f2b64170baa3e0d0bd24f64bc16a9088620a6be41a61ed170bd84d4795bf2819b40a188c5c2255a54d0e466035
 DIST qtsensors-everywhere-src-5.12.5.tar.xz 2035484 BLAKE2B 037deb6b0d4420a7cf9d52fbae1d7957fb989a385c557eb6427868ec7940b85fb2898c2eb7fdaa96df43b5f4652659c578bf50d3e6073ac3c790ca7f651c05f8 SHA512 81ac74e4c0a3d1942393c9267bbcc50af0e04a6f163d566010d6053dc4c69a67395c3f4b7564a50ec84ac88a715edd002920be4e145e6bd23d082a021dee1e5a
diff --git a/dev-qt/qtsensors/qtsensors-5.12.4.ebuild b/dev-qt/qtsensors/qtsensors-5.12.4.ebuild
deleted file mode 100644
index 2cf55ab96656..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.12.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Hardware sensor access library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-# TODO: simulator
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index 372ef1886ebe..a1704bc3c1c4 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,3 +1,2 @@
 DIST qtserialbus-everywhere-src-5.12.3.tar.xz 328664 BLAKE2B cea2ebacf8a2ffc6e2f1c1ab54327a50199407ded0338d6bbfd0a3d8672106253bcfc307fd38d2e81acecd87ae69f093f516a52e0e4a864130c8491f596cdba2 SHA512 5f9d477780bfcba1edb4a11592ea6f3a2a1b2e42fbbce898e167b1975b14e93b3840789230e320869cbdb16e33eb76b45310cd27089f2f854a20ac3b7e18d763
-DIST qtserialbus-everywhere-src-5.12.4.tar.xz 328808 BLAKE2B 4a3ada386c256c4bbc9d584a6232568adfc705d69d3a9ed505a006b2c494333a75e0ad08210ca45f131cee8060afa380317574fcbed1c052825d168a4e650ae7 SHA512 7d302552780a08444ea676abf9d0503a10b12e976d9ea1c95b8359d16b190f5d75e409cd3c82e4bf711b9906dd1b183169e5746bf6dce65868332bdbbaa33394
 DIST qtserialbus-everywhere-src-5.12.5.tar.xz 329052 BLAKE2B 9136be5ca768d610c38aad83301f080ed3617f368c3431828e7d9340ebe26fac7332e1a65db0e02701c18a555f784f3e2b4308850bacda415cfffd90263a831e SHA512 bf013a1e052cb0011c05f5dd52757f4944c86f4bd61f57244ffa299cd443166a80d27493a0ec8e22dcff817e89081502f091736bd37a27616de933e51184b0f4
diff --git a/dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch b/dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch
deleted file mode 100644
index 54c0b11087c3..000000000000
--- a/dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 43d746c2c0c87c8694e835f3b052317c8fa02482 Mon Sep 17 00:00:00 2001
-From: Andre Hartmann <aha_1980@gmx.de>
-Date: Mon, 8 Jul 2019 21:35:12 +0200
-Subject: [PATCH] =?utf8?q?SocketCAN:=20Fix=20compiler=20error=20"=E2=80=98?=
- =?utf8?q?SIOCGSTAMP=E2=80=99=20was=20not=20declared"?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Fixes: QTBUG-76957
-Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b
-Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
----
- src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
-index 74b0d1d9..a2da146f 100644
---- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
-+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
-@@ -45,6 +45,7 @@
- 
- #include <linux/can/error.h>
- #include <linux/can/raw.h>
-+#include <linux/sockios.h>
- #include <errno.h>
- #include <unistd.h>
- #include <net/if.h>
--- 
-2.16.3
diff --git a/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild b/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
deleted file mode 100644
index a1577e3db334..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-PATCHES+=(
-	"${FILESDIR}/${P}-canbus-missing-header-w-linux-headers.patch" # QTBUG-76957
-)
-
-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 3494c71a5cce..dea6b169e1b1 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,3 +1,2 @@
 DIST qtserialport-everywhere-src-5.12.3.tar.xz 302740 BLAKE2B 105999b369422c4e819c85bdcb2899eff2af9c8486ea485bf89f6b1fbe0d78c8760b52e06942145f7a0ad54c0a25ee504d9b3833536af3cfd88a2efeebda5b31 SHA512 42551b74abe1fcaa1972fb1134215987d7c1d0fe73874a4c6ad5b9aadad71a2066a1846c297569bb1562f94e54a406e8074d444deca510a566e27cd386b47ecf
-DIST qtserialport-everywhere-src-5.12.4.tar.xz 302892 BLAKE2B cc04f0bbdb201e9b202f74eb3c40e60b87234937dcdd7593fd4558344c60d7987daf44809026ea25b314d3f3097e03d4c24bad0c91482619c408b9b9588b5474 SHA512 c51fa5eca92a16c41678eef37c3e33c6ea7f61ad881dd309548b83bafa3fedf191afc324437863dcf1a35dafc512363e7588f65136c07ad8f0d51c6854da178f
 DIST qtserialport-everywhere-src-5.12.5.tar.xz 302940 BLAKE2B fdfad2cc1b9dbcef179689b938ce734a28972f9a6ac9235c8d9068cb3d2fb32ae12269d54deb7fd7b7eec0af78ae1ea8098aaa678fd48dd102243c6fa40f51be SHA512 f3a5fb8c9a9513c16f52bd22b4fd4c6400819863237762f459d9f612ef2457447733cc8ed2bd645f182ab9eab6ddb5bcdbca2fbd67745def1a5fad1392087f4e
diff --git a/dev-qt/qtserialport/qtserialport-5.12.4.ebuild b/dev-qt/qtserialport/qtserialport-5.12.4.ebuild
deleted file mode 100644
index 78e261c288e6..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.12.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Serial port abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-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 023eb6a2c75c..7ac51394ee7e 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,3 +1,2 @@
 DIST qtspeech-everywhere-src-5.12.3.tar.xz 99828 BLAKE2B a48006c84240091c09af185a6cb6b8df732f94452b92d734d4fb7383966d1be04dc0582c366014f7b75deb2d07c54b275adea3bfbb8d307d2dd1056e4d08c94e SHA512 9623a83cdfbed07dffcd8f0808c2a514c97fda72b68827d917f1a8ee3072286ef8bce06b114db94d7a0c3fc79425c2540fa5cadc6551367fd4431e5396395932
-DIST qtspeech-everywhere-src-5.12.4.tar.xz 99832 BLAKE2B bb05657bd78d6540d118abbd80e3f60f92c5c1f0a288434db4cff81c4bc8b219af0c00fc13446da5069795492a53b18676ead46b97c0513f88b88aff70c53bf7 SHA512 85f77f32d2a3fc28262fa0af2dc1ff13c572835bff8fef3a79b4af0efdee0fc325754e1803d98ce25042fd717de28f3ecb3cc916de729cbb267c14be136007a9
 DIST qtspeech-everywhere-src-5.12.5.tar.xz 99840 BLAKE2B b60a19bff4aad801d513ad7eff45ebfabedda18952e48137683ed15ab6f9330a8e41f195af9a6f6f06fb839f8a0338d26e6d7ae1bbf0aa92d6c00613c41b3095 SHA512 2a1a2c86ee3b5501623bb0c2c8e5b6f96b353707fe0eb804629187899eca5952c665ef037c4257f635edf34ddea03bc686f472a4a346d9f8e2adc7479f640482
diff --git a/dev-qt/qtspeech/qtspeech-5.12.4.ebuild b/dev-qt/qtspeech/qtspeech-5.12.4.ebuild
deleted file mode 100644
index 17f8c70c3c51..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.12.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Text-to-speech library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~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 a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtsql/qtsql-5.12.4-r1.ebuild b/dev-qt/qtsql/qtsql-5.12.4-r1.ebuild
deleted file mode 100644
index d1e4e555dd9c..000000000000
--- a/dev-qt/qtsql/qtsql-5.12.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	freetds? ( dev-db/freetds )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-PATCHES+=(
-	# Backport from dev branch
-	"${FILESDIR}/${P}-mysql_free_results_when_qsqlquery_finished_is_called.patch"
-)
-
-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 oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 8fba50f1208b..3b485d23013e 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,3 +1,2 @@
 DIST qtsvg-everywhere-src-5.12.3.tar.xz 1859680 BLAKE2B 9ee0a2dbde09ef19fc72285f5ec9b865fd65c23bbecc4fcc8969a5f84bbe31818a086e066f32873e0cfd82aaab4a077660eabd2cbcc7494e84949c64b4a99740 SHA512 23517dbdc30d7128fcbeb12a301eeeb300424bb17bc0d156d5e9298c092d3d3afd2cba45768f2512e58977ee2408450f50c385e03a47ccaf3ff6bc7e4fddf61a
-DIST qtsvg-everywhere-src-5.12.4.tar.xz 1859476 BLAKE2B 60de8594c157b914bba80adfd54292c850975939413a2ccfda19f3bafaf26862bd49225006f04c1e426f7928bfbc91cb4398a46eadc6883d97b3194a20ebb884 SHA512 40d7dc82e0acde52e1258e1b1753cc93609c31cf69057c52dc2dd30dc59f2d7d434e20fa4f7f27db3fa300fd3c8f23a8fb03cc26b27cc1c02cc3bf6d97383503
 DIST qtsvg-everywhere-src-5.12.5.tar.xz 1860340 BLAKE2B 51162f36eb7a645d5670f4d425596fa4fe96d5149833074ab1147ccb0b6ad603cf00a45b116f09beb1c692c071248c5a425aa3f4948e0dc4af4ba131537b795d SHA512 3d7f89d106b36c8a0fd04c6e6f0ccde0c50ced7192980ea7d9330ba73d9307559e60ed2b10c28481a419d19aaae6609bde9e1dd74ccedf340dacf0194a60429d
diff --git a/dev-qt/qtsvg/qtsvg-5.12.4.ebuild b/dev-qt/qtsvg/qtsvg-5.12.4.ebuild
deleted file mode 100644
index 943bcaab907f..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.12.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtxml-${PV} )
-"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qttest/qttest-5.12.4.ebuild b/dev-qt/qttest/qttest-5.12.4.ebuild
deleted file mode 100644
index 3003c2e7e412..000000000000
--- a/dev-qt/qttest/qttest-5.12.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtxml-${PV}
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:testlib
-)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 48efec43b648..567603dd3bb6 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,3 +1,2 @@
 DIST qttranslations-everywhere-src-5.12.3.tar.xz 1375832 BLAKE2B 5fbddd0a1aa58f367b4089dd6560e6251451e623c5e81078ae428a9420386bb6ad60402b6538d4a4004ec28f84df78896e73df81abfae64cd4ddec1c18fa1cf8 SHA512 76e31a3c6a6824666b2f49d7fa0ad6e604f4a8fcb408261cfeb7baa213fc2f54c1382f677c824f47e7a629776637c699fbe215eecfbce85c3ce621c3de9b01ad
-DIST qttranslations-everywhere-src-5.12.4.tar.xz 1383576 BLAKE2B 7c8ebb2e5fc350fc024cb228d0b696de5fa7ba412efcdb5f6279577d5462716a22baa8ae95795ca79f9525fc7507a08aa5a49cb549bcaeb3c885aee6061d967c SHA512 05046918e0e2d6377a462f034db1a4d7aeeedf952fef3db943a6e525c16d7ff3c93f2da78846e9662c85b515e46e464c81bd474e639d8c2deebe808e467e6d91
 DIST qttranslations-everywhere-src-5.12.5.tar.xz 1377740 BLAKE2B 7940ee5603001e9aa3ae946694f916a4c193c069b2ff6cf2241fdbe2bb6336f9589adfe31cc8ce95bdf44fcf0c9a99e16a567a873aca6683f3d2e6566d6812c4 SHA512 a2120add3b82fd84d44a064f08c5e781410c86dfd5eee39a01f44840063be5b4030c47989a2e6a413c4298d79b473f50968078a12793b9145d7ee8a722fd1698
diff --git a/dev-qt/qttranslations/qttranslations-5.12.4.ebuild b/dev-qt/qttranslations/qttranslations-5.12.4.ebuild
deleted file mode 100644
index 43701fa14908..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.12.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/linguist-tools-${PV}
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index c6d4b13e3f34..82afaaadcad1 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,3 +1,2 @@
 DIST qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz 10916144 BLAKE2B 871db74b3540980d4392fa49d77d60c33f5cbd7840cd41797c168c324f9ba46214cf31154cafec9714c17b784c0ed543f5498146cd3c71228c320fd67792735e SHA512 1aa00fec7e333e4fd52891b82c239b532cf41657d9c3f44c6cc1c211a1412dbf5584823511e54f3feb33b3fed9c6e0171b55afde2df9f0a358e2e4885e1b2686
-DIST qtvirtualkeyboard-everywhere-src-5.12.4.tar.xz 10915036 BLAKE2B ebc8511c1987a5a517e5f38aa536a8ec948609b4d56e5f84dbfc92713edb976b15f27cee97199f3c26fe63f77446d1b6393016dc94ce79d3749c03a69466211b SHA512 04960c475a01f65901279fdab352742e4dc77753a306c7bd9996cf32be4a63524e7be034d60b398c6862c0099b02eedcef89f28fd09b1c7fa3075f89adba5a7a
 DIST qtvirtualkeyboard-everywhere-src-5.12.5.tar.xz 10911944 BLAKE2B 3a8b8b8370d182e95d88262679747452418c0c74b104daf42a7bcabc3c816ad97447acb1250ada84b72bf7cfe08fb55dad7037c1c91d99a3f9ed97a5176d4450 SHA512 e4581673451c40bf39b9793b0131bbad29e8a3f9db2d42adb23b48847bd674b6820717c051b76e506d4fd52e87c79b042533be85285a0cce9bcdc49cca964e66
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.4.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.4.ebuild
deleted file mode 100644
index 0fa27800a02f..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
-fi
-
-# TODO: unbudle libraries for more layouts
-IUSE="handwriting +spell +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtsvg-${PV}
-	spell? ( app-text/hunspell:= )
-	xcb? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex handwriting CONFIG+=lipi-toolkit '')
-		$(usex spell '' CONFIG+=disable-hunspell)
-		$(usex xcb '' CONFIG+=disable-desktop)
-		CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
-			lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
-			lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
-			lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
-			lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
-			lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
-			lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
-			lang-uk_UA lang-vi_VN"
-	)
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 198b0f30bad1..1b67a63abd77 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,3 +1,2 @@
 DIST qtwayland-everywhere-src-5.12.3.tar.xz 432304 BLAKE2B eb2ba520c651467c8ed5f0d870a69c9b07047cb4c05a0c889b36abeab30149861b83ca693efb0bb93dce4f5da5913afc3c8b61933ef0e8307d22b64fce530d87 SHA512 e66f9f41c15cf84165e559a1ff09e20ec21bb3f909b57fab08b0e3f8f9eeacf75d49541b499b1a6514a34d1ba5dd426ec1ce77719910588afa12cb3a7980dc90
-DIST qtwayland-everywhere-src-5.12.4.tar.xz 434076 BLAKE2B f034080ec3ad8281c10edcdaa56bf2bcac2ea0002bb2b4780fce40cc28bcf30db713c736916f3382aa7ad0418f5ac424064d675c7001968378487d9cb40c619f SHA512 f3fd6644d7fa21ef042ecda807f6ede7853944de8908f8d390f0ebec258406ff4a4f3bfbb382b57a7a4684e19906b79b43c920f55c5fda75bacfc9a96fafa301
 DIST qtwayland-everywhere-src-5.12.5.tar.xz 448064 BLAKE2B e9ec631d1ec0f19cc5ef9f3c9e9e12d327da8ad896e40bb172b98191947ff20ba33b0fc747a9009d4d9147dd1cdea2d5376a12f25362bfa499eca6d0c838f2d2 SHA512 19e19b3d6226839856f8e8792665eda1f09f0bbf95a38077bdf2831205ee09254c8df6a521ba3f5a228bcd98c4d1929a2bd9e9aa2f6f14c218d4d7458d1a866c
diff --git a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-make-handleupdate-aware-of-exposure-changes.patch b/dev-qt/qtwayland/files/qtwayland-5.12.4-client-make-handleupdate-aware-of-exposure-changes.patch
deleted file mode 100644
index 6aacad2a942e..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-make-handleupdate-aware-of-exposure-changes.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b13b595dc4f4fe6bdca7b69a21fd934ee233e149 Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson@kde.org>
-Date: Sun, 23 Jun 2019 14:48:30 +0200
-Subject: [PATCH] Client: Make handleUpdate aware of exposure changes
-
-The wl_surface can be destroyed whilst a render is happening. Calling
-wl_surface::frame after the window is reset can crash as wl_surface is
-null.
-
-Change-Id: I139a9b234cb6acba81d6c1d5fa58629904a25053
----
- src/client/qwaylandwindow.cpp | 10 +++++++++-
- src/client/qwaylandwindow_p.h |  4 ++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 5ea0dce1e..7e7a4929c 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -79,6 +79,8 @@ Q_LOGGING_CATEGORY(lcWaylandBackingstore, "qt.qpa.wayland.backingstore")
- 
- QWaylandWindow *QWaylandWindow::mMouseGrab = nullptr;
- 
-+QReadWriteLock mSurfaceLock;
-+
- QWaylandWindow::QWaylandWindow(QWindow *window)
-     : QPlatformWindow(window)
-     , mDisplay(waylandScreen()->display())
-@@ -210,6 +212,7 @@ void QWaylandWindow::initWindow()
- 
- void QWaylandWindow::initializeWlSurface()
- {
-+    QWriteLocker lock(&mSurfaceLock);
-     init(mDisplay->createSurface(static_cast<QtWayland::wl_surface *>(this)));
- }
- 
-@@ -245,8 +248,10 @@ void QWaylandWindow::reset(bool sendDestroyEvent)
-     mShellSurface = nullptr;
-     delete mSubSurfaceWindow;
-     mSubSurfaceWindow = nullptr;
--    if (isInitialized())
-+    if (isInitialized()) {
-+        QWriteLocker lock(&mSurfaceLock);
-         destroy();
-+    }
-     mScreens.clear();
- 
-     if (mFrameCallback) {
-@@ -1145,6 +1150,9 @@ void QWaylandWindow::requestUpdate()
- void QWaylandWindow::handleUpdate()
- {
-     // TODO: Should sync subsurfaces avoid requesting frame callbacks?
-+    QReadLocker lock(&mSurfaceLock);
-+    if (!isInitialized())
-+        return;
- 
-     if (mFrameCallback) {
-         wl_callback_destroy(mFrameCallback);
-diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
-index e8c9d5684..d3706442f 100644
---- a/src/client/qwaylandwindow_p.h
-+++ b/src/client/qwaylandwindow_p.h
-@@ -53,6 +53,8 @@
- 
- #include <QtCore/QWaitCondition>
- #include <QtCore/QMutex>
-+#include <QtCore/QReadWriteLock>
-+
- #include <QtGui/QIcon>
- #include <QtCore/QVariant>
- #include <QtCore/QLoggingCategory>
-@@ -271,6 +273,8 @@ private:
-     static QMutex mFrameSyncMutex;
-     static QWaylandWindow *mMouseGrab;
- 
-+    QReadWriteLock mSurfaceLock;
-+
-     friend class QWaylandSubSurface;
- };
- 
--- 
-2.16.3
diff --git a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-no-fake-surfacecreated-destroyed-events.patch b/dev-qt/qtwayland/files/qtwayland-5.12.4-client-no-fake-surfacecreated-destroyed-events.patch
deleted file mode 100644
index c358e0f72de0..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-no-fake-surfacecreated-destroyed-events.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From e6edc73942a76e57e7ac745217092333480f2c64 Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson@kde.org>
-Date: Sun, 23 Jun 2019 15:09:51 +0200
-Subject: [PATCH] Client: Don't send fake SurfaceCreated/Destroyed events
-
-QPlatformSurface relates to the backing store. Not the wl_surface.
-They are emitted by QPlatformWindow.
-
-Due to a previously incorrect usage by KDE developers it was faked to
-emit the events when the wl_surface is created/hidden to keep behavior.
-
-With QtBase a9246c7132a2c8864d3ae6cebd260bb9ee711fcb this now causes an
-issue as now QWidgets react to this event in a breaking way.
-
-Change-Id: I2f003bc9da85f032a0053677fd281152099fc9eb
----
- .../wayland/custom-extension/client-common/customextension.cpp |  9 +++++++--
- src/client/qwaylandwindow.cpp                                  | 10 ++--------
- src/client/qwaylandwindow_p.h                                  |  2 +-
- 3 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/examples/wayland/custom-extension/client-common/customextension.cpp b/examples/wayland/custom-extension/client-common/customextension.cpp
-index aa0cb58a4..16f18fd7a 100644
---- a/examples/wayland/custom-extension/client-common/customextension.cpp
-+++ b/examples/wayland/custom-extension/client-common/customextension.cpp
-@@ -81,8 +81,13 @@ QWindow *CustomExtension::windowForSurface(struct ::wl_surface *surface)
- 
- bool CustomExtension::eventFilter(QObject *object, QEvent *event)
- {
--    if (event->type() == QEvent::PlatformSurface
--            && static_cast<QPlatformSurfaceEvent*>(event)->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) {
-+    if (event->type() == QEvent::Expose) {
-+        auto ee = static_cast<QExposeEvent*>(event);
-+
-+        if ((ee->region().isNull())) {
-+            return false;
-+        }
-+
-         QWindow *window = qobject_cast<QWindow*>(object);
-         Q_ASSERT(window);
-         window->removeEventFilter(this);
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index ca7c8495c..a6331621d 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -93,7 +93,7 @@ QWaylandWindow::~QWaylandWindow()
-     delete mWindowDecoration;
- 
-     if (isInitialized())
--        reset(false);
-+        reset();
- 
-     const QWindow *parent = window();
-     foreach (QWindow *w, QGuiApplication::topLevelWindows()) {
-@@ -119,8 +119,6 @@ void QWaylandWindow::initWindow()
- 
-     if (!isInitialized()) {
-         initializeWlSurface();
--        QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceCreated);
--        QGuiApplication::sendEvent(window(), &e);
-     }
- 
-     if (shouldCreateSubSurface()) {
-@@ -227,12 +225,8 @@ bool QWaylandWindow::shouldCreateSubSurface() const
-     return QPlatformWindow::parent() != nullptr;
- }
- 
--void QWaylandWindow::reset(bool sendDestroyEvent)
-+void QWaylandWindow::reset()
- {
--    if (isInitialized() && sendDestroyEvent) {
--        QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed);
--        QGuiApplication::sendEvent(window(), &e);
--    }
-     delete mShellSurface;
-     mShellSurface = nullptr;
-     delete mSubSurfaceWindow;
-diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
-index 121ad8219..ba69fd9dc 100644
---- a/src/client/qwaylandwindow_p.h
-+++ b/src/client/qwaylandwindow_p.h
-@@ -263,7 +263,7 @@ private:
-     void initializeWlSurface();
-     bool shouldCreateShellSurface() const;
-     bool shouldCreateSubSurface() const;
--    void reset(bool sendDestroyEvent = true);
-+    void reset();
-     void sendExposeEvent(const QRect &rect);
-     static void closePopups(QWaylandWindow *parent);
-     QWaylandScreen *calculateScreenFromSurfaceEvents() const;
--- 
-2.16.3
diff --git a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-reset-frame-callback-timer-when-window-hiding.patch b/dev-qt/qtwayland/files/qtwayland-5.12.4-client-reset-frame-callback-timer-when-window-hiding.patch
deleted file mode 100644
index 8d4378243412..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.12.4-client-reset-frame-callback-timer-when-window-hiding.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a4e6f88f50d1a1dd56df77ce8b07b98aceb20ddc Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson@kde.org>
-Date: Sun, 23 Jun 2019 13:25:16 +0200
-Subject: [PATCH] Client: Reset frame callback timer when hiding a window
-
-If we hide a window whilst a compositor has a pending frame to show,
-it's possible the compositor will not render the frame and not return
-the callback.
-
-If this happens on the next window expose we can be left with
-mFrameCallbackTimedOut still true causing isExposed() to remain false
-and us to not send the next buffer when we later show the window again.
-
-Change-Id: I507410415d1a930fd5fa736412055e68fdf6c1d3
-Reviewed-by: Johan Helsing <johan.helsing@qt.io>
----
- src/client/qwaylandwindow.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 7c8ecadaa..2b243bc44 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -254,6 +254,13 @@ void QWaylandWindow::reset(bool sendDestroyEvent)
-         mFrameCallback = nullptr;
-     }
- 
-+    int timerId  = mFrameCallbackTimerId.fetchAndStoreOrdered(-1);
-+    if (timerId != -1) {
-+        killTimer(timerId);
-+    }
-+    mWaitingForFrameCallback = false;
-+    mFrameCallbackTimedOut = false;
-+
-     mMask = QRegion();
-     mQueuedBuffer = nullptr;
- }
--- 
-2.16.3
diff --git a/dev-qt/qtwayland/files/qtwayland-5.12.4-fix-stuttering-when-gui-thread-busy.patch b/dev-qt/qtwayland/files/qtwayland-5.12.4-fix-stuttering-when-gui-thread-busy.patch
deleted file mode 100644
index 794fb1275298..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.12.4-fix-stuttering-when-gui-thread-busy.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From ec9057081f1094fbfeb11449bc533997731e4079 Mon Sep 17 00:00:00 2001
-From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
-Date: Wed, 19 Jun 2019 14:05:22 +0200
-Subject: [PATCH] Client: Fix stuttering when the GUI thread is busy
-
-When we did invokeMethod for handling the frame callbacks, we had to wait for
-the GUI thread to finish whatever it's doing before we would stop blocking.
-
-Fix it by clearing the frame callback timer and stop blocking immediately,
-while delaying the rest of the work until it can be run on the other thread.
-
-Fixes: QTBUG-76397
-Change-Id: I343e4feac4838926b4fa2ccac2948988bc6c3bb7
-Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
----
- src/client/qwaylandwindow.cpp | 59 +++++++++++++++++++++++--------------------
- src/client/qwaylandwindow_p.h |  2 +-
- 2 files changed, 32 insertions(+), 29 deletions(-)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index cecdbda92..7c8ecadaa 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -610,29 +610,34 @@ const wl_callback_listener QWaylandWindow::callbackListener = {
-         Q_UNUSED(callback);
-         Q_UNUSED(time);
-         auto *window = static_cast<QWaylandWindow*>(data);
--        if (window->thread() != QThread::currentThread())
--            QMetaObject::invokeMethod(window, [=] { window->handleFrameCallback(); }, Qt::QueuedConnection);
--        else
--            window->handleFrameCallback();
-+        window->handleFrameCallback();
-     }
- };
- 
- void QWaylandWindow::handleFrameCallback()
- {
--    bool wasExposed = isExposed();
-+    // Stop the timer and stop waiting immediately
-+    int timerId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1);
-+    mWaitingForFrameCallback = false;
- 
--    if (mFrameCallbackTimerId != -1) {
--        killTimer(mFrameCallbackTimerId);
--        mFrameCallbackTimerId = -1;
--    }
-+    // The rest can wait until we can run it on the correct thread
-+    auto doHandleExpose = [this, timerId]() {
-+        if (timerId != -1)
-+            killTimer(timerId);
- 
--    mWaitingForFrameCallback = false;
--    mFrameCallbackTimedOut = false;
-+        bool wasExposed = isExposed();
-+        mFrameCallbackTimedOut = false;
-+        if (!wasExposed && isExposed()) // Did setting mFrameCallbackTimedOut make the window exposed?
-+            sendExposeEvent(QRect(QPoint(), geometry().size()));
-+        if (wasExposed && hasPendingUpdateRequest())
-+            deliverUpdateRequest();
-+    };
- 
--    if (!wasExposed && isExposed())
--        sendExposeEvent(QRect(QPoint(), geometry().size()));
--    if (wasExposed && hasPendingUpdateRequest())
--        deliverUpdateRequest();
-+    if (thread() != QThread::currentThread()) {
-+        QMetaObject::invokeMethod(this, doHandleExpose);
-+    } else {
-+        doHandleExpose();
-+    }
- }
- 
- QMutex QWaylandWindow::mFrameSyncMutex;
-@@ -654,11 +659,11 @@ bool QWaylandWindow::waitForFrameSync(int timeout)
-     }
- 
-     // Stop current frame timer if any, can't use killTimer directly, because we might be on a diffent thread
--    if (mFrameCallbackTimerId != -1) {
--        int id = mFrameCallbackTimerId;
--        mFrameCallbackTimerId = -1;
--        QMetaObject::invokeMethod(this, [=] { killTimer(id); }, Qt::QueuedConnection);
--    }
-+    // Ordered semantics is needed to avoid stopping the timer twice and not miss it when it's
-+    // started by other writes
-+    int fcbId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1);
-+    if (fcbId != -1)
-+        QMetaObject::invokeMethod(this, [=] { killTimer(fcbId); }, Qt::QueuedConnection);
- 
-     return !mWaitingForFrameCallback;
- }
-@@ -1090,9 +1095,9 @@ void QWaylandWindow::timerEvent(QTimerEvent *event)
-         }
-     }
- 
--    if (event->timerId() == mFrameCallbackTimerId) {
--        killTimer(mFrameCallbackTimerId);
--        mFrameCallbackTimerId = -1;
-+
-+    if (mFrameCallbackTimerId.testAndSetOrdered(event->timerId(), -1)) {
-+        killTimer(event->timerId());
-         qCDebug(lcWaylandBackingstore) << "Didn't receive frame callback in time, window should now be inexposed";
-         mFrameCallbackTimedOut = true;
-         mWaitingForUpdate = false;
-@@ -1154,11 +1159,9 @@ void QWaylandWindow::handleUpdate()
-     mWaitingForUpdate = false;
- 
-     // Stop current frame timer if any, can't use killTimer directly, see comment above.
--    if (mFrameCallbackTimerId != -1) {
--        int id = mFrameCallbackTimerId;
--        mFrameCallbackTimerId = -1;
--        QMetaObject::invokeMethod(this, [=] { killTimer(id); }, Qt::QueuedConnection);
--    }
-+    int fcbId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1);
-+    if (fcbId != -1)
-+        QMetaObject::invokeMethod(this, [=] { killTimer(fcbId); }, Qt::QueuedConnection);
- 
-     // Start a timer for handling the case when the compositor stops sending frame callbacks.
-     QMetaObject::invokeMethod(this, [=] { // Again; can't do it directly
-diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
-index c47123dc9..e8c9d5684 100644
---- a/src/client/qwaylandwindow_p.h
-+++ b/src/client/qwaylandwindow_p.h
-@@ -216,7 +216,7 @@ protected:
-     WId mWindowId;
-     bool mWaitingForFrameCallback = false;
-     bool mFrameCallbackTimedOut = false; // Whether the frame callback has timed out
--    int mFrameCallbackTimerId = -1; // Started on commit, reset on frame callback
-+    QAtomicInt mFrameCallbackTimerId = -1; // Started on commit, reset on frame callback
-     struct ::wl_callback *mFrameCallback = nullptr;
-     struct ::wl_event_queue *mFrameQueue = nullptr;
-     QWaitCondition mFrameSyncWait;
--- 
-2.16.3
diff --git a/dev-qt/qtwayland/qtwayland-5.12.4-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.12.4-r1.ebuild
deleted file mode 100644
index 6bc4d61f2112..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.12.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="+libinput xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput=]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-client-no-fake-surfacecreated-destroyed-events.patch
-	"${FILESDIR}"/${P}-fix-stuttering-when-gui-thread-busy.patch
-	"${FILESDIR}"/${P}-client-reset-frame-callback-timer-when-window-hiding.patch
-	"${FILESDIR}"/${P}-client-make-handleupdate-aware-of-exposure-changes.patch
-)
-
-src_prepare() {
-	qt_use_disable_config libinput xkbcommon-evdev \
-		src/client/client.pro \
-		src/compositor/wayland_wrapper/wayland_wrapper.pri \
-		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
-		src/plugins/shellintegration/wl-shell/wl-shell.pro \
-		src/plugins/shellintegration/xdg-shell/xdg-shell.pro \
-		src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro \
-		src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \
-		tests/auto/compositor/compositor/compositor.pro
-
-	use xcomposite || rm -r config.tests/xcomposite || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index d332afccadaa..b41ced16bd1f 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,3 +1,2 @@
 DIST qtwebchannel-everywhere-src-5.12.3.tar.xz 182808 BLAKE2B 03b1e906e4697844e27a9f4fa7c74bb9df228d31c85071299645ff5441577f749b7019097ac9021f3dda02ca290aba74d3494adfb9b04d8614c82586abbf399f SHA512 2dda4351f5f3a5895a955d0ee77e55f758233672005a068d3e840a01d379727f99287fc6c8fb96516f23a5a8c4ebcb61098690fd3351e79be608e28657534006
-DIST qtwebchannel-everywhere-src-5.12.4.tar.xz 183056 BLAKE2B cace515cd75f68d707ac7b8b1932cc224f0924b07f3745d38ab4a2ffe90e3a617b91d0404dd3c43901fc4551a5e872642aed09aa299f45f4449e02993f8c001d SHA512 956c57c019623a2ccc4b4a7fc8ca2404a04862b7a3fdb8d1317dfd0d24d00f73db4698df22a9758667256646129163ea1b3a588435aa01f28e72e35300637458
 DIST qtwebchannel-everywhere-src-5.12.5.tar.xz 182944 BLAKE2B ec2433b839407dc6f46b479f2737881fbaccc52965c655986dc9745979d681476b5fc717e3a4a8bbd2c27edcbb1ec0e9239d6bb06fc3ce8b7585811c0e2bbb21 SHA512 8ea543f29e8f686961b033c1246714b1535d0be730026bef4b4ee172ce602c706d8a16b8391510a302df7be6545007a2f42311eb1aea4da326c3addde16ca2b2
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.12.4.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.12.4.ebuild
deleted file mode 100644
index 24910e034fdb..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.12.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-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 9fd50aa8e167..5000f5c088cf 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,2 @@
 DIST qtwebengine-everywhere-src-5.12.3.tar.xz 249275648 BLAKE2B 7d2404084a510c62b638dd09736130eeb40e494f9594339afc7df6628878aafed778a2785f6848702d51b3a4ef1dc8b333d5e5eeeeb8f930b4da839eb70bc175 SHA512 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5
-DIST qtwebengine-everywhere-src-5.12.4.tar.xz 249328292 BLAKE2B e76d4f0c7081bd4ccbfb8a7eba6e0ef8280b4558bf545eb76bcf87ca03c79912e9e095f7bbdb30693f6ffc2dee61db7a4308cc072d92d78773082b3df238d0b2 SHA512 312c584222ed5e7183af2be8a4f42b84c7fed18c3d4b080bc32bed1bd5c7dc88c9752deaf7afc1b4d9fcd02c8c8a013d32d5be2e7635fec2c085cdbe81998de8
 DIST qtwebengine-everywhere-src-5.12.5.tar.xz 249295448 BLAKE2B 3bbb9ea44ed58127a251b0dc5bd2681b9efbe4709b0c493940c85cedcbf668fe58ae2440c4afbb1e579cd69e504aa7efedd44519823ffed40444d8b3382362e8 SHA512 b485d37dca14f1cf4adf01bd8b1ae52c1d4916d7acf6ed210bc9feaece8efc2aa6cee8a3ef9174b50b767e373379c6a18d14db4426ac53a8c27d2d7b222826df
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch
deleted file mode 100644
index 90bcfc3027f4..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6f3c15d2319ca11c2e31076292f5733baf64d991 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Tue, 18 Jun 2019 10:29:48 +0200
-Subject: [PATCH 2/3] Bump V8 patch level
-
-Otherwise it might use outdated script caches.
-
-Change-Id: I839c6a11c3e1991f232972ad2d87fe6318256307
-Fixes: QTBUG-72532
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
----
- src/3rdparty/chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/v8/include/v8-version.h b/src/3rdparty/chromium/v8/include/v8-version.h
-index 3e703039517..8dacc30c340 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 6
- #define V8_MINOR_VERSION 9
- #define V8_BUILD_NUMBER 427
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
--- 
-2.21.0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch
deleted file mode 100644
index 11b637422694..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2323dc924a3b107647f9e5f0bdbcfc44b9713195 Mon Sep 17 00:00:00 2001
-From: Michal Klocek <michal.klocek@qt.io>
-Date: Thu, 20 Jun 2019 09:09:53 +0200
-Subject: [PATCH 3/3] Fix segfaults with arm 32bit on metrics
-
-Gcc 6 seems to misscompile pair's template constructor
-in std::map emplace, use converting move constructor instead.
-
-Fixes: QTBUG-75097
-Change-Id: Ia50dc9eadb58f713432c0228a4a5aed73b275f32
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc b/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc
-index 6685a5816db..5c5380e007e 100644
---- a/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc
-+++ b/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc
-@@ -23,7 +23,7 @@ UkmEntryBuilderBase::~UkmEntryBuilderBase() = default;
- 
- void UkmEntryBuilderBase::SetMetricInternal(uint64_t metric_hash,
-                                             int64_t value) {
--  entry_->metrics.emplace(metric_hash, value);
-+  entry_->metrics.emplace(std::make_pair(metric_hash, value));
- }
- 
- void UkmEntryBuilderBase::Record(UkmRecorder* recorder) {
--- 
-2.21.0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch
deleted file mode 100644
index 4e3ef674c32d..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e8eec84aac0dc626770a483d503f7b16ab0dbe70 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Fri, 7 Jun 2019 14:18:23 +0200
-Subject: [PATCH 1/3] Fix changing should_override_user_agent_in_new_tabs_
-
-It wouldn't be updated if the custom user-agent didn't change.
-
-Change-Id: Ic31ef485e2cb84903f9b48cb9ad5f9f1a723eb92
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
----
- src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-index a2659263737..4c127f835d6 100644
---- a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-+++ b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-@@ -1230,11 +1230,11 @@ WebUI* WebContentsImpl::GetCommittedWebUI() const {
- 
- void WebContentsImpl::SetUserAgentOverride(const std::string& override,
-                                            bool override_in_new_tabs) {
-+  should_override_user_agent_in_new_tabs_ = override_in_new_tabs;
-+
-   if (GetUserAgentOverride() == override)
-     return;
- 
--  should_override_user_agent_in_new_tabs_ = override_in_new_tabs;
--
-   renderer_preferences_.user_agent_override = override;
- 
-   // Send the new override string to the renderer.
--- 
-2.21.0
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
deleted file mode 100644
index 2390a80c8e8d..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
-	+system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
-	media-libs/libwebp:=
-	media-libs/mesa[egl,X(+)]
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib[minizip]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( ~dev-qt/designer-${PV} )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-60.2:= )
-	widgets? (
-		~dev-qt/qtdeclarative-${PV}[widgets]
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	sys-devel/bison
-	pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES+=(
-	"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
-	"${FILESDIR}/${P}-fix-should_override_user_agent_in_new_tabs.patch"
-	"${FILESDIR}/${P}-bump-V8-patchlevel.patch" # QTBUG-72532
-	"${FILESDIR}/${P}-fix-arm-32bit-segfaults.patch" # QTBUG-75097
-	# QTBUG-76963, not yet upstream:
-	"${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch"
-)
-
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/core/config/common.pri || die
-	fi
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
-
-	qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-opus
-		-printing-and-pdf
-		-webp
-		$(usex alsa '-alsa' '')
-		$(usex bindist '' '-proprietary-codecs')
-		$(usex pulseaudio '-pulseaudio' '')
-		$(usex system-ffmpeg '-ffmpeg' '')
-		$(usex system-icu '-webengine-icu' '')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-
-	pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index d9d1663da8ac..1ab50700a1e4 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,3 +1,2 @@
 DIST qtwebsockets-everywhere-src-5.12.3.tar.xz 235312 BLAKE2B aabe93119aedf18987b4c2211e1cd312a785592ddd0ac371b23e6d5649849bfe231aa24c2de91c20655df7f3a92a614371846060f5b70e09a14f4f7607242fd8 SHA512 212a98d987b4fd16216ac9a1c98e061be6a5bd2e2c4ec8be80424d6f23afeace790fe666abe8a11e2116dc20f17a41ad0c817fceacdfa5f766b93068ac614817
-DIST qtwebsockets-everywhere-src-5.12.4.tar.xz 235300 BLAKE2B 4dd5c7dc3d13dfa63dc1e75eb828751a3f9f77fa1fa2d41ab3b725b622a5ded789f4ae66b36b3203713d36d8a5a28f033e10034e468957a823651af79d56b12a SHA512 b5abd39664f07afe08805876980bc3850a83a032462a7b73e9d5c5458a2f195df85ec903e8a16bf93bde6089ec90ab9b930ea6b1ebb0d99d0955ad36de0613dd
 DIST qtwebsockets-everywhere-src-5.12.5.tar.xz 235468 BLAKE2B ad2418ea447490ab3ad7accc2850b448558c978389925e4c26cd3280ea20e543478fdd3af3db982cbd668a4074ce1b01a488d89313e9b9ff3ceface0fdafdc0f SHA512 970ad232ad1258630404d5e7347721505a780497e1775f88591098f11bca48cbf62c4f02491b133d31e4304eb9e16f923292c5b778e22d530d7a5a4e95d422ba
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.12.4.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.12.4.ebuild
deleted file mode 100644
index 097f97a9d7a4..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.12.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="qml +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 579412bd0964..e51680aa3163 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,3 +1,2 @@
 DIST qtwebview-everywhere-src-5.12.3.tar.xz 131136 BLAKE2B 09ff2437cd66bd0c5896fd2e0d7910d9e3ad14bb710bc6c8d4f9bd9e37b12401e0d82a0fbd74a9b48425419d9120b53cbe93f3eaf2b942e261d91cca0638c8cf SHA512 426227b9b4cb61c0e88958dbaab21e842a25989098a0e94a06fe3efc8a2b9d4a5d3216296c8228da977ef52cd5844b66048bcb84019da4f06de1b1009dfdffa5
-DIST qtwebview-everywhere-src-5.12.4.tar.xz 131184 BLAKE2B 52e994285364fb42e9eba2a277275b148952f6a9f6ef57194e560863af896b29b36088ca8153a7a278886e733efe9ccf4c3940edd56d91474577f585a157fc68 SHA512 c7d5b5225a7edcf642249eb68f0db52ec56cd071f1e17e1f846a210f48229e71c649d99323dc70e9d3bcdca925b0ae1d9c56282d6b31398478ef024b22835fc7
 DIST qtwebview-everywhere-src-5.12.5.tar.xz 131160 BLAKE2B 2860c751b0dd66bae966ab7286d5cd906430d4a860dea47c7b624eb631722bc06a2bb8e8093c0317476edf1242dec84bb322837090d0f35061dce0ad637d9755 SHA512 310beedf88cefc05458e99838e7cb71971aa24ba6c460ff3da804c2ab7f56167ca1067ddca71ee29ced32ea974fe405261f24c8bbcac0c7b69063d7c4e38a4de
diff --git a/dev-qt/qtwebview/qtwebview-5.12.4.ebuild b/dev-qt/qtwebview/qtwebview-5.12.4.ebuild
deleted file mode 100644
index fa902e48fdd5..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.12.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch b/dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch
deleted file mode 100644
index 5f72fef9d34c..000000000000
--- a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: fix notification of QDockWidget when it gets undocked
- Before the patch the notification was emitted only when the docker
- was attached to the panel or changed a position on it.
- .
- It looks like the old behavior was documented in a unittest,
- so this patch might actually be a "behavior change".
- .
- Note: https://mail.kde.org/pipermail/distributions/2019-April/000317.html
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=06b8644953fc5267
-Last-Update: 2019-06-14
-
---- a/src/widgets/widgets/qdockwidget.cpp
-+++ b/src/widgets/widgets/qdockwidget.cpp
-@@ -1171,6 +1171,8 @@ void QDockWidgetPrivate::setWindowState(
-             QMainWindowLayout *mwlayout = qt_mainwindow_layout_from_dock(q);
-             if (mwlayout)
-                 emit q->dockLocationChanged(mwlayout->dockWidgetArea(q));
-+        } else {
-+            emit q->dockLocationChanged(Qt::NoDockWidgetArea);
-         }
-     }
- 
---- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
-+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
-@@ -669,7 +669,11 @@ void tst_QDockWidget::dockLocationChange
-     spy.clear();
- 
-     dw.setFloating(true);
--    QTest::qWait(100);
-+    QTRY_COMPARE(spy.count(), 1);
-+    QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)),
-+             Qt::NoDockWidgetArea);
-+    spy.clear();
-+
-     dw.setFloating(false);
-     QTRY_COMPARE(spy.count(), 1);
-     QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)),
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch b/dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch
deleted file mode 100644
index 777d0195a53f..000000000000
--- a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From deac052a40c93633041da058d5c73c9e91aa76c7 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
-Date: Fri, 12 Jul 2019 12:28:29 +0200
-Subject: [PATCH] Revert "Reset QWidget's winId when backing window surface is
- destroyed"
-
-This reverts commit a9246c7132a2c8864d3ae6cebd260bb9ee711fcb.
-
-The QWidget machinery is way to fragile to reset the winId under the
-feet of QWidget like that. We would potentially need to include all
-the logic in QWidget::destroy. This also ties into the flow between
-QtGui and QtWidgets during window closing, which is still unresolved.
-
-Change-Id: I168048a63c89796398eb5331a80ce3e5c8d9a208
-Fixes: QTBUG-76588
-Task-number: QTBUG-69289
-Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
----
- src/widgets/kernel/qwidget.cpp | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
-index fdb38729032..6f0f39a3443 100644
---- a/src/widgets/kernel/qwidget.cpp
-+++ b/src/widgets/kernel/qwidget.cpp
-@@ -9382,12 +9382,6 @@ bool QWidget::event(QEvent *event)
-         d->renderToTextureReallyDirty = 1;
- #endif
-         break;
--    case QEvent::PlatformSurface: {
--        auto surfaceEvent = static_cast<QPlatformSurfaceEvent*>(event);
--        if (surfaceEvent->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed)
--            d->setWinId(0);
--        break;
--    }
- #ifndef QT_NO_PROPERTIES
-     case QEvent::DynamicPropertyChange: {
-         const QByteArray &propName = static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName();
--- 
-2.16.3
diff --git a/dev-qt/qtwidgets/qtwidgets-5.12.4-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.4-r2.ebuild
deleted file mode 100644
index 9d414296830e..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.12.4-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
-	gtk? (
-		~dev-qt/qtgui-${PV}[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-PATCHES+=(
-	"${FILESDIR}/${P}-revert-reset-winId.patch" # bug 689704
-	"${FILESDIR}/${P}-fix-notification-of-QDockWidget.patch"
-	# Still pending: https://codereview.qt-project.org/c/qt/qtbase/+/255384
-	"${FILESDIR}/${P}-synth-enterleaveEvent-for-accepted-QTabletEvent.patch"
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use xcb xcb system)
-		$(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 2ceccff4ae33..98429ebbea3f 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,3 +1,2 @@
 DIST qtx11extras-everywhere-src-5.12.3.tar.xz 115908 BLAKE2B 9ec7d370630f6c43869f648222ff46368cb57984ae732320974258da5b3905faa372e8fb97c25df8c88ce155c75be601bda28c988cf5b639bf6404213a1dbc54 SHA512 21dda778aaccab44d8c4950fc6cc9fc6748f1f38721d8f775c61754ace81d17a03847cc6fbe98a9d23ea592fd5f6942eedff102d4841daa5847125986c474854
-DIST qtx11extras-everywhere-src-5.12.4.tar.xz 115948 BLAKE2B 275d1db45081c8397844778e1dfea4902ae532c25abb61aeb2c746e5eab8850705d8afe36ab54f1184ca6209ea47e495fab9be9c24d9d042045fff14f234acae SHA512 a6d30a20a94d3c79470dabaecb7f262128d7517911f59baf0cf9e8fad18bcfb318a606ddbe291683a4c2f195e638ee114f67b6fb796031e67193324c6df1511d
 DIST qtx11extras-everywhere-src-5.12.5.tar.xz 115960 BLAKE2B e075f0cdaf6e5b5c57899e8f4440891b1be4e49246a3b7098c235239d1763109aab4e99931488c7585dcf8197b5357905f6f17fe5a8e15b46bec250e2b2aca79 SHA512 1e83c2d350f423053fe07c41a8b889391100df93dd50f700e98116c36b3dbad9637a618765daf97b82b7ffcd0687fc52c9590d9ce48c2a9204f1edc6d2cae248
diff --git a/dev-qt/qtx11extras/qtx11extras-5.12.4.ebuild b/dev-qt/qtx11extras/qtx11extras-5.12.4.ebuild
deleted file mode 100644
index 7754c982795a..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.12.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-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 a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,3 +1,2 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtxml/qtxml-5.12.4.ebuild b/dev-qt/qtxml/qtxml-5.12.4.ebuild
deleted file mode 100644
index a7668e1ef6ca..000000000000
--- a/dev-qt/qtxml/qtxml-5.12.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:xml
-)
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 475132df4b55..3361bb0a9a0f 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,3 +1,2 @@
 DIST qtxmlpatterns-everywhere-src-5.12.3.tar.xz 1389612 BLAKE2B ec5be0189d6e235dbeeff0660756365c6e900f7b56a1e18506e4c4190bcb4dd4f5242144ae53a5f4dc6334369234d0c8f4a05ce1b324a4002adf4da32cf3474f SHA512 4e421f0c78ca74f726f758bd95b33915297922f3b5a4fff84dde2600969f54f3914828fdb7903c7171e192f81966680b6c6bb4750de0be72728124470e7c798d
-DIST qtxmlpatterns-everywhere-src-5.12.4.tar.xz 1389616 BLAKE2B 388817e0131422d884fba7b24f9b1a279eedd907fc485754f387a4a496b8483a59fef6055994eb1b90038934ce4c87403975d72052a5136c0a424fd54de87a9b SHA512 769fb26b1b72bbe3a1fc0c13dee6f12c4bc5280824954194e676331082af91aacecd2c295aa2e566365f4679f19732b1caa3da18825e3560b402b86568b3ac4e
 DIST qtxmlpatterns-everywhere-src-5.12.5.tar.xz 1390052 BLAKE2B dfc8d1a596c2d93c45675b9a6e373294ae0ab52a36f2533e9be03719d7cf78c9c3597243ab01f5ff533cad5953a4a50ef30c109037f4905d9471ff8af97c151d SHA512 30b25e152970bfe51fcdeffa43d11dd51496e5ea6a5da644b13fa0ce4835302ebec651c1ecdcf9590c6689598cea9bd63748aab4ee0ec69f9155dc310a7c04c3
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.4.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.4.ebuild
deleted file mode 100644
index 3075ba68674a..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml qml \
-		src/src.pro \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick tests/auto/auto.pro
-
-	qt5-build_src_prepare
-}