4 files changed, 97 insertions, 3 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index cc9cf4901eb2..bf3da74b71c9 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index ecf4eda8ebec..52639666a835 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,13 +3,14 @@ AUX mkvtoolnix-67.0.0-no-uic-qtwidgets.patch 2494 BLAKE2B 1d23ca6e908947d80e3ea7
 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
 DIST mkvtoolnix-77.0.tar.xz 11044004 BLAKE2B 5aa43e155c1318dc6c3fd4418fb59ec498ad488a8459cf0aefa0bc0660ff93dd51f2699642ea633695fbf76ae1b4b6cfddddfca1b0e72e16357b579ce8dbee42 SHA512 b310077cfaddef3163c732943f1aaf7e63fb9f7efb19fdb27a35e2d0ad92dfc4536ea29366b44745f3f918703b02e2d52edb63369c23540df1312f3d54c06bb0
 DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0 SHA512 d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7
 DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5 SHA512 3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
-DIST mkvtoolnix-82.0.tar.xz 11067168 BLAKE2B a910898b4097ee8115f3354653d65d913e28fc0271c2869a72d4b0f70a6a17848b28c33ae0aee4d88b42bb911bf6d825211c723c47f7c1eee0f5204705e12223 SHA512 fd384bfc4350e972f44e2b488fb066641cf7e73860f179d4423a548f870521ad8414f53a98f67ad8809f261657fe378c5bed96069620a73be511bcd31dfa933f
-DIST mkvtoolnix-82.0.tar.xz.sig 833 BLAKE2B 53c96149a41a46892cfeb43ca786cd8c166747e508f3fa2aceca9520652741f738adad5f6e8809f97c5086d678bcd15d4f95f1ca964df5465b450679eb18eb2a SHA512 abea27631ea4f08182e86f99f1a8e38769e0ebc5a5d66426da7024348e6d00c0044644c107a982d902142167805c4771d318cc4ec66e4d9cea115a92806e8e95
+DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5 SHA512 e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d
+DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0eeeef8fd05f37bcaf4f SHA512 6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7
 EBUILD mkvtoolnix-77.0.ebuild 2981 BLAKE2B eaee5dd08153c3efd23fe7006e9c5980df1e6f62fed5d2303ed65918bfe036efdb450340b48f34492b747f0c5c0e2c4b622e529ee29d4458e26dca8935fec3bd SHA512 57dd6092f75d4fb1d794e59029da33e9c318a2e8f9ba0ca1f436ea8ead67ace12125eda560fbabad1c06390c3f3699202ce35e45120cdf02ad8d3d5b0c43f001
 EBUILD mkvtoolnix-81.0.ebuild 3617 BLAKE2B 68232e3bc6f600d7c33c8d9263193457d1eaa21c42c192c7c02749b0cf8db06b02fa7947b33319af7515af7822f4ddfa2d1adfe8a87c868a5e7c0b7d05d94de1 SHA512 f224a17d42ce74aae9ac6d8a9b7b1c8f38f34656707503d0c6f304fb67ca3ba3ce15d511f6fcab7a9a3038b7a156a6956c10a02e9d66b4fc1ba32fc30400028d
-EBUILD mkvtoolnix-82.0.ebuild 3040 BLAKE2B d4501f0109ba20046cd9d85745f3961d956fb80f7e0ca6cf185f4098306c694a59d9e99f7f6833dc49eba04c2820e249601bd679762958632de949b6475c07f4 SHA512 591f3488f22f9b892882ce4a618e4a7d357852436bad128a33b53a0ab6896b3d76e1c299c31125b6ba5256c21e8a1ec479e556c40ec2c2d70d795ba0e90f030f
+EBUILD mkvtoolnix-83.0.ebuild 3142 BLAKE2B 0729c1fb0b60510c22c4f49f7ca6de33eacbdaaf0159c477a72ee66a0a509cfa78f8794188c92ca39523145aa4f3a1d3fefae9f36794594da0191128a3806512 SHA512 0a9ab9519b11e9feb4c0f954ecc2188f4ba0b3ad32f851ec6de6d3ca5917a9952ff86c1acc02591300d7f359792c25ac25fd0faaa37accbf3c8c3efa74a5eaca
 EBUILD mkvtoolnix-9999.ebuild 3040 BLAKE2B d4501f0109ba20046cd9d85745f3961d956fb80f7e0ca6cf185f4098306c694a59d9e99f7f6833dc49eba04c2820e249601bd679762958632de949b6475c07f4 SHA512 591f3488f22f9b892882ce4a618e4a7d357852436bad128a33b53a0ab6896b3d76e1c299c31125b6ba5256c21e8a1ec479e556c40ec2c2d70d795ba0e90f030f
 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
new file mode 100644
index 000000000000..015a92fbd78f
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch
@@ -0,0 +1,88 @@
+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-82.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild
index de1b5ed169c7..393a62599642 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-82.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild
@@ -72,6 +72,11 @@ 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
+)
+
 src_prepare() {
 	default