20 files changed, 199 insertions, 117 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ff51e7874b29..81decac6d6ef 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 805c1723f9fc..0e9fb591a21c 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,7 +1,6 @@
 AUX gaupol-1.8-fix-audio-tracks-order.patch 6462 BLAKE2B 96e09112adf27ece07b65eee4b69d7dd1813c3b882afe790b8e35237e8e3c996809a0e71c00ce64f3c7cd0efbaf325933473f52439db31ba60869035c5a59feb SHA512 f7c001f698650c8c757818d44624201888aefe0d65689ee0fd357d85d45bd712a9f09b57e833a503c5b639ec430a6df2eebf02a40bed03a091abcd0da0bfae69
 DIST gaupol-1.8.tar.gz 558627 BLAKE2B a7243310b97fe7187311585762faaff512364ca043630eb43c1ee99c55fa5400e14698e391b410b67f70f1bc7a741adb0737868d7b40c868bb4c6badacd14fb1 SHA512 a6b65316b5750a4d636b39b75393b0b2f2c44d978f1fc8cc3bd2cd2d2bcf9ba68d0161afb41bdca5b381ec39e5a2e06440f4f4676f344019966b297c4112e691
 DIST gaupol-1.9.tar.gz 579382 BLAKE2B c326e800ebd56bab53757d13e075c7499d9b37c6677a3f2ef710e71ab427bc9d502d1539778e87625e43a6218a358b15dfc3c84fd22b42e95d808fc8495feb43 SHA512 c115409afe68a0981f7c29e5d6d3e23950081f186b74de460045de9976a6c7a674701d316214ee2b91bc59f1dd856fdc9cf999e328aba8abeb8eaf71911c68d2
-EBUILD gaupol-1.8-r1.ebuild 1700 BLAKE2B 323005573b77fdd234adf8cfd9aff2b6f8e8b01b5bdf9cb0ef5158964d4e0e6906af7390a45eeb0f13fc01f9e4ba64b8ba5db327b5425460ce497f2832efd9f4 SHA512 dea6b8f4967eab2ae772d177e03159b845faab2ec80339317a049e2c6cb6aaf9600aea5fa81aadacf04e22feacdab9f5ff9bdbe3052cd92de788c9786990ef8b
 EBUILD gaupol-1.8-r2.ebuild 1731 BLAKE2B b5af853dde513fb149ec2d2e9389caa2cc53c645ac676d832d5200ae6c5b278175de30eeda28639c6602cf27a3e83bf692aac68d21d00e0825ca6c65870b2444 SHA512 442d211c393b5f2613616f15e73a58e253045431190cd9abe6f7f7fc2b6c3b018f29f9516f97bedb05d243b04119661cb15cfd970e6e9ede728ae33486705641
-EBUILD gaupol-1.9.ebuild 1620 BLAKE2B 0b91fd53800b9656d15f07252ea498f7e0efb12ecd58a0441a9ab0aa2560d200f1a19fe58d222a41d242cdea07a081eac6ba02b4f9e810d0499d48e108f17d90 SHA512 3c6e1ca9300345ae61fb146c1d55c02be360e3ab3edfa140d281fa3714565ebbdda4db9bd3ba7b35d29cc29ccd426b0977f8893a5a0fc0ddbc4137e17d9ef21c
+EBUILD gaupol-1.9.ebuild 1618 BLAKE2B e039e80ce001fc413fd6b264d7b776db08944295ef166648b40b50e56de3e8c7bbf8ced7d74e93e22efba13a9346e20c555236db686749c73a828d9d19248cbb SHA512 2f5f6b9c00bfac63deb93f693ca5f17c2b0d974675c4568c67b8c56fa2cddabf60a085d87cadecc514ab54ae8bef41064c5743b63a135895eedb8c6b1c58bb89
 MISC metadata.xml 532 BLAKE2B 47a6663573f3be408acca753a58d90e17f31c17e6e1bfd0413cf63dda7ff7dbc5152e06b657f46db22e86b38fc07514fea249aa62ac5731e9c6a35cf17ca28da SHA512 3acb0780ebd63e6c33dc8b6b5cfd9f1209ff478d4b26bf8fad49d68be9de2f7968b0619c45eb432c6c91255f67c7aa4847889bdfeebbb7f2e296c9109ca2c27b
diff --git a/media-video/gaupol/gaupol-1.8-r1.ebuild b/media-video/gaupol/gaupol-1.8-r1.ebuild
deleted file mode 100644
index 21efffef817e..000000000000
--- a/media-video/gaupol/gaupol-1.8-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="A subtitle editor for text-based subtitles"
-HOMEPAGE="https://otsaloma.io/gaupol/"
-SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/iso-codes
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	spell? ( app-text/gspell[introspection] )
-"
-DEPEND="
-	sys-devel/gettext
-	test? (
-		${RDEPEND}
-		app-dicts/myspell-en
-		app-text/enchant[hunspell]
-		app-text/gspell[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
-
-PATCHES=( "${FILESDIR}/${P}-fix-audio-tracks-order.patch" )
-
-python_test() {
-	virtx pytest -vv
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The integrated video player requires media-plugins/gst-plugins-gtk."
-		elog ""
-		elog "External video previewing support requires MPV, MPlayer or VLC."
-		if use spell; then
-			elog ""
-			elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
-			elog "or app-text/aspell with the appropriate L10N variable."
-			elog ""
-			elog "Additionally, make sure that app-text/enchant has the correct flags enabled:"
-			elog "USE=hunspell for myspell dictionaries and USE=aspell for aspell dictionaries."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-video/gaupol/gaupol-1.9.ebuild b/media-video/gaupol/gaupol-1.9.ebuild
index 4821a8416563..1bbf9094611d 100644
--- a/media-video/gaupol/gaupol-1.9.ebuild
+++ b/media-video/gaupol/gaupol-1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 virtualx xdg-utils
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="spell"
 
 RDEPEND="
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 6fc64d2bd049..8ef2a75f498d 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,11 @@
 AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac528dda0227ccf2baf3732239b481ff6007bf5a8ddd9304dd7c2faff149f1cfbdbfb194eb30a3b19eea0803f10734572421 SHA512 d9a72bb0b8fc7c9915e4efa1e9758d4f9d6b68f1ad6ef9898dd0b5e693c8e1236b37fc97a9786c233f8909417309ea6bb9c1fb71054818f31eeb4c43faa46a06
 AUX mkvtoolnix-56.1.0-optlevel.patch 607 BLAKE2B 62c3ef3717a54030b1acc586e9468f4d8d783755f7762ccebe18b0f8b0214268477a5a218b2fc02f3e2f770664507d43119f13046a31c94f865f01d0000a8a68 SHA512 b8eec05844aa8ef4f27416a78f5231496e34a112126e8ef403d18cab26b94756bd60323b51cf0d59a5a44d7b379bbf09f6b7b1b7e29b9282a0a2e82a5b3f325e
+AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e
 DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69 SHA512 2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
 DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
+DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
 EBUILD mkvtoolnix-51.0.0.ebuild 2921 BLAKE2B e71d3e988f14a21595f8666f57d5eee063088dc708d787c707bef93e2fe8d8c86614e8c81f2542eb7b8b91203927b04ae44b5d8c95f8710884acde992f0da6bd SHA512 76409b23ca27bd4c9528c153d016c72bb39778c80ee3c487dd6d9f23c228b475df80fbc10b2b37ce10e0f131d4d6a33e6af77117f25488218bf5a3c0057a8e2b
 EBUILD mkvtoolnix-57.0.0.ebuild 2973 BLAKE2B d2c5a209bf16fac4b98a093e3cc5ac7b11f12707e648d5cabed8d90ea6431020cdbeac918a2b3c7d61ddebe6eca42499c038e3c6abfea2332cd4e952c1948370 SHA512 e64b0c432ebf47a4b40d201ff83ebec6723214d44d72d9ac8757ef176319579bfcbc841ba2e595bb8870735e8ef4f846fea8670e59498fc737dacdb0f362bd20
-EBUILD mkvtoolnix-9999.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505
+EBUILD mkvtoolnix-60.0.0.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f
+EBUILD mkvtoolnix-9999.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch
new file mode 100644
index 000000000000..fb94686d27ef
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch
@@ -0,0 +1,37 @@
+Index: mkvtoolnix-58.0.0/ac/qt5.m4
+===================================================================
+--- mkvtoolnix-58.0.0.orig/ac/qt5.m4
++++ mkvtoolnix-58.0.0/ac/qt5.m4
+@@ -98,12 +98,14 @@ 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])
+-      fi
++    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
+ 
+     with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/,/ /g'`"
+@@ -244,6 +246,11 @@ AC_ARG_WITH([qt_pkg_config_modules],
+ AC_ARG_WITH([qt_pkg_config],
+   AC_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
+ 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
new file mode 100644
index 000000000000..cd70327db014
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs 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 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-1.66:=
+	>=dev-libs/libebml-1.4.0:=
+	>=dev-libs/libfmt-6.1.0:=
+	dev-libs/libpcre2:=
+	dev-libs/pugixml:=
+	media-libs/flac:=
+	>=media-libs/libmatroska-1.6.3:=
+	media-libs/libogg:=
+	media-libs/libvorbis:=
+	sys-apps/file
+	sys-libs/zlib
+	dvd? ( media-libs/libdvdread:= )
+	dev-qt/qtcore: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
+	dev-libs/utfcpp
+	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 )
+
+src_prepare() {
+	xdg_src_prepare
+	if [[ ${PV} == *9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# https://bugs.gentoo.org/692018
+	sed -e 's/pandoc/diSaBlEd/' -i 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)
+		--disable-qt6
+		--enable-qt5
+		--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-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index d84291b28039..cd70327db014 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,34 +19,32 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd nls pch qt5 test"
+IUSE="dbus debug dvd 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-1.60:=
+	>=dev-libs/boost-1.66:=
 	>=dev-libs/libebml-1.4.0:=
 	>=dev-libs/libfmt-6.1.0:=
 	dev-libs/libpcre2:=
 	dev-libs/pugixml:=
 	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.0:=
+	>=media-libs/libmatroska-1.6.3:=
 	media-libs/libogg:=
 	media-libs/libvorbis:=
 	sys-apps/file
 	sys-libs/zlib
 	dvd? ( media-libs/libdvdread:= )
-	qt5? (
-		dev-qt/qtcore: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 )
-	)
+	dev-qt/qtcore: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
@@ -64,7 +62,7 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch )
+PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch )
 
 src_prepare() {
 	xdg_src_prepare
@@ -89,7 +87,9 @@ src_configure() {
 		$(use_enable debug)
 		$(usex pch "" --disable-precompiled-headers)
 		$(use_enable dbus)
-		$(use_enable qt5 qt)
+		--disable-qt6
+		--enable-qt5
+		--with-qmake=$(qt5_get_bindir)/qmake
 		$(use_with dvd dvdread)
 		$(use_with nls gettext)
 		$(usex nls "" --with-po4a-translate=false)
@@ -99,16 +99,6 @@ src_configure() {
 		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
 	)
 
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myeconfargs+=(
-			--with-moc=$(qt5_get_bindir)/moc
-			--with-uic=$(qt5_get_bindir)/uic
-			--with-rcc=$(qt5_get_bindir)/rcc
-			--with-qmake=$(qt5_get_bindir)/qmake
-		)
-	fi
-
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index 0c1b7e20efb5..aa491b4adaeb 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -255,6 +255,6 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST y4m-0.7.0.crate 12045 BLAKE2B 4f48eb7ad5be2486e0f723b9beb9109cd1b38a0d0c5ac4a64411fce0bd9371d45496e5e0e839d15e7d1616b3888cfc1a0fc1ca364e65ac508306cad9a4ed44a7 SHA512 b85b0dd6df46c9bf125eee3e51ea39545ea1c794a2a097bba0aa31c682532ed3a9ba141745c61915fff13535fc5fff5a490d7c9e731c75bb5ce38a702075467e
-EBUILD rav1e-0.4.1.ebuild 5873 BLAKE2B bff616e320e5e4f563c9c18a2c7cb181629b1816a2f865b8f8bd4108175b3e284ef6f331055e740ba1c9eceff30f0b68f5eb03713a302f8eebe02e026be69b93 SHA512 4504289c24ef9b74f23cc8d21750dac8d465756bd36eb0366402d5aef9cb831f895613ee4ffab1c4512f035c95f83abc21870cf4c146cf26e1789e40d6ad5325
+EBUILD rav1e-0.4.1.ebuild 5878 BLAKE2B b442a9ee660919d6fa23594cd0decbcbd66cd0110c89fd3398cfb2d770bac546bcc12f670da2760f78a469b84051fa70d1742d27e6ae2047b689e90cf59f5837 SHA512 acdccaa1dca40bce032c512195110f8ffee70c998a736b801b08857611a9d1097ef44dfae5506bd203a9636d37bc65484883a26dc833d2be87a42496fdeaf077
 EBUILD rav1e-9999.ebuild 1338 BLAKE2B 458b0b3caeb9f9ca18c35fe09d1cd8f2c9944b3154d150e559009f0cc4ac15833ce97862c2c64520a1164af22ad9c8d902e171e6d588a2a4bfa67af28e035015 SHA512 6bb8b42bc0dbd3265d2b14fc60b73d5aa1f43fc044aff8e205c784d8525f92d5060bb9f40d491f6c619da8db78bcf418af1245e361f93cc078f0b5e8fa7bb012
 MISC metadata.xml 396 BLAKE2B 3f15123aeeca6df02c1b6a886418af6cfd4e4e977a5a93b2cc13301ae8e5a17a918a9e8116e19ae120cc27e42bcdaeb5e6c546f99b0333144bbc4aa9960b862e SHA512 4d650221196a5f48b12f2dcd6ccd3ea56abc7ec205e78d470aae267c7706cf81f03a691ca916d5c2a8c9e09a62c07b0802b5c688bc60bbc09d74ea7a135278ed
diff --git a/media-video/rav1e/rav1e-0.4.1.ebuild b/media-video/rav1e/rav1e-0.4.1.ebuild
index daec6bb06fa2..28899deacae7 100644
--- a/media-video/rav1e/rav1e-0.4.1.ebuild
+++ b/media-video/rav1e/rav1e-0.4.1.ebuild
@@ -272,7 +272,7 @@ else
 		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		$(cargo_crate_uris ${CRATES})
 		"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="The fastest and safest AV1 encoder"
@@ -319,7 +319,7 @@ src_install() {
 
 	if use capi; then
 		cargo cinstall $args --target-dir="capi" \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED%/}" \
+			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
 			|| die "cargo cinstall failed"
 	fi
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 29b0283ae910..722a5c4af4ff 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -12,11 +12,11 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc
 DIST vlc-3.0-3.0.12.1.tar.gz 34233801 BLAKE2B 0bc571d8f3f8aa40eee93fe8ab13bd1f37e288372d46b13998986899d03bf327b300a98ec5736bb9fe7bb58aae65c1d469786a4dfdb80f4cf8b5bbbb250ee45d SHA512 05b079dcfd4a21cdae7bb19e9d71f2fad33ca846852683c5d2ca6d45f779749ead420d5211b4acce76971d7ec2265d0d07f970f35f647dd446e337dc31aa0ec1
 DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
-EBUILD vlc-3.0.12.1-r102.ebuild 13752 BLAKE2B 74446fb058d6ed5d09be30495edaeeded8b23fb421602712d594165736a13c817c87497ad74ea48bc856802de5233bdbb741eb50e76af4027c99307fe881eae0 SHA512 3d07f4802b011ab0f7a9698331fe20e59177a56653500e853ff8971f0ea0e57ab7fae19996b70e9afdb013fe15476d5f93e700fdfe3c1c381b477bc9e9665a94
-EBUILD vlc-3.0.14-r5.ebuild 13733 BLAKE2B 3143974d5b761a9feb0715ce5b7d6a7b855a5812210f6d79d025c580a136e77efbf7a5242e02c8fc0a39643722d758834ad09888f4de10952e052295416ff9a9 SHA512 317d443c824233441cf41d5917c85a9bac3fae158ca4dbda3bdf10e1b1cf4fef119c7b6f1c1934df026ff4c8c546aa5bec88829dc3006fec26f95c22bbe60b1b
-EBUILD vlc-3.0.14-r6.ebuild 13807 BLAKE2B 08cb1ee444cc1287ffba97c5fd595135c4a77f6195c65cf8fffeef37b98bad5500d151378dbe56accb18b9a804b29e046b5ad5dbf5abec73907e5aebf09fbc3b SHA512 4e4bf7ccbb09c16db596fe8ff1539d71b3be9e285339c0b61382bb82d01e3631cd48ceb1e3af65c91d733662853e94688e2039302d741b3a87606e5e5c7a2f00
-EBUILD vlc-3.0.16-r5.ebuild 13798 BLAKE2B 4edba2ab308353f279529117a8dae90e1ce1f1a19321ad92558cc36ffb167b2445048bce0c878724c575827fe635b745401a7ba6b15fc67fffae966f3db614b7 SHA512 edae0b3ebb10a164566cb57234fccd70dee408c720c9dde04166dd10670ecb82304764cb8b355625035d80c515a657e51648669ec0f501dc0c62a162fd70b1c6
-EBUILD vlc-3.0.16-r6.ebuild 13867 BLAKE2B 775a9d4d3e53d03328e1eb63ba3dc1cf51faed7f70789b6382e68a415ff49b9a3b2cf522d768c8a16eabc293983d27568831c11e7bdaf69f77622ba47a58e581 SHA512 80d98b3b3359224a4f81b0b3c15ab05abf1533d6dec069e81e81132354b267e72b0da0f5281d25065c1ff251b64bef36ecf358168f5026e3adcf2fdb370cabb6
-EBUILD vlc-3.0.9999.ebuild 13475 BLAKE2B 528764a390e3e0e859efb50a2e9db5366ba87a86f01483787a4e3fe2fdb36de18448a95746e58ba5705793b53a4534dd3184efcf24e1576de9f57b7e0fff59e4 SHA512 90f884b1419bb717174dd386c5dc3b99dea13f496c49ebaa89970b5910b730852c109d3942a944531449c1557c6a1ab72a0a7e67c550e50a3ed21af09b561bb0
-EBUILD vlc-9999.ebuild 13496 BLAKE2B 46b7e92d8a69a19156d259e9739871f4dc10c3dc2e4e0de0f427be000ed069e7af0959f30cb5346b03c09468289cf606261db3675a07ac92bf39bb12347f688b SHA512 57ad9586d3b9f65cd78738a0e7c8716371525112e8dbdc0533ea3bb965cc31f05bf5da1097a331ff0c9e0e323f7e330cdaf875d4d952e85bd03a5f35f857fa92
+EBUILD vlc-3.0.12.1-r102.ebuild 13761 BLAKE2B f374707de28935c411e9b02e99073eac296216dc471da4fc74669fc3a81df15165df3d4766a971f3a13c83b99578980db12404ec436ceefa5e2ce7ab547994b3 SHA512 4c7c532455c0e505befc37a411b9e09020ee2c7f8f7f6a58208ac74544510b33a10200a3f1d64b8a2d7ecb691738991527122b77df4292a68eff761adf1b4d58
+EBUILD vlc-3.0.14-r5.ebuild 13742 BLAKE2B 4eb92ef7de92aeeac6ebb217d221a49479ee7457f9497ae66dd8c8740c6474753c553f9c50562750cc925ebdfa5642e22aef080ac5960a4f37ddd13af41cbdc4 SHA512 cebbb15a7d7b9af8ccebad3bae87c1809136a4d4f8f6ee879a3d51822122ac47b92fbd8f07d8b0370179a1584ce150186f40fbe103aa39db8d39a2ea0f50a846
+EBUILD vlc-3.0.14-r6.ebuild 13816 BLAKE2B a41ead803cd22a476a4d3d423326419bb96f7b58c1e5c28bbe2f8bceef53806c675f9dac75e3f65120ce803754c69497040f5c5f494208c2d34b8204dd1ca780 SHA512 3e4a724bca6c870ddc352f66408734b0e701f35674b24750f389623326a7afd3e2ccc5a06de5a74cc6202c8c3f432ef098a70a635999bcd580d6163e663434ce
+EBUILD vlc-3.0.16-r5.ebuild 13807 BLAKE2B c5330aa94a746437244da0b97eab00ae356d54d42997c80ea7e4dd5498ff7f82b737013a9fd72fa42b87df2306dab3f8889f10bd7dca6ebefd00f2034a83cf61 SHA512 d64e09323facd3c670d7a04bd307996056af8ae260e73d3ac3cad7fe1910077cc71d309c82bbc16731b37ac2f3439bf77d1d2b3f9971005442c06b77412a1683
+EBUILD vlc-3.0.16-r6.ebuild 13876 BLAKE2B 20e9ce647c8626fa4c26bda1bb685f54d1c80cf6712c6b99b2681e2645ba532a5f90292489d26f0e3b7d20148d9961a3843e2e47c068c89fc89333c2af949d1d SHA512 91af950f70b883e744d46719dfcbcecc90c90bb6fd854d1a9a63cb0d4d2c525f4fa2481030d52e43d6e8025e099f2c877ba9bf86463ff2a294c754dba6085e32
+EBUILD vlc-3.0.9999.ebuild 13484 BLAKE2B 4af596070d8b9a4f4c22d14540863221725a591d34d26979b1b60c06d24923963dd3f1279c8de4f9adefc90b87bf08a88267d1a42324988099c4d656f2a3f843 SHA512 f5cf094b7eb9ce67b10a71719b476f9a960086587dfdb469d09c58e5c449fc1a06aea8532f479d51478d095dd0b92cb04e015d036752c56ad7e188e1ec8b2ade
+EBUILD vlc-9999.ebuild 13505 BLAKE2B 29f331ef011e705ff842f6c79fe0feb6c91a53ae2a476f36ecc23d7e10f1bb5a17626fd0e808d5aa5e99cb0e19810bdf1c5a926db01875333fbc654f03eec694 SHA512 8393e4cb2b4b6ec1d4d7bba05333ce15306b040eef3812112266cb8d1e32edd18779c3e44ab78d48faaf6c0ef13371f80ee21369fc5267fc1762d5f5901d7f8a
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/vlc-3.0.12.1-r102.ebuild b/media-video/vlc/vlc-3.0.12.1-r102.ebuild
index 95d8346aece2..472f7f61b4eb 100644
--- a/media-video/vlc/vlc-3.0.12.1-r102.ebuild
+++ b/media-video/vlc/vlc-3.0.12.1-r102.ebuild
@@ -158,7 +158,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
diff --git a/media-video/vlc/vlc-3.0.14-r5.ebuild b/media-video/vlc/vlc-3.0.14-r5.ebuild
index 2e16e99f153e..a983b3b93075 100644
--- a/media-video/vlc/vlc-3.0.14-r5.ebuild
+++ b/media-video/vlc/vlc-3.0.14-r5.ebuild
@@ -159,7 +159,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
diff --git a/media-video/vlc/vlc-3.0.14-r6.ebuild b/media-video/vlc/vlc-3.0.14-r6.ebuild
index 08c473c7b881..126e983f6a07 100644
--- a/media-video/vlc/vlc-3.0.14-r6.ebuild
+++ b/media-video/vlc/vlc-3.0.14-r6.ebuild
@@ -159,7 +159,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
diff --git a/media-video/vlc/vlc-3.0.16-r5.ebuild b/media-video/vlc/vlc-3.0.16-r5.ebuild
index 8c556b36dcbb..a21851568cbc 100644
--- a/media-video/vlc/vlc-3.0.16-r5.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r5.ebuild
@@ -160,7 +160,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
diff --git a/media-video/vlc/vlc-3.0.16-r6.ebuild b/media-video/vlc/vlc-3.0.16-r6.ebuild
index 3cb51b38ba34..695200e37de9 100644
--- a/media-video/vlc/vlc-3.0.16-r6.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r6.ebuild
@@ -160,7 +160,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 9de5769c7062..2c90e88cc44a 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -165,7 +165,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 7313dc1dcb86..09a8d54ca6e7 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -167,7 +167,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 6f78bfdd7d6b..c5f115b0f365 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,3 +1,3 @@
 DIST yle-dl-20210704.tar.gz 65583 BLAKE2B f347bf8198a0e645dc960fa4e7a6bc5f90081b9936f8462d0b13c92fcf7005e31837b01d8a830b17c1f962e6f7b4afbdc18a3227c6caa5d2eb3389f7fcbe66de SHA512 fd91960221476ed4e1d5de79132687da88ff19e66d1f75e940e8aa00e742139ff4b2d0d67b32f86f6b7bd326520d0287f3495607f68a7f1f3634493d63282c55
-EBUILD yle-dl-20210704.ebuild 1414 BLAKE2B 4157eb69cb5642359805db076beda2cdec1ee6329a342d47cb1c05b8862273dae4ae667c24b53042717eb5e2d88225942341db79d0fdb1e4b3bd06400daf00e9 SHA512 3f2b3714ed04f2c76a8f2149c425f4f2a425725e13b3fe348af227676515a1b3c9ccf91570cef601bf11873c5819cbb6e1de784b054c8ab48a9b1365e9d09a24
+EBUILD yle-dl-20210704.ebuild 1415 BLAKE2B e4dd5808cd1d439815164b6749711b828eb14100dfc2b437f26ecf7589dff5b80f74a7727e5fc49bf78f9ede2ab953d7f125fed0f5d1a78c367e08bf678da218 SHA512 6be16afd2cb0ce79f3eda29904160d4acaeef7680d657646c10374d1233fd74e5772741eac37232a790a7e7cff5a78929f4e31d3251890b6f3e7089e547dfce3
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/media-video/yle-dl/yle-dl-20210704.ebuild b/media-video/yle-dl/yle-dl-20210704.ebuild
index 9dd81dc7d3b9..143605b1b4cc 100644
--- a/media-video/yle-dl/yle-dl-20210704.ebuild
+++ b/media-video/yle-dl/yle-dl-20210704.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1 optfeature