[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/

[Andreas Sturmlechner]

commit:     3209ea08d76fd22e91876ad938f820a3d838cda1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 21:04:09 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 21:09:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3209ea08

kde-frameworks/extra-cmake-modules: Fix test dependencies

Also set QT_MAJOR_VERSION=6 if testing, not going to add any complexity
for optional Qt5 testing.

Closes: https://bugs.gentoo.org/938316
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild      | 11 ++++++++++-
 .../extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild      | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild
index ed1f9497b3a5..33c2e7461970 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.7.0.ebuild
@@ -17,6 +17,12 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/libarchive[bzip2]"
+DEPEND="
+       test? (
+               >=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+               >=dev-qt/qtdeclarative-${QTMIN}:6
+       )
+"
 BDEPEND="
        doc? (
                ${PYTHON_DEPS}
@@ -24,8 +30,8 @@ BDEPEND="
                >=dev-qt/qttools-${QTMIN}:6[assistant]
        )
        test? (
-               >=dev-qt/qttools-${QTMIN}:6[linguist]
                >=dev-qt/qtbase-${QTMIN}:6
+               >=dev-qt/qttools-${QTMIN}:6[linguist]
        )
 "
 
@@ -54,6 +60,9 @@ src_configure() {
                -DBUILD_MAN_DOCS=$(usex doc)
                -DBUILD_TESTING=$(usex test)
        )
+       if use test; then
+               mycmakeargs+=( -DQT_MAJOR_VERSION=6 ) # bug 938316
+       fi
 
        cmake_src_configure
 }

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild
index ff645083e05b..15428fb1dd55 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.8.0.ebuild
@@ -17,6 +17,12 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/libarchive[bzip2]"
+DEPEND="
+       test? (
+               >=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+               >=dev-qt/qtdeclarative-${QTMIN}:6
+       )
+"
 BDEPEND="
        doc? (
                ${PYTHON_DEPS}
@@ -24,8 +30,8 @@ BDEPEND="
                >=dev-qt/qttools-${QTMIN}:6[assistant]
        )
        test? (
-               >=dev-qt/qttools-${QTMIN}:6[linguist]
                >=dev-qt/qtbase-${QTMIN}:6
+               >=dev-qt/qttools-${QTMIN}:6[linguist]
        )
 "
 
@@ -53,6 +59,9 @@ src_configure() {
                -DBUILD_MAN_DOCS=$(usex doc)
                -DBUILD_TESTING=$(usex test)
        )
+       if use test; then
+               mycmakeargs+=( -DQT_MAJOR_VERSION=6 ) # bug 938316
+       fi
 
        cmake_src_configure
 }