gentoo auto-resync : 18:08:2024 - 12:24:44

7 files changed, 49 insertions, 181 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ee9f3f0a9aa8..1bcc7a76a75e 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 18f867b4b589..0fccc4251bd7 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,16 +1,14 @@
-AUX mkvtoolnix-80.0.0-fix-qtmultimedia.patch 808 BLAKE2B 560d85d4ef07677adb63053997a3198cf7348e8172f052a944fefd26c45c269247e3bd9a3831c9ba70fbabffe74ed7c53ac2637c5c0e1d32f1b5faca907aedfb SHA512 c7d3fce5c74d41db6d27a9c03866afce291dcc329257073cc8767e871847d1c80539b72c0c3392efb5010623d932ac0e4cfa3c86135d264faf9607cc2fa11999
-AUX mkvtoolnix-80.0.0-no-uic-qtwidgets.patch 1035 BLAKE2B ff38fb84285d2f496ebe56325dbb3c0059c41ec32bfbf31c2f45659ee17a2b4d29391d5f7b258b2c8c7d2ffcd25644c32ba4f4c0261e51a83bd518cb967c99a1 SHA512 d0b8ebbb246049ec8749dc1dc14575e41f091c758d323a4b7597475eb6422a0886eb9e4408084d4e386467760903e5fc444685d490216cae6642634318a6eef2
-AUX mkvtoolnix-80.0.0-optional-qtdbus.patch 2501 BLAKE2B 9372aee680a4b20adef6e0b9fe444548b40573ee50a9d9ac7593407d1b9e69670fe3c16ecd2dc3d752154a5414f714f201d00a5a1b4a96065265bd553219c1ba SHA512 75eb5344605ef9c461df7e8d92ce5422d241efe01aa49d148cbb337ac29f589ce83e4e258918dd62246c84fead8d971770ca577d7ead47246b5a74b023503fd1
 AUX mkvtoolnix-83.0.0-fix-disable-gui.patch 4772 BLAKE2B 9f1244cd93e1292cc91903846af71dac9bf0a81f2eedebe8166cd3516208a815d7054bec4ad77fb51f4adfc71a6ae5d84eb2096f5dc2d2895adde93d900a5f93 SHA512 f8939d53940fe2cd4a3b4e80b2af111934a5cacb9f87e7d17be9c3a34ce4205ec02ac4a2003c1b55ba97d0c5da132cdd8e123105db02cdcf7dfc289fdbc97314
 AUX mkvtoolnix-84.0.0-fix-libcxx-c++20.patch 1459 BLAKE2B 0836cb4b8d3df74254257b977272d3e6cdc4e9c0b92a95b17b880b722b942ed1a9eafe2b9bb2b822a2a593264d76f8a0941331db08e3377359b357fd5dd7be4f SHA512 8de434ee48cc4021fdbf2b8edf644f85bcfebf1c76a5ebfe11f74c86eb0564f7820db183ea7f2f3103e84a84428694cc946c142da54a5ee86950841feaa7c89e
-DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0 SHA512 d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7
-DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5 SHA512 3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
+AUX mkvtoolnix-86.0-libfmt-11-fix.patch 726 BLAKE2B 0379ba93dfb9669123492335516a3618cb970ea1ed19234202be7a28aa6276b51f982c596319f921ec0476e7d25b8ff74d46247f21af00838eed2bde22f36ab3 SHA512 6085ce904bf2ecb4fd43e469778f634b8e609a4a0f2733477605ead9b275a12be0fc1204ec09b601b5efb4328d65790ec424c2a542e14c962172b43797fc821f
 DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5 SHA512 e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d
 DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0eeeef8fd05f37bcaf4f SHA512 6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7
 DIST mkvtoolnix-84.0.tar.xz 11325260 BLAKE2B 147878e796c3ce9b3dc03e026eaeb45c21946d0a80ff76d090a8a11a22e1e02fddfe158192df264c5a006ad9007a73d68ddd5c79f0ccd1d103e827e4d0123974 SHA512 3a73bb2497a227fd2e0a65d58e72bf479662828a7b4201b37b7bfdd7f88d294a6690aee024661d8b5615036f64a4ce1c2ba64d7b24ebd352f8f5ce3ffdac543a
 DIST mkvtoolnix-84.0.tar.xz.sig 833 BLAKE2B 903530d5968d9409a9b0fe1f236c254386a33ce1224b36d4e6f33d603851eec2ed27aac2923d59a3f2e729a48bd7724d8b697cbdff5213bec338417f1632ef29 SHA512 2338a226e0df776e1b3c78f93793900e62c391fd7fd4e56c317840f3d00fccc20d6ede3118ad47266b6772459d1959a221f2e475a4b96bd9c2d58caab3dae184
-EBUILD mkvtoolnix-81.0.ebuild 3617 BLAKE2B 68232e3bc6f600d7c33c8d9263193457d1eaa21c42c192c7c02749b0cf8db06b02fa7947b33319af7515af7822f4ddfa2d1adfe8a87c868a5e7c0b7d05d94de1 SHA512 f224a17d42ce74aae9ac6d8a9b7b1c8f38f34656707503d0c6f304fb67ca3ba3ce15d511f6fcab7a9a3038b7a156a6956c10a02e9d66b4fc1ba32fc30400028d
+DIST mkvtoolnix-86.0.tar.xz 11369476 BLAKE2B a18ed1534f693f98924bc5c4bb1d3acedd154dacede17691a88b1d1a14c99d5ba4bc5483060d67624e682058e8af1a91ea0f77b095f35af340dea84a441dedc1 SHA512 ca1009439d662f32c75ee915f89ed1ccf1475f84782a5da977521e1ab1a558400d844d689ba37d3e5bcc2cb0ec70d3fac5db5594d0088668dd0ba3ac759819c6
+DIST mkvtoolnix-86.0.tar.xz.sig 833 BLAKE2B d53e8f8198f5ce5faec0b6c991ecf64a43f42395182aa7ead970f17e56b01c986392922b052cc2ac5e380983b937345838a96cde84e575d72bfcff2dd3084b09 SHA512 19901f9f61e108b8c4db0dab833e0998ab2bdc227130fe6d1aea6b9f495e66aa796bd4d3f70f14dadc906226884f03aaca90e710233e58fb604f66b28fb4abee
 EBUILD mkvtoolnix-83.0.ebuild 3138 BLAKE2B 71c5d5528b5a6b1f4fa70e85e9cfe0c2aacb292f0d088d93cd6b441fa0b300e5eef9d8d4e9be0ab32d2004c8a046fb2ea8a398a9b2b77ae75f6471be20d6f997 SHA512 0323f6e04b0d32e9ba2bc9c0fef1dce65ab23b2cd6e959a3b4572aedcf3c1f42e3d8e2411891f96d7bf2c9eade8090caba095422be82326434937e3ee3d828df
 EBUILD mkvtoolnix-84.0-r1.ebuild 3191 BLAKE2B cdbcd27d650f4e193a2fc76ff1e97f06be5b2ab49656332a235655465a87998546a160d18e35574c2814db700988951f6933cb8261752dc3b3f8c8b821e6024e SHA512 f5390992e4a381d5744f998fe624b633b2f141c7ee0d47aaced4d5903f1e33c958f8c33c0924106fa4975de03902071f53d816102a865028f9dddfea74947bfd
+EBUILD mkvtoolnix-86.0.ebuild 3186 BLAKE2B c735b0f489a99e25af136a90ac5b01e2b53bb88a2e0e5d2d4b60a8174f28feb72d50dcf22f4041bc68a36a7375c8fa82c547a7c61fd1744d4c59e4320d47fb60 SHA512 3b5ce2d2ad875d831b21927a1b0b3055f12aed75d5b717d715cdfefa5e8e6c62c77e0a98a6486eeb4d7332f0b173b6b997a42a05777a1e92c61d627981d61edf
 EBUILD mkvtoolnix-9999.ebuild 3122 BLAKE2B 08bd971c6a8eac6d5c328e864692176097b8c10fe00da64d2985626b2fa5eab4dc239f7042ebe152a8c566e047b217924935e2ec0d31a8ac3f6fe60beacd0649 SHA512 3adf6b36985c95a0112274021bb80419ac51a652aa6a6004e46357488bf34e3367849bc35e7ead16e78012b36632d4cfc6aaa0daff7456451628cc72f04fa68c
 MISC metadata.xml 343 BLAKE2B b13d9c252a7ad2f27c772c43d3476eee87d9a173c8fcc04a3be28ca9cfb826e6f1de6eade1211b4ff5f4a379b20a0961667fc99eee91495589e0632ad94b4c0a SHA512 cb7fd77f65779de841da03890fd1d0031cea8a95153f116f01f1be7d8ef5b87bb760933fc74f64a1d49ce94bc897cde94fdd4f6b45c016c3c20b842097692dc0
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
deleted file mode 100644
index d31731a266f8..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 246f824a6a0d2bc93ec4ad2ebfde7c92b42c879a Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Tue, 21 Nov 2023 01:10:23 +0200
-Subject: [PATCH] Fix detection of QtDBus and QtMultimedia
-
-* Sometimes you may have qtdbus and qtmultimedia present at the same
-  time.
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/ac/qt6.m4
-+++ b/ac/qt6.m4
-@@ -95,10 +95,12 @@ EOT
- 
-     if test $result2 != 0; then
-       continue
--    elif test $qt_module = dbus; then
-+    fi
-+    if test $qt_module = dbus; then
-       qmake_qt_ui="$qmake_qt_ui dbus"
-       AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
--    elif test $qt_module = multimedia; then
-+    fi
-+    if test $qt_module = multimedia; then
-       qmake_qt_ui="$qmake_qt_ui multimedia"
-     fi
-   done
--- 
-2.43.0
-
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
deleted file mode 100644
index 203721aedcff..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 196e704d9bd44a5bb7655d8a85b6f270b2165b3c Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Mon, 20 Nov 2023 23:41:06 +0200
-Subject: [PATCH] Only check for uic in qt5 if gui is enabled
-
-We should only check for UIC (provided by qtwidgets) if we're building the GUI.
-
-Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used
-for e.g. MIME type detection since 59.0.0), but the rest of Qt
-(like qtwidgets) is only needed for the GUI build.
-
-The build system incorrectly unconditionally checks for UIC. We fix it here
-to only check for it when doing a GUI build.
-
-https://bugs.gentoo.org/844097
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/ac/qt5.m4
-+++ b/ac/qt5.m4
-@@ -63,7 +63,7 @@ check_qt5() {
-     AC_MSG_RESULT(no: could not find the rcc executable)
-     return
- 
--  elif test x"$UIC" = x; then
-+  elif test x"$UIC" = x && test x"$enable_gui" = xyes; then
-     AC_MSG_CHECKING(for Qt 5)
-     AC_MSG_RESULT(no: could not find the uic executable)
-     return
--- 
-2.43.0
-
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch
deleted file mode 100644
index deb8d59fa6c4..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 998cd9baa8edbbc0a02509728c7ff21ddaaaad51 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Mon, 20 Nov 2023 23:18:56 +0200
-Subject: [PATCH] Add an option for qtdbus support
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/ac/qt5.m4
-+++ b/ac/qt5.m4
-@@ -103,11 +103,13 @@ check_qt5() {
-       return
-     fi
- 
--    if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
--      PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
--      if test x"$dbus_found" = xyes; then
--        with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
--        AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+    if test x"$enable_dbus" = xyes; then
-+      if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
-+        PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
-+        if test x"$dbus_found" = xyes; then
-+          with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
-+          AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+        fi
-       fi
-     fi
- 
-@@ -254,6 +256,11 @@ AC_ARG_WITH([qt_pkg_config_modules],
- AC_ARG_WITH([qt_pkg_config],
-   AS_HELP_STRING([--without-qt-pkg-config],[do not use pkg-config for detecting Qt 5; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
-   [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
-+AC_ARG_ENABLE([dbus],
-+  AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
-+  [],[enable_dbus=yes])
-+
-+
- 
- have_qt5=no
- 
---- a/ac/qt6.m4
-+++ b/ac/qt6.m4
-@@ -96,9 +96,12 @@ EOT
-     if test $result2 != 0; then
-       continue
-     fi
--    if test $qt_module = dbus; then
--      qmake_qt_ui="$qmake_qt_ui dbus"
--      AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+    if test x"$enable_dbus" = xyes; then
-+      PKG_CHECK_EXISTS([Qt6DBus],[dbus_found=yes],[dbus_found=no])
-+      if test x"$dbus_found" = xyes; then
-+        qmake_qt_ui="$qmake_qt_ui dbus"
-+        AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+      fi
-     fi
-     if test $qt_module = multimedia; then
-       qmake_qt_ui="$qmake_qt_ui multimedia"
-@@ -272,6 +275,9 @@ AC_ARG_ENABLE([gui],
- AC_ARG_ENABLE([qt6],
-   AS_HELP_STRING([--enable-qt6],[compile with Qt 6 (yes)]),
-   [],[enable_qt6=yes])
-+AC_ARG_ENABLE([dbus],
-+  AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
-+  [],[enable_dbus=yes])
- 
- have_qt6=no
- 
--- 
-2.43.0
-
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-86.0-libfmt-11-fix.patch b/media-video/mkvtoolnix/files/mkvtoolnix-86.0-libfmt-11-fix.patch
new file mode 100644
index 000000000000..3b4b1b9fca52
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-86.0-libfmt-11-fix.patch
@@ -0,0 +1,25 @@
+https://gitlab.com/mbunkus/mkvtoolnix/-/merge_requests/2259
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/b57dde69dc80b151844e0762a2ae6bca3ba86d95
+
+From b57dde69dc80b151844e0762a2ae6bca3ba86d95 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:10:09 +0800
+Subject: [PATCH] fix build with fmt v11
+
+fmt::join() was moved into fmt/ranges.h since fmt 11, so let's
+include this header for using it.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+--- a/src/common/common.h
++++ b/src/common/common.h
+@@ -35,6 +35,7 @@
+ 
+ #include <fmt/format.h>
+ #include <fmt/ostream.h>
++#include <fmt/ranges.h>
+ 
+ #include <boost/algorithm/string.hpp>
+ #include <boost/multiprecision/cpp_int.hpp>
+-- 
+GitLab
+
diff --git a/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild
index 077c325ecc46..b44d36acb42f 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
+inherit autotools flag-o-matic multiprocessing prefix qmake-utils xdg
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
@@ -17,7 +17,7 @@ else
 		https://mkvtoolnix.download/sources/${P}.tar.xz
 		verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
 	"
-	KEYWORDS="amd64 ppc ppc64 x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
 fi
@@ -27,43 +27,30 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd gui nls qt6 pch test"
+IUSE="debug dvd gui nls pch test"
 RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
 # version requirement updates and other packaging info
 RDEPEND="
-	app-text/cmark:0=
 	dev-libs/boost:=
 	dev-libs/gmp:=
-	>=dev-libs/libebml-1.4.4:=
+	>=dev-libs/libebml-1.4.5:=
 	>=dev-libs/libfmt-8.0.1:=
 	>=dev-libs/pugixml-1.11
+	>=dev-qt/qtbase-6.2:6[dbus]
 	media-libs/flac:=
 	>=media-libs/libmatroska-1.7.1:=
 	media-libs/libogg
 	media-libs/libvorbis
 	sys-libs/zlib
 	dvd? ( media-libs/libdvdread:= )
-	!qt6? (
-		dev-qt/qtcore:5
-		dbus? ( dev-qt/qtdbus:5 )
-		gui? (
-			dev-qt/qtsvg:5
-			dev-qt/qtgui:5
-			dev-qt/qtnetwork:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtconcurrent:5
-			dev-qt/qtmultimedia:5
-		)
-	)
-	qt6? (
-		dev-qt/qtbase:6[dbus?]
-		gui? (
-			dev-qt/qtbase:6[concurrent,gui,network,widgets]
-			dev-qt/qtmultimedia:6
-			dev-qt/qtsvg:6
-		)
+	gui? (
+		app-text/cmark:0=
+		>=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets]
+		>=dev-qt/qtmultimedia-6.2:6
+		>=dev-qt/qtsvg-6.2:6
+		media-libs/libglvnd
 	)
 "
 DEPEND="${RDEPEND}
@@ -87,9 +74,7 @@ if [[ ${PV} != *9999 ]] ; then
 fi
 
 PATCHES=(
-	"${FILESDIR}"/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
-	"${FILESDIR}"/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
-	"${FILESDIR}"/mkvtoolnix-80.0.0-optional-qtdbus.patch
+	"${FILESDIR}"/mkvtoolnix-86.0-libfmt-11-fix.patch
 )
 
 src_prepare() {
@@ -102,6 +87,9 @@ src_prepare() {
 	# bug #692018
 	sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
 
+	# bug #928463
+	hprefixify "${S}/ac/ax_docbook.m4"
+
 	eautoreconf
 
 	# remove bundled libs
@@ -115,7 +103,6 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
 		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
 		$(use_enable gui)
 		$(use_with dvd dvdread)
 		$(use_with nls gettext)
@@ -124,24 +111,12 @@ src_configure() {
 		--disable-optimization
 		--with-boost="${ESYSROOT}"/usr
 		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
 
-	# Qt (of some version) is always needed, even for non-GUI builds,
-	# to do e.g. MIME detection. See e.g. bug #844097.
-	# But most of the Qt deps are conditional on a GUI build.
-	if use qt6; then
-		myeconfargs+=(
-			--enable-qt6
-			--disable-qt5
-			--with-qmake6="$(qt6_get_bindir)"/qmake
-		)
-	else
-		myeconfargs+=(
-			--disable-qt6
-			--enable-qt5
-			--with-qmake="$(qt5_get_bindir)"/qmake
-		)
-	fi
+		# Qt (of some version) is always needed, even for non-GUI builds,
+		# to do e.g. MIME detection. See e.g. bug #844097.
+		# But most of the Qt deps are conditional on a GUI build.
+		--with-qmake6="$(qt6_get_bindir)"/qmake
+	)
 
 	# Work around bug #904710.
 	use nls || export ac_cv_path_PO4A=