dev-qt: Security cleanup

Bug: https://bugs.gentoo.org/754852 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
author: Andreas Sturmlechner <asturm@gentoo.org> 2021-01-10 10:53:59 +0100
committer: Andreas Sturmlechner <asturm@gentoo.org> 2021-01-10 10:53:59 +0100
commit: 37bcd8a2357a6948aa4d788f6babe299e072c735 (patch)
tree: 8f9b09773aac5b133223ba290541a5aa9289b0ed /dev-qt
parent: sys-apps/busybox: forward stable keywords to 1.32.1 (diff)
download: gentoo-37bcd8a2357a6948aa4d788f6babe299e072c735.tar.gz
gentoo-37bcd8a2357a6948aa4d788f6babe299e072c735.tar.bz2
gentoo-37bcd8a2357a6948aa4d788f6babe299e072c735.zip
115 files changed, 0 insertions, 3102 deletions
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index f9868d499513..c9faaf55f594 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/assistant/assistant-5.15.1.ebuild b/dev-qt/assistant/assistant-5.15.1.ebuild
deleted file mode 100644
index fca5047fefa6..000000000000
--- a/dev-qt/assistant/assistant-5.15.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 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}:5=
-	~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 f9868d499513..c9faaf55f594 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/designer/designer-5.15.1.ebuild b/dev-qt/designer/designer-5.15.1.ebuild
deleted file mode 100644
index 1f61eb738c6e..000000000000
--- a/dev-qt/designer/designer-5.15.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="declarative webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~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}"
-
-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/designer/metadata.xml b/dev-qt/designer/metadata.xml
index 7f1774a4eb6a..d07a54a9ddc4 100644
--- a/dev-qt/designer/metadata.xml
+++ b/dev-qt/designer/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="declarative">Build the qdeclarativeview plugin</flag>
-		<flag name="webkit">Build the qwebview plugin</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index f9868d499513..c9faaf55f594 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.1.ebuild
deleted file mode 100644
index c12bc99adfdd..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.15.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~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
-}
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index f9868d499513..c9faaf55f594 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/linguist/linguist-5.15.1.ebuild b/dev-qt/linguist/linguist-5.15.1.ebuild
deleted file mode 100644
index b1887a6ebd67..000000000000
--- a/dev-qt/linguist/linguist-5.15.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~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 f9868d499513..c9faaf55f594 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/pixeltool/pixeltool-5.15.1.ebuild b/dev-qt/pixeltool/pixeltool-5.15.1.ebuild
deleted file mode 100644
index 9ace8946bc5b..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.15.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 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}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index f9868d499513..c9faaf55f594 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qdbus/qdbus-5.15.1.ebuild b/dev-qt/qdbus/qdbus-5.15.1.ebuild
deleted file mode 100644
index 0446d75dde0c..000000000000
--- a/dev-qt/qdbus/qdbus-5.15.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 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 f9868d499513..c9faaf55f594 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.1.ebuild
deleted file mode 100644
index 8fc278009e48..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 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"
-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 f9868d499513..c9faaf55f594 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qdoc/qdoc-5.15.1.ebuild b/dev-qt/qdoc/qdoc-5.15.1.ebuild
deleted file mode 100644
index e7c033a327ea..000000000000
--- a/dev-qt/qdoc/qdoc-5.15.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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}:5=
-	sys-devel/clang:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index bef80d580ec6..51f131fc6710 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,58 +1,3 @@
-DIST 5.15.1-0-202009071124qdoc-documentation.7z 538292 BLAKE2B 2bfddf75b83783a515f7278e4c9e384e96d58a64f5326d640278dce7d730e011a0fd028ce41efb43d47c36c45cb378101a78c62779600cabff6c108db7146af9 SHA512 48ce574f1a4a888a40ed6ea8b81bb3baaec538c15c534dde15038eaf017bf97bf6714dd711b22a9d00332f4f79041ee20b27a4e0987ef98d48e7fb651df86f32
-DIST 5.15.1-0-202009071124qmake-documentation.7z 343276 BLAKE2B e4b4220bf97cb668b70021c3264713005fbb2b890cad7f19573f079726b84b181764789e0e46557eb8999ca84668e40b1c59836cd8ba4837f38754182d272313 SHA512 56bb705c4dde6e348bc995a0077b36c765e0295622490496d7c634effe5d9ad6e5f8a8239dd799ad0d61cbeb0d244904938d6e97ff91f761cc5f0c057e81ff86
-DIST 5.15.1-0-202009071124qt3d-documentation.7z 5832015 BLAKE2B d68bd281fcbf4c665f2b72602a4f2de779203cebdd870935f21c9514921062e1ca28d802f7d77779ec978752514b692f76f54487d0694c84397efadefcfa52bf SHA512 54d49afed958dc0231880d364c3385f017c72ab9226e1044b9d2b146685d5b5adf8fee44ed2ca58fa0d8f06fa01898724d570185f5b5995b93c5e028206fe959
-DIST 5.15.1-0-202009071124qtassistant-documentation.7z 452382 BLAKE2B a5346fe5790ec841293df776f359cd03ac5ade0b0f562171aa2e8826dfe4234f6116115302453696a640a177722c8361a336b22b9004218806855fc6a296b58f SHA512 ae8fc5447cc8f77da9d71dda38aabfe3605a2b6421da3a396e90a2331fe6042c85d61f80e73097bf1ff1664b063ec4be8ddb9dbb1cb34944f653ecf60436123c
-DIST 5.15.1-0-202009071124qtbluetooth-documentation.7z 2135670 BLAKE2B adef067d9dd456e31bd8b4aaecb1161d2989dd9eec177cb0a39bcb0a03c3dcf123ff2f56c94188814d5de87a93e95f8355ad27f74735bd55aff327e7a9622680 SHA512 866899f2e5a8857f00639bca38b3f9c4b3df07729d0f517c0540b624e0c367cc0f2413b1f16ae4acd47790ecf3845a1934d619bb17cd7a5d5bbb4cf53e236799
-DIST 5.15.1-0-202009071124qtcharts-documentation.7z 8712424 BLAKE2B e40f3431edcea3e1ea6fb6ddfbe45b77c9c4e5bcf0009975588ed11a1e0938bc70465f81795e5961e2eb1ba129ef9973f865d1ef29617753d9dbe15ba1333abe SHA512 9d27d51e59ab0ee63ebff914b4b82d1943597fa63c327dc596290a7426deff41701cf485ecc7abf322d34f2d48cfe60cfbd4b64d891cefdfab1b0bacaf90b432
-DIST 5.15.1-0-202009071124qtconcurrent-documentation.7z 121955 BLAKE2B 7909b193ee7ed546e65188f12ea6aca38a1224a786d53e003eaedd68c17e0ca7a11780d74fe1f034219b8420e47b762246cafc1624199e840d1917e70f9d6518 SHA512 5e79e57c282cae82feb36481b835055e4a429a366429493b753d9c21a424ba0c8af0bb2aa5159457085763bcd09a3ee2b3748b360e5dae54382f754ba7a5ee0c
-DIST 5.15.1-0-202009071124qtcore-documentation.7z 6605850 BLAKE2B 5a40cd2b5acbe67fd1c75441e2508c024be39bdaeac4e1e2f8bc5d507447904fd148e2794808243708fce4f234e7faa096e901417a42996987a060456ee431f1 SHA512 b24d908a79105d8293a31502de51098a5c5b57dc130e29c3844f6fd35dc5b7e4e0a1f6e885070ce039e4869b60151f41dd118270ce79d9df79870c2cfdc8b945
-DIST 5.15.1-0-202009071124qtdatavisualization-documentation.7z 6097823 BLAKE2B dc21616c77f8b62b9a25a197d01cd8aa172095d1834968ec3b91e67db47b6b8cead8d56dfa5423dac255bdb60d96766a835c779811cee043286750841307b71b SHA512 7f86deffade646db69e6eb83310de165da5085bd1bc7a4a0e6c5f9e9af8c744ccd39735283f6162ea51f0e1d0d9a210cb6ccf989d74a2d044efebc7781ec2a0a
-DIST 5.15.1-0-202009071124qtdbus-documentation.7z 394070 BLAKE2B b54535f2846dc236d4cc59665606955b204b4af63b3e9349856dda67938a7e076465c85dd2845047be079c2632ab94a5cd3a46b52552b63e1f49b8fef101d138 SHA512 e7910e53008a94fdcb424ba2140c9b2b919ea6a18602463a7cf7a2c8cde7b000989b064c36d0807b417713ca51a84c32676ae1c3236cfdbbc4a6820a67aacb15
-DIST 5.15.1-0-202009071124qtdesigner-documentation.7z 3531624 BLAKE2B fce3be5bebb24429dfb268f8db43691d81ee23a0b5375eb36feb6ea8287df97f080c6e91c0cd151fd65cf256a923a6281b18ef84a7a044967054a5bd647c829d SHA512 8b45e6a59a25683404b0d6b7e3624724b6369b10e6dd2ddbff717621c31945f004a2f4d1eb08730a68125bc903580fc7421219c98d67dbbd76f259d1ba717612
-DIST 5.15.1-0-202009071124qtdoc-documentation.7z 10133103 BLAKE2B 065b28f08cf1f24e106bb01323149fdb513381d786c9edd0f435e97a7c20f1bfdd0282d34986105a25acb49fd7409d3641228087e4b1f56054089198a0e056f2 SHA512 5f4667b4a7ab35674e375840f4e9fcd4fec01f690574484d937b123227028a068006f7e92dc8759631a96dd89f24b05488011872afdaedb42cf495df4c643810
-DIST 5.15.1-0-202009071124qtgamepad-documentation.7z 237910 BLAKE2B e0698c44fff77ef77318b86cb3e050338460bc13f0d7528bee39d33a16e056d5ddaf0b8d6f0c07268d9088767eaf6e6b3039b7caab38f9e0d8280d0f5b169069 SHA512 f9412152b24d93e0591f3ec594a975a03371e7bb0d6ee37cb06ecd723fa1681dcbbb7d17e5c16a4e285b7564ff7bfff6184449e32378114bcc1d10e75be8315d
-DIST 5.15.1-0-202009071124qtgraphicaleffects-documentation.7z 15995977 BLAKE2B ab201cbadb13e9b297219a0f588d36c0bae2e94a325903c6c353fc7c40360e835d843c488e8f7c7dd1842358777fe7c9d61c627c7cc4587403213d4692c4b386 SHA512 3f5e4cfa09062e421449202c876e6239b8c514a7be5b6999920914e95934dda22cf9de821b52a38d809f37fa53ab6574db7c04c2296533cfe30bfe7c91ada3e2
-DIST 5.15.1-0-202009071124qtgui-documentation.7z 7424242 BLAKE2B 53f305e674aba4e31db5c26e16e58769de00df7744f7ce0982d138f6c06f15f47b2f76c2d64c9d4b2ccf5b16b9d92ebd505051c386912972fc8d2feae84d5c12 SHA512 7f3b45d93a2a0778fd6d633fe4a4da72973de44707db8679780b7bc53374cc74c41327d82c1bb622ed2780dca7326cc7440008ff9f0761386d37879cda824df8
-DIST 5.15.1-0-202009071124qthelp-documentation.7z 217462 BLAKE2B 6f853e7a64412614713e56a98f4cf4d6591de1520f1a11342608a6c9fc27bc68e75fc83a555e1f68c2df37ef148103f29a2ac89df1c6f3fa072ce50b62f09638 SHA512 43bf8785c9e8b72a9f169022e07a0b2b6bb12f893baf272e4758fdee1dfb9cd7fdfa8634cd2cf344c5c1d022ab2765b6832f00115b83cd3e20ca9bd09b3bfb98
-DIST 5.15.1-0-202009071124qtimageformats-documentation.7z 28737 BLAKE2B eefcf534d1ef6e97304b18e5dcf87dcb2ec09d7baeb0ce21b2ec76600676e29a274fac0cd07aec2de0c2f47311045f1957a78992e1fc73a48b6850f1f43a25a3 SHA512 81cd1b2deeaf2cfdd1bc67d6d61bfb163077abaebe49768197141a693d5db2c61c79f2d2815d2df397f5c9da0c5a27c3ed29c2d6cd9c45a208d562612aa5c8e9
-DIST 5.15.1-0-202009071124qtlinguist-documentation.7z 967752 BLAKE2B ebcf53beebf7bd8e1f146f40d4e5e038f32df6cb33c7a5b6b34c818d08fd7a13bf4e64afc13c23710b271f6630098daa63898e6df2ba431cf5f1b30bb828ae7e SHA512 21722bf8d2bddad3c06f29dd3849599b86f575c59fc52b199146a149b2cb352b72b97e3184d07dd354d08ba1b92d6c9ad5ee6582f7afedc0bfa0adf0ab7c2b08
-DIST 5.15.1-0-202009071124qtlocation-documentation.7z 2774529 BLAKE2B d51daa70e488705d4f691708b2e9ffde905458e10ef0992ebf030be6faf00b28119abacbfb45ce49a5c51cf72b7ccd1ba4d5fbc2872e66a1cbbf72efa0e39ea3 SHA512 5a5d589b70431fcc503c0c9612a3342347e013f1ddda2cf03e87630a2e6cd94f3d373c0c413d3f148d6019530764352bdf6094205b478e7e5d3e5982caac3d3b
-DIST 5.15.1-0-202009071124qtmultimedia-documentation.7z 2798015 BLAKE2B 5b9de735c79a3d532bb9456c50ce499ce9f818f388e013bf2b79de0f03964b92fea74f5fa9d62503148346b8118bb10719554040f3a999f24ee2c5c9b84378bd SHA512 b20659575ef9450bca91a30c009a666222ccad7bebc01b89be96a37c53dc2706b459dd3a51f449b4fbc09cc82e41b04b8de8c10c0dd54afffc149dacd76bf3ec
-DIST 5.15.1-0-202009071124qtnetwork-documentation.7z 1504418 BLAKE2B 25f36ab36f7d50b528028f78da8f067facbe7f499878cf5fdba650520adbbffffd3fc157fb5419494d060937adfdd68f5570a79141c38856dde7f56db1ce5ab9 SHA512 bfb0815139bea616689f60750c4492291d6ff00abeca9e24f9f8abc905ff429195462cca524f65da5bddf3b371691955afeaa567050a4c3508e0d4490ffffbe6
-DIST 5.15.1-0-202009071124qtnetworkauth-documentation.7z 243250 BLAKE2B 7f2013ee73c218380e5c2f3259d9644203c8a6627ed72723bb0086202eeccfe6946d514d854f233c0df1eb3e62bd0c23adf9603d83761d8bb8c75e611850786b SHA512 2d7db655b1e1ce375eef6f0eca6e006b6450fe4e582d09a4a14c3643a7e1a6322eeb5dad9999998d8e7276454efc0d499ce26ad8850259dd7f31115909cb68c7
-DIST 5.15.1-0-202009071124qtopengl-documentation.7z 834694 BLAKE2B 71e4842be06ab8d7757aef438ce5ca0108cb462f97860008109c1350fe22cfdc68b5e9616f44b3bc803eaf64df98c26681a0ff4f0b244c1f434e89d359c88a7d SHA512 d994139294533124273323b1884461a33290b7d2c02e168c99cd0ecb1e272003e975e4cf1ed4d71ca848396a2dc9f01d3517bb48d0b03023012fe7e7368aa9d1
-DIST 5.15.1-0-202009071124qtplatformheaders-documentation.7z 77598 BLAKE2B 4f5b1efcae920d40a8f7f1e8e638db2947ccfa906e148f47eeab1ed799dc47b163b23cf2b6b848fc6614315dfa418bcfd0a10ce59f668c3bb6655d61054cd562 SHA512 87942d87a301ae1beb7e1c4921f73a3587b8753b412c11e807039c37dc2b3d32afc1d2a8ee144410e327f3c2935eb80966cb4e8ea64dcb1023edbc2cf6a7e5cb
-DIST 5.15.1-0-202009071124qtpositioning-documentation.7z 583776 BLAKE2B ec9c98d0b1072d38dd93704a66b751ae155dae5a4725b920cecbe33b296ee6f4c08580906c4f505d7910ce3405d2bba3b97d2ce725b1096658b1fccff1f7c1cf SHA512 f03177b79a25e4577d9c66bc3af936542d823b6e7e2091454faeb5cd513f6dbe532c4667bf9442c798c6efa73965c0899fcd411616a23de65de4b1626c8629ca
-DIST 5.15.1-0-202009071124qtprintsupport-documentation.7z 376227 BLAKE2B 8b7fce548e547e237afd50ce5be3d20039ab98d665812e220003b64fbd757f48b77355c9ea5ef7c876805acdfdf29113bc510e5cb48c2bd6f91a16eec827b49c SHA512 fcdcebf664bf3562963801c46cdbfed786a35c1ea52ba800293c4296904d3179bc74a26bf32c04c12b18d526c67293646b8e7762e52e1af46269c08680acdecf
-DIST 5.15.1-0-202009071124qtqml-documentation.7z 1524487 BLAKE2B 144d2fefd85c4d2c9f5a51b36ea7dcc519074f232c91a0954ab73af0c985e4e670f74fc192a5aae8809067f893494b84a3e5f9da62c758dbe48b33063737029c SHA512 56421709ebef3be889ce2beeda9622e912d2e6de98429cb4255931e2a8ab0a4e20e253b525c163d5c03eb86a6e90c6465d15598147a95c97d8bb065faf950c0f
-DIST 5.15.1-0-202009071124qtqmltest-documentation.7z 82597 BLAKE2B 9eb6b84419ccc218e991d00dfd05260a43c8c2e4fd79f0374370b7bf19a2fb1736cb0df3be0c1d590f5003b6a1080860c7b1e34d7810be57e3e44839edc90c18 SHA512 4199b3d1c96835acf00f3beacee3520aecdb9be78b4fd4eba1ef293dbf581dc79b64864ccb9494d29cde3b850aeb4c78aeb280d5e7b27b93a8df98374992b7b0
-DIST 5.15.1-0-202009071124qtquick-documentation.7z 16697884 BLAKE2B bd71ff3d718b69318ccbd2505d702a19e7c93fde8d6d00987a4bcbb635d0dfea607e3f2dbe5abec16b714f26b19e58bedfa016c8028ab17b61f111cab4058523 SHA512 8ceecc12ca34b108e7f94a02d26c6bd8618186cccd3a6b7b35aa00bb7c7680b4be51b8ff2a39253aea2374026097fc2871b7f447f13ccac5506988a0a5a260d6
-DIST 5.15.1-0-202009071124qtquickcontrols-documentation.7z 9347467 BLAKE2B b6bfef9e75e688787a98d1f584d5350bf18e5c7cc58f83b0ee914c83e02631b15bcbcccc613571eb2625504d547e6d11683029c50cab104a3e1a2a998023c427 SHA512 a3e70c8dc6a740ec772beb248125d5bcb38e74ca7adc6a4be0c7042099d8002699004f16c4027d3e6beb47fd37081f01f415cdbafa0e25922a24c8dfae2cf9de
-DIST 5.15.1-0-202009071124qtquickcontrols1-documentation.7z 1956514 BLAKE2B 72e17e6aec4b431772c18b046a0d540dab18b7c6b48286fdf1af207f2ade07947b223233f41ed21cc5abdb43a92045cff2f1710d31c52a38eba029edc45025f2 SHA512 9a1b65951c4a5567dbda228d5a7076924a5222622e9385c7582bf27ee6ba417e2d75407a29fed4cc2ea5193be940ef494654d76c71cc29000baa4c7510107baf
-DIST 5.15.1-0-202009071124qtquickdialogs-documentation.7z 182896 BLAKE2B e99c2be345f577e0ceca24aa810691234c45e4ba970ccbebbd65ef7c0be8d21dec41a2bcbfe6963b4849263723d5d3ef7883f00aa75724768f77efd764a9fd6c SHA512 7cdd9bc3f72b46ea030044c541fb5c715f9c2114b9e1981b68938f454f53a0e33ea0b63b0dfc6e701e3efc96564aed539deea0e2c0fd325df629391fa7f60455
-DIST 5.15.1-0-202009071124qtquickextras-documentation.7z 672442 BLAKE2B 4525eec156eabb6f08b98c450030621c7144e2ac20658b756c5a525b9463b510c411ee662909f5f93c92ec1c5957f34ffd2b5e44df8f8b9e93fd7842476a218f SHA512 6d53d7c6ba054c0800e1c66f26b41c5889b15bbb06731670de33f23f4ab7676ff7b0ba3938179c8e90f95a59bcfd04ff250fcde2d67cd971aa0468a8f1261cfe
-DIST 5.15.1-0-202009071124qtquicktimeline-documentation.7z 149335 BLAKE2B 5edf0974081b2a4b777b4b52e77d8c6e28473ebbbc33116cf4f96954e85a112d6be7e2d234c900ed6bc37f8a49975fef415fc86e0a0b3ecff88ec669589c5654 SHA512 b3025ff50aef9a4ec610226682a317360d1e410341050c49d1ca53d949c5692183ebd835927e71631621fa766f2305b059d82077572c4547c16113a76ba8b0a4
-DIST 5.15.1-0-202009071124qtscript-documentation.7z 598944 BLAKE2B 681b554cf31857d0ef1cd60b984f65db0a7d16694a10b9afc4413c0a02333beae3af482c8a77b6ed8db8b8a4d7f4300eced8b63403ecd0eb2850b442836907dc SHA512 91bcda93f06b97bb9d283bf865c2d5df4bcff1d06c27aa0ec43e0d41474b53ed8db86d25a5fb271028108ebb52890d77a3637cd13d7e94cf93f3e876a6c1ea6e
-DIST 5.15.1-0-202009071124qtscripttools-documentation.7z 85673 BLAKE2B 9d0a6d26ad1e94c43bb7f65e50eee43c76c2946fc06a06ed5396f1d1793a089ada2e7c967fdba6200010138cedf3945825eabc839eb61b8e7a2287d743766bfc SHA512 d1ac0d446a87c1dd13926301fb0d6abf90ef173160bce023a9bd737bf2b373faa63b13ca76ea38607af6d93d787ab8129be3700005dabcee93c90f0db698e240
-DIST 5.15.1-0-202009071124qtscxml-documentation.7z 618872 BLAKE2B 03b6f621ae73654891dd3c8daab7838c16437be5315b21974db04b6a096f115c6809e3930cd493278d5c0351e43199387dc0f11f75ad1ca76297410b0252e473 SHA512 954ad969d1607766954a8643c6881463da651f19fe27f1464b8f0b332feca9ec45593bb86710dc57596cf2cae15eb30f3f1130d15a761126808ff3605f00af93
-DIST 5.15.1-0-202009071124qtsensors-documentation.7z 3391558 BLAKE2B 4761e013dacc61a0f7d58f3175289f5c453da13e7357b054fb5e24f3fcd1ade601679740b4fa365f2af86061e5e219edbf60095f5105aec758f197ec6f46b218 SHA512 dce961cd76331a665e170852a54c104d143b8bb5ed9a6ec0f7c61e7a49d945bf49a5c158ad8305403bbf4c3e97fbeebc53431aaff50264d839ca6927d84a8069
-DIST 5.15.1-0-202009071124qtserialbus-documentation.7z 365712 BLAKE2B c8ca65f0a6306a71e9a9e85147737873a2b3fac8284a0d1cfdcd494e9d0c8a7c13cdc059ccb95fc0b56830b1cb1ab5138196e188a10362d91a734c3780caec93 SHA512 63bb09aa7da289cd413b8e26877cf73fcefa50800558022f48bdb149378e48858c6972572ede9d26932a6aaba01435187923d3fb0f9348712401e86afa1d6c73
-DIST 5.15.1-0-202009071124qtserialport-documentation.7z 278012 BLAKE2B 860e565474474dbd885d0b9e9eef5692348b58a3c6719a968a5264fae9e19157b523ea0ec5ad06d9af0173e83151a608737d6cedad65523a094f2acf94e5843e SHA512 a40d50fedc5d3ffb8ce6ed1c240b00f8229c0aa13d160a0cbdc5db9c3dacb7dbfe5a5f27e94df2f8c78f2b2e5a0417674d81789cd2f31b1ff9ed9eab7baef7ad
-DIST 5.15.1-0-202009071124qtspeech-documentation.7z 133567 BLAKE2B 92021d32cea0e9da723096d8e7a90a1d6d0e25b0bfca80a91e77038d53d62c107ec3a4282e4eb5acb4d4b899ec44578db58c5862c46e1edde1024369259c9038 SHA512 f52f47b75dd7d637ddf3857030ad8e124c8c8e5a7ce96f885c271884d7ac304d6d768d69eb0cac5a081b90e767159032a264e9ab2d099ce0278f3c0666076841
-DIST 5.15.1-0-202009071124qtsql-documentation.7z 882653 BLAKE2B 994ab7753da2d71457d7e2fbb30873f76c428adc55142944f2061304a31d5b394b9b29d18c280a68f0a9dae77c2c27da1b2dae665197acfc1591f4b41536a51d SHA512 7a426ca4df8819033452c48771cff8ffb4ee0057bdad7f8ecd7600488f848c4722fd2599f337ed51720a9ebaf72e683ef31bdd2ae668b11517e407e9cc90ec9a
-DIST 5.15.1-0-202009071124qtsvg-documentation.7z 254381 BLAKE2B a9c5f5381bf6f7e9e8e1f1ecbcccc3aaa4fde2a4c191e03b0c03e7b738c54e5c4ec525dfa29ad0ad9059cfde41aff1fa2b733c9ab55809e50e9b81f2444f0e7d SHA512 8e2fcd5a0e32e530e718c543382b74e63db5f7b6d81fb9830ab95723082df5b78f52b6ba722753086ff885088a2506fbb65275f6904e40b0cc1d38ce4df2bb22
-DIST 5.15.1-0-202009071124qttestlib-documentation.7z 218125 BLAKE2B c9fbef90ebea718ae0cd44fb68b3143baaceeed887e6ee97803b88a45871fc26b8681bbd0a17bd365aca8bf6581d708b75b53419fcb26cf0dde421fcf7acd499 SHA512 e745d4c971e665e378f747d267f98ce3ed3bf75fc4f2160a1478b3ce1b2c0fe38d117ccd3aff67078af5be7500eb8a3dface6d7bdea38f4109978d5ddc581592
-DIST 5.15.1-0-202009071124qtuitools-documentation.7z 158093 BLAKE2B 6cb98fcf3579114605a1072f70a24f6e6669118563c4808db8810345b941989e712ab4ee8ef608769e5e4455275ca279f44e067d6ed45e54ef67f7fc5255eba2 SHA512 ef28e043315e52b76f8a75fb65edc31b9ba79978737f6af8410c011072a9b04d759efc6daaf8ae92e710a8375469be075cec76c75e0f3c3ade6fcca143197d7e
-DIST 5.15.1-0-202009071124qtvirtualkeyboard-documentation.7z 2034337 BLAKE2B 0a6963c3464944e24cf55bd628af11d4efc0d44ba9f77190f75711c9fc98481f6ad882c9d2874b396137a0033206880ba36cb9da39004d343e59b2d3b9d56da5 SHA512 cc6fb2040ac8e9f27eef299a33b532bc394adc741e9fce2d0e91f25c7fe8bb94c5417de9f2a45c178fe13be6136ee47c1fc62ddbbd4ce4a6e24ebfe014050963
-DIST 5.15.1-0-202009071124qtwaylandcompositor-documentation.7z 584384 BLAKE2B 3c0c2992488d09bb89055da0ed14438f29d0ee6943e0878e39be1543d9a2d20a2b89952b63cd9dd2f6a0b71fe55261fc1b8bbe77df014814b4980064986ee00a SHA512 cb878bf84f2643bdbe265ab204545962cdced02246f9909be73a6fefbf6d84baf68294a12a532550a10bad69ced72df64cf8ab2f3b74afd5c8d75f9fde1cedca
-DIST 5.15.1-0-202009071124qtwebchannel-documentation.7z 162335 BLAKE2B 3633285db494cee7ee8025c38db54220a01dc8eb91a6b6a38c9ec40178d2d310549b5a19ed6b20ff8c56a91eea41f3247e5246cc57d365ee35189031b9f48a99 SHA512 27b6e681d39b7befb38f96c5f423f83f1afb371a0fb08300dddd78e0dae1e826aa84727cfce43d2cd94ccc8ee92f79abee3cc7d0997e63285c37abf537e5d774
-DIST 5.15.1-0-202009071124qtwebengine-documentation.7z 2972710 BLAKE2B 742efa1d698d4404ff184e9c623df616ac21030dc628cec0a318d1b6ebba58c8796b7d42c786749fab92335d7c17ee5ff20e92933e77580f6606e0ebb4ccba63 SHA512 ea1c24dcfaa322d5f615a6dd3ffaf1efd7776ffbed23a61bb1bce1edf51365ac927345d9f5fedb48febdee413961eb32e46b5ded61ac207d4a0eb0c76aeb4ae8
-DIST 5.15.1-0-202009071124qtwebsockets-documentation.7z 308099 BLAKE2B 26b1e5aff876aace45a3419ff962b67b99ba49f11033e8c0af3243daf8ed833b7753efea05d220526bdb5b9a9d15320c199233cbfecade47e801e6d8cce86cd5 SHA512 2db8f898430e28d18ef6c6c2e82b22909d10e206a1905f0ee5ac57796c6b6663ecd1aa2802b09ddea504b01ed31e4b50d90a4ec8aed988a7013c67918a7fc61e
-DIST 5.15.1-0-202009071124qtwebview-documentation.7z 119945 BLAKE2B 381c4c5f740ed755ad6cc85b85021a6bf5a7b8890fcbe489e85eb45fe0ffaf5e794ccd1c46dde2cf02519127a897db22f10d6d5a72382db44b0e78bccbc920a1 SHA512 64c1fb314fc596e1a83a7ebfa26a23d1b5728371e913bc37aae45e68a6dfeb4d81c7380768f4c0dbcfdeb11d758f7433ac12a766f8f0a95d098478318eb028cd
-DIST 5.15.1-0-202009071124qtwidgets-documentation.7z 26786725 BLAKE2B b17dbabf982ce7710cfd48d050ea5a126cd8e23cd8cd3d247fc4e0cbbeae98c0be77fcbca7ff0a5c398e08dc0a2b15742a0a5bd1b9a03f156d8712ed42746da8 SHA512 600b9c934fc2fb4047670a7c185b13f204ec44afebfde2ecdbf37f5dc9e1942f5e8f3243e6777670f245e1da84e0757c0354bc81ecc353cfe510636d2db7856b
-DIST 5.15.1-0-202009071124qtx11extras-documentation.7z 36642 BLAKE2B c7b0faaaa1e8a39c57a40e38dde48c580c8a5c6907f134118455fc8c327aa4ffe0325856f879798c57d9445b2616bb9e3bc24c38fd5f12bf10eed8423c7a5bfb SHA512 15bcd109cd5218dcee95f24cf7b370715f6eb075b010472652657339393c4d187ce2d58140c901e1902f80ac5a648360f8ad1dd19358a2cf8be3d719a4d32ee4
-DIST 5.15.1-0-202009071124qtxml-documentation.7z 448276 BLAKE2B 2bc3fa07132270659ef0d1f5140f06897ac4ded4b0380695f721d35fd09c4a2f6e4251801b72c11147f6ae41dbdfc1c0b2d998d0aad71c0d48f1a8e15ede3b16 SHA512 a1a4d1f53e96e86f05fd371d31b12156b971d076d81b5e838af522dbffc6955d58f7b24c7f874bfe8ca627905b9817de8e709ffbb830f267ebb8603b7a58e684
-DIST 5.15.1-0-202009071124qtxmlpatterns-documentation.7z 1199820 BLAKE2B fc0287d1401a911602e2fa5ba17f52bfd1a42a9c7687ae809ecfcffea6fc0d0c6d3d8ce4d9d395d48ea85bd267968ef887a205e9384e4de43178b0c37eb38965 SHA512 0005e22be3a926d8965323c34efd06229d32a364f1937aaf9aba6e0ba8093b518189d9399aa1e6e3fc0d9204bac0e442efe534fdbbc0c9b2fcf4b5ffa7f781ed
 DIST 5.15.2-0-202011130614qdoc-documentation.7z 538409 BLAKE2B 7606868dd6fd0c833571c59889adbc695fd93ca0db389808a3c97e7359a8b05d59d73efc9153849d610692b0f326c3f9973a1d7ed6cca79cd7bbfa91dfb09476 SHA512 e5b0cf8b4ed035751ac23ae215ad01897b8c3d3169edac24c2bc1570aab2adb01d756859f810b9e7ccdb032bcd91d75250a15caadaa7fca639088f8f940ff9dc
 DIST 5.15.2-0-202011130614qmake-documentation.7z 344094 BLAKE2B 7faf9aadc8e35ab5c3fddc3d9e9fcd7c22b177c109e89f173c3a51bf4bb9902d62e1e83a37e87e24d604a0b5e221c1ced32617bd8aaffed0d0b8bd2e99b8dcdb SHA512 f4afb32538345c4b6f77ab0418a4d10809be9647decdfc4b0b750cfb1a93d2e99c685c193775aaa749fe2c27519d8f0f4246f6009473e1e87fceb89fdf6a176f
 DIST 5.15.2-0-202011130614qt3d-documentation.7z 5862854 BLAKE2B 3b579b48996064d7f93a9743d8d955782394f05cba43c29053d448e0ab0576da34437fbb39cfed24054c40882af310183251c5b4da779b65e9ea8df0c636a0cc SHA512 c95b4078a2205a1548ad7633bc54baf22de9fbc9f93dc9416e60103d49955b95e24605361fe0b2b9fd4e19784c6bc0a777a87c4a0e1e2246b934008038aeafe3
diff --git a/dev-qt/qt-docs/qt-docs-5.15.1_p202009071124.ebuild b/dev-qt/qt-docs/qt-docs-5.15.1_p202009071124.ebuild
deleted file mode 100644
index 5298bc869f42..000000000000
--- a/dev-qt/qt-docs/qt-docs-5.15.1_p202009071124.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 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"
-	[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 timeline virtualkeyboard webengine"
-REQUIRED_USE="|| ( html qch )"
-
-SRC_URI="
-	${BASE_URI}/${PV_FULL}qmake-documentation.7z
-	${BASE_URI}/${PV_FULL}qtcore-documentation.7z
-	${BASE_URI}/${PV_FULL}qtdoc-documentation.7z
-	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
-	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
-	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
-	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
-		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
-	timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-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
-	media-libs/libpng:0
-"
-
-S=${WORKDIR}/Docs/Qt-${PV%_p*}
-
-src_prepare() {
-	default
-
-	# Fix broken png file, bug 679146
-	local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
-	pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
-	[[ $? -gt 15 ]] && die "Failed to fix ${png}"
-	mv -f ${png/.png/fixed.png} ${png} || die
-}
-
-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 fab09c46d1bc..c089dc49562c 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,2 +1 @@
-DIST qt3d-everywhere-src-5.15.1.tar.xz 81919836 BLAKE2B e0c617e777dc2562caaee02483bb4c9ec2fd17214ea02505942b074b82e698a82e4c81ef552705872c6c10be3cbab65a1fc3c5aff2c87637639f223583a04ae6 SHA512 5d35f39bd3cb65a4b7490fd3d57a4f62b3ccaad25c7963613d67641927bdc9d895fb436d049de5485a9e8e067c716951e376349cbfc3996af6765adda73d51d5
 DIST qt3d-everywhere-src-5.15.2.tar.xz 81925416 BLAKE2B 358a071f775d460d794ce3451ea6904f9d1ac0a388176ba62f7d6c7c574621cdcd3db8f7af3aaa361e5ac172056e8e8a32b894b401720e93ae2a2cfad4282da3 SHA512 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b
diff --git a/dev-qt/qt3d/qt3d-5.15.1.ebuild b/dev-qt/qt3d/qt3d-5.15.1.ebuild
deleted file mode 100644
index fe2c864d8f49..000000000000
--- a/dev-qt/qt3d/qt3d-5.15.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 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: tools
-IUSE="gamepad gles2-only qml vulkan"
-
-RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}:5=[vulkan=]
-	~dev-qt/qtnetwork-${PV}
-	>=media-libs/assimp-4.0.0
-	gamepad? ( ~dev-qt/qtgamepad-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
-	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 11edd0d40b58..fb34f083fc73 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,2 +1 @@
-DIST qtconnectivity-everywhere-src-5.15.1.tar.xz 2814984 BLAKE2B b1c4e0525fd50af4971d97a4f735e5a9c2fd1bdb72bf2ee01e7136ce57da576d10e4083da7ecd3257471b7a9f7fed3b925b473dcc99ef81a3576fc81abbb7971 SHA512 ad7bad604c466461bcc7bfd889ecbb36e010c89ea1ecf7736f8b0ad49e682a1800cd2507b8d8c0b582c424b176f8179aeec85a6b0fc4ed933f8b6032e935d39a
 DIST qtconnectivity-everywhere-src-5.15.2.tar.xz 2815492 BLAKE2B 0702601266d46669e0a39740b6df539b1d3f6dcb62d06b14f5ba89782e9bd38faa391892841434feccd9599eef09c7c7238efb82e11a0633e73f58dd721d3324 SHA512 a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.1.ebuild
deleted file mode 100644
index 50504a16238b..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}:5=
-	~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 659923367bdb..079eb701fa00 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,2 +1 @@
-DIST qtcharts-everywhere-src-5.15.1.tar.xz 4251664 BLAKE2B 392464bfd9fecadf59f759284ff530a5dbeefa0ea31a2ec134538f0abe21ef517be319ab51ff0f0d0a29f68a4c7b3a2c8905484cd193a33626e6381c11880822 SHA512 7e644d4a674f175745646f8b541c8cfd972853fdf3a3ee5d0f7c23f035ae81cef0671292535fe65b1c276e4c54c7a48db1a1d2f9be97834513d154eea1666f3c
 DIST qtcharts-everywhere-src-5.15.2.tar.xz 4251992 BLAKE2B 84a683f0ef327437ce801f3b1e0622e31bbc69c33173b3a52e66191120189b6c46e5840ae72861093a9c2f37cf486494fd947a75bd40c8dc2fd54cfd0324eb41 SHA512 d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f
diff --git a/dev-qt/qtcharts/qtcharts-5.15.1.ebuild b/dev-qt/qtcharts/qtcharts-5.15.1.ebuild
deleted file mode 100644
index 8a4f4e2ff532..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.15.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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 ~arm arm64 ~ppc64 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 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild
deleted file mode 100644
index 5dc681ed53a2..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild
deleted file mode 100644
index d893c6ff73df..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/$(ver_cut 1-3)
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="icu old-kernel 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/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch"  # bug 703306
-	"${FILESDIR}/${PN}-5.15.1-timezone-1.patch"                   # bug 737914
-	"${FILESDIR}/${PN}-5.15.1-timezone-2.patch"
-)
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-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=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	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 ce87eba0c840..7a6cc71d24ed 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,2 +1 @@
-DIST qtdatavis3d-everywhere-src-5.15.1.tar.xz 5191624 BLAKE2B ac6f6591f12e00bd9e473da0441d6863b1ffc44d125998a530a3993e9489ee56ed5c9d30e9842fc2b4a4b22110a0296709834582025d50c34653f90be5f08393 SHA512 3f11cddebd29aa90ce62fa19f9ab33026393bf95525bea7c4514e04acef23db9dbfdf000aa885aa2f823b1cd6ca99ac2a1f8afaabe67ee13785d5e4650aa4c97
 DIST qtdatavis3d-everywhere-src-5.15.2.tar.xz 5191436 BLAKE2B 2c319d7569f4dd62711f4de23661413f6d1a19ef1653543506afcdb455875447cb84980d780fefdb677f0856075e0b1df4525662bed92ae9b6272f91112c8f58 SHA512 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.1.ebuild
deleted file mode 100644
index b14bfaf7cb43..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 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-only qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
-"
-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 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtdbus/qtdbus-5.15.1.ebuild b/dev-qt/qtdbus/qtdbus-5.15.1.ebuild
deleted file mode 100644
index f0425f0dc006..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.15.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	>=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 8a1066681784..71839bb30c0d 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,2 +1 @@
-DIST qtdeclarative-everywhere-src-5.15.1.tar.xz 21558724 BLAKE2B 15da5471799e461e5f5983fb0d947cad9d635a1bb0760da0b709f273ba9a9846df442f424d2009e857d831695d14a92c9be941270a07dc0f33cc46382ba44e6f SHA512 193ec706b764330a2ae00614b13482b7586642f9cfd32458e8c975daa07ba25f0f9887de0918c4034f52f613b860677c09c46a3b7d07d4229446cfc0805bcccd
 DIST qtdeclarative-everywhere-src-5.15.2.tar.xz 21559880 BLAKE2B 07fa82a55f79c081cf3cb713e6b90274f2b2c420eba958042f58989502e2ae572294c4cd02eb73767e87d84c9173fb154e45370c043f6adfc7fb1a93377e2edc SHA512 a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild
deleted file mode 100644
index 4d0bd69acb5e..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtquickcontrols-5.7:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-)
-
-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 f9868d499513..c9faaf55f594 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qtdiag/qtdiag-5.15.1.ebuild b/dev-qt/qtdiag/qtdiag-5.15.1.ebuild
deleted file mode 100644
index edfbbd07b52f..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.15.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 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"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-# TODO: we know it is bogus, figure out how to disable checks, bug 728278
-DEPEND="${RDEPEND}
-	~dev-qt/qtxml-${PV}
-"
-
-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/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index c7830c2b51e1..98e030844561 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,2 +1 @@
-DIST qtgamepad-everywhere-src-5.15.1.tar.xz 387004 BLAKE2B 26e7e766121b18851f28c514e4cb7c144f1cce506ef80dc9db4034639df0c77671b5be618d318bb20c8aba290f1a3ed1d99d3a23fac83bc0942063d2cb4f77c2 SHA512 f74933f9e28d0db03d30743e7d75c7a1ba28fa03d97aa894b5cbc306a2d501c27ec40eb84c6b999a6e5ed01b3126bfa992a3a3ca28246310edfe1f2fc12c1d88
 DIST qtgamepad-everywhere-src-5.15.2.tar.xz 387084 BLAKE2B bced25244afb2f97adb7b05dbe68021923c45083abaeec92ff405a8c65b89910803dcfe28f4982f9d54dacab616b9917c7cd04b475ac7c36e8002bb6cbbc9b6a SHA512 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.1.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.1.ebuild
deleted file mode 100644
index 5354d14f6fb0..000000000000
--- a/dev-qt/qtgamepad/qtgamepad-5.15.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Qt module to support gamepad hardware"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-IUSE="evdev qml sdl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[evdev?]
-	evdev? ( virtual/libudev:= )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-	sdl? ( media-libs/libsdl )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt_use_disable_config evdev evdev \
-		src/plugins/gamepads/gamepads.pro
-
-	qt_use_disable_config sdl sdl2 \
-		src/plugins/gamepads/gamepads.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 4eb2d6b9e2e9..7b92e4abf1dc 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,2 +1 @@
-DIST qtgraphicaleffects-everywhere-src-5.15.1.tar.xz 14040940 BLAKE2B 1e49e58efeedadccb76c680ef80b017fbf5ff62df25140e0ef7012caacab0db67307f1a6ffd0cfe28e76b67ace61c858b1e34994c700b2a533233b9659efb970 SHA512 651f8d96199b6324726fcf97eebf16a3ee40e5a9523a3c03255ca4201228b8d02314d5dd9722f59d44f09b4ff8dd722fb276b9af7f65728693a2c4ee62f781c1
 DIST qtgraphicaleffects-everywhere-src-5.15.2.tar.xz 14040900 BLAKE2B 15564a1f849520adcf5cdaecf9ce015a4143c2843e339f11b291c7799242210187336a8894fa67608c172a9f1df9695124da470c67fc0448b0d1fefe59a89238 SHA512 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild
deleted file mode 100644
index f778c7d5a49a..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 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 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtgui/files/qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch b/dev-qt/qtgui/files/qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch
deleted file mode 100644
index 3e4187b22a06..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 65243ad7aef48af4689ea4454916b504025b5051 Mon Sep 17 00:00:00 2001
-From: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Date: Fri, 25 Sep 2020 14:10:58 +0200
-Subject: [PATCH] Emit QScreen::geometryChanged when the logical DPI changes
-
-Add the missing call to QScreenPrivate::emitGeometryChangeSignals()
-along with an emission of physicalDotsPerInchChanged()
-since that is calculated from geometry and physical size.
-
-Rearrange the code in
-QGuiApplicationPrivate::processScreenGeometryChange()
-to prevent duplicate emissions of geometryChanged(),
-physicalDotsPerInchChanged() which this change would introduce.
-
-Amends 5290027e3bab75f14fc0a2b7c206594d9cb91e76.
-
-Task-number: QTBUG-76902
-Task-number: QTBUG-79248
-Fixes: QTBUG-86604
-Change-Id: I3dc2ec5ccd9c6413e92f9246242f323e8afc5e57
-Reviewed-by: David Edmundson <davidedmundson@kde.org>
-(cherry picked from commit 5c7307775d32ae0a54acad8ae7a1c9d3cff7d45e)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/gui/kernel/qguiapplication.cpp | 11 +++++------
- src/gui/kernel/qscreen.cpp         |  6 ++++++
- 2 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
-index 239a78313c5..ef090605819 100644
---- a/src/gui/kernel/qguiapplication.cpp
-+++ b/src/gui/kernel/qguiapplication.cpp
-@@ -3162,13 +3162,14 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP
-     bool availableGeometryChanged = e->availableGeometry != s->d_func()->availableGeometry;
-     s->d_func()->availableGeometry = e->availableGeometry;
- 
--    if (geometryChanged) {
--        Qt::ScreenOrientation primaryOrientation = s->primaryOrientation();
-+    const Qt::ScreenOrientation primaryOrientation = s->primaryOrientation();
-+    if (geometryChanged)
-         s->d_func()->updatePrimaryOrientation();
- 
--        emit s->geometryChanged(s->geometry());
-+    s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
-+
-+    if (geometryChanged) {
-         emit s->physicalSizeChanged(s->physicalSize());
--        emit s->physicalDotsPerInchChanged(s->physicalDotsPerInch());
-         emit s->logicalDotsPerInchChanged(s->logicalDotsPerInch());
- 
-         if (s->primaryOrientation() != primaryOrientation)
-@@ -3178,8 +3179,6 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP
-             updateFilteredScreenOrientation(s);
-     }
- 
--    s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
--
-     resetCachedDevicePixelRatio();
- }
- 
-diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
-index df628fcc73a..a1afc1ba143 100644
---- a/src/gui/kernel/qscreen.cpp
-+++ b/src/gui/kernel/qscreen.cpp
-@@ -88,6 +88,9 @@ void QScreenPrivate::updateGeometriesWithSignals()
- void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged)
- {
-     Q_Q(QScreen);
-+    if (geometryChanged)
-+        emit q->geometryChanged(geometry);
-+
-     if (availableGeometryChanged)
-         emit q->availableGeometryChanged(availableGeometry);
- 
-@@ -96,6 +99,9 @@ void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availa
-         for (QScreen* sibling : siblings)
-             emit sibling->virtualGeometryChanged(sibling->virtualGeometry());
-     }
-+
-+    if (geometryChanged)
-+        emit q->physicalDotsPerInchChanged(q->physicalDotsPerInch());
- }
- 
- void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen)
--- 
-2.16.3
diff --git a/dev-qt/qtgui/qtgui-5.15.1-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.1-r1.ebuild
deleted file mode 100644
index 3e1ba3f077d6..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.1-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 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"
-SLOT=5/$(ver_cut 1-3) # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
-	+libinput +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}:5=
-	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:=
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		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-only::OPENGL_ES
-	gles2-only: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:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-	"${FILESDIR}/${P}-emit-qscreen-geometrychanged-when-dpi-changes.patch" # QTBUG-86604
-)
-
-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 X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X: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-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb)
-		$(usex X '-xcb-xlib' '')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index f9868d499513..c9faaf55f594 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qthelp/qthelp-5.15.1.ebuild b/dev-qt/qthelp/qthelp-5.15.1.ebuild
deleted file mode 100644
index 5dddcc287a33..000000000000
--- a/dev-qt/qthelp/qthelp-5.15.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~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 36cbccc0dc2b..d804150e2318 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,2 +1 @@
-DIST qtimageformats-everywhere-src-5.15.1.tar.xz 1807112 BLAKE2B d90e99c7a374c7aea73a04ba58c537225bb1c3e24d6af7c68e247f8473583dadd6eb369f7c2d9a71f56e27ddc84560ade933c63c549a4739f8e22c8a4cb5d0da SHA512 90da1c76b16dc5ea4ba99372208e3b10619efc4d131686ac6ab4a963ab0177ff9eee9155af564d72052f4ae1c21f06431ab66aa4e55b3c864f015b63ad75c107
 DIST qtimageformats-everywhere-src-5.15.2.tar.xz 1806740 BLAKE2B 11da7926a50c17d5a36259d15a5c7e6af68f9f2e7e26626b7e04a031ae428a8d220daa8fa4461efd4b8db85bcbaa1ccf24b72271f3599c7298a4d1a49c25f9c3 SHA512 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.1.ebuild
deleted file mode 100644
index e839a0613b3b..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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 c56e590fa848..d6548eb5847d 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,2 +1 @@
-DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
 DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f
diff --git a/dev-qt/qtlocation/qtlocation-5.15.1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.1.ebuild
deleted file mode 100644
index b8c3658beb8a..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.15.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 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-libs/icu:=
-	~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/imports/locationlabs
-	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}"/src/location || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 3a9b595dbbbc..696b51d2b52e 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,2 +1 @@
-DIST qtmultimedia-everywhere-src-5.15.1.tar.xz 3825940 BLAKE2B 8a86e77b37c7af0226420025f23bcea6aaffcf885f7c56945faa8606bdaf003b29013b452ee2cd44cb1abe7adf260af06f099b7af23664110a97a0dab0574a36 SHA512 9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9
 DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild
deleted file mode 100644
index 33eb59e9fbe4..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~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-only? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2-only=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-		src/multimedia/multimedia.pro || die
-
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
deleted file mode 100644
index d78e19293096..000000000000
--- a/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-From faefff58d6669a41ed7831589420c4413bc28f97 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] QSslSocket: add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 17 ++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 29 ++++++++++++
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 +++++++++++++++++++
- 6 files changed, 99 insertions(+), 3 deletions(-)
-
-diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp
-index 6f1fb26add..eba5a72951 100644
---- a/src/network/ssl/qsslcertificate_openssl.cpp
-+++ b/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -658,7 +658,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp
-index abc398b209..c2f90be009 100644
---- a/src/network/ssl/qsslcontext_openssl.cpp
-+++ b/src/network/ssl/qsslcontext_openssl.cpp
-@@ -397,16 +397,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- a/src/network/ssl/qsslcontext_openssl_p.h
-+++ b/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 6239537949..6f5e7fd6e2 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -605,7 +605,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 2f57998cea..c5779dd285 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -145,11 +145,14 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return
- DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
-+#ifdef OPENSSL_NO_DEPRECATED_3_0
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
-+#endif // OPENSSL_NO_DEPRECATED_3_0
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
- #ifdef TLS1_3_VERSION
-@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -843,17 +862,21 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(ASN1_STRING_get0_data)
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-+#ifdef OPENSSL_NO_DEPRECATED_3_0
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-     RESOLVEFUNC(EVP_PKEY_param_check)
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-+#endif // OPENSSL_NO_DEPRECATED_3_0
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
- 
-@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index 018962bcc1..62cf23ae38 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,20 +237,43 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
-+#ifdef OPENSSL_NO_DEPRECATED_3_0
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
- void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
-+#endif // OPENSSL_NO_DEPRECATED_3_0
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +299,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +314,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -497,12 +536,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +769,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.26.2
-
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.1-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.1-r1.ebuild
deleted file mode 100644
index 38835c81708f..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="bindist connman gssapi libressl libproxy networkmanager sctp +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	sys-libs/zlib:=
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.1.1:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy:libproxy:
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:network
-)
-
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) # Bug 562050, not upstreamable
-
-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 '')
-		$(usex gssapi -feature-gssapi -no-feature-gssapi)
-		$(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 7aa42eca0a74..e7e5b552beb0 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,2 +1 @@
-DIST qtnetworkauth-everywhere-src-5.15.1.tar.xz 141416 BLAKE2B 428f55b4d08c88b837b4c3397e13d7296855fd930df0fc319e564709993b4cc4dc7e1f2179c26f7f08e1b33172f62a4e1f7f373439f9ca341cbc821083dce6dc SHA512 2c22acf4842f2e26c514ea48bd4e21f466571c1993b811495c1eb9fe22ea66a687ca882c9ed09b38c00a9a6616b13d44021e0d9a65020f4ab9495d6e8c64d282
 DIST qtnetworkauth-everywhere-src-5.15.2.tar.xz 141688 BLAKE2B dc850ffb257e2f2c8ece0d8676cf91454df49550883548206d1362946d09bd0ddf74b2a73ea4860c1cbf68f59f0d06312a7d21279f1401bf27c11b66341df95c SHA512 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild
deleted file mode 100644
index 6962e0be789e..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 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 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtopengl/qtopengl-5.15.1.ebuild b/dev-qt/qtopengl/qtopengl-5.15.1.ebuild
deleted file mode 100644
index 9832679e0b3c..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.15.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="gles2-only"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	!gles2-only? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index f9868d499513..c9faaf55f594 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qtpaths/qtpaths-5.15.1.ebuild b/dev-qt/qtpaths/qtpaths-5.15.1.ebuild
deleted file mode 100644
index 8cf43c4c112c..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.15.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 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}"
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index f9868d499513..c9faaf55f594 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,2 +1 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.1.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.1.ebuild
deleted file mode 100644
index 3082414675cc..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 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}"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index c56e590fa848..d6548eb5847d 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,2 +1 @@
-DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
 DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild
deleted file mode 100644
index 00e76ee9b7d5..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 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 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.1.ebuild
deleted file mode 100644
index babe7326c5b9..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	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-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index eb2117a21d07..772be7c936eb 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,2 +1 @@
-DIST qtquickcontrols-everywhere-src-5.15.1.tar.xz 5983304 BLAKE2B 14ec58e4a1ae70617c74bdd5c3cd992e0c3a2c96540963edc2cba796e7730607df331167a928fd2e2dedc27457b4b27824b680b2670ca8e538423290d8cd6776 SHA512 71e6ee040bc76dc1576d31ff2c1d687e115f4c6dc63307e64c8173c2441835923375ee6b7f5473b3ec8c586f34e04b061b9a9e16b7f34b4075cfa0278599d2ce
 DIST qtquickcontrols-everywhere-src-5.15.2.tar.xz 5982344 BLAKE2B 425bf2841cf12dd636955abeeb520dda580f6b509c01562192d8f2c91d7a9c32349992cbb9f0c1f84a12a98c135656158660ed2d7b21fda204927d0c5255f708 SHA512 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.ebuild
deleted file mode 100644
index 3ca97181e2ac..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 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 fc09c3f5228d..203c90e379ab 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,2 +1 @@
-DIST qtquickcontrols2-everywhere-src-5.15.1.tar.xz 8282444 BLAKE2B 94be5403a3642ceb1ce8eb7ceae2a116743f5ee75c0614448bbfb846918d108f3c5bb6ad881bb63eb30082f0bbeed28a49e32456d335e67f19dc65418c76216a SHA512 ecb75619e80b737e3ae214f65a5175d933f8dc7832eb4eccd469fc1cb1eb85ef5c47f81563165da2d75abf15d7c47b868e68ab758d95183371b4ef64e7c52a39
 DIST qtquickcontrols2-everywhere-src-5.15.2.tar.xz 8284692 BLAKE2B c5c4550ff75bf655969b8601f36c38a0d5a6c9dbe406bc03d431c133f8f0b83a89098c3a64afa4073e4810ee73016a19e11fde1685732c3a9124ddaa2b21393f SHA512 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild
deleted file mode 100644
index d9241d146306..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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 ~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}
-	~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/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 329365470d3d..685f69e4d0f0 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,2 +1 @@
-DIST qtquicktimeline-everywhere-src-5.15.1.tar.xz 102556 BLAKE2B 25b0f9928e301f851613a288bb686ec65ce576998592013b4e8cdfade9114295adf3a1a60b0a792d5eea446ea2315a5531348d24d99e90f7fdb0251162e56cbf SHA512 698d91ff998f0075956fc27897708c75c4ece662f2152449cf2416f84ff17b6b7fd309c5705d1152fe814a646122985758b073bd8fb0ea5456b09338ad9dc6c2
 DIST qtquicktimeline-everywhere-src-5.15.2.tar.xz 102624 BLAKE2B 65cd3ba114e8da442a32ebe43d36b653b3d9a35b65d4fd0eaf17985545ce918cf45da9484094ee889fe56d935c9b988a1deef1c7c416bcfd3cf153fd458eadbd SHA512 2ea623bf2d74ce4dea8e8639a9a8e4bbc9cfaf7b9ec84eec3da3b41b580962cfa6c443c8c47d7dfe312885f4250ccd6a7c91ca1cbbb0fe8385d0f41ad44c3b92
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.1.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.1.ebuild
deleted file mode 100644
index bf8d344fb0b3..000000000000
--- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qt5-build
-
-DESCRIPTION="Qt module for keyframe-based timeline construction"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 397b36e2dd1d..54fed450c1df 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,2 +1 @@
-DIST qtscript-everywhere-src-5.15.1.tar.xz 2663232 BLAKE2B 3bc0c6bce1f7792fa67cc05f1948b3ca82a4ba5c3166f55860ba83f5b9a352d2eddeb9586a967e02251e1be143b6f1aeefcfd7dca627c207190ab1b39b2f755a SHA512 f97bdf0a3a402f2658d23c92d2f0d916bda68b63f1f140f90cb99176e969736758d50cbdc36c5a4b135b08cb74c117dd92c29bcbb41b1a28189af9180604b8ba
 DIST qtscript-everywhere-src-5.15.2.tar.xz 2663016 BLAKE2B f3cf09396fbcd9c386de9628042d2b70263343fec3e1fa49e53e705f56802a244373a37e5daafe6d90252ad67a8b1d3e0446aa4520ff8ff4a8bd010951a5d86e SHA512 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32
diff --git a/dev-qt/qtscript/qtscript-5.15.1.ebuild b/dev-qt/qtscript/qtscript-5.15.1.ebuild
deleted file mode 100644
index d2aa2181a86a..000000000000
--- a/dev-qt/qtscript/qtscript-5.15.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 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"
-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 6dc675b61ad5..8e018db4479d 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,2 +1 @@
-DIST qtscxml-everywhere-src-5.15.1.tar.xz 434168 BLAKE2B 7957a43ff527763137dfab45bec9242e8ca9a5d308ab0b7d1d9057f8e362f24ef73de19e61e1301922be87082ca07eda1524704916769875e5ef879710c661d2 SHA512 893c3b247578c330db9b828e28e4df83b0e966bb469f1f453569e0226a8181b642c37f2198ff4194bec7997daee9578bebaaa7166bf1be8b67693edd0fbac082
 DIST qtscxml-everywhere-src-5.15.2.tar.xz 434204 BLAKE2B 8deaa46eb784690937160470b20dc01ae1b2ee80be89f1f19a22e1e2f2252d3d33427e96bb97b4ec8033b54a78c2a73e3b00fe3bbbe061e9b9bfb299801847fe SHA512 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8
diff --git a/dev-qt/qtscxml/qtscxml-5.15.1.ebuild b/dev-qt/qtscxml/qtscxml-5.15.1.ebuild
deleted file mode 100644
index f85c0919e340..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.15.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 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 45524a72ab9c..c6b24fe48dbd 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,2 +1 @@
-DIST qtsensors-everywhere-src-5.15.1.tar.xz 2057232 BLAKE2B d4b609db7a73fbaf8cb3da02e34639491a778dab10061de7887bc76f39bcf712d9529fffd1712f94551da350bb9f0f823eac48a6d9be0a4d73e0fe9753bc475e SHA512 ef0757125a6c5b89e206661d1d0e0674b673a81e1a0be1de9de2fdcd701fd507b0b47e1b67be013cbebbf846f593e37e4ef2941dcec4b78028019820d1fe7c3b
 DIST qtsensors-everywhere-src-5.15.2.tar.xz 2056944 BLAKE2B 49f4e91027b122a16d65d953275b8720ecb9c12e9bff3a190df59dba703f6f3f8e8ec8c8fec1084154ec7a03a9a2c5d2fe196ec09ddf8f2282c16edd3873a965 SHA512 d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b
diff --git a/dev-qt/qtsensors/qtsensors-5.15.1.ebuild b/dev-qt/qtsensors/qtsensors-5.15.1.ebuild
deleted file mode 100644
index bc68f84ee2a7..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.15.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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 60f4f7e2324a..7c8d3a7a2146 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,2 +1 @@
-DIST qtserialbus-everywhere-src-5.15.1.tar.xz 356308 BLAKE2B 980c78aefbbfae6526d65ddce65276ec03b3c781529938d5a43a8e285dbb6f51412f54d7f9c17d6c4c8db3e9734847c0134805fd45367c39508636fb9c801d91 SHA512 cd7e0d721aa46a59239f44c6b0122509aba2237e0e62ea5399b4d4924601a9def989dd8b5d17fdcc46b41491d582d82b46c7efdfb9277ac1f06da7f1e2a1a859
 DIST qtserialbus-everywhere-src-5.15.2.tar.xz 356360 BLAKE2B 491f3a7b9df8f58496cff1c4fea87615335486ec834f859029340c7e34551e1127ce4e2689f16e06e195e40691300475ccace19c1fd43fefe0a56c10961184c2 SHA512 c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b
diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.1.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.1.ebuild
deleted file mode 100644
index 2b783f499663..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.15.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 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=""
-
-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 58632c850da6..4fbf20380e3d 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,2 +1 @@
-DIST qtserialport-everywhere-src-5.15.1.tar.xz 321472 BLAKE2B 6aa086b8ec8d79abbf1f428913800a67e1a48fb8629c10058fc464b913f3840a9dc06084bf181749b543f4795400b93f133ffe74cbc546986bf48e01317bb883 SHA512 5d2e9742d1c5f784375b3d0bf05e227abf1f358f4ba60e66044378b60ac256dda2ab5ecced07c68ca8d93fe894617050821654200e1faa12f4cca112a4fbd2a4
 DIST qtserialport-everywhere-src-5.15.2.tar.xz 321496 BLAKE2B 1a2d1a925a1f8224de6babad131efa9bb2e417574be939be35edf3a3b9f34a7fb12cc282f94ee2d8e52178cec7679caf1402f5a45a14bb15a546023fed494907 SHA512 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b
diff --git a/dev-qt/qtserialport/qtserialport-5.15.1.ebuild b/dev-qt/qtserialport/qtserialport-5.15.1.ebuild
deleted file mode 100644
index 23658e243ffe..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.15.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 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 8d287b67e161..cb4d63847263 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,2 +1 @@
-DIST qtspeech-everywhere-src-5.15.1.tar.xz 101772 BLAKE2B 8a61ff9d5b0ba33ef3c82e26f3e4ae91ff0a6af848ae2bd26c0f0850cab0cbc701698c712e528cb6bb9a66ac699519f8235cb2c62edabc4506bf397ca747401c SHA512 0e2c82ea72b5bff5b36f3d833d80dec68b39f3b9c3ca4d9c9fa29f0419a45dfb19ac59fb105136c551f6bbe60ad32af0f4aaa6abafb5bc61bc5d85ecb94b326f
 DIST qtspeech-everywhere-src-5.15.2.tar.xz 101940 BLAKE2B 0b100fddac7bc880b79914be54a8618e3e31e9a2486e8cd4ab9f65eabaec605d9aba7c66f71569466798b9cc94e97a2e136868a6f8eda3208f9d0a9515e71ac9 SHA512 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05
diff --git a/dev-qt/qtspeech/qtspeech-5.15.1.ebuild b/dev-qt/qtspeech/qtspeech-5.15.1.ebuild
deleted file mode 100644
index ce5caf530389..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.15.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 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 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtsql/qtsql-5.15.1.ebuild b/dev-qt/qtsql/qtsql-5.15.1.ebuild
deleted file mode 100644
index 3b493c72fbbb..000000000000
--- a/dev-qt/qtsql/qtsql-5.15.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	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
-)
-
-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 1bea74d964fd..84e4dea0c65d 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,2 +1 @@
-DIST qtsvg-everywhere-src-5.15.1.tar.xz 1885556 BLAKE2B b17906bce25066581fa4f53c4b35dad918da737fec8a966c891a150a242a787f231619fa6b1a303d02edfd7cde4a977fc3c0f94eb993bef56e4dfdee81892f20 SHA512 c0289bbce4682eef9cd87811ad11a4ce2141cb89bd026f9cc595123e6b4ebbe9e81a91b54bcf25fbf4225bc66e8a5e4f49e4fabde43e9da066583f22aab4f35f
 DIST qtsvg-everywhere-src-5.15.2.tar.xz 1886268 BLAKE2B fee60a9d769e4c8962d084e98cd4c1a958ba926c8b4482f5b60b596a34944576cddfb46c4e04bd4a67cba7dfbdc7e29e61d8b5025cc7d2a1ae063f81eb31a114 SHA512 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730
diff --git a/dev-qt/qtsvg/qtsvg-5.15.1.ebuild b/dev-qt/qtsvg/qtsvg-5.15.1.ebuild
deleted file mode 100644
index 558cc0f0b7f6..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 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"
-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 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qttest/qttest-5.15.1.ebuild b/dev-qt/qttest/qttest-5.15.1.ebuild
deleted file mode 100644
index 25b708984fb2..000000000000
--- a/dev-qt/qttest/qttest-5.15.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-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 d7bc64941955..d37d2b5437c1 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,2 +1 @@
-DIST qttranslations-everywhere-src-5.15.1.tar.xz 1419252 BLAKE2B 80656f949a8a408953169e9fb611887a73f302025a8411cddce40956b72fd4ac7bfb580fa37c2e932a5f7fe1388503bb30117b675cf65a8c7eee301a766bbfce SHA512 8e9fe7614c9aa9c557db1bfd6a0ceae90b45e5d28e0cd715fd4ad962b9fbfa722549d6c2a13d82deebd7d3fab7e68cc7affd207beb75629de0d01a5522035581
 DIST qttranslations-everywhere-src-5.15.2.tar.xz 1419504 BLAKE2B 3dd5a007bb42492e8a0e81004c99aaf10d97d3c7a77e952240d1d15c607cf34a246271776ff3bf01ad77fcbfb3966366131f23cba162414b02bbfd6da85505b1 SHA512 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe
diff --git a/dev-qt/qttranslations/qttranslations-5.15.1.ebuild b/dev-qt/qttranslations/qttranslations-5.15.1.ebuild
deleted file mode 100644
index 762a128712ec..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.15.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 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"
-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 241fe2a05183..963bafeb15dd 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,2 +1 @@
-DIST qtvirtualkeyboard-everywhere-src-5.15.1.tar.xz 10969980 BLAKE2B 8f645c22e7fa48f967b72cd66af5658f9ddf119cdf66b7acac9cc4ac6b26b45e461960c1987936a872dff093949f305c65ba0a3009cfbf22fcd73e0443e97e92 SHA512 f369eb0c313aa5a932cacca44f93732f8a7b8de4bf46df294c40b7c7dd436d5da5012680420306b57347aa38a10d78231199093a10e2b8a272429536a327962e
 DIST qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz 10955076 BLAKE2B 629068b92f58e825060410c84906edbcb9d83f942f1d4acfc1aab9404eb69e0ffeca0b5ca69a3d4b07033efb80ef161f23474e0a19ae6d9c4efb7698ba0a0d75 SHA512 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.1.ebuild
deleted file mode 100644
index 2bab20a97453..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 x86"
-fi
-
-# TODO: unbudle libraries for more layouts
-IUSE="handwriting +spell +X"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtsvg-${PV}
-	spell? ( app-text/hunspell:= )
-	X? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex handwriting CONFIG+=lipi-toolkit '')
-		$(usex spell '' CONFIG+=disable-hunspell)
-		$(usex X '' 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 db82abff1152..d2833c8905df 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,2 +1 @@
-DIST qtwayland-everywhere-src-5.15.1.tar.xz 563508 BLAKE2B 507e8612a35c6439fab0637edfcae95d712daf19c0a8b97110b57b8a8ffd70374addc3ef19f210eedc9493d84ec441f18bd0fd5a25af5394fde40ee55573eb09 SHA512 d6619f35b3ab163372a0d49a2221c487d5936b6d9ebeb92a7fd41521c424d550eea7c5c584e07f15bde1ec5ece1bd5774845eb9956ce793e546197ffdb28d594
 DIST qtwayland-everywhere-src-5.15.2.tar.xz 564884 BLAKE2B 472effd3e9f3fd5470e0449703a52d45f2fd823770880b5ad15d8bf99196eee5d8511ca2bc9e23df6e27c933551d1853928ba79b4b1e5fa6e53334c54c04a463 SHA512 e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c
diff --git a/dev-qt/qtwayland/qtwayland-5.15.1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.1.ebuild
deleted file mode 100644
index dcf9a905144a..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 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 ~sparc x86"
-fi
-
-IUSE="vulkan X"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		~dev-qt/qtgui-${PV}[-gles2-only]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 6c4097caf5b8..b1f08ab25706 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,2 +1 @@
-DIST qtwebchannel-everywhere-src-5.15.1.tar.xz 208872 BLAKE2B 14899ca0f65eafd69c0b7610035c7b1de6d2c033a4929a49b3898a16aea2eada812d4ebd343f7581eebd5df5e649c9cb7f62c2b9287d24fcbfc7c82600dfaf27 SHA512 01f37630ce7aa32726831b4a4d5e52e861269e33efd89246770e8a2a5536be976601d055c95f99d45699ea918ac4ce465b9ffab725f39841ddc5d320817c7523
 DIST qtwebchannel-everywhere-src-5.15.2.tar.xz 209208 BLAKE2B 486da1fb4dc8106343716536c69f9fe3251119ab844b36eace21ad1921840be3e0bb97db58d29738bb54a28d2ad85839bfa71a8832a9d84a40c32b0f285fc2e7 SHA512 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild
deleted file mode 100644
index 8e07b74973bc..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 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 0beead995ee0..a509a377cd2b 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,2 @@
-DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
 DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
-DIST qtwebengine-everywhere-src-5.15.1.tar.xz 278488056 BLAKE2B f369e435510644b36a7305a1a2b907f09f533f995c0c1a367a801cb9f277f66914f4511f20926ed4c865e9e5ec921c12d4406191706d263320a861250cebb3a0 SHA512 651520fcf89681b06c57f1992223f06ecbe3750a88ffae7a94a339503957e09d327ee1ae7e4bce88bfb09131b3b9c9abfc44f7bccb9c50d286181eaf306991a4
 DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.1-icu-68.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.1-icu-68.patch
deleted file mode 100644
index dbabd29d5b1b..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.1-icu-68.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-From 202158edd4643f11deaa79b6d88fed9bcdf47256 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Tue, 3 Nov 2020 01:10:53 +0200
-Subject: [PATCH] Fix compilation with system ICU 68
-
-Public header files no longer define/use the macros FALSE and TRUE.
-
-- https://github.com/unicode-org/icu/commit/a18df7ba
-- http://site.icu-project.org/download/68
-- https://bugs.gentoo.org/751997
-
-Thanks to: Lars Wendler <polynomial-c@gentoo.org>
-
---- a/src/3rdparty/chromium/base/i18n/string_compare.cc
-+++ b/src/3rdparty/chromium/base/i18n/string_compare.cc
-@@ -18,8 +18,8 @@
-                                              StringPiece16 rhs) {
-   UErrorCode error = U_ZERO_ERROR;
-   UCollationResult result = collator.compare(
--      icu::UnicodeString(FALSE, lhs.data(), static_cast<int>(lhs.length())),
--      icu::UnicodeString(FALSE, rhs.data(), static_cast<int>(rhs.length())),
-+      icu::UnicodeString(false, lhs.data(), static_cast<int>(lhs.length())),
-+      icu::UnicodeString(false, rhs.data(), static_cast<int>(rhs.length())),
-       error);
-   DCHECK(U_SUCCESS(error));
-   return result;
---- a/src/3rdparty/chromium/base/i18n/time_formatting.cc
-+++ b/src/3rdparty/chromium/base/i18n/time_formatting.cc
-@@ -236,7 +236,7 @@
-   icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
-   measure_format.formatMeasures(measures, 3, formatted, ignore, status);
-   *out = i18n::UnicodeStringToString16(formatted);
--  return U_SUCCESS(status) == TRUE;
-+  return U_SUCCESS(status) == true;
- }
- 
- string16 DateIntervalFormat(const Time& begin_time,
---- a/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc
-+++ b/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc
-@@ -43,7 +43,7 @@
- icu::RegexMatcher* AutofillRegexes::GetMatcher(const base::string16& pattern) {
-   auto it = matchers_.find(pattern);
-   if (it == matchers_.end()) {
--    const icu::UnicodeString icu_pattern(FALSE, pattern.data(),
-+    const icu::UnicodeString icu_pattern(false, pattern.data(),
-                                          pattern.length());
- 
-     UErrorCode status = U_ZERO_ERROR;
-@@ -70,20 +70,20 @@
-   base::AutoLock lock(*g_lock);
- 
-   icu::RegexMatcher* matcher = g_autofill_regexes->GetMatcher(pattern);
--  icu::UnicodeString icu_input(FALSE, input.data(), input.length());
-+  icu::UnicodeString icu_input(false, input.data(), input.length());
-   matcher->reset(icu_input);
- 
-   UErrorCode status = U_ZERO_ERROR;
-   UBool matched = matcher->find(0, status);
-   DCHECK(U_SUCCESS(status));
- 
--  if (matched == TRUE && match) {
-+  if (matched == true && match) {
-     icu::UnicodeString match_unicode = matcher->group(0, status);
-     DCHECK(U_SUCCESS(status));
-     *match = base::i18n::UnicodeStringToString16(match_unicode);
-   }
- 
--  return matched == TRUE;
-+  return matched == true;
- }
- 
- }  // namespace autofill
---- a/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
-+++ b/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
-@@ -424,7 +424,7 @@
-   // spellchecker and we need manual normalization as well. The normalized
-   // text does not have to be NUL-terminated since its characters are copied to
-   // string16, which adds a NUL character when we need.
--  icu::UnicodeString input(FALSE, &text_[input_start],
-+  icu::UnicodeString input(false, &text_[input_start],
-                            base::checked_cast<int32_t>(input_length));
-   UErrorCode status = U_ZERO_ERROR;
-   icu::UnicodeString output;
---- a/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
-+++ b/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -315,7 +315,7 @@
-   if (U_FAILURE(status) || (result & USPOOF_ALL_CHECKS))
-     return false;
- 
--  icu::UnicodeString label_string(FALSE /* isTerminated */, label.data(),
-+  icu::UnicodeString label_string(false /* isTerminated */, label.data(),
-                                   base::checked_cast<int32_t>(label.size()));
- 
-   // A punycode label with 'xn--' prefix is not subject to the URL
-@@ -491,7 +491,7 @@
- Skeletons IDNSpoofChecker::GetSkeletons(base::StringPiece16 hostname) {
-   Skeletons skeletons;
-   size_t hostname_length = hostname.length() - (hostname.back() == '.' ? 1 : 0);
--  icu::UnicodeString host(FALSE, hostname.data(), hostname_length);
-+  icu::UnicodeString host(false, hostname.data(), hostname_length);
-   // If input has any characters outside Latin-Greek-Cyrillic and [0-9._-],
-   // there is no point in getting rid of diacritics because combining marks
-   // attached to non-LGC characters are already blocked.
-@@ -690,7 +690,7 @@
-     base::StringPiece tld,
-     base::StringPiece16 tld_unicode) const {
-   icu::UnicodeString tld_string(
--      FALSE /* isTerminated */, tld_unicode.data(),
-+      false /* isTerminated */, tld_unicode.data(),
-       base::checked_cast<int32_t>(tld_unicode.size()));
-   if (cyrillic_letters_.containsSome(tld_string)) {
-     return true;
---- a/src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc
-+++ b/src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc
-@@ -564,7 +564,7 @@
-   if (!iter.ReadString16(&timezone_id))
-     return -1;
-   icu::TimeZone::adoptDefault(icu::TimeZone::createTimeZone(
--      icu::UnicodeString(FALSE, timezone_id.data(), timezone_id.length())));
-+      icu::UnicodeString(false, timezone_id.data(), timezone_id.length())));
- 
-   if (!iter.ReadInt(&numfds))
-     return -1;
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc
-@@ -168,12 +168,12 @@
-     return g_empty_string;
- 
-   UErrorCode status = U_ZERO_ERROR;
--  int32_t length = udat_toPattern(date_format, TRUE, nullptr, 0, &status);
-+  int32_t length = udat_toPattern(date_format, true, nullptr, 0, &status);
-   if (status != U_BUFFER_OVERFLOW_ERROR || !length)
-     return g_empty_string;
-   StringBuffer<UChar> buffer(length);
-   status = U_ZERO_ERROR;
--  udat_toPattern(date_format, TRUE, buffer.Characters(), length, &status);
-+  udat_toPattern(date_format, true, buffer.Characters(), length, &status);
-   if (U_FAILURE(status))
-     return g_empty_string;
-   return String::Adopt(buffer);
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
-@@ -311,13 +311,13 @@
-       text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
-                               ? static_cast<int32_t>(offset)
-                               : 0;
--      is_accessible = TRUE;
-+      is_accessible = true;
-       return true;
-     }
-     if (native_index >= native_length &&
-         text->chunkNativeLimit == native_length) {
-       text->chunkOffset = text->chunkLength;
--      is_accessible = FALSE;
-+      is_accessible = false;
-       return true;
-     }
-   } else {
-@@ -330,12 +330,12 @@
-       text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
-                               ? static_cast<int32_t>(offset)
-                               : 0;
--      is_accessible = TRUE;
-+      is_accessible = true;
-       return true;
-     }
-     if (native_index <= 0 && !text->chunkNativeStart) {
-       text->chunkOffset = 0;
--      is_accessible = FALSE;
-+      is_accessible = false;
-       return true;
-     }
-   }
-@@ -346,7 +346,7 @@
-                               int64_t native_index,
-                               UBool forward) {
-   if (!text->context)
--    return FALSE;
-+    return false;
-   int64_t native_length = TextNativeLength(text);
-   UBool is_accessible;
-   if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
-@@ -370,7 +370,7 @@
-     DCHECK_EQ(new_context, kPriorContext);
-     TextLatin1SwitchToPriorContext(text, native_index, native_length, forward);
-   }
--  return TRUE;
-+  return true;
- }
- 
- static const struct UTextFuncs kTextLatin1Funcs = {
-@@ -510,7 +510,7 @@
- 
- static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) {
-   if (!text->context)
--    return FALSE;
-+    return false;
-   int64_t native_length = TextNativeLength(text);
-   UBool is_accessible;
-   if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
-@@ -532,7 +532,7 @@
-     DCHECK_EQ(new_context, kPriorContext);
-     TextUTF16SwitchToPriorContext(text, native_index, native_length, forward);
-   }
--  return TRUE;
-+  return true;
- }
- 
- static const struct UTextFuncs kTextUTF16Funcs = {
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc
-@@ -300,7 +300,7 @@
-   DCHECK(U_SUCCESS(status));
-   int32_t input_length = static_cast<int32_t>(length);
-   // copy-on-write.
--  icu::UnicodeString normalized(FALSE, characters, input_length);
-+  icu::UnicodeString normalized(false, characters, input_length);
-   // In the vast majority of cases, input is already NFC. Run a quick check
-   // to avoid normalizing the entire input unnecessarily.
-   int32_t normalized_prefix_length =
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-@@ -326,7 +326,7 @@
-   DLOG_IF(ERROR, err == U_AMBIGUOUS_ALIAS_WARNING)
-       << "ICU ambiguous alias warning for encoding: " << encoding_.GetName();
-   if (converter_icu_)
--    ucnv_setFallback(converter_icu_, TRUE);
-+    ucnv_setFallback(converter_icu_, true);
- }
- 
- int TextCodecICU::DecodeToBuffer(UChar* target,
---- a/src/3rdparty/chromium/ui/base/l10n/formatter.cc
-+++ b/src/3rdparty/chromium/ui/base/l10n/formatter.cc
-@@ -232,7 +232,7 @@
-                        int value,
-                        icu::UnicodeString* formatted_string) const {
-   DCHECK(simple_format_[unit]);
--  DCHECK(formatted_string->isEmpty() == TRUE);
-+  DCHECK(formatted_string->isEmpty() == true);
-   UErrorCode error = U_ZERO_ERROR;
-   FormatNumberInPlural(*simple_format_[unit],
-                         value, formatted_string, &error);
-@@ -248,7 +248,7 @@
-       << "Detailed() not implemented for your (format, length) combination!";
-   DCHECK(detailed_format_[units][1])
-       << "Detailed() not implemented for your (format, length) combination!";
--  DCHECK(formatted_string->isEmpty() == TRUE);
-+  DCHECK(formatted_string->isEmpty() == true);
-   UErrorCode error = U_ZERO_ERROR;
-   FormatNumberInPlural(*detailed_format_[units][0], value_1,
-                        formatted_string, &error);
-@@ -281,7 +281,7 @@
-     base::string16 pattern = l10n_util::GetStringUTF16(pluralities.id);
-     UErrorCode error = U_ZERO_ERROR;
-     std::unique_ptr<icu::MessageFormat> format(new icu::MessageFormat(
--        icu::UnicodeString(FALSE, pattern.data(), pattern.length()), error));
-+        icu::UnicodeString(false, pattern.data(), pattern.length()), error));
-     DCHECK(U_SUCCESS(error));
-     if (format.get())
-       return format;
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index ea633503ac72..4c0b395c7e06 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -15,7 +15,6 @@
 			<pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
 		<flag name="geolocation">Enable physical position determination
 			via <pkg>dev-qt/qtpositioning</pkg></flag>
-		<flag name="jumbo-build">Combine source files to speed up build process.</flag>
 		<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
 			instead of bundled.</flag>
 		<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
deleted file mode 100644
index bb6ba8d69f0a..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/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} )
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	kerberos? ( virtual/krb5 )
-	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
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
-	"${FILESDIR}/${P}-icu-68.patch" # bug 751997
-)
-
-src_prepare() {
-	if use ppc64; then
-		eapply "${WORKDIR}/${PN}-ppc64"
-	fi
-
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 630834 - pass appropriate options to ninja when building GN
-	sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
-		-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/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=(
-		--
-		-no-build-qtpdf
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(usex alsa '-alsa' '-no-alsa')
-		$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
-		$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
-		$(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
-		$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
-		$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
-		$(usex system-icu '-webengine-icu' '-no-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
-}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 46ffb8a42f81..dcfc0f25c2fe 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,2 +1 @@
-DIST qtwebsockets-everywhere-src-5.15.1.tar.xz 258908 BLAKE2B cd5c5fbdbbc0191379cbcc6821250597982696e589e1caa18d91258fd6c3eacdb27fd11da94b0e68864c8f3e60c712a052516f5838e56249767125a90e077443 SHA512 5929f972b7e8aa40dbbd0a1157065bd11e81621cc880d1dfc55e4228800215d16cd301319a204413e7fee7ec57c4e5a70229ad2d3c1d3ac69f38bd39ce4b3713
 DIST qtwebsockets-everywhere-src-5.15.2.tar.xz 259000 BLAKE2B 1bbc4d5451e70a94b6fb8377a60e43e2fa1aeb0d1224dd04486fcafd7821c3918a887297860e7cfcd18f3afd8dd02a903cf16fb69aeb48a52557af539c79458e SHA512 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.1.ebuild
deleted file mode 100644
index 765ce319f886..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 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 5bfcc354f8a1..9cf04c9ed782 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,2 +1 @@
-DIST qtwebview-everywhere-src-5.15.1.tar.xz 133392 BLAKE2B 6958323ffe5d2d10b07bb7b926a05aa3f74d5aa38465f94e51877c162b4b2bd8e4733eda122bc691262f20dca9875177b1fbb260a922923e3e20611a2294dc71 SHA512 1da9cca184e66b02eef911e372d0f18466b989cc5c53d0a93e268857e1ca64a2f75bf20dfd1451060e6dbf4c7d248ba376112b7775e45ffa7d556712870478b1
 DIST qtwebview-everywhere-src-5.15.2.tar.xz 133428 BLAKE2B 64cc9ff6a14c9107eb1607cbf244d179fd78ab5fdc879cce85c5f8b85dd738452b681faf864bf0013d3c8614ab2bd593fbf5ddb603ee2d2a0e0f684f9a46a0e2 SHA512 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85
diff --git a/dev-qt/qtwebview/qtwebview-5.15.1.ebuild b/dev-qt/qtwebview/qtwebview-5.15.1.ebuild
deleted file mode 100644
index 10d7f8d00008..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.15.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 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 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
deleted file mode 100644
index df8813553b9b..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +X"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
-	gtk? (
-		~dev-qt/qtgui-${PV}[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb)
-		$(usex X '-xcb-xlib -xkbcommon' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index b90eb6877e9f..77d3a22a4566 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,2 +1 @@
-DIST qtx11extras-everywhere-src-5.15.1.tar.xz 143884 BLAKE2B a740621a4fe41b075dd5843f28bfa1d128e24d1df786b5c8aa0ceba5fe7fc59bc212b7ec8855c4a1eef7cd812615837e38089c9e9fd189dda16f5313d6091af6 SHA512 59155fc97da3f7571da37dd63bed79f61580fa4df7d4886df51520ea6fe8e01e7c09f0aa9caaeaa986c0e5eac11d4479c99c892da4d075c6369b535fd505b084
 DIST qtx11extras-everywhere-src-5.15.2.tar.xz 143972 BLAKE2B 7dfa2fcdad254280bb00f40722e5ba4736ed89a1dc6b3542738a0492fe74a5f0823aefc141938bd7b0e839c7ee0b72914030b368cf4e33101e1e056e4a8d2ca3 SHA512 beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild
deleted file mode 100644
index 90bcd0786891..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[X]
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtwidgets-${PV} )
-"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 5f276c2808e5..8d47df5d648d 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtxml/qtxml-5.15.1.ebuild b/dev-qt/qtxml/qtxml-5.15.1.ebuild
deleted file mode 100644
index 1f6a108a9d98..000000000000
--- a/dev-qt/qtxml/qtxml-5.15.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-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 8fa4545451cf..a0b8d8e7cdf9 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,2 +1 @@
-DIST qtxmlpatterns-everywhere-src-5.15.1.tar.xz 1415888 BLAKE2B f17a1dee54ee981fb435c2536f28b015d0a4ce48cf504c5f11b03992a9e569190e2ae8fd9960a408ddec54bdc14588cd498cbf9da0002f696c336af72b211e5a SHA512 f76b2063f88a14754b1ba7e417b9a4936b1cf371bf35c6382a31f9ec01513894313faacb41a43fe6b97c0b0dbb7d4f578877b159ef1321cd1a2cd9b1d36bcdb3
 DIST qtxmlpatterns-everywhere-src-5.15.2.tar.xz 5209380 BLAKE2B 35933ecc0b7eb6b7355e660aafc616e47a1358857f8f2b161454dcaf1f05cd0d536e27859e3380a8ac46da3b228c805ef25d267931eb71585e5f9974d3e5640f SHA512 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.ebuild
deleted file mode 100644
index 2401961cd1d4..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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"
-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
-}
author	Andreas Sturmlechner <asturm@gentoo.org>	2021-01-10 10:53:59 +0100
committer	Andreas Sturmlechner <asturm@gentoo.org>	2021-01-10 10:53:59 +0100
commit	37bcd8a2357a6948aa4d788f6babe299e072c735 (patch)
tree	8f9b09773aac5b133223ba290541a5aa9289b0ed /dev-qt
parent	sys-apps/busybox: forward stable keywords to 1.32.1 (diff)
download	gentoo-37bcd8a2357a6948aa4d788f6babe299e072c735.tar.gz gentoo-37bcd8a2357a6948aa4d788f6babe299e072c735.tar.bz2 gentoo-37bcd8a2357a6948aa4d788f6babe299e072c735.zip