15 files changed, 57 insertions, 17 deletions
diff --git a/dev-qt/designer/designer-5.15.2.ebuild b/dev-qt/designer/designer-5.15.2.ebuild
index 7430389f18b0..a61c840e711d 100644
--- a/dev-qt/designer/designer-5.15.2.ebuild
+++ b/dev-qt/designer/designer-5.15.2.ebuild
@@ -23,7 +23,9 @@ DEPEND="
 	~dev-qt/qtxml-${PV}
 	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
 
 src_prepare() {
 	qt_use_disable_mod declarative quickwidgets \
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
index 1f62623c5d30..e70cf3d14d78 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qttools"
 inherit qt5-build
 
@@ -18,7 +19,9 @@ DEPEND="
 	~dev-qt/qtxml-${PV}
 	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
 
 QT5_TARGET_SUBDIRS=(
 	src/linguist
diff --git a/dev-qt/pixeltool/pixeltool-5.15.2.ebuild b/dev-qt/pixeltool/pixeltool-5.15.2.ebuild
index e3a011cfcd6a..0f420e26c76b 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.2.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qttools"
 inherit qt5-build
 
@@ -18,4 +19,6 @@ DEPEND="
 	~dev-qt/qtgui-${PV}:5=
 	~dev-qt/qtwidgets-${PV}
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
diff --git a/dev-qt/qdoc/qdoc-5.15.2.ebuild b/dev-qt/qdoc/qdoc-5.15.2.ebuild
index 9052d5178e7c..bf61754ef4b3 100644
--- a/dev-qt/qdoc/qdoc-5.15.2.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qttools"
 inherit qt5-build
 
@@ -18,7 +19,9 @@ DEPEND="
 	sys-devel/clang:=
 	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
 
 src_prepare() {
 	qt_use_disable_mod qml qmldevtools-private \
diff --git a/dev-qt/qt3d/qt3d-5.15.2.ebuild b/dev-qt/qt3d/qt3d-5.15.2.ebuild
index ffeb1aa53337..d815875134bc 100644
--- a/dev-qt/qt3d/qt3d-5.15.2.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit qt5-build
 
 DESCRIPTION="3D rendering module for the Qt5 framework"
@@ -13,7 +14,7 @@ fi
 # TODO: tools
 IUSE="gamepad gles2-only qml vulkan"
 
-RDEPEND="
+COMMON_DEPEND="
 	~dev-qt/qtconcurrent-${PV}
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtgui-${PV}:5=[vulkan=]
@@ -22,9 +23,12 @@ RDEPEND="
 	gamepad? ( ~dev-qt/qtgamepad-${PV} )
 	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	vulkan? ( dev-util/vulkan-headers )
 "
+RDEPEND="${COMMON_DEPEND}
+	dev-qt/qtchooser
+"
 
 src_prepare() {
 	rm -r src/3rdparty/assimp/{code,contrib,include} || die
diff --git a/dev-qt/qtcore/qtcore-5.15.2.ebuild b/dev-qt/qtcore/qtcore-5.15.2.ebuild
index fb18132efb35..930bd912dbd9 100644
--- a/dev-qt/qtcore/qtcore-5.15.2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!<dev-qt/qtcore-4.8.7-r4:4
+	dev-qt/qtchooser
 "
 
 QT5_TARGET_SUBDIRS=(
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2.ebuild
index 098360958680..defe690aa31c 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.2.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.2.ebuild
@@ -17,7 +17,9 @@ DEPEND="
 	~dev-qt/qtcore-${PV}:5=
 	>=sys-apps/dbus-1.4.20
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
 
 QT5_TARGET_SUBDIRS=(
 	src/dbus
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
index 0a1641a44196..5c7e4ff9c888 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild
@@ -2,6 +2,7 @@
 # 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
 
@@ -23,7 +24,9 @@ DEPEND="
 	localstorage? ( ~dev-qt/qtsql-${PV} )
 	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
diff --git a/dev-qt/qtdiag/qtdiag-5.15.2.ebuild b/dev-qt/qtdiag/qtdiag-5.15.2.ebuild
index 3a64cd887589..66f891a69ccc 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.2.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qttools"
 inherit qt5-build
 
@@ -13,16 +14,19 @@ fi
 
 IUSE="+network +widgets"
 
-RDEPEND="
+COMMON_DEPEND="
 	~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}
+DEPEND="${COMMON_DEPEND}
 	~dev-qt/qtxml-${PV}
 "
+RDEPEND="${COMMON_DEPEND}
+	dev-qt/qtchooser
+"
 
 src_prepare() {
 	qt_use_disable_mod network network \
diff --git a/dev-qt/qtgui/qtgui-5.15.2.ebuild b/dev-qt/qtgui/qtgui-5.15.2.ebuild
index e6fed6656239..2e272cfbc2f2 100644
--- a/dev-qt/qtgui/qtgui-5.15.2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 	X? ( gles2-only? ( egl ) )
 "
 
-RDEPEND="
+COMMON_DEPEND="
 	dev-libs/glib:2
 	~dev-qt/qtcore-${PV}:5=
 	dev-util/gtk-update-icon-cache
@@ -66,10 +66,13 @@ RDEPEND="
 		x11-libs/xcb-util-wm
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	evdev? ( sys-kernel/linux-headers )
 	udev? ( sys-kernel/linux-headers )
 "
+RDEPEND="${COMMON_DEPEND}
+	dev-qt/qtchooser
+"
 PDEPEND="
 	ibus? ( app-i18n/ibus )
 	wayland? ( ~dev-qt/qtwayland-${PV} )
diff --git a/dev-qt/qthelp/qthelp-5.15.2.ebuild b/dev-qt/qthelp/qthelp-5.15.2.ebuild
index 1590efa1a496..faae9e4de438 100644
--- a/dev-qt/qthelp/qthelp-5.15.2.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qttools"
 inherit qt5-build
 
@@ -20,7 +21,9 @@ DEPEND="
 	~dev-qt/qtsql-${PV}[sqlite]
 	~dev-qt/qtwidgets-${PV}
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
 
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help
diff --git a/dev-qt/qtpaths/qtpaths-5.15.2.ebuild b/dev-qt/qtpaths/qtpaths-5.15.2.ebuild
index c221a48484b2..90b13c344fee 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.2.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.2.ebuild
@@ -16,4 +16,6 @@ IUSE=""
 DEPEND="
 	~dev-qt/qtcore-${PV}
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild
index 3082414675cc..69fcef78f572 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild
@@ -16,4 +16,6 @@ IUSE=""
 DEPEND="
 	~dev-qt/qtcore-${PV}
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild
index 30655fc94224..d2e557d0304c 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild
@@ -25,7 +25,9 @@ DEPEND="
 		x11-libs/pango
 	)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
 
 QT5_TARGET_SUBDIRS=(
 	src/tools/uic
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2.ebuild
index 66fa234d35c7..8acfda706903 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2.ebuild
@@ -2,6 +2,7 @@
 # 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"
@@ -17,7 +18,9 @@ DEPEND="
 	~dev-qt/qtnetwork-${PV}
 	qml? ( ~dev-qt/qtdeclarative-${PV} )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-qt/qtchooser
+"
 
 src_prepare() {
 	qt_use_disable_mod qml qml \