[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/

[Ionen Wolkens]

commit:     9a47c3b8aeeab8b397410e01cf9ef97c948521a4
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 05:13:37 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 06:20:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a47c3b8

dev-qt/qtbase: minor style/comment adjustments

Note that if needed this ?? () could be dropped, syslog just
becomes a no-op if both are set, but given journald is not a
global USE it shouldn't cause problems at this stage and lets
users know only one will work.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.7.2-r1.ebuild | 4 ++--
 dev-qt/qtbase/qtbase-6.7.9999.ebuild | 4 ++--
 dev-qt/qtbase/qtbase-6.8.9999.ebuild | 4 ++--
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild 
b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
index ef5475795d66..37e0b5c51a97 100644
--- a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild
@@ -28,13 +28,13 @@ declare -A QT6_IUSE=(
 )
 IUSE="${QT6_IUSE[*]}"
 REQUIRED_USE="
+       ?? ( journald syslog )
        $(
                printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
                printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
                printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
                printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
        )
-       ?? ( journald syslog )
        accessibility? ( dbus )
        eglfs? ( opengl )
        gles2-only? ( opengl )
@@ -51,7 +51,7 @@ REQUIRED_USE="
 # - qtnetwork (src/network/configure.cmake)
 # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
 # - qtsql (src/plugins/sqldrivers/configure.cmake)
-# dlopen: renderdoc
+# nolink: renderdoc, systemd
 COMMON_DEPEND="
        sys-libs/zlib:=
        ssl? ( dev-libs/openssl:= )

diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 1e708080ccd0..66720e44d615 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -28,13 +28,13 @@ declare -A QT6_IUSE=(
 )
 IUSE="${QT6_IUSE[*]}"
 REQUIRED_USE="
+       ?? ( journald syslog )
        $(
                printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
                printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
                printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
                printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
        )
-       ?? ( journald syslog )
        accessibility? ( dbus )
        eglfs? ( opengl )
        gles2-only? ( opengl )
@@ -51,7 +51,7 @@ REQUIRED_USE="
 # - qtnetwork (src/network/configure.cmake)
 # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
 # - qtsql (src/plugins/sqldrivers/configure.cmake)
-# dlopen: renderdoc
+# nolink: renderdoc, systemd
 COMMON_DEPEND="
        sys-libs/zlib:=
        ssl? ( dev-libs/openssl:= )

diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 8c263c91dad5..0f0f5cc3cd3a 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -28,13 +28,13 @@ declare -A QT6_IUSE=(
 )
 IUSE="${QT6_IUSE[*]}"
 REQUIRED_USE="
+       ?? ( journald syslog )
        $(
                printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
                printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
                printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
                printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
        )
-       ?? ( journald syslog )
        accessibility? ( dbus )
        eglfs? ( opengl )
        gles2-only? ( opengl )
@@ -51,7 +51,7 @@ REQUIRED_USE="
 # - qtnetwork (src/network/configure.cmake)
 # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
 # - qtsql (src/plugins/sqldrivers/configure.cmake)
-# dlopen: renderdoc
+# nolink: renderdoc, systemd
 COMMON_DEPEND="
        sys-libs/zlib:=
        ssl? ( dev-libs/openssl:= )

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 8c263c91dad5..0f0f5cc3cd3a 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -28,13 +28,13 @@ declare -A QT6_IUSE=(
 )
 IUSE="${QT6_IUSE[*]}"
 REQUIRED_USE="
+       ?? ( journald syslog )
        $(
                printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
                printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
                printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
                printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
        )
-       ?? ( journald syslog )
        accessibility? ( dbus )
        eglfs? ( opengl )
        gles2-only? ( opengl )
@@ -51,7 +51,7 @@ REQUIRED_USE="
 # - qtnetwork (src/network/configure.cmake)
 # - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
 # - qtsql (src/plugins/sqldrivers/configure.cmake)
-# dlopen: renderdoc
+# nolink: renderdoc, systemd
 COMMON_DEPEND="
        sys-libs/zlib:=
        ssl? ( dev-libs/openssl:= )