gentoo auto-resync : 22:02:2025 - 00:16:22

9 files changed, 221 insertions, 110 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6cb82e8a28d3..78c843f839c4 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/haruna/Manifest b/media-video/haruna/Manifest
new file mode 100644
index 000000000000..cb224ee69955
--- /dev/null
+++ b/media-video/haruna/Manifest
@@ -0,0 +1,4 @@
+AUX haruna-1.3.2-system-kdsingleapplication.patch 3095 BLAKE2B 598dbb11265ca8651a112bf4f41cb5f653a60661a40fef857af90ef5228184a02be7e0cf580c2e633d51a665fbc68b0e0f5b6e1369c984b58669f9db53d79c88 SHA512 6009e840d292b2cd62640c12fabbf270ceeca9684d29128ba5301681842e10f89526a9a2a55d50490e2aafd24fff0f716094fb6ae053b737cd477a74c426b000
+DIST haruna-1.3.2.tar.xz 662788 BLAKE2B cccca2d8102272ca4ddb78590ef7818de7970d9073484cdb4d343842c30318f262a01eab45ed0de8fc41c2824a33a2f2bec495df3fe0b9d1b9dfd022de2748ca SHA512 839ff8818064ae89dfbb44cd476f7b2e0e7048258c38294a5fe570434e07796033a161d3a6c788c2317dba6af6cfe3f6472a719e78e15388d649ff72519644ea
+EBUILD haruna-1.3.2.ebuild 1422 BLAKE2B 4d21123b70d353904126037b6f85098d1f588e9007806629b8ceb02b4a018365afc5d2ebaf65d3b5cc6c67f19d6ceb4c742387bc5ddffdf9e2861d5c49452865 SHA512 66fffd133e3781e6aea92f7f1a24cff923cacc5c201b783e39a3c0d30222c7cb7a577b8ab4da554111635296b4a9e2d48006bd9eaaaaec411692be8dacf84a27
+MISC metadata.xml 407 BLAKE2B e52f0a4099381cd9c4e5a2187edb15411ac4c2ab37957156316edb14575b625b7f6fcc531af1672f6eec05b6335da59cc41d7079c5413c21aed0738f572240f8 SHA512 4a151d15e9dcf0a0bc486a4f5614c8fab5d0ba2ee534412263ab9baf3449e9881c5e1597519bc5e5b529fc80cf508819f8625d5ce65dedea7fe818d55a518c28
diff --git a/media-video/haruna/files/haruna-1.3.2-system-kdsingleapplication.patch b/media-video/haruna/files/haruna-1.3.2-system-kdsingleapplication.patch
new file mode 100644
index 000000000000..2b20e2d29972
--- /dev/null
+++ b/media-video/haruna/files/haruna-1.3.2-system-kdsingleapplication.patch
@@ -0,0 +1,94 @@
+From 11a36a50558bdbc9c42253b937c8a832d896248f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 21 Feb 2025 22:28:27 +0100
+Subject: [PATCH] Make it possible to build against system kdsingleapplication
+
+Bundling must be avoided wherever possible.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt     |  7 +++++++
+ src/CMakeLists.txt | 23 ++++++++++++++++++++---
+ 2 files changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ac49e01f..990ff871 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,6 +112,13 @@ set_package_properties(Ytdlp PROPERTIES TYPE RUNTIME
+     URL "https://github.com/yt-dlp/yt-dlp"
+     DESCRIPTION "needed to play videos from youtube and other online sources")
+ 
++find_package(KDSingleApplication-qt6 QUIET)
++if(KDSingleApplication-qt6_FOUND)
++    message(STATUS "Using system KDSingleApplication")
++else()
++    message(STATUS "Using bundled KDSingleApplication")
++endif()
++
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+ 
+ include(KDEInstallDirs)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ef334a52..da9dd493 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -16,8 +16,6 @@ target_sources(haruna
+     application.h application.cpp
+     framedecoder.h framedecoder.cpp
+     global.h global.cpp
+-    KDSingleApplication/kdsingleapplication_localsocket_p.h KDSingleApplication/kdsingleapplication_localsocket.cpp
+-    KDSingleApplication/kdsingleapplication.h KDSingleApplication/kdsingleapplication.cpp
+     main.cpp
+     models/actionsmodel.h models/actionsmodel.cpp
+     models/chaptersmodel.h models/chaptersmodel.cpp
+@@ -34,6 +32,14 @@ target_sources(haruna
+     ${ICONS_SRCS}
+ )
+ 
++if (NOT KDSingleApplication-qt6_FOUND)
++    target_sources(haruna
++        PRIVATE
++        KDSingleApplication/kdsingleapplication_localsocket_p.h KDSingleApplication/kdsingleapplication_localsocket.cpp
++        KDSingleApplication/kdsingleapplication.h KDSingleApplication/kdsingleapplication.cpp
++    )
++endif()
++
+ if (CMAKE_SYSTEM_NAME IN_LIST DBUS_PLATFORMS)
+     qt_add_dbus_interface(haruna_screensaver_inhibit_SRCS ../org.freedesktop.ScreenSaver.xml screensaverdbusinterface)
+     target_sources(haruna
+@@ -126,12 +132,18 @@ qt_add_qml_module(haruna
+ 
+ target_include_directories(haruna
+     PRIVATE
+-        KDSingleApplication
+         models
+         mpv
+         ${FFMPEG_INCLUDE_DIRS}
+ )
+ 
++if (NOT KDSingleApplication-qt6_FOUND)
++    target_include_directories(haruna
++        PRIVATE
++        KDSingleApplication
++    )
++endif()
++
+ target_compile_definitions(haruna PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
+ 
+ target_link_libraries(haruna PRIVATE
+@@ -161,6 +173,11 @@ target_link_libraries(haruna PRIVATE
+     ${AVCODEC_LIBRARIES}
+     ${SWSCALE_LIBRARIES}
+ )
++if(KDSingleApplication-qt6_FOUND)
++    target_link_libraries(haruna PRIVATE
++        KDAB::kdsingleapplication
++    )
++endif()
+ 
+ if (CMAKE_SYSTEM_NAME IN_LIST DBUS_PLATFORMS)
+     target_link_libraries(haruna PRIVATE
+-- 
+2.48.1
+
diff --git a/media-video/haruna/haruna-1.3.2.ebuild b/media-video/haruna/haruna-1.3.2.ebuild
new file mode 100644
index 000000000000..d1f15ee60786
--- /dev/null
+++ b/media-video/haruna/haruna-1.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.9.0
+QTMIN=6.8.1
+inherit ecm kde.org xdg
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Video player built with Qt/QML and libmpv"
+HOMEPAGE="https://apps.kde.org/haruna/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/kdsingleapplication
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kfilemetadata-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	media-libs/mpvqt:6
+	media-video/ffmpeg:=
+"
+RDEPEND="${DEPEND}
+	net-misc/yt-dlp
+"
+
+# Upstream MR: https://invent.kde.org/multimedia/haruna/-/merge_requests/56
+PATCHES=( "${FILESDIR}/${P}-system-kdsingleapplication.patch" )
diff --git a/media-video/haruna/metadata.xml b/media-video/haruna/metadata.xml
new file mode 100644
index 000000000000..cd5e21506734
--- /dev/null
+++ b/media-video/haruna/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=Haruna</bugs-to>
+		<remote-id type="kde-invent">multimedia/haruna</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 4860e97c68fb..3d0ed60bed9c 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,13 +1,12 @@
-AUX mkvtoolnix-83.0.0-fix-disable-gui.patch 4772 BLAKE2B 9f1244cd93e1292cc91903846af71dac9bf0a81f2eedebe8166cd3516208a815d7054bec4ad77fb51f4adfc71a6ae5d84eb2096f5dc2d2895adde93d900a5f93 SHA512 f8939d53940fe2cd4a3b4e80b2af111934a5cacb9f87e7d17be9c3a34ce4205ec02ac4a2003c1b55ba97d0c5da132cdd8e123105db02cdcf7dfc289fdbc97314
 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-86.0.tar.xz 11369476 BLAKE2B a18ed1534f693f98924bc5c4bb1d3acedd154dacede17691a88b1d1a14c99d5ba4bc5483060d67624e682058e8af1a91ea0f77b095f35af340dea84a441dedc1 SHA512 ca1009439d662f32c75ee915f89ed1ccf1475f84782a5da977521e1ab1a558400d844d689ba37d3e5bcc2cb0ec70d3fac5db5594d0088668dd0ba3ac759819c6
 DIST mkvtoolnix-86.0.tar.xz.sig 833 BLAKE2B d53e8f8198f5ce5faec0b6c991ecf64a43f42395182aa7ead970f17e56b01c986392922b052cc2ac5e380983b937345838a96cde84e575d72bfcff2dd3084b09 SHA512 19901f9f61e108b8c4db0dab833e0998ab2bdc227130fe6d1aea6b9f495e66aa796bd4d3f70f14dadc906226884f03aaca90e710233e58fb604f66b28fb4abee
 DIST mkvtoolnix-88.0.tar.xz 11241552 BLAKE2B 01edcfe995e75fa7cde1916eb37a5f75d9788d5e56ee7a07ca106d861cf2d297a7d72974b0b6f958fec175d3db675e9e852af9f50345ededcca403983dcffa85 SHA512 b1b08a42f55e841c618cbfe19f40310ea7c879d43a6a1db4152abfd5618deccc33332a73b1fc21757660891907b9eb12028b8c016134708f0464d5cc10a343c2
 DIST mkvtoolnix-88.0.tar.xz.sig 833 BLAKE2B b0acd58dbc4c937ec50477e2695c4df1e67d6b40e985d676be38eaaff513a4eed17b19c612892c39c613e3736f516074febd12f76087ade3078d1183b0a3bce1 SHA512 f8175019b12f5a7bf36cc69f806d3dfc18431945f50bd1c4be5e5c1422ea9e53ca8ca93a08a417cae97da163b622ed09e7490a80255fccece6a5cbd32efbfe96
-EBUILD mkvtoolnix-83.0-r1.ebuild 3232 BLAKE2B f260b944cba90951c0db5b83bacb2ebbbd3f466dd14f0e4ba69460430783c334d232ec80c19aacb2dc926f4f1271966ee7444ad5d74d03ab77fbc729ebb65139 SHA512 3620d4f073e157e60e6f67b4f9fff494295cf7bb4df6b7140135902ed1d000fe6a4f712f10132f64adecc23673097f4e21a1ea83c522ee9e462b84575deee284
+DIST mkvtoolnix-90.0.tar.xz 11273024 BLAKE2B 03488894cc0ec51829581b6a4cae35f9eecd1443deacfd00cc81295b76317361657ccc42977a1a66d1320b59b03fd9db5373a0a4c1bb70c0df452b745f3ddf5a SHA512 3558e175bc369f1296604abc986bab88fb11d199032acf1e133d62ad8d99d848ae249df3f3e4ab342f3a400750ef20975acc0b9c0a3f4a7b8cb5bbdd563a4227
+DIST mkvtoolnix-90.0.tar.xz.sig 833 BLAKE2B 6dace1510af79347b772227a2e534cbfa74e18af3c0c9543a4951753dce2393cfb376ab2efdafe852e114b176e520a78bd7815c2ffec550baafb1496d762b1eb SHA512 de755106bebffd7b13365a6e8488cfeaa3666bc8b2cb21ef42429642e5dab9e048709327b00f8f7fed46186885dea3abcad2961e0c77a3ce04998b7369e9f9a9
 EBUILD mkvtoolnix-86.0.ebuild 3182 BLAKE2B a081872ad23073066638aebc67ceac238e2200f7e6ebd431706b3dd21f1b3424ba8d361353a5550bf94d0ba696be8e973bfddf98caf57724c137f75c5f48e6e6 SHA512 97f41c0614f8e2cf9e95eaf750671ca913415a6ee88965cad4c7fc3e0dc15fbcfb22bdf756227a171747710ad81f36f84d98228c081fb1a359baef0794836463
 EBUILD mkvtoolnix-88.0.ebuild 3120 BLAKE2B fdf0be85c372e14b5c33062003fe794545db690780bfecd2fce699e56301ac9ff0875d5f4fe5319cdf018fd5a7566bc769708249bd887a36430290443105dd5e SHA512 b315d0c1fd8c08dbc45c11a932c1585fd8b139d35541793f4ee864fa20a375cd8996d0295978cc33d5e3c5a7e70e27356a79edb4fa9eedaf17c853e44bd0225e
-EBUILD mkvtoolnix-9999.ebuild 3122 BLAKE2B 08bd971c6a8eac6d5c328e864692176097b8c10fe00da64d2985626b2fa5eab4dc239f7042ebe152a8c566e047b217924935e2ec0d31a8ac3f6fe60beacd0649 SHA512 3adf6b36985c95a0112274021bb80419ac51a652aa6a6004e46357488bf34e3367849bc35e7ead16e78012b36632d4cfc6aaa0daff7456451628cc72f04fa68c
+EBUILD mkvtoolnix-90.0.ebuild 3811 BLAKE2B 3eb7bba60292f839d40afb6fbf50dfbe9cd473e208147b902b15c1bf945274139cd146b5ff52687a70ee5eba6769919653b2c660f27c5189e650010a185d8de2 SHA512 34a8f90e048f4be1cff63a07bd7635d6fae90ed7025bc50edacc71e6840c80a5fc1b863cfd5df8a30b2b12ad749ee5270672277e000e3d556b7b556798be039f
+EBUILD mkvtoolnix-9999.ebuild 3811 BLAKE2B 3eb7bba60292f839d40afb6fbf50dfbe9cd473e208147b902b15c1bf945274139cd146b5ff52687a70ee5eba6769919653b2c660f27c5189e650010a185d8de2 SHA512 34a8f90e048f4be1cff63a07bd7635d6fae90ed7025bc50edacc71e6840c80a5fc1b863cfd5df8a30b2b12ad749ee5270672277e000e3d556b7b556798be039f
 MISC metadata.xml 343 BLAKE2B b13d9c252a7ad2f27c772c43d3476eee87d9a173c8fcc04a3be28ca9cfb826e6f1de6eade1211b4ff5f4a379b20a0961667fc99eee91495589e0632ad94b4c0a SHA512 cb7fd77f65779de841da03890fd1d0031cea8a95153f116f01f1be7d8ef5b87bb760933fc74f64a1d49ce94bc897cde94fdd4f6b45c016c3c20b842097692dc0
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch b/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch
deleted file mode 100644
index 015a92fbd78f..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-https://bugs.gentoo.org/927380
-
-Allow non-gui builds to configure without gui dependencies.
-
---- a/ac/qt6.m4
-+++ b/ac/qt6.m4
-@@ -113,13 +113,15 @@ HEADERS = configure.h
- SOURCES = configure.cpp
- EOT
- 
--  "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro 2>&5 > /dev/null
--  result2=$?
-+  if test x"$enable_gui" = xyes; then
-+    "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro 2>&5 > /dev/null
-+    result2=$?
- 
--  if test $result2 != 0; then
--    cd "$old_wd"
--    AC_MSG_RESULT(no: not all of the required Qt6 modules were found (needed: core gui widgets network concurrent svg multimedia))
--    return
-+    if test $result2 != 0; then
-+      cd "$old_wd"
-+      AC_MSG_RESULT(no: not all of the required Qt6 modules were found (needed: core gui widgets network concurrent svg multimedia))
-+      return
-+    fi
-   fi
- 
-   if test -f Makefile.Release; then
-@@ -135,7 +137,7 @@ EOT
- 
-   cd "$old_wd"
- 
--  if test $result != 0 -o $result2 != 0 -o $result3 != 0; then
-+  if test $result != 0 -o $result3 != 0; then
-     AC_MSG_CHECKING(for Qt 6)
-     AC_MSG_RESULT(no: qmake6 couldn't be run for a dummy project)
- 
-@@ -169,9 +171,15 @@ EOT
- 
-   qt_searchpath="$qt_libexecdir:$qt_bindir:$PATH"
- 
--  QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile" | sed 's/^DEFINES *= *//'`"
--  QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ ]]*//g' -e 's/\$([[^)]]*)//g'`"
--  QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile" | sed -e 's/^INCPATH *= *//'`"
-+  if test x"$enable_gui" = xyes; then
-+    QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile" | sed 's/^DEFINES *= *//'`"
-+    QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ ]]*//g' -e 's/\$([[^)]]*)//g'`"
-+    QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile" | sed -e 's/^INCPATH *= *//'`"
-+  else
-+    QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile.non_gui" | sed 's/^DEFINES *= *//'`"
-+    QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ ]]*//g' -e 's/\$([[^)]]*)//g'`"
-+    QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^INCPATH *= *//'`"
-+  fi
- 
-   # If under MinGW/MSYS2, fix relative include paths
-   if ! test -z "${MINGW_PREFIX}"; then
-@@ -181,16 +189,18 @@ EOT
-   QT_INCFLAGS="`echo $QT_INCFLAGS | sed -e 's:-I[[^/]][[^ ]]*::g'`"
-   QT_CFLAGS="$QT_CFLAGS $QT_INCFLAGS"
-   QT_CFLAGS="`echo $QT_CFLAGS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
--  QT_LIBS="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[[^ ]]*//g' -e 's/ -f[[a-z]][[^ ]]*//g'`"
--  QT_LIBS="$QT_LIBS `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile" | sed -e 's/^LIBS *= *//' -e 's/\$([[^)]]*)//g' -e 's:-L[[^/]][[^ ]]*::g'`"
--  QT_LIBS="`echo $QT_LIBS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
-+  if test x"$enable_gui" = xyes; then
-+    QT_LIBS="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[[^ ]]*//g' -e 's/ -f[[a-z]][[^ ]]*//g'`"
-+    QT_LIBS="$QT_LIBS `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile" | sed -e 's/^LIBS *= *//' -e 's/\$([[^)]]*)//g' -e 's:-L[[^/]][[^ ]]*::g'`"
-+    QT_LIBS="`echo $QT_LIBS | sed -e 's/\$(EXPORT_ARCH_ARGS)//'`"
-+  fi
-   QT_LIBS_NON_GUI="`$ac_cv_path_EGREP '^LFLAGS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LFLAGS *= *//' -e 's/-Wl,-O[[^ ]]*//g' -e 's/ -f[[a-z]][[^ ]]*//g'`"
-   QT_LIBS_NON_GUI="$QT_LIBS_NON_GUI `$ac_cv_path_EGREP '^LIBS *=' "$qmake_dir/Makefile.non_gui" | sed -e 's/^LIBS *= *//' -e 's/\$([[^)]]*)//g' -e 's:-L[[^/]][[^ ]]*::g'`"
-   QT_LIBS_NON_GUI="`echo $QT_LIBS_NON_GUI | sed -e 's/\$(EXPORT_ARCH_ARGS)//' -e 's/-Wl,-subsystem,windows *//g'`"
- 
-   rm -rf "$qmake_dir"
- 
--  if test x"$QT_CFLAGS" = x -o x"$QT_LIBS" = x -o x"$QT_LIBS_NON_GUI" = x; then
-+  if test x"$QT_CFLAGS" = x -o [ x"$enable_gui" = xyes -a x"$QT_LIBS" = x ] -o x"$QT_LIBS_NON_GUI" = x; then
-     AC_MSG_CHECKING(for Qt 6)
-     AC_MSG_RESULT(no: could not extract one or more compiler flags from Makefile generated by qmake6)
-     return
-@@ -223,7 +233,7 @@ EOT
-     ac_save_CXXFLAGS="$CXXFLAGS"
-     ac_save_LIBS="$LIBS"
-     CXXFLAGS="$STD_CXX $CXXFLAGS $QT_CFLAGS -fPIC"
--    LIBS="$LDFLAGS $QT_LIBS"
-+    LIBS="$LDFLAGS $QT_LIBS_NON_GUI"
-     unset ac_cv_qt_compilation
- 
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[
diff --git a/media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-90.0.ebuild
index ed9f5a45e234..838bf63b2a3d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-90.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
+inherit autotools flag-o-matic multiprocessing prefix qmake-utils toolchain-funcs 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,21 +27,18 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug dvd gui nls pch test"
+IUSE="dbus 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
-# <libfmt-11 https://gitlab.com/mbunkus/mkvtoolnix/-/merge_requests/2259
 RDEPEND="
-	app-text/cmark:0=
 	dev-libs/boost:=
 	dev-libs/gmp:=
 	>=dev-libs/libebml-1.4.5:=
 	>=dev-libs/libfmt-8.0.1:=
-	<dev-libs/libfmt-11
 	>=dev-libs/pugixml-1.11
-	>=dev-qt/qtbase-6.2:6[dbus]
+	>=dev-qt/qtbase-6.2:6[dbus?]
 	media-libs/flac:=
 	>=media-libs/libmatroska-1.7.1:=
 	media-libs/libogg
@@ -49,6 +46,7 @@ RDEPEND="
 	sys-libs/zlib
 	dvd? ( media-libs/libdvdread:= )
 	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
@@ -74,10 +72,26 @@ if [[ ${PV} != *9999 ]] ; then
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
 fi
 
-PATCHES=(
-	# https://bugs.gentoo.org/927380
-	"${FILESDIR}"/mkvtoolnix-83.0.0-fix-disable-gui.patch
-)
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# bug #927497
+		# the compiler used for qtbase affects what compiler arguments qmake will use
+		if tc-is-gcc; then
+			expected_spec="linux-g++"
+		elif tc-is-clang; then
+			expected_spec="linux-clang"
+		fi
+
+		if [[ ${expected_spec} != $(qmake6 -query QMAKE_SPEC) ]]; then
+			if tc-is-gcc; then
+				eerror "Detected non-gcc qmake spec but current compiler is gcc."
+			elif tc-is-clang; then
+				eerror "Detected non-clang qmake spec but current compiler is clang."
+			fi
+			eerror "Compiler mismatch: dev-qt/qtbase:6 and ${CATEGORY}/${PN} have to use the same toolchain https://bugs.gentoo.org/927497"
+		fi
+	fi
+}
 
 src_prepare() {
 	default
@@ -89,6 +103,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
@@ -100,6 +117,7 @@ src_configure() {
 	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
 
 	local myeconfargs=(
+		$(use_enable dbus)
 		$(use_enable debug)
 		$(usex pch "" --disable-precompiled-headers)
 		$(use_enable gui)
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 6731cce63b2d..838bf63b2a3d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing prefix qmake-utils xdg
+inherit autotools flag-o-matic multiprocessing prefix qmake-utils toolchain-funcs xdg
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
@@ -27,7 +27,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug dvd gui nls pch test"
+IUSE="dbus debug dvd gui nls pch test"
 RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
@@ -38,7 +38,7 @@ RDEPEND="
 	>=dev-libs/libebml-1.4.5:=
 	>=dev-libs/libfmt-8.0.1:=
 	>=dev-libs/pugixml-1.11
-	>=dev-qt/qtbase-6.2:6[dbus]
+	>=dev-qt/qtbase-6.2:6[dbus?]
 	media-libs/flac:=
 	>=media-libs/libmatroska-1.7.1:=
 	media-libs/libogg
@@ -50,7 +50,6 @@ RDEPEND="
 		>=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}
@@ -73,6 +72,27 @@ if [[ ${PV} != *9999 ]] ; then
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
 fi
 
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# bug #927497
+		# the compiler used for qtbase affects what compiler arguments qmake will use
+		if tc-is-gcc; then
+			expected_spec="linux-g++"
+		elif tc-is-clang; then
+			expected_spec="linux-clang"
+		fi
+
+		if [[ ${expected_spec} != $(qmake6 -query QMAKE_SPEC) ]]; then
+			if tc-is-gcc; then
+				eerror "Detected non-gcc qmake spec but current compiler is gcc."
+			elif tc-is-clang; then
+				eerror "Detected non-clang qmake spec but current compiler is clang."
+			fi
+			eerror "Compiler mismatch: dev-qt/qtbase:6 and ${CATEGORY}/${PN} have to use the same toolchain https://bugs.gentoo.org/927497"
+		fi
+	fi
+}
+
 src_prepare() {
 	default
 
@@ -97,6 +117,7 @@ src_configure() {
 	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
 
 	local myeconfargs=(
+		$(use_enable dbus)
 		$(use_enable debug)
 		$(usex pch "" --disable-precompiled-headers)
 		$(use_enable gui)