[gentoo-commits] repo/gentoo:master commit in: dev-lang/swi-prolog/

[Joonas Niilola]

commit:     410059ff2671da20d7213dd77c11c1753cb16a18
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 08:35:22 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 08:36:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410059ff

dev-lang/swi-prolog: re-order "cmake_use_find_package qt6" on 9.1.2

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild 
b/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild
index 32072614c3f8..e7f92df2f131 100644
--- a/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-9.1.2.ebuild
@@ -119,7 +119,6 @@ src_configure() {
                -DSWIPL_PACKAGES_JAVA=$(usex java)
                -DSWIPL_PACKAGES_ODBC=$(usex odbc)
                -DSWIPL_PACKAGES_PCRE=$(usex pcre)
-               -DSWIPL_PACKAGES_QT=$(usex gui)
                -DSWIPL_PACKAGES_SSL=$(usex ssl)
                -DSWIPL_PACKAGES_TERM=$(usex cli)
                -DSWIPL_PACKAGES_TIPC=$(usex ipc)
@@ -127,9 +126,17 @@ src_configure() {
                -DSWIPL_PACKAGES_YAML=$(usex yaml)
                -DUSE_GMP=$(usex gmp)
                -DUSE_TCMALLOC=OFF
-               $(cmake_use_find_package qt6 Qt6)
        )
 
+       if use gui; then
+               mycmakeargs+=(
+                       -DSWIPL_PACKAGES_QT=yes
+                       $(cmake_use_find_package qt6 Qt6)
+               )
+       else
+               mycmakeargs+=( -DSWIPL_PACKAGES_QT=no )
+       fi
+
        if use test && use java; then
                mycmakeargs+=( 
-DJUNIT_JAR="${ESYSROOT}"/usr/share/junit-4/lib/junit.jar )
        fi