gentoo resync : 10.09.2021

70 files changed, 613 insertions, 151 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index f44c1bb5fe3b..4a87bac1ba1a 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index c4bdac0ed000..1c8eec3f0d38 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,3 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD assistant-5.15.2-r10.ebuild 1267 BLAKE2B d530346bb33a5881c8c04e50ea38f807609b191f0cf487843eca254ca507cab524a7df7ac741fc201d7490e73783806db3da634ab154627be0e688a5a2549caf SHA512 fd2da93421be491f76a17770fc449961ec60d5cacb9085753eaebca427c5d91938d03f3cef816e9818cc6c30be37897e7188541149abdb3851b8681513faf058
 EBUILD assistant-5.15.2.ebuild 1172 BLAKE2B 279c9a3c861bae74c79d52a8549b06167a7ca4adc3e4da5b2de0eada3414702adf36f0055790221e3cf725e9dcd1a959a6a507dbb823ddef061c7ffaff34ff8c SHA512 65a1a15cc074952f79a15adf8f57dca1283d246c34367e467e591af4c3ae3284539592efcf10edbf035bf8e450688205d5c3ab9ce3c909c60e7b83f0691ea067
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.15.2-r10.ebuild b/dev-qt/assistant/assistant-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..c1c5acadc774
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.15.2-r10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+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=""
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qthelp-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qtprintsupport-${QT5_PV}*
+	=dev-qt/qtsql-${QT5_PV}*[sqlite]
+	=dev-qt/qtwidgets-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/assistant
+)
+
+src_prepare() {
+	sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
+		-i src/assistant/assistant/assistant.pro || die
+
+	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 e90eedf6db29..9db86fa0a084 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,3 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD designer-5.15.2-r10.ebuild 1323 BLAKE2B fa7b321ce9aa7ab565161c191ea362e64a47a3a6f5b9de352fd88b7441f59fc0ba2e0995505d90ae6a9ec0a8cb061566fd605b536b8c590f94a6feadd53d93aa SHA512 92e74771655cf662c4fae0cc131a0c16e3226320dc6fa9443ee3eefd91e0ebc1c6df55fe0036a579b1791dad78491c318d204eab8de301d23e7761fa0365a6c7
 EBUILD designer-5.15.2.ebuild 1207 BLAKE2B 164db9e578cf8ec76a9b319c0a40abf63dc318e9f8b697920f2123cc10ab07b2fdd85245fff218a09e70f9e69726c29f1c2e7327c59a040639845f5df9580895 SHA512 89f7f89384daf7d88afdea95ce93552f3430f79f75bfcc4b233c20cf700c2c1db25fedd722183eb13e80fdcbc04dddcdeea999a8cc6524259f8d10ace7fd952e
 MISC metadata.xml 564 BLAKE2B 99065231d080f2944ac1ab745f68fcf4f5ff84ccd4700f6e1c796d150f572475a33736b35bd013623027fa7eb384a3811f7bba6ebd9dd1c5c249cf0f04a7b5d4 SHA512 3a3bf5cc3ca2e11381fbb68e48ffac172bf41ab6fbb6ae42e354ffa53968f577b1c2b9a3df815501d46d9e4d66e32996ea2b971738c7a182cdc6fc8954bb4f18
diff --git a/dev-qt/designer/designer-5.15.2-r10.ebuild b/dev-qt/designer/designer-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..f4adcbff829e
--- /dev/null
+++ b/dev-qt/designer/designer-5.15.2-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+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 ~riscv ~x86"
+fi
+
+IUSE="declarative"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qtprintsupport-${QT5_PV}*
+	=dev-qt/qtwidgets-${QT5_PV}*
+	=dev-qt/qtxml-${QT5_PV}*
+	declarative? ( =dev-qt/qtdeclarative-${QT5_PV}*[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/designer
+)
+
+src_prepare() {
+	qt_use_disable_mod declarative quickwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
+		-i src/designer/src/plugins/plugins.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 128 src/designer/src/designer/images/designer.png
+	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	xdg_icon_cache_update
+}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index c4a3de331c3f..98a56ddd2661 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,3 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD linguist-tools-5.15.2-r10.ebuild 767 BLAKE2B fab57351b5130bdd36088a879647bac6150d1dd1bc89395f0854bb14ce2f4f3d4aa1412b38838f251dd5ea93b2ea86a408e4bbcbda07fc3073040cd9a387ffc9 SHA512 5e37201d3c16a1f498c529e52f684e62ea8710774b8cb92b71abed55c13fefc6b5c7cc4a792f62c07d07ee4d3afa31b92c26d28ad54aeb20e74bb0b23b0a80dc
 EBUILD linguist-tools-5.15.2.ebuild 1022 BLAKE2B ceaefee8134e4ec654d8eaf3dde8ae085332b72a4e6efc61e31e71cbb3ab1bd593bb286beab9bb444329bd1c2bdc09c282dbe15fde7ca5fb1552e42f7771140c SHA512 597c04f3ebc80a32a601beeb9a760b0dfb1cced4fa5e74f0fd4687b775196fde21a26ed42182ce4b1ea3c409503de674dcec60142ce39ed09db522cdef4e2a7e
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..d9508fdf3bab
--- /dev/null
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+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 ~riscv ~sparc ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtxml-${QT5_PV}*
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist
+)
+
+src_prepare() {
+	sed -i -e '/SUBDIRS += linguist/d' \
+		src/linguist/linguist.pro || die
+
+	qt_use_disable_mod qml qmldevtools-private \
+		src/linguist/lupdate/lupdate.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index f91e2ae4b7db..755ebe32a9b1 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,3 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD linguist-5.15.2-r10.ebuild 1068 BLAKE2B 91c8969a52ed32611d0a4e5ae35a5752ff8cd53f410386b8e46a8dc0ca2a25571bef42991880fa384cde982e21852c66fde1c1f50de022ac6ca00a860e72953c SHA512 1ea5c9e68f4733f432418739c42031fccfcbeff3738e1aa164a51e64d2f498ddb96dd45b6ddba713033efe08f8b89007fd41cd481dd64bb6eec272b461deac03
 EBUILD linguist-5.15.2.ebuild 978 BLAKE2B 9a0597ccbbe503e80793cb39ea06f12f98f9ea30119eefc569f01cc7540eec38c7088230133ea44792e34b66c60c71f1a26afe3ae2ad33e7c726127fa5c3ce0a SHA512 3cdb00dd950edc643b8c60d7f33600e76c059e36b7bad8c549f08ab504bdba58641ab9ec81e7b4d084ddccc71593ef984716e52a63a9a84f98692696b7304306
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.15.2-r10.ebuild b/dev-qt/linguist/linguist-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..e4d9d4505f59
--- /dev/null
+++ b/dev-qt/linguist/linguist-5.15.2-r10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+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-${QT5_PV}*
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=
+	=dev-qt/qtprintsupport-${QT5_PV}*
+	=dev-qt/qtwidgets-${QT5_PV}*
+	=dev-qt/qtxml-${QT5_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 04d5332d3ec1..14de20b5daac 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,3 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD pixeltool-5.15.2-r10.ebuild 516 BLAKE2B 1ebaa452db6cef64d6f03e9a60f131322693a37e2d2fef257bc384bccf60b7175837d7a14df022e143a958cdd65e793923c75cf4f609c5553da2baa922d06007 SHA512 6355fab226f0cf895f3f05f88e88c410412d0739646fe12f8794e82b1c5f46c8ffafd055b9bf5ce107eb2ea4da1840fd4c9cba683ab76aba59959ca8c1bee57e
 EBUILD pixeltool-5.15.2.ebuild 421 BLAKE2B 4e1e63db67d042bf03d2ee606682fa210e7c48ab314a4f78e71c198e3b920c45a930826054c7f9ba6af5b12f7e881c4fa9a605c96910f0317b7d88e37dcddf58 SHA512 6e8c19d9cfe7e5b8a651817499a72b5e8cb4a538cdd865a68fdf0c388ed093379297143916aa6fd3e55fe9ec25345554e072917a8096fc6a05fec241da329a89
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.15.2-r10.ebuild b/dev-qt/pixeltool/pixeltool-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..1ddf79a9916e
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-5.15.2-r10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+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-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=
+	=dev-qt/qtwidgets-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/pixeltool
+)
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index bd5999fa40f2..1ffcc097efca 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,3 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD qdbus-5.15.2-r10.ebuild 555 BLAKE2B db001bcb6f8d8f8fa47030591ef900b790761879a58a78c2f7431241b044ccc9a404cd649c6b5fe6060d8419204cbf3e76dcd06e1969f6e4501cf3a3fd33283b SHA512 fea4dc86408a06354716ff420ae4b948809295d8e342174b4070c409fa9c82e44d9a8bc4d67398666d69ea8fddc3bfb7087c17f818533c4931d9f41b85c9c014
 EBUILD qdbus-5.15.2.ebuild 479 BLAKE2B 1bbd1e7fabca5b7fe69348b35f043c8b405a3531d4376cde7014b325175507a3cdc1f7957caa83b467845b72296c7d4dc583ab577cfd4e5065633baa8d721651 SHA512 a67672a40c2673e507842372972a9fc5fb74f6cfede0a60f1c1d8c1d3d6285e1de7ae73c82bb699111b7f9e753b1ff0694bb40d8e953bb1ca777283a3369dcda
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild b/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..5f75c39d3486
--- /dev/null
+++ b/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+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 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdbus-${QT5_PV}*
+	=dev-qt/qtxml-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbus
+)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index d96d5605c2ab..066e107bab75 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,3 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD qdbusviewer-5.15.2-r10.ebuild 1045 BLAKE2B 1aec72731ddf8defb778c13ed76d92966a1217cf5904b5f08b597f2d0232f2cefe06725daf30084ea39bb8f513aa9c63df2a409605898d6afa724cb97f3c2acc SHA512 b6064082070eb97e9f8a8d4029e73a865176576a79f00cddd1900d6a8913148f2cb3745b7decf12aab612df89637e562413e0ba8441f5b9c9f23addfb73f4049
 EBUILD qdbusviewer-5.15.2.ebuild 960 BLAKE2B 1d2910182ed9b6830230106d2596c393aae23544651cec3fa4e9ed1b65aa3eab3a2a25c8080d034c6988aa1366d3e56c98eb70cac7f946ff7cbed96aff89324f SHA512 9091c3d7a17e3481458b9dcb4116f7e973ca4e43ae0d47aa0f28e8595f16b100c843c11b7779867150d5159e9b0cfa140d94e0a6995c4c65962f0538a6a3ca62
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..d9955e5d350b
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+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-${QT5_PV}*
+	=dev-qt/qtdbus-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtwidgets-${QT5_PV}*
+	=dev-qt/qtxml-${QT5_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 58141a2351e4..f0d196ac5926 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,4 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qdoc-5.15.2-r1.ebuild 624 BLAKE2B 5ea2d3296a79b8f3c69b4fba87d46b7ae106e01ae04259de3cc17fceb7e02584d8eca51ddd4e6ae6390248f562bf51a2ab132ca977dcffe80253ee8cd495dd86 SHA512 a5f46fe3a14d8181068161679724f0bde3989de6191539e91cc791f9c02b95958992b0d794453d3478f7ee5e652bdc283b89654cd0ee0710a6885abd68458645
+EBUILD qdoc-5.15.2-r10.ebuild 887 BLAKE2B 1fe2784b9683ea141813326bf8d803b2c5cd5204d88498ec843b8ff65a636089a11b40648c19b458e2070690ebdcfefb4b609d7b38c4555ec1766b77cca489e1 SHA512 43c3e777efe2106ec062c9ea8026ad6544ec1c9c4100026afe3e1d925e9737223d084dba3a8eb9b40d1ce33923f3011dddff844cc51b9e345f9268e9ce34babc
 EBUILD qdoc-5.15.2.ebuild 543 BLAKE2B 049d072f3fe6f36d4703150ebe4326f0ade72c2e415743da40bd2015dfe9818595f606ecd4e7ed543fd9175b2f1df77da811c3a655dae4112f816f901e3771f8 SHA512 4de93172b553430ff0507f32519b22e4668e024ada835c938defec5037f95f9752dc6f58951f6d3a3167586083f20679ba1eadf5927abcd6b3e2ab15de7824b8
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild b/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild
deleted file mode 100644
index 09d86b11c1d4..000000000000
--- a/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	sys-devel/clang:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-# TODO: we know it is bogus, figure out how to disable checks, bug 802492
-DEPEND="${RDEPEND}
-	~dev-qt/qtxml-${PV}
-"
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild b/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..1a250f857b1d
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	sys-devel/clang:=
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdoc
+)
+
+src_prepare() {
+	qt_use_disable_mod qml qmldevtools-private \
+		src/qdoc/qdoc.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	# qt5_tools_configure() not enough here, needs another fix, bug 676948
+	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
+	qt5_qmake "${QT5_BUILD_DIR}"
+	cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 39b4d6276c1b..41fe63b8b42f 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -53,5 +53,5 @@ DIST 5.15.2-0-202011130614qtwidgets-documentation.7z 26789215 BLAKE2B f0561ae272
 DIST 5.15.2-0-202011130614qtx11extras-documentation.7z 36673 BLAKE2B b7eb8f048acecce20b911267755e1e467fb23b975911025cd43915e043ffc3f34b2b38862f32ae9959dc7e5c759d22731d33fa600c9b8d239f0f0ba1bd6343ff SHA512 ade0a62026d32342fb2b48ade9a164d24e506f5e392e68c451055238ce2a673ea4358472c1132daa779498ff7f2351440d73b6218d5a01e8162bda0907215894
 DIST 5.15.2-0-202011130614qtxml-documentation.7z 448310 BLAKE2B 36de636799fbbe1b67db6e0ec19bc478d7d5003b840a7119ad8b11589a4d514b00c7aebc2ac2ff4a80004ecbb8a70b7297eae8f7624171f4ba62435996f62b32 SHA512 ac5d137311eb13491dac18746eef3a1c5dd87d37d3446047c380cfdacad8dfc9d5e54a078278d98ff4ff75b39ad6044fed9bda481e35e307b3f103b792d253cb
 DIST 5.15.2-0-202011130614qtxmlpatterns-documentation.7z 1199986 BLAKE2B 49caea50be44260696026fcc395df016ef69992fc2bb8e3f31005194cda4987729fbf4e837171732ac5d95184a36cf1574c1fa01f6f2520bb8c52515773564c1 SHA512 c2ad2759ef7dcd78c2039f47ee01f9d61338f6735b9ef2caf8c99b959dad94dfb32249ee5cf8d605d71ff8a3cb5549ec602df1877f3624dd9ba6ca7621a5cf0c
-EBUILD qt-docs-5.15.2_p202011130614.ebuild 3180 BLAKE2B 5c7d145508900bb2274c405de477e90a2097422e8ac20c089fdb05fc028bc7142bd95106820f232306424d13e7c5fd4f159e15b81e9c519dfdcb8d3943c7ffc5 SHA512 31fc5717088be7e0d640701168ec7a961e04c7b44099069af5aed5591d0ccb75f90c0ef507f1a0cc2cd8d648c0ef7625db88ec04b19f1a6f0b997f929b94f612
+EBUILD qt-docs-5.15.2_p202011130614.ebuild 3198 BLAKE2B 0288f1a9c3c4f4481bf3be21b61688746a264c725ad28a8bdadb91f017eb30d2f65c7d1c87e539553d21bad62ee430955dad19818e342d18c0c32a1841e31353 SHA512 ac962c7532e44e86d585040832c6c9e825fe80d5005163a0103ae1069b86430adc8322cf3627ebbd0af722a69a9cb6c5d9b245a74eaea91c41ed88a20495e26d
 MISC metadata.xml 3909 BLAKE2B 1f36215a83c7a9368114a0139747bef6cbfb5aa88880b633c3433d17b1767db1c55d5910fa0233b8dd124441e406d79fda510bc0657c8ed6669e67394033977a SHA512 deae0af2cce3dde641f0ff94234bdc98cc6f929885d12ded8cf9e4c70aa4f54e9dbd94db9b885281d22ac37a0140d4feed98f60a45bc415dbf3f32931ae8ba02
diff --git a/dev-qt/qt-docs/qt-docs-5.15.2_p202011130614.ebuild b/dev-qt/qt-docs/qt-docs-5.15.2_p202011130614.ebuild
index 351c5273763e..233c6d5932a4 100644
--- a/dev-qt/qt-docs/qt-docs-5.15.2_p202011130614.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.15.2_p202011130614.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit unpacker
 
 PV_FULL=${PV/_p/-0-}
 PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
@@ -80,13 +82,13 @@ for DOCUSE in ${!QT5_DOCS[@]}; do
 done
 unset DOCTAR DOCUSE
 
+S=${WORKDIR}/Docs/Qt-${PV%_p*}
+
 BDEPEND="
 	app-arch/p7zip
 	media-libs/libpng:0
 "
 
-S=${WORKDIR}/Docs/Qt-${PV%_p*}
-
 src_prepare() {
 	default
 
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index dfb50423bfbd..2d3331b5c837 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,4 +1,4 @@
 AUX qtbluetooth-5.15.2-gcc11.patch 596 BLAKE2B 0b8b8e493ff32e34a53e1fd22358f556bb7844fea8eeb3e8384f82aeb1ca63c760d234c2f4cfdf25ae5bfb9a7b86c7c95c8bc421d1f812ec84f87a904c300e74 SHA512 f598c403fadb7c88e972f2c4dd91f0c6ebd85a7c1812c632a3aa9826780d26dcecdbe0f2f7e8c4ed0e412b6ef4cee4aeb194cf393e418418686233fda9fe41bc
 DIST qtconnectivity-everywhere-src-5.15.2.tar.xz 2815492 BLAKE2B 0702601266d46669e0a39740b6df539b1d3f6dcb62d06b14f5ba89782e9bd38faa391892841434feccd9599eef09c7c7238efb82e11a0633e73f58dd721d3324 SHA512 a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c
-EBUILD qtbluetooth-5.15.2.ebuild 709 BLAKE2B b771acaa55468dd3002301d0b2b6c6a2165d176a0a0c6459cc4d2c4baabbc2cf49965d740314206d25ceb56c01fb705e9a71594ab5ddd25589b751bc4409c3c1 SHA512 282d37d1053baf98752050a9919447c057ee2beedf2465b1e7447670f17367cff97d32323ca05586a82767f5e6b9c2f281cef3fa35cb1a8730b71b8d59ef03a6
+EBUILD qtbluetooth-5.15.2-r1.ebuild 734 BLAKE2B ba2d32b3c80171665c2ee6b578884a08e6c79908740becc9e336e2948c1e345d8b1ccc541cb02eaf781b4e47c50deebd2c70d6a2729cf97b07c0a983b3fabd28 SHA512 23c55f55b436fc4b4e633934aa0f40f1aac743a832504e4b12212d5c33a529bcfa868f845188932fee8c37d82d844dd722179ca3f833d1c0eef423a6c24f0f71
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild
index ab26257c7e41..1a88564f814e 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 QT5_MODULE="qtconnectivity"
 inherit qt5-build
@@ -15,14 +15,14 @@ fi
 IUSE="qml"
 
 RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtdbus-${PV}
+	=dev-qt/qtconcurrent-${QT5_PV}*
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtdbus-${QT5_PV}*
 	>=net-wireless/bluez-5:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
 "
 DEPEND="${RDEPEND}
-	~dev-qt/qtnetwork-${PV}
+	=dev-qt/qtnetwork-${QT5_PV}*
 "
 
 PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 752012
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 3b7e0414f304..8ddfc5443cdf 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,3 +1,3 @@
 DIST qtcharts-everywhere-src-5.15.2.tar.xz 4251992 BLAKE2B 84a683f0ef327437ce801f3b1e0622e31bbc69c33173b3a52e66191120189b6c46e5840ae72861093a9c2f37cf486494fd947a75bd40c8dc2fd54cfd0324eb41 SHA512 d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f
-EBUILD qtcharts-5.15.2.ebuild 541 BLAKE2B 5fb9dc3f4d4d2a68c77d64ef1804454f97474eef7d1be268ffec980382ac194a5638e524ba93b908e5792c42bc2323c9db71eb1073b8c6ffffaa10b53234dc91 SHA512 66629db09d86a3e5bd0966946f1c3255b1d2c1881605c8b04fb2b8c920f9cfb8032a9ae0617ebde2ffbfc91e77fb80118eae4268e0a7615b43ea0f07a91ef062
+EBUILD qtcharts-5.15.2-r1.ebuild 562 BLAKE2B a8aa30ada9a23c720f003323b9c50fbc2a28bbf70ca10438d468d82b4d17471d45539bee3fe2af2a5b9de3c483284b94c42482dbeb2bfcf97fcb6e00c030f79a SHA512 3f65b22256a72d1a0e87226e0eef5b9ec8b4eb8a2558a2b25be0fbcb3c57fce87b992117041b82e8d376f0f6c4d132ebfa79d0446e89a4422749012c5b1abc0e
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.15.2.ebuild b/dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild
index f9ace0931949..a23f9413e208 100644
--- a/dev-qt/qtcharts/qtcharts-5.15.2.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="Chart component library for the Qt5 framework"
@@ -14,10 +15,10 @@ fi
 IUSE="qml"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtwidgets-${QT5_PV}*
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 5adb7eb6d9ea..64d815f6002b 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,3 +1,3 @@
 DIST qtdatavis3d-everywhere-src-5.15.2.tar.xz 5191436 BLAKE2B 2c319d7569f4dd62711f4de23661413f6d1a19ef1653543506afcdb455875447cb84980d780fefdb677f0856075e0b1df4525662bed92ae9b6272f91112c8f58 SHA512 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3
-EBUILD qtdatavis3d-5.15.2.ebuild 641 BLAKE2B 8ba38986fbcc9bd7cb0b8751ee37ee6e2c3b6cc85595bb0d41c8310d2613b47b8096c4bbcd1b09c8a8646300356f5e257f4f87d68a352bf92b561b42802a5dda SHA512 77ba2e8c071ea1ce1c8ecf543a99206fdf6b987c373512ba58de41302bfd039473ba9146757c00e749cd6b48be93186f0fb9c5136aa87839d686462bad31dba0
+EBUILD qtdatavis3d-5.15.2-r1.ebuild 657 BLAKE2B 738bcc293a87cc22fb62ab7751300b9d43d5e5d4d885098cb724776021d316cf008bcf8166282067f340dbf707d09fa169ce906b11b330ed37789e24c280756f SHA512 0c9884115559c5d97e98a530b2f817bf7fd126cde789e34bac71b87af1148ae38ac10fcf957b0a39c3bf4a8f32ebd936299185852f31c1e61c2ea02ddc5de372
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild
index 46e32e2b4d71..4963f2fe39af 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="3D data visualization library for the Qt5 framework"
@@ -14,9 +15,9 @@ fi
 IUSE="gles2-only qml"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 1979092bad47..fbc50e908d39 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,3 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD qtdiag-5.15.2-r10.ebuild 803 BLAKE2B 7983ba8236a634dd86dea3db15d54d4906a33a0e1bdae0834c71abc2fbe7a41e954f053d760affb959f7dd79dc9fda14aee7dfaad143b531607a3f46c068432d SHA512 7dbaaeabfd616936ab1741a0c31769b3fd27c0fe4693bad7f170360db14dc8c700a0be7fa78b7fab0767b3311e612dc90828dbb897d7a7157f2cd82cc0882507
 EBUILD qtdiag-5.15.2.ebuild 844 BLAKE2B b2fc4783c2910ef62aee3d66404b2c2974afcd0323dba3611c18649bf376e4560531c5d2b209acf9492c179865035939302d2e941dc52712db938dcd162c7891 SHA512 e421c1d18d168e132a99c6ecebd2a8004f1faa3eb9414470ce262995f177c5ce87e4315ef50cac38e39ac9e5f518db72ac39e41880dc30fbd9c841fb216d359d
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild b/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..5a86aaf571a2
--- /dev/null
+++ b/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="+network +widgets"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=
+	network? ( =dev-qt/qtnetwork-${QT5_PV}*[ssl] )
+	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtdiag
+)
+
+src_prepare() {
+	qt_use_disable_mod network network \
+		src/qtdiag/qtdiag.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/qtdiag/qtdiag.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 466de795d70b..28f3ae734407 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,3 +1,3 @@
 DIST qtgraphicaleffects-everywhere-src-5.15.2.tar.xz 14040900 BLAKE2B 15564a1f849520adcf5cdaecf9ce015a4143c2843e339f11b291c7799242210187336a8894fa67608c172a9f1df9695124da470c67fc0448b0d1fefe59a89238 SHA512 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d
-EBUILD qtgraphicaleffects-5.15.2.ebuild 450 BLAKE2B 5655cd60b7f766e31535b014193c020919ee466c3c8a5e2cc512ef05a2553ac55902beee9a297e915e873cac34407ee9a66abc23916fe89d5aaacac53975d862 SHA512 c37149ad5e8e86c8ae9ff2619ea9f4cd9fd0a305bef26c0257de207a63573f9e33052b98d296068bb56b23930bfef47c0706e61391bd511f434fa4efa1b59593
+EBUILD qtgraphicaleffects-5.15.2-r1.ebuild 466 BLAKE2B 4c54cf86c23f2cb21d2288f7486cc74b1d45c5919024766dee78d49dda2556c8d756d02eac4e85500b1687593989435680d151688bcf5500ee5fcdd09e1b9518 SHA512 17daee79cad383305e49468bc446b4163e160a44701356e121edcbbbd2271cebe28c517a522138cb804ce6961101b8932080a820b49f7285c89a4b0dfcf621a4
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild
index 4ad065e1ce37..216671e4f052 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
 
@@ -14,8 +15,8 @@ fi
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index ed009771e1b5..ac115e2a2a15 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,3 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD qthelp-5.15.2-r10.ebuild 706 BLAKE2B ed6e6379c7b8eca9d041dd88068fe8d6b9011e299a923d088a3fcfe3975971e4bc8333b2da5a28b918f9485dbba661b1fa1b21c58c8e3ea97457dc6e1645b52c SHA512 a57974b1659bcd12034e6aa142af02348dc4fd322a596e38fb41dca99facff4baaf36a363c0156621e5b10b38199f0eee75e2816cf6362ad20aec63ee869ecaf
 EBUILD qthelp-5.15.2.ebuild 638 BLAKE2B 8333b21d25d777f2e7e2ebec3eda8c9ee440cf3fc7763b16d4246748e4bd937ef0edde019e0b104f86b8087ebb05186922f006b50bb4544afbb7fe5333ba4951 SHA512 6eebcd2844c14d5f9cb2b55f44cfeb8da425829fb7ebad7312d4ef9afaab3522ae1a082411a822c7d77b9dce120518dbd6d39f10e98b3857198c929cbf195720
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild b/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..e946e8837d9f
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+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 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qtsql-${QT5_PV}*[sqlite]
+	=dev-qt/qtwidgets-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qtlockedfile/Manifest b/dev-qt/qtlockedfile/Manifest
index c1eedca3af1a..73df31265c40 100644
--- a/dev-qt/qtlockedfile/Manifest
+++ b/dev-qt/qtlockedfile/Manifest
@@ -1,4 +1,4 @@
 AUX qtlockedfile.prf 190 BLAKE2B 254ba3ddc3708c72fdefa5f3a0be26f33752c7a00edbefebc46b8e39ae967064348bcf9e0b946428421d2c232a3d612838e7003352eb489f01a2597928ed4404 SHA512 efd51aa88a40ad5615d3ae9122a360997a3d32e3f212e7d9c1c2cf9e42984a1e4b9ccff02c6ddc1e8926104527004536ad848c5ef24bc28a93eb556d99235696
 DIST qt-solutions-20171024.tar.xz 710532 BLAKE2B 365f4c6fc3bee34bf26ac5039984ceac1d90527297b985b0d1b606f3ba67219bab7f7cba40b4adca55446c34e9f4fe218b4449ee255ba6f6409de78f80ccdaec SHA512 4784d88c2f40c88f06abeb728842875fb5e428a630dbf749f71055681b0c631803d2901b60aa8cc95f5f382dcd21da8d739873aa45e3dd3676ee95925f0198da
-EBUILD qtlockedfile-2.4.1_p20171024.ebuild 1067 BLAKE2B 7bcb83ccbc175ff11d855c2db4a233b8f905924577d9c071b0bf45326f7253a99b241833ad88ce8ab115ad620eecbd679d36ff9d60f7eea9a15d4ef167e88fbe SHA512 56e3b79b3e8cd26ea5efa8049e4f1f3ca350fc13aee3fca34cdc68ecc747b243b5ef97163d6b508fda3e541278d177a8246f7f3bea676023591a9e9fd84d9961
+EBUILD qtlockedfile-2.4.1_p20171024.ebuild 1066 BLAKE2B cea3c9837c9e7c068963fc74404f17b446388e941c3e009ceef9d3e86d46b87303e3a3c6e4a103fcd174ed65f6037f474ca2489fc6734c21c2680fc5d4ba27bb SHA512 c5a63523e932c025531b252e2ee7432f8b6456cba795d253600d77b6e59da673849179128c973d55339b3d125cbd2ed9de16643b4786303e57d9c3223529daa9
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
index 8ce005c4ebea..0cfb9a5a3d36 100644
--- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
+++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P=qt-solutions-${PV#*_p}
 inherit qmake-utils
@@ -9,6 +9,7 @@ inherit qmake-utils
 DESCRIPTION="QFile extension with advisory locking functions"
 HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/"
 SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
@@ -18,8 +19,6 @@ IUSE="doc"
 DEPEND="dev-qt/qtcore:5"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/${PN}"
-
 src_prepare() {
 	default
 
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 2bea22569b78..ab7427f93bca 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,3 +1,3 @@
 DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd
-EBUILD qtmultimedia-5.15.2.ebuild 1469 BLAKE2B a8f9898698043573721980561b7f749aa3057fd54d20829affd3c6d4c345472d8ea1a3f06d0d0f85a44af72143980993e76398b3e5bfc41cffef7a1a111b43a0 SHA512 36826ed6c833a145c433ca0192de07363c61c3607c8f65f0f1f37b0555e92a756c05c08370b39fdb52daab87c7893e9debfc0d992bcf0e056bd27bd8705c26d9
+EBUILD qtmultimedia-5.15.2-r1.ebuild 1505 BLAKE2B 7e9049970a904dbec7accd0db053faa8e6755f93296cc3f2a67ab15b28c35814ab31f218abbbe1f21c0be7bbcee6b13731fa962137ca80597517c0088245586d SHA512 fd943e28d689fea3af9cc1dbbb66fc1c5a101201e2b79bf7be72491038c3e5c33b8628c99334d75a7b2714ca7c0b3de76100023d41eca95ceba3af6b3eab9414
 MISC metadata.xml 717 BLAKE2B 66c4caae8c3c2d342dda85c4fd88d7dc3ddd8415e5b1e14a6278b324df257212b128b75468581609959b774fd9ba67a01d1294e539bf1c1cbc393aaf1a0bbbdd SHA512 d3d69ed7c2f42dbbf33aa360ef34dc2a0687be44a795ce2ee6c4b34603a7767b4e66c652e500ae3beed47cb1d6e73be5ffa13cf4bb1d33e3fc3f0154f950bee5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild
index d7aa5646506c..2ed94944ea31 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
@@ -13,9 +14,9 @@ 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}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+	=dev-qt/qtnetwork-${QT5_PV}*
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
 		dev-libs/glib:2
@@ -25,13 +26,13 @@ RDEPEND="
 	)
 	pulseaudio? ( media-sound/pulseaudio[glib] )
 	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
+		=dev-qt/qtdeclarative-${QT5_PV}*
+		gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2-only=]
+		=dev-qt/qtopengl-${QT5_PV}*
+		=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 0b7e916ad6f6..ed7e69cbde7e 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,3 +1,3 @@
 DIST qtnetworkauth-everywhere-src-5.15.2.tar.xz 141688 BLAKE2B dc850ffb257e2f2c8ece0d8676cf91454df49550883548206d1362946d09bd0ddf74b2a73ea4860c1cbf68f59f0d06312a7d21279f1401bf27c11b66341df95c SHA512 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d
-EBUILD qtnetworkauth-5.15.2.ebuild 384 BLAKE2B ccfc31ba154994931b6ff0a21c4bd4063d392676708b8df77a5f372149c804bef7d067cc0aad0be14990b3d1def75c03c4547acd578447b3644b4c28aa4c8714 SHA512 01106bc87958f4091a1b885c841ec5f40c89b885c2d36400a0ef6c0c52d6ce12fa29ae5f3472496f76000f7ad124f8c21d1ffea5f8c6abab6b66250a8b2d9015
+EBUILD qtnetworkauth-5.15.2-r1.ebuild 395 BLAKE2B 25fa46a71957920b64c2dc7f978e26f18ecfbcf4677340e89824294be0a4ba712a46132a956e4158da377259d435f68c644cc674a04103ce2e4b18aa38f2176a SHA512 f567f95f47879de36f2a9bc689a892f0312bfb956b7cf0700df333538452b790c0fad44a6d8a7b796a1a9710f96d4e681b0c6fd8201226ab29b054425d79cceb
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild
index ab41e5c6f79a..427cf618df8a 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="Network authorization library for the Qt5 framework"
@@ -14,7 +15,7 @@ fi
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index a310d96acd60..fd3fe5ba518a 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,3 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
+EBUILD qtpaths-5.15.2-r10.ebuild 482 BLAKE2B 81d89a4f006ed3275fef69ec376d84df40bf2f526f54a416f63b9d6cc3d9ecddcee601aac4369bca9b1d8e781e2a5257cce80ed5147d656fedfa032b0bdf9400 SHA512 2be9beba279ecf2141270d9c873eb50d07fe014eaa37e266666d25e841f9784be932cda62d1bea2346c52393fbaa1aead24a47e0168ec07b05de47d8e89b9097
 EBUILD qtpaths-5.15.2.ebuild 397 BLAKE2B 2cda259a7a23d11676c72137944b339813b064ad8e61f93b717e276f28d244674c5494046746e4a60cfee876dc85b10067cea3711c56418f231bb77cec53a982 SHA512 47df5c78a84e07d26ad708c300cb2c02cd0cef90b5fc79471be652537dc58cbe9f324b3fbc3c09ce6e384abca73b465abb5919b0bd9a75937eaf709df444a9e2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild b/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..4496c1285756
--- /dev/null
+++ b/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
+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 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtpaths
+)
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 900d1b15d3d9..8d8620a2b91c 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,4 +1,5 @@
+DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qtplugininfo-5.15.2-r1.ebuild 426 BLAKE2B cd2f205d6f6a94c88ab13b10ecb6b773d58f8f2f5fba3d180da8cc7fadf25a69e9ac1fc1a926169b09c770e94bd03791aa79335ad45bbd69802c8d5ac6fc5448 SHA512 c99099c40a76e4032f113081562f78cc9c315ee2ec1bc9655bcc30e5bed4ae3dc642f29ad82380c5ab20835537188c70d13865bb1395cba2b4d8d841cdc62225
+EBUILD qtplugininfo-5.15.2-r10.ebuild 432 BLAKE2B ee87e66ebc299d7348a1af578483339ad35dc53cb66cdffc7b380af96b30724631c5b12642f95d7fa9d1de4fba5f4d914e8db1ae237ccf834e99b928671b49d1 SHA512 44c7621a2658a1cb0e4101aba4978ffcd2fa4fa784449ad802b5bbb971407b077a1b58601c94518c24b93a1efcf76080c2a3afccaffa4907389a8052e17381f8
 EBUILD qtplugininfo-5.15.2.ebuild 347 BLAKE2B 27ff111ca6151127fd562c56bfb79b374f2d19137106b703b925ff0925749ff5a18eb411d5905766aef55761235c4dfc08ddfb8f3dae73306cfa3d26e1fef0d4 SHA512 35fb6f758b7aafbcf3c30fda07afdfdd7f25da0ad6d872fc8047074dd532b07553b2a460d1fd966ced4a44569b9db77e071d85a8a0993a4e07b78a6164d47154
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r1.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r10.ebuild
index 064b136fc6ac..c08f8306e509 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r1.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r10.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
 QT5_MODULE="qttools"
 inherit qt5-build
 
@@ -14,10 +15,11 @@ fi
 
 IUSE=""
 
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-# TODO: we know it is bogus, figure out how to disable checks, bug 795237
-DEPEND="${RDEPEND}
-	~dev-qt/qtxml-${PV}
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
 "
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtplugininfo
+)
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 23b579296cf6..e3e2597f1085 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,3 +1,3 @@
 DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f
-EBUILD qtpositioning-5.15.2.ebuild 854 BLAKE2B 1c927c0040ea4ce5f303a9d615941c1b88bd101641dfdced29f00d2b9e09410dc5c038bfa0da64a62b0030b290a8e567ea6c0e7a5ff26859772420cf0252f8b1 SHA512 3a2fcc23c1250cc9e6d2ddd4799152d4f28fbb53b1785b32655797767376791a7d1c013f56a53d4b4f9c3e026e7cf403965d9286d2075e5e09c4b11cfacee784
+EBUILD qtpositioning-5.15.2-r1.ebuild 870 BLAKE2B 8f9eaa39120b41d77a7f1a0eb58486efa46e29c99f4c6a19718f327fc8c76a066e5410329bcbef47605bb18bdb93bae35e7c014cc7a816257983e25dd7ea9921 SHA512 e908ace9182c6e5cc37639d42d21ad862cc71d56e6c58361e7bda324af40105edc5de2fc6db6290f1b9d81ee655713552a78190ed7ca0f2bfde46c0413c1fb9a
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild
index bffa2b8cacf2..6154ad6744ae 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.15.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 QT5_MODULE="qtlocation"
 inherit qt5-build
 
@@ -14,9 +15,9 @@ fi
 IUSE="geoclue +qml"
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}
-	geoclue? ( ~dev-qt/qtdbus-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	=dev-qt/qtcore-${QT5_PV}*
+	geoclue? ( =dev-qt/qtdbus-${QT5_PV}* )
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
 "
 DEPEND="${RDEPEND}"
 PDEPEND="
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 21f7b8bf9f2b..0980dba46491 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,3 +1,3 @@
 DIST qtquickcontrols-everywhere-src-5.15.2.tar.xz 5982344 BLAKE2B 425bf2841cf12dd636955abeeb520dda580f6b509c01562192d8f2c91d7a9c32349992cbb9f0c1f84a12a98c135656158660ed2d7b21fda204927d0c5255f708 SHA512 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2
-EBUILD qtquickcontrols-5.15.2.ebuild 744 BLAKE2B 4cfc0821c704fbe2035a047a8c4aab22850fac10bbd776a91a62fcf7275a8d80f7a3e5a07fc5755cf2becb9bba921444d5cf0ba55944d442eb9a52de9d816f10 SHA512 60b422e26121c2a537b21c27fd00911fc171359a36ddca1cd7bcc2710ce2c228d7e54313bbe91ffeba39b7451d2964d435f991152ca91872ffe73d965d3c1772
+EBUILD qtquickcontrols-5.15.2-r1.ebuild 765 BLAKE2B 45cf85d9840351cf6312ee5811eabc4dfcec2516a67d9b04bd451674c4f2d301c058209bd1605510c1721ade0f6a5aef603eb3d0e3ead4d1e87cea433d55243b SHA512 cc30a6858cc250b5a31c75df36a47e08dfa6684190c7aaf5fb1ed264cb2360d65592eafa2486b3286db10722ea758bd15c014f6413128ff52fa3b26042db782a
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild
index 91ad5b9e09f6..494d453b030b 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
@@ -13,10 +14,10 @@ fi
 IUSE="+widgets"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 66ae96d3c981..3199d70f4827 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,3 +1,3 @@
 DIST qtquicktimeline-everywhere-src-5.15.2.tar.xz 102624 BLAKE2B 65cd3ba114e8da442a32ebe43d36b653b3d9a35b65d4fd0eaf17985545ce918cf45da9484094ee889fe56d935c9b988a1deef1c7c416bcfd3cf153fd458eadbd SHA512 2ea623bf2d74ce4dea8e8639a9a8e4bbc9cfaf7b9ec84eec3da3b41b580962cfa6c443c8c47d7dfe312885f4250ccd6a7c91ca1cbbb0fe8385d0f41ad44c3b92
-EBUILD qtquicktimeline-5.15.2.ebuild 357 BLAKE2B d7ab992791b227d9244c633f275e44bc2371ea030c223ccefc5a13d4b91c8ff1becf5209f5aeb64c9c5a81711f21b86a2c0306d3b7d9016d0b8c705cb4f8a5d9 SHA512 a3bfea6bdc195cdf55bdfa4dc08a8748e00989670db24dc120632b1fe7815d2e07feb108931b6c46f2a344701b79580bd0763e0af9eca38279e5cc1192c7d05e
+EBUILD qtquicktimeline-5.15.2-r1.ebuild 367 BLAKE2B 8234ac716bc7891542739f6d766a34e12a3207548a9d4628b70888e440d8afe27248bb76e5822b45606e78acce33b0d7b9a8f82fc40d65917adee2ce43da62b1 SHA512 3abf2ad66d61f40e8967f600534e898eec6fed12280806b42f6a6c8928b4e40671e7c127c502858fdd8f31824d3f437714387dc00741f80f9b82f3050bc95251
 MISC metadata.xml 382 BLAKE2B 3b12c68b32cd705b033f8750db3115587b76d52369a33481330d100e3bbd22dbfbcc0ea065f7659e6771af923477f2fbd1d4fc86743d13fc64f194e7b014567b SHA512 4825235a64c6320484a0bfd188dc1f4a0686f6222ee4abd29d6904899eed14f6471358562e8f08cd9b90743a718383e980925a432917dbbe3abba1872c631951
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild
index bf8d344fb0b3..3ba1e4d5dceb 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qt5-build
 
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 4b3614d0b1e7..dde9a7442e94 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,3 +1,3 @@
 DIST qtscript-everywhere-src-5.15.2.tar.xz 2663016 BLAKE2B f3cf09396fbcd9c386de9628042d2b70263343fec3e1fa49e53e705f56802a244373a37e5daafe6d90252ad67a8b1d3e0446aa4520ff8ff4a8bd010951a5d86e SHA512 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32
-EBUILD qtscript-5.15.2.ebuild 680 BLAKE2B bb6587549cd227fcddf2de294741180f8d5f6cb9e5bf885c12ec599c306203e30d300fde997b9b1b04b0e2b731bdd6ffdc29ef822f60d51fd312563741535bd9 SHA512 d1423b680d9f53006d75dfd2281f6ec7d4ceec36b41ac008d6647d372756debec95c2fe9e922f53624444b678101318fcceb38e0ec74c39eb7a6d30a6796f678
+EBUILD qtscript-5.15.2-r1.ebuild 696 BLAKE2B 4e9a59a088bb9f059977507b668b505118875ff8bf67a25769a3f55ec1a717701b066233f83889e02c55ce806120e3d59fc667366d114cae71dac6bd9bf6a698 SHA512 19f14e37efc672da5f02a90530b5e357750b123d785f4ab3913d39cfeabc3a28aed7a390e294dfee4a22e2f52491d6dd3d0844843ef9cf867f0835013e93191e
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.15.2.ebuild b/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
index 654014235025..00e1e6cc7370 100644
--- a/dev-qt/qtscript/qtscript-5.15.2.ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
@@ -13,10 +14,10 @@ fi
 IUSE="+jit scripttools"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
 	scripttools? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtwidgets-${PV}
+		=dev-qt/qtgui-${QT5_PV}*
+		=dev-qt/qtwidgets-${QT5_PV}*
 	)
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index e830715bf412..96dfcf731aaa 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,3 +1,3 @@
 DIST qtscxml-everywhere-src-5.15.2.tar.xz 434204 BLAKE2B 8deaa46eb784690937160470b20dc01ae1b2ee80be89f1f19a22e1e2f2252d3d33427e96bb97b4ec8033b54a78c2a73e3b00fe3bbbe061e9b9bfb299801847fe SHA512 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8
-EBUILD qtscxml-5.15.2.ebuild 375 BLAKE2B 386d2aafcd8e10dde8bfc13ae25fb3283de4cbdfdf4e0d66a3c587f7c4605077971d58d425b18acbb1f34d66418329c3f425748ec2b5ccf84e492ddb2b4cb62d SHA512 f5af1e4af2c10ee8a85071d3502ed2c890365f070318d7e65208f4ff0115da2ec8a965893aa9090e6daf1f15a97b7592fcaf8fdb9bcb2921eb1a9f532a7fdcc0
+EBUILD qtscxml-5.15.2-r1.ebuild 386 BLAKE2B 46e2d831ef8d18627363fac2b9ea2e27196ce2fba0002ddd050371de458380b1039a3612df8a4302705e4c197d6a83a485f33b20932bd2bbb578996256ea222b SHA512 f03793767456bff609a61ae0b61b1e4d99b09c3931397225c846eb0410c7b8470fb252733713a14d2159d08a9ee4c3f6ffd7bd1d1647635ab9c7492556ca3041
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.15.2.ebuild b/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild
index 8a38c015dba4..03ff5ecc0229 100644
--- a/dev-qt/qtscxml/qtscxml-5.15.2.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
@@ -13,7 +14,7 @@ fi
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 65e70ad5a8a4..ca3f75ad03da 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,3 +1,3 @@
 DIST qtsensors-everywhere-src-5.15.2.tar.xz 2056944 BLAKE2B 49f4e91027b122a16d65d953275b8720ecb9c12e9bff3a190df59dba703f6f3f8e8ec8c8fec1084154ec7a03a9a2c5d2fe196ec09ddf8f2282c16edd3873a965 SHA512 d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b
-EBUILD qtsensors-5.15.2.ebuild 543 BLAKE2B 034b706805c971e007c2638cc081157bf31d0a7e7f55fa375b32b62ca4bd77e5f71ac3fb90d000f6efd24ea3ee6e831d5b09423a2c9dccae0d6aad6e56842543 SHA512 321f929f1240a2fc197dcf6f3183ad4374e15c3adb1b7a9db4434df10968dedbace89b65fef10ece0be03f7ebab91eddf785993cb2283a2fd5d50482dc1d7487
+EBUILD qtsensors-5.15.2-r1.ebuild 559 BLAKE2B 8c14a3a0d27a2555add9398b246050dd386ac2d0c9fc597e7c2b915846f8045b416abd6a28bf632c3d17d94939c896ab612092e3d925c076dc1f4af52ec55e25 SHA512 ec69dad6a14f8440b0e54d3921ed30e7acc05e5fb775ef9db1f18c38ab544fefc827391650ea3f9d894044d7553c3b1a79e1cceab6a8898f374c94f76a161a04
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.15.2.ebuild b/dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild
index 66b45058d70a..c28fdfe54405 100644
--- a/dev-qt/qtsensors/qtsensors-5.15.2.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
@@ -14,9 +15,9 @@ fi
 IUSE="qml"
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdbus-${QT5_PV}*
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index 48959cbf28db..8ad486766a4a 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,3 +1,3 @@
 DIST qtserialbus-everywhere-src-5.15.2.tar.xz 356360 BLAKE2B 491f3a7b9df8f58496cff1c4fea87615335486ec834f859029340c7e34551e1127ce4e2689f16e06e195e40691300475ccace19c1fd43fefe0a56c10961184c2 SHA512 c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b
-EBUILD qtserialbus-5.15.2.ebuild 414 BLAKE2B 1866625b93493ce873ce5f3f3fc0c02e8f62953b8c0d1d5bf009e0d23de8d426457d7ec7772c7fb52d0d7dbf5f63e3995e1745e67159737ecf44be431bf75c99 SHA512 14e4ce2c8eba7e423d0b7240d9f9be7ed1f72b1384409b68103ce84a690e2821893f0c243b451d5da532fb24f7a3eb971ab1684d861009273f41223dbfc8c755
+EBUILD qtserialbus-5.15.2-r1.ebuild 430 BLAKE2B 4b935e7c6fcc6bd8828249e6967320fa3fac4b87e6cf7543849c8cf57a396707fc4abd2e76fe91e59f6cccbbeb972ec1f2598940a5e2ba33236cc426220ecdd3 SHA512 e36aa6019ae92b0ae204e2749b488867c40664cad03bdaf43ea73c9344e0ae2fae9151491fe1b1318c64acab0f218900f596682baa26aab0f1d9a2b710da8b7d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.2.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild
index 2b783f499663..0d8fd68fa6e0 100644
--- a/dev-qt/qtserialbus/qtserialbus-5.15.2.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
@@ -13,8 +14,8 @@ fi
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtserialport-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qtserialport-${QT5_PV}*
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 70ad067b9458..c11e1b20714e 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,3 +1,3 @@
 DIST qtserialport-everywhere-src-5.15.2.tar.xz 321496 BLAKE2B 1a2d1a925a1f8224de6babad131efa9bb2e417574be939be35edf3a3b9f34a7fb12cc282f94ee2d8e52178cec7679caf1402f5a45a14bb15a546023fed494907 SHA512 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b
-EBUILD qtserialport-5.15.2.ebuild 552 BLAKE2B 5103dbf146c1ba5668be8f0972634a9634cbecbb012752320bcaa449a825ea1b28b5ea87f1118920489668672adec95acd0e99562df3b11de7aa23c4a27d8a9b SHA512 2c64e1f10d99d0b5b2f6e735a404317d3a36bb61b498025524e11efa003f4a50094342e802bed2f6a303ea1355c789a080ca6319066e19f91ae13ca5e1f0d94c
+EBUILD qtserialport-5.15.2-r1.ebuild 558 BLAKE2B 5c281a603275cc97952fd5687479c6e8c7f56a5a08a93bc7d66ba4ef3f9a77d6b5a32bc3372ad3ed9b7988505e8f1e27bf70f3aee5311690f5dcbdfcf3e0e240 SHA512 fd20efebb0baed3876d0d231301ad1f17c6599f7860ec9bb3a33f8bd840f926e503b3d9703af9b9efbca55dad06ec428a7833db0e0cf9580f2269724de554c3b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.15.2.ebuild b/dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild
index dbbb302a3f98..26e5eb53bd00 100644
--- a/dev-qt/qtserialport/qtserialport-5.15.2.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
@@ -13,7 +14,7 @@ fi
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
 	virtual/libudev:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsingleapplication/Manifest b/dev-qt/qtsingleapplication/Manifest
index 3ad89602af4e..0e868acf37c0 100644
--- a/dev-qt/qtsingleapplication/Manifest
+++ b/dev-qt/qtsingleapplication/Manifest
@@ -3,5 +3,5 @@ AUX 2.6.1_p20130904-unbundle-qtlockedfile.patch 2547 BLAKE2B e1668e24798405e91a3
 AUX qtsingleapplication.prf 255 BLAKE2B a810e133b1017901bffb26aa1ede3ba64d28044b57c5b49828f55d6bf0e0f3e7c3bced99b69064985a8d1703b996d8eb678da89fb620fd91c2b28b8e5c8dfdea SHA512 005d9f547279ee7df2a4c0ae17ad371a73c9d21a3257740d5ad63c261c8eed64acff7211d009ef787ff9610075d0fbf31fb404803cd0ed2647dc2036ef89fad5
 AUX qtsinglecoreapplication.prf 241 BLAKE2B b356e55f6ba7fb1028e399b6111463bd5f0a02d4cd3c07240c433f7f0bffca587334752fb89e38673c075d47d3cee69a69420ccae6d2fa69454b1cac496edc6d SHA512 938d2eb0c2a3a8dc8ab1c15a175a6bad78b20ad699936b7afbbc54fec10cff6f7ed9ca69b68d81d36495fad439b8550c0d515e4b4a6856362c475f1d9fa7d974
 DIST qt-solutions-20171024.tar.xz 710532 BLAKE2B 365f4c6fc3bee34bf26ac5039984ceac1d90527297b985b0d1b606f3ba67219bab7f7cba40b4adca55446c34e9f4fe218b4449ee255ba6f6409de78f80ccdaec SHA512 4784d88c2f40c88f06abeb728842875fb5e428a630dbf749f71055681b0c631803d2901b60aa8cc95f5f382dcd21da8d739873aa45e3dd3676ee95925f0198da
-EBUILD qtsingleapplication-2.6.1_p20171024.ebuild 1459 BLAKE2B 0671641ca1b02bd5c7c408287f8d8a47f057a5f80545cc636b980950fbcd47ec1352eda5d4a14449324f1a1fbb819098daeaeea9b70c22477c97db6122bd407c SHA512 650d8a0b057406729f7c0628235e4fab3e16eb40e1e326dd2f31e630f4c37914d7289db291e86aacf4183d7730bf5b52d8328ef6de6f40dd750c6dd1a20b1518
+EBUILD qtsingleapplication-2.6.1_p20171024.ebuild 1458 BLAKE2B 5e9dfa09fe3b071d5c917695a83ab812259c665bbd7ea95828a6b4fcea3555f6e1aca59079c4a4f8e9f04cb03b54e8211bfe7194649656452f3de1a06cbbcd02 SHA512 22f4758fa47ad4bd26fc84c348737cff0cee35e4b4af3c19d7a6dd033cbdef7cc7eb747dc6446fce29b7337fc0bf3a3327f15d1f0f2dd5740af322a942b2cdac
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild
index c8d3c9c8e5d8..195bd2ed872c 100644
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P=qt-solutions-${PV#*_p}
 inherit qmake-utils
@@ -9,6 +9,7 @@ inherit qmake-utils
 DESCRIPTION="Qt library to start applications only once per user"
 HOMEPAGE="https://code.qt.io/cgit/qt-solutions/qt-solutions.git/"
 SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
@@ -26,8 +27,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/${PN}"
-
 PATCHES=(
 	"${FILESDIR}/2.6.1_p20130904-unbundle-qtlockedfile.patch"
 	"${FILESDIR}/2.6.1_p20130904-no-gui.patch"
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index d64cfd308a21..1df7964ae36f 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,3 +1,5 @@
+DIST qttranslations-5.15.2-68f420eb.tar.gz 2994506 BLAKE2B a0cdc69f6fc9b455b98658ee386d15346c1c23eeedeb4b7ca9d7cd7b60e7ee06a537a68530d017797683d60485dc38b02144f35f3e3e94c280a00b65a690bf97 SHA512 012e83971a8064d87d0d7ea50e6a9579916974fdaef195f1eea1639673085512bd421ced7abc2550c5b07dad264c861a75cd8ae6d48ac1c5e78f5359ceaa61b4
 DIST qttranslations-everywhere-src-5.15.2.tar.xz 1419504 BLAKE2B 3dd5a007bb42492e8a0e81004c99aaf10d97d3c7a77e952240d1d15c607cf34a246271776ff3bf01ad77fcbfb3966366131f23cba162414b02bbfd6da85505b1 SHA512 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe
+EBUILD qttranslations-5.15.2-r10.ebuild 439 BLAKE2B 3b58acfcb36e6744a570eb8af313069bbd3816ad668bf71007775bf65e2e119dcb7fed31f242b850744c5c708e722718645cbb5a19dd153db3252990fa436ac4 SHA512 f53320cbd1e6c08030d33bde018f54db7486555c942f892dc6539b849f444d9160c493ffcb1b3d5c718737090068916a32b42b1598b9326ff57afa1864e4cba8
 EBUILD qttranslations-5.15.2.ebuild 379 BLAKE2B 7f9bc811a3f5669b63609c8ad81039049ac860a79f27378e176a8206e67bdf118754d6ff27a09621a2c951ca9b634234dcd1a8ee13508f1bffd8aa6278d8d6fe SHA512 b1e2c9b0af9d09683b6ffa9e4cafa8b13fb55ed2c14316aa2e8de5836ee8ae1007c23455c8f6a39474668ccb02b788e184184276fc565612415e8b37e47d7db3
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
new file mode 100644
index 000000000000..f45c8d00c605
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f
+inherit qt5-build
+
+DESCRIPTION="Translation files for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="=dev-qt/qtcore-${PV}*"
+BDEPEND="=dev-qt/linguist-tools-${PV}*"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 247f93cd7a90..1ff29e5bebbe 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,3 +1,3 @@
 DIST qtwebchannel-everywhere-src-5.15.2.tar.xz 209208 BLAKE2B 486da1fb4dc8106343716536c69f9fe3251119ab844b36eace21ad1921840be3e0bb97db58d29738bb54a28d2ad85839bfa71a8832a9d84a40c32b0f285fc2e7 SHA512 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b
-EBUILD qtwebchannel-5.15.2.ebuild 571 BLAKE2B d75457b9aef8bdbfb6bac195374c8d54b2b9582cf750b1f162608500844d2e404ffdf83f96fa9d1ed2e8df219b6ab0bdc568d06dd11e683f8cb1c8837effdba6 SHA512 50819b28a6aa804e03557a4d11a70671610a2f1b423892fae3abe93ea18d70bbd6797cc7b4bb13dd1db66cb05bcab28c1b23b284b52b07b7bda075582076632f
+EBUILD qtwebchannel-5.15.2-r1.ebuild 582 BLAKE2B 82846fda48800ab672fe7f1de8ba52c8b95b8eb4c10d622f9f2afb78cb0c69a92f32a4a698666a532166d2a23ce6c09b8f1770e2d864c9443f68d83dd0e5dd4a SHA512 ea75b3fcfb6ed378cd16f9b3c9427cdb2673b542450f01a292d2d0424ba3ca33cac47f4224363d6d57888d0dc796c6a6e2347a9dacfeec915142000b92036b16
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild
index b5486b450fcb..1f5019a95f50 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit qt5-build
 
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
@@ -13,8 +14,8 @@ fi
 IUSE="qml"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	=dev-qt/qtcore-${QT5_PV}*
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 40dd9c2168b5..56a0d1032f39 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,3 +1,3 @@
 DIST qtwebview-everywhere-src-5.15.2.tar.xz 133428 BLAKE2B 64cc9ff6a14c9107eb1607cbf244d179fd78ab5fdc879cce85c5f8b85dd738452b681faf864bf0013d3c8614ab2bd593fbf5ddb603ee2d2a0e0f684f9a46a0e2 SHA512 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85
-EBUILD qtwebview-5.15.2-r1.ebuild 435 BLAKE2B 0dd0f0e06638bfa3dd13870f2f6d3c7c996a429b55719dd89fdf630399be31f98da77aae550473c049d1125b0e8685ebaa2b7f17a8fe2cedbf76e0097c9c3102 SHA512 4847f8521c1f9c03c50df065823bc049fbace48b4d3ed30f4c2f27accf282525aaafee86960cc81f248d3740fb862f4a7b784965b291439045ea8dae3e32a3d0
+EBUILD qtwebview-5.15.2-r2.ebuild 450 BLAKE2B a1fa18df102f9fcb7aff5f6f7d6c661c858a08244bdd3db4cd339aeb55fcd0c0062b7e0a04cfe1c1a5e37a75a40a3c3ffb1b6b51e7898b1b045c84a84bae3def SHA512 e081d839e2603fd09dc9c6e8c65d5ec4e2df37298db9e6b9bcca6ca8701061567d0ca3e91582617ab91545032b1426a22594b8bdd5d1f73c35449ce9b8c4dff2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.15.2-r1.ebuild b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
index d17dd95908f8..a1b3c1180fbd 100644
--- a/dev-qt/qtwebview/qtwebview-5.15.2-r1.ebuild
+++ b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qt5-build
 
@@ -14,9 +14,9 @@ fi
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
 	=dev-qt/qtwebengine-${PV}*:5
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index fbac01f3cb53..50a8256d922b 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,3 +1,3 @@
 DIST qtx11extras-everywhere-src-5.15.2.tar.xz 143972 BLAKE2B 7dfa2fcdad254280bb00f40722e5ba4736ed89a1dc6b3542738a0492fe74a5f0823aefc141938bd7b0e839c7ee0b72914030b368cf4e33101e1e056e4a8d2ca3 SHA512 beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9
-EBUILD qtx11extras-5.15.2.ebuild 437 BLAKE2B fa4a71929c54b3b11ce568b0d2c0e2b665acba86445316a7dd7c8d320927474396ac13c2533bf1e540d0548cc3ae407459183ebfffc879eba1b92f44bbd57d98 SHA512 ca050374fb5d0b3a2dd2867334fa341b9cf81886ebe3e4520b7e1d4389323150c0feba9beba43b902e8831212ba931a0d8dbeb0e8b8c0114b59c6f36dc6f5bf9
+EBUILD qtx11extras-5.15.2-r1.ebuild 452 BLAKE2B 68d15adc17ef5dc066030d53ada160ec18fc602e7751cf5f8154dab498100ad9a2b598b19f80333b2a25c1ef020b53b3348f8cbc6f06b580806920b99dddc86a SHA512 c77dd842d7529d45a8877f9623297f2677be3be3c6eaad7ea8fe076db3283d13a21bdee90f67b6858f574064b85e400aff4a2a2ae1b58cf39aca434a8e176902
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild
index 40e88544ff0d..0174763a58f6 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.15.2.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qt5-build
 
@@ -14,9 +14,9 @@ fi
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[X]
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*[X]
 "
 DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtwidgets-${PV} )
+	test? ( =dev-qt/qtwidgets-${QT5_PV}* )
 "
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 699538cdf2e5..bfe4f691fcc0 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,3 +1,3 @@
 DIST qtxmlpatterns-everywhere-src-5.15.2.tar.xz 5209380 BLAKE2B 35933ecc0b7eb6b7355e660aafc616e47a1358857f8f2b161454dcaf1f05cd0d536e27859e3380a8ac46da3b228c805ef25d267931eb71585e5f9974d3e5640f SHA512 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348
-EBUILD qtxmlpatterns-5.15.2.ebuild 647 BLAKE2B 3800415cb54bd04fb22d1c7131456abca5fce3a2b5b05cca1b551ce7576fa4df53751752db23950a2d568737dd6385bd0bf14bb843450c91bf3c84645ae90330 SHA512 940e223f67da2380fe244a12235f6bc9be579478bb688d55bf1097aae31462b4b1ac8c386ab71927e0ba1fa3628d4d988f9b3c86d4c59578ca945fd102e2bdb7
+EBUILD qtxmlpatterns-5.15.2-r1.ebuild 643 BLAKE2B 6ba7d3493d66247c29aa09cd106132774f05e649be235b0f785f40103fae21e2ea7b1e9af7d6c0de822da97e506db362fc5899d20aa310cdf029daf3220b0e4e SHA512 414a184e1a86a12e5ccf1d44c167b5fce52f0a7004bf3207ba527478fa11263781334614991f0517be8cce9f599ba7ce8987731b0ac571e29cd32c6b9f87fce5
 MISC metadata.xml 589 BLAKE2B bbca816148efdf3a04c05ea1c653a4e9a6e7c9c8109283719d53a06188e495df1addfceca8acc374ed03b89391fe14c70eb6e84b4f5343fb7345e841d50d8ee0 SHA512 dfd095f116f9223cea460984b650cf9d6f506f1bc5e43ae38429528d1218863d785fb47e05a3c9eb4891838d58baa967de3ac31d59e38c4de90a5655c8344d4b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2-r1.ebuild
index 86facdb947d9..20f6cb72b150 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qt5-build
 
@@ -14,13 +14,11 @@ fi
 IUSE="qml"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
 "
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	qt_use_disable_mod qml qml \