diff --git a/dev-qt/qt5compat/metadata.xml b/dev-qt/qt5compat/metadata.xml
index 61563214f4862..00a322d647f6d 100644
--- a/dev-qt/qt5compat/metadata.xml
+++ b/dev-qt/qt5compat/metadata.xml
@@ -5,6 +5,9 @@
qt@gentoo.org
Gentoo Qt Project
+
https://bugreports.qt.io/
https://doc.qt.io/
diff --git a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild
similarity index 57%
rename from dev-qt/qt5compat/qt5compat-6.5.2.ebuild
rename to dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild
index 774e6a1a99c68..4a08020e992c2 100644
--- a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild
@@ -11,12 +11,26 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
+IUSE="icu qml"
+
RDEPEND="
- =dev-qt/qtbase-${PV}*:6[gui,network]
- =dev-qt/qtdeclarative-${PV}*:6
+ =dev-qt/qtbase-${PV}*:6[gui,icu=,network,xml]
+ icu? ( dev-libs/icu:= )
+ qml? (
+ =dev-qt/qtdeclarative-${PV}*:6
+ =dev-qt/qtshadertools-${PV}*:6
+ )
"
DEPEND="${RDEPEND}"
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package qml Qt6Qml)
+ )
+
+ qt6-build_src_configure
+}
+
src_test() {
# tst_qxmlinputsource sometimes hang without -j1
qt6-build_src_test -j1
diff --git a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild
index 774e6a1a99c68..4a08020e992c2 100644
--- a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild
@@ -11,12 +11,26 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
+IUSE="icu qml"
+
RDEPEND="
- =dev-qt/qtbase-${PV}*:6[gui,network]
- =dev-qt/qtdeclarative-${PV}*:6
+ =dev-qt/qtbase-${PV}*:6[gui,icu=,network,xml]
+ icu? ( dev-libs/icu:= )
+ qml? (
+ =dev-qt/qtdeclarative-${PV}*:6
+ =dev-qt/qtshadertools-${PV}*:6
+ )
"
DEPEND="${RDEPEND}"
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package qml Qt6Qml)
+ )
+
+ qt6-build_src_configure
+}
+
src_test() {
# tst_qxmlinputsource sometimes hang without -j1
qt6-build_src_test -j1
diff --git a/dev-qt/qt5compat/qt5compat-6.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.9999.ebuild
index 774e6a1a99c68..4a08020e992c2 100644
--- a/dev-qt/qt5compat/qt5compat-6.9999.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.9999.ebuild
@@ -11,12 +11,26 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
+IUSE="icu qml"
+
RDEPEND="
- =dev-qt/qtbase-${PV}*:6[gui,network]
- =dev-qt/qtdeclarative-${PV}*:6
+ =dev-qt/qtbase-${PV}*:6[gui,icu=,network,xml]
+ icu? ( dev-libs/icu:= )
+ qml? (
+ =dev-qt/qtdeclarative-${PV}*:6
+ =dev-qt/qtshadertools-${PV}*:6
+ )
"
DEPEND="${RDEPEND}"
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package qml Qt6Qml)
+ )
+
+ qt6-build_src_configure
+}
+
src_test() {
# tst_qxmlinputsource sometimes hang without -j1
qt6-build_src_test -j1