gentoo resync : 24.06.2021

17 files changed, 152 insertions, 775 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 74fd771a0f51..cc940d2a0eeb 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index b64ffd284305..6fc64d2bd049 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,20 +1,8 @@
 AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac528dda0227ccf2baf3732239b481ff6007bf5a8ddd9304dd7c2faff149f1cfbdbfb194eb30a3b19eea0803f10734572421 SHA512 d9a72bb0b8fc7c9915e4efa1e9758d4f9d6b68f1ad6ef9898dd0b5e693c8e1236b37fc97a9786c233f8909417309ea6bb9c1fb71054818f31eeb4c43faa46a06
 AUX mkvtoolnix-56.1.0-optlevel.patch 607 BLAKE2B 62c3ef3717a54030b1acc586e9468f4d8d783755f7762ccebe18b0f8b0214268477a5a218b2fc02f3e2f770664507d43119f13046a31c94f865f01d0000a8a68 SHA512 b8eec05844aa8ef4f27416a78f5231496e34a112126e8ef403d18cab26b94756bd60323b51cf0d59a5a44d7b379bbf09f6b7b1b7e29b9282a0a2e82a5b3f325e
-DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
-DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8 SHA512 dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d
-DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739 SHA512 33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d
-DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018 SHA512 087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7
-DIST mkvtoolnix-50.0.0.tar.xz 7559852 BLAKE2B ffcc0c608915d32d20fc823208857bf54dc3d645d56d3b8b9f7e33b213ce5046b977b6f3de41d1b779d958d6ffc8578fe0cbac41d92d88bb4c779363739ee437 SHA512 ef0c6f4be768e32e3b0887c17d77f8441fd1b19294120c043dd9b2fdd9b76357bea721a156c3e99e0677d2e83dee92ea776df906347a0d44acbc2631b66c73ea
 DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69 SHA512 2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
-DIST mkvtoolnix-56.1.0.tar.xz 7632872 BLAKE2B 805ddc9fadca4eba2ea4f3d8371f191c20ab6ca74c1564a216f1c001d272d038ee9622a562034b4584e118859a24cdcf36840e9e0bf7d5f2cc9893b91cf1c29b SHA512 7ee1c580c5b8824491652571f30559829700e50b1a74cf92affba77154c2756bd613cfd5776cdd180d1eaa888949ca898caac1bfadc690c68086fb136d41b2a6
 DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
-EBUILD mkvtoolnix-37.0.0.ebuild 2633 BLAKE2B 4bb1bc4c3defb6dfd672ca24322f9c220155b29ee11a355720de0aea495b9dc5d9a9a21f76c75bf7a91df8d96ed52850ac8e8b371efee6a4fbc9eda4770b0028 SHA512 22ec4a4753909bd92426841c2e2025ace80b3bc6de57e00182c67ab1c2bc8d1e7d03acd0312123f6979b09f6756ecb511ec1f2f97b6e939a591476a03f40bc7b
-EBUILD mkvtoolnix-47.0.0.ebuild 2708 BLAKE2B fcae224ed255e1e3ae82e78d901b14e7e230fc9ac77d02901df03b9ca3f866af9695313ac1337ccf3f3b2480c7f71639926b98422388ec8c033d2146a3bb5ebb SHA512 aee260c756079917131a64721a109b65358081f9a5eb2098034e15fac7f601b69e35811efd28da20c601765505194a8d1f30af2aca66a0ccbe0292ab8152951f
-EBUILD mkvtoolnix-48.0.0.ebuild 2704 BLAKE2B bd58d60ce6c5f1d4365223b149790fea8558ec0aa458d0b21e08fe144d3140c3a3d8ea8f477ebe016da21b2db538eb4a21b31c10d6946718189d4de6d6af572b SHA512 754cd160947385bdc5e8cd5cc66bc2140c7706848b35baa2e9ec9b5f13017fa807c6c97d41609bcfe874a848a73df94b3c4998e97260c0e37a2368871f894a52
-EBUILD mkvtoolnix-49.0.0.ebuild 2813 BLAKE2B 3d6f8974419ec2a24030ddfb9bbdcb83b8d408dbe74bfe6516762738d8b4bb115e648518b6130f3aec14ee327ebc10eb576fa964b02699c94d9a76f1e7ccfe8a SHA512 b866c1f585b5fe1ce3d014236a4b139b0d394de0b7eb2b15c2c0ce338a319cb5b0f344ef0c41d0f259f671f9537358b7b485d265830293778a3e3f5ae2f70f02
-EBUILD mkvtoolnix-50.0.0.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505
 EBUILD mkvtoolnix-51.0.0.ebuild 2921 BLAKE2B e71d3e988f14a21595f8666f57d5eee063088dc708d787c707bef93e2fe8d8c86614e8c81f2542eb7b8b91203927b04ae44b5d8c95f8710884acde992f0da6bd SHA512 76409b23ca27bd4c9528c153d016c72bb39778c80ee3c487dd6d9f23c228b475df80fbc10b2b37ce10e0f131d4d6a33e6af77117f25488218bf5a3c0057a8e2b
-EBUILD mkvtoolnix-56.1.0.ebuild 2973 BLAKE2B d2c5a209bf16fac4b98a093e3cc5ac7b11f12707e648d5cabed8d90ea6431020cdbeac918a2b3c7d61ddebe6eca42499c038e3c6abfea2332cd4e952c1948370 SHA512 e64b0c432ebf47a4b40d201ff83ebec6723214d44d72d9ac8757ef176319579bfcbc841ba2e595bb8870735e8ef4f846fea8670e59498fc737dacdb0f362bd20
 EBUILD mkvtoolnix-57.0.0.ebuild 2973 BLAKE2B d2c5a209bf16fac4b98a093e3cc5ac7b11f12707e648d5cabed8d90ea6431020cdbeac918a2b3c7d61ddebe6eca42499c038e3c6abfea2332cd4e952c1948370 SHA512 e64b0c432ebf47a4b40d201ff83ebec6723214d44d72d9ac8757ef176319579bfcbc841ba2e595bb8870735e8ef4f846fea8670e59498fc737dacdb0f362bd20
 EBUILD mkvtoolnix-9999.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
deleted file mode 100644
index f29330b7108c..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 autotools 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="debug nls pch test qt5"
-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/libebml-1.3.7:=
-	>=dev-libs/libfmt-5.3.0:=
-	dev-libs/pugixml:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.5.0:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-apps/file
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus: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=
-	)
-"
-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
-	)
-"
-
-src_prepare() {
-	xdg_src_prepare
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# 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 qt5 qt)
-		$(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)
-	)
-
-	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[@]}"
-}
-
-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-47.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-47.0.0.ebuild
deleted file mode 100644
index eb57b01c0ba9..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-47.0.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 autotools 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="debug dvd nls pch test qt5"
-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/libebml-1.3.7:=
-	>=dev-libs/libfmt-6.1.0:=
-	dev-libs/pugixml:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.5.0:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-apps/file
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus: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=
-	)
-"
-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
-	)
-"
-
-src_prepare() {
-	xdg_src_prepare
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# 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 qt5 qt)
-		$(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)
-	)
-
-	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[@]}"
-}
-
-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-48.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
deleted file mode 100644
index 8b911a01ce14..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 autotools 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="debug dvd nls pch test qt5"
-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/libebml-1.4.0:=
-	>=dev-libs/libfmt-6.1.0:=
-	dev-libs/pugixml:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.0:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-apps/file
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus: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=
-	)
-"
-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
-	)
-"
-
-src_prepare() {
-	xdg_src_prepare
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# 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 qt5 qt)
-		$(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)
-	)
-
-	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[@]}"
-}
-
-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-49.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
deleted file mode 100644
index ae9314eb7e7a..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 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 qt5 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/libebml-1.4.0:=
-	>=dev-libs/libfmt-6.1.0:=
-	dev-libs/pugixml:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.0:=
-	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 )
-	)
-"
-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-49.0.0-qt5dbus.patch )
-
-src_prepare() {
-	xdg_src_prepare
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	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 qt5 qt)
-		$(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)
-	)
-
-	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[@]}"
-}
-
-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-50.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild
deleted file mode 100644
index d84291b28039..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 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 qt5 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/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/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 )
-	)
-"
-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-49.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)
-		$(use_enable qt5 qt)
-		$(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)
-	)
-
-	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[@]}"
-}
-
-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-56.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
deleted file mode 100644
index dbc45d73af89..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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 qt5 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/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:= )
-	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 )
-	)
-"
-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-49.0.0-qt5dbus.patch
-	"${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.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)
-		$(use_enable qt5 qt)
-		$(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)
-	)
-
-	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[@]}"
-}
-
-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/noad/Manifest b/media-video/noad/Manifest
index 65d9bd4b2f6c..689c0e2aad28 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -6,6 +6,8 @@ AUX record-50-noad.sh 1443 BLAKE2B 98cba3a0024bc8c4426d2cd5d1e0d5b9d2e2ead2c50f9
 DIST noad-0.8.6-ffmpeg3.4.diff.bz2 6261 BLAKE2B 4c1de8b72c9b25a056cabb5a74b4d9bbc42f6586b4e2166bf2cf5ac76d7617df3318a4a4b21fa5dbfb601e2f9bacc7bd2d8b54705750a2d761c5a73c5c745578 SHA512 f7b4879902e2344099ef337094fc8be1c4322d2fa1ed5d7c275adfed9dfcc1644cc18743191ffd4daaa44a83cf3936a8dd8a978c66aaeae18a38c6164a608b02
 DIST noad-0.8.6.tar.bz2 188085 BLAKE2B fa9ae43984509f6da17028cda11f69dae0a74afcabe8daaaf2661d9791229bf1d5374b26abbcc9cd8f887b42c188a0d4871ae059dabac3b9bb9175533f096100 SHA512 ffca9e8bc78719350ffdfe59a4f258033f843ddf761ca5d8893cde5a4968a644c0318fd86b60e7b9e78b0650f8f02c68e6f7a95f4dfb702ab30d84ad3750c9e9
 DIST noad-0.8.6.tar.gz 226169 BLAKE2B c8aa44a868a7592b66a94a58065df5b3dc19562bf6bfb946fe60acebd2ea9f9090750836368bc6aeecf2fbd9938b0ec3f653d7908d3b34f27c3362fcea48e445 SHA512 abec49ea7d4dc4233d42bd42ba267bc7b235aace1597c5cd3dcbb7b4ede00c3778eaa2a0d8697fca4caf2b0ca94b540b87a862523a3028eb5cfe84db3c460ede
+DIST noad-0.8.7.tar.gz 144339 BLAKE2B e7492f63e7326cdced041332e05051a6bda2e92798f4b694ff626e65306d6ebe606f871eabc37df1613677c2f739b3caed033b443cbe7edce913b83a0365e3e5 SHA512 fa1d0226144175de586f938a594fe0a3c0b8a924a258f1406cf52078d5e6d84f46ae685ee3c9f3ce28e62f9eee719d6a938504e39a6b3b9c96043f4bd4aaf69d
 EBUILD noad-0.8.6-r5.ebuild 1854 BLAKE2B bfb1a46ad9e03b964d3f1a27e1e4602e459a56f0a8497615050d8d341b7e4a0b35f3c896ae4f367963e1b191c16c13fc90d3ed28e3fa858c37afdc48b5e19293 SHA512 793c1e77ed94cb155c1aaa39bbc54f24e3e323a40b261f9bb73089d0ae0dad3f4a2bf1f0d8c4969148c1e45144cfd1bb1d8bff2d27f47218ba2ab16c76af8eb4
 EBUILD noad-0.8.6-r6.ebuild 1877 BLAKE2B 883f67181c265f0f2a0427150d5dbe864fac7abf5f33c2ad4f4608ad0b29a38c5bf1f5447076874cbbc876a37833dcf28b18d5a46a99db8d8818931f032fc8c3 SHA512 5ba550ee36d2c6c84737a5cc32eb59e8f839cc71f12b947a3f1fa272b01f8c8eda02867c05c0ebf6d34bb56ec50e0486c91d5c6263c23662773ae85565b763c9
-MISC metadata.xml 489 BLAKE2B 21d3e8e42096fed4a5b7b9d138f8e0e627a3a7dc23fe93e1ed84d50b03c20629db9aea90c0284d9016a9b4aa13c8ed6052551f418e246cb4c32fe91ad02902e9 SHA512 1430cd34fce2dc1640655aeadf95f88a1d0cfd90f958f2907c8f281cc3d2bb08a4496e4cbea62cebef960d43e97104f952e653c79f690a948948cf53713c19a0
+EBUILD noad-0.8.7.ebuild 1701 BLAKE2B 522366ca77ef831fda2873ea7ab95ef6d3cdb55fdb31d6b2731d2035c215301a295811707f34b9a41a724ffde7a15d676d0b2db8a4cae2248f1a86c552799ed5 SHA512 5e652e645d9ab83f82b5a5e53a6bb6a601638e08161c8e626edffc2e24e20106f34920b01c3a56bdbc536bf33287b1eeb8a696b8601d82989e50a56c495e94ac
+MISC metadata.xml 863 BLAKE2B 52d389381161228e34af1f1182bbee293f2b88df09e45b86fc631750c0a31a347f3ac766f4e6980be2adfe269ae49bf965011ebd902668f21a35388c109dbebb SHA512 ae46651700709056c68a8d92dda4b3ddc2a3e69f6c546693bc4ee94395de762f32ca8c376bd93809ed830baedc60d9f9b991595889effef9de7ae8ace58d88f7
diff --git a/media-video/noad/metadata.xml b/media-video/noad/metadata.xml
index 90724bd37831..d9850778c30a 100644
--- a/media-video/noad/metadata.xml
+++ b/media-video/noad/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
@@ -9,7 +17,10 @@
 		<email>media-video@gentoo.org</email>
 		<name>Gentoo Video project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">madmartin/noad</remote-id>
+	</upstream>
 	<use>
-		<flag name="libmpeg2">Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg</flag>
+		<flag name="libmpeg2">Build support for mpeg2 through <pkg>media-libs/libmpeg2</pkg> rather than using <pkg>media-video/ffmpeg</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/noad/noad-0.8.7.ebuild b/media-video/noad/noad-0.8.7.ebuild
new file mode 100644
index 000000000000..1b5132feec44
--- /dev/null
+++ b/media-video/noad/noad-0.8.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Mark commercial breaks in VDR recordings"
+HOMEPAGE="https://github.com/madmartin/noad"
+SRC_URI="https://github.com/madmartin/noad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ffmpeg imagemagick libmpeg2"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	libmpeg2? ( media-libs/libmpeg2:= )
+	ffmpeg? ( media-video/ffmpeg )
+	imagemagick? ( media-gfx/imagemagick )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( ffmpeg libmpeg2 )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex imagemagick '--with-magick') \
+		$(usex ffmpeg '' '--without-ffmpeg') \
+		$(usex libmpeg2 '' '--without-libmpeg2') \
+		--with-tools
+}
+
+src_install() {
+	dobin noad showindex checkMarks
+	use imagemagick && dobin markpics
+
+	dodoc README* INSTALL
+	# example scripts are installed as dokumentation
+	dodoc allnewnoad allnoad allnoadnice allnoaduncut checkAllMarks clearlogos noadcall.sh noadifnew stat2html statupd
+
+	newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
+
+	insinto /usr/share/vdr/record
+	doins "${FILESDIR}"/record-50-noad.sh
+
+	insinto /usr/share/vdr/shutdown
+	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
+
+	insinto /etc/vdr/reccmds
+	doins "${FILESDIR}"/reccmds.noad.conf
+
+	exeinto /usr/share/vdr/bin
+	doexe "${FILESDIR}"/noad-reccmd
+}
+
+pkg_postinst() {
+	elog
+	elog "To integrate noad in VDR you should do this:"
+	elog
+	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
+	elog
+	elog "Note: You can use here all parameters for noad,"
+	elog "please look in the documentation of noad."
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 3f014efa9ace..e86c28bdfc8d 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -6,18 +6,17 @@ AUX vlc-3.0.11.1-srt-1.4.2.patch 976 BLAKE2B 1d5c6a2df44e2cc26c0b835b71f028b0445
 AUX vlc-3.0.12.1-limits-p1.patch 874 BLAKE2B c46ce7c774c378601e39fac6c0013e0cf6a8b008becdaea9e35f56ed21d6efaa28ce9ae55cf3e2ba70e7d116f17dca12b348ff75c692a83ccfc79d2728ec0e86 SHA512 28dcba99106ac2e3b40bab90fceb206d98f47852d8be12b865c6cdb03febc2f6a39610854424bdd513b537ac5fe05cdfe261598497e67c5f55012f95908f5b7e
 AUX vlc-3.0.12.1-limits-p2.patch 1311 BLAKE2B bcef3a4d0fd2b7bf033132c9b30098cf4c97992da027a862e8bef197d2fc90f65986a9c4188dc72732ce50d1a2683d411cb69f75f04c814a40306a41517f1e10 SHA512 1eee525ce5f10fcc4f778cd1249e3e930b1605b68b096ff61b33a38dff513f547e3baa05ed7d448da5ff61def55f6822c4dfcce94a0c3d693c936ed33ae12d7b
 AUX vlc-3.0.13-srt-1.3.0.patch 446 BLAKE2B e02bad6bcc81508fd8d28a2b10f1760339c6a9432e951bf04596053493f2cec197468032ec29773fdf1b980cee5e2c71b556a4cdef4076fb08f0b1edc6965dba SHA512 1b4165bdb95d128ae9afdb1f650f629c219801eaf6f6e1f12659eb45026e732099ad3a714406e8ad0cdeb1f4e6988c187b7e60b69a8d00bdc759649f1d08b5e5
+AUX vlc-3.0.14-fix-live-address-api.patch 2233 BLAKE2B 50b40430978996e5302b08bcb8a68e5f106fe43f4fd66ad69dd1e6c1e8097abc32c671cdfc8dc87b7526cabadf847bf359f81927919ff3ab8ea7a80274bc7075 SHA512 d79e03677e404ef853499ac7b72977f1d6368d003720ce663581a5527b5b6327b36d5b240bec0aa2d4c3bff4c1b04ce1c4dc904fc648c98498ba2f88f1acd82a
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0-3.0.12.1.tar.gz 34233801 BLAKE2B 0bc571d8f3f8aa40eee93fe8ab13bd1f37e288372d46b13998986899d03bf327b300a98ec5736bb9fe7bb58aae65c1d469786a4dfdb80f4cf8b5bbbb250ee45d SHA512 05b079dcfd4a21cdae7bb19e9d71f2fad33ca846852683c5d2ca6d45f779749ead420d5211b4acce76971d7ec2265d0d07f970f35f647dd446e337dc31aa0ec1
-DIST vlc-3.0-3.0.13.tar.gz 34356102 BLAKE2B 93490278f47ab389c927a44bc84727b8067a9792e5621b3a9caa90c23a25ecb11244ebd62aa2dfb6d03df692c1ce3ae2aaec20aff001bb805f3965357298b4c9 SHA512 58439ef605ddc43aaf3fbd41715d3e341565590db3d73256ea3a977544f287d8f5001eb334a70674b707ccdc584125a24a3f320b3b4d166c01450d53741a4f85
 DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
-DIST vlc-3.0.15.tar.xz 26436344 BLAKE2B 42e20e8bbd2af79a63d261c3b376ff974a38e8d5376a3998e4759584f4e791a1d0c2827268055ec36a792980c74cf39a749770b2d1a31e15d3cff721a855851c SHA512 4645d7e9cc894ddf4c1776fe15124b1c123c3860f6dceec7bc0087a37a6e98f62e35856cdb59f8759b8f4aeea766b25c9a7767b65f1be8bb9ee23c71376cd914
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
 EBUILD vlc-3.0.12.1-r100.ebuild 13748 BLAKE2B 107691a0a6f7a25082845706fe39be5d51c48b23bca434075f2d86b53205cc528d1bfe09374c945e80510f59739cf610dd76d6fda4735406ae10d60fb525ee5a SHA512 747e7cf72eb2e01b324ad6b8526f11b5d55400f9a86a02674e72ee1666ac4ff5c486bc5fa03319e369c84b34f5e350862c5cee5ae5cee327e5006147273bc3e7
-EBUILD vlc-3.0.13.ebuild 13746 BLAKE2B b4a84533271235cde54783bc92f6cc7bcddd4f87c05fc67ca51b0d2dc9bd5b4d02e7f5e7da4329544169781f67dbc7e38a8fcb33139318f7ce12f0a29872d483 SHA512 ccd6e2232808764ef877df955ab5921a1761a511cf04c57413cc2a5bd54552166d3ded64164c958360d89de244bccb793c1a0b2a934823af4dd4187ecbf943fb
-EBUILD vlc-3.0.14.ebuild 13717 BLAKE2B 0f49a586f792a100142e88d0d479c08357f2954c3a94a6219f6adb1a8bb19b7ba0a96d05494ef0cc9f9ec6279929392ab772e71015385eb1c2734bfd0b2b0b53 SHA512 c78b495db3029610d72112a956de8b4da2331cac9a00faeff3c828b2927f2aeb4d8ff303316c1a17b3963fac9c37b4bb55f42fbca62f152f91b9c19a3dcce68a
-EBUILD vlc-3.0.15.ebuild 13782 BLAKE2B 64a8810958c32ef5b7e0afc8f859fe787988ab0e039342a32ed048d89c43a0dc79af9af7ba100ff7eda6c8f4753d267e2e610226ff5ddf557792e893289d4c5a SHA512 cd38e83c98e8d4e8797c2e6e93d705dfa41d25a6b6a80d3ce723b93096c32905596d1652b39906a00ad74d0a4d2773dbb8120aa10a9d5678fb4df00ff57449d9
-EBUILD vlc-3.0.16.ebuild 13782 BLAKE2B 64a8810958c32ef5b7e0afc8f859fe787988ab0e039342a32ed048d89c43a0dc79af9af7ba100ff7eda6c8f4753d267e2e610226ff5ddf557792e893289d4c5a SHA512 cd38e83c98e8d4e8797c2e6e93d705dfa41d25a6b6a80d3ce723b93096c32905596d1652b39906a00ad74d0a4d2773dbb8120aa10a9d5678fb4df00ff57449d9
+EBUILD vlc-3.0.14-r1.ebuild 13729 BLAKE2B b4192f8e6a09bb46ea874ffa32f384711a035ed4d6d4f034ba9291182e29f898e2ec3c3d49ec628958ec238d8ae204c8c8144af55f2be8d7221ba3be8fdec03f SHA512 202e7c02f83e7f8f67b0258ed5e14b0e3a3023ce298edb1958c47d7fde12a706001281205d6f907c05638000916d49eb98d7f0b7a18ab1f356bc6c180bbc6500
+EBUILD vlc-3.0.14-r2.ebuild 13803 BLAKE2B aa9a4b608938df3e91bf502ef3f7be34d531052b001c02e850a986dd816f592159f381b77649b103bb2e3fed143af2ac9b9b445a29a01907d4858e6b45fda248 SHA512 cb217ec30d9e04798abf30483d0afd09c85c06ee95d77dabbc656b859f94c9f162a0ebebff8f1f1e8c78d0eaac8d38f25abefd4293c2c1edfcab851c37ca97ec
+EBUILD vlc-3.0.16-r1.ebuild 13794 BLAKE2B 9554db9294a77775f61fd16e2d37b138eef70d5ed6579bb6ae2183f5ea7b1d6fdb900e4f126291c76b5da9ca7b2c9c16c5a9efb04410d3ff6d2185e775e54504 SHA512 e1fa14df23f4aee2796fd801b30106d76a80088c5a9e8fcc77cab812c232c096f11899f1045abe445951444c599fd6a18f54fcd49784fa695af43c3c598a7cb0
+EBUILD vlc-3.0.16-r2.ebuild 13863 BLAKE2B ea7ee43901e17fefa418779f38603bad1c5e890bb5c75f5e10999559e2ac86c29495421f24ce0f012a138bc8f33c59ade12136a5b5e415f43e68f9bc1fe2a32f SHA512 a1e38b1d8fe28ce16286442fed99fcddac7f5f542f05c83b7a7f1788010042d6625add98c0c6e4a4b8bf6eda63bca957fffd8aca879f4291953a31dc9ea03445
 EBUILD vlc-3.0.9999.ebuild 13471 BLAKE2B b670f3966ef3b437efbc49c237723ee1b58eadd1072f9b019ccb42644e0699f1673acb53839c044e6dd3b5e0137e3c6562d5cc008e05793d9bdd1ac5329c74c6 SHA512 7175f7a47a3466e3e08e72064d4cf280dc528a9e98ef538a0f45d05ca63ab4a23c212393d66a5192ea892cdc62f5fed742efb0068977f76da0debd1e16e764d1
 EBUILD vlc-9999.ebuild 13492 BLAKE2B 4ce1ec116bd322cb97a258e5bc61e2ea068d19f5eea7c024df8c3e3662342b0395b01407a1dad74dc69200501e5d85d17102fb2d0adf0f5a27ff5a5ea6262b47 SHA512 aa17c24cfa15b04be911405523eaac1d5bc6003f32c21d32f9161e2d98820646344a5d7dde75ccd7784a36d18b2bf61c1d94bebd3ed2e10181fdb6153967b25a
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch b/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch
new file mode 100644
index 000000000000..2d6f86f0aba6
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch
@@ -0,0 +1,53 @@
+Needed for https://bugs.gentoo.org/795798 and
+https://code.videolan.org/videolan/vlc/-/issues/25473
+
+From 94845266b705dc9de7921408531b9d7704f4458f Mon Sep 17 00:00:00 2001
+From: Dominic Mayers <dominic.mayers@meditationstudies.org>
+Date: Sun, 28 Mar 2021 04:37:54 -0400
+Subject: [PATCH] Get addr by ref. from getConnectionEndpointAddress.
+
+Fixes issue #25473 in code.videolan.org. The maintainers of live555 changed
+connectionEndpointAddresss to getConnectionEndpointAddress, which now provides
+the address value by reference. Before, connectionEndpointAddresss returned
+the value. So, in modules/access/live555.cpp, we must first get the value and
+then pass it to IsMulticastAddress.  The code will not compile with the recent
+live555 unless we also modify modules/access/Makefile.am - a different patch.
+---
+ modules/access/live555.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
+index 01c535ca5b..95e15e35d9 100644
+--- a/modules/access/live555.cpp
++++ b/modules/access/live555.cpp
+@@ -60,6 +60,7 @@
+ #include <liveMedia.hh>
+ #include <liveMedia_version.hh>
+ #include <Base64.hh>
++#include <NetAddress.hh>
+ 
+ extern "C" {
+ #include "../access/mms/asf.h"  /* Who said ugly ? */
+@@ -727,7 +728,8 @@ static int SessionsSetup( demux_t *p_demux )
+     unsigned const thresh = 200000; /* RTP reorder threshold .2 second (default .1) */
+     const char     *p_sess_lang = NULL;
+     const char     *p_lang;
+-
++    struct sockaddr_storage addr;
++    
+     b_rtsp_tcp    = var_CreateGetBool( p_demux, "rtsp-tcp" ) ||
+                     var_GetBool( p_demux, "rtsp-http" );
+     i_client_port = var_InheritInteger( p_demux, "rtp-client-port" );
+@@ -850,7 +852,8 @@ static int SessionsSetup( demux_t *p_demux )
+             if( !p_sys->b_multicast )
+             {
+                 /* We need different rollover behaviour for multicast */
+-                p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );
++                sub->getConnectionEndpointAddress(addr);
++                p_sys->b_multicast = IsMulticastAddress( addr );
+             }
+ 
+             tk = (live_track_t*)malloc( sizeof( live_track_t ) );
+-- 
+2.25.1
+
diff --git a/media-video/vlc/vlc-3.0.14.ebuild b/media-video/vlc/vlc-3.0.14-r1.ebuild
index 0a0bd7bf3e16..39df8bf51c03 100644
--- a/media-video/vlc/vlc-3.0.14.ebuild
+++ b/media-video/vlc/vlc-3.0.14-r1.ebuild
@@ -140,7 +140,7 @@ RDEPEND="
 	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
+	live? ( <media-plugins/live-2021.05.22:= )
 	lua? ( ${LUA_DEPS} )
 	mad? ( media-libs/libmad )
 	matroska? (
diff --git a/media-video/vlc/vlc-3.0.13.ebuild b/media-video/vlc/vlc-3.0.14-r2.ebuild
index a706bd9e653e..06e953113a2f 100644
--- a/media-video/vlc/vlc-3.0.13.ebuild
+++ b/media-video/vlc/vlc-3.0.14-r2.ebuild
@@ -41,7 +41,7 @@ IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
 	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
 	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
 	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
-	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
 	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
 	cpu_flags_x86_sse
 "
@@ -66,6 +66,7 @@ BDEPEND="
 	x86? ( dev-lang/yasm )
 "
 RDEPEND="
+	media-libs/libvorbis
 	net-dns/libidn:=
 	sys-libs/zlib[minizip]
 	virtual/libintl
@@ -139,7 +140,7 @@ RDEPEND="
 	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
+	live? ( >=media-plugins/live-2021.05.22:= )
 	lua? ( ${LUA_DEPS} )
 	mad? ( media-libs/libmad )
 	matroska? (
@@ -208,7 +209,6 @@ RDEPEND="
 	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
 	vdpau? ( x11-libs/libvdpau )
 	vnc? ( net-libs/libvncserver )
-	vorbis? ( media-libs/libvorbis )
 	vpx? ( media-libs/libvpx:= )
 	wayland? (
 		>=dev-libs/wayland-1.15
@@ -237,6 +237,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
 	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
 	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
+	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
@@ -294,6 +295,7 @@ src_configure() {
 		--enable-screen
 		--enable-vcd
 		--enable-vlc
+		--enable-vorbis
 		$(use_enable a52)
 		$(use_enable alsa)
 		$(use_enable aom)
@@ -394,7 +396,6 @@ src_configure() {
 		$(use_enable vaapi libva)
 		$(use_enable vdpau)
 		$(use_enable vnc)
-		$(use_enable vorbis)
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_with X x)
diff --git a/media-video/vlc/vlc-3.0.15.ebuild b/media-video/vlc/vlc-3.0.16-r1.ebuild
index 8d7b04a4384d..dfd2ab3881e9 100644
--- a/media-video/vlc/vlc-3.0.15.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r1.ebuild
@@ -141,7 +141,7 @@ RDEPEND="
 	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
+	live? ( <media-plugins/live-2021.05.22:= )
 	lua? ( ${LUA_DEPS} )
 	mad? ( media-libs/libmad )
 	matroska? (
diff --git a/media-video/vlc/vlc-3.0.16.ebuild b/media-video/vlc/vlc-3.0.16-r2.ebuild
index 8d7b04a4384d..0a410fa516ff 100644
--- a/media-video/vlc/vlc-3.0.16.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r2.ebuild
@@ -141,7 +141,7 @@ RDEPEND="
 	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
+	live? ( >=media-plugins/live-2021.05.22:= )
 	lua? ( ${LUA_DEPS} )
 	mad? ( media-libs/libmad )
 	matroska? (
@@ -238,6 +238,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
 	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
 	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
+	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )