commit:     d68269b014a9223c51f15f00024eb53440fcca54
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 23:44:35 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:08:37 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68269b0

dev-qt/qt5compat: add IUSE=+gui

Often not bothering with USE=gui automagic, but this one was requested
in bug #951442 and qt5compat can be needed for a variety of non-gui
things too.

Using [gui=] rather than cmake_disable for two reasons, first because
the latter often has unexpected effects with Qt (side-disabling things
it shouldn't, tend to be fine with Qml but with Gui it can be messy)
and then so that gui revdeps do not have to think about whether USE=gui
is set on this package or not (if they depend on qtbase[gui] then it'll
be set) given unclear what packages need graphicaleffects5 controlled
by this.

Note that if a user setting USE=-gui globally and then only setting it
on specific packages like qtbase is reading this and wondering why
portage is giving confusing output, please set it on qt5compat too.

Closes: https://bugs.gentoo.org/951442
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../qt5compat/{qt5compat-6.8.2.ebuild => qt5compat-6.8.2-r1.ebuild} | 4 ++--
 dev-qt/qt5compat/qt5compat-6.8.9999.ebuild                          | 6 +++---
 .../{qt5compat-6.9.0_rc.ebuild => qt5compat-6.9.0_rc-r1.ebuild}     | 4 ++--
 dev-qt/qt5compat/qt5compat-6.9.9999.ebuild                          | 6 +++---
 dev-qt/qt5compat/qt5compat-6.9999.ebuild                            | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dev-qt/qt5compat/qt5compat-6.8.2.ebuild 
b/dev-qt/qt5compat/qt5compat-6.8.2-r1.ebuild
similarity index 90%
rename from dev-qt/qt5compat/qt5compat-6.8.2.ebuild
rename to dev-qt/qt5compat/qt5compat-6.8.2-r1.ebuild
index 5cbb665fb212..92818ac9c965 100644
--- a/dev-qt/qt5compat/qt5compat-6.8.2.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.8.2-r1.ebuild
@@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
        KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 fi
 
-IUSE="icu qml"
+IUSE="+gui icu qml"
 
 RDEPEND="
-       ~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
+       ~dev-qt/qtbase-${PV}:6[gui=,icu=,network,xml]
        icu? ( dev-libs/icu:= )
        qml? (
                ~dev-qt/qtdeclarative-${PV}:6

diff --git a/dev-qt/qt5compat/qt5compat-6.8.9999.ebuild 
b/dev-qt/qt5compat/qt5compat-6.8.9999.ebuild
index 4462f312f154..31d0855b0d9a 100644
--- a/dev-qt/qt5compat/qt5compat-6.8.9999.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
-IUSE="icu qml"
+IUSE="+gui icu qml"
 
 RDEPEND="
-       ~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
+       ~dev-qt/qtbase-${PV}:6[gui=,icu=,network,xml]
        icu? ( dev-libs/icu:= )
        qml? (
                ~dev-qt/qtdeclarative-${PV}:6

diff --git a/dev-qt/qt5compat/qt5compat-6.9.0_rc.ebuild 
b/dev-qt/qt5compat/qt5compat-6.9.0_rc-r1.ebuild
similarity index 90%
rename from dev-qt/qt5compat/qt5compat-6.9.0_rc.ebuild
rename to dev-qt/qt5compat/qt5compat-6.9.0_rc-r1.ebuild
index c5015b0bcc12..31d0855b0d9a 100644
--- a/dev-qt/qt5compat/qt5compat-6.9.0_rc.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.9.0_rc-r1.ebuild
@@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
-IUSE="icu qml"
+IUSE="+gui icu qml"
 
 RDEPEND="
-       ~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
+       ~dev-qt/qtbase-${PV}:6[gui=,icu=,network,xml]
        icu? ( dev-libs/icu:= )
        qml? (
                ~dev-qt/qtdeclarative-${PV}:6

diff --git a/dev-qt/qt5compat/qt5compat-6.9.9999.ebuild 
b/dev-qt/qt5compat/qt5compat-6.9.9999.ebuild
index 4462f312f154..31d0855b0d9a 100644
--- a/dev-qt/qt5compat/qt5compat-6.9.9999.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.9.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
-IUSE="icu qml"
+IUSE="+gui icu qml"
 
 RDEPEND="
-       ~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
+       ~dev-qt/qtbase-${PV}:6[gui=,icu=,network,xml]
        icu? ( dev-libs/icu:= )
        qml? (
                ~dev-qt/qtdeclarative-${PV}:6

diff --git a/dev-qt/qt5compat/qt5compat-6.9999.ebuild 
b/dev-qt/qt5compat/qt5compat-6.9999.ebuild
index 4462f312f154..31d0855b0d9a 100644
--- a/dev-qt/qt5compat/qt5compat-6.9999.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
-IUSE="icu qml"
+IUSE="+gui icu qml"
 
 RDEPEND="
-       ~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
+       ~dev-qt/qtbase-${PV}:6[gui=,icu=,network,xml]
        icu? ( dev-libs/icu:= )
        qml? (
                ~dev-qt/qtdeclarative-${PV}:6

Reply via email to