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

[Jimi Huotari]

commit:     11be163d9a5024c49ab92ab3fe9baeab35221009
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 09:03:28 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed May 25 16:20:46 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=11be163d

dev-qt/qtbase: remove USE="xml" from 6.3.*

Configure fails with USE="-xml" without additional changes, though
it looks like it has been removed from bootstrap in the upstream
dev branch (6.9999), so perhaps it will make a comeback very soon
(or we can backport the required changes + what ever else is needed).

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.3.0.ebuild    | 4 ++--
 dev-qt/qtbase/qtbase-6.3.9999.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.3.0.ebuild 
b/dev-qt/qtbase/qtbase-6.3.0.ebuild
index 485c0d24..65c14f48 100644
--- a/dev-qt/qtbase/qtbase-6.3.0.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.0.ebuild
@@ -12,7 +12,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 # Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml"
+# TODO: Restore/patch xml flag support (seems fixed in 6.9999).
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets"
 REQUIRED_USE="
        opengl? ( gui ) widgets? ( gui )
        X? ( || ( evdev libinput ) )
@@ -129,7 +130,6 @@ src_configure() {
                $(qt_feature systemd journald)
                -DQT_FEATURE_testlib=ON # TODO: install QtTest by default?
                $(qt_feature udev libudev)
-               $(qt_feature xml)
        )
        use gui && mycmakeargs+=(
                $(qt_feature accessibility accessibility_atspi_bridge)

diff --git a/dev-qt/qtbase/qtbase-6.3.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
index 485c0d24..65c14f48 100644
--- a/dev-qt/qtbase/qtbase-6.3.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.3.9999.ebuild
@@ -12,7 +12,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 # Qt Modules
-IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml"
+# TODO: Restore/patch xml flag support (seems fixed in 6.9999).
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets"
 REQUIRED_USE="
        opengl? ( gui ) widgets? ( gui )
        X? ( || ( evdev libinput ) )
@@ -129,7 +130,6 @@ src_configure() {
                $(qt_feature systemd journald)
                -DQT_FEATURE_testlib=ON # TODO: install QtTest by default?
                $(qt_feature udev libudev)
-               $(qt_feature xml)
        )
        use gui && mycmakeargs+=(
                $(qt_feature accessibility accessibility_atspi_bridge)