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

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     f799c99df449d844f71a00b95912592c0cb4aa20
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 23:00:25 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 16:20:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f799c99d

dev-qt/qtbase: remove IUSE=systemd

This is to control where log messages will be sent by default, and
I think enabling this is just going to be confusing. Off-by-default
(even if found), and cmake gives a warning that we should do special
handling for it. Plus no parity for openrc given we were not enabling
syslog as alternative.

Have not looked much, but not seem most distros enable this.

(also adjust disparity in the opengl option sorting)

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

 dev-qt/qtbase/metadata.xml           | 1 -
 dev-qt/qtbase/qtbase-6.5.2-r1.ebuild | 4 +---
 dev-qt/qtbase/qtbase-6.5.9999.ebuild | 6 ++----
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 4 +---
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index 573775d954fd..1ed99ac060a1 100644
--- a/dev-qt/qtbase/metadata.xml
+++ b/dev-qt/qtbase/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic HTTP/SOCKS proxy configuration</flag>
 		<flag name="network">Build Qt6Network module</flag>
 		<flag name="sql">Build Qt6Sql module</flag>
-		<flag name="systemd">Enable native journald logging support</flag>
 		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
 		<flag name="widgets">Build Qt6Widgets module</flag>
 		<flag name="X">Build the XCB platform plugin and enable X11 integration</flag>

diff --git a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
index 3c566fb935d8..90d4a0ba1d4d 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
@@ -13,7 +13,7 @@ fi
 
 declare -A QT6_IUSE=(
 	[global]="+ssl +udev zstd"
-	[core]="icu systemd"
+	[core]="icu"
 	[modules]="+concurrent +dbus +gui +network +sql +xml"
 
 	[gui]="
@@ -60,7 +60,6 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/libpcre2:=[pcre16,unicode(+)]
 	icu? ( dev-libs/icu:= )
-	systemd? ( sys-apps/systemd:= )
 
 	dbus? ( sys-apps/dbus )
 	gui? (
@@ -165,7 +164,6 @@ src_configure() {
 
 		# qtcore
 		$(qt_feature icu)
-		$(qt_feature systemd journald)
 
 		# tools
 		-DQT_FEATURE_androiddeployqt=OFF

diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 9dff844569da..8a845eb86893 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -13,7 +13,7 @@ fi
 
 declare -A QT6_IUSE=(
 	[global]="+ssl +udev zstd"
-	[core]="icu systemd"
+	[core]="icu"
 	[modules]="+concurrent +dbus +gui +network +sql +xml"
 
 	[gui]="
@@ -60,7 +60,6 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/libpcre2:=[pcre16,unicode(+)]
 	icu? ( dev-libs/icu:= )
-	systemd? ( sys-apps/systemd:= )
 
 	dbus? ( sys-apps/dbus )
 	gui? (
@@ -163,7 +162,6 @@ src_configure() {
 
 		# qtcore
 		$(qt_feature icu)
-		$(qt_feature systemd journald)
 
 		# tools
 		-DQT_FEATURE_androiddeployqt=OFF
@@ -188,9 +186,9 @@ src_configure() {
 		$(qt_feature evdev)
 		$(qt_feature evdev mtdev)
 		$(qt_feature gles2-only opengles2)
-		$(usev !opengl -DINPUT_opengl=no) #913691
 		$(qt_feature libinput)
 		$(qt_feature opengl)
+		$(usev !opengl -DINPUT_opengl=no) #913691
 		$(qt_feature tslib)
 		$(qt_feature vulkan)
 		$(qt_feature widgets)

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index a3394328ab7e..8a845eb86893 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -13,7 +13,7 @@ fi
 
 declare -A QT6_IUSE=(
 	[global]="+ssl +udev zstd"
-	[core]="icu systemd"
+	[core]="icu"
 	[modules]="+concurrent +dbus +gui +network +sql +xml"
 
 	[gui]="
@@ -60,7 +60,6 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/libpcre2:=[pcre16,unicode(+)]
 	icu? ( dev-libs/icu:= )
-	systemd? ( sys-apps/systemd:= )
 
 	dbus? ( sys-apps/dbus )
 	gui? (
@@ -163,7 +162,6 @@ src_configure() {
 
 		# qtcore
 		$(qt_feature icu)
-		$(qt_feature systemd journald)
 
 		# tools
 		-DQT_FEATURE_androiddeployqt=OFF