gentoo auto-resync : 21:03:2024 - 07:00:13

5 files changed, 36 insertions, 340 deletions

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 34941f7dc16d..67ccf444217d 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,17 +3,13 @@ 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
-DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97 SHA512 dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c
-DIST mkvtoolnix-75.0.0.tar.xz 11009552 BLAKE2B d9c32a453ac1f07e201b99fdcaaa5e553b42c1d17fafdeb1a84808ee572caf00b4b49d04c90d7801564f4856e9b3057a45ef79041e72f76bc829c3b5d9536c58 SHA512 eca45828ec3cbb540c67d12d369f3314246d08812933a018e5c4f69e8bd2fa4e17143a33a1841c5a8da3befbc22509fa508e6688ea858980d13c44aaae4ead08
 DIST mkvtoolnix-77.0.tar.xz 11044004 BLAKE2B 5aa43e155c1318dc6c3fd4418fb59ec498ad488a8459cf0aefa0bc0660ff93dd51f2699642ea633695fbf76ae1b4b6cfddddfca1b0e72e16357b579ce8dbee42 SHA512 b310077cfaddef3163c732943f1aaf7e63fb9f7efb19fdb27a35e2d0ad92dfc4536ea29366b44745f3f918703b02e2d52edb63369c23540df1312f3d54c06bb0
-DIST mkvtoolnix-80.0.tar.xz 11056764 BLAKE2B 6178b65ce57b1ab897c91a456fa9887499e683619654b2a7f8fbcd8b7d98f04dd831d2c875da85a644357ec8c8de3b408394f7b29def9203f35a28ec19513a0d SHA512 066c10a9112ca0cdb59567235aae70e94ccab25b0e2d6156f4ba1090e102614b07c37eb0116a9ee540b2ed8f4b9d58a699f553b974a3f2636c65241915b3b6bc
-DIST mkvtoolnix-80.0.tar.xz.sig 833 BLAKE2B 6c08689419877da7f3f16b8453a44f837792f5e7f3de7fb8574597dee3317ffadf2418cae82949a7585ab53cf1e0a60391ba898fc4607290d678501c3ffd4672 SHA512 47df9f0199275873b300b229fc91d14d5ab93c423e4fb8f31055b84619ae00609850ccb77f6d84c8eb3e4afee76acbe3e0779d03f3041d01d598f462788c618d
 DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0 SHA512 d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7
 DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5 SHA512 3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
-EBUILD mkvtoolnix-72.0.0.ebuild 2937 BLAKE2B ad306e107e1065ecbf0df631cb0eebb0d6f981da9f479b0a17604b016b21a6e0e544ee2f2eea50bb62cc3fcec7b8a59cfd717eee706d137f62e0717a5794584a SHA512 52e2adf07dce52e3bbf035bc11a9cfb27bc53e33109d3d781f845b1f0805b7999b4923ce9e89eb54f1b8b472819411019cd7bbb5776cdc36ccba123fc7ebfaf2
-EBUILD mkvtoolnix-75.0.0.ebuild 2981 BLAKE2B eaee5dd08153c3efd23fe7006e9c5980df1e6f62fed5d2303ed65918bfe036efdb450340b48f34492b747f0c5c0e2c4b622e529ee29d4458e26dca8935fec3bd SHA512 57dd6092f75d4fb1d794e59029da33e9c318a2e8f9ba0ca1f436ea8ead67ace12125eda560fbabad1c06390c3f3699202ce35e45120cdf02ad8d3d5b0c43f001
+DIST mkvtoolnix-82.0.tar.xz 11067168 BLAKE2B a910898b4097ee8115f3354653d65d913e28fc0271c2869a72d4b0f70a6a17848b28c33ae0aee4d88b42bb911bf6d825211c723c47f7c1eee0f5204705e12223 SHA512 fd384bfc4350e972f44e2b488fb066641cf7e73860f179d4423a548f870521ad8414f53a98f67ad8809f261657fe378c5bed96069620a73be511bcd31dfa933f
+DIST mkvtoolnix-82.0.tar.xz.sig 833 BLAKE2B 53c96149a41a46892cfeb43ca786cd8c166747e508f3fa2aceca9520652741f738adad5f6e8809f97c5086d678bcd15d4f95f1ca964df5465b450679eb18eb2a SHA512 abea27631ea4f08182e86f99f1a8e38769e0ebc5a5d66426da7024348e6d00c0044644c107a982d902142167805c4771d318cc4ec66e4d9cea115a92806e8e95
 EBUILD mkvtoolnix-77.0.ebuild 2981 BLAKE2B eaee5dd08153c3efd23fe7006e9c5980df1e6f62fed5d2303ed65918bfe036efdb450340b48f34492b747f0c5c0e2c4b622e529ee29d4458e26dca8935fec3bd SHA512 57dd6092f75d4fb1d794e59029da33e9c318a2e8f9ba0ca1f436ea8ead67ace12125eda560fbabad1c06390c3f3699202ce35e45120cdf02ad8d3d5b0c43f001
-EBUILD mkvtoolnix-80.0.ebuild 3621 BLAKE2B b762c6a8f2a036a1a12cee52c743f657f51a0f7ee14045bfd9afe2d57f30ddf8d14920c45a6356623f67b65e4c2f406a121f32936372ba6bb0e6deba03f607e5 SHA512 dbeab97b6e0f1a41a39110c8e5d70d49f1445b1ebbd059c1b1f0bdad4f91e58b88fff0f481fcd186f5874c70a5fd1457762bcc6f684c7ddd109585c3bc80db1b
 EBUILD mkvtoolnix-81.0.ebuild 3621 BLAKE2B b762c6a8f2a036a1a12cee52c743f657f51a0f7ee14045bfd9afe2d57f30ddf8d14920c45a6356623f67b65e4c2f406a121f32936372ba6bb0e6deba03f607e5 SHA512 dbeab97b6e0f1a41a39110c8e5d70d49f1445b1ebbd059c1b1f0bdad4f91e58b88fff0f481fcd186f5874c70a5fd1457762bcc6f684c7ddd109585c3bc80db1b
-EBUILD mkvtoolnix-9999.ebuild 3040 BLAKE2B 5344aa6e366d686bc26cb3b6397f1e1f5fbc8f6acef4ccda6f306d6c2b00fe7f2fa33fd131c2cfe6376936557239c807ec2a39584c5b034ae0a2574f121bd8a6 SHA512 4dd14ce9015d48af8c1f2f1b7ed319d8137a608f7d405f38b2919b2128256accd780f3aa727d2abf8e48e04b179eeff1a339589ee9c0629a56ac29c9a828a74a
+EBUILD mkvtoolnix-82.0.ebuild 3040 BLAKE2B d4501f0109ba20046cd9d85745f3961d956fb80f7e0ca6cf185f4098306c694a59d9e99f7f6833dc49eba04c2820e249601bd679762958632de949b6475c07f4 SHA512 591f3488f22f9b892882ce4a618e4a7d357852436bad128a33b53a0ab6896b3d76e1c299c31125b6ba5256c21e8a1ec479e556c40ec2c2d70d795ba0e90f030f
+EBUILD mkvtoolnix-9999.ebuild 3040 BLAKE2B d4501f0109ba20046cd9d85745f3961d956fb80f7e0ca6cf185f4098306c694a59d9e99f7f6833dc49eba04c2820e249601bd679762958632de949b6475c07f4 SHA512 591f3488f22f9b892882ce4a618e4a7d357852436bad128a33b53a0ab6896b3d76e1c299c31125b6ba5256c21e8a1ec479e556c40ec2c2d70d795ba0e90f030f
 MISC metadata.xml 343 BLAKE2B b13d9c252a7ad2f27c772c43d3476eee87d9a173c8fcc04a3be28ca9cfb826e6f1de6eade1211b4ff5f4a379b20a0961667fc99eee91495589e0632ad94b4c0a SHA512 cb7fd77f65779de841da03890fd1d0031cea8a95153f116f01f1be7d8ef5b87bb760933fc74f64a1d49ce94bc897cde94fdd4f6b45c016c3c20b842097692dc0
diff --git a/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
deleted file mode 100644
index f04b8591f71a..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/gmp:=
-	>=dev-libs/libebml-1.4.4:=
-	>=dev-libs/libfmt-8.0.1:=
-	>=dev-libs/pugixml-1.11:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.7.1:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	dev-qt/qtcore: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
-	)
-	app-text/cmark:0=
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-cpp/nlohmann_json-3.9.1
-	>=dev-libs/utfcpp-3.1.2
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
-	"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# bug #692018
-	sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug #692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-
-		# 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.
-		--disable-qt6
-		--enable-qt5
-		$(use_enable gui)
-		--with-qmake="$(qt5_get_bindir)"/qmake
-
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--with-boost="${ESYSROOT}"/usr
-		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-80.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-80.0.ebuild
deleted file mode 100644
index 20d89f9877dc..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-80.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-else
-	inherit verify-sig
-
-	SRC_URI="
-		https://mkvtoolnix.download/sources/${P}.tar.xz
-		verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
-	"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug dvd gui nls qt6 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/libfmt-8.0.1:=
-	>=dev-libs/pugixml-1.11
-	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
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-cpp/nlohmann_json-3.9.1
-	>=dev-libs/utfcpp-3.1.2
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-if [[ ${PV} != *9999 ]] ; then
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
-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
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# bug #692018
-	sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug #692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-		$(use_enable gui)
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		#$(use_with nls po4a)
-		--disable-update-check
-		--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
-
-	# Work around bug #904710.
-	use nls || export ac_cv_path_PO4A=
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-82.0.ebuild
index 19b76609dc6a..de1b5ed169c7 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-82.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,12 +6,20 @@ EAPI=8
 inherit autotools flag-o-matic multiprocessing qmake-utils xdg
 
 if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+
 	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
 	EGIT_SUBMODULES=()
-	inherit git-r3
 else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ppc ppc64 x86"
+	inherit verify-sig
+
+	SRC_URI="
+		https://mkvtoolnix.download/sources/${P}.tar.xz
+		verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
+	"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
@@ -19,34 +27,30 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd gui nls 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-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:=
+	media-libs/libogg
+	media-libs/libvorbis
 	sys-libs/zlib
 	dvd? ( media-libs/libdvdread:= )
-	dev-qt/qtcore: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
+		>=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets]
+		>=dev-qt/qtmultimedia-6.2:6
+		>=dev-qt/qtsvg-6.2:6
 	)
-	app-text/cmark:0=
-	dbus? ( dev-qt/qtdbus:5 )
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/nlohmann_json-3.9.1
@@ -64,10 +68,9 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
-	"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
-)
+if [[ ${PV} != *9999 ]] ; then
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
+fi
 
 src_prepare() {
 	default
@@ -92,16 +95,7 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
 		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-
-		# 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.
-		--disable-qt6
-		--enable-qt5
 		$(use_enable gui)
-		--with-qmake="$(qt5_get_bindir)"/qmake
-
 		$(use_with dvd dvdread)
 		$(use_with nls gettext)
 		#$(use_with nls po4a)
@@ -109,6 +103,11 @@ 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.
+		--with-qmake6="$(qt6_get_bindir)"/qmake
 	)
 
 	# Work around bug #904710.
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 1f14599ac81e..de1b5ed169c7 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ 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]