gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-video
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
169 files changed, 3251 insertions, 2656 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 42e25df940d6..14d9be614d5f 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/acidrip/Manifest b/media-video/acidrip/Manifest
index 32ef69962224..b8602a864181 100644
--- a/media-video/acidrip/Manifest
+++ b/media-video/acidrip/Manifest
@@ -1,5 +1,5 @@
 AUX acidrip-0.14-makefile.patch 2360 BLAKE2B 565554ea73dc3eefa7141ecd9fec35bba2837e0fbd74991241f1a07bfe63221c346335aa86a42d134cb28c9ceeb3d261d508a25b7285430406814a80c17bad2b SHA512 7e91ea9ad24e20f620f0d406f2dd5d5ed5364cf92d57566c969e17aef0a0bb3d172142692a08766b4cbce0f4e1c2594672542765e68c559e9c9679a27012441b
 AUX acidrip-mplayer.patch 1079 BLAKE2B 8115276151641042b854f7ddc0607a939eb67c86b2cc1d56037cd5209a5c898e6bba97ee974d58eba59d09bc43c2701176e0a54ad26aa4d17c2582c3a7b3fd30 SHA512 ae1b57efbd49de33f60dd0d6daffb4c4ddf6bf726ad5fc2fab485a4af39d5c1326c43471dbbe8a28147e3a0f42e1ea55bd98554a1fbd8ee0fa3a150a180f4f23
 DIST acidrip-0.14.tar.gz 92086 BLAKE2B 0f1dec1a6a35d41ecbc66fc4ccf5df82c3f0e6f9f958482ebf8965dd59ffdcae88b8f1b7453c06c48d6555067e00ca57f7b5d469f7780c78cb5180a883a45009 SHA512 3ee0e329bd7e5eb4067d618fc79a49707084526d53e8c10cd9ec560828cf621e8d7263259cc8bc7944e6f9d7b7fd1fc5b8a42a8f37f18666f1974f240edb99a0
-EBUILD acidrip-0.14-r4.ebuild 706 BLAKE2B 89b80c94715cee50422ed87b7adde847646cb9a31a442f6614b56631696be01f71c4870531d68fab71d9b4af86a6ce841a8489c7a85d80695029b7dbe6e7919e SHA512 c87093ecbdc1853213eba6e680a32e8f0c1bc36fbe3e9f17864c67a1e0ce5fa24e967caca947915b704e0cb4c60e71c33d223b1967b04e1f3f9a892ce00eede4
+EBUILD acidrip-0.14-r4.ebuild 713 BLAKE2B 74fd071872e9826df865448ea3a31cb7c2cba689856f7b50bcd98f5c8fa37a61e527660c65d556ae9b41705e46467038658f579410aeb86d86d84a66f1c7765a SHA512 9c9a7c4ac8ce97ed75bb7fd2b39e1ecc835bb617864a9c7728c6bc9215cd8ca9c694f1cfcabc241ecd5a0814c98a9b4e76d034517bbc01ee091d81d5385f601c
 MISC metadata.xml 300 BLAKE2B 253c7b9fff6f6baad509f1daf8033ba7f08602d26761bd54bfab87721d41998b43f2f0cc56734c87353625ab82cf74c76561da5fd96a14d750a8bb7992563e7c SHA512 38c5aed9ac2ffb07d440065ca471b391cd3cf8a6b3f424779679d2eeafb6de38c72c29802c8ef772447a20ff83533d25c9aed2ddbb1b3330b3a8e5c597098b08
diff --git a/media-video/acidrip/acidrip-0.14-r4.ebuild b/media-video/acidrip/acidrip-0.14-r4.ebuild
index 990424cacafa..030214ae78a7 100644
--- a/media-video/acidrip/acidrip-0.14-r4.ebuild
+++ b/media-video/acidrip/acidrip-0.14-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit perl-module
+inherit epatch perl-module
 
 DESCRIPTION="A gtk-perl mplayer/mencoder frontend for ripping DVDs"
 HOMEPAGE="https://sourceforge.net/projects/acidrip/"
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 9d6393c1c1e5..e98772b6f3c6 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -5,7 +5,7 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch 2369 BLAKE2B e
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-makefile-for-make4.3.patch 729 BLAKE2B 3aa9f74687527268349bc6c3be89bde4f27d74a68b2cdd31f228fb91869890e151af94ecad4937b3ea179b1e1ec8c026c00d5946b6de0d2329c58906f5fd06c5 SHA512 44cbeaf7284d0ed6a43afbf36cc25db02c365a30fedcaccdccf0b584d2b0c8ba4a8055263fe7e8288bb6b356892f09463a81391fd4fcd8b7eb1e7b1b1ea98744
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch 4029 BLAKE2B 635bfd2317a05b1393c26b648f0081920be30e9ca29eeac0a5d25b75a141a3eb40cded94d27934eddb4d2ad1f28a1d8752faf97f264cc4a2a4ef0ffaedeed7b4 SHA512 247dba6e593212294f3157226c03e2fb5d3a5a8eaf9a16e0a65ea1fee006b8f21fadbdd80fb0b748be3a9b043779a0da6bb6007fac07b7908fb46f27a055704e
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 BLAKE2B 67558c0d8a1227e03d6ab97e4f417ec0ef557609be908b403ea5d4c4b12b58dd33822611b98e42afdbc3e65741094ef52d19812fd4eea5611f12a7e109b0986f SHA512 8584f8b6822642f5afdbe1fb9a1e77b32fa4eefebb473d6a501147d328ca38ecb2f88f4247a7ad06a8dfe3d9cc6695f60652dbc122237a17d097bae2f29a6a7e
-AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2446 BLAKE2B 5b1a5556829fbcd5d10ad869af5dcce4c6227dbc9d460094f237448a4aac9e07a9752039ab857a3556d062297cd0101e71ace0b4d3643f481e7479f16ccdf2e3 SHA512 f5171353ac14806166e26c4b335e6c7d9e111ba1eb68c3160fc9f802e1e3de659df48c4be180a0a25c67f7733007c8875c191436314ccfc9d7696a1f8a1fa719
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2452 BLAKE2B 96b3712ec2f01eecff986b6e7fa8f2844b194e4cf139c0195d87fc7bd7aa77734c1b603c23081179fcbc4699e3c887fbb8069e58a23c44d706d79233a5418a1e SHA512 c3c8e5d13f73257278323bc2bba97b3abf838af0c727dc77aa8ba76b16440354d8d450ac9f6b5ab89cac3b1f44cc883a3ef80f22cf4f3ddd7ade05ee06c59cbb
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch 505 BLAKE2B d92ab5c7604b9c04296ea82d3c5b093a900bb9345289539262e5d057bf21d003ce1fdfce7e6f57b8dad3cb62c3e604ada6e9bd596a3673afbbced338230ba638 SHA512 71bc5511bc0fcb9d55e893300066f7e755da5bad04f74e0ba103e622cac6ebf99d1fa7b1ca9f08d2b5169d305a4bee6a7782cb14304352ca108d126931851a5b
 AUX aegisub-9999-git.patch 1602 BLAKE2B ae40661da657c303eaaefc8b2d850e810ca506b60eb023bb34b6fe9839205dec15c7f781ab0e886f52e3c1d721338bf9bd9ec29814c65f236c8d5b99156a8a45 SHA512 7e4c1be034543b887b9ee6b84e686c2f1c26e6138a9aee997a0eab2dd5256a918c4ccfda41b0cc71a88fc0856f1726cee413e16fa4aef260faacb0803e01732d
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
index 7e3fac2acd81..3c6c108e1738 100644
--- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
@@ -26,8 +26,8 @@ index 8c30c1d..c5bf049 100644
 +GTEST_CPPFLAGS := -I$(GTEST_ROOT) -I$(GTEST_ROOT)/include
 +GTEST_LIBS := $(LIBS_PTHREAD)
 +else
-+GTEST_CPPFLAGS := $(shell pkg-config --cflags-only-I gtest)
-+GTEST_LIBS := $(shell pkg-config --libs gtest)
++GTEST_CPPFLAGS := $(shell ${PKG_CONFIG} --cflags-only-I gtest)
++GTEST_LIBS := $(shell ${PKG_CONFIG} --libs gtest)
 +endif
 +
 +GTEST_CXXFLAGS := $(CFLAGS_PTHREAD)
diff --git a/media-video/bbtools/Manifest b/media-video/bbtools/Manifest
index 2f882c11b880..864921338a4f 100644
--- a/media-video/bbtools/Manifest
+++ b/media-video/bbtools/Manifest
@@ -1,4 +1,4 @@
 AUX bbtools-1.9-gentoo.patch 2688 BLAKE2B 13203a771aef5d3ca2cff45aa0e61b95a1a2f7dd543f756d41b1701d40b6b855cbf8e9f4d3220a678c6685dd02213acf67894b1693a94c61e0e9c8dfb4c26183 SHA512 fb406f85ae4c4bcc46689ad92de47585d4b0b46a14f767e24c52bcc083253f4e80caf0b97d33ca1f14a43caa0f86f15aba7f6526f4bf2b00f0506c826aef0539
 DIST bbtool19_src.zip 68080 BLAKE2B b831d5fa2f6321df31f55970851049fd1e361dfcdc5f1f03617f5c3ffda547ef3b350c26cd6de83d463d93c13d0d37fd814d2f7598632fa4288612e55300a259 SHA512 7d22a3934e0b5a8fa228963989b20387b493a672026adcac1761256030f64681fdc936f15934bb7ecf019db43f3bdfbebbf94782534b21883c5c5c3674d073c7
-EBUILD bbtools-1.9.ebuild 814 BLAKE2B 136b86e19f71d67a9b502b41877fc117747cdd747ab9878308a06478080889cfb17d7e03a8bdf2a843713c93435b3607dc5e700feb21e99ec8124d6d37b90a71 SHA512 90c960fee4d512bbdfedb0fe2f968b14baaf8f09a951299dd2e38f9951779142957a8f48aaba4659c1a678173ab0f077671e544ac99ed6e58eaaac34fc7f6547
+EBUILD bbtools-1.9.ebuild 817 BLAKE2B 0c400a7356a18f8646e45ea561410cf1247497debfd2375b2d83b1291c1aa6352fae070681b78b51a4e73ef5668cb35061d5406b45cb196ac6d3ce3a48b94d3d SHA512 b35e9074bd3b613ded2d352cdf29f7cd5c4e680d20bf2f159abc4337729d943a954bd102ad8d805e0d58986bf0e2acea135752ae03ef3f90471a3c7b8da85b33
 MISC metadata.xml 554 BLAKE2B ed3c9c52f0e914b48bdae335870acfd84b25b9b7c06119234e665c4eb432037feb8b69980246e93ec3d6360c09f59051b87fb1953d1c88cbe8cd06896985bcff SHA512 ca7a79616518939ae835c8d2e327aadd7f7d48d9ab28af61ad61b7ab435b9384c285d45614f0ee10a0222fa556739b02cfe4ed0f78b9233a4007fbb8b41f0ad7
diff --git a/media-video/bbtools/bbtools-1.9.ebuild b/media-video/bbtools/bbtools-1.9.ebuild
index 392e8c0d3afe..c7e629784f22 100644
--- a/media-video/bbtools/bbtools-1.9.ebuild
+++ b/media-video/bbtools/bbtools-1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit edos2unix flag-o-matic toolchain-funcs
 
 DESCRIPTION="bbdmux, bbinfo, bbvinfo and bbainfo from Brent Beyeler"
 HOMEPAGE="http://members.cox.net/beyeler/bbmpeg.html"
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index a60bd7050950..c530a68133d7 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,8 +1,4 @@
-AUX cheese-3.34.0-buildfix.patch 736 BLAKE2B b99354dd49acb32201ddcdd104b0581e2a61248053017859ea2f0b20b2a66a4f5bfb5d5a26e458464b9a18ae0e8a8e7bfe801d2cc9758331a5a2ba28aad4a78c SHA512 0a6373485cd07398ac5dca0ed1431ee2ed7b174bb55ee45a839775cb229bfbb223897be2590e238487eb3971fde0d9bbc5c85194239e8ff03d84742f0071acff
-AUX cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch 6545 BLAKE2B 6bd549dc4a26dc4cd1f14b812d4910fb93b19e899a58c6c1e4cd713bc126c059d2f1d148f9e5d3581cf64a8c4f3ea938e684e85535d774fd8861bd87cd93df3c SHA512 6f8f66897252172b68508ded5996213e4660ec00b5172874e0b360ee1c60baf2e579f88998dd78c850d4eb6796a097f74646c28f923f7f11de9302f2dd8023b7
 AUX cheese-3.38.0-buildfix.patch 736 BLAKE2B 3118378b5b125ae6fe223d3b114e07805eb2b5d300bb78ec6b8ff3888f19a0b68af0091aa33918c885991a86293c5cc530d65a75d433cd7c5d343889e5740fbe SHA512 6633f5ebdb2662d199d3f44f49754c8e2c9cd2d864084bff079f4f4de9f20d15489f84ca3acba46df0c9af36920c57b1eca94748c097cb744f71669a69fada47
-DIST cheese-3.34.0.tar.xz 1077052 BLAKE2B 9719818aebb3472b804d96d79b02ee71b818d098b6eeb54f2075939e95ba651c251d561b4bc79c30a0aae6217a8a29f46f045be9279c9100ba1b0344f1279ba5 SHA512 093b4e5f7f15fd0c445fffd254d4a5035a4e3e91bacccdeeda64a4a7182901646daea5c8596c954a67896f9aaf37dab2309c21e8f026583f59d787a2c1e4c200
 DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae
-EBUILD cheese-3.34.0-r1.ebuild 2152 BLAKE2B 2104d16b5408457dc4e2c9ea3f48cbccb5e753383ebf20e89c662162a4028ac75c798ee3988816cef6467e71f01042a3778d40cf6a803cca75e574396702ee56 SHA512 d579bb91cedcc2e11c143b0fffeb1ed11b597c8644e08d25d19342ae3b1a5842710e672c76a5ec53cbed992ea51f4853de33d04f45fb305eb1d5f4e0dd331c46
-EBUILD cheese-3.38.0.ebuild 2095 BLAKE2B 8caa33b4191ab34ce9a7c7b0e5c9a54ec70c130fce2ace9c59e4b0e9c8b83ee800d111bb816b97eeae8d004d003846bcedf4e3ae23f7e09b4e2437e34e96cc10 SHA512 81a56fcfd18e2a39afb94dae8a6dffec3b88386d6dc1b54a712843be744012373a672a190cf60e11c137ffa9405a34b89a74d15474515aa666d71696226b14e6
+EBUILD cheese-3.38.0.ebuild 2120 BLAKE2B c28699d5912d6bcf91c9c95b02f00bb1e2c5c88964b67dd46681549eccc0570fe1cd55a3d21bacf5b557ba0bb4c4cd9ac1e4ecea4d13cd067577bca19abda7fa SHA512 5af98575aafab5be072e221cc54d4f317cca56fd1bb60a17c80b5811760d2f63c4140ffeecaa350677491737c2bc4bd66ffc2ca7d7d6be835b978246aad62b4b
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.34.0-r1.ebuild b/media-video/cheese/cheese-3.34.0-r1.ebuild
deleted file mode 100644
index fd904b0cdccd..000000000000
--- a/media-video/cheese/cheese-3.34.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson vala virtualx xdg
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # subslot = libcheese soname version
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="gtk-doc +introspection test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=media-libs/clutter-1.13.2:1.0[introspection?]
-	media-libs/clutter-gst:3.0
-	>=media-libs/clutter-gtk-0.91.8:1.0
-	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-	>=dev-libs/glib-2.39.90:2
-	>=gnome-base/gnome-desktop-2.91.6:3=
-	>=media-libs/gstreamer-1.4:1.0[introspection?]
-	>=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis]
-	>=media-libs/gst-plugins-bad-1.4:1.0
-	>=x11-libs/gtk+-3.13.4:3
-	>=media-libs/libcanberra-0.26[gtk3]
-	x11-libs/libX11
-	sys-apps/dbus
-	media-video/gnome-video-effects
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-
-	media-libs/cogl:1.0=[introspection?]
-
-"
-RDEPEND="${DEPEND}
-	>=media-libs/gst-plugins-good-1.4:1.0
-
-	>=media-plugins/gst-plugins-jpeg-1.4:1.0
-	>=media-plugins/gst-plugins-v4l2-1.4:1.0
-	>=media-plugins/gst-plugins-vpx-1.4:1.0
-"
-
-BDEPEND="
-	gtk-doc? ( dev-util/gtk-doc )
-	dev-libs/libxslt
-	app-text/docbook-xml-dtd:4.3
-	dev-util/itstool
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( x11-libs/libXtst )
-	$(vala_depend)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-buildfix.patch
-	"${FILESDIR}"/${P}-help-No-more-menu-bars-in-3.34-UI.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use test tests)
-		-Dman=true
-	)
-
-	meson_src_configure
-
-	# Hack: version.xml is not generated if gtk-doc is not enabled
-	echo ${PV} > docs/reference/version.xml
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-video/cheese/cheese-3.38.0.ebuild b/media-video/cheese/cheese-3.38.0.ebuild
index c12f4984c2fb..1044f8b7f629 100644
--- a/media-video/cheese/cheese-3.38.0.ebuild
+++ b/media-video/cheese/cheese-3.38.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+VALA_MAX_API_VERSION="0.50"
 
 inherit gnome.org gnome2-utils meson vala virtualx xdg
 
@@ -10,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-video/cheese/files/cheese-3.34.0-buildfix.patch b/media-video/cheese/files/cheese-3.34.0-buildfix.patch
deleted file mode 100644
index 8e2ac282481c..000000000000
--- a/media-video/cheese/files/cheese-3.34.0-buildfix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a4775d44..9d1e5587 100644
---- a/meson.build
-+++ b/meson.build
-@@ -149,11 +149,7 @@ gnome_video_effects_dep = dependency(
- # Recommend some runtime GStreamer plugins.
- gst_inspect = find_program('gst-inspect-1.0', required: false)
- if gst_inspect.found()
--  foreach plugin: ['camerabin', 'vp8enc', 'webmmux']
--    if run_command(gst_inspect, plugin).returncode() != 0
--      warning(plugin + ' was not found. It needs to be installed before Cheese is run')
--    endif
--  endforeach
-+  warning('unable to check for runtime GStreamer plugin dependencies due to Gentoo\'s sandbox: camerabin, vp8enc, webmmux')
- else
-   warning('unable to check for runtime GStreamer plugin dependencies')
- endif
diff --git a/media-video/cheese/files/cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch b/media-video/cheese/files/cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch
deleted file mode 100644
index b19c8fa30d5e..000000000000
--- a/media-video/cheese/files/cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 9a9e47a3d3e910805bd7c9c1763c66400181f677 Mon Sep 17 00:00:00 2001
-From: Andre Klapper <a9016009@gmx.de>
-Date: Sun, 5 Jan 2020 23:35:37 +0100
-Subject: [PATCH] help: No more menu bars in 3.34 UI
-
----
- help/C/burst-mode.page            | 5 +++--
- help/C/pref-countdown.page        | 6 ++++--
- help/C/pref-flash.page            | 5 +++--
- help/C/pref-fullscreen.page       | 6 ++++--
- help/C/pref-image-properties.page | 5 +++--
- help/C/pref-resolution.page       | 6 ++++--
- 6 files changed, 21 insertions(+), 12 deletions(-)
-
-diff --git a/help/C/burst-mode.page b/help/C/burst-mode.page
-index a14d3ab8..0a587ca1 100644
---- a/help/C/burst-mode.page
-+++ b/help/C/burst-mode.page
-@@ -9,6 +9,7 @@
-     <revision pkgversion="3.1" date="2011-09-05" status="review"/>
-     <revision pkgversion="3.8" date="2013-04-19" status="review"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="review"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="review"/>
- 
-     <credit type="author copyright">
-       <name>Julita Inca</name>
-@@ -59,8 +60,8 @@
- 
-   <steps>
-     <item>
--      <p>Select
--      <guiseq><gui style="menu">Cheese</gui><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>.</p>
-+      <p>Press the menu button in the top-right corner of the window and select
-+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>.</p>
-     </item>
-     <item>
-       <p>Edit the preference settings:</p>
-diff --git a/help/C/pref-countdown.page b/help/C/pref-countdown.page
-index 9077d7a0..8f4b0292 100644
---- a/help/C/pref-countdown.page
-+++ b/help/C/pref-countdown.page
-@@ -9,6 +9,7 @@
-     <revision pkgversion="3.1" date="2011-09-19" status="review"/>
-     <revision pkgversion="3.8" date="2013-04-15" status="review"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="final"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="final"/>
- 
-     <credit type="author copyright">
-       <name>Julita Inca</name>
-@@ -28,8 +29,9 @@
-   <title>Disable the <gui>Countdown</gui></title>
- 
-   <p>By default, <app>Cheese</app> counts down from three before taking a
--  photo. You can disable this feature by selecting
--  <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Capture</gui></guiseq>
-+  photo. You can disable this feature by pressing the menu button in the
-+  top-right corner of the window, selecting
-+  <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>,
-   and unchecking <gui>Countdown</gui>.</p>
- 
- </page>
-diff --git a/help/C/pref-flash.page b/help/C/pref-flash.page
-index b6ccd736..52897d2f 100644
---- a/help/C/pref-flash.page
-+++ b/help/C/pref-flash.page
-@@ -9,6 +9,7 @@
-     <revision pkgversion="3.1" date="2011-09-19" status="review"/>
-     <revision pkgversion="3.8" date="2013-04-15" status="review"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="final"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="final"/>
- 
-     <credit type="author copyright">
-       <name>Julita Inca</name>
-@@ -30,8 +31,8 @@
-   <p>When you take a photo with Cheese, the computer screen briefly turns
-   white.</p>
- 
--  <p>To disable this feature, select
--  <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Capture</gui></guiseq>
-+  <p>To disable this feature, press the menu button in the top-right corner of the window, select
-+  <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>,
-   and uncheck <gui>Fire flash</gui>.</p>
- 
- </page>
-diff --git a/help/C/pref-fullscreen.page b/help/C/pref-fullscreen.page
-index a90baaad..7e79f374 100644
---- a/help/C/pref-fullscreen.page
-+++ b/help/C/pref-fullscreen.page
-@@ -7,6 +7,7 @@
-     <link type="guide" xref="index#preferences"/>
-     <revision pkgversion="3.6" date="2012-05-09" status="stub"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="review"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="review"/>
- 
-     <credit type="author">
-       <name>Ekaterina Gerasimova</name>
-@@ -23,10 +24,11 @@
-   <p>To enable or disable the fullscreen mode:</p>
- 
-   <steps>
--    <item><p>Select <guiseq><gui>Cheese</gui><gui>Fullscreen</gui></guiseq></p></item>
-+    <item><p>Press the menu button in the top-right corner of the window and select
-+      <gui style="menuitem">Fullscreen</gui>.</p></item>
-   </steps>
- 
--  <p>If you cannot see the <gui style="menu">Cheese</gui> menu in fullscreen
-+  <p>If you cannot see the menu button in fullscreen
-   mode, move your mouse or tap your touchscreen.</p>
- 
-   <note style="tip">
-diff --git a/help/C/pref-image-properties.page b/help/C/pref-image-properties.page
-index eea2c0e3..7d812596 100644
---- a/help/C/pref-image-properties.page
-+++ b/help/C/pref-image-properties.page
-@@ -10,6 +10,7 @@
-     <revision pkgversion="3.1" date="2011-09-05" status="review"/>
-     <revision pkgversion="3.8" date="2013-04-15" status="review"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="review"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="review"/>
- 
-     <credit type="author copyright">
-       <name>Julita Inca</name>
-@@ -33,8 +34,8 @@
- 
-   <steps>
-     <item>
--      <p>Select
--      <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Image</gui></guiseq>.</p>
-+      <p>Press the menu button in the top-right corner of the window and select
-+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Image</gui></guiseq>.</p>
-     </item>
-     <item>
-       <p>Move the sliders to find the best settings for your webcam.</p>
-diff --git a/help/C/pref-resolution.page b/help/C/pref-resolution.page
-index a620a4ba..42846841 100644
---- a/help/C/pref-resolution.page
-+++ b/help/C/pref-resolution.page
-@@ -8,6 +8,7 @@
-     <revision pkgversion="3.0" date="2011-08-25" status="candidate"/>
-     <revision pkgversion="3.1" date="2011-09-05" status="review"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="candidate"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="candidate"/>
- 
-     <credit type="author copyright">
-       <name>Julita Inca</name>
-@@ -38,8 +39,9 @@
- 
-   <steps>
-     <item>
--      <p>Select
--      <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Webcam</gui></guiseq>.</p>
-+      <p>Press the menu button in the top-right corner of the window and select
-+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Webcam</gui></guiseq>.</p>
-+
-     </item>
-     <item>
-       <p>Choose a different resolution from the drop-down list. Some webcams
--- 
-2.24.1
-
diff --git a/media-video/cpvts/Manifest b/media-video/cpvts/Manifest
index 4e233a13a1b8..df25ecc1d433 100644
--- a/media-video/cpvts/Manifest
+++ b/media-video/cpvts/Manifest
@@ -1,4 +1,4 @@
 AUX cpvts-1.2-dvdread.patch 315 BLAKE2B 285fc22c4680137b57f6f3be5121dc03aa2c363b66179290b31a14a5b026a643ecd376d2458db62def2e85aeb6036b4136d05114d21ac0e497fd7026e9189b88 SHA512 418166b513ddd766b125bf20ff0381c2915497b9946c00942f005ef96f95418eb524f0e9316b324b4635dbeaf03d6a8e55a0f77657748f5f002c696119d4dc00
 DIST cpvts-1.2.tgz 4200 BLAKE2B 18a57a794b90d05d9bfb0694754609cc16f5e7647a75402a0a822cd4547d2da0843f846041377a60cc55c3a1f5b28a333bfa3d8a4f77b35d17b1873674b02c12 SHA512 59314f2b49e7f82d2994aa6725fcc8431ffb72aa2ae83d67cbef008d850890a61322756c1d644e28760e332bcbe17ce9ad8b05c10fe9f30fe997933281e2f06f
-EBUILD cpvts-1.2-r1.ebuild 679 BLAKE2B 77f47df0938a5214a08fe958805af9274143d33fc7deb0eed9abc829cfbeb7c5cb35ed13cef055093e0a056b91864af406cd8ea363fe75d97a114159085175e0 SHA512 21a0ca44f61f3570d54abfac552f430a58b418a75a145d6167c5ad03da9ce472b59e7b6f7fc6ff32378d6326843c1764a3b8dd7583f1c344f15eaada24ed3d3d
+EBUILD cpvts-1.2-r1.ebuild 672 BLAKE2B 0d28db00703b2db22f72b0633bdc2b69b7bcb89b957ce8dc606aa4f8cbbc2fc3c28461988dac4af25f276557c7334f5e1aa016683f2e3a86c8eef53b4acd7434 SHA512 b4c6ab251c314119d38e11505e3c3a1beb62baa03daf430ccc56b63e8c9e1e96c34db7855dbbd20a33aeeea6e3dea52330fe480cadfa94cd46c1edc64b24c0b0
 MISC metadata.xml 227 BLAKE2B 129a977f3a470f0774cb25c7d9d67968f807b5bbba6b1d1b1d0155e288555355796826ce187abf95a06ee0a448e08e9c5ec34ee79d9895bf2718b47ff0d9bfe8 SHA512 d39fc0676c06bf09884fa817e0d5dc386a536d5626a9c2cf34ddb8b7e29d612ecb2c617214788ffe729c5118c632c119e03ce6d38f17114c48c090c82a2ec2e5
diff --git a/media-video/cpvts/cpvts-1.2-r1.ebuild b/media-video/cpvts/cpvts-1.2-r1.ebuild
index d23ea9ae6ddf..b8d8ced70e88 100644
--- a/media-video/cpvts/cpvts-1.2-r1.ebuild
+++ b/media-video/cpvts/cpvts-1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 IUSE=""
 
diff --git a/media-video/dvbsnoop/Manifest b/media-video/dvbsnoop/Manifest
index f8dfa560c9be..39b5b4c8a854 100644
--- a/media-video/dvbsnoop/Manifest
+++ b/media-video/dvbsnoop/Manifest
@@ -1,4 +1,4 @@
 AUX dvbsnoop-1.4.50-crc32.patch 2031 BLAKE2B c8255a57e2b27a4297cfe50ea813558d51c4eddefd747d00469d5e1c216dba28ee54b8c2c959703b616f66c6e0e171f885f8adce9f6c7d66ffbf4fe6d0096849 SHA512 29b0b0b4814680840df4ff5e9b480b939b2ed916357ae6cfaec26bf8275f2d1ab700b2d550384f437650932f2b1e98690afc470bb01e537ac4f556d15651d7a1
 DIST dvbsnoop-1.4.50.tar.gz 333992 BLAKE2B edd860feedbdc6457c9b55707fcdeaf2918e2fd96cad511967bf6909bc4f64a71697697f39f7ace314030308c4ded17a018fdb597de506c51b9b0a12f56f25ea SHA512 288b98e9205b9ee6638b65cd0d7c463c2c243c1f7e650a6df8592acd3f40eca3352a563cc8a1a04f0f2731b3718e6dc3d09f56f59da4b59fbe25b86acf434f81
-EBUILD dvbsnoop-1.4.50-r1.ebuild 520 BLAKE2B c58a810c2b7a2bfdb367ada72b83e7aecc71cf8630e8142b2e940c7cc86b02e496e5f177363fcfd2c4bc9c9bf5f467b72691ca013dff1407c8b4509fb6aadbe4 SHA512 e040fa998ad28b3d3392a22a7f92ad20132800c1b6402becaf659f6025c0e9493c56e0fee17c6bb43511985da28a3b8f88694243ef2b15adaefbeff9ea474191
+EBUILD dvbsnoop-1.4.50-r1.ebuild 520 BLAKE2B 19df4e3d8c45129437c0e0082420ff6661c4e8da69f5ec56b817b186c579e94259b47c11ca448e178dfaacfc111847650d718aceb61f9fea3acfe2bf023af247 SHA512 df0cef7049956243ac9c44f2abe0146199f5b2b0f1c6f11824931e5904a05787f1ed88511c1201cc09f1348697e8aea25cb55ec4c4d87199f55d49e67083e676
 MISC metadata.xml 245 BLAKE2B af5332ff76105b86622c00a07d180449fa4aef354bbbfe782338fd515fce4b329fb3e6cbdf90c08dd4e0b97b21033817d74bc47fba703235fe2ff703214480b5 SHA512 0b34b35bb16bcc796c549cb5b35da06ff468bcab0d1ea72eb9fd50c36fa44a5b0cb6e9db38b5a8007b0a3fd45c97a9a25bb9858f5d9ed12bda54a406380a1ec1
diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild
index 083e789518de..e8982ef10084 100644
--- a/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild
+++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit epatch
 
 DESCRIPTION="DVB/MPEG stream analyzer program"
 SRC_URI="mirror://sourceforge/dvbsnoop/${P}.tar.gz"
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index 23996f2342b3..c1eeb6b35b4f 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -3,6 +3,6 @@ AUX dvdauthor-0.7.2-imagemagick7.patch 2076 BLAKE2B 121de0091628c1e95adb5c742b54
 AUX dvdauthor-freetype_pkgconfig.patch 1283 BLAKE2B 5802cc6e00b14748ff1de8ba528c6cd1318fdae44c4ad22659dfd101058af27ae95b7ad854232b7ebc2b8997b782b50c493fbc8056f037c6abf6ac9f537b5f1b SHA512 cd60b6dfc8629f8320c93e42f1a86377a377f8c8e6fbc49b8c3bc3171ed3a762e047ce8c935c2ce66ba7e55908333d1862bbf1c56c08bc956678628a4be3e114
 DIST dvdauthor-0.7.1.tar.gz 421324 BLAKE2B 34d7f20cc7f8a5f8ea10cfd1404a15b04e909a343e008da18035f6bf78de7b4f16729b3c2ba5ebedd7bd12e72a801874d99d5c1e6f7458a311501e07afc11788 SHA512 0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9
 DIST dvdauthor-0.7.2.tar.gz 648305 BLAKE2B e3c918e101be1627b32d19a4ba17e676593ce260c72c4a1126acc691d9dec484e3d70817abfa1f1542d5a29d603ecbd9226e305caadd77abfb1278125f7d6c64 SHA512 202b8bba38939d122dc864921a57e89906ca99ddabf44e3b07419cc42cc052567cd892b41f1171c9c195c9a770758e9319a942ea64d14ee8fa847588c7761125
-EBUILD dvdauthor-0.7.1-r1.ebuild 1179 BLAKE2B e812e3d0702e464680c98ed47a6216250ed449e7e884993339b2bbd9ef1ab50c1e21464cead9cd54b0b18872931a7d99e170ca676976884b96d727ceb71ec669 SHA512 5b32d4c47c63cf0fc42be1b50d6175a18ab61f629bc731fb965c441b0f99dc7e4f2bef6646afac2dfa751cd4bf72d5a1ac6149bafa83274f472ae427cbae72b0
-EBUILD dvdauthor-0.7.2-r2.ebuild 1352 BLAKE2B 8b75852cc4c245eefa5ba6bf4c21d17d76c04ab6a1f860e7a0f0021e71bdca5e7dac559e6c9b6370af5fb04227507b58d4f6ab4df35bf1c49fa05f060d5a5cf3 SHA512 5d238243b2ad1f8ee8290930679e06e9739de2478a725595001e3f17e78c31815fc170384195b1ee7d59df93d75c5e6ac44d9f6d2882166f72aad231cd7924c3
+EBUILD dvdauthor-0.7.1-r1.ebuild 1169 BLAKE2B 8ac8a9ef349484a0e8475e4710d05c8b39719f2f79f48686cfa05398fff5956eaf4bc596ec209f5dde88b2a6b2b43eca1d501d802f87fb258aa182dcc139e056 SHA512 472ef4197490a72fee192b6e1bc09a13cc00851b95d1db723b4898a0bb2c05d3bd4b0dd74aec88e36d7ad03e7bf24bfe1b3ccdb8c5c880414058c5de999c3be2
+EBUILD dvdauthor-0.7.2-r2.ebuild 1342 BLAKE2B aec77233d8ddfaecb3c1bd5b3d2f18c77fb6c8921aef456e1ae5be49a343b24a32252fd070cddd1a74b9ac05e8a779e9ccba025896da42f4dd8dfa1e2f7303ff SHA512 3b3945ccca66ead6f3b9809c53e1fe6cad17f3bcb5a71c88500c09ad35fbbc006de9c0693326184fea5245eb8f418bba96d6f0ac40db800c713d613e88903ec0
 MISC metadata.xml 310 BLAKE2B 98950538160adf1178a053c79da3802c04ef0ae8c45436df86f5da69c4ad200e38b971134dfc4d94c90f061502247a45d39d319b6bff1ec3f4e3cd3a9c432ac5 SHA512 e9f2f78be647d48778accbf7da1d1b925dd8c441fa07743c776eee3362bf75f57a7051a7805ad1b2ab76a5958a18ae1b889ccb006da66d3197fefb0498e1f0c4
diff --git a/media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild b/media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild
index 838735e5b1f2..ec4f4b64bb34 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
 HOMEPAGE="http://dvdauthor.sourceforge.net/"
diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
index e7b36f67d408..f62b1cd090ac 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
 HOMEPAGE="http://dvdauthor.sourceforge.net/"
diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
index 45931c4fb06c..88bfa3132eb8 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,4 +1,4 @@
 AUX dvdrip-0.98.11-fix_parallel_make.patch 880 BLAKE2B 3011cc4503bedfd056f6c587d65cf6bdd42d481f09f5c3644d8337ea11053fb6b91a0d88112385969c3592c8407294b8d1c661701e2b4f27ef4339e096125c80 SHA512 0fabe81659cb510357381d99ae8eea73a6a986e7c646dfd6b0fb7d38920a8b7cf9e79cb40a3606cb88a97f7ff9250d5e64aefb0fa599b9d9e6ae4ce91e692fb9
 DIST dvdrip-0.98.11.tar.gz 2075302 BLAKE2B 875ea2d9ee679657b7bebce10ecf037a2467f7e61a8ae8f9417bbb93115368d439e1347b8e0f9c9aae88e8e6d0886ac7dc9b5650420618231550994cca0b65ff SHA512 8bb2e4cb72666ac3f7d1953e02ac868070503f00b05ea39b4961f54042088d07abd4ef020a9cefec11e96e965d84dd95d00288e7562d92551f480ccba88b9dce
-EBUILD dvdrip-0.98.11-r4.ebuild 1994 BLAKE2B 88b897b6d13b4e42f76ecb503d59694cfadf9b13e1c61281c06de9d5c79aca4ed3fa694a8a33bd9705398ebb25a06e0007348ae5629bd9b9f061d7570ef7ce1a SHA512 59dc2744f1484a9b35e7547b38e4d4384566884416e47252a2240caf5f2664fcc59e6a4b9e5be94200eee18ba50fa383050f5a96704f595418cb60510430e486
+EBUILD dvdrip-0.98.11-r4.ebuild 1994 BLAKE2B fa6944e5480ffdade034941f2a5cc5c4192e296e73b7affd2857dff384b75d042fd7e97f6ce241e31d23bf679941d2c4a805a575bf55fa28d9f2dbec4c3ee104 SHA512 13e1948af8f392c12e5ca7abf8aa0a8e79ff45ceb52921e78cec58d2f92cffeaf454bf31605241275a703501962ae53c39341ada173af572afdd5dbd27329609
 MISC metadata.xml 389 BLAKE2B 85a367f916a737f8a0010c54746610a34408c68919ce3d8b6728203597cdd1d155839c20e50de6565844c63d27f9e7305aba8d5ec1bb6b7e82384e577c2657c7 SHA512 f9762a6801b0f060cff8b36f328729aa20c71ec34fa33be7c6088e20004d3b42ac4d45b60c82774d7519b6be09b76aa9ea06b18fa252300b47fada916620ecfd
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
index e26b6462724b..31a52bda60c5 100644
--- a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils flag-o-matic perl-module
+inherit epatch flag-o-matic perl-module
 
 DESCRIPTION="dvd::rip is a graphical frontend for transcode"
 HOMEPAGE="https://www.exit1.org/dvdrip/"
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index b91b9550f835..69868496376b 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,4 +1,4 @@
 AUX ffmpeg4.patch 541 BLAKE2B ff2ad556e881009ff5ba79b252fd55eb9054ea273f20d4af1bd76440b70d351b03f204ad1ff7648694cab950c49082728b6370a93610dd40c09c10a8609ae5bd SHA512 3ad427f51e5ab24231309f01d410e213df874d01567417ea66bcb88cd39e60d672b4771d8c3f210690eb6d145f3d6f7ff81bca8e1b9c841fb2b895f63070ed11
 DIST DVDStyler-3.0.4.tar.bz2 8870498 BLAKE2B c1ec7651d90613cebbd8d4e62b4626b8a7e2069eadc07bfe9a91e51bf33638135ca975f4857242b3f9ff34606a4e6084200059c82ebc3aa146f446f9b77483ae SHA512 2747e6a494d331b6f35405d7d2ed47789f4452bb3d4e86b0c68cf0fafffb4e6de452b28fac0e9995c312017c7e4e8a3f89ad42bf0a0c99ce19c5d6c0ca6e351a
-EBUILD dvdstyler-3.0.4.ebuild 1713 BLAKE2B 58af318ed962ecbde9aa69ee0e52340d3235633a302eec9889eb72005b6b6e28994fc8e1739abcf410f42116d16e2dece0a1ddbbd188d3fef60fcbd40e311d8f SHA512 0d6cb6784398df0bfee6b22b8ae535b543304900042a3e33151f2b3512e7c976c967e122bedf147f5e2501d2eb60dc238973601551e70b8599e6d35d10df8853
+EBUILD dvdstyler-3.0.4.ebuild 1661 BLAKE2B 4046cb106b79f8ae7b20668cae1dd0204700fbef3ee119bca1c16346d238a0482981e08219e18467e9e5d81d2052564cea1f7c4089989853528d1afd94c8c7a2 SHA512 9dde872a63b2ad3cbe8c5c04b20207239dac4782b5f9fd50f9071d8085a0dfbea2fd8d0e8aa5cd150e5b8203e3edb6b95fb3cce0c6db729407a195294a5d8702
 MISC metadata.xml 302 BLAKE2B 2e58ce53fb249f7e8c837a58561ac4724b7ca19ae8002465e2c98da67674103bfc4d949cebabc8fb11e313d2eda33a476482e253fb8d3d55bc00b79f3c63e633 SHA512 ebc7b7d7e9d24c31f2e6f3cd811dbf7b36e142974cb909bace0929882230be34552aca8741e471374e62ffed749675440d2ee9b723bfd774a1c503d2a5bd40c2
diff --git a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
index f34dcb86924f..fc6e67168465 100644
--- a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
+++ b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${P/dvds/DVDS}
 WX_GTK_VER=3.0
 
-inherit wxwidgets eutils
+inherit wxwidgets
 
 DESCRIPTION="A cross-platform free DVD authoring application"
-HOMEPAGE="http://www.dvdstyler.org/"
+HOMEPAGE="https://www.dvdstyler.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +udev"
 
-COMMON_DEPEND="
+DEPEND="
 	app-cdr/cdrtools
 	>=app-cdr/dvd+rw-tools-7.1
 	media-libs/libexif:=
@@ -28,26 +29,22 @@ COMMON_DEPEND="
 	virtual/jpeg:0
 	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
 	sys-apps/dbus
-	udev? ( >=virtual/libudev-215:= )
-"
-RDEPEND="${COMMON_DEPEND}
+	udev? ( >=virtual/libudev-215:= )"
+RDEPEND="${DEPEND}
 	>=app-cdr/dvdisaster-0.72.4
-	media-video/mjpegtools
-"
-DEPEND="${COMMON_DEPEND}
+	media-video/mjpegtools"
+BDEPEND="
 	app-arch/zip
 	app-text/xmlto
 	sys-devel/gettext
 	virtual/yacc
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/ffmpeg4.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}/ffmpeg4.patch"
+	default
 
-	need-wxwidgets unicode
 	# disable obsolete GNOME 2.x libraries wrt #508854
 	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
 	# rmdir: failed to remove `tempfoobar': Directory not empty
@@ -61,13 +58,13 @@ src_prepare() {
 }
 
 src_configure() {
+	setup-wxwidgets unicode
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		$(use_enable debug) \
-		--with-wx-config=${WX_CONFIG}
+		--with-wx-config="${WX_CONFIG}"
 }
 
 src_install() {
 	default
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
+	rm "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} || die
 }
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 9427b1081341..1b165789d7cf 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,8 +1,9 @@
 DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348 SHA512 958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
 DIST ffdiaporama-2.2-ffmpeg-4.0.patch 6648 BLAKE2B 1efaecf9dc6180539bc01a6e4f1403864ea2f9318cc1528aac0bb339d840e3eec40ddc60a531d8af52aae5592c38bbcad9d8dd260cedbe01ab655e2135766e6b SHA512 9588352af7b048ade3b681364a4edc29526241b0631e39314b9466f490d66a4e3b795f4c32afd0aadc2a3d63a9ce4e99a6bb77e4c3f79d959e68e82856882d32
+DIST ffdiaporama-2.2-ffmpeg-4.4.patch 1034 BLAKE2B f6105f5fc9d928c43fc33d2eb154d97843516f42754154690ca1651c90f9cce21ce03a80ca2fd0440611f30463077a67cccc9d2103d6ffecde80f7ca5ba48142 SHA512 14c2c8361836a0f95224577710b72d48fe9aa5c9a330777b8cb709a1ad02f95d9b8ba0f22ff9250e0a6898cfd8f6839658a94f59082d2da767299a81a38e9f8a
 DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9 SHA512 f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
 DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
 DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5
-EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2009 BLAKE2B d9ce1ed905ce9dc958c0ffd2842d2b446458775845500a7e52c6b9da8c41048b5507cf8f29dbed00c1339f0d3bf1e21bea17ec7eaf3792d89768faeaa215d852 SHA512 1b4a552c18c4d64a794e3376457bb529265cb7344b4f82b400fce80cb3f4c7b20bbcfa92207ae0a76d3e59f8d0fa0769c626a88042c6af2222918e46a50591a3
+EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2202 BLAKE2B 02c10b37be6a97785ddc840f3fdfca53a87b912f87088502c652b22e78dd7874c89730a80a34550d9e3eeb85ca5bcf7633a6027c910c9b749aaecd58c8085450 SHA512 92b1a53ad3a35127155c88f7ee72981f883e8de5b56c2f8329cefd53c9b510f28ebc4ad7ef7c654637711f1dbaabad59c32347cab20e383f678324af00697e8e
 MISC metadata.xml 2286 BLAKE2B d731cd148e5f11d3128b94f0b1c7b08575bba8904d41a4a1ce92948f52a68bc5c6274cd707dc70bc071897e320bbf0c75bb5fabcdfd66575a8bd518309b43236 SHA512 97829259b665317f51cee00190c341765d0fc4fad72af7ce3e652a661bb6e79cc09d4eb85402d43e2ea51b29bdc2c9e60b650e249a1603d9af8d0cf41a68cc28
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
index 18f8f9737310..f32094e39d46 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.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
@@ -13,9 +13,10 @@ DESCRIPTION="Movie creator from photos and video clips"
 HOMEPAGE="https://ffdiaporama.tuxfamily.org"
 SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
 	https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-4.0.patch
+	https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-libav11.patch
+	https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-ffmpeg-3.0.patch
+	https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-ffmpeg-4.0.patch
+	https://raw.githubusercontent.com/laurantino/gentoo-dist/master/ffdiaporama-2.2-ffmpeg-4.4.patch
 	texturemate? ( https://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz )"
 
 LICENSE="GPL-2 texturemate? ( CC-BY-3.0 )"
@@ -40,7 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( authors.txt )
-PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11,ffmpeg-4.0}.patch )
+PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11,ffmpeg-4.0,ffmpeg-4.4}.patch )
 
 S="${WORKDIR}/ffDiaporama"
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 0cdbd282bd16..dacf1a9e9e42 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,8 +7,10 @@ DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917
 DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876bd1001ad185384fcabb3d0ae196c9ba591e680823b3c7b6e0ef9a0a9e9575a8b08439fdd89ef0e4dabb9d4a7f4e6 SHA512 5c74e3fe77ddf8ffede0e4692d574858dd0626e542380a819ab79c0f669c6c1329ffbccb872502f60306e561f10aa8bc1e61d09b2bea829870fe4a48b76460c6
 DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
 DIST ffmpeg-4.3.2.tar.bz2 11307134 BLAKE2B 97e1e598e4abe397b06298d545c3073ea2303e11c01e98343fe09d99174e02ca94f52c4df0d389fbefe7814686221446d30f107092f00cb0b69275c8747d6f32 SHA512 ec5566f8684f0ceb18184d59786ea1fc166ab28c46260ebcca5b919ad53137ba7317fd0c537e97df28553572a0d5e42c558773c808cf76995d67985aec2d6d4d
-EBUILD ffmpeg-4.2.4.ebuild 18169 BLAKE2B b771bf50bfce5c754963f431f085c29b962bed73e55e805e112986281abf025cf7723e8cdc5f15829d06424aadbc6899c644f5e4ca56a2a113920a13c5c8b13b SHA512 b26527dc7e5c46dbe8b958efd4d5ebd51d91e258c2a6b23d1d9c9fcc4ddbbe72f1ad9751b8dd9273ebd0840003db83db16babc15ca844e33df2a06ac16add793
-EBUILD ffmpeg-4.3.1.ebuild 18273 BLAKE2B eb5dc1bd75ed130f327d5e8c87b7124f43fcc6d1a6120ac3a19e8921d4364553afcd60d615f5cca1ad12321288306107486edcc57f300941af3a66e156a09969 SHA512 bab445d72698e907dd3d11b48bd1d86875d7f1f2db576a03f14623def6435569ac1e28052af4d7d464747a0067d26d6ae116766de707bb8d4f6a630b0b8377d4
-EBUILD ffmpeg-4.3.2.ebuild 18257 BLAKE2B 377d01553516cc83a4956bd61e6dad31b840d8eaa77ffd7ab099af4a77ee53ec47bfdccc20adeac725df3c62ca43fa76304c23dae1754cd6408f7d75fd7c35e2 SHA512 78421a506447e4e925fe714d6f722aa046115035d16db0a1d733d1ab0ff0c6916067c8abea90d07a14c744961c560b37cc4f1ca38775bd78a0919b82dabe4a98
-EBUILD ffmpeg-9999.ebuild 18155 BLAKE2B ed9677f8769e9484bf50b574daf2a7d9dd484365cb3e76402d07dce664f7ae5e484e536cf51e11660b98b8c3e126ce0ec9ea3ccea53301f5fd8b88ac2ef9edb8 SHA512 7fab11bbbaee5338cc480234bc7d16c3d9e170d33a00b8ca4a3b3a1cc71783739d6652aedcd08b7e8bdce1799a1137664d2f189f0b8e5cd2441213d6bdbeff23
+DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd21758e02c7a8d66a745ced2d1bbef4aa9c18c9b7cefef004b5ffa3fc859e2a2474c957bdf9ff27e82cec72ed4a5bf SHA512 212c330f477e9452b9d7873d6d3c452a5c946b6b9c17b01d94c60fda66e61e53b78388ef7686b8d9415a27cd3e05d5f0d6639a02a22467dbf1ed483b5594c80f
+EBUILD ffmpeg-4.2.4.ebuild 18162 BLAKE2B 3c16fcbcff2bbdf380b3ef786a37e34b475fd54fc136ea56b1273b3b9f765401d444206b2967d4307cd4ba83a7e2a7c015c30c32f56ce723a109370871914c73 SHA512 6f5b0dbe93a192ad93e5990a1958bb1e63d9d800a3af0b031c6f1e3732573084e4a0686c569be9046471d124bce240c90cde5c637f21aa9f28b138add94d85cb
+EBUILD ffmpeg-4.3.1.ebuild 18266 BLAKE2B 8eceb23ee9c3953ad01330b1d736c6d2ee58065abafadc37ae7c3592557263713a866c094c1a0efa82000dc280551217f0c3087d089a9fbf0fb2ab4e28e8fce7 SHA512 a1efda5a267ebdb8aa535e43c1eb82e6cac4b41b052b577f3dca5e8726da5836fad313a1761ee78540ca2a46a46f1b8590eec243f55c7778f438f21293231e54
+EBUILD ffmpeg-4.3.2.ebuild 18249 BLAKE2B 24459ebf7a336ef4fdcf240497363ec7e99ddc4e3966801695631bc28e7041aa82dbe5d3d9f548e5c697d91a4579dd542456fa9b5b60c17eab7579374112b673 SHA512 e6d1d863267a17df6e6f822ad5937e4e9bb4051ea2ea997df552ff5664deb5db53f871b2fafeec511e055f758e547b70ebc1f8872ba9cba9a4de199c3f11fd4f
+EBUILD ffmpeg-4.4.ebuild 18154 BLAKE2B bf9cd45489ee505ff425122d8b0e1e61f485dc5f6f4c0724d0750581769e5d0c29c412a1993370d8e02a0119b07d86285e28748a11e955646a8e45f3d3af6c16 SHA512 71ecb0f7a7c2c0dd8ba26793035fc436a5a40f09ac2707015aa2ae6eee6018ccefa41620b0beab9d0a581ef73e14f97ec33d0024321ec90518f13ab4d7aa5c69
+EBUILD ffmpeg-9999.ebuild 18154 BLAKE2B bf9cd45489ee505ff425122d8b0e1e61f485dc5f6f4c0724d0750581769e5d0c29c412a1993370d8e02a0119b07d86285e28748a11e955646a8e45f3d3af6c16 SHA512 71ecb0f7a7c2c0dd8ba26793035fc436a5a40f09ac2707015aa2ae6eee6018ccefa41620b0beab9d0a581ef73e14f97ec33d0024321ec90518f13ab4d7aa5c69
 MISC metadata.xml 5955 BLAKE2B 59329980a1e72c3899f09ddc2ac217aed5c540e91c1f1e0636ac2f84986e20ea7cdd0e07c9e350aed664933a4b02cfed2001bcd1e47723fba913b24b0d35b3aa SHA512 9c4d77572b982475313acddc8cd0df16a121d3a5363335d4d2a1e3021b3dd4bcda5efec9f4a913349efc532919441852dfa702df22dceda62d6f8af5fd491666
diff --git a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
index 870f697ab830..6ef88dd7e711 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.4.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
@@ -21,7 +21,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
 fi
 
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index cd228d62314f..aa4da5b2e28c 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.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
@@ -21,7 +21,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
 fi
 
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
diff --git a/media-video/ffmpeg/ffmpeg-4.3.2.ebuild b/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
index 1b5fccb1230b..657510529850 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
@@ -21,7 +21,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
 fi
 
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-4.4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.ebuild
new file mode 100644
index 000000000000..7ab4dcdeb81a
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-4.4.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=56.58.58
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_MIN_CLONE_TYPE="single"
+	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
+HOMEPAGE="https://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	libaribb24? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
+		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
+		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
+		libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
+		# libavfilter options
+		appkit
+		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
+		rubberband:librubberband zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar libaom
+	openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame
+	webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode oss pic sndio static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 )
+PPC_CPU_REQUIRED_USE="
+	cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec )
+	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx )
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${MIPS_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${PPC_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
+	dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] )
+		rav1e? ( >=media-video/rav1e-0.4:=[capi] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
+	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
+	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
+	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}]
+	)
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	postproc? ( !media-libs/libpostproc )
+"
+
+# Crypto & co provider magic
+# - libressl is a useflag meaning it should always favor libressl over openssl
+# - libressl and openssl provide more features to ffmpeg than gnutls
+#
+# The ordering is thus: libressl > openssl > gnutls
+RDEPEND="${RDEPEND}
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	!libressl? (
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+	)
+"
+
+DEPEND="${RDEPEND}
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	>=sys-devel/make-3.81
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
+	doc? ( sys-apps/texinfo )
+	test? ( net-misc/wget sys-devel/bc )
+"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	rubberband? ( gpl )
+	vidstab? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+	)
+"
+REQUIRED_USE="
+	cuda? ( video_cards_nvidia )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	!test? ( test )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium-r1.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+build_separate_libffmpeg() {
+	use opencl
+}
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack sndio ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss sndio ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use libaribb24 && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# Incompatible features: openssl or libressl and gnutls
+	if use libressl ; then
+		myconf+=( --disable-gnutls --disable-openssl )
+	elif use openssl ; then
+		myconf+=( --disable-gnutls )
+	fi
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in librav1e libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282, bug #754654
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+	filter-flags "-flto*"
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
+		--disable-libcelt # bug #664158
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--nm="$(tc-getNM)" \
+		--ranlib="$(tc-getRANLIB)" \
+		--pkg-config="$(tc-getPKG_CONFIG)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}" \
+		${EXTRA_FFMPEG_CONF}
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--disable-opencl
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+
+				# When not built separately, libffmpeg has no code of
+				# its own so this QA check raises a false positive.
+				QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*"
+			fi
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 8f00858f69a8..7ab4dcdeb81a 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -21,7 +21,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
 fi
 
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
@@ -185,7 +185,7 @@ RDEPEND="
 		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
 		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
 		openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] )
-		rav1e? ( media-video/rav1e:=[capi] )
+		rav1e? ( >=media-video/rav1e-0.4:=[capi] )
 		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
 		theora? (
 			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 6fc250c594e0..1605fc3ad66f 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,6 +1,6 @@
 AUX ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch 675 BLAKE2B b6b00228900e3fb1894eb4ca4872a2be645cb3a6aecbb9d3581ff1fc00b7290eab72196fb9c5f6ac4924eb3e4b1b82093669128fe32c01ce56e4c36ee53528b4 SHA512 facfdf9693710c93896590b8814af0b6ed98fe9fe4ecde013a3554032ed733b3ab713a4a840212808c84b1277c9c4e7951fd1fbc641ad9c001f78635e4e539be
 DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 BLAKE2B 1babd01672f927a9ae043488e67225490f732b26544ad92e4c55ae683eb7d852cb90233e76a52cbda2f6aec26654b57907d7706e3ad4ae6d76ca3bca163c78eb SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf
 DIST ffmpegthumbnailer-2.2.2.tar.bz2 1201838 BLAKE2B 449a876eaf56feb41c06dc5f3d123b138d66dfe8b6e1bc2e53f1742ef6fbd4ec5d14d77402e13cf8c369ee0cf0707ae5b100ac1d9fb02435b3c3a776cc9dc5f4 SHA512 52760dcf59430e5e85024c9f19dc1fac1d5f0edb4f937b33feac2b3ca8f12bbf549b5f658fc16fc07bf773717b9e10048aa3eb24bf52811c5c88c995ef492612
-EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1086 BLAKE2B 5a244c16fac1c6c3f20227c165345cf6dfe31c940ee7cf6d7e07c83d37956742c6d51049cfe0d111d2c3124a814dfbb86362ca960444592a02bd5e582513e840 SHA512 d5ea165c0b6518279c509f43c4bbe5933eed0017478871e65206af1c7b4dc5cd1ad6dbb21eb21399af9bd0632efcbf7fae9ef7fdc170b6dd9d759b4f01796cc5
+EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1085 BLAKE2B d89bcbeed12ca0aea9c931461dbdecce973d44e8ecd0d8d777abfa6f0128f491f36771a1a4d7adddac49b8228458cb81821b7b85d78d85b1bccdfb907c871dc5 SHA512 aa950d982ac2529cbaef04af04582cb8023e2165e3905d20c6f72411fe59bd5e1e1c71e2fa8891958ef44f943406dbcfc366588c445e3105fc02ce2992233348
 EBUILD ffmpegthumbnailer-2.2.2.ebuild 1037 BLAKE2B 74df41ed7ffba61c688cf9fc4dbe9b1257322bc25591aaeb194cc9a507b9103b8d8490b01770f6e40958187ae58bee0bdee1c7ab98fb56a41a531b8de603c9fc SHA512 f7c957535d396c18a1348af47d7d9350701be4da6bed54f7fa3eae8ce2412b86dcac702454bda5df241bc1a879790389a37cfdb6400b851639273530bf68c0c8
 MISC metadata.xml 375 BLAKE2B 95c0757230dcb40e028a904cfeb17bc44d651e2c5840fb9bd45222f56217ab72cee863157c014fa301a69611eee2e5b574fe9351f066bba1a846ad2b458ae52e SHA512 a3b8d0dc66f4660489b8e084a310da37b5379843b5e4a661a7c1150a4c2a7c4924f6d92366edefa6e57ed77016577d86c4aef084238df06925395f21c3078ab0
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
index 4ceb37088e75..7513824240d8 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="gnome gtk jpeg png test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-video/gnome-video-effects/Manifest b/media-video/gnome-video-effects/Manifest
index 6af2f73288f4..b51952710ed0 100644
--- a/media-video/gnome-video-effects/Manifest
+++ b/media-video/gnome-video-effects/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-video-effects-0.4.3.tar.xz 142100 BLAKE2B 5541c38dffd17cd8cc1ae1a87b7dba13051fe18466a422aaef7918b0f8a0145f39d15c68bd40338a157c51111c4bdfa06897da8c80ce1a318aa6a66b719ff278 SHA512 5cf708f7deea4edd5d80cd838a78a7b539cb87504f55bfda1686bbe0136ee0eba20885ab8cd2a880ad0c825bf5ca972b0f612a579016eace736b790d7bdd10d3
 DIST gnome-video-effects-0.5.0.tar.xz 85424 BLAKE2B 6c3aad12bd3f7c00a0f800d62df0144a4ca1318dbcb771f038f83fd82e252ba79aba379f57dd259c41dac3ba197dd98f52b944b018e39a419bb48b77e3a1d475 SHA512 48d68984913e6732a097b4f235671ecb3442945ec843accfae4b4526ecd27641831a847ea193ac1e13a452700c4a76fa15fa84c2293cbaf7b1b2f4d1b85487ce
-EBUILD gnome-video-effects-0.4.3.ebuild 522 BLAKE2B 28bf55ed9f3ee1ca320febdb5c11510ba87b4727fef61f299df4eeb9de8f73e95e73718d2b4e705cc097d8298dabbf477efa1255825734de4004d731fac18337 SHA512 802caf5e48866f3c105f932fd3e1b2c2ed8c9142df251f17c2046da684052fa5e2087ac957fd95be83ed45632c8526f97d0b23dcab74b6d138354d2fa8b76069
-EBUILD gnome-video-effects-0.5.0.ebuild 527 BLAKE2B 9f7a8ca66ee85d9f9a43eee744bbf022466911992910f302fafaf906007ae9a32cc8a989ec34e6d19be29232310246fcd8bf5ace08a7c623b80ee17be8d1377f SHA512 b78a3272342b88d436e992479625b8c097b21ab0c4993977a1e2b85bc2c12f64847110c66a99f771d18ca6e84bf89b2c04e9cb5ba310a48ee0ab3b062de6a57f
+EBUILD gnome-video-effects-0.5.0.ebuild 524 BLAKE2B 2a9edd549e4a23c1878ea97e7b205f255115f7aaac690436829f75e409e3cd217706105a1bee1008217fc7600904117b3fd90dbb15ca52b2803452d2975f301a SHA512 4498e2afafcb1009b7748c2110e1b6305434c55feb4104787dc9f2eaede6717e303dc402d83efe5e28ce7ab5ef5d8f01c413d5266bf17eaca9a5ace9f7a51d3a
 MISC metadata.xml 488 BLAKE2B 202c977557ebfa4dd1d9da6c558c1094758a403396d255c8aaafc62f746aa42b650ec597a7f5ef1cf3507cedd6bf4dce2f109e4da02a4906e451fbc73b4a3462 SHA512 db1e3250d928428f492fca5e87c5824d7cf8e19746e433292faa19544ba89c043f046305c650c5c18e6d94fb429ff5f4e634dd5c0609d8c6aead26e3ec9d50ec
diff --git a/media-video/gnome-video-effects/gnome-video-effects-0.4.3.ebuild b/media-video/gnome-video-effects/gnome-video-effects-0.4.3.ebuild
deleted file mode 100644
index 580ee2caae2e..000000000000
--- a/media-video/gnome-video-effects/gnome-video-effects-0.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Effects for Cheese, the webcam video and picture application"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeVideoEffects"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
diff --git a/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild b/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild
index e033177c23fd..fac1f7bccb13 100644
--- a/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild
+++ b/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeVideoEffects"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/media-video/h264enc/Manifest b/media-video/h264enc/Manifest
index 8b0a6044cf1e..fb872d84eb4b 100644
--- a/media-video/h264enc/Manifest
+++ b/media-video/h264enc/Manifest
@@ -1,4 +1,4 @@
 AUX h264enc-10.4.7-libaacplusenc.patch 905 BLAKE2B b79273fbaf4fcfe3f176881c601ce9927bd33535392a0c95f770606f64cc1b69b4b407b919ca50d18a66c0a5c0c49c9c49f8b0972beeabc59b29d5016cb1af1c SHA512 1030a4f24da0499151e576328b0c5f292116012c63862a3d43a22bbd600c174c139ae4ba3dfb84abaeb7d83547b8e113d4062c8bfd82c9f7a859f1c025b693c9
 DIST h264enc-10.4.7.tar.gz 138481 BLAKE2B f1571eb79c7d627eb8534a28d5c9ae337e3d1bb8fd416ae83754cb9f4d055c8f8937e228991e8ae15f6c5a657fbc5931acdaa6fe56cf71e89ce1c5b4ba820a27 SHA512 09d133e8b4d16f513b790b4517a276d48fe400c2a09a80ee2ae229a9224a9d225d54b5b48b5b60ed6ebe1f181f8b96340ad0e44a9e1e1eb7e6889809edab0bcf
-EBUILD h264enc-10.4.7-r1.ebuild 1054 BLAKE2B e6e73562f95a866c5b11df2257ee2e64d5e1e88a09eb144ee315b21b800cbba7de9bee22e850793d23823a5f81f685d4cae1dfbe7e2ff23af9e922e746e0b851 SHA512 f4c734af6f00f5a03948085f367f71edf1ce6e8a0f66e58a9bc8d1494d53e8ad6fe6897316e32347c8216ff62192da5138a68b8f057e9116b072c7a6520404df
+EBUILD h264enc-10.4.7-r1.ebuild 1032 BLAKE2B b31b030b7b3d585fcd2ee0bad86616f5fc3de5e5e6b283084d5226df63b405821e64a931c60fa5d1265f5e3e6398d9400ede8fe72e606707b5daaaa20b7c858f SHA512 d24b96f5b2cf6012b63ed176b5acad3a1eb15f95ef6f5846ec13e38773b2373c90040fa2b498f7b50a37cd4983f28550e09cb0e246679483b28918840af7301b
 MISC metadata.xml 300 BLAKE2B 351f5c58f1fe3b1c3db8a0210ba10a0d1f4a1d4749a3f06e2f9c93dc7fdbe583a1a06b6647e28e95f917c86aa29999f8c1aff7b3f2736dcc6044c8c548bc52cf SHA512 80a1cbae96078c5801ca3eff3e34f00bb4d22211ffc91f493dfa162d7e86134f9f6cc9d9192f238bf0620e2f65b5a34b2530d6a99863707d188ecfd6d611ed9b
diff --git a/media-video/h264enc/h264enc-10.4.7-r1.ebuild b/media-video/h264enc/h264enc-10.4.7-r1.ebuild
index 4659f64d0e25..87fc103f2861 100644
--- a/media-video/h264enc/h264enc-10.4.7-r1.ebuild
+++ b/media-video/h264enc/h264enc-10.4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Optional encoders:"
 	optfeature "aac support" "media-libs/faac media-libs/libaacplus"
 	optfeature "dvd support" media-video/lsdvd
 	optfeature "flac support" media-libs/flac
diff --git a/media-video/harvid/Manifest b/media-video/harvid/Manifest
index b2c42f954895..97a46cf854c0 100644
--- a/media-video/harvid/Manifest
+++ b/media-video/harvid/Manifest
@@ -1,4 +1,4 @@
 AUX jpeg.patch 921 BLAKE2B 321213241c8160a5f06438f5740c795e69797858f33eab0a9a294cba7b006028f0f5d961d84f114b85089c3419c1c5dbcd137a7b213569a926af1f7a1dca0a91 SHA512 c9bc0f20f118955ed31feedbf24f10a3f988e658d2b248db9fdfdc23cabef1e68139ba6d532e0515fc7bb1830bc1c31d15799568a9871800f31fe27191794951
 DIST harvid-0.8.3.tar.gz 116446 BLAKE2B b245166ab2244a7afdddabb463296974c0d995d70ad8af6e93f549f045245597cb4ca3abf47c608eea15089ac5e6f82972b789d9a3f268b8be98f3080fd6e5e7 SHA512 748475602c7279f10790523cbd5cbf34c9cd283ca9e959ac0535fbb5b4ee6d2fcab976c5ddba3fa40862552b49d73df7145f36d26c9fe708063505812537a8ac
-EBUILD harvid-0.8.3-r1.ebuild 968 BLAKE2B b5ea60fdb804cca1dffd2cefd5becab6ed2bf18dcb8a46087fd6d23bbaa7d20cbcbe7c3ce4e8f672553ef25b7a3e592e16f11a6a5b5ad5346205ba86a1fc8e3d SHA512 5979b29c1632798d9efe1e6dbf9c2678ecc9dcec38d9b02891218814d542fcc424dc15013ebf1487360947d1a0c2f6049ce5295cf24a2dff87bf87a67df6017a
+EBUILD harvid-0.8.3-r1.ebuild 961 BLAKE2B 5b1bee007a966f65d47483c7efe7bf424829e61be7219355b62a794d68602fdf08bfa862ae8e7445caaf9416dc44a48ffe09bffa66c3714af5aef5926585d52b SHA512 b908f8cf7d649fad9723b89380d29b85470de8ed5aa4e684f75a014f2dbfce092de9cd263115eb002c30376788c7cf921ef7860d4dd80c1fefcd873dfa65258d
 MISC metadata.xml 306 BLAKE2B 5c1fba580f975a8cbd2247e002f0565de5a1f406f4361e312865e9e7b6fdd406a3e128fee109fddcf37b5978e865850a7de3abbe656f50d3c1642650d8f371f2 SHA512 4fa6b478e09481b73a9c1743c79b108e115a9452c31f3a37134d9ef939f4118c27690e9e7f33fcd0fa7a558d73840b84b944e14344d1ebffc10febc16cbf2315
diff --git a/media-video/harvid/harvid-0.8.3-r1.ebuild b/media-video/harvid/harvid-0.8.3-r1.ebuild
index e8896dbe474c..6e0a1ba99158 100644
--- a/media-video/harvid/harvid-0.8.3-r1.ebuild
+++ b/media-video/harvid/harvid-0.8.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="HTTP Ardour Video Daemon"
 HOMEPAGE="http://x42.github.io/harvid/"
diff --git a/media-video/isight-firmware-tools/Manifest b/media-video/isight-firmware-tools/Manifest
index c23360a46134..91c0a20bedb4 100644
--- a/media-video/isight-firmware-tools/Manifest
+++ b/media-video/isight-firmware-tools/Manifest
@@ -1,4 +1,4 @@
 AUX isight-firmware-tools-1.5.90-build-O0.patch 598 BLAKE2B 7ad3392140e3fd416f6cc932b015cc21e0ececb97bb12a0c889e3059112ffbff4f328db7d0a0a9c3133986b88fc96417e88a319d7fc0283b746ad815b02e7c32 SHA512 f2b781a94f29ab5c539a8b6f0da9abf554e79ae84825d1d3deb63fcb3844efe36db73c831e359b3436a1b08a8a16218aa1dfff941f07f67e3e7007c71e67cc39
 DIST isight-firmware-tools-1.6.tar.gz 229122 BLAKE2B 7838b342bc522a88d06ac01d062fa4cacd44bb4d2cef00ee0eb37d972bcdde2b5b0676efe54df77c59717ae8023bd60cce9550e78d5586ac7a81387ad212e2f4 SHA512 1d72e10d1ff97665c96113c70786307e0b5d1cd24cd8f5fcd15ddd7b608ff1596023139a41f550a9fd288bd8968f69d348b433f5a739179fc0e3f8fa3e143fea
-EBUILD isight-firmware-tools-1.6-r1.ebuild 1587 BLAKE2B 0155789447449823e41b5cac6c2d4b4c3dfce56a995722a367c37807aeed75305b81d23f3e1618e3a3bea2b64f8550b87d8f8544dd9229bceb6b31c60bdeee46 SHA512 32ed20190d789e19c33fb7021d9c973b3c6bfe866064b29fd8f76b396adc6bc6284726b283b0af74429d1fcdf608c1b43bc4a2952887c92883f9f4bcfbd3715a
+EBUILD isight-firmware-tools-1.6-r1.ebuild 1584 BLAKE2B fb0776858d03720e4a58138707929cf1f9886600f8ea1de15191b5d1636f4fb354d6e4f36f659bcf088855493621e69c314e445473a2d15f5337d0b3e94a068d SHA512 e527d94de1c008e02a674c55c5d16c663e231b3d8e683578aa30af19203044ad6d2cc1edb93aa4688366e46a6e9e1d8df344a9adb6799ebfe23bfc23edc62a52
 MISC metadata.xml 256 BLAKE2B f18a4f169258cc2e2558a1073e13b17dce6ff59b0fafa00d75df30d8a98f6d03e982d8740054004ebd73cc1af1c053f7d19158853fa158a1644a8868b8746362 SHA512 8cf30d78f67983b3cb006d8faa8829aed12f07544c69b3309ce3d8854eef36d5743ba84c78ce4ad5d2f7566b84b4be7d1df20039def8601d269aaf5fa978d64c
diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild
index 2959f96fc526..1d92625a87c5 100644
--- a/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild
+++ b/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils versionator udev
+inherit epatch versionator udev
 
 MY_MAJORV="$(get_version_component_range 1).6"
 
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index e9907869776b..3d459d052f9d 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -1,3 +1,4 @@
+AUX kino-1.3.4-desktop.patch 407 BLAKE2B 9fb95f11dabad418b2006db47c0cfd4a29bec37c896b84fc78f3ff4d9070364e62517f35454408eec9a3d0cfb53969561ec7851a437cbfe78afa80ddc099cd34 SHA512 573ecb979dda675a6b9a82258bd854468289e2551c6a8a4e6b33144f51daf4d4a3a6fd52b1ac17eaefa19d6c033ca3b22d47ab515b0f3d121b5a767680c7ee63
 AUX kino-1.3.4-ffmpeg3.patch 6804 BLAKE2B 7517c00374bb48ec7677a749296a91c4e5d242496b14d0a38c1e262772cbdadb89c527a44a46db42fa7cad8460138e1d2b11e56ead5bc320a12f5a005363ad17 SHA512 d6ba42d70a907887a866c195946a130fcfff63c8caacf68e8de13fe4d43d4e1898df38fbea5afdb498aade03d14822f0c6f1a9b8308729041e1319acd8c2a0bf
 AUX kino-1.3.4-ffmpeg4.patch 687 BLAKE2B 904e34afbc0707cc8b12de5ec4b733e78a6db91bd9af07a071ae623f82bb57b249acf0b49151a9a597985824c7b402fe8191616fd99ead50a6df7e8f79a1ef93 SHA512 55646377cfacf3a60d240845656e0f01060fb520cf51cac03a6d72941447a5ac05abe1086f84810d684ffe913bd04b3073c951a0efb5891bae44f3eb8c65a858
 AUX kino-1.3.4-libav-0.7.patch 2001 BLAKE2B 75060268985ffbf0cb19e6b96acde037b7b86522e03661becf0fde1b8e114212a033150bb69cf4bdfcd4783cb149f2864c7cceb8d6cfbf778b26cca96108febb SHA512 f4e52546b3451684add1ce5d539b1630d476e0a6889da0f7b3d827cab0ba5d7dc1b5febaea735188886fdf7f8012402c8aa6baa73aa6ae7ae204e035df33394a
@@ -6,4 +7,5 @@ AUX kino-1.3.4-libavcodec-pkg-config.patch 451 BLAKE2B 87a6292a89627000437c07e60
 AUX kino-1.3.4-v4l1.patch 635 BLAKE2B 5f4d4c69c2505fa59aff8ed2323b303092809d1c1991387795a8cd58687b27631d697997861f1b17e921875c5e798495fc4866eb1163afc19c80c376616c95da SHA512 840b9549aa4fa639a090ffdf2e4a65b8b37e5b8c8fd7f13eacb599b6659b0a6c1a435da5f3fbb7ca2b81ce5e2759ef49267af93864aff0426e61eb63d3aede77
 DIST kino-1.3.4.tar.gz 11090771 BLAKE2B 58d61257c09638d12cc4ec1e40fa5f51c6812039825f915b0b8c32817c791c7ce89b69145ffffed8fb65ea21b57d50628bab2654df731b79c39d120ea4335bb9 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32
 EBUILD kino-1.3.4-r1.ebuild 2710 BLAKE2B 63c28374516dfd5c8876d32150b597f185ac13741352d6a78d1007ce073fb4ef0771f88b1ee4e39bc4720faf93b6601a612278968de6af3bdae7b59a5e57712f SHA512 abcb7d0270832572b4bebe8a3ea0b963ad98ab403dad266a30ec501792b19243f1ed038f8c8f7629609062a7ab4172a4d72afdd92cb832b33f6faa039bfb91a6
+EBUILD kino-1.3.4-r2.ebuild 2755 BLAKE2B c2829db734029e1bc4c4663bc88478dcc1f2cc18b6404a1bfdd8de8d9d3db59dfcb5d4de7780a475503814cd987af79a2d78355f020c0cc25e5fbd389c33056a SHA512 5fa09a993078b29d5f0162ee5b4307dbfc304f3bd8e0a0307c03c7785044834df25caa9e5b6dde70a263e594e8a4794f2e49c1360d0607973604541dc96d08bc
 MISC metadata.xml 439 BLAKE2B e5c5ba3dffa41f889738582a879e23b49a17ca31787c5461a6d136317d3fce8d1df4cc29657eec57af00ec8d810e52ad0a125cbd5b378fc1de63d018696e932b SHA512 b6c464f30ce0e75cad151021288fbf2e2fa360a978b707108eb39e23bb15d3d91212abbb23fa181c97959bd80ce519e4f26bf59c6a22a99ab19bc5051a0746a4
diff --git a/media-video/kino/files/kino-1.3.4-desktop.patch b/media-video/kino/files/kino-1.3.4-desktop.patch
new file mode 100644
index 000000000000..03267e35b48f
--- /dev/null
+++ b/media-video/kino/files/kino-1.3.4-desktop.patch
@@ -0,0 +1,14 @@
+--- kino-1.3.4/Kino.desktop_orig	2021-04-10 11:55:07.696950138 +0200
++++ kino-1.3.4/Kino.desktop	2021-04-10 11:55:19.621863615 +0200
+@@ -41,9 +41,9 @@
+ Encoding=UTF-8
+ TryExec=kino
+ Exec=kino %F
+-Icon=kino.png
++Icon=kino
+ Terminal=false
+ StartupNotify=true
+ Type=Application
+-Categories=Application;AudioVideo;AudioVideoEditing;
++Categories=AudioVideo;AudioVideoEditing;
+ MimeType=video/dv;application/smil
diff --git a/media-video/kino/kino-1.3.4-r2.ebuild b/media-video/kino/kino-1.3.4-r2.ebuild
new file mode 100644
index 000000000000..da4e9f6edd09
--- /dev/null
+++ b/media-video/kino/kino-1.3.4-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools ltprune udev xdg
+
+DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
+HOMEPAGE="http://www.kinodv.org/"
+SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa dvdr gpac lame quicktime sox vorbis"
+
+# Optional dependency on cinelerra-cvs (as a replacement for libquicktime)
+# dropped because kino may run with it but won't build anymore.
+
+CDEPEND="
+	>=x11-libs/gtk+-2.6.0:2
+	>=gnome-base/libglade-2.5.0
+	>=dev-libs/glib-2:2
+	x11-libs/libXv
+	dev-libs/libxml2:2
+	media-libs/audiofile
+	>=sys-libs/libraw1394-1.0.0
+	>=sys-libs/libavc1394-0.4.1
+	>=media-libs/libdv-0.103
+	media-libs/libsamplerate
+	media-libs/libiec61883
+	media-libs/libv4l:0=
+	alsa? ( >=media-libs/alsa-lib-1.0.9 )
+	>=media-video/ffmpeg-3:0=
+	quicktime? ( >=media-libs/libquicktime-0.9.5 )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+"
+RDEPEND="${CDEPEND}
+	media-video/mjpegtools
+	media-sound/rawrec
+	dvdr? ( media-video/dvdauthor
+		app-cdr/dvd+rw-tools )
+	gpac? ( media-video/gpac )
+	lame? ( media-sound/lame )
+	sox? ( media-sound/sox )
+	vorbis? ( media-sound/vorbis-tools )
+"
+
+src_prepare() {
+	default
+
+	# Deactivating automagic alsa configuration, bug #134725
+	if ! use alsa ; then
+		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die
+	fi
+
+	# Fix bug #169590
+	sed -i \
+		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
+		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
+	\$(LIBQUICKTIME_LIBS) \\' \
+		src/Makefile.in || die
+
+	# Fix test failure discovered in bug #193947
+	sed -i -e '$a\
+\
+ffmpeg/libavcodec/ps2/idct_mmi.c\
+ffmpeg/libavcodec/sparc/dsputil_vis.c\
+ffmpeg/libavcodec/sparc/vis.h\
+ffmpeg/libavutil/bswap.h\
+ffmpeg/libswscale/yuv2rgb_template.c\
+src/export.h\
+src/message.cc\
+src/page_bttv.cc' po/POTFILES.in || die
+
+	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' src/filehandler.h || die
+	eapply "${FILESDIR}/${P}-v4l1.patch"
+	eapply "${FILESDIR}/${P}-libav-0.7.patch"
+	eapply "${FILESDIR}/${P}-libav-0.8.patch"
+	eapply "${FILESDIR}/${P}-libavcodec-pkg-config.patch"
+	eapply "${FILESDIR}/${P}-ffmpeg3.patch"
+	eapply "${FILESDIR}/${P}-ffmpeg4.patch"
+	eapply "${FILESDIR}/${P}-desktop.patch"
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-local-ffmpeg \
+		$(use_enable quicktime) \
+		$(use_with sparc dv1394) \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		CPPFLAGS="-I${ROOT}usr/include/libavcodec -I${ROOT}usr/include/libavformat -I${ROOT}usr/include/libswscale"
+}
+
+src_install() {
+	default
+	mv "${ED}/$(get_udevdir)"/rules.d/{,99-}kino.rules
+	fowners root:root -R /usr/share/kino/help #177378
+	prune_libtool_files --all #385361
+}
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index c5bac7e92058..48bdf5fa4055 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,15 +1,17 @@
 AUX libva-utils-2.10.0_test_in_sandbox.patch 526 BLAKE2B 8275555ee777b8e66852730a084911a44b74ebb3cfe378d5f60d2e1a95f3cf8185506788af2e8606a23bc233623a59eaa7554b68f16555ba35b941b1c59dae3a SHA512 980424fbbd5215da672819963fd5e36a7900955752f42632cf8258efef577f5a511e8a961e273141c4acf83f8c6bb5783561c256b730992a03bd9c914510209e
 DIST libva-utils-2.10.0.tar.gz 1203536 BLAKE2B c7b51e07618204c55e992f57dd2d80b289d2edd7b4f526c3afaaec1081f5497ac86614e097bc14a1e79d380ca2c529359d02cee601502e292ca8f89073d5fdbb SHA512 2d44c5e3f52ff4ce8bfb206af95c4d790b6d31ec21f899f0ec9604391359f55de06c63b446e19cd8f0ea0c36ccb4ac7cc5ae7fe68361eb263c01454682d18402
+DIST libva-utils-2.11.1.tar.gz 1205472 BLAKE2B 251a318d10eb5907e0ee54f101a153cfe76a98d61fc1f4fabf890901b52e980439d77acfbb4e1b566d361a7cda5c7ab504e575067eb932b0e121904be34b801f SHA512 d64c4767269a810386e02426fce3bde6aa693ac899ace22900e4ae4918dfe461736fe0a031db36751281d5bd78960354cdfa4ca13c5f7c30cc67d05abdd0bcd2
 DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e750f854dd87c8448afb3d361581d83b20a5ffd8d7e22c9dbf5fae6f7ff3fd62d70cc248b29a862066ff10928629e4d11 SHA512 c5c674179ed589968fd296a7e33dd57a3476c237d8e15258938b364051d501e156c22b41b98fe59d6bc36805495a934dee602ec9e9bb5350c72aa65d3d300ff6
 DIST libva-utils-2.8.0.tar.bz2 1037112 BLAKE2B 9168d7d489e1574d970e9e3a270946de522a4063b80c4cafe38cc6917b99deb6394570592d3ed29a0ff7b92f819b9bbc9eb2a8f3b70077625a2714f70ee1959e SHA512 b3412349234ad2923953296674926ee7cb33c43ce17df8942f751789f0208064a4557ca16e1a5878a4e1b35e5bbbd415a9c9f182ffb24e589ac4757e990576b5
 DIST libva-utils-2.8.0.tar.gz 1198057 BLAKE2B 7c3332fcd2f4631cb2f77d0775e7f542b8ffbbb77aac0fb0629fb2474563320dbbefa546999fc7c991e8081e82a2c48b1406a34d2f075c80fca391088d779fcc SHA512 2102c5bc2b9b1caa99852892b2b7c1f5db7846283781cec84fe9683ac245ea366120096c1032a2c8b36a7c5fc8e4cd68e3939b0a2712a15f453c33560217585d
 DIST libva-utils-2.9.1.tar.gz 1198337 BLAKE2B 58f5a6a537c68eed74aec5dc8f1c4b5a0431062d1d9803d8ccb1e5c3b534edf4f91288009d5940a0ddab49beeadae92bf361bec0bee8a3214f04f3c6767b0992 SHA512 39d79d4eed1fc0890fbf89d5689d4f01f704d3c71b4986e0eaf4c4a2f836cc36338d0a01630092a31b740588426398d0381eae1dc0302b0df94859d9161d8378
 EBUILD libva-utils-2.10.0.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
+EBUILD libva-utils-2.11.1.ebuild 2347 BLAKE2B 9acd1f4e00da2d1cadcaefea94551274118322e170fbd8fd60f3fc27346f460817906ae20b75883dfcfb9804cdd25cddc7677b82e7b55b3d25a3f9c23c6e1b52 SHA512 53fe221cfc639a8d657148cc5c3f2d90a0c6fdc522686afccc1d55682dcd7b50318fb9ee0d881117dd2c885349528e87fe7eb63595039519bfd9a3b72a33cb94
 EBUILD libva-utils-2.4.0.ebuild 1260 BLAKE2B 21e0954fabf17181f30f73ab9e04fff01fc1ee90aa37983e83a0937eba1e334154931d854b424072be433afacfeae9fc9abd449e335d5f1b5d0ab44262949d31 SHA512 5cf59b4ad3ab602a9a548b1ba7fdfd19096c92fc09c2d860d7e4277e10d070d80d0ce995b54d6d3140fa5837437c765b58f2b2b926d28b20a90277eaf36361cc
 EBUILD libva-utils-2.8.0-r1.ebuild 1537 BLAKE2B 2c1f7727f4b9c1bbc3360dd20133a56ce641c1fd53ec56ab5b0f736db0ae343c9efbf5b523de2bb9bb50dac477a45f005256fac98ae25b2ffefe8c07469f5f18 SHA512 5f36c0614e05d5ceb11af1bae4aa698cf2a45f3535eb947088546d0f74bf5a725c74d92b054f6cb3a70fd572742d359ab92f68af45e51cfbf8093540a12d95ff
 EBUILD libva-utils-2.8.0-r2.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
 EBUILD libva-utils-2.8.0.ebuild 1264 BLAKE2B 184c33bb8683bb8d86e9fdf8f12dfb33a4fd5ae1ed25a6fc1ca75835c8d791b1805abf20ef9096ffa69bc30d2d9e767d5b9f3f2f47ad1a58ffd50de9cc8789d4 SHA512 ccfccee30aba5857f484b6d8a308a3d895ba89cabac7d7d5b1240f7ed5b9b0d672efef4f02be591864dfa8ce9a530eed848831af971897685e1fc1ced57d3788
 EBUILD libva-utils-2.9.1-r1.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
 EBUILD libva-utils-2.9.1.ebuild 1269 BLAKE2B 7a67145af77dab26119aada7dc4ce3a341d605802c0e514693dd02de71848a1f0435f8591449af69dbe69554f6d28b700cd8e723e183eb2b39f2d10d7a07bb56 SHA512 0c3d37d06de6b2aa4f2156c3ea09c49a8f4066ea5e11003e077a405767abf299ac1fb37c585c8674f5c21dae94f3585842ccbb83baae4aed96e9db68b5874e1a
-EBUILD libva-utils-9999.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
-MISC metadata.xml 414 BLAKE2B 172a3ddb5fec4b701f6f0fdf1c99ec916312151513e3505a6b37087204283040cffaced290a092f6ce71e8e499a134c882754b011a2dce2e9195f74d8b3eab4c SHA512 180a80f82f063806dac28be27bedc9d968ac74134e4c63a45a11b94db8cbd531971530844d1988f1fa1d4e389fa40bfdc8ce0c65109ae8f64accf9e5a607970a
+EBUILD libva-utils-9999.ebuild 2347 BLAKE2B 95b8b81383867046a9a236cc5902bcc7e26968d6071757a8ddf0d2386d256bc52737649298d59c1f18822f703d685427a1bc9729f28d191d7928cf6f85054031 SHA512 7d5be3598482b126269a22fcbb950c7f7d75d240cf75199048dd8230dd8cb012eb43677383f50b6296573351e7efe7d825e3d8c6c1a4a5e99a9f9d3a87d7504a
+MISC metadata.xml 760 BLAKE2B a25a8e5142620cd1cad39a334a278322319bae8965c2358a541cb70b52324a4eb5d49a525af36b00d7755643ac7f411f6b810153f9f88677b63ea8f3f5505684 SHA512 8a1ad7340171a8b2160f91c616b131f2ded08b9ed5c916c7482f45375aa9537eb0a0248839cf47169de2f851b01b7ea0171e37bc28350ae28e4b5537c9c67a81
diff --git a/media-video/libva-utils/libva-utils-2.11.1.ebuild b/media-video/libva-utils/libva-utils-2.11.1.ebuild
new file mode 100644
index 000000000000..2af7d4a1fc0c
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.11.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
+else
+	# Tarball with pre-built 'configure' not always available, portage use tarballs
+	# without pre-built 'configure' as they are always avaialbe upstream.
+	# SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
+	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+drm examples putsurface test test-va-api +vainfo wayland X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	|| ( drm wayland X )
+	putsurface? ( || ( wayland X ) )
+	|| ( examples putsurface test-va-api vainfo )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} = *9999 ]] ; then
+	DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]"
+else
+	DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]"
+fi
+
+DEPEND+="
+	wayland? ( >=dev-libs/wayland-1.0.6 )
+	X? ( >=x11-libs/libX11-1.6.2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" )
+
+# CONTRIBUTING.md and README.md are available only in .tar.gz tarballs and in git
+DOCS=( NEWS CONTRIBUTING.md README.md )
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+
+	if ! use examples ; then
+		sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die
+	fi
+
+	if ! use putsurface ; then
+		sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die
+	fi
+
+	if ! use vainfo ; then
+		sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable test tests)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+
+	if use test || use test-va-api ; then
+		myeconfargs+=( --enable-tests )
+	else
+		myeconfargs+=( --disable-tests )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if ! use test-va-api ; then
+		if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then
+			rm -f "${ED}"/usr/bin/test_va_api || die
+		fi
+	fi
+}
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 7803d68b4896..a363b5cb3856 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -20,10 +20,14 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+drm test wayland X"
+IUSE="+drm examples putsurface test test-va-api +vainfo wayland X"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="|| ( drm wayland X )"
+REQUIRED_USE="
+	|| ( drm wayland X )
+	putsurface? ( || ( wayland X ) )
+	|| ( examples putsurface test-va-api vainfo )
+"
 
 BDEPEND="virtual/pkgconfig"
 
@@ -46,7 +50,21 @@ DOCS=( NEWS CONTRIBUTING.md README.md )
 
 src_prepare() {
 	default
+
 	sed -e 's/-Werror//' -i test/Makefile.am || die
+
+	if ! use examples ; then
+		sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die
+	fi
+
+	if ! use putsurface ; then
+		sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die
+	fi
+
+	if ! use vainfo ; then
+		sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die
+	fi
+
 	eautoreconf
 }
 
@@ -57,5 +75,22 @@ src_configure() {
 		$(use_enable wayland)
 		$(use_enable X x11)
 	)
+
+	if use test || use test-va-api ; then
+		myeconfargs+=( --enable-tests )
+	else
+		myeconfargs+=( --disable-tests )
+	fi
+
 	econf "${myeconfargs[@]}"
 }
+
+src_install() {
+	default
+
+	if ! use test-va-api ; then
+		if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then
+			rm -f "${ED}"/usr/bin/test_va_api || die
+		fi
+	fi
+}
diff --git a/media-video/libva-utils/metadata.xml b/media-video/libva-utils/metadata.xml
index 8d6b2fa413db..b7e200e4ca0d 100644
--- a/media-video/libva-utils/metadata.xml
+++ b/media-video/libva-utils/metadata.xml
@@ -7,6 +7,10 @@
   </maintainer>
   <use>
     <flag name="drm">Enables VA/DRM API support.</flag>
+    <flag name="examples">Build and install decode, encode, videoprocess and other VA-API examples.</flag>
+    <flag name="putsurface">Build and install putsurface tool.</flag>
+    <flag name="test-va-api">Install test_va_api tool for thorough testing of the installed VA-API.</flag>
+    <flag name="vainfo">Build and install vainfo tool.</flag>
   </use>
   <upstream>
     <remote-id type="github">intel/libva-utils</remote-id>
diff --git a/media-video/lsdvd/Manifest b/media-video/lsdvd/Manifest
index ec6efb8c1ce7..082831fd173f 100644
--- a/media-video/lsdvd/Manifest
+++ b/media-video/lsdvd/Manifest
@@ -1,4 +1,4 @@
 AUX lsdvd-0.17-autotools.patch 538 BLAKE2B cd5967fe1ae36d355db2a2b8f35a9a28d69f852729b8fc62425c7e71676f253ba3e6d47a4c9cd181bd45258b550e6c457b1d9baff125ae3d5f66a7c206330d44 SHA512 7fc4b172d8ca75019165758b2bad030e6a5ffc28cf542e1f0d9025078029578cb96b6ba5f1a6bd877f315baef74aa302dae78352636b03592e5a1343da5680b0
 DIST lsdvd-0.17.tar.gz 99250 BLAKE2B 2b3203527aa4aabd43d26de5f983733f5570905a81043f49e18531a29198499ebb2b9c1ed9caf4ff061639ca02f047c13f95948c09bad7b105d8c02bb3ec9c67 SHA512 d217ebe063c9d4c1584abe99cba5c5d09e1d600d26c58f90d542235f9a629433aa24f24fd8399c639e21391e7a5e8bdf54a9c85083aed63eae1090f4c23677e0
-EBUILD lsdvd-0.17.ebuild 612 BLAKE2B 3573e055caa1234622659abb7e1a88c5890400ab1df9d41d694b9364a39ac0b738492a35a75dac6faa74c6094d75f95a868ce6312390a7e9c31c87633acb15e5 SHA512 76d4b2aba61b6c7d3b0ccb3fa90a72e5345106d63bb94e9633af872dde20ba2efb41677c2fa5b3590b8ee1d4cb40209c91a44e2099ffe83a7aa21b95cc9d05bb
+EBUILD lsdvd-0.17.ebuild 612 BLAKE2B 817ea630f91a2546cf8e53e014062c4df7dbc087885002704699fda654cae8ce832afa190c4660ac99b8da1718baa27d611a3261bf6281ab4f7610e6f40641e4 SHA512 7a154ac1eeaf585fac025d5d3ae8a529c2768084e7c56b2e799deb0b7433f0c895dcd5f1fae012aaf9e17c2f5ee6027966f6b5afec6072f25b3c8002a0b30c23
 MISC metadata.xml 298 BLAKE2B c3e1a45f064520eab1bb66929326a061c877aa6ebf092b4b467aa0ba2a9d904acbc4a5354a6773765973d18c5359bac14a0f04bf9a2f84490d56161155870f6c SHA512 b52246d4fa2022782a488aa4181dae1eb3b4c1371f492eae86c871d4e7f4cc23c89889ac08a5d74f337276933a53237a7d49e4489db384913017e74c888230b6
diff --git a/media-video/lsdvd/lsdvd-0.17.ebuild b/media-video/lsdvd/lsdvd-0.17.ebuild
index eeee01479de9..fda1e95f98df 100644
--- a/media-video/lsdvd/lsdvd-0.17.ebuild
+++ b/media-video/lsdvd/lsdvd-0.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils
+inherit autotools epatch
 
 DESCRIPTION="Utility for getting info out of DVDs"
 HOMEPAGE="https://sourceforge.net/projects/lsdvd/"
diff --git a/media-video/lxdvdrip/Manifest b/media-video/lxdvdrip/Manifest
index df8e93422545..0349b27b518c 100644
--- a/media-video/lxdvdrip/Manifest
+++ b/media-video/lxdvdrip/Manifest
@@ -1,5 +1,5 @@
 AUX lxdvdrip-1.77-makefile.patch 1341 BLAKE2B 8aaea5bfebfb0fa4cbb5be44d9c1e5204edad4c7e2200df848f44d304eeafd51de5f1b1fa258fb9d6dc90483f5cf459de4141a187f44bea5f06dc19d8daebda4 SHA512 4641e48fa2c7f35948788211a093f96506a74a5beee44b83787774627b52b85b36a65043e1b99cde6fb9352dde0a3838070e1f63a810f7f1433849be04e7e4a2
 AUX lxdvdrip-1.77-vamps-makefile.patch 389 BLAKE2B 52911721cd566f0fd648f698fd7fbc1f04cb1f21233924364369cc3e5a4feb9485f3fb550c9e81b43b742a922e18ade5dd886a1e05908d8f81bc432b4be90d0c SHA512 d51a411dd8bee365556b0ee275beccb99f00d4054e40080ca40fbb50f843a6646d2bb5fbc3ae97073dac7411706c0075266b00b7dfafcfa5977442143592e8b4
 DIST lxdvdrip-1.77.tgz 714310 BLAKE2B 07ec19bc7ecd3c8dbe4be50b0f100f9e4ecd04cc09aedb6b0a24a0a1b3396e20628db611bb34ab1a53bbb32c887d34fe67c4002dbc220eb0802a28d1f1754a7b SHA512 d9b3003d52b90ad0f6c02054cb3171b4613b4210b5681c76f2e6e42d4a233438b1323c93b92457fd2e048e7ddef0df2089d82ea8bf3f9983c453ff99f122cca3
-EBUILD lxdvdrip-1.77.ebuild 1065 BLAKE2B e475c04ff19162e2b16ae9aa82279110972cf78c6a9660194b34ee85f5f36e908ca065ffe6c3a3ce7517204e95447a121145b59e429ede1ba9a5cf86c0f9fc28 SHA512 67648ef99b5e6bb5695080af19ba5ce8effab21076cdde4fc2c5a6afdd05700cf404062e962192702f2c107b00fd8945f7b9e0d975fbc0ba37a6cc076119650d
+EBUILD lxdvdrip-1.77.ebuild 1065 BLAKE2B aeb2c0a03153bfa1251ef695a7a9cca48f5b415d01c939032aa52c6c4983841f4fa281c1c5d7ebd5344cf3b110a5ed036d9f03b5754a9ad01cbeedefff967801 SHA512 e592f53c27cc3867ed61df6cb6a03ddbbe01fb66dec56c8cc1ee82b4c660568106f311c40f9ca3329b7e6ddc39ac518172ecf8023ab218e8118981d81f58d378
 MISC metadata.xml 301 BLAKE2B 2a1f465bbef5ed15fe8cde02e7239e906611c905d4c5121b873455c79e2ed211b60512160845d8cc23a1c3778ad6f2ae7b109cf1ea6ae5ec72a5920047b7bb3d SHA512 14dce877e9111310fd764182c06b619ab5ef6c64c779e218aff6d996ceb70ad78c42f05f26a6f00adbf99b83e4b2b743c251fa7e65325d154efdf02cddb713f2
diff --git a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild b/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
index f2d8f274f184..f925ac98c665 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="Command line tool to automate the process of ripping and burning DVDs"
 SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index d746e52a28d8..784fb0e46466 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,6 @@
+AUX makemkv-flags.patch 481 BLAKE2B 26ea134bddf0c1168944bc76de20cf1b860178a990dab88ee61f3656495ea125d97e929e0626b6626f2fa12e1219e3dcfb80067e9f682311bb75d8750dc7eddb SHA512 c43c28774e9750f79624ff682bbcd8566aadf18bf4c44692d214e80f654eecf63f26bcaa8c7292d4d8e3969350f50f0b720982099e0114866630a8c0828088a7
 AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed
-DIST makemkv-bin-1.16.1.tar.gz 15306460 BLAKE2B bc2c95da1e0bb6cb1280d2dbd16cfa8eaa5f9bb3c056b43f442b6d12c41ab593758f4d9eac6c472e277696707739e71b9e5746096490a926c9e97ca9d7ff36c2 SHA512 c0597aeff56da40074570bb66e6d1c16a31ec54d283d28681f2edaf89a4597fa8bea4adb45a27dfd348e99aa3c008b5447bb9dd9d0dfb11bec36d044ff3bd404
-DIST makemkv-oss-1.16.1.tar.gz 6409619 BLAKE2B d0381fc452c57695bbac66137ef5d3df97fb9c950a52c3cb97b08422d9d02ef1671443e0584c47127654502e893f6d57c197e2fa9e769727944dc2895e2a66dd SHA512 12c83ec05e31a54d75355cf396eae977319318dbe0384a08ed5a75648ffd8e4840e3c3a0bf855c14153a77e2bb831951b96c6c01a48d1d7f5285497ad772f199
-EBUILD makemkv-1.16.1.ebuild 2967 BLAKE2B 74b0362791559182073052251d34363cf00d476d80d92edee471e5b59098da9d6157fb13b9b3b38e6c46421058835c49ccc93926688354795c7ca555a0dd5e86 SHA512 ff8210b70501c8064ed5e3d110fe88289e1b9bde09b901a62e1e2a245e660f12c94f2b735f9f534fe936963594d6ca87c88bafb24f152c01674ba3bcb8574dd5
+DIST makemkv-bin-1.16.3.tar.gz 15309313 BLAKE2B 34cbf3ee5400a21a4c9f3f71e95afeb2129bda69daa4743321c3aff9ad8bf2c8f703fbf63e45720612b5305efb04484fd1a5719af74398fde2a15a3f982d65b4 SHA512 0806d8f9adde605efeff5d551ba721d9f400c8643e78ec562425aec1af33bb429e2816c5b9cf2e4a1b1efe4161f5d2623a182799d75c9833f045f5420bf13543
+DIST makemkv-oss-1.16.3.tar.gz 6536679 BLAKE2B 63d119dff4098b47cafbe63112118922f77404f1d9353f8aae944be105754a6662db576d318522436ce5d4121528e5b9cc06829e30787120928e8be881d953d6 SHA512 a620141cbaeb621feb5746a753eb448b181d9c795d0f78fad0659baeea21ebf8c6ce925b24f8b7d6844f92b0438a36a32fbac7c7260858e26116d55832a233c0
+EBUILD makemkv-1.16.3.ebuild 2978 BLAKE2B e7fabbd1fdcf3f0286a66f79ff81943ee59dcbb2c5195e79ee2ccbfd6bffa2b8c9e2b2046a203edc2538aff15d12a72e800d4f96d0b92a44181f47f7c5b5c52c SHA512 0dc533cbb7d81a7cff529467f33920c4c68c5a1191acbdc10ae621127cf20c8d5cad27d1311701e3642aa06d116b28b81b52a4e59b85c79b7b0d7a4de145dd74
 MISC metadata.xml 1166 BLAKE2B f2e594a7e322225101561a998472a832c3d2559dbfd79817f2fd1eaf9b0e7145fb467b9b0421d13b3df90ece45ff969d97e9e44d9147d4b0a57e4d8fd9104345 SHA512 d8e8d898cf3ee9428fc1b08e292608da7a4f753ad22053a521c475e9445dafa9ac7c2c5139ed4ab9009b0d59e95737f77773d15f8590b8a4cf0f39961d714fb7
diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch
new file mode 100644
index 000000000000..d7a2f1be16c5
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-flags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2021-03-19 13:06:50.000000000 +0000
++++ b/Makefile.in	2021-03-30 23:28:42.720480399 +0100
+@@ -112,7 +112,7 @@
+ 
+ out/mmccextr.full: $(MMCCX_SRC) tmp/gen_buildinfo.h
+ 	mkdir -p out
+-	$(GCC) $(CFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \
++	$(GCC) $(CFLAGS) $(LDFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \
+ 	-ffunction-sections -Wl,--gc-sections -Wl,-z,defs
+ 
+ tmp/gen_buildinfo.h:
diff --git a/media-video/makemkv/makemkv-1.16.1.ebuild b/media-video/makemkv/makemkv-1.16.3.ebuild
index f28d5a01e2db..06832f14e6ac 100644
--- a/media-video/makemkv/makemkv-1.16.1.ebuild
+++ b/media-video/makemkv/makemkv-1.16.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.makemkv.com/"
 SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 	http://www.makemkv.com/download/${MY_PB}.tar.gz"
 
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+gui libressl"
@@ -37,7 +37,6 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	media-video/ccextractor
 	net-misc/wget
 "
 BDEPEND="
@@ -50,6 +49,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-path.patch
+	"${FILESDIR}"/${PN}-flags.patch
 )
 
 src_configure() {
@@ -64,6 +64,13 @@ src_configure() {
 }
 
 src_install() {
+	local myarch
+	case "${ARCH}" in
+		arm) myarch=armel ;;
+		x86) myarch=i386 ;;
+		*) myarch=${ARCH} ;;
+	esac
+
 	default
 
 	# add missing symlinks for QA
@@ -77,7 +84,7 @@ src_install() {
 	cd "${WORKDIR}"/${MY_PB} || die
 
 	# install prebuilt bin
-	dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
+	dobin bin/"${myarch}"/makemkvcon
 
 	# additional tool is actually part of makemkvcon
 	dosym makemkvcon /usr/bin/sdftool
@@ -85,9 +92,6 @@ src_install() {
 	# install profiles and locales
 	insinto /usr/share/MakeMKV
 	doins src/share/*
-
-	# add symlink rather than relying on MMCCEXTRACTOR env var
-	dosym ccextractor /usr/bin/mmccextr
 }
 
 pkg_postinst() {
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index e913c245b4b8..5d8379f76a42 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,3 +1,4 @@
 DIST mediainfo_20.09.tar.xz 1984148 BLAKE2B 6926d9ce787b9f9e5c07fe0ddf98e186139ea25c7ab6b3573dc1732850a7f98aeefdeca2157fdcad83d652332705028df12a1cf1e6377f9c1e23b7865578cfd8 SHA512 b6c8bf661585fa6b8e82c7f4bafacae8505078c5c57bc1c703ed16ac237dad0829569dd33fdaaadccd394bdd93088d9b71e5ad2c2294f75aa641004ec91feca9
+EBUILD mediainfo-20.09-r1.ebuild 1613 BLAKE2B d2cbc44406a1b9f1389b636a236fd2c1961e4c50494d14268e851db3cdb591ace48adf6021cd620d63f010a262180b14a98fae92b8fa85d1fab57d99a5585775 SHA512 42d2fcdd06b6d5bc0e9d02ab779a300085e60093cb47690a0713ddb7f08d9ce92239f4dd40bb5ddd9cbb2eaa10ff10bdb788905ba6c6d6921bb669782fab198d
 EBUILD mediainfo-20.09.ebuild 1603 BLAKE2B 5c0dc5cd5992ce35df04b60e0f870a1203cd60bc67e923f20b7575827695d01f092785149fab5e2aad3297215d1128599b9177590bad13ad28226a1b05b4dd7f SHA512 d0779a099600b1478d234fa61f2696961266d2137c904e648ca77d52433588fe7015e929f2ced4eb5444fa4ee63fb05461f5f26a7cd86c7b7da6203a58ff2804
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-20.09-r1.ebuild b/media-video/mediainfo/mediainfo-20.09-r1.ebuild
new file mode 100644
index 000000000000..cb4768702f87
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-20.09-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit xdg-utils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="
+	~media-libs/libmediainfo-${PV}[curl=,mms=]
+	>=media-libs/libzen-0.4.37
+	sys-libs/zlib
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/MediaInfo"
+
+pkg_setup() {
+	TARGETS="CLI"
+	if use wxwidgets; then
+		TARGETS+=" GUI"
+		setup-wxwidgets
+	fi
+}
+
+src_prepare() {
+	default
+
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		sed -i -e "s:-O2::" configure.ac || die
+		eautoreconf
+	done
+}
+
+src_configure() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		local args=""
+		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+		econf ${args}
+	done
+}
+
+src_compile() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+	done
+}
+src_install() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+		dodoc "${S}"/History_${target}.txt
+	done
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest
index 3684c5d840c1..aabca7d700c6 100644
--- a/media-video/mjpg-streamer/Manifest
+++ b/media-video/mjpg-streamer/Manifest
@@ -3,5 +3,5 @@ AUX mjpg-streamer.confd 347 BLAKE2B f544307fca9e420d5a8edd3b8ea1834dc5d9125d2aba
 AUX mjpg-streamer.initd 1265 BLAKE2B e42564a98636a1a5dc059bd418e281ab6da494f88cb64cd56c58401d55c4e02208c5f45289d0ee04ce16fe4118a7cbcd2f5f2d4a289f171be790bbb5e8d81a3e SHA512 4cc90922e9fbd966f9a41719e18672e46a94a7206f18e12e8ac19bd40de3944597f0323c42862731079201367381af9de8cfd4ee8d89f7fc3173640fda9ef5d9
 AUX to-work-with-kernel-3.18.patch 2832 BLAKE2B 157c3c5c30973cdc64d9bd0a5cadba238dd6e33d72b96b0776065f57bb34e14f47336e509e8dbf1fe6fbb8f715fd99837b42e9ecec6fcc4c5da1101300c1e900 SHA512 c619c788fd09118f309b081eabb7f80835690923e098368f16f26a7b4e6b63e494dd5f91a9fe73d83b3151b77dd6393263ab3756f7d8b3a6286ac3d52f1e89c8
 DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d7151e32cd8dac11a083cc6a88dc350a523174685b2ff066fa99db13b82a6a4960d370b97b27aa3663ac323fa54908bb0108857d0 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332
-EBUILD mjpg-streamer-0_pre20120621-r2.ebuild 1895 BLAKE2B f78c80d7b4b94b4d91082f7a332d11dde3f6b994f30d0c1f1d704a80d725f3231a4fe492f5e69a40baa71ee1b1de638d65d4fb73dd9d77b2ccfcd98db5d220ea SHA512 6ada19dc511b45b5a565cdbcc9651269e559b70007663062531e6892e8b3b08bd306b13e4b3b72506a609a985dfe10814d01f52a887feae833ebd996e55033cf
+EBUILD mjpg-streamer-0_pre20120621-r2.ebuild 1879 BLAKE2B 1bc5482504e7ccae9c5de4240dc7033046761d82cf066f6f02f02ef9259c578dbb032f388566fa985a36a11598429b9b63896d320d2ccbe25beb97c6e92fd663 SHA512 d330b8e7015e62f72e146d2555522d38c97661bafb4c4b41e7953324523fc85175d6eb5a61c7827646b11efb85e6e9e34df811c770c4bbfe0f0ef0659d68cbed
 MISC metadata.xml 1739 BLAKE2B eb540aa61dc989023ab95953685d26a490919bc1faf9a4a3a144d47a9ff7b2947613114008365aec1f78163dd556be8251fc7532bb7d8ea17691ba1ba166531b SHA512 6efd0e69791aa856af7c404f380887a1936709bec939b2dd5b6082dd3f02519797070fee34a10e22072d630dfd4293bcb6a8d8b1b8c677b40009ef309cc7e6f1
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r2.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r2.ebuild
index 0e44b70eb0ab..ab0b5bde573c 100644
--- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r2.ebuild
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r2.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils
-
 DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatible webcams"
 HOMEPAGE="https://sourceforge.net/projects/mjpg-streamer"
 SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index ca14c97da64e..ae3c7b758333 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -5,11 +5,13 @@ DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 995c468f9e2069204b539cdc3200d5543e
 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
 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 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505
+EBUILD mkvtoolnix-56.1.0.ebuild 2925 BLAKE2B d9584ae4c8c9fc2b15b8542d7d315711e92a683224c18069bf5383efb307ede48b5f233eae69184fe08ffed471fe2f6e6b79c9a311173ecc22e193a8bb15297e SHA512 f67f7cc9d7a1258fe2942a650047e5a1ffc061ef09379dcc98cfbae29fb93709dbc35ca4042fddc4ffd46be35d0439dba5477e0522a09141331e6037f309cce3
 EBUILD mkvtoolnix-9999.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
new file mode 100644
index 000000000000..c093e341ab9e
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
@@ -0,0 +1,130 @@
+# 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 )
+
+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/motion/Manifest b/media-video/motion/Manifest
index 8f5c995d563f..439db39abecc 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,10 +1,6 @@
-AUX motion.confd-r4 773 BLAKE2B 1a7f0128ec385751d75152c4a36cc2afe57a36b55cd5efe5035af3e78df775edf11568f8bae3acbf7c986b967087cb8b633724bb08bbbf24a0102a082dc5a55f SHA512 4aff16be6fd77909751b034ada9611522acb3c8de0fd160fe67c415eb54cb63a8adad055972ffc3ea7428588a6f5673bb9b311be4660c180796d6067eb3c45e5
 AUX motion.confd-r5 884 BLAKE2B 63c497e942ae499271504d308f826f23d718ac968f7735e340ef2fa8a7b1a64d63365686cc00137141bd4b788975c00b4ea3eaf38c1dd9bd219d3d50ff0da8e0 SHA512 998dcfe4160c90adf2683f0194fcf867f0062f1e54355c1158ecb9965a5ed2c30f362147ac9a915b42ba681184d91e78c3a1d397c4b92ee48440d00f3ac0df99
-AUX motion.initd-r4 975 BLAKE2B a9f001318783f793474ef295d5724ff207d646051783d9927b2949c5c3adf65fef11ca63071f1401cab017ba1cf676f39bb2298b848e9f57185a1875c7e4c316 SHA512 ee0b471da01f7a7bb6a19fb974ec775e5d830b4970b5a690b2ba8043bddfe79245c72546d4a41b5d3bb50adbe03b79373ecc643161b50bd88386e66ee318b9ef
 AUX motion.initd-r5 1083 BLAKE2B cc013f9d529b722be26db8ead665380ce1724436f53e0131705bd99177d5f5eabaad939df78995be28d20f002753c7d43b382781660df3f56bf4126bb3cda75c SHA512 4106c502d75f6c5d58766d3bc784dc75b2a1ba0c4897093ed3afb6c1e5efc2032e150d657b8471e70f34ff932c4db93ef1adf55485159bd6906a4766fd5fb12e
 AUX motion.service-r4 462 BLAKE2B 3aeac7440cb545bbf7c41a59eb81260202e7783f701ed20ad33e8f69356bcc78ff7a23b3f518df7dc0ab0eb664d05b75e449afa7abbf1f993ad3c77b0eb83fb7 SHA512 2fbcdb381888d63d0becfc04473f915d75f97e267e4fb2bcf2554e53cbc302fd45b544b7c267a99a05540fb79ce4fcf3e3bc7e973fe08d0db5481e7728c02a1f
-DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6
 DIST motion-release-4.3.2.tar.gz 849378 BLAKE2B 2ff49f44bb1d57123760860ae17cc241ecabf3d045ac0c45e1ca08ce3ac8be2fec308492472c37c0d869bc21a7c04658c923c763f9b8f6b547403fc094b03196 SHA512 df54297eebc44b3bc50fd40890c69a9cbbfc5936224bf7027065364e794d7201ceadd99ac99bf43113ec3368f2b5ca435d2956258b9c774e03a6750b41346a7c
-EBUILD motion-4.3.1.ebuild 2855 BLAKE2B 595ffa0920ab840308ca9562657532b61cf72d528a2bc976b384332d97ed255512710c142267479be2b04b7c255004d32ff230c5324871d7f85ba65281157667 SHA512 36bf969a4608a3156d1a798ae39f0df5d174d0557ff752dfdc060aa7e05e6146ff432827d0537b07231bdc922c8f886ef51c34a6f8f9097820ac177f239038fd
-EBUILD motion-4.3.2.ebuild 2234 BLAKE2B 7adc8b1b4b3b552fd80a5580bd2baa2969f28cd0d5df6712ca93836a362c085b12e6d6baa1af478adba2039f35ba21200a365ae27b6e41a0444f463791e39678 SHA512 c94be53b5ea1f5511b6dbd57f3bf815ed8e5a3e46c04f4b21d76683fcc95e34c14e2e296fb0e8310c9c90608681512330a77d5d7ad632a0d250c9ce2c4fb8026
-MISC metadata.xml 880 BLAKE2B eb7167f5b1c6cea244e553aad747ad114c46e1f8dad0d26c271afb7630ef88bea28e824c454913dc5a1f56e80ecba1ff7b518384eff503e06c18fa02ea80b13f SHA512 b44ede0bcef1053fb097cdb8f243ad8d9e17ee2ba627ceb1ca31a360b8d22f58d5fe43a81d0c81494916698f8c448d1254299c5358cef977405396846cda7320
+EBUILD motion-4.3.2-r1.ebuild 2236 BLAKE2B 387396f07ea1a7b287acd42683e8e7d5ab0485d6e2d9cda610eeeec4880f5c0513038de8f48555bc278ebc3e76bc78523c4d63f09ffd7e27fe2d7352c07d06d9 SHA512 24449e9617fab38423b61269325e549f349dcd7fd43d973d8b9b5fa29ee5b147914d711344ce90dc106773238038de7b35442bc3fb9a6874cf08850675796fb6
+MISC metadata.xml 765 BLAKE2B dd7f3c7c7fc7a1dfa9052eb1508bc6c1ab502fc284ea884918d56b0a497aeb13506764fc6237176bbc7fd5450e10cbd37b321b07b909e6c199226363dacf9dc0 SHA512 55c0c250f64a23c8b03615a9c8bd510bfbddc088cb1d485e0faaa071f0fe148fa8312915cbd08cce0eeda13d4398cc6bebae42bfba82cc81b9d13b51303cc32e
diff --git a/media-video/motion/files/motion.confd-r4 b/media-video/motion/files/motion.confd-r4
deleted file mode 100644
index 8a200d14928c..000000000000
--- a/media-video/motion/files/motion.confd-r4
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# Motion OpenRC conf.d file
-# All settings are optional
-
-# Set the user and group under which motion will be run
-#MOTION_USER="motion"
-#MOTION_GROUP="motion"
-
-#Set motion's config file:
-#MOTION_CONFIGFILE="/etc/motion/motion.conf"
-
-#Set motion's log file. Leave unset for syslog:
-#MOTION_LOGFILE="/var/log/motion/motion.log"
-
-#Set log type:  1-9 for COR, STR, ENC, NET, DBL, EVT, TRK, VID, ALL
-#MOTION_LOGTYPE="9"
-
-#Set log level: 1-9 for EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL
-#MOTION_LOGLEVEL="6"
-
-#Set a default dir where motion places its output
-#MOTION_DIR="/var/lib/motion"
-
-#Set the umask for the output files, for additonal security
-#MOTION_UMASK="007"
-
diff --git a/media-video/motion/files/motion.initd-r4 b/media-video/motion/files/motion.initd-r4
deleted file mode 100644
index 30d5e25cb08e..000000000000
--- a/media-video/motion/files/motion.initd-r4
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${MOTION_USER:="motion"}
-: ${MOTION_GROUP:="motion"}
-
-[ "${MOTION_UMASK}" ] && umask="${MOTION_UMASK}"
-[ "${MOTION_CONFIGFILE}" ] && command_args="-c ${MOTION_CONFIGFILE}"
-[ "${MOTION_LOGFILE}" ] && command_args="${command_args} -l ${MOTION_LOGFILE}"
-[ "${MOTION_LOGTYPE}" ] && command_args="${command_args} -k ${MOTION_LOGTYPE}"
-[ "${MOTION_LOGLEVEL}" ] && command_args="${command_args} -d ${MOTION_LOGLEVEL}"
-
-command=/usr/bin/motion
-command_user="${MOTION_USER}:${MOTION_GROUP}"
-
-start_pre() {
-  if [ "${MOTION_DIR}" ] ; then
-    mkdir -p "${MOTION_DIR}"
-    checkpath -d -o "${MOTION_USER}" "${MOTION_DIR}"
-    directory="${MOTION_DIR}"
-  fi
-  if [ "${MOTION_LOGFILE}" ] ; then
-    local LOGFILE=${MOTION_LOGFILE##*/}
-    local LOGDIR=${MOTION_LOGFILE%$LOGFILE} 
-    mkdir -p "${LOGDIR}"
-    checkpath -d -o "${MOTION_USER}" "${LOGDIR}"
-  fi
-}
-
diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index 45dcbfba21ef..cec3a16a5f2f 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/metadata.xml
@@ -15,7 +15,6 @@
 	<use>
 		<flag name="mariadb">Add mariadb database support</flag>
 		<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
-		<flag name="supervise-daemon">Add experimental suppport for OpenRC's supervise-daemon process supervision</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Motion-Project/motion</remote-id>
diff --git a/media-video/motion/motion-4.3.1.ebuild b/media-video/motion/motion-4.3.1.ebuild
deleted file mode 100644
index fcb7435c91e5..000000000000
--- a/media-video/motion/motion-4.3.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 systemd
-
-DESCRIPTION="A software motion detector"
-HOMEPAGE="https://motion-project.github.io"
-SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="ffmpeg mariadb mmal mysql postgres sqlite supervise-daemon v4l webp"
-
-RDEPEND="
-	acct-group/motion
-	acct-user/motion
-	virtual/jpeg:=
-	ffmpeg? ( media-video/ffmpeg:0= )
-	mariadb? ( dev-db/mariadb-connector-c )
-	mmal? ( media-libs/raspberrypi-userland )
-	mysql? ( dev-db/mysql-connector-c )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="${RDEPEND}
-	net-libs/libmicrohttpd
-	v4l? (
-		media-libs/libv4l
-		virtual/os-headers
-	)
-"
-
-# Breaks src_install(), #727056
-RESTRICT="test"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need to setup a configuraton file (/etc/motion/motion.conf) before
-running motion for the first time.
-
-If motion is built with the mysql or mariadb use flags then please make
-sure to configure a matching database_type in the config file.
-
-Motion runs by default under user motion and group motion:
-- change this if needed in /etc/conf.d/motion
-- or add users who need access to the output files to the motion group
-
-To install motion as a service, use:
-- rc-update add motion default # with OpenRC
-- systemctl enable motion.service # with systemd
-"
-
-S="${WORKDIR}"/${PN}-release-${PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ffmpeg) \
-		$(use_with mariadb) \
-		$(use_with mmal) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3) \
-		$(use_with v4l v4l2) \
-		$(use_with webp) \
-		--without-optimizecpu
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} \
-		examplesdir=/usr/share/doc/${PF}/examples \
-		install
-
-	# build INITDAD string cwto be added to initd based on use flags, eg
-	# "depend() {
-	#   use mysql
-	# }
-	#
-	# supervisor=supervise-daemon"
-	local INITDADJ=""
-	( use mysql || use mariadb ) && INITDADJ=" use mysql\n"
-	use postgres && INITDADJ="${INITDADJ}  use postgresql\n"
-	[ "${#INITDADJ}" -gt 0 ] && INITDADJ="depend() {\n${INITDADJ}}\n"
-	if use supervise-daemon ; then
-		INITDADJ="${INITDADJ}\nsupervisor=supervise-daemon\n"
-	else
-		INITDADJ="${INITDADJ}\npidfile=/run/\${RC_SVCNAME}.pid\ncommand_background=true\n"
-	fi
-	cp "${FILESDIR}/${PN}.initd-r4" "${T}/initd" || die
-	echo -e ${INITDADJ} >> "${T}/initd" || die
-
-	newinitd "${T}/initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	readme.gentoo_create_doc
-	readme.gentoo_print_elog
-}
diff --git a/media-video/motion/motion-4.3.2.ebuild b/media-video/motion/motion-4.3.2-r1.ebuild
index 10749fd8c447..19c0917b4e13 100644
--- a/media-video/motion/motion-4.3.2.ebuild
+++ b/media-video/motion/motion-4.3.2-r1.ebuild
@@ -17,6 +17,7 @@ IUSE="ffmpeg mariadb mmal mysql postgres sqlite v4l webp"
 RDEPEND="
 	acct-group/motion
 	acct-user/motion
+	net-libs/libmicrohttpd:=
 	virtual/jpeg:=
 	ffmpeg? ( media-video/ffmpeg:0= )
 	mariadb? ( dev-db/mariadb-connector-c )
@@ -27,7 +28,6 @@ RDEPEND="
 	webp? ( media-libs/libwebp:= )
 "
 DEPEND="${RDEPEND}
-	net-libs/libmicrohttpd
 	v4l? (
 		media-libs/libv4l
 		virtual/os-headers
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index 6321e128a2a8..01a4ff288031 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -1,11 +1,11 @@
-AUX mpeg-tools-1.5b-64bit_fixes.patch 6986 BLAKE2B c9260ac02bfad853af227ff5cba05c8c4a932dd3461362a7fb6d817b049f0ce3407182777ed26ca3fae1849729217c01237c3ef3bcaff0490f5656fa6eae34a4 SHA512 8d8f596cf39c1e9535ae21f8399136189e0775cbe69146208654bf394b8524932a4961e99061c76ba195c20909ab6dc2f420a12b72862ebbc6c81d7e7c7c6cc6
-AUX mpeg-tools-1.5b-as-needed.patch 1526 BLAKE2B 823889c2cb6abe1683cd72e63b7a93cbf367d9cde130354f25ff30b3c17ed878d71fb830e7258c797c8d5579a722c4daa42d61d80aee9003236a8626c8ff268e SHA512 5874d5241ffb9ed6d6bc35774f6e643c141c8ec63811d8f761700acef816911220df20a943c739f4df4ce95783502f8963235ae4ecc0b66bd116a6daaa2aa5d1
-AUX mpeg-tools-1.5b-build.patch 1414 BLAKE2B 8a0f804f670fbd75617c38726149b2db0f3594c3082e5efd66877e4214bc8bc67eccca91aabd10cbedb84da1e92c2df7ec01a5b1cf7ca368f0fdf2bfad4c6726 SHA512 f2bfe1126926c6473a149ea120898eb252c681808cd2745bed5428164ebeabfb33218cb7f98b4a9930af9d88055ca067129f1a4ffede824d5d6179762f27a4d7
-AUX mpeg-tools-1.5b-jpeg.patch 1498 BLAKE2B 32e421efe289622e34fc7387f4c56de65e210297c60a69a792a56a5e66eb8918f9df82628b705a4f98af70bc1c952dacd6f883af90eedea083170e65e6a7a8b1 SHA512 9bc509c603e825d94372f866fced352149d5d003c2ee247eb356db22f80bbf6cfbfcaaf03fb7a104ff84548e52f0f3034619e15598d0ae04df36d4b4332ea18b
-AUX mpeg-tools-1.5b-powerpc.patch 1041 BLAKE2B 9297129f0a028174c9c58f5b9e5af22fd8597c9a9d5e430ad0deacfa4f8378f2ba57ac3a1086398186187c5055f71cff3bdac903a404fd13ce0e251fe9d9a859 SHA512 f0ee310dce12d9137186b7d99aa88282cb65838855820ad3642bf090194be07d5f6cfef509561d1e097a938e68a6c2f8c61536a1921d08df458c66b83c6eaeca
-AUX mpeg-tools-1.5b-tempfile-convert.patch 4097 BLAKE2B f60e5bb386c468827024162cc50135fb0cfb858d2f4a373fc6ee9d4f465915be7c7206d1b8c75a1c47695cc2fdf1737979c4749bb97aa5da17c7fd1c12e336df SHA512 b90879e884e9f5a5bd61149adda293c149e533b8fdb969b6e6d579917b2abed0fb848629f1567782d80c97dcf40eaf3c005731d216c02d1e97d54543c74e6e2d
-AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538 BLAKE2B 4bbc67856c745ea320a6ae70e3ce43db54b044f360c00a94e84582d30d07eeb419dccf47d6b0ec47884004861751383531c119547c11707e924a9e537ee83f5b SHA512 229fcd4e28628fa8d45a20766e6b46bcf2e3a6ea9e69b2e8764b180b2766d539a701c64a7969a4020805a06188825c5fa5a5e1146052ee6a52edbb7d3d572f1e
-AUX mpeg-tools-1.5b-tempfile-tests.patch 5256 BLAKE2B bf52a2bc69f42af32cc6e0aecd910d6c37e12c0a9391d18dd4fff9e7304a99550b9c0a08c608aa6b3bfeda14166caeabb154c6ff7af7c4c307dc23796c46dfc5 SHA512 ee616fc5b4b4bf15e547d737a00a4349fff98127c5ec836e63ae5b6b3e365c50b6cba1c535fd27de2ce6ee28ef5bd3872f5d3b7880f39fe23c7e8ebdc24508e8
+AUX mpeg-tools-1.5b-64bit_fixes.patch 6914 BLAKE2B 4b9c42f10bc8e44dd402233a933c523cb5fdf15802575e762efacb5f165efeaff45ebfdfc414f6819c9f959301bf6844d7cdc7488145e7ee76192d34cbc6f08b SHA512 1d45ceb3b5bcd8c536b0d1f5a29e2e010dcc0bbff687588e795772188100fe2370e42ff889b649912c97363cd112db0ef4bd1ea22b13b6c5d4cf5b62ba9f2465
+AUX mpeg-tools-1.5b-as-needed.patch 1524 BLAKE2B e153902331f7c58c7e9a10f7c9c6cb95a801d96b4961ffa43a2aae8cd8fa10096c391a87540c76e478a7e164834baa243c442aa44b38d9794ab0aa3ece2a2df5 SHA512 9bfa844b66a0eee2c025e1e01cb8802d4ea0fb2d5a4f8172c10516732a9edb5b02877b0e8d4298f5e8d2bdbe46ab1b067562c067cbd866a921b7f76032da7a65
+AUX mpeg-tools-1.5b-build.patch 1349 BLAKE2B c724711b8f6c43f537995e78b134da59eeb1101ebac0e38422389f819ca74f1ae528bb14e6cf723135576b9b60fec157fa6cfb0364ebad4b13a4b31f966f88bf SHA512 e1854262fcb1a3373c7ba907e672eaa4432c0c5e5d963df0174bc01010cbfdb5ea1679102ed905daaf3ef0171a93097a5ee20638c37a45149c57e4fcf26f0271
+AUX mpeg-tools-1.5b-jpeg.patch 1554 BLAKE2B 69de8a65db7e8a005ccce41b19ba749f7721005bfa93d12eab1b2b1e9148fa049b0dc1548a213938ff962b2efec86d53c7fe2db532ad7d6c26bd3a92e73da43e SHA512 ad87f8cc38342c62ac47fea8b9e6b1beaad5a7fef0059336b41d7222c720fae00edbcaf7cd4eb8fb3f7d7bfc03df82db9928a9c3efbc542dadf94c1d5ee10ad7
+AUX mpeg-tools-1.5b-powerpc.patch 973 BLAKE2B 932e71d12e33f53e9c14513b4c3fbf91db08954eaaacca7c3cb1a0dc5fc8457b71457c86efd5952928aa15cedc78ba36e9765d7eb19e42ea9d8fa39362d0fc1e SHA512 a3a7447f57a5d83e6cc25551186d03a8a89b956185e3457ef46ff2a9c594a8a0ca2f1f0a2a5da0299a70b40b3d52f2254d25e46465c899315149a9bc3f410a39
+AUX mpeg-tools-1.5b-tempfile-convert.patch 4117 BLAKE2B 0ef961ec23cb88da70d1317a43a38fcf95d58554664a078ebf81d0546ec085ceae5934122c8e6633a9d79efe82ff43c0283940fa6ff54e0dfc2c90205eabb3bf SHA512 8af3a8c8116243380faa9b628e743e1d266e762d0aa9dc3c15ca2b95a4c3d15b57b84f0bb7ce49c426cb3c1e87ebbe777358083d7e09a6150ae79cdda7c12e92
+AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2546 BLAKE2B e5c1f72de985dbfd3eb28f9fdcded691d498cc8106a65c3020e0d9c8fd312ef6875e6541a1bfaa684c23925bd53903259d90ed6176416ff953451a4cba158c02 SHA512 08e1fed266b3b921a214cd0d881ebe219b79a7b7b3044abe9348a7d2ec28a7b7ad50c538a64cc6818839724923bb7bd021614ca8f9fe5d23c0e419f2c549beee
+AUX mpeg-tools-1.5b-tempfile-tests.patch 5304 BLAKE2B c23b571b117c0dfc5e115dfa47b318051859ab758fb4a77f482deac5d470001d1cd289717d779133e961024a17677fcbe4cf224b18ce2c104d37197f7d268841 SHA512 3942aa4d6d4935d7401b422837df254fabdc37c9b1c1d42fe978e746f1b74a6964990f14bf0905b3963e180c90b32e4b7150079137635e6c2a42c357f1472f7e
 DIST mpeg_encode-1.5b-src.tar.gz 2028724 BLAKE2B 6758a34bbc7a967311f710277b37d6f7612b9f4be429e0909d623b33ff83e7c10a8f7de9de3dcbc69080a23f6312b611315732eede649165873c50e92d53f639 SHA512 df6f9def3ba05c752ebdc5311c512688d6fae380480009dad55b4183a378685eca79943c075166b21ed3bfd0cce7697761abc6ec795f57c0ed1c60c2a5cba469
-EBUILD mpeg-tools-1.5b-r5.ebuild 1788 BLAKE2B 9a8ca3d9486b3f0bdfb31411d8bbb4579b219f76b774e13b348b314c3460b213341a8bd77659610142b5f846df790b36bc7c4814fd19a46d76d14466ca9c4b22 SHA512 f2f00e951318bf3dc3e2a628320e6f3885e9fe604ea926a97f17fc8b367f2530c47b3e2d899a6148a2b0836b99da24442a5b8015f26e0cbc52088d24ca11b77c
+EBUILD mpeg-tools-1.5b-r5.ebuild 1758 BLAKE2B fccbc220d9e73d136b5b70614cb9887d10ad6aba42988c93de27745ea3f452857ceb8ee9d9a44ce45d4d1c72c8b9fd6050aba3853d274ca719fafcc0af925efb SHA512 480f536ae7cbbdee5a3b9f5ead46d89cfe5d9c71a9ce8f0abaecb4d540d272a0db6b7f71472a9f59b9be0ed8d9e3fe69ebba4e5eaa82c8145a2ee8dca2f797d7
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
index fa2e70304dbe..d1f25884453a 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
@@ -1,5 +1,5 @@
---- work/convert/eyuvtojpeg.c
-+++ work/convert/eyuvtojpeg.c
+--- a/convert/eyuvtojpeg.c
++++ b/convert/eyuvtojpeg.c
 @@ -22,6 +22,7 @@
  /*==============*
   * HEADER FILES *
@@ -25,8 +25,8 @@
  }
  
  
---- work/convert/eyuvtoppm.c
-+++ work/convert/eyuvtoppm.c
+--- a/convert/eyuvtoppm.c
++++ b/convert/eyuvtoppm.c
 @@ -22,6 +22,7 @@
  /*==============*
   * HEADER FILES *
@@ -53,8 +53,8 @@
  }
  
  void Usage(void)
---- work/convert/mtv/archdep.h
-+++ work/convert/mtv/archdep.h
+--- a/convert/mtv/archdep.h
++++ b/convert/mtv/archdep.h
 @@ -45,16 +45,46 @@
  			    ((char *)(to))[5] = ((char *)(from))[2];	\
  			    ((char *)(to))[6] = ((char *)(from))[1];	\
@@ -104,8 +104,8 @@
  /* Define types of specific length */
  typedef char		i_8;
  typedef short		i_16;
---- work/convert/mtv/movieToVid.c
-+++ work/convert/mtv/movieToVid.c
+--- a/convert/mtv/movieToVid.c
++++ b/convert/mtv/movieToVid.c
 @@ -295,7 +295,7 @@
      exit (0);
  }
@@ -121,8 +121,8 @@
      fprintf (stderr, "done\n");
 +    return 0;
  }
---- work/convert/ppmtoeyuv.c
-+++ work/convert/ppmtoeyuv.c
+--- a/convert/ppmtoeyuv.c
++++ b/convert/ppmtoeyuv.c
 @@ -39,6 +39,11 @@
   * HEADER FILES *
   *==============*/
@@ -152,8 +152,8 @@
  }
  
  
---- work/mpeg_encode/bitio.c
-+++ work/mpeg_encode/bitio.c
+--- a/mpeg_encode/bitio.c
++++ b/mpeg_encode/bitio.c
 @@ -79,6 +79,8 @@
   * HEADER FILES *
   *==============*/
@@ -163,8 +163,8 @@
  #include <assert.h>
  #include "all.h"
  #include "byteorder.h"
---- work/mpeg_encode/jpeg.c
-+++ work/mpeg_encode/jpeg.c
+--- a/mpeg_encode/jpeg.c
++++ b/mpeg_encode/jpeg.c
 @@ -65,6 +65,8 @@
   *==============*/
  
@@ -174,8 +174,8 @@
  #include "all.h"
  #include "mtypes.h"
  #include "frames.h"
---- work/mpeg_encode/headers/libpnmrw.h
-+++ work/mpeg_encode/headers/libpnmrw.h
+--- a/mpeg_encode/headers/libpnmrw.h
++++ b/mpeg_encode/headers/libpnmrw.h
 @@ -20,9 +20,6 @@
  ** that point here, feel free to tweak or remove these declarations.
  */
@@ -186,8 +186,8 @@
  /* End of configurable definitions. */
  
  
---- work/mpeg_encode/libpnmrw.c
-+++ work/mpeg_encode/libpnmrw.c
+--- a/mpeg_encode/libpnmrw.c
++++ b/mpeg_encode/libpnmrw.c
 @@ -27,6 +27,9 @@
  /* #define MSDOS */
  #endif
@@ -220,8 +220,8 @@
    register bit* bP;
  
    switch ( format )
---- work/mpeg_encode/opts.c
-+++ work/mpeg_encode/opts.c
+--- a/mpeg_encode/opts.c
++++ b/mpeg_encode/opts.c
 @@ -35,6 +35,7 @@
   * HEADER FILES *
   *==============*/
@@ -230,8 +230,8 @@
  #include <stdio.h>
  #include <string.h>
  #include "opts.h"
---- work/mpeg_encode/iframe.c
-+++ work/mpeg_encode/iframe.c
+--- a/mpeg_encode/iframe.c
++++ b/mpeg_encode/iframe.c
 @@ -235,6 +235,8 @@
  int SetFCodeHelper _ANSI_ARGS_((int sr));
  void CalcDistortion _ANSI_ARGS_((MpegFrame *current, int y, int x));
@@ -241,8 +241,8 @@
  int
    SetFCodeHelper(SR)
  int SR;
---- work/convert/jmovie2jpeg.c
-+++ work/convert/jmovie2jpeg.c
+--- a/convert/jmovie2jpeg.c
++++ b/convert/jmovie2jpeg.c
 @@ -33,6 +33,9 @@
  ************************************************************************/
  
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
index 58c74e124f09..0d0c24fa5038 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
@@ -1,5 +1,5 @@
---- convert/Makefile	2009-08-25 21:19:42.000000000 +0200
-+++ convert/Makefile.new	2009-08-25 21:22:54.000000000 +0200
+--- a/convert/Makefile	2009-08-25 21:19:42.000000000 +0200
++++ b/convert/Makefile	2009-08-25 21:22:54.000000000 +0200
 @@ -53,13 +53,13 @@
  all: $(TARGETS)
  
@@ -17,8 +17,8 @@
  
  wc:;		wc -l *.[ch] *.pl *.table
  clean:;		rm -f *.o core *~ gmon.out $(TARGETS)
---- convert/mtv/Makefile	2009-08-25 21:19:42.000000000 +0200
-+++ convert/mtv/Makefile.new	2009-08-25 21:24:31.000000000 +0200
+--- a/convert/mtv/Makefile	2009-08-25 21:19:42.000000000 +0200
++++ b/convert/mtv/Makefile	2009-08-25 21:24:31.000000000 +0200
 @@ -15,12 +15,12 @@
  default: movieToVid
  
@@ -34,8 +34,8 @@
 -	$(PURIFY) $(CC) $(OBJ) -o movieToVid.purify
 +	$(PURIFY) $(CC) $(LDFLAGS) $(OBJ) -o movieToVid.purify
  
---- mpeg_encode//Makefile	2009-08-25 21:19:43.000000000 +0200
-+++ mpeg_encode//Makefile.new	2009-08-25 21:27:12.000000000 +0200
+--- a/mpeg_encode/Makefile	2009-08-25 21:19:43.000000000 +0200
++++ b/mpeg_encode/Makefile	2009-08-25 21:27:12.000000000 +0200
 @@ -203,7 +203,6 @@
  ############
  
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch
index 70a96c439e9c..146c602dc522 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch
@@ -1,5 +1,5 @@
---- convert/Makefile
-+++ convert/Makefile
+--- a/convert/Makefile
++++ b/convert/Makefile
 @@ -24,7 +24,7 @@
  #CC = cc
  
@@ -25,8 +25,8 @@
  vidtoppm: vidtoppm.c
  	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtoppm vidtoppm.c 
  
---- convert/mtv/Makefile
-+++ convert/mtv/Makefile
+--- a/convert/mtv/Makefile
++++ b/convert/mtv/Makefile
 @@ -4,7 +4,7 @@
  
  PURIFY        = $(PURIFYHOME)/purify
@@ -45,8 +45,8 @@
  
  clean:
  	rm -f core lintout makeout tags Makefile.bak *.o \
---- mpeg_encode/Makefile.orig	2005-09-26 16:01:51.000000000 -0400
-+++ mpeg_encode/Makefile	2005-09-26 16:02:11.000000000 -0400
+--- a/mpeg_encode/Makefile
++++ b/mpeg_encode/Makefile
 @@ -97,5 +97,5 @@
  
  #	gcc
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch
index 633321879e8d..faade2d46bbc 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch
@@ -1,5 +1,5 @@
---- jpeg.c
-+++ jpeg.c
+--- a/mpeg_encode/jpeg.c
++++ b/mpeg_encode/jpeg.c
 @@ -77,13 +77,10 @@
  
  /* make it happier.... */
@@ -30,8 +30,8 @@
    
    for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
        cp++,compptr++) {
---- Makefile
-+++ Makefile
+--- a/mpeg_encode/Makefile
++++ b/mpeg_encode/Makefile
 @@ -36,9 +36,9 @@
  ##############
  # JPEG STUFF #
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
index 3eb2d5f15a60..ed2f57c0fad0 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
@@ -1,5 +1,5 @@
---- convert/mtv/archdep.h	2010-03-11 04:35:04.596642403 +0000
-+++ convert/mtv/archdep.h	2010-03-11 04:34:38.949974604 +0000
+--- a/convert/mtv/archdep.h
++++ b/convert/mtv/archdep.h
 @@ -17,7 +17,7 @@
   * Note that these macros *do not* work for in-place transformations.
   */
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch
index 2bab1511bf59..7ee852aed311 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch
@@ -1,5 +1,5 @@
---- convert/eyuvtojpeg.c
-+++ convert/eyuvtojpeg.c
+--- a/convert/eyuvtojpeg.c
++++ b/convert/eyuvtojpeg.c
 @@ -25,6 +25,7 @@
  #include <string.h>
  #include <stdio.h>
@@ -41,8 +41,8 @@
  }
  
  
---- convert/vidtoeyuv.c
-+++ convert/vidtoeyuv.c
+--- a/convert/vidtoeyuv.c
++++ b/convert/vidtoeyuv.c
 @@ -125,9 +125,9 @@
    XImage *ximage;
    char *tdata;
@@ -81,8 +81,8 @@
  
        for (j=0; j<nth-1; j++) {
  	if (read (fd, &image, sizeof(image)) != sizeof(image)) {
---- convert/vidtojpeg.c
-+++ convert/vidtojpeg.c
+--- a/convert/vidtojpeg.c
++++ b/convert/vidtojpeg.c
 @@ -123,9 +123,9 @@
    XImage *ximage;
    char *tdata;
@@ -121,8 +121,8 @@
    }
  }
  
---- convert/vidtoppm.c
-+++ convert/vidtoppm.c
+--- a/convert/vidtoppm.c
++++ b/convert/vidtoppm.c
 @@ -220,9 +220,11 @@
  
  
@@ -148,8 +148,8 @@
 +    unlink(tempfile);
    }
  }
---- convert/eyuvtoppm.c
-+++ convert/eyuvtoppm.c
+--- a/convert/eyuvtoppm.c
++++ b/convert/eyuvtoppm.c
 @@ -100,13 +100,9 @@
      fpointer = fopen(dest, "w");
      if (fpointer == NULL) {
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch
index 1b33bc5dd1c8..9462e6f26eff 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch
@@ -1,5 +1,5 @@
---- mpeg_encode/parallel.c
-+++ mpeg_encode/parallel.c
+--- a/mpeg_encode/parallel.c
++++ b/mpeg_encode/parallel.c
 @@ -586,6 +586,8 @@
   * SIDE EFFECTS:    none
   *
@@ -40,8 +40,8 @@
      } else {
        Frame_AllocYCC(frame);
  
---- mpeg_encode/readframe.c
-+++ mpeg_encode/readframe.c
+--- a/mpeg_encode/readframe.c
++++ b/mpeg_encode/readframe.c
 @@ -227,14 +227,22 @@
   * SIDE EFFECTS:    none
   *
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
index 260f279d2d4b..709f497b5fb0 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
@@ -2,8 +2,8 @@ When running tests, don't use /tmp for obvious reasons
 
 Also rewrite the diffscript in sh since csh isnt always available
 
---- mepg_encode/Makefile
-+++ mepg_encode/Makefile
+--- a/mpeg_encode/Makefile
++++ b/mpeg_encode/Makefile
 @@ -187,16 +187,16 @@
  #########
  
@@ -28,8 +28,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  ############
  # BINARIES #
---- mepg_encode/tst/diffscript.sh
-+++ mepg_encode/tst/diffscript.sh
+--- a/mpeg_encode/tst/diffscript.sh
++++ b/mpeg_encode/tst/diffscript.sh
 @@ -0,0 +1,16 @@
 +diff $1 $2 > ./foobar
 +egrep Blocks ./foobar > ./blockbar
@@ -47,8 +47,8 @@ Also rewrite the diffscript in sh since csh isnt always available
 +	echo "FAILURE! (different exection).  Please send bug report."
 +	exit 1
 +fi
---- mpeg_encode/tst/test_all
-+++ mpeg_encode/tst/test_all
+--- a/mpeg_encode/tst/test_all
++++ b/mpeg_encode/tst/test_all
 @@ -1,19 +1,19 @@
 -#!/bin/csh -f
 +#!/bin/sh
@@ -78,8 +78,8 @@ Also rewrite the diffscript in sh since csh isnt always available
 -csh diffscript /tmp/tsd.stat tsd.stat /tmp/tsd.mpg tsd.mpg
 +sh diffscript.sh ./tsd.stat.new tsd.stat ./tsd.mpg.new tsd.mpg
  
---- mpeg_encode/tst/diffscript
-+++ mpeg_encode/tst/diffscript
+--- a/mpeg_encode/tst/diffscript
++++ b/mpeg_encode/tst/diffscript
 @@ -3,23 +3,23 @@
  #
  # NOTE:  if this script doesn't work, then basically all you need to know
@@ -114,8 +114,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  		echo "SUCCESS."
  	else
  		echo "FAILURE! (different output -- probably endian bug).  Please send bug report."
---- mpeg_encode/tst/ts.param
-+++ mpeg_encode/tst/ts.param
+--- a/mpeg_encode/tst/ts.param
++++ b/mpeg_encode/tst/ts.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -125,8 +125,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/tsd.param
-+++ mpeg_encode/tst/tsd.param
+--- a/mpeg_encode/tst/tsd.param
++++ b/mpeg_encode/tst/tsd.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -136,8 +136,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/gop.param
-+++ mpeg_encode/tst/gop.param
+--- a/mpeg_encode/tst/gop.param
++++ b/mpeg_encode/tst/gop.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -147,8 +147,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/short.param
-+++ mpeg_encode/tst/short.param
+--- a/mpeg_encode/tst/short.param
++++ b/mpeg_encode/tst/short.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -158,8 +158,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/ts2.param
-+++ mpeg_encode/tst/ts2.param
+--- a/mpeg_encode/tst/ts2.param
++++ b/mpeg_encode/tst/ts2.param
 @@ -2,7 +2,7 @@
  
  PATTERN		IBBPBBPBB
@@ -169,8 +169,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/ts3.param
-+++ mpeg_encode/tst/ts3.param
+--- a/mpeg_encode/tst/ts3.param
++++ b/mpeg_encode/tst/ts3.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -180,8 +180,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/ts4.param
-+++ mpeg_encode/tst/ts4.param
+--- a/mpeg_encode/tst/ts4.param
++++ b/mpeg_encode/tst/ts4.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -191,8 +191,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/tstl.param
-+++ mpeg_encode/tst/tstl.param
+--- a/mpeg_encode/tst/tstl.param
++++ b/mpeg_encode/tst/tstl.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
index 8da82cd441af..acd331b70b3f 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
@@ -1,37 +1,42 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_PN=mpeg_encode
 DESCRIPTION="Tools for MPEG video"
 HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
 SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
+S="${WORKDIR}"/${MY_PN}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
 
 RDEPEND="x11-libs/libX11
 	virtual/jpeg:0"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_PN}
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-64bit_fixes.patch
+	"${FILESDIR}"/${P}-tempfile-convert.patch
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-powerpc.patch
+	"${FILESDIR}"/${P}-jpeg.patch
+	"${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
+	"${FILESDIR}"/${P}-tempfile-tests.patch
+)
 
 src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-64bit_fixes.patch
-	epatch "${FILESDIR}"/${P}-tempfile-convert.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-powerpc.patch
-	cd "${S}"
-	rm -r jpeg
-	epatch "${FILESDIR}"/${P}-jpeg.patch
-	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
-	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
+	cd .. || die
+	default
+	cd "${S}" || die
+
+	rm -r jpeg || die
+
 	# don't include malloc.h, but use stdlib.h instead
 	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:' \
 		convert/*.c convert/mtv/*.c *.c headers/*.h || die
@@ -51,7 +56,7 @@ src_install() {
 	docinto examples
 	dodoc examples/*
 
-	cd ../convert
+	cd ../convert || die
 	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid
 	newdoc README README.convert
 	newdoc mtv/README README.mtv
diff --git a/media-video/mpeg2vidcodec/Manifest b/media-video/mpeg2vidcodec/Manifest
index a452b30075d5..fca24cb01754 100644
--- a/media-video/mpeg2vidcodec/Manifest
+++ b/media-video/mpeg2vidcodec/Manifest
@@ -1,5 +1,5 @@
 AUX mpeg2vidcodec-12-Wimplicit-function-declaration.patch 1020 BLAKE2B b61c8c45a0a3fa499e6f7c153cced71c80a87d6ddeda0283d51c56932393eb994297f7f192fffa342d952547b6857c8ead2d8aa1a99202c4d3c19ef8adf5cc02 SHA512 2741e393adadc6b74408b53dd978b820ed80483eb8c91ce1b50f2e916bdcaef7c25fb8679e4c8fad5686f0da99c42881738f424e72b2a02a2d098f0d2f99b393
 AUX mpeg2vidcodec-12-fix-build-system.patch 2038 BLAKE2B cb5dedb4c2c4a60e85e23cebabe12d6c6ec95ba3ba5b198da99735e515ff78007aa40b67be87e23d3ab2558b40c390f944417dbcf72a3026550683bb8297bf61 SHA512 04d55902b48f68460e5272a5ddacf1f6b9f1dbe2f3fa4b9955e804a1ae36f533998f51eb1cdae7f9babbcd753d3436b71d37af324f2eac3bf02c9df6f64e99d7
 DIST mpeg2vidcodec_v12.tar.gz 259790 BLAKE2B 528a6bc7ffdf25ff97241752d26accf83860f3dcf6a7f8ce9394308c1cb1ece0cad9d79f8a6ce7b59823900e9ff991a1cc0ff9de8c11749736576d847d07545a SHA512 2a46f486102ac2a1ae99a0f75b196c5aa01f8a99a6230723a2000ca8411adbca6c3e07d70f7cb269b17ce5fa4bf318e6dd4bfa83ecf8e137e8efca2bb352735c
-EBUILD mpeg2vidcodec-12-r1.ebuild 734 BLAKE2B f09a03b88321fcd341988643e63a329f82a8c72e5616c6a4ad2de468cfab8a05484f9b1d5f47136a2483b28988f79fdbd55782805691c85a724e203edf09fa58 SHA512 29c8fd2b2bf9352595097efd8ab3a795a822ca84a610dfe576b9a4df7d963ed205ad9cd7f769abac97217821223da39caf50b9e3809ee52006d47656e3d22c16
+EBUILD mpeg2vidcodec-12-r1.ebuild 735 BLAKE2B d4df59c93ec56fd68a4e25a0d39c0fb5e921e8147d376007e36291e2ff0fc34ba07c2fbc1b281ed7f6331916b3f774ca545c814b715aa36e6a1b6971ba1719c0 SHA512 4c14f23353d2915d953ea7033fd86886ff5ff82049bdccb349e5c79b2d10ab7042f62bdfd8c0146dc43bedb37cb7f900abf9336c6ef1772c83a94b0c0667e547
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
index ce2c9c3830b9..0aaba40bef35 100644
--- a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
+++ b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.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
@@ -13,7 +13,7 @@ SRC_URI="http://www.mpeg.org/pub_ftp/mpeg/mssg/${MY_P}.tar.gz"
 
 LICENSE="mpeg2enc"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 RESTRICT="mirror bindist" #465088
 
 S="${WORKDIR}/mpeg2"
diff --git a/media-video/mpgtx/Manifest b/media-video/mpgtx/Manifest
index 490cdf9718aa..4b2e241ed38b 100644
--- a/media-video/mpgtx/Manifest
+++ b/media-video/mpgtx/Manifest
@@ -1,5 +1,5 @@
 AUX mpgtx-1.3.1-configure.patch 2414 BLAKE2B 542e4e504040a190ec131d9339f943cbb6d11a65d23e1b29003c34e3e7111dfa5c8d9c27a5e17fa7f9d2cd9a0827530d5ab5870d3f89eeaee3e143576d18bbea SHA512 038ae7bb3ff09f65b01ebfe1d60c44d21f1c7347710191be86e65286de83b84ffe35c7f2a97795b4a6ac9eb50189e5a2b50bf452bb49cffa615c2bbc7ebfcad3
 AUX mpgtx-1.3.1-dont-ignore-cxx-flags.patch 364 BLAKE2B decbf12e2ba6fc66b98a0aa861ef9fa5af6cfb93c2ec44c24fd5ff828ad29d762a1015455807f4d14cc66ed9684b17fb7dbdeff89a0eeab20bb61326de096ebf SHA512 5845b7ad6d9ca7200074d8c90588b97cb623e08c2946c2902bca49e7861273468471db0b74d268d4ec458920f0c2c698208d768c6afd179c2ed9abd199e636aa
 DIST mpgtx-1.3.1.tar.gz 89170 BLAKE2B 30286aa86f5c073a10619bb09eb6f1a5fcde70792839de43a5fe8aa98fb7f94ed61e529288fff76ff64267f2de4582b168176cedd7dda2c19732e6667641f9f3 SHA512 0f568673811f709383b3f262b19d3ec69de6807671c05a98266b21f2bfa6a8b85d2a8b95c3cec38bb012afb9d8add19a3f38b74b3e90f66cf233a1d26aaca805
-EBUILD mpgtx-1.3.1-r2.ebuild 1202 BLAKE2B 6208c5e780948bb84be3292d71b2a199f74eeb398f784008b0ea24d6771564016d0aa3a520cd77a9c410e31678af17033dfbebbb85fd8eaaf7a3ec972523d4ec SHA512 4657ff284fddaff879ad5bbae49aae3377f5a801fecfa99475301497d157b6bc835b08d80af76da8431f7ced5b6bd1e2bb70ff92c28dc4ca41e6cf5721494be8
+EBUILD mpgtx-1.3.1-r2.ebuild 1202 BLAKE2B 879970c6b54e2173bfcb772395b6b786cc9d8fdcced70f2c20c13733e5253a74b4ee2b31cfe347b242f1befbc7bb6c6410c2ab353a6f10cf47c5ff226b8ead11 SHA512 4acad3a319988fea6eab0873959cd13a2afddce4159332b68dbcb304071aa4ac5434f07ce6fe7e54837d24a54753def234a8ab9e4b431ef90b6da72b83dac25c
 MISC metadata.xml 306 BLAKE2B f4b719952d2e6cf75e8640f793deeafc89acde125263d2fb3fecf0151595805a90750416c23806b308acb4b9163f08ff4e4d74cd1d61227f1abe447afd6cc542 SHA512 4ee62efce019bd77b49de68810efadafdd36db330b147d8bd24a4af29ba6a4e69a3ccb66545a4c42261ade86b3094b2e15d838ac8af7d06be1713b3b07193144
diff --git a/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild b/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
index 6d709ee3f1a0..11bb99459f44 100644
--- a/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
+++ b/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="Command line MPEG audio/video/system file toolbox"
 SRC_URI="mirror://sourceforge/mpgtx/${P}.tar.gz"
diff --git a/media-video/mplayer-sh/Manifest b/media-video/mplayer-sh/Manifest
index 0f89606671fa..a396e40aa444 100644
--- a/media-video/mplayer-sh/Manifest
+++ b/media-video/mplayer-sh/Manifest
@@ -2,6 +2,6 @@ AUX mplayer-sh-0.8.6-parameter-aid.diff 3541 BLAKE2B 40a6e3c4c4f832ca37ef4bbb49c
 AUX mplayer-sh-0.8.7-parameter-aid.diff 3570 BLAKE2B 52622f53c8b8992b0f2fef0e708118d5cafc05e8ba8dafa55910815cdf2dd7b49933fd1f33797faf2f055ecadc35863d6cebfe2819c8bb1ff0acc2bec3accb78 SHA512 9783f779a09143faa89ef3de5d87ec415dd797af53d4b1da6b56ed28021a414768b4393e0fd8812c74805c17970eb24cbee3ebc12ee741e036a2f4276e449e5c
 DIST mplayer.sh-0.8.6.tar.gz 7568 BLAKE2B 4eecf46b75368028f54f090e13575287bbbe9ab6fedaf2def221f539b95fcdd4fba8c3a1ad59d9aca2fd72b6ec770ee159a410383e45d53148d270043fe464c6 SHA512 ff4a11f1b8dae014646f101fcab16d6cebc0c3250bc8d259500c2819b484913270051ed9ec9b1442e647e811030f927db07f71aa64edd6221a875e067e22e36a
 DIST mplayer.sh-0.8.7.tar.gz 7851 BLAKE2B b7dbaf93c509a3d2bb38f226dafed2261ddadbff24a6e450f3fe2cf5cb5208bb3e89a1830fc3e59d674e9b045360208e7c221498e32f228be9c6e0147aef2588 SHA512 5e83dd2f83b104f7043d828b713e34f47c9a42a93324424c802d4d448b770e36515accf67bd67ce7461201b5e9cd5596da2bbd182eccef9578c9b31b5fed50d9
-EBUILD mplayer-sh-0.8.6-r2.ebuild 1016 BLAKE2B 7ac9979a063b1b82c10947a19d4ff774213c88f33d98e8d0fa0f4b4814f5cf7f08a5d41208af6e28249144fc0dbb55a34e535bcebb5b4b97c257bad1b68de9e5 SHA512 77c9dfd1500bc47cc6bd5831bcfa96c4fffb21fc8b1ee6d3b0127d0670c94554375decd5b9528c4766c8d0c4524ea54684f0a358db40e448750860217a2ca082
-EBUILD mplayer-sh-0.8.7.ebuild 1040 BLAKE2B 88af926f3919271306a1f8b2f8abab7ef283d27dfb02519d6ef2b7c4384b92cf8dbaca841e809f04b4799afffc7fc56266e86b55ac143b2b2829ffd4cc7f2f34 SHA512 724cce5b006bf67c263f235d4672be7efcbafacece0759a1811b521afff6c0324bb753bc432dd4bb14ce7fb915d4fbeb2a8367471557441cedbe80167327560f
+EBUILD mplayer-sh-0.8.6-r2.ebuild 1016 BLAKE2B 1f20a4d2e8dd68fe041b64cd2417d1c737442aeb026573b6c14ccd265a0329b9fd97a067e6cd97f9a2eaeb1af202a345e11a3cc3a3c0bc6b22b74e3905c07489 SHA512 bbdf22302e7e0c9d9e900602c0e7e343808bce4b6ef8fda0f653d987b7c5edb8dfb71643bd69142262a1701b605e11ed535b1fd3b03130f1fec1f8773145893a
+EBUILD mplayer-sh-0.8.7.ebuild 1040 BLAKE2B 79d5283fdd98120b0724e22e5611bd8c400dea35873e599f43d7ddc74232833015616d7f20fd615ec305bbe6f2501e955a8081ee8a31a064db939d7d4cdf5162 SHA512 06de9fb7015afe6ef615e53d9cff39342266ecc707c99b886ad6f80bddf2b7bd17853b25bd07925d355746b3dc11e5afbf7deab7d0b483a9bf2df90a8940dd7b
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
index 1a81acd52372..982453ffa896 100644
--- a/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
+++ b/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 RESTRICT="mirror bindist"
 
-inherit eutils
+inherit epatch
 
 DESCRIPTION="Video Disk Recorder Mplayer API Script"
 HOMEPAGE="http://batleth.sapienti-sat.org/"
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
index 3ffabc1ecea9..c5826b56616a 100644
--- a/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
+++ b/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils
+inherit epatch
 
 RESTRICT="mirror bindist"
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 6e250f2fc0ef..f65bdcd836db 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,16 +1,11 @@
 AUX dump_ffmpeg.sh 2529 BLAKE2B 2c945fcf0b430d74c85557f82497dbc4a2a8308ecb34c86e42cc3c6a5eed20496691839355c068ccabf6d20d11d62035231aa208341a1ce9affc44b3e30acfde SHA512 12c15efa5cdb99eac92ff808fa56c6137343cca48b73d5875a7a6b08cf36ebeda5022eb3bae0ba567ff9031d2a0f3b5dbe69ee191ae8ecf48b98a779504df66c
+AUX ffmpeg44.patch 517 BLAKE2B 432b42b5e89707739768b83332e17eb16008fd636a14e57ea8cef73aaac057e4a33ea1071ff7d1ef56c106a35b297cf9106ccb5ffab383f23e1a98cf451c021d SHA512 95eaa2a524d6b12b87e5f1548fc0565904f6478bce5353da5fbe6892e25da595376c25bfbfd4030b267b9adb2850b1a2c7a3b2f41a19091f4fd35535140865db
 AUX mplayer-1.3-CVE-2016-4352.patch 617 BLAKE2B 57f85be46230fa0576c6569bafc8c65f24b0a59d3b083c06d2e14fe176505567feca5024bafd73fb1b48960ea95a4705132ed6e2166a31aabcd1e34fc41e3803 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512
-AUX mplayer-1.3-ffmpeg4+mencoder.patch 19947 BLAKE2B 4fd3cc6f793c22b02febf99ba3ea557bf20848c6adafd995e6c4822418407c7f3f0498d512b1b08d55f449f528b681a2f4f256bcec5dd360fb6e85fe3db023dc SHA512 dc20718aad3dd00336e04ac8788cc9bd3ba5808dc69e33ee23a6c523920d05fd57db7355505e7c32d8cf740308be48b6c91332551ff423ae5e6e72925681b3f0
-AUX mplayer-1.3-vdpau-x11.patch 547 BLAKE2B b168b61f5712788c25164cf286a119de1d42c1a142048fc8b138226d146614d7fc454dd7a5c05bfcbdef815bf5d5e18064e2893a3adecd0733fcb79a803a5876 SHA512 439c7925f97b973597239a8f684171e752321dad4bae80a3a2bad46dcf6bf0c49b0839cd5cdac5c8e0b9f5c165061b4177d05cd8060ebba6cd5c4e730ab019ab
-AUX mplayer-1.3.0-freetype_pkgconfig.patch 417 BLAKE2B 3eb3d8463917f938b587858bca55f974382eab82ca5b22d05f3a3f3ef0f640a991e4b0dc527a7b02788f9fe361ae96898208f9a8d45c6b7dc1ddea5dd07a2dea SHA512 6e934229ab5c3a7bbfb583c9e41365c9f9de8f1448ff6bd9dfb4a8053cae18b66081b64d9f1bd26678db69470372805566df52894cb9a433f38d3c15ed4a8815
 AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a
-DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
 DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36cbe6bcf6f426c90c2c8c70123e8aed4d01faf52ee6b1fba3c49e11fa13185f81ae8582f90c901b90955a1f42b SHA512 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-DIST mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081
-EBUILD mplayer-1.3.0-r6.ebuild 16919 BLAKE2B dd876a26f589209def340800eecbcabc397636154ec056a24b24c48f22e214b9186a7779da32acd4bc16c2bec0e6a510f9fd3c58efb019d493982334430df447 SHA512 1dc1622febbaef3d8cd7821d94649a59e89867b0b46de04f79272f82ae59375273d0d5091fbc11873a70255da9617e9f5b99b14db631df297183f2f6e7a62808
-EBUILD mplayer-1.4-r1.ebuild 16599 BLAKE2B 4b209a5a68434f68b329f1f092e88820c516215c4c545e2298189f1633d5a52caed31667240e31d1ed044e5467ce783627b33c29f128defedde37e17e97223aa SHA512 c853cc2d01ce9922df6fdddba7c727102b7cb2341bf09835d5748896487f22d2f4e19775e3ada46e47196dabf5005d569dec1f74e0e5e7bc8b716037fdc693c6
+EBUILD mplayer-1.4-r1.ebuild 16636 BLAKE2B b746abb3708c4ff1f1ebc1771245ad34a344e781e3df64198db6e73a5ebe9cee5882d991a8e74f597610dd577b0ef7e0892922c9d41f175ae968976fa614fd71 SHA512 42b9aed3035aa845cdb2b61d998b5f418fc99089e46a6c5a04ce29c3dfbfa043e53805180ab908586d24cf54024d2ba85ed07d9b2895f49f6bc9f1129c2ea19c
 EBUILD mplayer-9999.ebuild 16604 BLAKE2B 291f1d3cb495761dd072805b003bd543335b5287c722c8ccd79f5b602f010d98f3bd9823d1b6cd4540845f87cc52676a312e88fecfa9652e71660505006d559e SHA512 dc706f1755f95c0177d03ba90ebc8311f07fb9890bae722f9208a6b9cc24e907fca99bab2203a040bc99ab5032f4e81a4a9876ef398eab8400892fbeb3ffddbb
-MISC metadata.xml 2536 BLAKE2B 1a8ff751e68c46c921cd09a9364e8046372cf0a77aaf062c26ed1356eebfaa8b90eb36cac6e101fe22f9f7ddcec611806271683e76d53c642dfc1fc87ba0baa5 SHA512 01fadd14038f9bda1fb3b521f65ab92e2cfed58628352b02f26dfef710d4d5a6fd964ef00e3a123a76046557b15ae29bc7c221c5a8a692cb06763e478b3b58c7
+MISC metadata.xml 2463 BLAKE2B 74bd1f6f4d85fb5b55b3cfd6ca6350a9c4c6baf52c8cced69b7d37b84b5f5f154038e8c81c14ddc57d34037cabe3d638c49994c9bea7bba87852f792fa766aae SHA512 3fa8f536d01cb7fae5f4c56d2f66949cd4a237fabec8f2eb2941a436e0319e6c04652e97747384bd106ad6d9a31f1e14b605e47a73b3829cb0b7f37ab745ce88
diff --git a/media-video/mplayer/files/ffmpeg44.patch b/media-video/mplayer/files/ffmpeg44.patch
new file mode 100644
index 000000000000..99d54079cab2
--- /dev/null
+++ b/media-video/mplayer/files/ffmpeg44.patch
@@ -0,0 +1,12 @@
+Index: MPlayer-1.4/libmpcodecs/ad_spdif.c
+===================================================================
+--- MPlayer-1.4.orig/libmpcodecs/ad_spdif.c
++++ MPlayer-1.4/libmpcodecs/ad_spdif.c
+@@ -300,7 +300,6 @@ static void uninit(sh_audio_t *sh)
+         av_freep(&lavf_ctx->pb);
+         if (lavf_ctx->streams) {
+             av_freep(&lavf_ctx->streams[0]->codec);
+-            av_freep(&lavf_ctx->streams[0]->info);
+             av_freep(&lavf_ctx->streams[0]);
+         }
+         av_freep(&lavf_ctx->streams);
diff --git a/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch b/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch
deleted file mode 100644
index f312203027a9..000000000000
--- a/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch
+++ /dev/null
@@ -1,360 +0,0 @@
-r38001 | al | 2017-10-31 23:33:45 +0100 (Tue, 31 Oct 2017) | 37 lines
-
-ve_lavc,ae_lavc: Adjust to work with newest FFmpeg again
-
-This commit re-enables previously disabled lavc encoders.
-
-The lavc audio encoder had no problems by itself after
-my last commit, but could not stay enabled because of
-the coupling of the lavcopts option.
-
-Here follows a list of changes done to ve lavc
-
-* Explicitly use 16 as upper limit for vmax_b_frames
-
-  The FF_MAX_B_FRAMES #define was removed from FFmpeg's API.
-
-  It was removed because there is no global limit to the number of
-  b frames. While this is the most conservative change to address
-  the removal of the #define, it may not be optimal because we do
-  not allow for more than 16 b frames.
-
-* Options that now need to be passed to the encoder as AVOption
-  - lmin & lmax
-  - vrc_strategy
-  - vqsquish
-  - vqmod_amp & vqmod_freq
-  - vrc_eq
-  - vrc_buf_aggressivity
-  - vrc_init_cplx
-  - ibias & pbias
-  - border_mask
-  - naq
-  - gmc
-  - vme
-
-* Options that were dropped because they had no effect anymore
-  - sc_factor
-
-
-Index: MPlayer-1.3.0/Makefile
-===================================================================
---- MPlayer-1.3.0.orig/Makefile
-+++ MPlayer-1.3.0/Makefile
-@@ -615,7 +615,9 @@ SRCS_MPLAYER = command.c
- 
- #MEncoder
- SRCS_MENCODER-$(FAAC)             += libmpcodecs/ae_faac.c
--SRCS_MENCODER-$(FFMPEG)           += libmpdemux/muxer_lavf.c
-+SRCS_MENCODER-$(FFMPEG)           += libmpcodecs/ae_lavc.c              \
-+                                     libmpcodecs/ve_lavc.c              \
-+                                     libmpdemux/muxer_lavf.c
- SRCS_MENCODER-$(LIBDV)            += libmpcodecs/ve_libdv.c
- SRCS_MENCODER-$(LIBLZO)           += libmpcodecs/ve_nuv.c               \
-                                      libmpcodecs/native/rtjpegn.c
-Index: MPlayer-1.3.0/cfg-mencoder.h
-===================================================================
---- MPlayer-1.3.0.orig/cfg-mencoder.h
-+++ MPlayer-1.3.0/cfg-mencoder.h
-@@ -52,7 +52,7 @@ const m_option_t ovc_conf[]={
-     "   nuv      - nuppel video\n"
- #endif
- #ifdef CONFIG_FFMPEG
--//    "   lavc     - libavcodec codecs - best quality!\n"//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
-+    "   lavc     - libavcodec codecs - best quality!\n"
- #endif
- #ifdef CONFIG_WIN32DLL
-     "   vfw      - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n"
-@@ -106,7 +106,7 @@ const m_option_t oac_conf[]={
-     "   mp3lame  - cbr/abr/vbr MP3 using libmp3lame\n"
- #endif
- #ifdef CONFIG_FFMPEG
--//    "   lavc     - FFmpeg audio encoder (MP2, AC3, ...)\n"//TODO: ae_lavc was deactivated because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
-+    "   lavc     - FFmpeg audio encoder (MP2, AC3, ...)\n"
- #endif
- #ifdef CONFIG_TOOLAME
-     "   toolame  - Toolame MP2 audio encoder\n"
-@@ -226,7 +226,7 @@ const m_option_t mencoder_opts[]={
-     {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
- #endif
- #ifdef CONFIG_FFMPEG
--    //{"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, //TODO: ve_lavc doesn't build after latest FFmpeg major bumps
-+    {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
- #else
-     {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
- #endif /* CONFIG_FFMPEG */
-Index: MPlayer-1.3.0/libmpcodecs/ve.c
-===================================================================
---- MPlayer-1.3.0.orig/libmpcodecs/ve.c
-+++ MPlayer-1.3.0/libmpcodecs/ve.c
-@@ -43,7 +43,7 @@ extern const vf_info_t ve_info_x264;
- 
- static const vf_info_t * const encoder_list[] = {
- #ifdef CONFIG_FFMPEG
--//    &ve_info_lavc,//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
-+    &ve_info_lavc,
- #endif
- #ifdef CONFIG_WIN32DLL
-     &ve_info_vfw,
-Index: MPlayer-1.3.0/libmpcodecs/ae.c
-===================================================================
---- MPlayer-1.3.0.orig/libmpcodecs/ae.c
-+++ MPlayer-1.3.0/libmpcodecs/ae.c
-@@ -59,7 +59,9 @@ audio_encoder_t *new_audio_encoder(muxer
- 			break;
- #endif
- #ifdef CONFIG_FFMPEG
--		//TODO: ACODEC_LAVC <-- has been removed here because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
-+		case ACODEC_LAVC:
-+			ris = mpae_init_lavc(encoder);
-+			break;
- #endif
- #ifdef CONFIG_MP3LAME
- 		case ACODEC_VBRMP3:
-Index: MPlayer-1.3.0/libmpcodecs/ve_lavc.c
-===================================================================
---- MPlayer-1.3.0.orig/libmpcodecs/ve_lavc.c
-+++ MPlayer-1.3.0/libmpcodecs/ve_lavc.c
-@@ -63,12 +63,9 @@ static int lavc_param_vbitrate = -1;
- static int lavc_param_vrate_tolerance = 1000*8;
- static int lavc_param_mb_decision = 0; /* default is realtime encoding */
- static int lavc_param_v4mv = 0;
--static int lavc_param_vme = 4;
- static float lavc_param_vqscale = -1;
- static int lavc_param_vqmin = 2;
- static int lavc_param_vqmax = 31;
--static float lavc_param_lmin = 2;
--static float lavc_param_lmax = 31;
- static float lavc_param_mb_lmin = 2;
- static float lavc_param_mb_lmax = 31;
- static int lavc_param_vqdiff = 3;
-@@ -81,22 +78,15 @@ static float lavc_param_vi_qoffset = 0.0
- static int lavc_param_vmax_b_frames = 0;
- static int lavc_param_keyint = -1;
- static int lavc_param_vpass = 0;
--static int lavc_param_vrc_strategy = 0;
- static int lavc_param_vb_strategy = 0;
- static int lavc_param_packet_size= 0;
- static int lavc_param_strict= -1;
- static int lavc_param_data_partitioning= 0;
- static int lavc_param_gray=0;
--static float lavc_param_rc_qsquish=1.0;
--static float lavc_param_rc_qmod_amp=0;
--static int lavc_param_rc_qmod_freq=0;
- static char *lavc_param_rc_override_string=NULL;
--static char *lavc_param_rc_eq="tex^qComp";
- static int lavc_param_rc_buffer_size=0;
--static float lavc_param_rc_buffer_aggressivity=1.0;
- static int lavc_param_rc_max_rate=0;
- static int lavc_param_rc_min_rate=0;
--static float lavc_param_rc_initial_cplx=0;
- static float lavc_param_rc_initial_buffer_occupancy=0.9;
- static int lavc_param_mpeg_quant=0;
- static int lavc_param_fdct=0;
-@@ -108,8 +98,6 @@ static float lavc_param_dark_masking= 0.
- static float lavc_param_temporal_cplx_masking= 0.0;
- static float lavc_param_spatial_cplx_masking= 0.0;
- static float lavc_param_p_masking= 0.0;
--static float lavc_param_border_masking= 0.0;
--static int lavc_param_normalize_aqp= 0;
- static int lavc_param_interlaced_dct= 0;
- static int lavc_param_prediction_method= FF_PRED_LEFT;
- static int lavc_param_format= IMGFMT_YV12;
-@@ -131,15 +119,12 @@ static int lavc_param_bit_exact = 0;
- static int lavc_param_aic= 0;
- static int lavc_param_aiv= 0;
- static int lavc_param_umv= 0;
--static int lavc_param_gmc= 0;
- static int lavc_param_obmc= 0;
- static int lavc_param_loop= 0;
- static int lavc_param_last_pred= 0;
- static int lavc_param_pre_me= 1;
- static int lavc_param_me_subpel_quality= 8;
- static int lavc_param_me_range= 0;
--static int lavc_param_ibias= FF_DEFAULT_QUANT_BIAS;
--static int lavc_param_pbias= FF_DEFAULT_QUANT_BIAS;
- static int lavc_param_coder= 0;
- static int lavc_param_context= 0;
- static char *lavc_param_intra_matrix = NULL;
-@@ -162,7 +147,6 @@ static int lavc_param_skip_exp=0;
- static int lavc_param_skip_cmp=0;
- static int lavc_param_brd_scale = 0;
- static int lavc_param_bidir_refine = 0;
--static int lavc_param_sc_factor = 1;
- static int lavc_param_video_global_header= 0;
- static int lavc_param_mv0_threshold = 256;
- static int lavc_param_refs = 1;
-@@ -190,21 +174,21 @@ const m_option_t lavcopts_conf[]={
- 	{"vhq", &lavc_param_mb_decision, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- 	{"mbd", &lavc_param_mb_decision, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
- 	{"v4mv", &lavc_param_v4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
--	{"vme", &lavc_param_vme, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL},
-+	{"vme", "vme has no effect, please use the corresponding codec specific option (see FFmpeg documentation) instead of vme.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL},
- 	{"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
- 	{"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
--	{"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
--	{"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
-+        {"lmin", "Please use o=lmin=<value>*QP2LAMBDA instead of lmin.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+        {"lmax", "Please use o=lmax=<value>*QP2LAMBDA instead of lmax.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
- 	{"mblmax", &lavc_param_mb_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
- 	{"vqdiff", &lavc_param_vqdiff, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
- 	{"vqcomp", &lavc_param_vqcompress, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
- 	{"vqblur", &lavc_param_vqblur, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
- 	{"vb_qfactor", &lavc_param_vb_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL},
--	{"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, FF_MAX_B_FRAMES, NULL},
-+	{"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, 16, NULL}, // FF_MAX_B_FRAMES was removed from FFmpeg. We still use its value here, so we probably limit ourselves in some cases.
- 	{"vpass", &lavc_param_vpass, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
--	{"vrc_strategy", &lavc_param_vrc_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
-+	{"vrc_strategy", "Please use o=rc_strategy=<value> instead of vrc_strategy.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"vb_strategy", &lavc_param_vb_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
- 	{"vb_qoffset", &lavc_param_vb_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL},
- 	{"vlelim", "Please use o=luma_elim_threshold=<value> instead of vlelim.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-@@ -217,16 +201,16 @@ const m_option_t lavcopts_conf[]={
- 	{"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- 	{"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL},
- 	{"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL},
--	{"vqsquish", &lavc_param_rc_qsquish, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL},
--	{"vqmod_amp", &lavc_param_rc_qmod_amp, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL},
--	{"vqmod_freq", &lavc_param_rc_qmod_freq, CONF_TYPE_INT, 0, 0, 0, NULL},
--	{"vrc_eq", &lavc_param_rc_eq, CONF_TYPE_STRING, 0, 0, 0, NULL},
-+	{"vqsquish", "Please use o=qsquish=<value> instead of vqsquish.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+	{"vqmod_amp", "Please use o=rc_qmod_amp=<value> instead of vqmod_amp.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+	{"vqmod_freq", "Please use o=rc_qmod_freq=<value> instead of vqmod_freq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+	{"vrc_eq", "Please use o=rc_eq=<value> instead of vrc_eq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"vrc_override", &lavc_param_rc_override_string, CONF_TYPE_STRING, 0, 0, 0, NULL},
- 	{"vrc_maxrate", &lavc_param_rc_max_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL},
- 	{"vrc_minrate", &lavc_param_rc_min_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL},
- 	{"vrc_buf_size", &lavc_param_rc_buffer_size, CONF_TYPE_INT, CONF_RANGE, 4, MAX_BITRATE, NULL},
--	{"vrc_buf_aggressivity", &lavc_param_rc_buffer_aggressivity, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL},
--	{"vrc_init_cplx", &lavc_param_rc_initial_cplx, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9999999.0, NULL},
-+	{"vrc_buf_aggressivity", "Please use o=rc_buf_aggressivity=<value> instead of vrc_buf_aggressivity.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+	{"vrc_init_cplx", "Please use o=rc_init_cplx=<value> instead of vrc_init_cplx.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"vrc_init_occupancy", &lavc_param_rc_initial_buffer_occupancy, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
-         {"vfdct", &lavc_param_fdct, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
- 	{"aspect", &lavc_param_aspect, CONF_TYPE_STRING, 0, 0, 0, NULL},
-@@ -235,7 +219,7 @@ const m_option_t lavcopts_conf[]={
- 	{"tcplx_mask", &lavc_param_temporal_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
- 	{"scplx_mask", &lavc_param_spatial_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
- 	{"p_mask", &lavc_param_p_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
--	{"naq", &lavc_param_normalize_aqp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-+	{"naq", "Please use o=mpv_flags=+naq instead of naq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"dark_mask", &lavc_param_dark_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
- 	{"ildct", &lavc_param_interlaced_dct, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-         {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL},
-@@ -266,8 +250,8 @@ const m_option_t lavcopts_conf[]={
- 	{"aiv", &lavc_param_aiv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- 	{"obmc", &lavc_param_obmc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- 	{"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOOP_FILTER, NULL},
--	{"ibias", &lavc_param_ibias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
--	{"pbias", &lavc_param_pbias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
-+	{"ibias", "Please use o=ibias=<value> instead of ibias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+	{"pbias", "Please use o=pbias=<value> instead of pbias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"coder", &lavc_param_coder, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
- 	{"context", &lavc_param_context, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
- 	{"intra_matrix", &lavc_param_intra_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL},
-@@ -280,9 +264,9 @@ const m_option_t lavcopts_conf[]={
- 	{"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- 	{"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME, NULL},
- 	{"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP, NULL},
--	{"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL},
-+	{"gmc", "Please use o=gmc=<value> instead of gmc.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL},
--	{"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
-+	{"border_mask", "Please use o=border_mask=<value> instead of border_mask.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"inter_threshold", "inter_threshold has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"sc_threshold", &lavc_param_sc_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000000, 1000000000, NULL},
- 	{"top", &lavc_param_top, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL},
-@@ -295,7 +279,7 @@ const m_option_t lavcopts_conf[]={
-         {"skip_exp", &lavc_param_skip_exp, CONF_TYPE_INT, CONF_RANGE, 0, 1000000, NULL},
- 	{"brd_scale", &lavc_param_brd_scale, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
- 	{"bidir_refine", &lavc_param_bidir_refine, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL},
--	{"sc_factor", &lavc_param_sc_factor, CONF_TYPE_INT, CONF_RANGE, 1, INT_MAX, NULL},
-+	{"sc_factor", "sc_factor has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- 	{"vglobal", &lavc_param_video_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
- 	{"aglobal", &lavc_param_audio_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
- 	{"mv0_threshold", &lavc_param_mv0_threshold, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
-@@ -351,8 +335,6 @@ static int config(struct vf_instance *vf
-     lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate};
-     lavc_venc_context->qmin= lavc_param_vqmin;
-     lavc_venc_context->qmax= lavc_param_vqmax;
--    lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
--    lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
-     lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5);
-     lavc_venc_context->mb_lmax= (int)(FF_QP2LAMBDA * lavc_param_mb_lmax + 0.5);
-     lavc_venc_context->max_qdiff= lavc_param_vqdiff;
-@@ -360,17 +342,12 @@ static int config(struct vf_instance *vf
-     lavc_venc_context->qblur= lavc_param_vqblur;
-     lavc_venc_context->max_b_frames= lavc_param_vmax_b_frames;
-     lavc_venc_context->b_quant_factor= lavc_param_vb_qfactor;
--    lavc_venc_context->rc_strategy= lavc_param_vrc_strategy;
-     lavc_venc_context->b_frame_strategy= lavc_param_vb_strategy;
-     lavc_venc_context->b_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vb_qoffset + 0.5);
-     lavc_venc_context->rtp_payload_size= lavc_param_packet_size;
-     lavc_venc_context->strict_std_compliance= lavc_param_strict;
-     lavc_venc_context->i_quant_factor= lavc_param_vi_qfactor;
-     lavc_venc_context->i_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vi_qoffset + 0.5);
--    lavc_venc_context->rc_qsquish= lavc_param_rc_qsquish;
--    lavc_venc_context->rc_qmod_amp= lavc_param_rc_qmod_amp;
--    lavc_venc_context->rc_qmod_freq= lavc_param_rc_qmod_freq;
--    lavc_venc_context->rc_eq= lavc_param_rc_eq;
- 
-     mux_v->max_rate=
-     lavc_venc_context->rc_max_rate= lavc_param_rc_max_rate*1000;
-@@ -382,8 +359,6 @@ static int config(struct vf_instance *vf
-     lavc_venc_context->rc_initial_buffer_occupancy=
-             lavc_venc_context->rc_buffer_size *
-             lavc_param_rc_initial_buffer_occupancy;
--    lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
--    lavc_venc_context->rc_initial_cplx= lavc_param_rc_initial_cplx;
-     lavc_venc_context->debug= lavc_param_debug;
-     lavc_venc_context->last_predictor_count= lavc_param_last_pred;
-     lavc_venc_context->pre_me= lavc_param_pre_me;
-@@ -391,8 +366,6 @@ static int config(struct vf_instance *vf
-     lavc_venc_context->pre_dia_size= lavc_param_pre_dia_size;
-     lavc_venc_context->me_subpel_quality= lavc_param_me_subpel_quality;
-     lavc_venc_context->me_range= lavc_param_me_range;
--    lavc_venc_context->intra_quant_bias= lavc_param_ibias;
--    lavc_venc_context->inter_quant_bias= lavc_param_pbias;
-     lavc_venc_context->coder_type= lavc_param_coder;
-     lavc_venc_context->context_model= lavc_param_context;
-     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
-@@ -479,7 +452,6 @@ static int config(struct vf_instance *vf
-     lavc_venc_context->spatial_cplx_masking= lavc_param_spatial_cplx_masking;
-     lavc_venc_context->p_masking= lavc_param_p_masking;
-     lavc_venc_context->dark_masking= lavc_param_dark_masking;
--        lavc_venc_context->border_masking = lavc_param_border_masking;
- 
-     if (lavc_param_aspect != NULL)
-     {
-@@ -552,20 +524,17 @@ static int config(struct vf_instance *vf
-     if (lavc_param_alt)
-         av_dict_set(&opts, "alternate_scan", "1", 0);
-     lavc_venc_context->flags|= lavc_param_ilme;
--    lavc_venc_context->flags|= lavc_param_gmc;
- #ifdef AV_CODEC_FLAG_CLOSED_GOP
-     lavc_venc_context->flags|= lavc_param_closed_gop;
- #endif
-     lavc_venc_context->flags|= lavc_param_gray;
- 
--    if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;
-     if(lavc_param_interlaced_dct) lavc_venc_context->flags|= AV_CODEC_FLAG_INTERLACED_DCT;
-     lavc_venc_context->flags|= lavc_param_psnr;
-     lavc_venc_context->intra_dc_precision = lavc_param_dc_precision - 8;
-     lavc_venc_context->prediction_method= lavc_param_prediction_method;
-     lavc_venc_context->brd_scale = lavc_param_brd_scale;
-     lavc_venc_context->bidir_refine = lavc_param_bidir_refine;
--    lavc_venc_context->scenechange_factor = lavc_param_sc_factor;
-     if((lavc_param_video_global_header&1)
-        /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){
-         lavc_venc_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-@@ -648,8 +617,6 @@ static int config(struct vf_instance *vf
-     }
-     }
- 
--    lavc_venc_context->me_method = ME_ZERO+lavc_param_vme;
--
-     /* fixed qscale :p */
-     if (lavc_param_vqscale >= 0.0)
-     {
diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
deleted file mode 100644
index cfefb63deb94..000000000000
--- a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-r37932 | al | 2017-04-20 01:06:04 +0200 (Thu, 20 Apr 2017) | 6 lines
-
-vo_vdpau: Explicitly include header vdpau_x11.h
-
-The include from inside libavcodec/vdpau.h was removed in FFmpeg
-commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
-
-Index: libvo/vo_vdpau.c
-===================================================================
---- a/libvo/vo_vdpau.c	(revision 37931)
-+++ b/libvo/vo_vdpau.c	(revision 37932)
-@@ -34,6 +34,7 @@
- 
- #include <stdio.h>
- #include <strings.h>
-+#include <vdpau/vdpau_x11.h>
- 
- #include "config.h"
- #include "sub/ass_mp.h"
diff --git a/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch
deleted file mode 100644
index 4bd67ca185aa..000000000000
--- a/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: configure
-===================================================================
---- a/configure   (revision 38020)
-+++ b/configure   (revision 38021)
-@@ -839,7 +839,8 @@
- _macosx_finder=no
- _macosx_bundle=auto
- _sortsub=yes
--_freetypeconfig='freetype-config'
-+_freetypeconfig='pkg-config freetype2'
-+type freetype-config >/dev/null 2>&1 && _freetypeconfig=freetype-config
- _fribidi=auto
- _enca=auto
- _inet6=auto
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 5f4a3dfe1b75..11e093c1f064 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -20,7 +20,6 @@
     <flag name="md5sum">Enables md5sum video output</flag>
     <flag name="mng">MNG input support</flag>
     <flag name="network">Enables network streaming support</flag>
-    <flag name="nut">Enables support for the NUT container format</flag>
     <flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag>
     <flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
     <flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
deleted file mode 100644
index cc6c4c2db4cd..000000000000
--- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild
+++ /dev/null
@@ -1,609 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
-
-VIDEO_CARDS="mga"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
-	MY_P="MPlayer-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	https://dev.gentoo.org/~juippis/distfiles/tmp/mplayer-1.3-ffmpeg4.patch
-	!truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	>=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-#	nemesi? ( net-libs/libnemesi )
-# mplayer relies on private APIs in giflib that have been removed:
-#   https://sourceforge.net/p/giflib/bugs/132/
-RDEPEND+="
-	sys-libs/ncurses:0=
-	app-arch/bzip2
-	sys-libs/zlib
-	>=media-video/ffmpeg-3.0:0=[vdpau?]
-	a52? ( media-libs/a52dec )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bidi? ( dev-libs/fribidi )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	bs2b? ( media-libs/libbs2b )
-	cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
-	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dga? ( x11-libs/libXxf86dga )
-	dts? ( media-libs/libdca )
-	dv? ( media-libs/libdv )
-	dvd? ( >=media-libs/libdvdread-4.1.3:0= )
-	dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= )
-	encode? (
-		!twolame? ( toolame? ( media-sound/toolame ) )
-		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423:= )
-		xvid? ( media-libs/xvid )
-	)
-	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
-	ggi? ( media-libs/libggi media-libs/libggiwmh )
-	gsm? ( media-sound/gsm )
-	iconv? ( virtual/libiconv )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? ( >=media-libs/libass-0.9.10:= )
-	libcaca? ( media-libs/libcaca )
-	libmpeg2? ( media-libs/libmpeg2 )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	mp3? ( media-sound/mpg123 )
-	nas? ( media-libs/nas )
-	nut? ( >=media-libs/libnut-661 )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
-			app-arch/unrar
-			app-arch/rar
-		)
-	)
-	rtmp? ( media-video/rtmpdump )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora[encode?] )
-	tremor? ( media-libs/tremor )
-	truetype? ( ${FONT_RDEPS} )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( !tremor? ( media-libs/libvorbis ) )
-	X? ( ${X_RDEPS}	)
-	xinerama? ( x11-libs/libXinerama )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv )
-"
-
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dga? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	X? ( x11-base/xorg-proto )
-	xinerama? ( x11-base/xorg-proto )
-	xscreensaver? ( x11-base/xorg-proto )
-	amd64? ( ${ASM_DEP} )
-	doc? (
-		dev-libs/libxslt app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-	)
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-REQUIRED_USE="
-	dga? ( X )
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	ggi? ( X )
-	libass? ( truetype )
-	opengl? ( X )
-	osdmenu? ( X )
-	truetype? ( iconv )
-	vdpau? ( X )
-	vidix? ( X )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )"
-RESTRICT="faac? ( bindist )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
-
-pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
-
-	if use cpudetection; then
-		ewarn
-		ewarn "You've enabled the cpudetection flag. This feature is"
-		ewarn "included mainly for people who want to use the same"
-		ewarn "binary on another system with a different CPU architecture."
-		ewarn "MPlayer will already detect your CPU settings by default at"
-		ewarn "buildtime; this flag is used for runtime detection."
-		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system. Also, if your compile fails, try"
-		ewarn "disabling this use flag."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
-
-	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
-		cd "${S}"
-		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
-		chmod +x dump_ffmpeg.sh
-		./dump_ffmpeg.sh || die
-	fi
-
-	if ! use truetype; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-}
-
-src_prepare() {
-	default
-
-	local svf=snapshot_version
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		printf "${ESVN_WC_REVISION}" > $svf
-	else
-		eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
-		eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
-		has_version '>media-video/ffmpeg-3.5' && eapply "${DISTDIR}"/${PN}-1.3-ffmpeg4.patch "${FILESDIR}"/${PN}-1.3-ffmpeg4+mencoder.patch
-	fi
-	if [ ! -f VERSION ] ; then
-		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-		local sv=$(<$svf)
-		printf "SVN-r${sv} (Gentoo)" > VERSION
-	fi
-
-	# fix path to bash executable in configure scripts
-	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
-	# Use sane default for >=virtual/udev-197
-	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
-	local myconf=""
-	local uses i
-
-	# set LINGUAS
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
-	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
-	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation. The reason for this is
-	# because if --enable is used, it will force the build of that option,
-	# regardless of whether the dependency is available or not.
-
-	###################
-	#Optional features#
-	###################
-	# disable svga since we don't want it
-	# disable arts since we don't have kde3
-	# always disable internal ass
-	# disable opus and ilbc since it only controls support in internal
-	#         ffmpeg which we do not use
-	myconf+="
-		--disable-svga --disable-svgalib_helper
-		--disable-ass-internal
-		--disable-arts
-		--disable-directfb
-		--disable-kai
-		--disable-libopus
-		--disable-libilbc
-		--disable-xvmc
-		$(use_enable network networking)
-		$(use_enable joystick)
-	"
-	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
-	myconf+=" --disable-nemesi" # nemesi automagic disable
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bidi  || myconf+=" --disable-fribidi"
-	use ipv6  || myconf+=" --disable-inet6"
-	use libass || myconf+=" --disable-ass"
-	use nut   || myconf+=" --disable-libnut"
-	use rar   || myconf+=" --disable-unrarexec"
-	use samba || myconf+=" --disable-smb"
-	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
-
-	################################
-	# DVD read, navigation support #
-	################################
-	#
-	# dvdread - accessing a DVD
-	# dvdnav - navigation of menus
-	use dvd || myconf+=" --disable-dvdread"
-	use dvdnav || myconf+=" --disable-dvdnav"
-
-	#############
-	# Subtitles #
-	#############
-	#
-	# SRT/ASS/SSA (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	use truetype || myconf+=" --disable-freetype"
-	use iconv || myconf+=" --disable-iconv --charset=noconv"
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
-
-	#####################################
-	# DVB / Video4Linux / Radio support #
-	#####################################
-	myconf+=" --disable-tv-bsdbt848"
-	# broken upstream, won't work with recent kernels
-	myconf+=" --disable-ivtv"
-	# gone since linux-headers-2.6.38
-	myconf+=" --disable-tv-v4l1"
-	if { use dvb || use v4l || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb"
-		use pvr || myconf+=" --disable-pvr"
-		use v4l || myconf+=" --disable-tv-v4l2"
-		if use radio && { use dvb || use v4l; }; then
-			myconf+="
-				--enable-radio
-				$(use_enable encode radio-capture)
-			"
-		else
-			myconf+="
-				--disable-radio-v4l2
-				--disable-radio-bsdbt848
-			"
-		fi
-	else
-		myconf+="
-			--disable-tv
-			--disable-tv-v4l2
-			--disable-radio
-			--disable-radio-v4l2
-			--disable-radio-bsdbt848
-			--disable-dvb
-			--disable-v4l2
-			--disable-pvr"
-	fi
-
-	##########
-	# Codecs #
-	##########
-	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/
-	use dts || myconf+=" --disable-libdca"
-	if ! use mp3; then
-		myconf+="
-			--disable-mp3lame
-			--disable-mpg123
-		"
-	fi
-	uses="a52 bs2b dv gsm lzo rtmp vorbis"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-lib${i}"
-	done
-
-	uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	# Pulls an outdated libopenjpeg, ffmpeg provides better support for it
-	myconf+=" --disable-libopenjpeg"
-
-	# Encoding
-	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-	else
-		myconf+=" --disable-mencoder"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
-		done
-	fi
-
-	#################
-	# Binary codecs #
-	#################
-	myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
-	################
-	# Video Output #
-	################
-	uses="md5sum sdl yuv4mpeg"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use aalib || myconf+=" --disable-aa"
-	use fbcon || myconf+=" --disable-fbdev"
-	use libcaca || myconf+=" --disable-caca"
-	use zoran || myconf+=" --disable-zr"
-
-	if ! use kernel_linux || ! use video_cards_mga; then
-		 myconf+=" --disable-mga --disable-xmga"
-	fi
-
-	myconf+="
-		--disable-3dfx
-		--disable-tdfxvid
-		--disable-tdfxfb
-	"
-
-	# sun card, disable by default, see bug #258729
-	myconf+=" --disable-xvr100"
-
-	################
-	# Audio Output #
-	################
-	myconf+=" --disable-esd"
-	uses="alsa jack ladspa nas openal"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
-
-	####################
-	# Advanced Options #
-	####################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
-	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
-	for i in ${uses}; do
-		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
-	done
-
-	uses="altivec shm"
-	for i in ${uses}; do
-		myconf+=" $(use_enable ${i})"
-	done
-
-	use debug && myconf+=" --enable-debug=3"
-
-	if use x86 && gcc-specs-pie; then
-		filter-flags -fPIC -fPIE
-		append-ldflags -nopie
-	fi
-
-	###########################
-	# X enabled configuration #
-	###########################
-	myconf+=" --disable-gui"
-	myconf+=" --disable-vesa"
-	uses="ggi vdpau xinerama xv"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use dga          || myconf+=" --disable-dga1 --disable-dga2"
-	use opengl       || myconf+=" --disable-gl"
-	use osdmenu      && myconf+=" --enable-menu"
-	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
-	use xscreensaver || myconf+=" --disable-xss"
-	use X            || myconf+=" --disable-x11"
-
-	############################
-	# OSX (aqua) configuration #
-	############################
-	if use aqua; then
-		myconf+="
-			--enable-macosx-finder
-			--enable-macosx-bundle
-		"
-	fi
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--confdir="${EPREFIX}/etc/mplayer" \
-		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--disable-ffmpeg_a \
-		${myconf} || die
-}
-
-src_compile() {
-	default
-
-	# Build only user-requested docs if they're available.
-	if use doc ; then
-		# select available languages from $LINGUAS
-		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
-		local BUILT_DOCS=""
-		for i in ${LINGUAS} ; do
-			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
-		done
-		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 html-chunked
-		else
-			for i in ${BUILT_DOCS}; do
-				emake -j1 html-chunked-${i}
-			done
-		fi
-	fi
-}
-
-src_install() {
-	local i
-
-	emake \
-		DESTDIR="${D}" \
-		INSTALLSTRIP="" \
-		install
-
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
-	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto TOOLS/
-	dodoc -r TOOLS/*
-	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/*
-
-	if use doc; then
-		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/*
-	fi
-
-	if ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
-		done
-		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
-	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
-
-	if use truetype; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
-	fi
-
-	# bug 256203
-	if use rar; then
-		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
-	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
-	# Cleanup stale symlinks
-	[ -L "${EROOT}/usr/share/mplayer/font" -a \
-			! -e "${EROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/font"
-
-	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index c3f5a2e913cd..e3f376cc7060 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -232,6 +232,7 @@ src_prepare() {
 	else
 		eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
 	fi
+	eapply "${FILESDIR}"/ffmpeg44.patch
 	if [ ! -f VERSION ] ; then
 		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
 		local sv=$(<$svf)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index f83008c60bbc..fe965a75e608 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,5 @@
-DIST mpv-0.33.0.tar.gz 3259387 BLAKE2B c9ffaccb2258493517814490ab589ef298d6a0ba66398683f5fd1bcb01e2c073c99b8276a60951bea766ee85c726456d8a4ae329cf8748de4f15bb346161a269 SHA512 5a4af74ba2c9656c6b61adcf944c734923c7b4527a49cd79ec63a0617911629438a138d887dfbd4b6c0c9c53e2c68c18839d98d9765179e52cc5675d0682e077
+DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B 97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04 SHA512 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
-EBUILD mpv-0.33.0-r100.ebuild 9704 BLAKE2B 99c260d0e41df5d24e93c3fd7c6a70c51f1a5a261f0f08d79b4a88e50257ad7f5ea441ce8955c9e4a472ff3f24c4da4aed97cec6419e9ed4dc0b30a36adda98e SHA512 47b5c874f8435e540f52b35c1807b691f888611a8f7e18769cdf3453de5b3b69ddde17d1d33bed38219b24925bc63214ae7e0627be3aae2832e34f88887137fa
-EBUILD mpv-9999.ebuild 9704 BLAKE2B 99c260d0e41df5d24e93c3fd7c6a70c51f1a5a261f0f08d79b4a88e50257ad7f5ea441ce8955c9e4a472ff3f24c4da4aed97cec6419e9ed4dc0b30a36adda98e SHA512 47b5c874f8435e540f52b35c1807b691f888611a8f7e18769cdf3453de5b3b69ddde17d1d33bed38219b24925bc63214ae7e0627be3aae2832e34f88887137fa
+EBUILD mpv-0.33.1-r1.ebuild 9701 BLAKE2B 38788628dbb7e711a7772ffde07997f5d3d5844a3acfc4adc973cefd0bdb98ab309b4584df3bf05a2bfb9022f1bc4302a659682921b7d9604ca02b82cf5647c3 SHA512 a28e1c03f2ae1c264942402eed5115aa5824fc0c315e8ba0af120ced224cc18ab17a81bfb239b4e593ff2e7d777ed745699446229473cb8f811caaa635b31865
+EBUILD mpv-9999.ebuild 9692 BLAKE2B 768f10eb7e77b522df0a8a9f4b06ef35a332903a83bfc91402cfe5320fd08f4a85e163007e759c972835bfe4468664b31c21b6b1026202724a631b4e2980955f SHA512 05a617c66ff841d4b1993382405bcf29cdc0577e43df6d0db20c6fe180692c2b9918221108129a8bc525822f4ee4bddbe0143e7ef34df270d6790b9a26a57b59
 MISC metadata.xml 2210 BLAKE2B db6e0e06db186121b62f386ca14c899da0dc88fabebdf6b12812e7a53318b2dac8b71ee4a82e6946d7a33b4d9cd1e933d577ad4efbad8a3a1f05a19ff1e08c4d SHA512 77648b67b0cd42c8471437e33bdca81ee4185109e2dfebe619f7e8e2282e76aec4d54523d51c422b5c613cd56ca788fbb7b06614791c46b3ddeda3de2f30f32c
diff --git a/media-video/mpv/mpv-0.33.0-r100.ebuild b/media-video/mpv/mpv-0.33.1-r1.ebuild
index edb74a93b704..502d8074bc41 100644
--- a/media-video/mpv/mpv-0.33.0-r100.ebuild
+++ b/media-video/mpv/mpv-0.33.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
 
 WAF_PV=2.0.9
 
-inherit bash-completion-r1 flag-o-matic lua-single pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
+inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
 
 DESCRIPTION="Media player based on MPlayer and mplayer2"
 HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
@@ -93,7 +93,7 @@ COMMON_DEPEND="
 	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
 	vdpau? ( x11-libs/libvdpau )
 	vulkan? (
-		media-libs/libplacebo:=[vulkan]
+		<media-libs/libplacebo-3.104.0:=[vulkan]
 		media-libs/shaderc
 	)
 	wayland? (
@@ -336,7 +336,7 @@ pkg_postinst() {
 		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
 	fi
 
-	elog "If you want URL support, please install net-misc/youtube-dl."
+	optfeature "URL support" net-misc/youtube-dl
 
 	xdg_icon_cache_update
 	xdg_desktop_database_update
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index edb74a93b704..c749f487bd6a 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
 
 WAF_PV=2.0.9
 
-inherit bash-completion-r1 flag-o-matic lua-single pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
+inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
 
 DESCRIPTION="Media player based on MPlayer and mplayer2"
 HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
@@ -336,7 +336,7 @@ pkg_postinst() {
 		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
 	fi
 
-	elog "If you want URL support, please install net-misc/youtube-dl."
+	optfeature "URL support" net-misc/youtube-dl
 
 	xdg_icon_cache_update
 	xdg_desktop_database_update
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 70cb39d79717..65d9bd4b2f6c 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -6,6 +6,6 @@ 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
-EBUILD noad-0.8.6-r5.ebuild 1861 BLAKE2B 17ef4655086dc08d5f9d1b16a09f9915432af3249ada1615ce115b77645e902aec5941d340ca51615d4c8914e0e04c8ae7d2a5e43258b472e6feaec3a4977f3f SHA512 fb000cb51506bf86cdf5bd4f86d81e04038dba65b7b1c7d222bf91ee2378b4e9bc2852ac8e6e77c7ac51aba5aa92321e2028b9f0d7f3ea52a4275b305a34440d
+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
diff --git a/media-video/noad/noad-0.8.6-r5.ebuild b/media-video/noad/noad-0.8.6-r5.ebuild
index d899fd371e72..d589220b2609 100644
--- a/media-video/noad/noad-0.8.6-r5.ebuild
+++ b/media-video/noad/noad-0.8.6-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools eutils toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Mark commercial breaks in VDR recordings"
 HOMEPAGE="http://noad.net23.net/"
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 280e06164f48..beeac7f6bfd3 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,7 +1,13 @@
-DIST pipewire-0.3.18.tar.gz 1277055 BLAKE2B 4a18bd668afaf144d6e83590293a744b6d2c2a7d8e9fc6ab581f22d294fac5a4841098875f8569f36b794c083e4ec9f0b7d4e29a10dc79286a4843996f7fb64e SHA512 933b15908e30c389555dd9f82f87c2e571b4cb078bfbe5ed1858440166093cdee2b1c15da50bc5ab36087b62e216786b95c2aad9403e5047ae33e4fe8a6f4cc5
+AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
+AUX pipewire-0.3.25-fix-docdir-path.patch 1231 BLAKE2B 7e361262d4ccc6f21159dfce6b7e93c3e332b90ca75fb90f1a8a3edd8b4a813d78d5c4c61d89452f626c32206de9c6be075dc66e95c5cfc0e147bd08ace4db2e SHA512 8a4e0ebfc6e3776ca4e5b43f4b16828f72983053aa957368a36aa9dec12ebac32275261f67b5e4e63b7ad4580d61a6ee78327e08146ecc67ce84a493d49400bc
+AUX pipewire-0.3.25-non-systemd-integration.patch 822 BLAKE2B e80245300313151c01ec56a9be74590d6ee9211a78d9c16180ef1bfb1938a8ad9f8e00f2086d220ca6f8ad2d1c55508cfcc3c240467ed66239808f76029fdcae SHA512 0a7570e0dadd9119ba81b91fc0831ad511ed793f2f10f304547152448e0cf079118c595944e22f31cea94a92a0819524aad26c3fc2d17e73b622b43637cdf06a
+AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
+AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
-DIST pipewire-0.3.24.tar.gz 1333048 BLAKE2B 3146084e3028ed7bf27d483666e07d76c45988a911bba70bd31656ed75847fceb5c306a95bc3515cae9208f9b3cd9e9aaab56ee1de154a7520f669887e77fc6b SHA512 be1fd3b15aae4fc276dd7e4be385cd58e6e9626d6e0a42b7bc3eb46ba324759c05320547aa857510ecf24b1628b76555222d342350d6406ad4d7b536cb3db497
-EBUILD pipewire-0.3.18.ebuild 3423 BLAKE2B a17234221cb84d36eab89a48f3dfe13a910bc02c67de3ab9462ad081d115922c53928cb0896393b7ff78a99447f588fbc9a31033e6048bbfb09a204ffb8d514b SHA512 1931d14b75e0e99ef4b7ff0d661a942dab3d8d9cb90e8dc6f5d723ece66824906c474aa40af6f03ab751db0356d9a36e336ad3b1aeece6bdd38276355f0b1d1d
-EBUILD pipewire-0.3.22.ebuild 3180 BLAKE2B a2c337f799010c37734af0fedd47eed02717e268c5cb2915516dc291f3d07dc70a9b97c868d1e124182fb8a27b20be7652461538e729ceda04da991e7c559ccb SHA512 732ff816b1ddaa2553c7b3d87938b38d17c10e66e0fff8674736d8e5175a4db8bf1002a12b962210bbfe8d71bd54064c17e1a4bc9e53c8b1ceb611d054855248
-EBUILD pipewire-0.3.24.ebuild 3238 BLAKE2B 5e448d515c93d683cf44e222f6eff91ff1a0cb5a2c784098f25119244dbfa1ba66ffbc6cda190462f5569518881d4b13cd54aad7b41326500eafea42d1a8116f SHA512 f63ed7306a04919ab3882d846bc223857a4ffd874aedd1b86fe5de7f986633a9c716e9194b207c3e862320b987cd441a57048ffc771304f2c573178915804ca6
-MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
+DIST pipewire-0.3.25.tar.gz 1351257 BLAKE2B 3c4d6d98e3255df8baf50eb548bcf77b5c027a50f6acedd83cd63481ed5b642c174589f34314f150b07116cea8a3458c3f8b770df4081585d7f75cc8dde4decd SHA512 0f84be21bfcd70f25900c53a8ce399c29ce2d4d10f8b56e5103603cf0c80673aab0b16492e55b42985283adf46343cdca01626225db85a2263f06c309f68f2d7
+DIST pipewire-0.3.26.tar.gz 1447673 BLAKE2B 67feb1288fcdc9ac5578b97ab2567b46a7431921291584bc9db2c2e60db074c3a61c3af9859d3b2f9044cfba6c15e9bfde9edc001b753f8fc47965eb55d751c8 SHA512 d771956a42801a6e07fac48a175363eb4107a9fba13d649ff5c2cdc40044c84a61bf56050783507f6dd8efae8c59a2be07ec67433827335ae60f8116c4a4e178
+EBUILD pipewire-0.3.22.ebuild 3177 BLAKE2B 712e773c42b0a89d482a1c38f1d5b2ad73bd9790173093813f257378e5bcda3aaaeedb2d215812637d14dccc4c57cb25ba3d4574d579821f7c09f8a110cac8ac SHA512 89583f0495c8a12598c829de80d2b515a1a37aecf51b4cb54c4988f0fc3aff2f5d9b7f4d23621678d5f1b2e67f145d941eacc0d9eca0281d9cf202ff109a7195
+EBUILD pipewire-0.3.25.ebuild 8576 BLAKE2B 8e84ae5b121a7755c247f6a140a9c72fbf69912edf84e2891f8c78944dccc6204f6f9c1a7ad211c51d87a09719750d9bd2de2ee1e993def4e66d04672a2eec86 SHA512 1de53f6529cdaed7194f6a05c0adf84e40dd8484f251b245fd3e036196d663a71450d7b53ffa64d06a9b805c23f08eebe8c06cc6490c84a5f5d5ecd37a6f1e47
+EBUILD pipewire-0.3.26.ebuild 8727 BLAKE2B f8562cef3ecb56394c026923f55c814c1ea66c7eafd40288e64737e7e9991be6c24eddbd3dbdb26053ad57454e178351e78dac810cf09b5c2c99bd7e6f24a002 SHA512 f75916fd73b14fa5f62c3ac6fb71dc31ad8cff4370cf23edd8ef3ca230f9000d07c21797d25cb39f21e012d62882e8b4d4c10c577e9847f83a455c28f4fd9db1
+EBUILD pipewire-9999.ebuild 8727 BLAKE2B f8562cef3ecb56394c026923f55c814c1ea66c7eafd40288e64737e7e9991be6c24eddbd3dbdb26053ad57454e178351e78dac810cf09b5c2c99bd7e6f24a002 SHA512 f75916fd73b14fa5f62c3ac6fb71dc31ad8cff4370cf23edd8ef3ca230f9000d07c21797d25cb39f21e012d62882e8b4d4c10c577e9847f83a455c28f4fd9db1
+MISC metadata.xml 1536 BLAKE2B b0c4a4c8723d29f1dfa1ad8c74730c5aeeff2b0af77631e6ea6f09fb75b3b0cf2e6e755129fd1e5fa8782230bb9658bffa86c752a66cea6bd73079029b4b606e SHA512 a788e4c079a1dd11b84ea6a095fb378e9453c516010654b487cc22a2eeedffc0fb969394ec88f21bdc9b3227b08a1e99e912d5cee8e7e2a405314adf121ce55f
diff --git a/media-video/pipewire/files/pipewire-0.3.25-enable-failed-mlock-warning.patch b/media-video/pipewire/files/pipewire-0.3.25-enable-failed-mlock-warning.patch
new file mode 100644
index 000000000000..bdb43fe551d2
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.25-enable-failed-mlock-warning.patch
@@ -0,0 +1,12 @@
+diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
+--- a/src/daemon/pipewire.conf.in
++++ b/src/daemon/pipewire.conf.in
+@@ -6,7 +6,7 @@ context.properties = {
+     #support.dbus                          = true
+     #link.max-buffers                      = 64
+     link.max-buffers                       = 16                       # version < 3 clients can't handle more
+-    #mem.warn-mlock                        = false
++    mem.warn-mlock                         = true                     # Gentoo should have good RLIMITs now
+     #mem.allow-mlock                       = true
+     #mem.mlock-all                         = false
+     #clock.power-of-two-quantum            = true
diff --git a/media-video/pipewire/files/pipewire-0.3.25-fix-docdir-path.patch b/media-video/pipewire/files/pipewire-0.3.25-fix-docdir-path.patch
new file mode 100644
index 000000000000..9c7a55c95e26
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.25-fix-docdir-path.patch
@@ -0,0 +1,32 @@
+diff --git a/doc/meson.build b/doc/meson.build
+index 05c7ed35..ce9b52ea 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -24,11 +24,14 @@ doxyfile = configure_file(input: 'Doxyfile.in',
+                           output: 'Doxyfile',
+                           configuration: doxyfile_conf)
+ 
+-docdir = join_paths(pipewire_datadir, 'doc')
++docdir = get_option('docdir')
++if docdir == ''
++  docdir = join_paths(pipewire_datadir, 'doc', meson.project_name())
++endif
+ 
+ html_target = custom_target('pipewire-docs',
+                             input: [ doxyfile ],
+                             output: [ 'html' ],
+                             command: [ doxygen, doxyfile ],
+                             install: true,
+-                            install_dir: join_paths(docdir, 'pipewire'))
++                            install_dir: docdir)
+diff --git a/meson_options.txt b/meson_options.txt
+index 858283f2..d51e693f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,6 @@
++option('docdir',
++	type : 'string',
++	description : 'Directory for installing documentation to (defaults to pipewire_datadir/doc/meson.project_name() )')
+ option('docs',
+        description: 'Build documentation',
+        type: 'feature',
diff --git a/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch
new file mode 100644
index 000000000000..51455a3b84b8
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch
@@ -0,0 +1,18 @@
+diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
+--- a/src/daemon/pipewire.conf.in
++++ b/src/daemon/pipewire.conf.in
+@@ -204,12 +204,12 @@ context.exec = [
+     # but it is better to start it as a systemd service.
+     # Run the session manager with -h for options.
+     #
+-    @comment@{ path = "@media_session_path@"  args = "" }
++    { path = "@media_session_path@"  args = "" }
+     #
+     # You can optionally start the pulseaudio-server here as well
+     # but it is better to start it as a systemd service.
+     # It can be interesting to start another daemon here that listens
+     # on another address with the -a option (eg. -a tcp:4713).
+     #
+-    @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
++    { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
+ ]
diff --git a/media-video/pipewire/files/pipewire-launcher.sh b/media-video/pipewire/files/pipewire-launcher.sh
new file mode 100644
index 000000000000..ecff3e7e7082
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-launcher.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# We need to kill any existing pipewire instance to restore sound
+pkill -u "${USER}" -x pipewire 1>/dev/null 2>&1
+
+exec /usr/bin/pipewire
diff --git a/media-video/pipewire/files/pipewire.desktop b/media-video/pipewire/files/pipewire.desktop
new file mode 100644
index 000000000000..d3786e74f82b
--- /dev/null
+++ b/media-video/pipewire/files/pipewire.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name[de]=PipeWire Mediensystem
+Name=PipeWire Media System
+Comment[de]=Das PipeWire Mediensystem starten
+Comment=Start the PipeWire Media System
+Exec=/usr/libexec/pipewire-launcher
+Terminal=false
+Type=Application
+X-GNOME-HiddenUnderSystemd=true
+X-KDE-HiddenUnderSystemd=true
+X-systemd-skip=true
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index dc9635eee0fe..954805d1590e 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -9,12 +9,24 @@
 		<email>asturm@gentoo.org</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">PipeWire/pipewire</remote-id>
+		<bugs-to>https://gitlab.freedesktop.org/pipewire/pipewire/-/issues</bugs-to>
+		<changelog>https://gitlab.freedesktop.org/pipewire/pipewire/-/releases</changelog>
+		<doc>https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/home</doc>
 	</upstream>
 	<use>
+		<flag name="aac">AAC over Bluetooth (iPhone compatible headphones)</flag>
+		<flag name="aptx">aptX (HD) over Bluetooth (many Android compatible headphones)</flag>
+		<flag name="extra">Build pw-cat/pw-play/pw-record</flag>
+		<flag name="ffmpeg">Builds an unsupported SPA (file a Gentoo bug if you need this)</flag>
 		<flag name="jack">Enable SPA JACK plugin and emulation to be able to run JACK applications on top of PipeWire</flag>
-		<flag name="pulseaudio">Enable emulation to be able to run PulseAudio applications on top of PipeWire</flag>
-		<flag name="vulkan">Enable vulkan spa plugin integration</flag>
+		<flag name="jack-client">Install a plugin for running PipeWire as a JACK client</flag>
+		<flag name="ldac">LDAC over Bluetooth (primarily Sony headphones)</flag>
+		<flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag>
+		<flag name="vulkan">Uses Vulkan compute shaders to provide a CGI video source</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/pipewire/pipewire-0.3.18.ebuild b/media-video/pipewire/pipewire-0.3.18.ebuild
deleted file mode 100644
index 437e30b364af..000000000000
--- a/media-video/pipewire/pipewire-0.3.18.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
-	EGIT_BRANCH="work"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	>=media-libs/alsa-lib-1.1.7
-	media-libs/libsdl2
-	>=media-libs/libsndfile-1.0.20
-	sys-apps/dbus
-	virtual/libudev
-	bluetooth? (
-		media-libs/sbc
-		net-wireless/bluez:=
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack? ( >=media-sound/jack2-1.9.10:2 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-11.1
-	)
-	systemd? ( sys-apps/systemd )
-	vulkan? ( media-libs/vulkan-loader )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	spa_use() {
-		if ! in_iuse ${1} || ! use ${1}; then
-			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-i src/daemon/pipewire.conf.in || die
-		fi
-	}
-
-	default
-	spa_use libcamera
-	spa_use rtkit
-	spa_use bluetooth bluez5
-	spa_use jack
-	spa_use vulkan
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dexamples=true # contains required pipewire-media-session
-		-Dman=true
-		-Dspa-plugins=true
-		--buildtype=$(usex debug debugoptimized plain)
-		# alsa plugin and jack/pulseaudio emulation
-		-Dpipewire-alsa=true
-		$(meson_use jack pipewire-jack)
-		$(meson_use pulseaudio pipewire-pulseaudio)
-		# spa-plugins
-		# we install alsa support unconditionally
-		$(meson_use bluetooth bluez5)
-		$(meson_use ffmpeg)
-		$(meson_use jack)
-		$(meson_use vulkan)
-		# libcamera is not packaged
-		# misc
-		$(meson_use doc docs)
-		$(meson_use gstreamer)
-		$(meson_use gstreamer gstreamer-device-provider)
-		$(meson_use systemd)
-		$(meson_use test test)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# 	# TODO: this breaks alsa users
-# 	if use alsa; then
-# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# 	fi
-}
-
-pkg_postinst() {
-	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
-	elog "by setting DISABLE_RTKIT env var."
-	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
-	elog
-	if use jack; then
-		elog "Please note that even though the libraries for JACK emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
-		elog
-	fi
-	if use pulseaudio; then
-		elog "Please note that even though the libraries for PulseAudio emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
-		elog
-	fi
-	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/pipewire/pipewire-0.3.22.ebuild b/media-video/pipewire/pipewire-0.3.22.ebuild
index ca830f18aed3..882c564f08a0 100644
--- a/media-video/pipewire/pipewire-0.3.22.ebuild
+++ b/media-video/pipewire/pipewire-0.3.22.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/pipewire/pipewire-0.3.24.ebuild b/media-video/pipewire/pipewire-0.3.24.ebuild
deleted file mode 100644
index 77f2f8a90cbe..000000000000
--- a/media-video/pipewire/pipewire-0.3.24.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
-	EGIT_BRANCH="work"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="bluetooth debug doc ffmpeg gstreamer jack sdl sndfile systemd test vulkan X"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	>=media-libs/alsa-lib-1.1.7
-	sys-apps/dbus
-	virtual/libudev
-	bluetooth? (
-		media-libs/sbc
-		net-wireless/bluez:=
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack? ( >=media-sound/jack2-1.9.10:2 )
-	sdl? ( media-libs/libsdl2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.20 )
-	systemd? ( sys-apps/systemd )
-	vulkan? ( media-libs/vulkan-loader )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	spa_use() {
-		if ! in_iuse ${1} || ! use ${1}; then
-			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-i src/daemon/pipewire.conf.in || die
-		fi
-	}
-
-	default
-	spa_use libcamera
-	spa_use rtkit
-	spa_use bluetooth bluez5
-	spa_use jack
-	spa_use vulkan
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dexamples=enabled # contains required pipewire-media-session
-		-Dman=enabled
-		-Dspa-plugins=enabled
-		--buildtype=$(usex debug debugoptimized plain)
-		# alsa plugin and jack emulation
-		-Dpipewire-alsa=enabled
-		$(meson_feature jack pipewire-jack)
-		# spa-plugins
-		# we install alsa support unconditionally
-		$(meson_feature bluetooth bluez5)
-		$(meson_feature ffmpeg)
-		$(meson_feature jack)
-		$(meson_feature vulkan)
-		# libcamera is not packaged
-		# misc
-		$(meson_feature doc docs)
-		$(meson_feature gstreamer)
-		$(meson_feature gstreamer gstreamer-device-provider)
-		$(meson_feature sdl sdl2)
-		$(meson_feature sndfile)
-		$(meson_feature systemd)
-		$(meson_feature test test)
-		$(meson_feature test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# 	# TODO: this breaks alsa users
-# 	if use alsa; then
-# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# 	fi
-}
-
-pkg_postinst() {
-	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
-	elog "by setting DISABLE_RTKIT env var."
-	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
-	elog
-	if use jack; then
-		elog "Please note that even though the libraries for JACK emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
-		elog
-	fi
-	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/pipewire/pipewire-0.3.25.ebuild b/media-video/pipewire/pipewire-0.3.25.ebuild
new file mode 100644
index 000000000000..480acc4c2927
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.25.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+#	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+	aac? ( bluetooth )
+	aptx? ( bluetooth )
+	ldac? ( bluetooth )
+"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	media-libs/alsa-lib
+	sys-apps/dbus
+	sys-libs/ncurses[unicode]
+	virtual/libudev
+	bluetooth? (
+		aac? ( media-libs/fdk-aac )
+		aptx? ( media-libs/libopenaptx )
+		ldac? ( media-libs/libldac )
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-fix-docdir-path.patch
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_feature doc docs)
+		-Dexamples=enabled # Disabling this implicitly disables -Dmedia-session (not good)
+		-Dmedia-session=enabled
+		-Dman=enabled
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_feature gstreamer)
+		$(meson_feature gstreamer gstreamer-device-provider)
+		$(meson_feature systemd) # Also covers logind integration
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		#-Dlibjack-path="" # Where to install libjack.so et al (if an absolute path is used, remember to prefix it with ${EROOT} or similar!); setting this will also break pw-jack's multilib support (but presumably that's okay as the intended use would be to replace system's libraries making the loader irrelevant)
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_feature bluetooth bluez5)
+		$(meson_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_feature bluetooth bluez5-backend-ofono)
+		$(meson_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_feature aac bluez5-codec-aac)
+		$(meson_feature aptx bluez5-codec-aptx)
+		$(meson_feature ldac bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_feature jack-client jack) # Allows PW to act as a JACK client
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		1000:60000	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+}
+
+pkg_postinst() {
+	if ! use pipewire-alsa; then
+		elog "Contrary to what some online resources may suggest, avoid setting"
+		elog "PULSE_LATENCY_MSEC environment variable since it may break ALSA clients."
+		elog
+	fi
+
+	elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+	elog "alternative libraries have been installed to a non-default location."
+	elog "To use them, put pw-jack <application> before every JACK application."
+	elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+	elog "provider is still needed to compile the JACK applications themselves."
+	elog
+
+	if use systemd; then
+		elog "Per Gentoo policy installed systemd units must be manually enabled:"
+		elog "systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog "systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog "Rebooting is strongly recommended to avoid surprises from"
+		elog "remnant PulseAudio daemon auto-spawning and surviving logouts."
+		elog
+		ewarn "Both new users and those upgrading need to enable pipewire-media-session:"
+		ewarn "systemctl --user enable pipewire-media-session.service"
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog "autospawn = no"
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf"
+		elog "by commenting out the relevant command near the end of the file:"
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		elog "It is still necessary to manually enable PipeWire startup. Setup specific"
+		elog "instructions can be found at: https://wiki.gentoo.org/wiki/PipeWire"
+	fi
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.26.ebuild b/media-video/pipewire/pipewire-0.3.26.ebuild
new file mode 100644
index 000000000000..a90b445a81d0
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.26.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+#	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+	aac? ( bluetooth )
+	aptx? ( bluetooth )
+	ldac? ( bluetooth )
+"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	media-libs/alsa-lib
+	sys-apps/dbus
+	sys-libs/ncurses[unicode]
+	virtual/libudev
+	bluetooth? (
+		aac? ( media-libs/fdk-aac )
+		aptx? ( media-libs/libopenaptx )
+		ldac? ( media-libs/libldac )
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_feature doc docs)
+		-Dexamples=enabled # Disabling this implicitly disables -Dmedia-session (not good)
+		-Dmedia-session=enabled
+		-Dman=enabled
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_feature gstreamer)
+		$(meson_feature gstreamer gstreamer-device-provider)
+		$(meson_feature systemd) # Also covers logind integration
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		#-Dlibjack-path="" # Where to install libjack.so et al (if an absolute path is used, remember to prefix it with ${EROOT} or similar!); setting this will also break pw-jack's multilib support (but presumably that's okay as the intended use would be to replace system's libraries making the loader irrelevant)
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_feature bluetooth bluez5)
+		$(meson_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_feature bluetooth bluez5-backend-ofono)
+		$(meson_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_feature aac bluez5-codec-aac)
+		$(meson_feature aptx bluez5-codec-aptx)
+		$(meson_feature ldac bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_feature jack-client jack) # Allows PW to act as a JACK client
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		1000:60000	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	if ! use pipewire-alsa; then
+		elog "Contrary to what some online resources may suggest, avoid setting"
+		elog "PULSE_LATENCY_MSEC environment variable since it may break ALSA clients."
+		elog
+	fi
+
+	elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+	elog "alternative libraries have been installed to a non-default location."
+	elog "To use them, put pw-jack <application> before every JACK application."
+	elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+	elog "provider is still needed to compile the JACK applications themselves."
+	elog
+
+	if use systemd; then
+		elog "Per Gentoo policy installed systemd units must be manually enabled:"
+		elog "systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog "systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog "Rebooting is strongly recommended to avoid surprises from"
+		elog "remnant PulseAudio daemon auto-spawning and surviving logouts."
+		elog
+		ewarn "Both new users and those upgrading need to enable pipewire-media-session:"
+		ewarn "systemctl --user enable pipewire-media-session.service"
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog "autospawn = no"
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf"
+		elog "by commenting out the relevant command near the end of the file:"
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		elog "It is still necessary to manually enable PipeWire startup. Setup specific"
+		elog "instructions can be found at: https://wiki.gentoo.org/wiki/PipeWire"
+	fi
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
new file mode 100644
index 000000000000..a90b445a81d0
--- /dev/null
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+#	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+	aac? ( bluetooth )
+	aptx? ( bluetooth )
+	ldac? ( bluetooth )
+"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	media-libs/alsa-lib
+	sys-apps/dbus
+	sys-libs/ncurses[unicode]
+	virtual/libudev
+	bluetooth? (
+		aac? ( media-libs/fdk-aac )
+		aptx? ( media-libs/libopenaptx )
+		ldac? ( media-libs/libldac )
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_feature doc docs)
+		-Dexamples=enabled # Disabling this implicitly disables -Dmedia-session (not good)
+		-Dmedia-session=enabled
+		-Dman=enabled
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_feature gstreamer)
+		$(meson_feature gstreamer gstreamer-device-provider)
+		$(meson_feature systemd) # Also covers logind integration
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		#-Dlibjack-path="" # Where to install libjack.so et al (if an absolute path is used, remember to prefix it with ${EROOT} or similar!); setting this will also break pw-jack's multilib support (but presumably that's okay as the intended use would be to replace system's libraries making the loader irrelevant)
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_feature bluetooth bluez5)
+		$(meson_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_feature bluetooth bluez5-backend-ofono)
+		$(meson_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_feature aac bluez5-codec-aac)
+		$(meson_feature aptx bluez5-codec-aptx)
+		$(meson_feature ldac bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_feature jack-client jack) # Allows PW to act as a JACK client
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		1000:60000	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	if ! use pipewire-alsa; then
+		elog "Contrary to what some online resources may suggest, avoid setting"
+		elog "PULSE_LATENCY_MSEC environment variable since it may break ALSA clients."
+		elog
+	fi
+
+	elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+	elog "alternative libraries have been installed to a non-default location."
+	elog "To use them, put pw-jack <application> before every JACK application."
+	elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+	elog "provider is still needed to compile the JACK applications themselves."
+	elog
+
+	if use systemd; then
+		elog "Per Gentoo policy installed systemd units must be manually enabled:"
+		elog "systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog "systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog "Rebooting is strongly recommended to avoid surprises from"
+		elog "remnant PulseAudio daemon auto-spawning and surviving logouts."
+		elog
+		ewarn "Both new users and those upgrading need to enable pipewire-media-session:"
+		ewarn "systemctl --user enable pipewire-media-session.service"
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog "autospawn = no"
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf"
+		elog "by commenting out the relevant command near the end of the file:"
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		elog "It is still necessary to manually enable PipeWire startup. Setup specific"
+		elog "instructions can be found at: https://wiki.gentoo.org/wiki/PipeWire"
+	fi
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index c3ab961e8376..1db34ddc4753 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,4 +1,7 @@
+AUX pitivi-0.999-metainfo.patch 734 BLAKE2B 6187b6d596c80e3ea00e5b79df6f9092f6be1f3e90037ea7f4638aba60fe47cf77e4a9dd4b77d716fd7b3793da0c501b29462b9e98918fc1de089615de2d4f0c SHA512 dfd9c1e9c84de7883b386dcc9b555d904b5633cdfaa0670de7e95ac3561ff45e4f692fcea77cd6b6d4082d834a41026a73b80d0916c81cb15c95d1508534a599
 AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f
+AUX pitivi-0.999-python38.patch 1809 BLAKE2B fe95c44a409f0a629602d4656cfc90a02e2e676a40d3d3f232457e2a506225f25ab86d585f26ddbaf8551c5efc54e13f474b8b259dd05c2a8285c0b98b9249ba SHA512 f90523242fd8acaa4f0637b8facc5a528186c5dd371f67049b11b307bd6f06c693dd79bb305f2163bed4bd0140bd7fcee86fe7d4b2239be82a7dea47c6038026
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
 EBUILD pitivi-0.999-r3.ebuild 2541 BLAKE2B 583615b1bfee4b7b4074f21cbfcf1a10b1b221a6e16a758480f4c031335fb510cc46477c92421430f6240a47f3dbbf88584de53216caf865ad436ec1fd033584 SHA512 a190374c1527ad7febb37a1f74aee427c90d613c977b37ca541decc8469035cb41e815eba9aabb10c3042daa0700d282fa0d981fc22d8bd356339df5e21b4707
+EBUILD pitivi-0.999-r4.ebuild 2733 BLAKE2B 7fc6bc19f41af949929b213de602a597b10b3313f3b35080ab54b63fcd8cd3a2c961d01655d68772227659906828a07f4b43a62929e2e80ac2a6e32e822f63c9 SHA512 f28fb45cc38c78b38874ae215880599d9c9db0d9719d81e4595d8f1b3a3fd111ff4bc0ef089bbf0828776365b156d58d93f39ce77a957a96ab37eaa3a3aebd34
 MISC metadata.xml 379 BLAKE2B a4f21a8cd6e5f4b09d1a89e426610108ab92ba52ef432d1780d100e76e43dda198cee09f105aec83994d4d1fa701be6c33a5981253b6c38b8ec888da08b5975a SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1
diff --git a/media-video/pitivi/files/pitivi-0.999-metainfo.patch b/media-video/pitivi/files/pitivi-0.999-metainfo.patch
new file mode 100644
index 000000000000..830a246e60dd
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-0.999-metainfo.patch
@@ -0,0 +1,12 @@
+diff --unified --new-file --recursive --show-c-function '--color=auto' pitivi-0.999/data/meson.build pitivi-0.999-fix/data/meson.build
+--- pitivi-0.999/data/meson.build	2018-08-29 16:05:21.000000000 +0200
++++ pitivi-0.999-fix/data/meson.build	2021-04-18 09:10:56.067231216 +0200
+@@ -18,7 +18,7 @@ custom_target('org.pitivi.Pitivi.appdata
+     input : 'org.pitivi.Pitivi.appdata.xml.in',
+     command : [intltool_merge, '--xml-style', podir, '@INPUT@', '@OUTPUT@'],
+     install : true,
+-    install_dir : join_paths(get_option('datadir'), 'appdata'))
++    install_dir : join_paths(get_option('datadir'), 'metainfo'))
+ 
+ install_data('org.pitivi.Pitivi-mime.xml',
+     install_dir : join_paths(get_option('datadir'), 'mime/packages'))
diff --git a/media-video/pitivi/files/pitivi-0.999-python38.patch b/media-video/pitivi/files/pitivi-0.999-python38.patch
new file mode 100644
index 000000000000..3c240d949112
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-0.999-python38.patch
@@ -0,0 +1,49 @@
+From 3c2c03828efb986e66ba2a35e341127e8161c799 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandru=20B=C4=83lu=C8=9B?= <alexandru.balut@gmail.com>
+Date: Tue, 28 Jan 2020 22:34:40 +0100
+Subject: [PATCH] meson: Support Python 3.8
+
+To link to Python we need to use python-3.8-embed.
+---
+ meson.build       | 13 ++++++++++---
+ meson_options.txt |  3 ++-
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 17a7312d..289e0086 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,11 +1,18 @@
+-project('pitivi', 'c', version : '0.999', meson_version : '>= 0.41.0')
++project('pitivi', 'c', version : '0.999', meson_version : '>= 0.46.0')
+ 
+-python = find_program('python3')
+ intltool_merge = find_program('intltool-merge')
+ itstool = find_program('itstool')
+ msgfmt = find_program('msgfmt')
+ 
+-python_dep = dependency('python3', version : '>= 3.3')
++pymod = import('python')
++python = pymod.find_installation(get_option('python'))
++pythonver = python.language_version()
++# Workaround for https://github.com/mesonbuild/meson/issues/5629
++# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
++python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>= 3.3', required: false)
++if not python_dep.found()
++  python_dep = python.dependency('python3', version: '>= 3.3')
++endif
+ 
+ if get_option('build-gst')
+     subproject('gst-build', default_options: ['enable_python=true',
+diff --git a/meson_options.txt b/meson_options.txt
+index c6590dd1..7d6bad29 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,2 +1,3 @@
+-option('disable-help', type : 'boolean', value : false)
+ option('build-gst', type : 'boolean', value : false)
++option('disable-help', type : 'boolean', value : false)
++option('python', type : 'string', value : 'python3')
+-- 
+2.26.2
+
diff --git a/media-video/pitivi/pitivi-0.999-r4.ebuild b/media-video/pitivi/pitivi-0.999-r4.ebuild
new file mode 100644
index 000000000000..0fea03048c4f
--- /dev/null
+++ b/media-video/pitivi/pitivi-0.999-r4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_8 )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome.org meson python-single-r1 virtualx xdg
+
+DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
+HOMEPAGE="http://www.pitivi.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="v4l test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# XXX: recommends gst-plugins-libav and frei0r-plugins
+
+# Do not forget to check pitivi/check.py for dependencies!!!
+# pycanberra, libav, libnotify and liwnck are optional
+GST_VER="1.14.2"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pycairo-1.10[${PYTHON_MULTI_USEDEP}]
+	')
+	>=x11-libs/cairo-1.10
+
+	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
+	>=media-plugins/gst-transcoder-1.14.1
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/glib-2.30.0:2
+
+	>=dev-libs/gobject-introspection-1.34:=
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/gst-python-1.4:1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
+	')
+
+	gnome-base/librsvg:=
+	>=media-libs/gsound-1.0
+
+	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection,theora]
+	>=media-libs/gst-plugins-bad-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gtk-${GST_VER}:1.0
+	>=media-libs/gst-plugins-good-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0
+
+	>=x11-libs/libnotify-0.7[introspection]
+	x11-libs/libwnck:3[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+
+	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/yelp-tools
+	dev-python/setuptools
+	>=dev-util/intltool-0.35.5
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose2[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/pitivi/-/merge_requests/245
+	# support python 3.8
+	"${FILESDIR}"/${P}-python38.patch
+
+	# use /usr/share/metainfo
+	"${FILESDIR}"/${P}-metainfo.patch
+
+	# Make tests optional, bug #594096
+	# https://gitlab.gnome.org/GNOME/pitivi/issues/2303
+	"${FILESDIR}"/${P}-optional-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Denable-tests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	export PITIVI_TOP_LEVEL_DIR="${S}"
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"
+}
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 3e8766e1d4b5..d455ecc3c238 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -8,4 +8,5 @@ DIST projectx-icon.png 1692 BLAKE2B 6da85b69961b81f64638b04860b467e8cf599287513d
 DIST projectx-idctfast.tar.xz 12444 BLAKE2B e4b2a6ab235601dbdd1acf8a73a14fecb5da455670bad52598e0dbd8a7300305fad1b22b3d550dd046dcac68975af4b225e042f7c968ce9108f702d01586302f SHA512 85dd6dd0011c166aaefd47a47c4455dda68ba6da65c9eda5a996f7d078ce3900168714c0c72c6250f7b99181fda84c6d81e3afb392ace9c12c3c5690de01c1d8
 DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b
 EBUILD projectx-0.91.0.10-r2.ebuild 3277 BLAKE2B a682a39f1869f45ddea86f759fe04375da69e0b0b9f40894d385e1e758c287aa608fa0b362c8161455b5fd3fca558f1f8557b3dbc27d6ad9880188e35cf0be20 SHA512 bf4a4c64e156feabf89e2b0f81097c6d2a809e7ea065601eff23fe8a78b746887a30b5c1a7bccba3d835e6fadc90d232f2a4182dd3d22425669233da7d11b531
+EBUILD projectx-0.91.0.10-r3.ebuild 3284 BLAKE2B 0c7444ebfbe6e5fed0c686ab94b0b67c5ea3d40f6145db7d5b894b35dd9eccd6dbef05fe6f80285b3b9eaf03cdd9f56e9cb603eb8c4dd0ed6820710e2fa69427 SHA512 9b66fe087821b95eaba93c16037624e5af4dc35878f2c00fedce2cc7be6fc8f772414561b590f62b03f0e3882349bc512d8a29de98d77c7b029ab468fe4bec09
 MISC metadata.xml 742 BLAKE2B 5aacc52def6d49258139e9435aa1db4f2295a07e4491a921db142c262c84a3deaaf8b9b22d7bc68dcd00ee142cb4f9912463f4ab2fb79eae74ea461375b1467c SHA512 3a5546c1efbafa335ee5d05ff24c2b22f0f49d8944e242348bef9627ac5e72205d9bd3e697b3d89c7d0ef3e34d98fe19b58c021f41bcaff872c74373a6803341
diff --git a/media-video/projectx/projectx-0.91.0.10-r3.ebuild b/media-video/projectx/projectx-0.91.0.10-r3.ebuild
new file mode 100644
index 000000000000..2663408f4e05
--- /dev/null
+++ b/media-video/projectx/projectx-0.91.0.10-r3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit desktop eutils java-pkg-2 java-ant-2 toolchain-funcs xdg
+
+XDG_P="xdg-20100731"
+
+DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
+HOMEPAGE="http://project-x.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~billie/distfiles/${PN}-idctfast.tar.xz
+	https://dev.gentoo.org/~billie/distfiles/${XDG_P}.java.xz
+	https://dev.gentoo.org/~billie/distfiles/${PN}-icon.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+COMMON_DEPEND="
+	dev-java/commons-net:0
+	X? ( dev-java/browserlauncher2:1.0 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jre-1.8:*
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jdk-1.8:*
+	app-arch/xz-utils
+	virtual/libiconv
+"
+
+S="${WORKDIR}/Project-X"
+
+mainclass() {
+	# read Main-Class from MANIFEST.MF
+	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" || die
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	local X
+
+	# apply stdout corruption patch (zzam@gentoo.org)
+	eapply "${FILESDIR}/${PN}-0.91.0.10-stdout-corrupt.patch"
+
+	# apply BrowserLauncher2 patch
+	use X && eapply "${FILESDIR}/${PN}-0.91.0.10-bl2.patch"
+	rm -rf src/edu || die
+
+	# apply IDCTFast patch
+	eapply "${FILESDIR}/${PN}-0.91.0.10-idctfast.patch"
+
+	# apply XDG patch
+	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
+	eapply "${FILESDIR}/${PN}-0.91.0.10-xdg.patch"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-0.91.0.10.xml" build.xml || die
+
+	# patch executable and icon
+	sed -i -e "s:^\(Exec=\).*:\1${PN}_gui:g" \
+		-e "s:^\(Icon=\).*:\1${PN}:g" *.desktop || die
+
+	# convert CRLF to LF
+	edos2unix *.txt MANIFEST.MF
+
+	# convert docs to utf-8
+	if [ -x "$(type -p iconv)" ]; then
+		for X in zutun.txt; do
+			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || die
+		done
+	fi
+
+	# merge/remove resources depending on USE="X"
+	if use X; then
+		mv -f htmls resources/ || die
+	else
+		rm -rf src/net/sourceforge/dvb/projectx/gui || die
+		rm resources/*.gif || die
+	fi
+
+	# update library packages
+	cd lib || die
+	rm -f {commons-net,jakarta-oro}*.jar || die
+	java-pkg_jar-from commons-net
+	use X && java-pkg_jar-from browserlauncher2-1.0
+	java-pkg_ensure-no-bundled-jars
+}
+
+src_compile() {
+	local IDCT="idct-mjpeg"  # default IDCT implementation
+	if use x86 || use amd64; then
+		use cpu_flags_x86_mmx && IDCT="idct-mjpeg-mmx"
+		use cpu_flags_x86_sse && IDCT="idct-mjpeg-sse"
+	fi
+
+	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
+
+	cd lib/PORTABLE || die
+	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
+		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_doso lib/PORTABLE/libidctfast.so
+
+	java-pkg_dolauncher ${PN}_cli --main $(mainclass) \
+		--java_args "-Djava.awt.headless=true -Xmx256m"
+
+	if use X; then
+		java-pkg_dolauncher ${PN}_gui --main $(mainclass) \
+			--java_args "-Xmx256m"
+		dosym ${PN}_gui /usr/bin/${PN}
+		newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
+		domenu *.desktop
+	else
+		dosym ${PN}_cli /usr/bin/${PN}
+	fi
+
+	dodoc *.txt
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
+}
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index d3d402db390f..89f25700d71c 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,4 +1,6 @@
 DIST QMPlay2-src-20.07.04.tar.xz 1552680 BLAKE2B cc53ef842f91312f72e8d347a2d6d2e4239fe9435d0b7ac39e47e9f1f48a9a570ce614dd496512079d3701e1823ab75123b40ad752fdd2348cdb7bc8de425225 SHA512 4a6316f03d1b77bcd6c08de0daefc3f29b4c8c575eae9f901951e2b43f2739904136b9455f567b66fc9a4e4c64fe92584608f1878dd8c30c0352ea9ee1e2e314
+DIST QMPlay2-src-21.03.09.tar.xz 1568600 BLAKE2B da3a185ae2e372b0bad697e4ad7d836647c5b4bb376f0ee3f7e85e387c10b86f1a3fdaf8eb13a2c9a8d3b7d56105e282cc82f22d31043e9e418ee907776f1db2 SHA512 311fe45a9ee237556faeee29633be6161407a31b19fd3bceca5a164e92ff1757824094d20f6b556c0a4beaac07a14179e812faafc5e41ee904cf1ce1827fb138
 EBUILD qmplay2-20.07.04.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
-EBUILD qmplay2-9999.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
-MISC metadata.xml 1547 BLAKE2B bec5bcc60b7dc19bc1f0c9fbfdf86d7a62fcd5312fa8a5505727b38dce7be1d8fb909995555625373d4fb3ba3ea2019eed841113efdf904e8af46dfdbe5ff709 SHA512 c00d0c95211535d067c5f8ffe59b72e8c652f2194baf7178addfb5de76a051619a7b9983a0c175b393afb3a56e7c30f722abd29767ea7c587cfd0ad7733871bc
+EBUILD qmplay2-21.03.09.ebuild 3457 BLAKE2B 33657ed63ead83ea84d42a5a5afa6756733d496c7429fb80d7150326f463ed4e0f470b67a38814f16144053eaf2727a2586e21b2c809fc858554d47a47b8568f SHA512 af380f84264bbb4de17f1a7bdaf0fb1c338ce2b404e9accfed9d95cdab8601c67e2a1a4429b6fe664a9d30234a5da715ba2ea117aaf5f7ac26363c7082025427
+EBUILD qmplay2-9999.ebuild 3457 BLAKE2B 33657ed63ead83ea84d42a5a5afa6756733d496c7429fb80d7150326f463ed4e0f470b67a38814f16144053eaf2727a2586e21b2c809fc858554d47a47b8568f SHA512 af380f84264bbb4de17f1a7bdaf0fb1c338ce2b404e9accfed9d95cdab8601c67e2a1a4429b6fe664a9d30234a5da715ba2ea117aaf5f7ac26363c7082025427
+MISC metadata.xml 1487 BLAKE2B f91021bb5b7db3b6cb98516ab8c31120bbe0706cc22d0d847a28be8d4c803c2336eba9c7188c5d7c3f91f1a3ba29ee9e0f9bace18410f2b36227d8b940d5c05d SHA512 3a7cdadcacea59a411e3169995a688339c779b74d81a92d7cd386fcdb0ef9a66e969a72bce68914bd156741b0bd2657eb5bfe94644e094f96001363a8adbeb47
diff --git a/media-video/qmplay2/metadata.xml b/media-video/qmplay2/metadata.xml
index dd91b14c1c27..4d4923eee8d1 100644
--- a/media-video/qmplay2/metadata.xml
+++ b/media-video/qmplay2/metadata.xml
@@ -5,10 +5,6 @@
 		<email>reagentoo@gmail.com</email>
 		<name>Dmitry Baranov</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>email@linxon.ru</email>
-		<name>Yury Martynov</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -26,6 +22,7 @@
 		<flag name="inputs">Build with Inputs module</flag>
 		<flag name="libass">Build with SSA/ASS subtitles rendering support</flag>
 		<flag name="notifications">Build additional notifications module</flag>
+		<flag name="pipewire">Build with PipeWire support</flag>
 		<flag name="sid">Build Chiptune with SIDPLAY support</flag>
 		<flag name="shaders">Compile Vulkan shaders using <pkg>media-libs/shaderc</pkg></flag>
 		<flag name="videofilters">Build with VideoFilters module</flag>
diff --git a/media-video/qmplay2/qmplay2-21.03.09.ebuild b/media-video/qmplay2/qmplay2-21.03.09.ebuild
new file mode 100644
index 000000000000..b626780caa01
--- /dev/null
+++ b/media-video/qmplay2/qmplay2-21.03.09.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
+HOMEPAGE="https://github.com/zaps166/QMPlay2"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
+else
+	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/QMPlay2-src-${PV}"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
+	gme inputs libass modplug notifications opengl pipewire portaudio
+	pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
+
+REQUIRED_USE="
+	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
+	extensions? ( dbus )
+	shaders? ( vulkan )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg
+	|| (
+		dev-qt/qtgui:5[X(-)]
+		dev-qt/qtgui:5[xcb(-)]
+	)
+	alsa? ( media-libs/alsa-lib )
+	cdio? ( dev-libs/libcdio[cddb] )
+	dbus? ( dev-qt/qtdbus:5 )
+	extensions? (
+		dev-qt/qtdeclarative:5
+		media-libs/taglib
+	)
+	gme? ( media-libs/game-music-emu )
+	libass? ( media-libs/libass )
+	opengl? ( virtual/opengl )
+	pipewire? ( media-video/pipewire )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplayfp )
+	shaders? ( >=media-libs/shaderc-2020.1 )
+	vaapi? (
+		>=media-video/ffmpeg-4.1.3[vaapi]
+		x11-libs/libva[drm,opengl]
+	)
+	vdpau? ( media-video/ffmpeg[vdpau] )
+	videofilters? ( dev-qt/qtconcurrent:5 )
+	vulkan? (
+		>=dev-qt/qtgui-5.14.1:5[vulkan]
+		>=media-libs/vulkan-loader-1.2.133
+	)
+	xv? ( x11-libs/libXv )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+src_prepare() {
+	# disable compress man pages
+	sed -r \
+		-e 's/if\(GZIP\)/if\(TRUE\)/' \
+		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
+		-i src/gui/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# core
+		-DUSE_LINK_TIME_OPTIMIZATION=false
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_AUDIOCD=$(usex cdio)
+		-DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
+		-DUSE_LIBASS=$(usex libass)
+		-DUSE_NOTIFY=$(usex notifications)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_VULKAN=$(usex vulkan)
+		-DUSE_GLSLC=$(usex shaders)
+		-DUSE_XVIDEO=$(usex xv)
+
+		# ffmpeg
+		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
+		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
+		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
+
+		# chiptune
+		-DUSE_CHIPTUNE_GME=$(usex gme)
+		-DUSE_CHIPTUNE_SID=$(usex sid)
+
+		# modules
+		-DUSE_AUDIOFILTERS=$(usex audiofilters)
+		-DUSE_CUVID=$(usex cuvid)
+		-DUSE_INPUTS=$(usex inputs)
+		-DUSE_MODPLUG=$(usex modplug)
+		-DUSE_PIPEWIRE=$(usex pipewire)
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DUSE_VIDEOFILTERS=$(usex videofilters)
+		-DUSE_VISUALIZATIONS=$(usex visualizations)
+
+		# extensions
+		-DUSE_EXTENSIONS=$(usex extensions)
+		-DUSE_TAGLIB=$(usex extensions)
+		-DUSE_LASTFM=$(usex extensions)
+		-DUSE_LYRICS=$(usex extensions)
+		-DUSE_MEDIABROWSER=$(usex extensions)
+		-DUSE_MPRIS2=$(usex extensions)
+	)
+
+	# find and link vulkan libs permanently
+	if use vulkan; then
+		mycmakeargs+=( -DQMVK_FIND_VULKAN=true )
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		mycmakeargs+=( USE_GIT_VERSION=true )
+	else
+		mycmakeargs+=( USE_GIT_VERSION=false )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 264d28c79f26..b626780caa01 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake xdg-utils
+inherit cmake xdg
 
 DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
 HOMEPAGE="https://github.com/zaps166/QMPlay2"
@@ -21,11 +21,11 @@ LICENSE="LGPL-3"
 SLOT="0"
 
 IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
-	gme inputs libass modplug notifications opengl portaudio
+	gme inputs libass modplug notifications opengl pipewire portaudio
 	pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
 
 REQUIRED_USE="
-	audiofilters? ( || ( alsa portaudio pulseaudio ) )
+	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
 	extensions? ( dbus )
 	shaders? ( vulkan )"
 
@@ -49,6 +49,7 @@ RDEPEND="
 	gme? ( media-libs/game-music-emu )
 	libass? ( media-libs/libass )
 	opengl? ( virtual/opengl )
+	pipewire? ( media-video/pipewire )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	sid? ( media-libs/libsidplayfp )
@@ -108,6 +109,7 @@ src_configure() {
 		-DUSE_CUVID=$(usex cuvid)
 		-DUSE_INPUTS=$(usex inputs)
 		-DUSE_MODPLUG=$(usex modplug)
+		-DUSE_PIPEWIRE=$(usex pipewire)
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
 		-DUSE_VIDEOFILTERS=$(usex videofilters)
@@ -135,15 +137,3 @@ src_configure() {
 
 	cmake_src_configure
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/raspberrypi-omxplayer/Manifest b/media-video/raspberrypi-omxplayer/Manifest
index 9d97afa63731..5d28613d2a35 100644
--- a/media-video/raspberrypi-omxplayer/Manifest
+++ b/media-video/raspberrypi-omxplayer/Manifest
@@ -1,11 +1,6 @@
-AUX Makefile-0_p20160217.patch 1567 BLAKE2B 6e305549a07794ea4e3f97131577e5cb97c8e73b60e75b8a4bbe99feeb683a63f8106c35cc4a92957c2d4ed169e4d6ca75cb7b6a8c28e22fe0094262b43ae9f7 SHA512 c32de32fbbe39b004c428aee9bd65574704c02cd5a7470ceaeba5a039ffb1b78f288f6394a2aa2a544072704ee6d1d2eff10689d15ea16ba8350c6c71bba11eb
-AUX Makefile-0_p20160528.patch 1578 BLAKE2B d0df4c085c06ae76a54bd8fc8db9251054787eb2cfacddfbca0c2110e6992efe10d090ae2ace6d5da2e1f55f4ca9f43596ab8555cb8a3fa4cb5917f0878b161b SHA512 6831719329d6900dd65c7fa6961790300bb8c204b59b81f2d0c6c31e6410bbf89f206d852cd5fb364e2945f36d6fc6be9f25f34158d1c1831581ff05162f900b
+AUX Makefile-0_p20160528.patch 1558 BLAKE2B 46ac6fc78241cef74e05b560c7a75d8367f8e191066f40a801b760688c99cd39b36d36ad56c73979bdef988a01906576169232bcf08d8ff0584510018ef28468 SHA512 0774d69992a1a19c4caf7edd17dfb41f5670ad1f8c4a86834064ce1a9fe88db01814b4c6eb8e8c118b94280e5af908bc8806831252617613dbdc745acd99ccc4
 AUX cross-0_p20160528.patch 520 BLAKE2B d7c69d51a04cf7c458ed97e3911ea6732dd7e51c1cec42787de9c5f77bde1e6312c83fc5317c838e2e8d684f22cd2ac7fbc56c36551421b7468868eb811e9688 SHA512 7ac3f7b3cda31ff6277da792d49e18b792646108faa28154bbad719f0181187e22d9ac7065a685edfcbc28076fc8a37d95b9381cc68e39a469a15c85622dec58
 AUX fonts-path.patch 881 BLAKE2B 3d95639c3aa0bc2d724b44477edc3f9699d627822df12504cf0a3e7beed7fc80a1d1b8a30d2dc4012a2ba0c9869dea5f8801610685b472a4a50b9a0d91748440 SHA512 995e9b5850a240e07814697054178fc19e94483d51b11a3786b8eff6c609619be2d7caa97c63ebdc1d194acb1d24a85b8acd34bbb4d5c0c7cc92a14da7b368dd
-DIST raspberrypi-omxplayer-0_p20160217.tar.gz 1204486 BLAKE2B 4c6739f9cf3f8c401966581a84634aa2187d00110a2a7a5b9077cf1b9efafb1a21c03c4cfaaad4f225b7f2f2d1bb6c777d6d01c1268c14049a2eb03cabf60dbb SHA512 5137ba534ce3b0698c6ace8f570594c97ef978aaa97e6cc902f7895412c5d0282c7c4fa1f7b03f043d5281f0a282caf494602e45aae6a12d6d35bc26aaa4000f
 DIST raspberrypi-omxplayer-0_p20160528.tar.gz 1207624 BLAKE2B 5b8f8973302718cd06f0b7527eb1cc59bddd4c98a58917c540853e54a5c6d6978b00eb790ac5d18cd2e1b90730543e51c3c6edc221b4df1d9482d5e89af5846b SHA512 c7b00908f52159745dda94f35b9150122ca1e4e97ad1578a89f6db917b1579a8ed94c4ef1592a7c2590240e0fd1e7e0617e3ee8dec7f532368205ee63ce42572
-EBUILD raspberrypi-omxplayer-0_p20160217-r1.ebuild 1068 BLAKE2B 1fb694b3a2487b33c751e72dfe6d33cbfbc54c64627a85b113a703bb50f5ccbcbb72ba7eb3ddd9d61c641b78327a963a84e6c8836d2045a5c66364e57314bbb9 SHA512 85f57873b23a94e04b238b65df974ef7dc1339761b1be19f9be376e2bc944cb683f063e88e36de49f2ffcf939d942fa0719d3f58903722637fbf4bf4669962af
-EBUILD raspberrypi-omxplayer-0_p20160528-r2.ebuild 1130 BLAKE2B f5bf083c0f2aa4591fb6453a6708979487dd99b2791e4d687e20bf97288a6d799e130e4dc923313b4c7790344ceb8fee908e6846c930cb26287d56ce7d7b6a50 SHA512 46e9e58f8fbc17adf465ca5cf18056f8f461ec849b91176f9ed96cf4c1a785ec2fcbfeb3d9961aa9cef96616fc03fb3c17c3e34403dabe8d7ca83aad084baed9
 EBUILD raspberrypi-omxplayer-0_p20160528-r3.ebuild 1201 BLAKE2B 82f21e01576c9ec997d464f1e29fc93dd46895e074896f84cf25b1c03cd8070036b1cd937ffdeb6cd5f4bfcbd65303dc1c4a0f6e3d085612115d5a2d9b494ea8 SHA512 289f39d62a0a3d4ac0534d2060c91284709f15ac05ce889e7edeca7bfa9d2de5618a8bd948443605fc531bbb1766876b708198bae913903528304f31bc93c336
-EBUILD raspberrypi-omxplayer-9999.ebuild 1023 BLAKE2B f5e6889287bf8f4c571ac856eb0dde6a34300b43507e66e79a6158e92b814ffd5f244bd11afe2436f9080e2e5438832c779fcb19871d0224a48cc594993fa78a SHA512 7e1a47f4931183b411b09b4db4d9e517c7b087545410673aef0851421a04e75cefb1d2f6f9ae7c062d6df4bd39d288ff1313d63b3f1dc449157881f54d56e191
 MISC metadata.xml 334 BLAKE2B 15d5f7c9703eadfceff441baeb65825f2424949cd0d0c1181615c65bc7b7411e5988aaffbdd3c11d3c82a798e44f0c567b7ac004b5e9e501ec49b8cb2fcad4cb SHA512 e11d2fffe221a77abeb9d7921240732d0f531ab24f0c7663fed7d36a4450a806e97f27329ab7cb63eec9803f377fbe6e757d7bfd50fbb584640e92ed942d9320
diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch
deleted file mode 100644
index c6f945209b95..000000000000
--- a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- omxplayer-9999/Makefile
-+++ omxplayer-9999/Makefile
-@@ -2,9 +2,11 @@
- 
- CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
- 
--LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
-+PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
-+
-+LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
- 
--INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
-+INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
- 
- DIST ?= omxplayer-dist
- 
-@@ -51,8 +47,7 @@
- 	bash gen_version.sh > version.h 
- 
- omxplayer.bin: version $(OBJS)
--	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
--	$(STRIP) omxplayer.bin
-+	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS)
- 
- help.h: README.md Makefile
- 	awk '/SYNOPSIS/{p=1;print;next} p&&/KEY BINDINGS/{p=0};p' $< \
diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
index eb65f5d7ad70..d71e6b376080 100644
--- a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
+++ b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
@@ -1,5 +1,5 @@
---- omxplayer-9999/Makefile
-+++ omxplayer-9999/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -2,9 +2,11 @@
  
  CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
@@ -7,10 +7,10 @@
 -LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
 +PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
 +
-+LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
++LIBS+=-lrt -lpthread $(shell ${PKG_CONFIG} --libs $(PKGS)) -L/opt/vc/lib
  
 -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
-+INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
++INCLUDES+=$(shell ${PKG_CONFIG} --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
  
  DIST ?= omxplayer-dist
  
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217-r1.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217-r1.ebuild
deleted file mode 100644
index 862d38275e34..000000000000
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic
-
-GIT_COMMIT="15a490b"
-DESCRIPTION="Command line media player for the Raspberry Pi"
-HOMEPAGE="https://github.com/popcornmix/omxplayer"
-SRC_URI="https://github.com/popcornmix/omxplayer/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE=""
-
-RDEPEND="dev-libs/libpcre
-	media-fonts/freefont
-	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
-	sys-apps/dbus
-	sys-apps/fbset
-	media-video/ffmpeg
-	x11-apps/xrefresh
-	x11-apps/xset"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/Makefile-0_p20160217.patch \
-		"${FILESDIR}"/fonts-path.patch
-
-	cat > Makefile.include << EOF
-LIBS=-lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
-EOF
-
-	tc-export CXX
-}
-
-src_compile() {
-	emake omxplayer.bin
-}
-
-src_install() {
-	dobin omxplayer omxplayer.bin
-	dodoc README.md
-}
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r2.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r2.ebuild
deleted file mode 100644
index a5a79ed5c0b2..000000000000
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic
-
-GIT_COMMIT="791d7df"
-DESCRIPTION="Command line media player for the Raspberry Pi"
-HOMEPAGE="https://github.com/popcornmix/omxplayer"
-SRC_URI="https://github.com/popcornmix/omxplayer/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="X"
-
-RDEPEND="dev-libs/libpcre
-	media-fonts/freefont
-	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
-	sys-apps/dbus
-	sys-apps/fbset
-	media-video/ffmpeg
-	dev-libs/boost
-	media-libs/freetype:2
-	X? (
-		x11-apps/xrefresh
-		x11-apps/xset
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/Makefile-0_p20160528.patch \
-		"${FILESDIR}"/fonts-path.patch
-
-	cat > Makefile.include << EOF
-LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
-EOF
-
-	tc-export CXX
-}
-
-src_compile() {
-	emake omxplayer.bin
-}
-
-src_install() {
-	dobin omxplayer omxplayer.bin
-	dodoc README.md
-}
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
deleted file mode 100644
index 3cefa5dab0e0..000000000000
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils git-r3 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Command line media player for the Raspberry Pi"
-HOMEPAGE="https://github.com/popcornmix/omxplayer"
-EGIT_REPO_URI="https://github.com/popcornmix/omxplayer.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="X"
-
-RDEPEND="dev-libs/libpcre
-	media-fonts/freefont
-	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
-	sys-apps/dbus
-	sys-apps/fbset
-	media-video/ffmpeg
-	dev-libs/boost
-	media-libs/freetype:2
-	X? (
-		x11-apps/xrefresh
-		x11-apps/xset
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/Makefile-0_p20160217.patch \
-		"${FILESDIR}"/fonts-path.patch
-
-	cat > Makefile.include << EOF
-LIBS=-lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
-EOF
-
-	tc-export CXX
-}
-
-src_compile() {
-	emake omxplayer.bin
-}
-
-src_install() {
-	dobin omxplayer omxplayer.bin
-	dodoc README.md
-}
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index c3e213687dfd..71c4df9dcda2 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -1,56 +1,89 @@
 DIST addr2line-0.14.1.crate 31201 BLAKE2B 52564dd603a9c02694ea41bafc91bf20aaf6837321407d2fdf3e7a0db9f92726c73735fb7d8424295bda9db016d319bd6ab1b3ffcd79df60656a0524006732eb SHA512 f665deccae566ec2754cd43fc1d8fc05db11320af54d0561a612faad769234e8b3b8c0235f90f86027a4db9b7ef2915c86398005c949e2c096fac8e53f3f441e
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
 DIST aom-sys-0.2.1.crate 3122 BLAKE2B b36dda367b7a5b65b3ae9aa33e60ec19f51f3a72126c41de049a1a18b76283c717b12380030e7155c2dd00c7674f4ebc8329d6ef7163075fff9e8d99a91580b1 SHA512 1bc6934004e070891abbd98f237a4026aedbd96ceeedd8186df894f833a72af78533176ae406d5aa3ebbe3cc8581761ce1868046aaf3522655fd715ad9a288b9
+DIST aom-sys-0.2.2.crate 3134 BLAKE2B 07b0ae83708bcbdee36df9d67657f8c178a2d6f360e1b7fa83104a44d5b035a3905ad7a6bb930eacae8c67bd1faf4068ba5cc578bfd7967c2705ad38dacb51ea SHA512 972ba26950eddb495e9d1335bd46fe91426e2d981906a1d2530ab12cf3845bbc023d47214f382f7515c9bf9a70f3da7f8f33c103752a475723d6817cd988920b
 DIST arbitrary-0.2.0.crate 4743 BLAKE2B 2bf19d83340d582ecfad69053b852e6928d5a3a66e90bc1af44def6d057c023bc6e1263cea7cdcfc5f7bf8694f26acf6aa88452a4a5be391d07dc5350d450013 SHA512 995e99bdea49ccd2bc153569cfc24c0e936e719a1cbd32471abbaf9d2a148daa76b735576c5dc802c6eb6eb0b913ddb6a1431e8b1d05eac4674786be07435677
 DIST arbitrary-0.4.7.crate 26282 BLAKE2B 1a304154926c9f24a80eced744f13379814377f067f8340672c2588edad22b26088b359b304c1c22f068bf6c7a1da09715caefa28eab046fe79085e67ecb259e SHA512 17968466d1403903a8cb5ec7f8af403e2ecbbbd8beed3df41035c34af1c19bc9d57596e1751f3aaf4c6021fe8fc7e23a7f0c1bbd1a5942d94f9dcafd0b19c1a6
 DIST arg_enum_proc_macro-0.3.0.crate 4213 BLAKE2B 13680bf0754b3096d183f1d1900d45b6a937b7b2e1a44b4f58d79e13ac6ddc608d1aa8fde8155ef8dcb1ab8a513afd91fb60dfd16f11dee9e9666193578e6ef3 SHA512 fe575c5e70c132051d7900885f4aa8c0568efeb383e4f305bb62d69f70f21f1dee9d36e6715d482c594fdbc0e9bfdb445ae55e619d4ab44815b044abad4066da
+DIST arg_enum_proc_macro-0.3.1.crate 4687 BLAKE2B a35b8077b49836f9f8eb310b81052414cc5c9a35c7658e2cb1262a067dd2e0319bd88a3e5dc9837942a4ac40ea622ea47816b2932d8fa6b5935d0e7add3fb769 SHA512 b4c4472393ca6ee00e5859478caefa011f0fa51acd9072457d02c0dc7a9afbf18871ff1135bfe0ac9a26b8a2c419dfdeb878f2a2cab87f8714101f1a59ea1963
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST assert_cmd-1.0.2.crate 25037 BLAKE2B b7fe731a66ce7270b165e30da774420ff17f29a881e738b8b8a9ed37170edc6d0c27f1b052553c408c93b832f879742123b1585abccfde9c7e4b5830d0f327a6 SHA512 1d17d4ac5748a3a44ed25c8788f17bb5edcc15ce0e3f2232dfcb0c88cf735406e1048752473ae76fb033aad6d544c142c699c49e0398d2625e59b36526417f7a
+DIST assert_cmd-1.0.3.crate 26323 BLAKE2B 97fa287db425901474b2e9c4e0b9c500209e6ae23de73d079458ef21e8d1f6a49837683c543ce05ed79b0a07a4e1075d02630789760b52956f16e2f629e3d439 SHA512 3205f9eac594113996287dab2a641115e5fdb4e92734fa34e12d99b3808597e13371658857896c76449ab1fdca4cf4e675d812ea120602e16024409483b60bf2
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST av-metrics-0.6.2.crate 22396 BLAKE2B 300827869d546f4d093a3e1246cf3b4c67d0c7a483028b7ef1b7e400dec2f55ca31238c0c918b799cd73ae94c8184570c6a31b4b4f3c909bf603da7f83ee09bd SHA512 47aae94ef05302c0ac2bd20dfed97c3ca41db0f63ced9bbac206824bbef017e0abcd39e9805eac268c88adb2bdf6ef3b662a7865e6f3ce311795dba1e84cc996
 DIST backtrace-0.3.55.crate 73145 BLAKE2B 51206670a26275afd43da11c210b4c581c962ace22f7da19411aa287961313d71fd0d1e09866b8870d5f25fdb25b524aa79ea65b7e66eb25cd134c12455bfae7 SHA512 c39ef484034fd10577d3fb3d1b57a2de246d882c0f401477dca29bf856b33fe0fbd9c3732dc926c3df0f29cfaeb2e2ee94f810e645ad21642e445b6f239f8e69
+DIST backtrace-0.3.56.crate 73377 BLAKE2B ef13597495bc655bb01ffe3d5724ef487d48dce598d9522c737c694ebed1f4c78d8e6bb1b80c817409ec4eb8c99b4835b254ee92a2c2befd1cce2034d0b3567a SHA512 0baf075eb3a964f27306863c19a2961121b52758b58d12ec7dfb508fbae2f3136e8be21d2d9f63ca5b54d4e9db78d9cdbe65fa27b31c42b65c182ccd79a0d7e6
 DIST bindgen-0.54.0.crate 192585 BLAKE2B 623084aa43a8781dad202d82e17cac8f00b0683546b5417d05a021b1205c6fed5b142f27634da22ba5cc15f71eeb570daf21d089ceb37a69db7e0750af2c9701 SHA512 17053d27fc54cf905c2ec481f7e236352fca4e676c4dfaa260f36a357f4b54bec2a6a5983ca036055df236aa21e80f6650635462ce9e700cde4ca119a80c5da1
+DIST bindgen-0.56.0.crate 198300 BLAKE2B 96a4434f5cd0dc474a344e58944acf6dea915cfe27adede48bba10c9c542e5c4748f5ab90a0cbdb6901495f985f9112383e40021e60703695b5ff3afb29fd05d SHA512 e7bc3700d3db533380b40874d258d9c3132a85bb704929922f203619dc7e62d0778d92cc23e9409a3c098095e0a29d995b9feb1409a57a402f6059d094a109fb
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
 DIST bitstream-io-0.8.5.crate 22710 BLAKE2B 7b3e7448745ff4e7d735377ed2f531a5784a95238e1b4f2676876cdf86031ecdaa9f549c4f6b491140c7054dbf28dcd373a1798fc70efab556becced0c5b399a SHA512 79d87a9b3780e6bf38000d435a2fe7579ce88bbbf50cc2fe4b3eaeb1b7812813216682adf968de369fa6f749f75958a47e6232d3a5154cdd2c8bbc69a616e3ca
 DIST bitstream-io-1.0.0.crate 27035 BLAKE2B 6775b22bec5d54467f83f58b6421bc247338c7a862fe5edf920f805cc2ac6a047a314ea0c6eca13cc6c97eaee7f0aa5f816704bad764e572f2db9901b6f72f78 SHA512 c1741d748e3c65d790037fef2b025db4ac1fb0a9fb3ef152d09e96d7067eff077fd74a406d5b2569f404d49b0e0fe02f2b85af8f283a36627b85007428f6fa90
 DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d95b713bd44375e739037ae12451602fa539ebf98e73d39a6786728ad145e882117b98108d945ba96b810e83 SHA512 de62c0f31ad672f90a8038fa163c7cdaf474b35ec24592aee5549af7c76d43e6ed00f8d7237e15ab27576c27a7232033a217955de6a0a3b40c83661b3a7e1e8a
+DIST bstr-0.2.15.crate 344206 BLAKE2B 3a4f24d2a039f7aeee3b6fcbfcc2fa72f1ef8a06ff8bc039af055739436655851565a57e5a4f86a7984b00ee7598c1fbdf26f3302929f91d7efb1327fd36eb57 SHA512 6e464ca1aec722a283759ff6978bab1769dfc8d61aa683f8e4c59bd69c7be2fe86c5470f4c54457871c6640e2d50b6b882747ec567098eb78e62f7cb07cb93a2
 DIST bumpalo-3.4.0.crate 129102 BLAKE2B b585c8d682acf555cbe695dfe150074e4afb1620736f28b29567070e445a12293b460d3c85ff88979abfc74fe7453010ebbcfd64bb2b2d575258d51fab2b1400 SHA512 955e49eeeb803547092b58c086a2582e905578179d93500c1f55dd3fb7a65349f33ddc4c2710c0ee804abbe4e1f2afbdeb998533d362177298a86a4f9a8822a5
+DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
 DIST bytemuck-1.4.1.crate 23450 BLAKE2B dfa2dd2cf2861069238076d7986f0395297989d6f7838b5c6e7c7190287a533b61aa6fefacb73fc821ed281738ada6045966f8bb99bf89e604247494f6bbd7e1 SHA512 234f524538afd0e28049d1559d0aafbc2803b9461c6b7f65525a3a8d9a9042886acfbcc037dcc4837cc9c42d9f2208eec61536ce559939064d5b0cab73d9e1b3
+DIST bytemuck-1.5.1.crate 24562 BLAKE2B 25221f8a42f7b43fcaf94351fd1c42c3640ebcec254a73d0083c5880774db63e74b831b67092e20c9d80dd04c7d6af0ff28b2c1b2a53bfda465453e8d79dea8d SHA512 23aa2ce347d8cd031e341acbdd4d3f4e0d950afe3b215e0c61d2a313a62f139710333f0fcec9510a3007e31d50c5bdbd765d52ce33713b594476de456babeb31
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
+DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
+DIST bytesize-1.0.1.crate 7629 BLAKE2B c1f969f809abf5ac432e8590158781c26d11448ff0590647f2d60ad62d416a9f93e8bf1d5a650a40cac21bda90310c02f323bcc4fd1e2ee122de1588aff29352 SHA512 99a11059c27ed3c0279acafff1c0fa27fb7e5021876d2ad3a79ff8f31030fdc8a1b5969063ec6578499412804564cd3cb325c9198196bd4a078225a47179f605
+DIST cargo-0.51.0.crate 1348742 BLAKE2B 13568c915970e7accbe41f792c3bb0ae0f2d305d4bd6c393655b06a475cc6dc35542977e950c81606af932d875b7310a679f0024daffad525c041c30581ba966 SHA512 81026a3fc8f24e4e71fa8d6d39417d497e313382eb0e8f99397ee57fa199dfb8215bda529e77f3579146e29bb79e44a5255a75a8e3a3f4072745bbaafb6521fb
+DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
+DIST cbindgen-0.18.0.crate 180380 BLAKE2B f12f95a3e7c9af2ad933e7cf51248eaf5a30816f8aa5a160b8e7decffffc9fadf90a9bb832690be51639209470e4644154525b6cd6e51dc0a03dbea53a7e0595 SHA512 5d09c5720f5157239228f8570b18c33057cfd7e68f453d9e31bd5eb69541e21a348bbe9116c3387a00425803c6ae8eab9b2b97359fb275f5a7fb982974008909
 DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
+DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
 DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clang-sys-0.29.3.crate 36660 BLAKE2B 51169ccae4f69b656e608bec3ff8f0ed323f3c569e7a27d097f83609efa6a772ba2c2a549d1b112577da0d74ce5e4a68c1d8095217bb0bdbca974b90dc7240ce SHA512 a34ae3e1963e64e3d5e28e2d665aca7caea1c0b604ffa184eaec8824d2fd8f8b4f48a6bf4721be8355411163a521e273218217deaac7adf1e4f8542244277bec
+DIST clang-sys-1.1.1.crate 36567 BLAKE2B f2bb14b5e984e0aba35e381bcfbdb365b28aefe9e3a06286aafaae302b9e409c037432fb5434f12478f64bf1bd30d4ae278c6c336b4596b0d26c705e5cc8284e SHA512 cf6745d021a779d49fe7271b1c940fb2c69d80d06afc4a6548a736c819f16f82875bd94f946a189c67453b346bcf73f360af846b30619189fcde82ed04fe964e
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181add90715ec709c3162c081cc506ed4c7f4f3e6ed6d76aef8213ce80b9b865b2e737166b498a50b60acb7c83b SHA512 7de4ae0c3a50806f2b060e145948be6c6dd0db3975b626e0432301f454612fb7bc7fd2f4549529deaf7a1a55063a11dd553efb59a9dd5aa61ede5e63371d6b2d
 DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
+DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
+DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
 DIST console-0.11.3.crate 20886 BLAKE2B d24a8988673195a09eb5299ab5c5da1d346c6d760821eb094604cd653f6624b6779642616c55bb7e1f20ebf6cbec9737cb43c33466dd759f736bb9084f2c3f9a SHA512 9eae29976d27c46de43e8839ec909fd6fa392a630b47610097e5d8882d3c3bfdbed5be5fe2b8f88a6c01e53ec89e9d4840cf834da7bee334cdf76f337ace3eb5
 DIST console-0.14.0.crate 22587 BLAKE2B 3e91af20994c45b503fa4187ca537fad18efb0b552e09a3cc8e97f84ae0b51309dc1bff91bb54d06412f4779bb218652d649936216bb24fba473b988f1191ad2 SHA512 d453e82559629f0a7516760c18ce28ad347b4016e02d0c4f1aa725b93000cabc41749ce0bbb43cc98d6f9b0b92bf6726a8a265369d86f54a41a0a3f4ff8dd4b1
+DIST console-0.14.1.crate 22844 BLAKE2B 2e7a1480fc10ba92d4d5c601b87a0dac840b71c6c44679acf0a90667f37a40528ff2155130aa72be2ade1fdef4e6512dfb404b0eff181d77fbafb00c25dd6c5c SHA512 2c85d1938faca5163dd7eede2a8a07569e536c92fd0fbc7f6e6ed91c60fa7f947f0ae101817ed943b0668c4d98ddfd3149033c83614786b5d841b19a8b011c91
 DIST console_error_panic_hook-0.1.6.crate 501738 BLAKE2B 1fc227061d615b580e08905ad47e3dd2b63b4ee4e4cdaa92a4dbfc0a63e0f272eb552b17aabf7d03b73630f64c41a1653a034fbf8afc2ccca337d8ad405a90d2 SHA512 622500b82ce27a1dd33197f54f8c0495aa34b870b96a71fd0fa92cf1f0b0e7d4968b9f6bc5e41c23a145980cbe7a4bc5a7ddd03571e1e4688b2eeb7d146aa5c9
 DIST const_fn-0.4.4.crate 16138 BLAKE2B 80885ad10a5649876d37635dc6eb8b426e68f23d7bfdac234ae32816e7fae6d246ff0657d904a3b18dc5ab93fcaa3d4ff28984a1144fa3557d082c1c4d064fd1 SHA512 d79f07982c8ead364f314672ed471d41c6f31431cf511eff5e4c42ebdde324842110ffb8238394d9e8ba2ac19d884fa5f359ba04cef83acb1ca9431e14acb030
 DIST const_fn-0.4.5.crate 13107 BLAKE2B 00a90cd0087060f2d4fd279ae8a771913d6be6055d0c2365b76eddf55d294ce203d1dc7eab907890a96379c910f08fe9456517671a9ba48231f54bc411fb75e1 SHA512 6e41e2d5b185178ea0b7efe8303b7a3a532d3c7d7c7c4c9f093007c81edef2ed5ac8d456da167247b53a128c12ba3a6e1c32497ca11b7c5cb1b03ae37c7c897c
+DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
+DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
+DIST crates-io-0.31.1.crate 8943 BLAKE2B ea8b4ea737ef07b27861555b8940722798306fc8c8adb908f81158f16309eca2a88db2ce6ce4a4d814d7a11f1625f2f9a13500ebe2dccb2cef1d435161baf5ad SHA512 2b04cf7ca5a79c31f25877c5d28d70d958a9bf31f5a057568272ffabdfc8131dd4fb5c76cc06700ff74fd8877b8a0096ec0a72b38a7db0054e75dcd6f2b45e74
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST criterion-0.3.3.crate 106132 BLAKE2B e216e65e5c1e9abca23fab01af7253562be7d36e5dd43f6e80bfc17d3f230f3c116d6332006db053e7d0405a3d817df585260e82fb08736fbeb7999b996e006f SHA512 6f8ce0b6af810f2a28c3d5acfcdaf338633fec9ee7c3e7995eaae249c1a9fa92ea6d209c09e5ea4ae7fbac47b2330867ef0a8c3555cd3412ae72c503489e62ea
+DIST criterion-0.3.4.crate 111110 BLAKE2B 1a27f32745dfedcddd1b41f1d9fa2096cecb11d90c4126bc0d7a52a14c4b97d99204a7156e55c2ca5e525d4b648a82f3126f5d2b6c3d97ce424d1d7fde9656ae SHA512 e54f73d39e54f74758710d14c970ab928b86595b2ecc3759c218e4a57a2d618f8d425049763669de6ac48ff97dda72eecbce2e48b731cf0c11a240cc20e9fb86
 DIST criterion-plot-0.4.3.crate 17226 BLAKE2B cf896d08a208e9e317aa7b9095086660e57e5d8e6552b3615b027847e64fd4cf135d361bca7ee45fbe55163739285907320e9a39fbd28506fcb2ba56e091497c SHA512 69620d5b215757ddd818606d1a979c411de803032391be3b56e1c1ff73fbea992ae5e6c14cd78b519eeab806a34320468b44adb04fd1c67076163658f03d2844
 DIST crossbeam-0.8.0.crate 10993 BLAKE2B 9758a7ed1373f10da09c07875842a1fbb549dd20add43c50918276574fa57b5c5b51d15593e6611b34ff2472e51770fd965fc0810d0bf18f7740467d866c5669 SHA512 8846d29074f5e2a601e1bb741db9396b16270689f108e0b1621d29d15e774898e5f8d159e9af990fbba2cb414a13948a6236254353d4c594c38bf9cbfd2032d7
 DIST crossbeam-channel-0.5.0.crate 86811 BLAKE2B 9af4384f2b74d202971f1967887cfd0e71ddba9a6456ffbdfc80bf192d527f61242239d2eb6a0d9dcbe47be22eb414736976e6b1840c021610d96a3bf03c3d18 SHA512 838b433d48b84f1fea020a1d1324e366e6cdae30ef07396140f195afc45b8f705de6347d949b68ce1ed0708fe533ffaa2cfdedc9d2e6288a7325c188ccde9aa2
 DIST crossbeam-deque-0.8.0.crate 20756 BLAKE2B 6bb602547cb0ca65552a9b981502221f1d3570422d22c867f654ba677e5c95aa5f81ed0022a498d3408c3f69291e1805b49fcfbfaff0d9a6075b75be3bf926ea SHA512 4efa73dcb9ef40b841039d24ffaf9bd7c63f8c0233bba1e0728fd5558702b4ef0af117543834c527335e99384d3c80d56293e891c9d94440f51f454b1b90c399
 DIST crossbeam-epoch-0.9.1.crate 39561 BLAKE2B dedbd19d8aba2c19b844a10323ab488f0dffd5a8ad041cd715a9b1d6d14da343c0c680f6756736501ae420846a5d19bf5aa7bc7142daa39fee901e97f28bb557 SHA512 63d03e71013f7ffbc7b7a8ec5fe478323e7cf679bd126f03980c5e0790b57f5c48ce0ddb5e9c7ece31bd7380a944c1a1d462a9a1bf0126f9851e549739d8afc4
+DIST crossbeam-epoch-0.9.3.crate 42766 BLAKE2B a9f458d912dc247bbc8d2172792e06992ae4b51f588a7cb5a4851c6d7021b428c8225ccf07f0e4597e3e9585cf7b860781c1829d6269826893da3cddc2a753a3 SHA512 f68e1957018f7b88440492403b6812403312b7252e0e873715a2a970a4c9d2647174a19853d1533451ff1f568ac7df2deaa614f342d695c613053b1a3d5d1ef1
 DIST crossbeam-queue-0.3.1.crate 14787 BLAKE2B 136cf26e3a932a4c8035c50b8d6f905f59d3116a8bfaaeb5511e48e7225d05857722240e169d8efe3aab07c370923a57178f058f05c83cee9c1992d03f907f1e SHA512 f666d14ffe4be603ada67ac1fd28526bd2517c32856dc077e5bfe512fa012c08f197e206afb2547b9b5a52ecfb1231a9bffb5b9d24cc4e58aee37ebb87b54d6f
 DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
+DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
+DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
 DIST csv-1.1.5.crate 886773 BLAKE2B c5da00c6d81b3cc1336edbe462cbca59121c3438d41c55148de21a538c5a3a9d81d10da44177c51898dd6b9d027f794fa15779cf0c01861183efed54fd6b95a3 SHA512 d878a953fd1079b1aef7f23108c1bc5db3cadc2e1a1dc1ceb4e26508e4249db01f957f6626eef721153d3b0cc47f5f3b25380e4c943adbdf28647b9bb7cd8f05
+DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST ctor-0.1.17.crate 4793 BLAKE2B e30442d8a37c4d55e0fa17e1bc676defdb6a79c532989c827a2d41e120b7da5d130cca6960ff9325999d4bea988fdebfa07fae26122d15c0de94872a05732eac SHA512 0565ed8caf8f4663bb33007c12fd3d74169a56f2d417f312bef4922c1821d02ab89f59a5dbff0bc83b30e8bfcfe1ec0ac12f5ec270c80834458bb479b6ba4f69
 DIST ctor-0.1.18.crate 9279 BLAKE2B f3e388e35d9de7340ba5610e6c6a9f7df3b1325087e9fc6a219e062d1926ab98c4d014ae9970ce6e51285b90bfd8a069a01c3bf6c5028b1b7172cc6fc70f808c SHA512 82040822370eef7d276275f2042940a6b9d8b94667ef22fcf6f8eb0b527b56cd1d00d5520e42ec000512d17560b13fc792fef2c77f47337e9c843922e61325be
+DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
+DIST curl-0.4.35.crate 85012 BLAKE2B 11ab2e14e425caf91c4c42650f68e1ea5fe5edf6759b10e66718ee2c603056facd8dd00da4acb3124669fff3c8af366bad4f163b5477c28be0e9329ca188e7a8 SHA512 255f4f8d7ed2c0a4f4f9b32b3cbd6e9f20f299bf5379e084d884107836b108f4df31b3f8ef5ad3731e7209ee5eca63568b6d3b68a0e7cdf24d83d36b80bc23b4
+DIST curl-sys-0.4.41+curl-7.75.0.crate 2907738 BLAKE2B f165531da074c856e8cb6725f55b1d00f6dcabf2756dab59c35fefe193b25aeb11dadcfb7f7a5bfc986d8983ffb360637ca76cc937b8559f5da6c15a019d7244 SHA512 34bd579b80135d72c50edcedeab88b00dfd7a5aed62f4eee59ce3fbbeac43553bdeb87d5cdb513bb8c6c064a64552443fad7c02501a44b840ad35bcf22cd4179
 DIST dav1d-sys-0.3.2.crate 2828 BLAKE2B a2915ec47646e1cee14a9f57f14396d09ced2b46b278661f01dcb8cbe09a7d91b9e73146d102d494b9d96eebfd7ff50cb9d65379875da01729ac81961977bb91 SHA512 ab664883fadd003a91ebec09f69774f897f8a857c6487559d80ffdac985a4cebb20d2e1333a042ff380db11708cb4a5dfa3621f99b588a4da15a7591d54709f2
+DIST dav1d-sys-0.3.3.crate 2816 BLAKE2B c6824ee66c2a199839e56ba6f5d2ea2d5c2f7cbd2e82fc9f423127285bf99ea1473945088658846b27d2d355c87079a46a115306ac4a9d0c7d5f9b7c1a12f3ae SHA512 d29262bc5124c469d758dfc2d477273fc499082528daace2f1a5e74865e78f1540b5c09af0c3518918cfd643cd343bd6990c8d132457c5056c903af17bb08dba
 DIST dcv-color-primitives-0.1.16.crate 69927 BLAKE2B 7ab85222d4b4fa0a3395bb45be191a3135f9f66db13b980c1db2a3f03679173ca0fe1bb19510978f2db5a9e9b97d8fc66d72a2bb2668158ed0748d666f8e3c16 SHA512 991bde0cab882ebebfc599388dc6d508a6a53825ab484beb76259af15c6e7c49320bd4c0d3857b1cab965c420be968d7e284859ad58bfb8eb6c5d9b27ee13652
 DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
@@ -58,16 +91,41 @@ DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST env_logger-0.8.3.crate 32543 BLAKE2B 513790f39c63eb096b0fb62687c74262b42b0edc3e6fc2e2f2fdd44463eb4cfbf67560136ec206e252afa1477fabf66917f4fc0e8192e040670f98f3d7c4bb51 SHA512 7f6c3c79b8f4efb8d1d4e4b879c1c78a427f15669244ce1eca869aea9bcad950ffa5b59f3f8e4513e085c2daf1f5857313b374e238fc78b731bba2646ec895ff
 DIST error-chain-0.10.0.crate 18432 BLAKE2B ec4623513667d68a2f491eae64fc7e3ab11819b64ca95f7a0e5776cea433b19ce8198fcdae7ac16831c63594dfa27b1a285a7989990111af6f91eec88399ab70 SHA512 77552e8db32e2c7d37e01b1050fc889964193d21f281c3ad28c6adf5fcf8d3ee4c73fe182b27282fba4dbc3e6584df7894a3b1fabdee7e219b6d59fcf18a1a3e
 DIST fern-0.6.0.crate 299856 BLAKE2B e7adf3beaa2f5fc029acc8d87411c5ef8d3288100b5521d0c1379db6868bcaae73e197f456509bf29f52429ec72bc6e5ef297e971ce9cf6d7cc6232b5d9813fd SHA512 d0524c272cba970b5193d845d4e84698d64bc28c75b38dd2f265f1a132e1c9ea177ebdc38741614f6a6f3d106c7c50565b8562378a50d59ed093e00aee8ca382
+DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
+DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
+DIST fwdansi-1.1.0.crate 8280 BLAKE2B 5c46e66a7fe25e02aaf42668853a0eea8ab3bbf9d160702770d94f8e6c4b3efcac9f840387516d1d14cf34271981ba095e3e0f7a5eb009b9d5837f94f8fdee3b SHA512 5f91a6fbc40b00a06abb6686cdc0389a837fea6513a9b9bde7cc4ce5cdb19c180ab21ecb5927c41a52c56675991ee10d127335c1f6d8c52dc7e6b30b32411370
 DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
 DIST getrandom-0.2.1.crate 25459 BLAKE2B 2b3eb82c444d15a770691e1c312e4e694292de6b8a0eb8f6b3e19e0ceadc2d44a6cabb93f2a309e7ee388bc0d9a4b323800d863db7b7e7460e98e4ef6156eb6d SHA512 3cd15d52c5821972d1777cf2249a5f55ca0705ac2ff688ec45c21b70e3e956b538133a529e229d778cc0d0b48f293466d1bbccd0e18d43b9b6646daec4b08480
+DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST gimli-0.23.0.crate 702175 BLAKE2B 9acdb3afc092e43b25a11639407eba7258d25e6dd57c1f1aa18d17ac7c2ad73b422f85d850947498deb3ad8c1b8001077f9b636f7c1c11a4215b957c990483f7 SHA512 b5dce7b563ce7b8dd6cfec5258793323d370f217779d0d57265bbbe2b1eb2704dbf0f25c189ae6e9079989b6ac7d5341e10fe49457577e482a3904c745c89b5a
+DIST git2-0.13.17.crate 181726 BLAKE2B be159d2f3602a65b133d6bdb3d949a48b34029b7a491961469d7a5a6dd8d471b0460ea53e802f69a216ed6111d0329e8a8ee29024af3753a185258f1268b5ead SHA512 5d95ff8d5c62df55b9995f2319dc350dfc9c44b90bb594f6b90df4985f8ebed50211e380885826251aa4e86eef1cfac99f648fba5f91cd4b725b0d05b3800fc9
+DIST git2-curl-0.14.1.crate 9336 BLAKE2B ac2338bcc95315dfbc1528e29fbe7e16a4442b2e2aa94350b0f7e8a5d643db60f901d99ac5689c1b242335eee78194449c64d3e7082a2f164b6b80fcf3100134 SHA512 bd1f074631f902c1affd167db0cbff329aa07b2a46758af97c71dfbb5308a82562efa2c42e21c5be63d7c93bc1052d688beb71cfe1588a4c2e9705679cec5a1c
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
 DIST half-1.6.0.crate 36740 BLAKE2B 712af6d7dacca729e3063c5aa56211f5539f47deb61de466969a4ebfbc4c2eb8e179ca29c4d466e9188c877a3415a25dd70719b2e65106e4d8f56c3422e647f5 SHA512 52a459a793c43d66dbc79eb517b1cb63313b009aa8ce64c0ba09c4e49d4abe51ab1085f1f28421dfb78d3f83eecce7113dd50b6bac8a58259fbda4a5529b2ec2
+DIST half-1.7.1.crate 36168 BLAKE2B 632fefc24ad4b44c64ef6d3da745392ac016580baa5ba898c45bf41598ebb9ea86bb11c041b8813df73aaa755e323cc762b9e95b834aff7118d0d77e1834e7d5 SHA512 cd678b9277fd909083b67eb86c1fe92f464c92e1932246c6793dd835069aac5af6b9dc16bfbdcfbcdd75d3a641bc1f2240effd83dff6068a41b6c54d3739f73e
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
+DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
+DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
+DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
+DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
+DIST idna-0.2.2.crate 271070 BLAKE2B 3a07d53ea832d53a2e99ed3345d748b6299f6b4e6d4c33de17fd5ed70b9a46727272c9facf1bbb79e2981a4ad1953cabeb53d71cefcdc2a1e9e9f57c4a9f0d22 SHA512 71be89a626b087ca3a33576857799c15634263e2bbe43290750eaa6b074088cb6b54b3f778930e3dcc796a883daf662c0935178d4f096c751027bbe727124212
+DIST ignore-0.4.17.crate 53056 BLAKE2B 734e74210f13e5ad08864cc8b143fb780383cd36048e78da04a0475eaa760867dd4a385b37fdfaff0c5aca946d4aab19c4901df0833271a3ba05887ea5dec9c5 SHA512 52380126bb46478875093eb39972949625e1d9ada6fac7148faeccc22807d8e2a1e41c34549e7d9f884fd3cd6dc3d42b47a88b5b6de1089d7e3ee8014b3aea35
+DIST im-rc-15.0.0.crate 182171 BLAKE2B 94605a89b9f375cc2e0a60f107db600ca57b7f342d1d686ed73a24d9e4851d790b71293b0b0440262ee45ec94defa8780c7611969fbbe36532b328964ef12c22 SHA512 4be0ad2ef6272d39b3305dcf50c97836839c4917163c030ff2a950fb16deb4eed0d3026f09743479b344f9f688419449e8732923ee1146aa655ff5aae6279003
 DIST image-0.23.12.crate 217913 BLAKE2B ba8b3891785a8af7231425217044d4a24e418829bd55a966886df0b84d167c177d8d6088e9d039fd12dbf5f5c6bdead5dcae27cceaea3c899f7a3fe6abbbf0eb SHA512 bf97aea11b89d66f5887dd4b1d0927d1907b7b93457329ac58f082d7b17738ca6e5629eb5e3648cb6d2e75ee1a2cf0f302dd30fa232611dd2eab0dafa7e3bce6
+DIST image-0.23.14.crate 226804 BLAKE2B 0debec9484b54cb56eedbf07c246b80afc6de99b03e5f41b5cb9aa29ad2269cb7e9891b7377ef7ff53200959317bd38b24e823ebe5c2125677ef2588eec81ae8 SHA512 4eb07fd698c2d902979ab06ae0baef4a53db74da78493c45f0c32d5903c5399cb8a1a25a2e89bf504ffb612e8153eaba4ae41df3d17f02c27e7991fdca518f63
+DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
 DIST interpolate_name-0.2.3.crate 4165 BLAKE2B 4399a4330a833c45918b94c78a269e9166a616714faec00998a69484e3fcb8cef20b2a0fc266fa6dea5abda2830e0f9bc958f51497b249c01e1f60373e198a59 SHA512 964944384c39d0c085c05a7643ed2e8a25e224e6b28fd9da9d971567b4d56e7c4887a61e107c718cd95c19c6d83f355256d1130206491f7b286a68899eb7b894
 DIST itertools-0.10.0.crate 109656 BLAKE2B 73b65db4a9f02cd6940a81966ff433c5d9d82bda15b2250907728b2305451e2914e0211ed16e9755585d6a4ea67c3f2b1a5b1ca589afb60f20f23d1c1d31da7a SHA512 ecc194ded512a0979c4429c0395125e1d3968c61f673546b755c0a8bf2fa5a604690baf77e95dbb91dc26a3004b50a856a8aee0dae0e4c1bd83073e5e7cacefd
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
@@ -75,20 +133,32 @@ DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST js-sys-0.3.46.crate 67064 BLAKE2B cae8b3f5d9318f684869aca74d762364a4655b56eedb3dcc3b3678386ece5275c4990ba997a787158aca296320bc7a73915db5e9654b3590af179afaec823e8e SHA512 504048b9a2efb42315e351d3a972cbb7474cda1374281e25b26a62c5811a3b34606489b95bfd417b41316569aa33ebbd02af2aa359b576198f3123bf7e9e4d28
+DIST js-sys-0.3.50.crate 67123 BLAKE2B e31d81932e8c219524aca9159013e3e7e24519f154e6789b9b5e23de7da0b89e7ec5bf3f949a28a87a0a9671831d619aff1b84ed0b2011ddb01668b110c4d9b7 SHA512 961f1e2949ae8e662aac866807b2522537ed8756caaeaeca2be837329d6b684dd928aca1a7da9dbc402388625c54177dbc6b8141a1efa4087c78a3240d002d87
 DIST lab-0.8.2.crate 13245 BLAKE2B c8e8c42301205355a29ff165bd52a3a6425bd3ff4b4171d51547875fb99d8569816cebab8e883e84ff5a3dc0e0a3e2732f8c00baf672004343e1042f31f05b8e SHA512 a08f0fb5daa02a24ea2fdacf818a9def23793f6ba614d971ade84e05381631ded6d2d7bf7e57e7fdc0d27bf27180a28862551929874101bd8afbcc0ffe620d6c
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
 DIST libc-0.2.82.crate 515967 BLAKE2B 60c1ebdf659f1eb37f47a068e778567412bb133526df28fee1d20b3fd58dbe7fee1abbdd21c5445bc1022f2cdc39847244dcb7412114037a0be64f5a2a383978 SHA512 25eaf390acb409d329b9e32008078824eed4ca3a10af851f5097b653793db316419a395910c23dff293dfe2bac051a51871281a6bf2487937121b403286630c1
+DIST libc-0.2.92.crate 522480 BLAKE2B 4390c54531fc908b8d8e200fe271cd8536660b907dab3da07056b650f13fab0dda83969518438eac7ee75761bc1913ffd056a7cf98b58ab31d4ef98676193220 SHA512 bee1495a75cce8d117d5a565dcd9e2050b9b308aeef40dffe5b970cec4a0840eef07e8d65a64558cb75494a77a6b0023923ee451b29288e02573b54121fc7b34
 DIST libfuzzer-sys-0.3.5.crate 112480 BLAKE2B 0c566e9f8187e51708b8df88333a9ad92f80e62be22c6dcede44729c87a245f41ad254dd4bcbb76f5f6be3c7c426770b0800e82ad6e4b1e5b598e54ac033ee9e SHA512 d07c49351ff8bdb1cfc62f60cbf9147213bfd524e26dc50ca17f2374868a05581c432822c396222fbb9c72098fe47a57d97423f4b40fc2e7577801b829a8e796
+DIST libgit2-sys-0.12.18+1.1.0.crate 1434936 BLAKE2B f283177caa941757388042ca4578394e160ea8e5776f6b4d842f778218286ccf65ce2febbfc780606d7624660224b11a470849b4d61302dbc11b3ba5e8d1b49f SHA512 3d9be57074e15bb0dbed151804d401d4688a77f1d46eee171e39b00815a983c103b614509ea0bcbe3c1355fc6c47738fe9da7ef6b8ee2d040fc30062db701233
 DIST libloading-0.5.2.crate 16420 BLAKE2B 1b73f3294830cdd97b7ad42f0458bbdc95f641a182352095c26f835ba4fdc71cf9a0fa85244511b07bb79dd1c4e913625fc69b4b1e2ec28306dada1aaec2750f SHA512 d04cb1bb220c9364c02da4f360593907c875951fc0f6de5da1455bac4e96a470128409f77b21194fd6a87550f3ba00abe3b7a3426e7637acb62b80d61da46be4
+DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
+DIST libnghttp2-sys-0.1.6+1.43.0.crate 4458350 BLAKE2B 90357f647b7ffbd1bb5debaf22f57de48da392bf6ae64a5a7fe02fdc0c791c945f918432c21c97fdec75a6aa16fbd3c7ad6619e42e04462bb58fca906984c551 SHA512 d64cef5933c01cc4243f8cd9b9b00224d1d89b00d21202ce2e0baab0491357b7bd23a5310443bddf9b2ecf3309747080aff4eaf5bf7a0e81c9ae1482a3c64cee
+DIST libssh2-sys-0.2.21.crate 482836 BLAKE2B d92ef8081bd1ffceabf1be840b20722de647b50a0b95832d544afd7f1930dd51620622a9bf3031b37db9b0a1da4a925050bde16c916a8a71b3e79c73f125ea1a SHA512 654dc947e32070cd03fc8e9bc6046e28c9cc401bbc4c914319102a2c7ace7f319dbf0414a51d9812a09c9a88f7fba6b9203286fdc383d0e75f86b6a87fc78faf
+DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST log-0.4.13.crate 36015 BLAKE2B e71388a74a491e519a6c4dc048c46d2ec7fc30e68663806084db1bd772b8cbf89f684879114c09865b1ddc37d187499652d1731f62268eb634567d2166147e04 SHA512 22713712656ffdbfee7d2862c208fc7ad1c1c5380601ae9d0cc100fa460902ebd7a90cdf9fb5dccb5dcd17248d5c8ae8b1c53946c1baa8490cc9f06cab3d4a4a
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 DIST memoffset-0.6.1.crate 7706 BLAKE2B 351e6ff24a61b1016e7749571e1e66dae370c58746baf00b4688bb1e2d8c88621aa6f135468593bcd8ba30acf2c097d06a0dd7243eb06b9825e3fc1ffd31ea52 SHA512 74d081af00b7e442198b786d79e4ef35c243d2e78347ab9cb50e127569aed3fd77b47b95df6f361a716abce27c8cc6cb1dfa12c92b0b2208b21f9eb9527b61be
+DIST memoffset-0.6.3.crate 7697 BLAKE2B aae9b5dedf06680bc597825653c08bcfaef6429a8367c8dbb58df7f09e91b166d04a231f28856af592590eda0e255a947294e0b8064d7651f490e44e4d1e748a SHA512 5afd2f9a282e9bbc60da1abbf911a3b4480ab975c04c565149dca8a36e9975b3262023b73c67d9dcf80b2eba3e8540aa2b91466d37a2504facb3f1eae98f52bd
 DIST metadeps-1.1.2.crate 2768 BLAKE2B 96effbe67bf7b1f29a6746914321c7911c2d2619f360cf01ef4451b07fce5c36b6f2a7c8bf9abfa08e7e5d2e6e43b44f08a94701cbcf6d66b1631e7c8d76a519 SHA512 d9a1c14918579e5beb2e9126dbe7558440c73fa87c06f5d721df9cf8bc6297b8ed16cf40cdbb26b6f72dde9d39111c74306c70e8c7a16e85262c6279308f9da5
 DIST miniz_oxide-0.3.7.crate 44996 BLAKE2B 0e89ec4131e7abdadaa9feb6019b31853976a34434216e0f89ddab519559d0e1feaf2228fbc09906e51fb0242a18abe1a67a5362e080c19fc7cd00c2f95f08ae SHA512 d4eff239f8d6e947b94619e80fe03ed32aabd1a6393f63145d70ed7f08c51c45c7261d8157bf61c78d1637ea1f71ef15f9813ec733efd8afe6aa14810888718e
 DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
+DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
+DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST nasm-rs-0.2.0.crate 9522 BLAKE2B f4a6266e83a5b17116eed0776003894b42d71edfb0a2a4d5ce39e8695f001233ba2ad12f59b0a564813680aae085c2366304fd16b9a127236b11b8eab6c61ffa SHA512 fcaa05cc8ec2128f25caa44772ec56a971cf9e63f3525a21d10bf2d54bb3d30e729a90f4d812e451318726c743045da24c9f31a80e218c807ef44271fa32cc2a
 DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
 DIST noop_proc_macro-0.2.1.crate 2025 BLAKE2B 739e953d8b8d087e5c907e6dbf0cec79bb9aaab11dcf225b6aaaf4e7c3657c8f73a5e5cac9442a943e2b625a8a11afeaa9a15b3481f03bc279b00f68997bda34 SHA512 3f2cf8eaf66fa8ec3c7704d9d525e38dfb10432a1e5c7be2b3c2b9833ddb72884dc3748adbeb34dabc94e643702fe2c9c69b96436347d7571fceee2529493c51
@@ -100,107 +170,186 @@ DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd75
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST object-0.22.0.crate 181505 BLAKE2B 5a7430b47954c8aa89624d7895b861dd1a8daad926a59f2cf4f6c4528bfb794c1b0715782844ab142c8f1121eabaae71958e5fb8b67c45ba801bd31053cd08d4 SHA512 9491319361ff42d19f0e3dc72186dfa2a21e28090516a0a1be5bfa78a267fc5447e1be73b16f25709586113a78ba5d49d8d6c72243c9adee3d3e4d7aa2f268e6
+DIST object-0.23.0.crate 203889 BLAKE2B 41dd20ad5b43b026d032b50360bcb1efff7aab471342da1ab787d820722f4374fef8df48eae722016893618f0e1af3014e42c56a57ea8792594b5fee676a4d6b SHA512 6352624a9071bef53e4b7209b3f8cd5168d54174962565d76f8eb9201dc84dc3b26f08c81ac954bc9d4c55032a022abb35d160817bb434ef27f76949290bc7ef
+DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
+DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
+DIST openssl-0.10.33.crate 202638 BLAKE2B 717e9724117c8b16391b02d30f24a242f67087a53c61b3fdf623c88b3b6f22576cd726f24fcc04f4105bd985c16bdbd0b6a6f7ae1dc1d7dac5f7a44c68160039 SHA512 69f0aa67cf9beb2e66116e7d6a652fc64b0470fea6eae3ac6bbcddc8fcba8ce13d8a170dd990dae0524bd4a583e05588266806396f75a909851f9e124bc8f536
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-src-111.15.0+1.1.1k.crate 5087962 BLAKE2B 50a7528ca83e30434f14aeddbc83c434c74962faa106c597794a5c5a9d43d4c37de524f657cea9d3c87ca3f605bc59cde0273d64149954526ddffe96bb9c2093 SHA512 0adee57c5a9dc12b7a2c438f838a5d26286f9e885500708a6945a53c96708838071ee7a521e7dd9f18f5de59c5c3e66880ea99f64669daee442766471c8c2898
+DIST openssl-sys-0.9.61.crate 52010 BLAKE2B 4746fdfffb1f0cf626ff0fe93e3057bafd8277c6469f577e37370010d5267b0f9bde8a91279e9f8d0ca0b93cad2231153ca07d667fb3b7c8feb637a04dbc352c SHA512 0ef36b2483163af083465ba9e84586ac0c2068285a8b3f1ad1e6a2831361722132d1d008791d969be669ab1131500416852813bb431307a484c1a277b5ab9abd
 DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
 DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
 DIST paste-1.0.4.crate 17431 BLAKE2B 304b7b5f2735daade64c99785412420b209aba104d316d49e4d4458cac5fb632d2648a3363505b416da769b97ae972d84b18d3f1cd2a5029bee0f258c42e6848 SHA512 5c8d4a0c970babf81c7de5feaff8c31f0b92427c21c58741e169e55f801fddf6d369c1aec1e665f3a7171a0b7f07367dfa76bbeb2cf3f19e777fb42f69b7733a
+DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22
 DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST plotters-0.2.15.crate 1047949 BLAKE2B b293fb49e20d34038212d008a1d5ae95f7619d14f16f0f9b72d5d8188e83d2274cbba30734518fea8adf367282644058c589d9121cef5377753d78444c5ce489 SHA512 d66b9c8154a9106e990a8a544aade2baa61e293cc36fa9833fcb2d814da3aa87382f50e637eb25cd2c4b7e2fe28a71f3fdfbe8d210d835e839f9685d33d11c2a
+DIST plotters-0.3.0.crate 3242931 BLAKE2B 946c47a0b15d9a0a4c44b1a086bfd366be93b47b13290681b578ebab421e7a8e0d5cdd224de29c325b213d43b11b41f8d6dd26a961dbc98bccf4d3a580dbcaa0 SHA512 c54a833b2184cf0a9e9ac93739dfe06cafbbf381b20fa8601a5d97a25998881d92197afb086d1dc40dceb283aa2bd054151f9a21d38e0eefc817247c8e2c40f6
+DIST plotters-backend-0.3.0.crate 13492 BLAKE2B b9963648fd1a95f557bc92781c292ab0917ef373666cba95b0a1d3821253cfe8de19677f65973fddcd96bcd2d37bc817cdd783680dcc26be9556813baf413d29 SHA512 2071a4e249277a25cabf2f39c8fbf68ee5246b853c3f054fa49ff5356492b770419ca7dd7e481465b764fe8a1606491a2ff49a3215c3a5dd7c7b28779c54f3ad
+DIST plotters-svg-0.3.0.crate 7488 BLAKE2B 87e22fec00b61737f3ca630fec669b277470455da19de52ea5098bdebc1061c03a15dbe0cb498f321f168d64369493f0d8c4260490a19989b5fe6bcbabb4ad18 SHA512 a706b4db5160d30d1e1e2d718b511a9c3f875947ea989d981e7cf221aab3d7b1c41ceb7704956683f2ad5415e698463c0eceb1e3e60fe1f794ac90f4dd175d82
 DIST png-0.16.8.crate 52598 BLAKE2B 03f706591182a89b0566f8a793163372a4db3e7a742f3aadf06fda93068c42a4351722796ddbbb013fdc1be5a88dc02debae50ab1cc3ac81d72d07a814b456ce SHA512 df96f8580d8cc11df54788ff64ab3269b14369a467d7c29964a5b19add5e7a82258e6bfda40eedf135bffa98a2a86afbb725cd085cf37f6c433abf9a7485edee
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST predicates-1.0.6.crate 26093 BLAKE2B 20eec0af0b3464931f486938fd7a058d4ccd15fc12d7842387906f142897b929ec79068ef410853b6008b71945424930064bafd84ead7afcdca29f35b9624926 SHA512 0e971a05e1ada5ffe61054d551330a6bcb1c9a5df541d19b442d7a06842ccfec9db981d347e3357f83b1cad750e8af1f90cc9130df94f417267063e7954c529e
+DIST predicates-1.0.7.crate 274733 BLAKE2B 5275012b3759356882fc1256119b52526eb8a39f3670d8e38d10ea96918bdc3bd13fbdfc841c6784aa3dbe8147777048f751886427c1ee8c4380b5084c5a70c5 SHA512 6d72f940714d698f5ff92f16a35e26675d995ea94c82de9bddbd386e7783ce0ed726b21c85bac3dd21e8f8a92cd2d4ee37dafe1cbc42e8e6b30ba13f06858b40
 DIST predicates-core-1.0.1.crate 8186 BLAKE2B cef5cbdc252e3f953fb9417bd5a439f226f627b2ca6a9c537834ee8ee59cf3a252ad92ef5ee40f4e544e388757e5dba6b07b6807e95dd89eb35bf45f612d09b8 SHA512 3addfc4f6e3f549125eddc9f1aa11072e17f48909f53ce8e476ce783cc690c0b52a1fe6416d87816d8b558350fb8b4666adc6b79cff880956bf258f646459da0
+DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
 DIST predicates-tree-1.0.1.crate 6355 BLAKE2B b79f756d9f1822a037c05a65f90cf01592ec6ba83bde2c44aa6fc8a3d476f9e4e3d0ac13afdcd3936b0d43244e8e7ab1eeaf0223cecc3f7941af96e44c45366f SHA512 f97f6e05b3edc1faf82931ab47541b3e459066e0f5181f77a4ab885e10bdce43f71021bf2c848993125a4feef13c3290a312a74ad1d2b4a2cb55fe7d24492a19
+DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
 DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e67515cf8aa528479e14bae9c79193652c435e9513e85b7958016c105ed581fcbae19ceaa742fac6b07374a2e6f7b57a689b2 SHA512 10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
+DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.2.crate 84288 BLAKE2B 406820e506cb3dfd2529703ff4ac42dc1a693fc4c12023ab46fd69c5517b3136f02b580d850730855493a69ce31f8825bd9fb1905717178b1221f6c6c9aa3788 SHA512 573090e4a3501df912b04e5cecc40b1c61a46602f790a8f6068a06fc28acb40ff760882cb1c65eda073d33b4ab74691ca84456e5f1744bd0fc2bc9990ba894f3
+DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_core-0.6.1.crate 21634 BLAKE2B f059ef57238977208711b2b25f96682f58a5e935406b24a91cbbfca2cea918e764c512efa8ed8d77ee8df1fa3aae1d887148c5dd54cc0bd82ff14ee2dfade0f9 SHA512 546c1cc6064f22fa2b0cda1e42329aa7da1ea3be9b6aa277ef97de13067f28c473fe7f5bae4cf4151693aff31df3e57d6e99c6ff10d8fc79f94154dc26d19bf3
+DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
+DIST rand_xoshiro-0.4.0.crate 17029 BLAKE2B efee418e99b15aba76385a4320da667554effdde4f5d19dd55d16c1069d7915851f64526d4b4c9ed1cb6e5827572c0c96484f13669ff233baca124377ccbd48b SHA512 e889eb75ef40ad52eaf32692b3a405e01eacfeb20e0dc171de8f1b2ce05723ba448e293a2ee91eb3bec3cb5a2667bd05c11433b50470eea9219586afa73f519e
 DIST rav1e-0.3.5.tar.gz 803183 BLAKE2B ceca6ba44f2ca0f4b3580e24520fc2f4e2b61482da800e5e1d61b925a875fc222d13d2f871ab69968863443689c2a5378fc0910e0a5e805e8fd9cf56ffdb6ea7 SHA512 5e3ebdfe9392f7a7ca5b657c1843d1d575d1b856c6c01d3f52a88154d138c3992646e045acd9f8b15c7517cf99d8ce41ef1d373ccd3ab529197aea8f61f4fa82
 DIST rav1e-0.4.0.tar.gz 4535773 BLAKE2B 74b8f9a0bb366a20f3b097cf58a43e43d4e17437fd47021062640bf3e735320177618295d984120fb9191066523e9fd3076e8d87f68a6189677750cd5d3e6538 SHA512 79eaf580e60bc3dafc518813392d34339a6f3ca39567d0658c48fea3e2eafd4bfa89630aa0ada8200eaeaa1b1f0d4701d87636edf9c14bbe602c53e2b36367e9
+DIST rav1e-0.4.1.tar.gz 4536093 BLAKE2B d1200707783b5ceb13ab6403b4a4e8ac2af9a8d9a4bbd0765946d4752e98e4a5df286adc4883dd9ffbf4a21b0cd3bd486d34d563fcd955edf26f3e58181bbca6 SHA512 d8466c7392cdcd6c6693174cc7148d57a82a8b2328f27b0665a3311e24c9fba136e7f5a35a222004e0554d64005e8b676601e437dcba5365cf69e3b8c61691d8
 DIST rayon-1.5.0.crate 158037 BLAKE2B 6cb7f696e9c04d3aa6c3bf9c95690c2e259267024ac9701da5cd85c7d39b900a7e9e423e5b7602e108587a34c2519642ce1456dfd82fb13328ed3aba7516b569 SHA512 be15cbc7ad0fadb55e5640c78aa2eeac282872be88c5402338caad0a7ea604d2b8477648dcf7e453e22fbcdfefa915aa4bdbfa75e3d4f7a993fd8d85ed68395a
 DIST rayon-core-1.9.0.crate 63787 BLAKE2B bc5f930b1ce8e9fde03c01df7a53eeb3318ae24ac1c6b22e401a0b2359f4b9d6e419fcd41c7db33881c4ec29fbb844a44e2cff747d7dde2133668e733f8b6966 SHA512 d05b4c1e7bcb1c4e9238ab08bde39f08f069a08593084f041720694bae8bd524d1761766beb93e97784d7d541bde3e290446344fe129b0e10491405c1577366f
+DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
 DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
 DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
+DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
 DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
+DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust_hawktracer-0.7.0.crate 4718 BLAKE2B 269902116f53e1f50cfb524bedd4594c9c43d481ae5eebb16dc12f4314024afa16e224fbccc97907429534cfb74e06cc263c69da3ac1cc2f04b49ec4b8b29890 SHA512 62756c6c99a1ff1dd78565a522cebec3a9bed637a157b3d5d7ab91f7ce74d6de809604e8406b7e80807f34a7fa7b72fc9b6df51bcbd41e4fb503425d0b8cbc02
 DIST rust_hawktracer_normal_macro-0.4.1.crate 3000 BLAKE2B 9126ff8bd5dd0300e4c6df4311a94c96c1b0ffc23973fdde752593c7072ed687393a5165d5e4a27df28ab56490a0cf4af67556c1829103298963f1210dab7161 SHA512 19d2d10da7728d28baf3c5be0f7a9df7b23e63188d7f6f2acae199d081a06fcc6a78c778d56cbaeeb83dfcc5e0c775f1d608074c95461a17b6a1ff84017129a9
 DIST rust_hawktracer_proc_macro-0.4.1.crate 3028 BLAKE2B aa2d70be709d0926a2edc4e29c31fb2bb1412d2e9c2144a604d19a4b903e92c59ed2a9892a2182c859963704ea0d6035304e0621e8f8bb432ca7cb888b1bc4a5 SHA512 f23b23cedbf1992a58e238d03acf75d627a9a4442019597c913e8c23d133511c2501e80a839f61af816efd55d6b9d8a6b045454652dced927e06b480dec53140
 DIST rust_hawktracer_sys-0.4.2.crate 319968 BLAKE2B 251fd00f03338cd5287c79a58a5589cc03890b9e044fe679b2ede657816256caab8d7b09765b540b1ff50b0fcc52b9138a63b41e6b6def35ead81168e0c3ca13 SHA512 9a145263b5debed91980151229fbf61583f67b187c904cd9976d8837c0c8b348e53b47e58cd0d34b7a23609ecec8cd40d241f08d0da585931a203915e36bcc24
 DIST rustc-demangle-0.1.18.crate 19913 BLAKE2B fd0b955e9f552d5a3759dec05bf5f971d151efdb8098b0b3fba0ac80f0034c4891c575ba1247b04d1271fbfc8a1585f4a65200ff3836946aecae1cd653c7a1e3 SHA512 93ebaf7630c99b6c83712452aca26a42d9a173aad8ba7e85954f65e7867486519013aae1afb0006a0507fc3d6a4688df783ca091779bc0f316c5b8c4be95b793
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustc_version-0.3.2.crate 12064 BLAKE2B 425d5db88b23d2245b05b8c0b1be74a56d38c154b4eb3507ac5befa96ca58be7d5f349ac1e3962bba096c66eee421d1c1777fffc3b018f71e20a3f716e92aea7 SHA512 dcc78339eb5079ba0964d8a6ef7f6d024a4992ebf370cc664f2aebfe36d0fbe3eb76dd033567bf79d8854b6926de4406fdde996bbc21ee5abde44c9d87313934
+DIST rustc_version-0.3.3.crate 12119 BLAKE2B a8cfe3dcbaf436b74e9798ee1296ea7aa372cfa26788b7a84c9ce7ab3de5c5e00c6962e4310aed9bef8584e3c30298bf1bec1ac23c3b70c6aea32394359712e8 SHA512 37732b3b28eca41de205db34479c75b31af4ddd811f0f1606933eb31e25e5ed3966a41a8b7d338be20fcf47540629824c41a267436c185a98f8acfdce608b5cf
+DIST rustfix-0.5.1.crate 17768 BLAKE2B 6c1e58267fc4b81ba025d33a9bd95ab1832ed651d22d52b8808f52870aec674bffc18ce2d53bce58c4bc36f98f1e049e4c9609eb7e99e407ef78eeb756186837 SHA512 61990f482a5d490154fc55d7c052464e50268c0f752068669afb3c387d27a1e980a052ba29fe0aa301cbe4b17c7374db071a8a38d3562c943e8292605c40b3a4
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scan_fmt-0.2.5.crate 9015 BLAKE2B 3b6b82454a1fd2e5301022a6cf8e1ebfdccc4d9e2fe4fa2dac91bdb0ec29cfb7c1a36d1ef4eb3e2af08d5868905c9da378bd2649e2bcec994322b7b632e9c3c3 SHA512 8cfd8b4961ddaffaa468cb4daf6c69f65de977efecb10ef781deaaaa2fe6a4d0918bfd515b7f85b08b99f417504ba69059f2652ccb8c5ce6f19229e85ae0fc64
+DIST scan_fmt-0.2.6.crate 9676 BLAKE2B eb314c3e456de46b31d4286016b9194e663f7c3aea0b699a2693d180b2f0fa549448609b845afbbd0053661b5777a8912c2c607ffb26e490f86fd43ee2c2a1ab SHA512 ac24f699aa39d6fb29c309a9716eda9bda7331769114f52ab51f4aa781ecb3c7694ac385c7d60cec9b87e134fa2a5d8f586b54166ee9d58cc4bc34c83943ecc0
+DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
 DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe174c22d2680ecf5f723354e0ff5253974b07981a6266cd74d373d1993eeb145ce795201bd8e43dd0e15299b SHA512 75e39076a551cd1f4e7c011e79ac762258b7995bb021298cf2fbc7b3bc9e6715ca3c5165429834738f1cfb5ea9fa3daf173ebe1e9e0f04135845c89675c89ad4
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
 DIST serde-1.0.119.crate 74321 BLAKE2B 334922cb9b3115a929c7b32ee7ca3356de1f7cadbda224bffb7044db9ec0a6d949c415e10ffc7cdae356da749e779185072e965162ac036987ab997b40cf761f SHA512 7bce4d7c836c3d65f8d63e1200ea28e11f7b43c4c72e3d9576e2493699b2cc1dc88908a1086310a46961f6cf2e1191724f0a6f1fb137030659280dad434a451b
+DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
 DIST serde_cbor-0.11.1.crate 43947 BLAKE2B 4c1dc444089276b4bfb1b1237eeaefbb6954fa8b613e539fa6eabe01ddda990be50c5e5ce72e5f765835224e9de4fb0fdb26d2fada2b18d6b03f77665e2c41cc SHA512 165192ed999cfdbe162abd3aff92f86f4300ffa9347e57fda2ef3c32c69a18183d468db059d9dd80218bf01de15fec6fde7cf6dbb8cc2a6158785484353f2192
 DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
 DIST serde_derive-1.0.119.crate 50617 BLAKE2B 71520b2b83e55129b901876fcaebb4e7a1717f89d573b9b7780a9a27e3f50915eafa9a0fbd803af31f17ba2de7e7708b8357cc915827217ebb0f227f2632f087 SHA512 6fb88db514c30f4706a1f535fb0997a753601e2f6a4d0c7546b50b9d5febde4b982bab172101973232784cb8a8ba54ecf8584ac0f980f339b6578bfab41001b5
+DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
+DIST serde_ignored-0.1.2.crate 12179 BLAKE2B 45b8cab135fac2d7b23443462fe630212ae170207061f968540dd2b86a1f8c1203a185dfaa158f87dc36ceb8f769ea6c57e67c1497f2374444424237b7275af2 SHA512 c6f76051a5397615eea4aa953535ffa227cbdd6747f8f2ed0bf57d0a0b7bfa71536d8372a6cb8eb046b9a761e36f273e019754f607e6c84ae71bce25e25132cd
 DIST serde_json-1.0.61.crate 114887 BLAKE2B a06e2b3572b01b57d39a7df4d4c333408594cfe80b6b6a810f8c36479550f56f085cbd7e693d3c27f307bf0b49eefd34f55bef1872a4a0318797e4b9585cce9e SHA512 ff626602b547fa8e48c37251d2f6c91633fd45b49ed8211e66a3174f52f9aafe8778238466e7deb5d5477ed23eea0091596d78894e0967d6978f6737ae115891
+DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
 DIST signal-hook-0.3.3.crate 48707 BLAKE2B c082528a452628748743cb4fc8b84d31b1d66f4360a83d572078653bf68971f9e2e581de96bbb85c4430e2d2933f005c8e52826d70444b9d85007eec1ea19422 SHA512 02ac145e61577cdb9e3552ce8299718462cec42cffb773bfcb7e953e4b098472aa615deb9af3ac753e77dc2415c2e5bb9c03d17908fcce7370296f8a6f6d79ed
+DIST signal-hook-0.3.7.crate 49462 BLAKE2B 9238e39216b0a3e2e44e43c7f55b719da8766a8d113c76be16efa5c17335d2298a30a7da6286876c39cf5ef319d773b58bdb3482ab1fae87430a97964a8406e0 SHA512 80aae49b5c780c1e4db4d1ee038681a7df35bd5902b540af5c48f756dcbd2400477a64fb7e46520f78b4376d89c5f7f8aea95d787e0fab47a2cd57eb9f1d958a
 DIST signal-hook-registry-1.3.0.crate 17786 BLAKE2B fbd4284bc1020145b92557a99628b985860bd5020cc870ceb6067933c8e58be11d7bdb3c1f715231ca2f0ec2930487ceb88a82d9b9d1c0a31bfcf4a581a002f4 SHA512 2576d474c490deb6cbd759985f55340bb4e4ae0abac3ee02055bc30fa4008fc96ebf4d96f0a85c634b4f04d57b00243625194b333cf330f59fc82286bbeb30a9
 DIST simd_helpers-0.1.0.crate 1527 BLAKE2B dc556646a3fc94548f1e16e837e94fa2e28b78b650260aa50535a45e92fdcd952bf0eebddfc2fcb9e653871447e9b9db82f3f8c1090fe09442b7916c65ade3e7 SHA512 20577ab7615f955ee3a88c617630fc6c88703d455629d5b3838a551baebbeae8c64a2587871ec5a4fb6bc203945cace50593a238e4765b5fa2313bac30237ca7
+DIST sized-chunks-0.6.4.crate 43783 BLAKE2B 38f86301d615deebf1e6aacc7a462ff8997c5aa00eaf7e074b64c28072fd6a9649424c6f464cd804517407b9456971475eda2adcf32791ad58462dcc2ac38c75 SHA512 bf4f2b41dfd2c8f8cab9fa54f85f5ca4d600f0ccfd8d70efedce03eae3905e7c598ea19e5b11b925d2e16fd9eb633b03d9b5f61ef294e47f4b139f336bb6a71d
+DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
+DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
+DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
+DIST strum-0.20.0.crate 5172 BLAKE2B 755be909504b106848079cd975331dafdf24914ebc22e5642d2b0e867a3619eb7424bea818cb3228d17baaafcc6ffe6ded22a5fa802e96e3bd685c7f94391cbc SHA512 4de0497d47ed09931107a7ee8a7b87fc00c38ea578b7c5910df98c71b3df0970b3cf0d629844c0e9a52864d43887cb435c0f419d26a68a23d0211ab0e86d1989
+DIST strum_macros-0.20.1.crate 15634 BLAKE2B 61b36751545b80297a8f66391175cedb8bce5a144014eb789101f9adeecdfb85b76b598f9db556b64804158dc8118f3f9bbc49f13a4c99192bf68d40017fa4cd SHA512 c209a690370b50698c7489210dd799bb10e53b3e6fc84db370ca7aa3f205694a8f07071d25a75f37970a650bf1fc047e2e5ea4dc588c2604c980211276a6580a
 DIST syn-1.0.56.crate 229279 BLAKE2B f2cbafdcccdcde982da9dfc9136829be836cccf8cf8933ad888ba1747bf4a09aa0878b6c46220f2539d863481c268f03edf4f7a9b29a1017dbfe4b08590291ae SHA512 d874787b3c9f2aaf54c6beb0a6d5986b20053e2499ddb462b118e3275f30389afd93be6590ef188c30656400ecec83f4e50ba42f75e3bb40fd7f486fd8c1d4ff
 DIST syn-1.0.58.crate 229250 BLAKE2B 28df7854962f46339d1f993d2e1dae4c142731c3d7f08d03015ffcbf7eb307c1da9d35eb603d6efe653ff80bb0108bd5faabe1d7c68cec9476eaa0b710a27586 SHA512 b6bd101a455b77c2836384d7346f79b651f41c7685667b64032905cdd4026ee673c24de16a2acb2b8005af743a6d1b40628b30cd09c8454a39cc7d131ce71487
+DIST syn-1.0.67.crate 231889 BLAKE2B 28807964411994b126e132c42b1361d55788a641da24773d1f1006373d3c21048f78553682441766b7257e5b4a4a1833954075fd2c4965f949d8465ee57a3ca7 SHA512 06a5f203c7e4c6f6bed489bea7e171cc8f29020401eb32405373a838526c6a5bed47e1310f41636d475358c420b82837bc7c1f90374fa6d0e842dd0224de3552
+DIST syn-1.0.68.crate 231887 BLAKE2B 2e2547391fcd7a9854cfb888448eb89cdfd19ac20e9d909782ff11eb5bbd0b00717b3892199c2c88d005b8fda358ed10828a3f5a123a8d6416910d3b78971d5b SHA512 3023baeacb0164db641e809ac46fa48bdb8ff725e6c767764fa23552d53605dcad3d629f9c7a976a01ad7dd423595575d41c338223df5f7b72c417a97793414e
+DIST system-deps-2.0.3.crate 17504 BLAKE2B 87a175214b612ce03810378f65ae36bd35f873271de9bc3ad9e29cfabc1f741ca0e4ae719807e12a8bbb172921b75c47726b1ac0676ad2abe761fa217f774dd8 SHA512 9b1c4df589b1f0d0771ca8e10cf94a884a4f615bf2e8ec993e1dfd3f42273b3b188c81e0bdad1637b9ede1e223fe9bba44542058f150379c3c87de24b414bb79
+DIST tar-0.4.33.crate 45448 BLAKE2B 380f20835bf04624c87201f54f575ce6f94a2ddcee4e58917777ce069fcc822101994d8b9f1f3a249d25e62d59527001807842e650edc9fbf7cdf55f65615da9 SHA512 69c5932790c2448d6d754a622066564027414ceff5b555c928f55f627c9e5e7c192e0c13f93af48d64d37d4f9f56c0cf8feeb3fe17d3861b277c66bcb8b1d9ec
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST terminal_size-0.1.15.crate 8795 BLAKE2B 2e7590a524bd8e439d385f925c3d5a3aadea20bb24b7fb5c52dedc4dccdd67f986b304208dc6d9cecf0e4b2c449dd980613b4e381603cad74fd9038420b289e2 SHA512 cf1612f46c8502e079b87a240ddecdc02be8481cb7b78115ba1550a9a732103bc19de11f46160dbc5af06f8576d3dc780ed0b199b7f24c92fc0734e0d07e484e
+DIST terminal_size-0.1.16.crate 8755 BLAKE2B 33cfd9a62bdb77bd096563330ee5f07465d69c16659294a9e6ebeccf3d49e17473185fb84c2a4b50d29b084da0633b2ac4bf41801b0bd17f5c927d9bf68fdce7 SHA512 afefb529a80249ec398b444f593b6010b2a85e65e29557373cec72ee18bac5a5359aa2da3cda28d494f34c8eaddfc8a82029fb936d49726261ae0c5557bd5c17
 DIST termios-0.3.3.crate 17103 BLAKE2B 855b1115d02dcb275ea772dec3db383f9a6f84c14876ac037a5e3bbd1e71e26d3adc64e41521145093256acbea56c28b6c14f7e3e2bc9fda37e7cea113abe214 SHA512 3d4cacdaa8bbbd9083a050e723c93510829210f5ca8eb806e661a3a1e3c8aee33565142c5df34fca74aad0d26319525ee70ca6faf3f55a29427423d37fda43ff
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.23.crate 16423 BLAKE2B fd257d34da829c8d0fd2cdce9910e0b5e797ec233af3a6b3be6b47a4fa3f39bc0170edd08cde3fb546d8f3c7be63049ddd94400b602dc73262fba2c323229650 SHA512 e6b6ab7a4a23f3c50e765a16071b65007441ad3f1eb5566e91bc19755cd019fb8efb358cea5663bf7c83cb3be63fae9ee0d019cffb3fddae58233c84b93aea9c
+DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
 DIST thiserror-impl-1.0.23.crate 13269 BLAKE2B 7b570c1a0d122a11fcbb7784e6c0620bee0e4644e6e8e988de6936ba23901ef6549585d1e14afa8240b199e3c92a6471af3e4b63fac902292f46ab7ff0a7a6f5 SHA512 72098ef63a73986c8d6a0f3fff6d5b23e29da0dc8eb4eddb410b7bdfcedb303e73418b2a3518d9315772b0c2c1b9c3d86d6a67bc7cdebd45f4488c13a5b62162
+DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST thread_local-1.1.0.crate 12222 BLAKE2B 4d19e85f5e342cdad8bcb33ab4c54d19563a831128c0d98dd79906f1096d3665a2bd0bdc114f11f51bf517dd5f401b2788a16482e38895610b080d1e2eba6dc7 SHA512 4681b69e471f2b90091f51422358cd86d1e851cb7118613d7e791b18d7464cd71e9d21d50223ccaa9dcca1c54b220474d3d6739634f57666938baf4dc174e621
+DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST tinytemplate-1.1.0.crate 25611 BLAKE2B 4eee211f337cc94ff6ded7901eaa451d15a79bcd258aefe77d769c831865ae6ccf76d5e7a36d2af9feab38df828027ed4ac8f2e64fab141993c9123a7cdd85d3 SHA512 0de214a2e908e2c0e30c277fcdf015b1054d96b299797724f95d0b65a4c31ff1fd6d2ccb738b84cc44ac7f63db917c43846cea432c012123dce2fbeafd5f9a80
 DIST tinytemplate-1.2.0.crate 26423 BLAKE2B d3547b014db6e6edd4fd4f70f82f44c638ddad9c96c7efa03761c44e0f122fbbb25f01a2dcd908e43d5cbc1dd404c8a7b9c620edee5b935057db13f75c4fa205 SHA512 e187a1c53ff3c9d58ff0f69fae4d944e4d175ef14e10ebb550b6fcd6047ddfd317c5cc1f09d65767a93c1ea0a843115f715c615a31d81b4490680c4cc8f2ec51
+DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
+DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.2.1.crate 47258 BLAKE2B 0016d906559a13b97e16614597e41ad9d6f9892abb0897b69a33c87415578dd7d12cab9821ed7d64c335d0d738fd7ac516265aca7b1afcd567ae746b1c841d14 SHA512 e802d66d207debc8f5d7655c0eb797fe09125d5e85fcf4cc8c3088d9811b141f8db40b9a95f76df271a9d32640a8e59f1e9520da670f0a994bc73994552cf4bc
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
+DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
+DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
+DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
+DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version-compare-0.0.11.crate 15208 BLAKE2B b2b463f1965739369aa168b4d58775cd35c9a072ddc3775c439026e3b7a9cad5b60e9745980cebf498d22ca85932e1c670409007c4206ee6112d95096d552161 SHA512 dc0871daf7a1eb1890b70d5b876291f10b5f61b19f276a104176901f46671799e0254f0af8bb9c4106e3c8255b4d3fd65f6f408e51f080d79947c2fea4eb3558
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.10.1+wasi-snapshot-preview1.crate 26898 BLAKE2B 658d12823fdff936f3205917a2370a6d2dd87288f4b9b93956298a58ac6ced8da1081d6f024505b5532655329dd437557b3e56319d742d791bf4108173c7a6a3 SHA512 7e40e580df3707681e3d31c7058234549f036628a6bbfae301bdffabf5c36133ba2f20a6c0f5ddb4c7129500b3bce57fdc9049f0bc227df8fab4d8ff398fb9a9
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasm-bindgen-0.2.69.crate 159046 BLAKE2B 076ce37babce89fd08c6145869fdc724e800ed6bbf764388a4960c2b08ee1d18ddd647795123376556a00e49b6c4cb42cf6980f5af487faeb862dd8d88c6dad9 SHA512 4fd058cce1f641982f2800cb6d6c9979748ddc23091012d95dc81963d578188e82600a5d8d9ff06f588865c069410ce915da4e00f02e170876cac10fa6c99c6d
+DIST wasm-bindgen-0.2.73.crate 159293 BLAKE2B 3ad8a4221d5a3824d8c7788294b3b3b571ba4d676c782f7890be6f0f8acf5fc88166b8bf28933bb7511a388defa5ebd968b8fb8a69bdc424ff8ae64fddba1d16 SHA512 69b070d71df7b5539a9b45cb61704629cb917626e8e9f892ff684007647c36aaa04b7413f1f87eee7fffbcf28550b2d9e632c3747cd1a73a2a75043ea0849722
 DIST wasm-bindgen-backend-0.2.69.crate 25508 BLAKE2B 421943499a5b38da565d1d99683beda31dfc6621fe19e93ffb8619cee0739f4ba336748f7bd73c7f20ed86076e8a5a45ae3fd72facef88646e0a31690012ced7 SHA512 b04515acf4c00093d288d2073a46d3a64241ab87b802e39629560695c40324cd855582aee617879a7964285e82c67733e59f82bb948a4a0ca99c66aa5a890723
+DIST wasm-bindgen-backend-0.2.73.crate 25434 BLAKE2B 63298c33497fac327ecf31f2dafa3681b906c8d0a873a80bce1282c53a6d63aa8b0d30b8962ecef1f9a0986ab481a41b79cba5b8180f48b084d04fb0c6ba4577 SHA512 853fd0e354aa41706e19de192c9872812072cc881520f8c81b94eadb0cceaa693855598380dcb7729c8c6125eb90cac440453545a5fff0e40714038c86ff2cb6
 DIST wasm-bindgen-futures-0.4.19.crate 13865 BLAKE2B 9af8a196406d6192b820a5846b763b6913e3935857964a0749cd2193c77a23839c7f1910c0ff695126c9da7f600f5372091f726bc32b2c9fa4ef6ac4e5f88861 SHA512 a3a339a3f43284a9e9a6ed199ada927572676a38f65c9d82392c081b7973b79ef534c2ba26e66473c3ac6a48a7812f6bd01ebdb0b0296d073edcb6049cc87095
+DIST wasm-bindgen-futures-0.4.23.crate 14760 BLAKE2B 3b783c6056e7566197f68c9f18c557328b8a32a671247497999107052a3e51d2e616d5dd03f5399154b3cafd002b953dfc2850e9d018031b4d4ed3b940a09505 SHA512 344f2705a64f0618584c5a9ad0a026f156918873ad6fafbaf92d57b564445ab6d557d76233445ec263a18a0bb19b6be7d1d7710d3f83b25114ea1b621fe102d9
 DIST wasm-bindgen-macro-0.2.69.crate 11596 BLAKE2B fc263ec70dbe065e556e0c40bf9c13a86b6add4bacd880294602933199e2cfafcc6ec016d395afbdc429c851a1cf30b109c3dc7774ce11fdec2238099cb756d9 SHA512 a26616dbb3a3bf3f8e9be658078760475a8f82aa2492ef1588d4408f66898103f3478bf0ee468ca8ebfbc981e9c1433cacc9ffc5309c9d6a053c50b2eda67fc8
+DIST wasm-bindgen-macro-0.2.73.crate 11545 BLAKE2B 481800c0c118048b29733a3bbe11ed5c816c1b5496b10b4142310d79ab6b825eb12280cf3c7304e768e6c8acd77105faa8574cf21afbf27810c9b7eac31010b9 SHA512 7ac842e68e6ba577b33df50ebe5c5fd250b1f4bc4e1ec1112be4fc806980d21f73f33612b14024626904a6116a8c72b83f2b7c5405fc111cd2164b4744f843d1
 DIST wasm-bindgen-macro-support-0.2.69.crate 17844 BLAKE2B 5df460238d7276559074e821977b9770bce02a5d2ff9136a7efe3f25bb713aa30a0dbefa436434fac2ad5eea9d86bfa78231466d0a2b979be936105c47703e49 SHA512 01cf7154a5bf83b2bd15920cadb61ec588de3b6194a7e9e99bc08246a6a6be8017c28877325d9abf1b62f17573bc71a50cc52cf75b56d1a5cc11eff9da445f0d
+DIST wasm-bindgen-macro-support-0.2.73.crate 17835 BLAKE2B 8e18ef319106273d3f41e947bd1f5ffa7a91e04f713fd67fa0bb697579ae51bbcce75b48a91949aca8e64e6f52ed35eda6b49cec366365126115a9c30572281c SHA512 22e322840ebda05ffdd2f4ffd07745d0f24b928e3425c66425392560f8dd59b007f80d7c4e4a01dafd83c09d76953ecc2cd61d362219791ed88f7f4ecc56960d
 DIST wasm-bindgen-shared-0.2.69.crate 6726 BLAKE2B 20ecb830f6546b48ce4c45ed5ff97f6d6d2bbdd063ddfa032cba50b5a0c12b9dadafba5f3bda0dd2fdc60595a8452ce868a7aca0f846546093feac40a851f078 SHA512 e14bd33effa81a033155416c12426249ad6ef7fb38389439ec81212534d09680c8351eaf867235cae726f1bc7fbb4ebb6183f7f339d7ad04dde62709a2d2ec47
+DIST wasm-bindgen-shared-0.2.73.crate 6691 BLAKE2B fbde26dfb5f36474ed3e01f7254dbe742a205cacc85848b85efda09c22e1f9fdb464bd3b7a2c429b73e4f5f3095803e9e477cfb81d6bcc779c04c2602c465bb6 SHA512 d3a28e4bf42071496f2e48c3ba3134a06856be12deac79fe13d1e2e7da8018d5e7f220f4dcc02fdda9eddfc2d52ceef18cd180db7d2bcced44e88a36304f947c
 DIST wasm-bindgen-test-0.3.19.crate 15612 BLAKE2B 0df4f4643370af40d1b42618c53b144e25e97ee41a4a875c7a9a30497e54db13f015d5845f02f6909f9f0ff45320f2f8f7a6d4579b3ea96496482b4e5db73400 SHA512 85489acb8fef8eaea572676d3dcb8c3775d86a635832419c2f29057e4a1e42a4b6845b3e7cac17f2de2b6c69ffb95e361027057bfbb89b074d22c02994795e1a
+DIST wasm-bindgen-test-0.3.23.crate 15577 BLAKE2B ad5e671ec812142fbf498ed1dcbe7e62708004e8396bfd35ea4d75589e1f4270ca926554459eb57a76b5e4971065dec4a3bfe950c7a66d3b9043720d1ea1dc57 SHA512 06c4a0f996deb0da292b126fd21f94bbddf16c4be00d9835759cbefc5f4c5eca276ce0e4a762dd3c42104fe585469c7be0fea13e66ffd791ec4e15d5aad89d5a
 DIST wasm-bindgen-test-macro-0.3.19.crate 6375 BLAKE2B 259972d70a64ab7ae15c84d95ac8ed10d3baa51980814696de0f3360b67201b543c747c1016629ee47ceb62536bab88dcdadaec90d614393dff9b1bbf368a00a SHA512 3490113b22016f2c91d31c0af52ed340fce8a5f73be15c5d6e881a59a052508dfdcf67edd5c318d4b042acadd3d06c382337367ab4ae3e6894dd7ad205eea713
+DIST wasm-bindgen-test-macro-0.3.23.crate 6337 BLAKE2B 31af4921ba1a6dc8b5300ce4d4b4f31efe7aae1fc3d744f5f85935aca98578622f7d087b28a7f379cc6349473f67cf2fd6b04784d656e7a23a5b0a62482dcd1f SHA512 eb7de7f94380678d2691d1cc53acb59cf27d88153422b685c6d30b42a05214001a43ed282369f8faa67aeac395e858d2bc53c285c8b3a5e8a5c11323a9f2db0a
 DIST web-sys-0.3.46.crate 648005 BLAKE2B 6d257fe5e489961d3c9a8f6aa5ff7d6f2f786372764bfec4d2321f895a361e052400847f3c77295ec48fa63c1108284cee35c63cce84b22bf3eecd9fbcd9d2be SHA512 4198f854b73b2c63288b920aada7c69934393e0d6ce93599d907d1db055d2c25383b8574f0297af4ea89f45c7f7ee706622d564958d49d1b1aea89d4e9f127b5
+DIST web-sys-0.3.50.crate 650100 BLAKE2B 448227dfbb6b91ab316ceebe554c9d9b89c397c25cd465f2e8a77560f185eb7308caf3b6052946e691d8fc22d6d382a0e3f164f7d29d873591ce17da792a993a SHA512 32afbfd3021c6cc4f228fc1762a4e29935373f4e7c572128723b508e6ab9588f3737167b91d5837e05a08c0bd182dd339c8f16b71e8a032f7e735cd619949d14
 DIST which-3.1.1.crate 8071 BLAKE2B b53adc5136f26fc1be6ae18987d0129527cfd6eb2fb1f0876600ff55ac2f935f608337ff89478f3aed2e8c97a08c474109382a56eabe67dc788b744d90c73ad9 SHA512 3677d709eced54a332e68d9c9385708205838301a576da0c4d88049403a81676c3939a97cd1bec4ab261c7e8fb6211956b47afe5d1fee84d9c4ecf4eb30184f5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
@@ -210,5 +359,6 @@ DIST y4m-0.5.3.crate 11447 BLAKE2B d3a7081899f12a50907ecbce6f63f1b1119618aefdc97
 DIST y4m-0.7.0.crate 12045 BLAKE2B 4f48eb7ad5be2486e0f723b9beb9109cd1b38a0d0c5ac4a64411fce0bd9371d45496e5e0e839d15e7d1616b3888cfc1a0fc1ca364e65ac508306cad9a4ed44a7 SHA512 b85b0dd6df46c9bf125eee3e51ea39545ea1c794a2a097bba0aa31c682532ed3a9ba141745c61915fff13535fc5fff5a490d7c9e731c75bb5ce38a702075467e
 EBUILD rav1e-0.3.5.ebuild 4218 BLAKE2B b4a4e63de87d673c12f814a174598ec8dea06bf208d6e4f0f7e6c6bb4e2f6b53051c1cf220be8335f1757cb85aa495104f91de621a079a1c9a7fb7b8d3e503f5 SHA512 69bd68f8a5b077f63eb43765c7d07a9681cf8ff2f9d89bf7c331fb35789a2f8ee779f45fc592618eced604b1b6e632ab4bbf5dc7e8ad93823b4c32133dbaf71f
 EBUILD rav1e-0.4.0.ebuild 4468 BLAKE2B 8760cdb7b50991dd861b6010eff114e71af8ddc1979eff893f8e5b85729971ffc5d8fa46714ee80a488f2ba7b05a78e71bc1d377c5a477653239e1cf53d7d290 SHA512 2435c1737201fee6eeb7008f7f292abc29ea899d5f64c0e3a6475d78ae711d64306bd640232c3bc71d8d82dbf70f0a565fcd87b17e6661934109f4ab597f2a6e
+EBUILD rav1e-0.4.1.ebuild 5861 BLAKE2B d27bdc711f4b6d9b78ce67e8fd62f4f2d105f832d0e3eea7f739acd29680cc8fd0f71a6f757d298be57d666b456db9623eac4f355369f9e1c751500cbf58bb70 SHA512 ff6b51f0c1c4ce85bf1b24420eeef65d72a6b70bf065569da88147a5b75bd9a6dcb219b45f5ee52b5a07d915a48265c340e71eab98d139a05593048e644f718f
 EBUILD rav1e-9999.ebuild 1361 BLAKE2B 8eaf63b69c5eef56c0e7fb725aea974e688da362dec3cfe1bac18562f281102e0f4430c1dd612c66425e60d7146b2b8e5504717229cd19e260834c2d2bd6e74b SHA512 e0f16779f8646fe7f283a5f0a07b3374aa5db1f31155637780a0dc3d25148664373e92907e27d4a1259e063d7a392c8a9e320a21bf05c4bbc4fe756fa5b8d1c9
 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
new file mode 100644
index 000000000000..8b07f2528793
--- /dev/null
+++ b/media-video/rav1e/rav1e-0.4.1.ebuild
@@ -0,0 +1,325 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+addr2line-0.14.1
+adler-1.0.2
+adler32-1.2.0
+aho-corasick-0.7.15
+ansi_term-0.11.0
+anyhow-1.0.40
+aom-sys-0.2.2
+arbitrary-0.4.7
+arg_enum_proc_macro-0.3.1
+arrayvec-0.5.2
+assert_cmd-1.0.3
+atty-0.2.14
+autocfg-1.0.1
+av-metrics-0.6.2
+backtrace-0.3.56
+bindgen-0.56.0
+bitflags-1.2.1
+bitmaps-2.1.0
+bitstream-io-1.0.0
+bstr-0.2.15
+bumpalo-3.6.1
+bytemuck-1.5.1
+byteorder-1.4.3
+bytesize-1.0.1
+cargo-0.51.0
+cargo-platform-0.1.1
+cast-0.2.3
+cbindgen-0.18.0
+cc-1.0.67
+cexpr-0.4.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.19
+clang-sys-1.1.1
+clap-2.33.3
+cmake-0.1.45
+color_quant-1.1.0
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+console-0.14.1
+console_error_panic_hook-0.1.6
+core-foundation-0.9.1
+core-foundation-sys-0.8.2
+crates-io-0.31.1
+crc32fast-1.2.1
+criterion-0.3.4
+criterion-plot-0.4.3
+crossbeam-0.8.0
+crossbeam-channel-0.5.0
+crossbeam-deque-0.8.0
+crossbeam-epoch-0.9.3
+crossbeam-queue-0.3.1
+crossbeam-utils-0.8.3
+crypto-hash-0.3.4
+csv-1.1.6
+csv-core-0.1.10
+ctor-0.1.20
+curl-0.4.35
+curl-sys-0.4.41+curl-7.75.0
+dav1d-sys-0.3.3
+dcv-color-primitives-0.1.16
+deflate-0.8.6
+difference-2.0.0
+doc-comment-0.3.3
+either-1.6.1
+encode_unicode-0.3.6
+env_logger-0.8.3
+fern-0.6.0
+filetime-0.2.14
+flate2-1.0.20
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+form_urlencoded-1.0.1
+fwdansi-1.1.0
+getrandom-0.2.2
+gimli-0.23.0
+git2-0.13.17
+git2-curl-0.14.1
+glob-0.3.0
+globset-0.4.6
+half-1.7.1
+hashbrown-0.9.1
+heck-0.3.2
+hermit-abi-0.1.18
+hex-0.3.2
+hex-0.4.3
+home-0.5.3
+humantime-2.1.0
+idna-0.2.2
+ignore-0.4.17
+im-rc-15.0.0
+image-0.23.14
+indexmap-1.6.2
+interpolate_name-0.2.3
+itertools-0.10.0
+itertools-0.8.2
+itertools-0.9.0
+itoa-0.4.7
+jobserver-0.1.21
+js-sys-0.3.50
+lab-0.8.2
+lazy_static-1.4.0
+lazycell-1.3.0
+libc-0.2.92
+libfuzzer-sys-0.3.5
+libgit2-sys-0.12.18+1.1.0
+libloading-0.7.0
+libnghttp2-sys-0.1.6+1.43.0
+libssh2-sys-0.2.21
+libz-sys-1.1.2
+log-0.4.14
+matches-0.1.8
+memchr-2.3.4
+memoffset-0.6.3
+miniz_oxide-0.3.7
+miniz_oxide-0.4.4
+miow-0.3.7
+nasm-rs-0.2.0
+nom-5.1.2
+noop_proc_macro-0.3.0
+num-derive-0.3.3
+num-integer-0.1.44
+num-iter-0.1.42
+num-rational-0.3.2
+num-traits-0.2.14
+num_cpus-1.13.0
+object-0.23.0
+once_cell-1.7.2
+oorandom-11.1.3
+opener-0.4.1
+openssl-0.10.33
+openssl-probe-0.1.2
+openssl-src-111.15.0+1.1.1k
+openssl-sys-0.9.61
+output_vt100-0.1.2
+paste-1.0.5
+peeking_take_while-0.1.2
+percent-encoding-2.1.0
+pest-2.1.3
+pkg-config-0.3.19
+plotters-0.3.0
+plotters-backend-0.3.0
+plotters-svg-0.3.0
+png-0.16.8
+ppv-lite86-0.2.10
+predicates-1.0.7
+predicates-core-1.0.2
+predicates-tree-1.0.2
+pretty_assertions-0.6.1
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.24
+proc-macro2-1.0.26
+quote-1.0.9
+rand-0.8.3
+rand_chacha-0.3.0
+rand_core-0.5.1
+rand_core-0.6.2
+rand_hc-0.3.0
+rand_xoshiro-0.4.0
+rayon-1.5.0
+rayon-core-1.9.0
+redox_syscall-0.2.5
+regex-1.4.5
+regex-automata-0.1.9
+regex-syntax-0.6.23
+remove_dir_all-0.5.3
+rust_hawktracer-0.7.0
+rust_hawktracer_normal_macro-0.4.1
+rust_hawktracer_proc_macro-0.4.1
+rust_hawktracer_sys-0.4.2
+rustc-demangle-0.1.18
+rustc-hash-1.1.0
+rustc-workspace-hack-1.0.0
+rustc_version-0.2.3
+rustc_version-0.3.3
+rustfix-0.5.1
+ryu-1.0.5
+same-file-1.0.6
+scan_fmt-0.2.6
+schannel-0.1.19
+scoped-tls-1.0.0
+scopeguard-1.1.0
+semver-0.10.0
+semver-0.11.0
+semver-0.9.0
+semver-parser-0.10.2
+semver-parser-0.7.0
+serde-1.0.125
+serde_cbor-0.11.1
+serde_derive-1.0.125
+serde_ignored-0.1.2
+serde_json-1.0.64
+shell-escape-0.1.5
+shlex-0.1.1
+signal-hook-0.3.7
+signal-hook-registry-1.3.0
+simd_helpers-0.1.0
+sized-chunks-0.6.4
+socket2-0.3.19
+strip-ansi-escapes-0.1.0
+strsim-0.8.0
+structopt-0.3.21
+structopt-derive-0.4.14
+strum-0.20.0
+strum_macros-0.20.1
+syn-1.0.67
+syn-1.0.68
+system-deps-2.0.3
+tar-0.4.33
+tempfile-3.2.0
+termcolor-1.1.2
+terminal_size-0.1.16
+textwrap-0.11.0
+thiserror-1.0.24
+thiserror-impl-1.0.24
+thread_local-1.1.3
+time-0.1.43
+tinytemplate-1.2.1
+tinyvec-1.1.1
+tinyvec_macros-0.1.0
+toml-0.5.8
+treeline-0.1.0
+typenum-1.13.0
+ucd-trie-0.1.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.17
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.1
+url-2.2.1
+utf8parse-0.1.1
+vcpkg-0.2.11
+vec_map-0.8.2
+version-compare-0.0.11
+version_check-0.9.3
+vte-0.3.3
+wait-timeout-0.2.0
+walkdir-2.3.2
+wasi-0.10.2+wasi-snapshot-preview1
+wasm-bindgen-0.2.73
+wasm-bindgen-backend-0.2.73
+wasm-bindgen-futures-0.4.23
+wasm-bindgen-macro-0.2.73
+wasm-bindgen-macro-support-0.2.73
+wasm-bindgen-shared-0.2.73
+wasm-bindgen-test-0.3.23
+wasm-bindgen-test-macro-0.3.23
+web-sys-0.3.50
+which-3.1.1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+y4m-0.7.0
+"
+
+inherit cargo
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/xiph/rav1e.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		$(cargo_crate_uris ${CRATES})
+		"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="The fastest and safest AV1 encoder"
+HOMEPAGE="https://github.com/xiph/rav1e/"
+RESTRICT=""
+LICENSE="BSD-2 Apache-2.0 MIT Unlicense"
+SLOT="0"
+
+IUSE="+capi"
+
+ASM_DEP=">=dev-lang/nasm-2.15"
+DEPEND="amd64? ( ${ASM_DEP} )"
+RDEPEND="capi? ( dev-util/cargo-c )"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		default
+		cargo_src_unpack
+	fi
+}
+
+src_compile() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	local args=$(usex debug "" --release)
+
+	cargo build ${args} \
+		|| die "cargo build failed"
+
+	if use capi; then
+		cargo cbuild ${args} \
+			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
+			|| die "cargo cbuild failed"
+	fi
+}
+
+src_install() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	local args=$(usex debug "" --release)
+
+	if use capi; then
+		cargo cinstall $args \
+			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
+			|| die "cargo cinstall failed"
+	fi
+
+	cargo_src_install
+}
diff --git a/media-video/recmpeg/Manifest b/media-video/recmpeg/Manifest
index afef0c1133e0..668995b27b9c 100644
--- a/media-video/recmpeg/Manifest
+++ b/media-video/recmpeg/Manifest
@@ -1,3 +1,3 @@
 DIST recmpeg-1.0.5.tar.gz 56561 BLAKE2B 598a193182c46b646fe634f85935738b86a464931c7142773db74ed7225076416d6146e05776456f2d5b0bc5796adeb33cc2cac0867b56cf967ed7aac7fe3d02 SHA512 95bd18fb7a2698e006b69d52805a0378cbbb17475189abe4cc3b69b1523a4df226e294915ce51e48b258cc01c6eb2bed0faa305590f8cdb85a80b96950d5b439
-EBUILD recmpeg-1.0.5.ebuild 399 BLAKE2B 403f5f24a06ff7084a0fe1eefb11347dd18181f033bb5330e2203941b3d97f2ae0291c734b464147d58ad20a3e93edc23e999dbf3539ce41d33209ad6946a7ba SHA512 03ef461eea155daf4ad1dcaa556c998abc0ad89b24656bfba883d18d755a9c0a31082a352217362eeba05a3e0b125466ad67f58d9c0b5f61f19dc56cd0cd4a95
+EBUILD recmpeg-1.0.5.ebuild 400 BLAKE2B 6466c25800003d92f0acd59a56cc53a50f88b387a2a8f1c4ed936144a60b2fccc26752fca054fd1ec6931f00c6f69fbb6f52cec63336f5498e28aa630754f7f7 SHA512 9a9c7c911896abdf465c45d4d25bb529eec2623cbe9878e16d1365d06c1c5fdb291ddf6e07e50a505d6e824e5f702784fcb4259bfb6f2cbb18bd175e108d1d72
 MISC metadata.xml 297 BLAKE2B 11f51d49c6584b02011081cb8eaaa00441c9bf623bbd068fc731d0352c568e891654b18ee0c50d6722c31cdd966351cf58ce18947beee1410138b29c1d1c9b08 SHA512 6fad09bf8ac2d08c4e255fc2ae8a95afd410a7dbaaa91fc7467a78ace5a9a9a9cef1ec25ddd676a3c696a5a2714bb3c3f5b180cbfb0fd8a254bab9a5e310212f
diff --git a/media-video/recmpeg/recmpeg-1.0.5.ebuild b/media-video/recmpeg/recmpeg-1.0.5.ebuild
index a1911052f6bf..43d869e72e46 100644
--- a/media-video/recmpeg/recmpeg-1.0.5.ebuild
+++ b/media-video/recmpeg/recmpeg-1.0.5.ebuild
@@ -12,4 +12,4 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 
 RDEPEND=">=media-libs/libfame-0.9.0"
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index 0854864f9205..e0b589cce217 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,6 +1,6 @@
-DIST shotcut-21.01.29.tar.gz 4094623 BLAKE2B 7f0642ffaf342061d2ebb2882b412f57fb70dac01387855872d23cf1ac9a93e4569de45d5e26db2990e7deedd677eaf227cbfe1ffcfc1aac0deb6f9a9c36c7ed SHA512 fc47110771a0f891a3cf43a9730121a7b2f687d762ecc6df18907094830e9e89110174b3e3df391f58d9d1ab12c850fd822b85652bd20c02707b02304104dc55
 DIST shotcut-21.02.27.tar.gz 4101402 BLAKE2B ef5320fd9b353fed0b429763cf1fa57bfef0417dabe2bbedd744bc95afe957c6312b7c344dbf53d0986aec05165aae394304454398767ce8d9a76ed0201fead8 SHA512 6c282702fa0322448a9679128e920d099d5d11b122dbcb7c0a54be3da25fd54afc39c910fe99b498dc67be8f31c251be31472c93233d1b609f9eea5dd96e3ed0
-EBUILD shotcut-21.01.29.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
+DIST shotcut-21.03.21.tar.gz 4101401 BLAKE2B fb716215ba31b4b057080f05a59462a674aebfa364924240f96ebf87bb94e4ccb649c2452e952b507037a8e62840cb7c805ee258761bb21d515173bba26dfdd1 SHA512 402d714df7285d49269891e5def0b8a1a46f54b6ec88b0201981bdf8d866c49e83bbbf513805795630e39335e0fddc2457e1a7db582affe4a4d057ac5ab4e2bb
 EBUILD shotcut-21.02.27.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
+EBUILD shotcut-21.03.21.ebuild 1388 BLAKE2B 00e1700637768e7559366da0a1e4a7b523ee41e8a07104696cc81298d5617dc032ab9cdd08d4a258b5872f1ef806d04bf3733dfa4097601d15ab5c3471d17e86 SHA512 2745d89a9e8b0eb25afe019994f207aa9d63d07fa34d5baf6972a1af1524516b6fae61f6dbcb9f57fc596d7b3426b07e1980706d186c72500f8965a3edb52ef7
 EBUILD shotcut-9999.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
 MISC metadata.xml 480 BLAKE2B 73a38f8b538f121032bea4148cf2721020e4fd53c5e41479dc7163bd9f637edfdac5c5f67cca191d96af4159dc51567b1009122f9f6aa47368d66386d7410d3c SHA512 38373130a0ed4bf237232b7ad6fa0fa499874206ca0d50d1e44cb0b0ae115ef0b56104464732e7305a54d99485880d7e5a4d6466ddc54d516bc279632e2bd34e
diff --git a/media-video/shotcut/shotcut-21.01.29.ebuild b/media-video/shotcut/shotcut-21.03.21.ebuild
index 598b4f6b6561..ef956ac31c78 100644
--- a/media-video/shotcut/shotcut-21.01.29.ebuild
+++ b/media-video/shotcut/shotcut-21.03.21.ebuild
@@ -15,6 +15,8 @@ else
 	EGIT_REPO_URI="https://github.com/mltframework/shotcut/"
 fi
 
+IUSE="debug"
+
 LICENSE="GPL-3+"
 SLOT="0"
 
@@ -48,10 +50,14 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_configure() {
-	eqmake5 \
-		PREFIX="${EPREFIX}/usr" \
-		SHOTCUT_VERSION="${PV}" \
+	local myqmakeargs=(
+		PREFIX="${EPREFIX}/usr"
+		SHOTCUT_VERSION="${PV}"
 		DEFINES+=SHOTCUT_NOUPGRADE
+	)
+	use debug || myqmakeargs+=(DEFINES+=NDEBUG)
+
+	eqmake5 "${myqmakeargs[@]}"
 }
 
 src_install() {
diff --git a/media-video/snappy/Manifest b/media-video/snappy/Manifest
index a21e046cf76e..d4f4494b868c 100644
--- a/media-video/snappy/Manifest
+++ b/media-video/snappy/Manifest
@@ -1,11 +1,3 @@
-AUX snappy-1.0-clutter-1.22.patch 721 BLAKE2B 1257ee9db63cf4795a9e1deceac9d9667628b0a76e513f3f830ff955433f25103c731517782242200b574169225be569ecf0a1176174aa9babf650e102a94756 SHA512 3d808cb79cfec5486726999586a307db0b7426d3250291120ec0e91c35ac8a1fdc5c9545fd58562160d836643396b094d1cbbdb4f1bca6d361c39f9662b203fe
-AUX snappy-1.0-clutter-gst-3.patch 3951 BLAKE2B d8c708575c2c8dfbf94e87b66c1ee3feb24c6250d921f56821b65e7a30e17b1a39da5997564831a6c0e7c247f9562bb91371043850753938da9fe0f44c165da2 SHA512 18f550d91d84fc0cd350cee600454ff7b7103e9e17db877b3773817819fe8fcbb24882e3da84b83d3f0c2fd18c9494c34a9dd60a3712d2e0174bca3e49779104
-AUX snappy-1.0-configure1.patch 630 BLAKE2B cf3e197213308a0689814f66e1af2f5fb2865f0c3bf1b8812b85b2c9f99e4bed02223b2d82743f518d459425211d96fdd7f22e731b0be26abe4f43a7c9822e51 SHA512 ce3a2fa09141bc99becf806c6c45895e785014bc2de877a53c710a9a7cbd5193990e623af75a07300f325770efc3fca2b357f94a18f2ce871800b231d3d84f1d
-AUX snappy-1.0-configure2.patch 699 BLAKE2B d13d0341607ab5acbc134786d88cc522ec8e719626803ae7b3deeaec0096dfb4562830def887760789a766d056b6f981097f510cc1095ed4e4bb18a0b0a45212 SHA512 71bcf47ee1e263a2e14af991f1aa134690df9db2b4279ae1de8a6100db4ad0c0083466a5f88f36d38e72b0389d1081442a0884f346710c42e211b6a2aa4f95b0
-AUX snappy-1.0-string-concatenation.patch 921 BLAKE2B 5e8726793991b93e235529a219ab0cbf4ec899b3fe38cdfa2a30dadfaf410d139b9bb0590b3d486408fea8a87936911d753b9741b1596057687532bdd383dd03 SHA512 4ad47d7907ec77de2ffa866305ff23390915f7f6f27883e4a035e862116cd3e418addbd600954d2a52b8a8ae1c22803e57d672fddaf5e955da6e3110a950671e
-AUX snappy-1.0-video-texture.patch 1126 BLAKE2B fba2134c9a44429046c63b93db40d744ff1e658c8a5736b0e187f22b4b5a91e40b6774947deb9d9f36f390a0a75a08044b06f2cb9202cb31501c61bc46204aa2 SHA512 b139b5ed43ce85240015467330f17f244bcca59533d203c29d60955ba9992d8cca9f2715d928551fdb5cc92c0618ba60df6a51ffe798d19bbc0532dccf58a810
-DIST snappy-1.0.tar.xz 282964 BLAKE2B 9855e3c9397ccde1122c22066cc33e98fda93cb364c03d8649a823dddc9de81bb9eaa89002f3fd1410b6910433e554d231774524da1cd917138c3154c6ed153b SHA512 d8a3fd3a598efde4d699cc8fa13bee1239917a877627b26d5d278af5fd1824f02acf5ce685f8bf994087b3374de9917a5aa4f6f6ebe94f385c8d3bf91887eca9
 DIST snappy-ebf8e3ed30013e6577fa8994db40743d2ec05e94.tar.bz2 80663 BLAKE2B 1bf4b654c4c8c1b8b5cdbb71295c231588a03034e1ad3691e4c80f6e5439b420a76124d5f7a073eb225a13db99b32745dca3fe6845fbfe3bca6a685810fa7f61 SHA512 adc6c514dc38bab86d100aa481be09a75160a9641cfe32f467cc524ef7a006dabbbd450587c007d6a980e8e4b974b49629295e6cf791be3b42401b45168040f3
-EBUILD snappy-1.0-r1.ebuild 1360 BLAKE2B 4867a12555dfab28d6b3db9cf9c214796322cab950c016dc0f095d2b00524c9340fec05c72d1af2e0f474c980ac5100b118ca2f5391194f703d0a262e9adcdba SHA512 e40cee3f9d1a7bcb0bee096b876e36afc7eef9f09fdeb43497b6ba2a1a8b471f30352d866324bd788dad45273f584389eb3cba7a88f499563999bc7676c0be26
-EBUILD snappy-1.0_p20200428.ebuild 1054 BLAKE2B 82623450455ea4ac6da8a47098c4b01a1ada110bf87d50b796f7e14a02af0f708af1cb149d5c422d29a581106a3a36471316b3af3fdfe6c0c81da745555a8b0b SHA512 4ee1f80a7d4457a9c6044933eacf54595b48b950494b8bf44ee35fdb423a545eacf545ea5341196091da7a3a34c704d672caed82645167ea7c16276639b2afc6
+EBUILD snappy-1.0_p20200428.ebuild 1052 BLAKE2B d516808a19a06aeabeb39b0a994dbebe6cedd9c7f0e18fdf6e9b9d528f9017f5e069d5e3aa55d9b2e2cf4f0a4d55f1369795362dc0c1b2a853a5851bbcb24d92 SHA512 b84d6b189ddfc98186b660298df8abed185348bb19041e0bbe9dc3da727f4ed1b0be53f085339f7712865d2cbe791e085776f3375870c05f80f0eeb4ff99557e
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-video/snappy/files/snappy-1.0-clutter-1.22.patch b/media-video/snappy/files/snappy-1.0-clutter-1.22.patch
deleted file mode 100644
index f79d26786732..000000000000
--- a/media-video/snappy/files/snappy-1.0-clutter-1.22.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 529445d6fc5da3ea6e5c81051248b9d4818a1224 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
-Date: Wed, 15 Apr 2015 15:46:14 +0200
-Subject: Set windowing backend to X11
-
-This required to work with Clutter 1.22.
----
- src/snappy.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/snappy.c b/src/snappy.c
-index 6054c88..c2bb2d0 100644
---- a/src/snappy.c
-+++ b/src/snappy.c
-@@ -179,6 +179,7 @@ main (int argc, char *argv[])
- 
-   context = g_option_context_new ("<media file> - Play movie files");
- 
-+  clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
-   ci_err = gtk_clutter_init (&argc, &argv);
-   if (ci_err != CLUTTER_INIT_SUCCESS)
-     goto quit;
--- 
-cgit v0.11.2
-
diff --git a/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch b/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch
deleted file mode 100644
index c914b028d1dd..000000000000
--- a/media-video/snappy/files/snappy-1.0-clutter-gst-3.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 872fc2ed3d0339559e4023523fa0935f168f631a Mon Sep 17 00:00:00 2001
-From: Luis de Bethencourt <luis@debethencourt.com>
-Date: Tue, 28 Jul 2015 12:06:16 +0100
-Subject: clutter: upgrade to clutter-gst-3.0
-
----
- configure.ac         | 4 ++--
- src/gst_engine.c     | 2 +-
- src/gst_engine.h     | 5 +++--
- src/snappy.c         | 7 ++-----
- src/user_interface.h | 4 ++++
- 5 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b2986c6..75ffb8d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,7 +35,7 @@ AC_CANONICAL_HOST
- # keep one single GST_REQ, core/base should be same versions anyway
- GST_REQ=1.4.0
- CLUTTER_REQS=1.20.0
--CLUTTER_GST_REQS=2.0.12
-+CLUTTER_GST_REQS=2.99.2
- CLUTTER_GTK_REQS=1.6.0
- GTK_REQS=3.5.0
- GIO_REQ=2.32
-@@ -55,7 +55,7 @@ PKG_CHECK_MODULES([CLUTTER],
- AC_SUBST(CLUTTER_CFLAGS)
- AC_SUBST(CLUTTER_LIBS)
- 
--PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-2.0 >= $CLUTTER_GST_REQS])
-+PKG_CHECK_MODULES([CLUTTER_GST], [clutter-gst-3.0 >= $CLUTTER_GST_REQS])
- AC_SUBST(CLUTTER_GST_CFLAGS)
- AC_SUBST(CLUTTER_GST_LIBS)
- 
-diff --git a/src/gst_engine.c b/src/gst_engine.c
-index 8fc16d4..431d77c 100644
---- a/src/gst_engine.c
-+++ b/src/gst_engine.c
-@@ -724,7 +724,7 @@ cycle_streams (GstEngine * engine, guint streamid)
- 
- /*            Init GstEngine variables           */
- gboolean
--engine_init (GstEngine * engine, GstElement * sink)
-+engine_init (GstEngine * engine, ClutterGstVideoSink * sink)
- {
-   engine->playing = FALSE;
-   engine->direction_foward = TRUE;
-diff --git a/src/gst_engine.h b/src/gst_engine.h
-index 70dce63..1c044eb 100644
---- a/src/gst_engine.h
-+++ b/src/gst_engine.h
-@@ -24,6 +24,7 @@
- #define __GST_ENGINE_H__
- 
- #include <gst/gst.h>
-+#include <clutter-gst/clutter-gst.h>
- 
- /* GStreamer Interfaces */
- #include <gst/video/navigation.h>
-@@ -50,7 +51,7 @@ struct _GstEngine
-   gchar *uri;
- 
-   GstElement *player;
--  GstElement *sink;
-+  ClutterGstVideoSink *sink;
- 
-   GstBus *bus;
- 
-@@ -64,7 +65,7 @@ gboolean bus_call (GstBus * bus, GstMessage * msg, gpointer data);
- gboolean change_state (GstEngine * engine, gchar * state);
- gboolean check_missing_plugins_error (GstEngine * engine, GstMessage * msg);
- gboolean cycle_streams (GstEngine * engine, guint streamid);
--gboolean engine_init (GstEngine * engine, GstElement * sink);
-+gboolean engine_init (GstEngine * engine, ClutterGstVideoSink * sink);
- gboolean engine_change_offset (GstEngine * engine, gint64 av_offest);
- gboolean engine_change_speed (GstEngine * engine, gdouble rate);
- void engine_load_uri (GstEngine * engine, gchar * uri);
-diff --git a/src/snappy.c b/src/snappy.c
-index c2bb2d0..c06fd10 100644
---- a/src/snappy.c
-+++ b/src/snappy.c
-@@ -29,9 +29,6 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
--#include <clutter/clutter.h>
--#include <clutter-gst/clutter-gst.h>
--#include <clutter-gtk/clutter-gtk.h>
- 
- #include "user_interface.h"
- 
-@@ -160,7 +157,7 @@ main (int argc, char *argv[])
-   UserInterface *ui = NULL;
-   GstEngine *engine = NULL;
-   ClutterActor *video_texture;
--  GstElement *sink;
-+  ClutterGstVideoSink *sink;
- 
-   gboolean ok, blind = FALSE, fullscreen = FALSE, hide = FALSE, loop = FALSE;
-   gboolean secret = FALSE, tags = FALSE;
-@@ -230,7 +227,7 @@ main (int argc, char *argv[])
- 
-   /* Gstreamer engine */
-   engine = g_new (GstEngine, 1);
--  sink = gst_element_factory_make ("cluttersink", "video-sink");
-+  sink = clutter_gst_video_sink_new ();
-   if (sink == NULL) {
-     g_print ("ERROR: Failed to create clutter-gst sink element\n");
-     return FALSE;
-diff --git a/src/user_interface.h b/src/user_interface.h
-index 6fe43c5..b011da0 100644
---- a/src/user_interface.h
-+++ b/src/user_interface.h
-@@ -23,6 +23,10 @@
- #ifndef __USER_INTERFACE_H__
- #define __USER_INTERFACE_H__
- 
-+#include <clutter/clutter.h>
-+#include <clutter-gst/clutter-gst.h>
-+#include <clutter-gtk/clutter-gtk.h>
-+
- #include <gtk/gtk.h>
- 
- #include "gst_engine.h"
--- 
-cgit v0.11.2
-
diff --git a/media-video/snappy/files/snappy-1.0-configure1.patch b/media-video/snappy/files/snappy-1.0-configure1.patch
deleted file mode 100644
index cd499d7197ab..000000000000
--- a/media-video/snappy/files/snappy-1.0-configure1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 259bebe65f0f108726d5a0504b23c85525199b15 Mon Sep 17 00:00:00 2001
-From: Luis de Bethencourt <luis.bg@samsung.com>
-Date: Tue, 2 Jun 2015 16:47:31 +0100
-Subject: configure: update GStreamer version
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b628f33..430647f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,7 +33,7 @@ AC_LIBTOOL_WIN32_DLL
- AC_CANONICAL_HOST
- 
- # keep one single GST_REQ, core/base should be same versions anyway
--GST_REQ=1.0.0
-+GST_REQ=1.4.0
- CLUTTER_REQS=1.12.0
- CLUTTER_GST_REQS=2.0.0
- CLUTTER_GTK_REQS=1.0.2
--- 
-cgit v0.11.2
-
diff --git a/media-video/snappy/files/snappy-1.0-configure2.patch b/media-video/snappy/files/snappy-1.0-configure2.patch
deleted file mode 100644
index c4787d846a8d..000000000000
--- a/media-video/snappy/files/snappy-1.0-configure2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c0eacf30b2a0476488004c6000de659ce4380534 Mon Sep 17 00:00:00 2001
-From: Luis de Bethencourt <luis.bg@samsung.com>
-Date: Tue, 2 Jun 2015 16:56:14 +0100
-Subject: configure: update Clutter version
-
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 430647f..b2986c6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,9 +34,9 @@ AC_CANONICAL_HOST
- 
- # keep one single GST_REQ, core/base should be same versions anyway
- GST_REQ=1.4.0
--CLUTTER_REQS=1.12.0
--CLUTTER_GST_REQS=2.0.0
--CLUTTER_GTK_REQS=1.0.2
-+CLUTTER_REQS=1.20.0
-+CLUTTER_GST_REQS=2.0.12
-+CLUTTER_GTK_REQS=1.6.0
- GTK_REQS=3.5.0
- GIO_REQ=2.32
- 
--- 
-cgit v0.11.2
-
diff --git a/media-video/snappy/files/snappy-1.0-string-concatenation.patch b/media-video/snappy/files/snappy-1.0-string-concatenation.patch
deleted file mode 100644
index bafaa164a2d8..000000000000
--- a/media-video/snappy/files/snappy-1.0-string-concatenation.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f2d51cde0e72853050495b3d995db4aee14c66a6 Mon Sep 17 00:00:00 2001
-From: Jan Schmidt <jan@centricular.com>
-Date: Tue, 13 May 2014 14:30:34 -0400
-Subject: ui: string concatenation to use corect format
-
----
- src/user_interface.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/user_interface.c b/src/user_interface.c
-index c29c688..8e3894a 100644
---- a/src/user_interface.c
-+++ b/src/user_interface.c
-@@ -1052,9 +1052,9 @@ position_ns_to_str (UserInterface * ui, gint64 nanoseconds)
-   seconds = seconds - (minutes * SEC_IN_MIN);
- 
-   if (hours >= 1)
--    return g_strdup_printf ("%d:%02d:%02ld", hours, minutes, seconds);
-+    return g_strdup_printf ("%d:%02d:%02" G_GINT64_FORMAT, hours, minutes, seconds);
-   else
--    return g_strdup_printf ("%02d:%02ld", minutes, seconds);
-+    return g_strdup_printf ("%02d:%02" G_GINT64_FORMAT, minutes, seconds);
- }
- 
- static void
--- 
-cgit v0.11.2
-
diff --git a/media-video/snappy/files/snappy-1.0-video-texture.patch b/media-video/snappy/files/snappy-1.0-video-texture.patch
deleted file mode 100644
index eed0bd491ae4..000000000000
--- a/media-video/snappy/files/snappy-1.0-video-texture.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f33f7a5e9424544884a37b264bf88ee1866a56ac Mon Sep 17 00:00:00 2001
-From: Luis de Bethencourt <luis@debethencourt.com>
-Date: Tue, 28 Jul 2015 14:02:44 +0100
-Subject: clutter: update method to create video texture
-
----
- src/snappy.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/snappy.c b/src/snappy.c
-index c06fd10..94b6e5b 100644
---- a/src/snappy.c
-+++ b/src/snappy.c
-@@ -222,8 +222,6 @@ main (int argc, char *argv[])
-   ui->tags = tags;
-   ui->data_dir = data_dir;
-   interface_init (ui);
--  video_texture = g_object_new (CLUTTER_TYPE_TEXTURE, "disable-slicing", TRUE,
--      NULL);
- 
-   /* Gstreamer engine */
-   engine = g_new (GstEngine, 1);
-@@ -232,7 +230,9 @@ main (int argc, char *argv[])
-     g_print ("ERROR: Failed to create clutter-gst sink element\n");
-     return FALSE;
-   }
--  g_object_set (G_OBJECT (sink), "texture", video_texture, NULL);
-+  video_texture = g_object_new (CLUTTER_TYPE_ACTOR, "content",
-+      g_object_new (CLUTTER_GST_TYPE_CONTENT, "sink", sink, NULL),
-+      "name", "texture", NULL);
- 
-   ok = engine_init (engine, sink);
-   if (!ok)
--- 
-cgit v0.11.2
-
diff --git a/media-video/snappy/snappy-1.0-r1.ebuild b/media-video/snappy/snappy-1.0-r1.ebuild
deleted file mode 100644
index aa41637c6525..000000000000
--- a/media-video/snappy/snappy-1.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A simple media player written using GStreamer and Clutter"
-HOMEPAGE="https://wiki.gnome.org/Apps/Snappy"
-
-KEYWORDS="amd64 x86"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=media-libs/clutter-1.20.0:1.0
-	media-libs/clutter-gst:3.0
-	>=media-libs/clutter-gtk-1.6.0:1.0
-	>=x11-libs/gtk+-3.5.0:3
-	x11-libs/libXtst
-
-	>=media-libs/gstreamer-1.4.0:1.0
-	>=media-libs/gst-plugins-base-1.4.0:1.0
-
-	media-plugins/gst-plugins-meta:1.0
-
-	!!<net-misc/spice-gtk-0.19
-" # File collision -- /usr/bin/snappy with older versions
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Fix compat with clutter-1.22 (from 'master')
-	epatch "${FILESDIR}"/${P}-clutter-1.22.patch
-
-	# ui: string concatenation to use corect format (from 'master')
-	epatch "${FILESDIR}"/${P}-string-concatenation.patch
-
-	# clutter: update method to create video texture (from 'master')
-	epatch "${FILESDIR}"/${P}-video-texture.patch
-
-	# Move to clutter-gst-3 (from 'master')
-	epatch "${FILESDIR}"/${P}-configure{1,2}.patch
-	epatch "${FILESDIR}"/${P}-clutter-gst-3.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS README THANKS ToDo docs/*"
-	gnome2_src_configure --enable-dbus
-}
diff --git a/media-video/snappy/snappy-1.0_p20200428.ebuild b/media-video/snappy/snappy-1.0_p20200428.ebuild
index 572a173dfe7c..81d6b0d8882f 100644
--- a/media-video/snappy/snappy-1.0_p20200428.ebuild
+++ b/media-video/snappy/snappy-1.0_p20200428.ebuild
@@ -12,7 +12,7 @@ COMMIT_HASH="ebf8e3ed30013e6577fa8994db40743d2ec05e94"
 SRC_URI="https://gitlab.gnome.org/GNOME/snappy/-/archive/${COMMIT_HASH}/snappy-${COMMIT_HASH}.tar.bz2"
 S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
diff --git a/media-video/sonic-snap/Manifest b/media-video/sonic-snap/Manifest
index 5199ba4ce0ad..051d25fab5a0 100644
--- a/media-video/sonic-snap/Manifest
+++ b/media-video/sonic-snap/Manifest
@@ -1,3 +1,3 @@
 DIST sonic-snap-1.7.tar.gz 16760 BLAKE2B d3bc2d55d12aa0e02949a815cb3c1b2402ad7980b7d52c240fef513b3aadd3399d113fc6b8ab7a727fc6cfd8cf6c158887fe0be64f5bdc9ed585f190d7ab39f9 SHA512 0c2fe5a7403ac003aad308d064a4d981a25f52e478943125090cb96d337aebe0a9fef160217b4f37cfd1991c0517f5f869f60f4c93a6abe9a127821f7906a664
-EBUILD sonic-snap-1.7-r1.ebuild 1720 BLAKE2B b17b6d4c5648b77d843fa6eba630a0a3ab51870a87d9fae3edbb886800342e8cc6c2c5c62446094c9a368b9c4cd9008d36175a6f75126cd1fd6c8eb8e2b01d57 SHA512 b986c0b5656afa101fab3254559c0243a583720884300b7be7896a2acd6d0051afcc5f95445ec97a2d2b79cf8fef76bcdb5f7b5573bf2c90a1d3e62786bfbf39
+EBUILD sonic-snap-1.7-r1.ebuild 1710 BLAKE2B 0b55223b95a468a97b9ea60c87f4687f48d29e21c3a670d081f61bcd9b0610457452518537c394e0749f2287aca66f5ddf4d64eed26362e8f7319ccf3df0b542 SHA512 f91e43f7dab008e8eea5de8995452e0c98f1efab67fb4fd6d8211ae62edf0edd13643018845597da5beef17bc9ed97e056861bd2bb5e8b41cdb26e20a1baaa8e
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild b/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
index 753cb9d0be30..58e5b52ded2a 100644
--- a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
+++ b/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils linux-info multilib toolchain-funcs
+inherit linux-info multilib toolchain-funcs
 
 DESCRIPTION="Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)"
 HOMEPAGE="http://www.stolk.org/sonic-snap/"
diff --git a/media-video/streamdvd/Manifest b/media-video/streamdvd/Manifest
index d3cfc3e0371d..4abcbee2e15a 100644
--- a/media-video/streamdvd/Manifest
+++ b/media-video/streamdvd/Manifest
@@ -5,5 +5,5 @@ AUX streamdvd-0.4-libdvdread.patch 1460 BLAKE2B 68577f49d3c837c9d2148838459e3e3b
 AUX streamdvd-0.4-makefile.patch 1378 BLAKE2B d8a244cb91f246eefa9da4f39a861f9f6bef84580a0b2faff3f01d0ad7c0c7ecc2f8a62711b4f5abca8c6e985a6d70934f49724bb052be8e284c506fe70d59c3 SHA512 5234433fd985ef561c43420a6f7a1ee30c4748ce5a4c04e3a6864e95f42fae1b97c8c0e1a6adb0c6c395500a7f007263621cab8779dc57535287a6ba81a32988
 AUX streamdvd-0.4.patch 785 BLAKE2B 665bf98e78727abeba771b5dc84eaaccadc14fafe8978e21bde1480630d197a6dfa213e9f8d662d4813078d1ab66ffd4f33bc2513f99e6d93684cb3aa086eebb SHA512 81edce3f825c38a28aeafe25fcd1dad3b71413fdc22892fcbe5d0af32235b43f2256a6f38b3997dfea1306f492d2f4c96e0b85fe39802111502bea4af17013a7
 DIST streamdvd-0.4.tar.gz 152669 BLAKE2B 700ce4f03eabf3e3531bac4ab7b618c55a96e636c459368740597124353f9639cfd7c6b00a5a4eacfd438c3a6a7966c0c8dd42dedd3ab877ad96317a8658aa1e SHA512 81e8fdaf028799be7269c239ec5717bd5da58254b7eeef35ee5d436c4408fb02f9badbc5ff8a661903d10ec43bbaca68d8792f729293f6330c2a9e92ee0c48a5
-EBUILD streamdvd-0.4-r2.ebuild 1511 BLAKE2B f4236a3382bf6cdc1a0731987a80e109dcfa56caa84a8bd02f02f4b5411c7b9c981cd99c9bd2b965ee7f93a543cc3ebe608c13b5bd246770cf3a0eca1dd9385c SHA512 47990c7a782feb3e75ad68fc0e6dfb4a59eb3ecfb84384868565b80cf3317d6435cfc2c46523be8d10788d67dfa8d70b5eaebc05b7500d071d50dfc4c5cc3012
+EBUILD streamdvd-0.4-r2.ebuild 1504 BLAKE2B ac693a77ea36ff1f8676739998f7ae32e929ef87bf6797af6ee8141583e6c23e29138c83d1b51e3f26311220ac9dc4c31734adb4bbd7a514fe892a77495a6013 SHA512 7ff110564aa9d2b381fd7a371580b6ec8716028832a299e4351df9ed3cec2d7ff709df1aeb9aa916bc6fe9226a3a40c8b8c7b3b328a4f7b16164bd0e27f604bb
 MISC metadata.xml 559 BLAKE2B d5dd932f55599c1f38b5c68472a7e635852dd846d3c4cb85bf99f783c861be56cf5f846da27fb81460e68b97666b2bcd229655e987380a84c74c352f20668516 SHA512 17ff5079ade1e6a7c74298fe8e6f5737cb3fd0822f3318b198c32af761043c218739bb90865c616229ffba5698711a970d48f83df02716e7f82ab819c3c8fa98
diff --git a/media-video/streamdvd/streamdvd-0.4-r2.ebuild b/media-video/streamdvd/streamdvd-0.4-r2.ebuild
index c235978a8e29..8cba1b350b33 100644
--- a/media-video/streamdvd/streamdvd-0.4-r2.ebuild
+++ b/media-video/streamdvd/streamdvd-0.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="fast tool to backup Video DVDs 'on the fly'"
 HOMEPAGE="http://www.badabum.de/streamdvd.html"
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 1be6f0560d8c..31f626c41487 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,5 +1,7 @@
 AUX 3.34.1-gst-inspect-sandbox.patch 1828 BLAKE2B 9abd87afc62c784c4e5f79374d0172da0295cee520a9aa3ce2d4a2471f3e94accd7f14746fb93873767a5a11a2c9143b9387bf70295cc792199df62f501f73de SHA512 c312ddee62695b4344917eb2c7cca67284f3c7b24b21f35646f8b315bded9827aec05056fd17eadfe35da3dd876f20fd7b2cadd2141d04843c3c96d5f0346b21
+AUX 3.38.0-gst-inspect-sandbox.patch 1823 BLAKE2B 14be244c4bd9d96264ff776fb68381df5ea153fac41bf358e2253628bdb09733846a9331e6b129a1abd9186b967357549d6247d5ac021a37362a34206d8e17d8 SHA512 45f7602233b2f64debe1624442a2f6a21e0bf0b2cddf06b49dcdae7dcf0fc0ae6c3f16e5ec2603340df7cd89271501be70a31a0e0b0a737f85f667ac10c3ad53
 DIST totem-3.34.1.tar.xz 2157160 BLAKE2B 9ae9c8f6485c7377af07803c328e8ea3cc6fa80d8e30a7045bd2b50f7bc3d5a12582e5b60d901d22683f89e994c619c26ddb8b0890e343c873d4457fa177786d SHA512 9a3556f5cf522fca29926db185c2e5d25bdb80a25e14d0ba3062a7f15fc3ec40ae9f25752763bc444d4fd82ec2098efd732da662a1b1c5923ec19fde432606db
-EBUILD totem-3.34.1-r1.ebuild 2790 BLAKE2B 11bc1a25e6748bf907867e62bc651b86ebf25567e5e758e678a34f1472f4b81de5aa8da52aa0a21d54b9039a648ee00211704bfaa6dc264fd0de98ca0858817c SHA512 383a546321cf45b0547daefe0227178fb179905832ac6ce9177c8ac355f7f1cf85c2c6757846c12117c1f1ceb40319af6080739b611ae517f0ae2751a06f7f06
-EBUILD totem-3.34.1.ebuild 2787 BLAKE2B aa2b12503566a4bd278e0dc62e4e5a81043e7ae5eb1ea08e12f949ae466fc26fc107d9119ba1e117fd7c222bb06a396096e612c064b72dcd9698fc5b810ef797 SHA512 0b2878f608208b6a57e47e0db21e604631ee9438d064b667c287cbcc0d28b404652c5127215f9c801916d747e1fc48ee9fcb509c43dfa86f64ee3ca88998553e
+DIST totem-3.38.0.tar.xz 2235672 BLAKE2B 31a69bce69316e06b6ba1b1c98bfc5b87cae0b30e682bb1b32bbac713fb2ff262084e76c19690eb78495969a67c2be484bc45adcd1b432a3de7a33c3dc04109c SHA512 231aca873bb53f23f81a7981177761d0bf7768baa845309b0dc0821db58377d692cf7e8a65135090dac14e856aa3e1dc0c1f11c55a7b25d694822019bfa9eecf
+EBUILD totem-3.34.1-r1.ebuild 2789 BLAKE2B 615ed5d9dcb1c2852c7c3c0592bd40d9585ee3f0061bf6340c226a9feb60b89fac8f7cadb2121bf9bdd6aa3e96fa52331a783ba6c88ab088b989d7209312417e SHA512 fddc185417f9d27b097cfe56847ee39b369ed1df6d4b9ab18cccc37f2073f81f82c1f82481e9906d256e41c9569d93753cc826dd835fcc5705899499879a0c05
+EBUILD totem-3.38.0.ebuild 2790 BLAKE2B 8ec2c830521636e99084f30cf8d31aa9684ace498bb2601129f24d1b1ee6fe68030a271d260e0fdb5c9960e64641dc6861c55ece1cb070cfdaa49b2469211695 SHA512 ecbd39ef76d91afb54b2ec5ebd27a298d2e3cc14a69cf7486933a67e178df06732c55eda3fb316bd0b7104695b69b54ec3deb64ab2aeae537191a6af2e2fe7ce
 MISC metadata.xml 1017 BLAKE2B de40f52bc4cc3c838b473d4c444e9c41673cd3c2925f17508d03f5130fe237784d4ee4d02581718c06ccd30fa204d27ba7691fb8046009a540c00f3535f6909d SHA512 9b89a8eaa90ad2f55abf7a53bfba7c065be999233a7bbfe243f4514ca1c3ec5a3934f23ea8ecd6b2674ac82d5e55e2f3e25e3869a0cec019485c9bb99549b625
diff --git a/media-video/totem/files/3.38.0-gst-inspect-sandbox.patch b/media-video/totem/files/3.38.0-gst-inspect-sandbox.patch
new file mode 100644
index 000000000000..ef3ea1140217
--- /dev/null
+++ b/media-video/totem/files/3.38.0-gst-inspect-sandbox.patch
@@ -0,0 +1,42 @@
+From abb91b315f407b7e180bc00eb96f1cd6bb0ab25d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Thu, 7 Jun 2018 23:47:48 +0200
+Subject: [PATCH] Make gst-inspect calls optional at build-time
+
+Crashes on Gentoo due to plugins trying to access dri nodes which are sandboxed
+---
+ meson_options.txt       | 1 +
+ src/backend/meson.build | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 7070fd5d0..678b8f588 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -3,3 +3,4 @@ option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'a
+ option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
+ option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+ option('profile', type: 'combo', choices: ['default', 'development'], value: 'default', description: 'Build profiles')
++option('gst-inspect', type: 'boolean', value: true, description: 'build-time test of available gstreamer plugins')
+diff --git a/src/backend/meson.build b/src/backend/meson.build
+index fbf74258b..1e025a5b9 100644
+--- a/src/backend/meson.build
++++ b/src/backend/meson.build
+@@ -1,5 +1,6 @@
+ backend_inc = include_directories('.')
+ 
++if get_option('gst-inspect')
+ gst_inspect = find_program(
+   'gst-inspect-1.0',
+   join_paths(gst_dep.get_pkgconfig_variable('toolsdir'), 'gst-inspect-1.0'),
+@@ -31,6 +32,7 @@ foreach plugin: gst_good_plugins
+   assert(r.returncode() == 0,
+          'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-good. Please install it.')
+ endforeach
++endif
+ 
+ sources = files(
+   'bacon-time-label.c',
+-- 
+2.26.3
+
diff --git a/media-video/totem/totem-3.34.1-r1.ebuild b/media-video/totem/totem-3.34.1-r1.ebuild
index b9df961c7470..94346eec82b5 100644
--- a/media-video/totem/totem-3.34.1-r1.ebuild
+++ b/media-video/totem/totem-3.34.1-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.43.4:2
diff --git a/media-video/totem/totem-3.34.1.ebuild b/media-video/totem/totem-3.38.0.ebuild
index 2fac065f9174..89b5506cb674 100644
--- a/media-video/totem/totem-3.34.1.ebuild
+++ b/media-video/totem/totem-3.38.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
@@ -19,17 +19,17 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 DEPEND="
-	>=dev-libs/glib-2.43.4:2
+	>=dev-libs/glib-2.56.0:2
 	>=x11-libs/gtk+-3.19.4:3[introspection]
 	>=media-libs/gstreamer-1.6.0:1.0
 	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
 	>=media-libs/gst-plugins-good-1.6.0:1.0
 	>=media-libs/grilo-0.3.0:0.3[playlist]
 	>=dev-libs/libpeas-1.1.0[gtk]
-	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection]
+	>=dev-libs/totem-pl-parser-3.26.5:0=[introspection]
 	>=media-libs/clutter-1.17.3:1.0[gtk]
 	>=media-libs/clutter-gst-2.99.2:3.0
 	>=media-libs/clutter-gtk-1.8.1:1.0
diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest
index dc75ee000592..dd30da08b0d3 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -5,8 +5,6 @@ AUX 07_all_drop_optimizations.patch 516 BLAKE2B 2c0f82d9fac9c095d962248c781eabc0
 AUX ushare.conf.d 781 BLAKE2B 03331d0e3e5d58aae6b8856d7273c8c6f4393c3f4a50f551d1ecfabd0185c393a36d4b4eb944dcc20728ddd062923a86873ac2b5eb831c705fefa7806ef928b9 SHA512 86c7459952f5bfbad3daa960c2412f5dd32d4047db7714d0c990aad77f9aa9e68a49ddc46e8653276c3216f2834aa4334d4bc8c71770866b1a1c124848977dd0
 AUX ushare.init.d.ng 954 BLAKE2B f62f987fcaaa217e0b3a75d225351be4a8d486f4ff025c7fea5dd34a69e58a993fbafb43ab3b7feab474cdd736c6978d8cd149f919b758dc972e33508918376a SHA512 c70e6f47f29a9d555821c3bc2000ebd6533778208b46a7bbe823454e4b26408ab9b6e31ce7449dc84ae32fcc6754c3ca2a5afa0a0393a59888bda294f0e78c98
 AUX ushare.service 189 BLAKE2B 29037c78c7fb3b263e166e06dd82a5785f499db24cfbe8227e1f4695d200fff89f5a1275255f06938d134b3871b1551fee1262eaf0580ec75fb3b87ad1888adf SHA512 141b1f592220d3785af821f085f9c03811a2370e1a8c6bb5d2739b4ae74421323df437d2a6672d943ab8371b6d5ccfb395a4943a10eb5c1e8bc0ff16a3177b15
-DIST ushare-1.1a_p20200824.tar.gz 72751 BLAKE2B 3f9116eab500ad9eb959ded9b1e406100cfbbc32c27b1cc599ef301f8d72e9acb1e053722b8724fc3d350fffda6e5b932eb78cd5fc3f2b5dbe67431f5f5de5b4 SHA512 530fe718e2d52acc27af670d7e44703b34fea33d15fcda3bd1fd4c5702794647576df8a329a11439f0eeca52e75390548a5417776add7b5ab3f09bb0eb85ac11
 DIST ushare-1.1a_p20210221.tar.gz 72759 BLAKE2B e5dd79cba08c3c7554fd19eb98ecf9920dc1939e5dfe34a803669628b2d4031ebb6e2f037550e5129a8cc6f0c84a9a8e234c3c9823108f374375405ea16b5263 SHA512 c3038d7e7da13a6adbf52a20ffa0b33ca92a7b03d39c0fa6f9bea98484cb062f0509d655f853f7eafe3dab54b2bd97e3c8a4f571686bfdf13dccaa012b0c8202
-EBUILD ushare-1.1a_p20200824.ebuild 1821 BLAKE2B f86f508bd40a3eb7f71152da54f6ebbac484ee9bb3a74c6b69d02d50e08f88765c717a6d874595fb2b51ec5da40cb35b0e2f2984acf5f7241b4bc56edf84fea9 SHA512 fd19265c7c6330a7b098eae1b22bfcb24bf55b82ea830c9b7c6bc5faf02db4aa3f6596d32bc3f65d3514f5153aeb2e001599b556c91be7c0257b8e6d8ee5477b
-EBUILD ushare-1.1a_p20210221.ebuild 1823 BLAKE2B 3724cc4ef92abdd84ad68e195007c9cad1417e50a49463ecd44f78fc55f9445fe30bf9dbec0998daa075d5968b4ae2fdb2bb3e5ca4ab7ec025374d1f000d89cd SHA512 9c1b46ad127518972664fd2542799694e3336abba63988e39b9ac63cdada86bc645659747e88e2f7e9bb0dd416adeac825a257cb808a0ff6cf7f04fcc10ff3e8
+EBUILD ushare-1.1a_p20210221.ebuild 1821 BLAKE2B 59554b910cf00ad5ba2a956660c32c43faaf7d38d438f0ad8d0083c104a1317c8d87dc68094f891be8def8dc3718ac841073b081a829babebb6c5a371f5bc0f4 SHA512 c1fbf9335629c0cd910fa679b6d2204022ee55901a79540dc6e2c29d1970961990a0cc04e92f694c63d05ad1c7dcb15b0015f4c135d2c9ce46ab17af70db3bd4
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/media-video/ushare/ushare-1.1a_p20200824.ebuild b/media-video/ushare/ushare-1.1a_p20200824.ebuild
deleted file mode 100644
index aa9239211470..000000000000
--- a/media-video/ushare/ushare-1.1a_p20200824.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 toolchain-funcs systemd
-
-COMMIT="5f7f66cd89d5b0652c1226e65bbf9c85aeba00f2"
-
-DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
-HOMEPAGE="https://github.com/ddugovic/uShare/"
-SRC_URI="https://github.com/ddugovic/uShare/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DEPEND=">=net-libs/libupnp-1.14"
-RDEPEND="acct-user/ushare
-	${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/01_all_ushare_build_system.patch
-	"${FILESDIR}"/02_all_ushare_build_warnings.patch
-	"${FILESDIR}"/03_all_ushare_mp4_video_mime.patch
-	"${FILESDIR}"/07_all_drop_optimizations.patch
-)
-DOCS="NEWS README.md TODO THANKS AUTHORS"
-DOC_CONTENTS="Please edit /etc/ushare.conf to set the shared directories
-	and other important settings. Check system log if ushare is
-	not booting."
-
-S="${WORKDIR}/uShare-${COMMIT}"
-
-src_configure() {
-	local myconf
-	myconf="--prefix=/usr --sysconfdir=/etc --disable-strip --disable-dlna"
-	# nls can only be disabled, on by default.
-	use nls || myconf="${myconf} --disable-nls"
-
-	# I can't use econf
-	# --host is not implemented in ./configure file
-	tc-export CC CXX
-
-	./configure ${myconf} || die "./configure failed"
-}
-
-src_install() {
-	default
-	doman src/ushare.1
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-	newinitd "${FILESDIR}"/${PN}.init.d.ng ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	elog
-	elog "The config file has been moved to /etc/ushare.conf"
-	elog "Please migrate your settings from /etc/conf.d/ushare"
-	elog "to /etc/ushare.conf in order to use the ushare init script"
-	elog "and systemd unit service."
-	elog
-}
diff --git a/media-video/ushare/ushare-1.1a_p20210221.ebuild b/media-video/ushare/ushare-1.1a_p20210221.ebuild
index 8e89f250bb51..add31f454fe2 100644
--- a/media-video/ushare/ushare-1.1a_p20210221.ebuild
+++ b/media-video/ushare/ushare-1.1a_p20210221.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ddugovic/uShare/archive/${COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 DEPEND=">=net-libs/libupnp-1.14"
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index a2b5f6482849..5a4e962254d3 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -26,7 +26,7 @@ DIST vdr-2.4.6.tar.bz2 951272 BLAKE2B 52e92eb7e5fdc9bb9209cbef61f8db47e2e9a4750c
 DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f SHA512 d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
 DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882 SHA512 14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
-EBUILD vdr-2.2.0-r6.ebuild 8161 BLAKE2B ec2b998268125743b19d22d94262d2082b66e20d4fa32bd7323ebcc176c3f0a7aa63a12108b058a543b27acc92a8954ba7673bf658f1291959d4ac130dbfcac4 SHA512 5b6b56bfe59571eee19d5a3bb7cbc8c30ad48e617e8a1a9490a274aa3a1b4da437d65e71e2f40e6ecbf3a2d0d7a30f14e2c1ed8c150f9011c7c6d7c9bc43c7fa
-EBUILD vdr-2.4.1-r3.ebuild 6092 BLAKE2B 222efc8feee22c150c1c8a2eb395bb0f33cb59c7dedaf7f2a12734f05dbc39bd97764174d1352afc661e48d90bbb372b1d608caad9034814d59dfd960460dffb SHA512 509e606bff521f2f33f93a98e69d8dc1a40b834cdadc1b8b70f22898446ab38b046258221b1e5e0a77c972f555c7cb14b06f266074ba2b36cf4411a59ca112aa
-EBUILD vdr-2.4.6-r1.ebuild 5994 BLAKE2B 32fed77708c0df98811c1bc5552abe90d824c013ea5e94225444c434110e38d0f01d2fcc2d161072caf76d60b6e8978c93cbb6c0163d11c6e7a9808f4c405995 SHA512 0f37bad860a11e80439e9f13424e4b26ba1846305bd9e48b5d93b74488ca656b9a39dc221cd1c0571944b9e0753bd630255ae94a2ea544f799a227675a7bf7de
+EBUILD vdr-2.2.0-r6.ebuild 8159 BLAKE2B 383a0d759dea10033288f365a2d4c5ea90598a7254c7cd2179aa8ad98d111a84c2b324e2f63f2a8fac120a99038ab872ccf2f301f13a6a1e0e09da0877bade3b SHA512 195696b43bd21ea93bcf2a1056beb1557251f451ae52f5f4234afdbb78f82c99e3a628a19c3a6575cfb82b3530b4be0ecdd87eca349afc8afd5af1f4a535866c
+EBUILD vdr-2.4.1-r3.ebuild 6081 BLAKE2B 4bf9470dff3b8997e3e5c87755a8a1aed655c8bbe66c67a01cac6e13daad63da17347dd3b870db7e3326a2f5e6d4eea779103b3c79aac42c4b34341e82ff873e SHA512 eef8e4e4e9059126cbd4745b1d5ece8b79204d81d0f3bc0ffebad64cd52508446aea6c2af227befb971a913fcf6195abfa4c008069e83532cf914c95933599f2
+EBUILD vdr-2.4.6-r1.ebuild 5990 BLAKE2B c7f384d5f5f4d3db13efe9cf6996070b41ffea836b2460e755b037af90b7ba87aa22140fa2dabd820a7882075b0aaaf590863394526c025face8c0fa9bcf3f57 SHA512 b047a77e991e794001a6b7629408b798ca3cc60ca36e26b5ed1e18e8c99d63f2eacaeaa8a2cc14fce4ad8620e77639e944a5d392efaf3ba30da68d01030b7c31
 MISC metadata.xml 1892 BLAKE2B 2a233ceb745f8df9350e37d99d8dce2cc56d3c21e0d187de483a2d2d18c0129a047d48cf7cddff7ea2500ae044d1eb196efb508cce0424368e03bbddb75c6d82 SHA512 dba266e22f0d99b98284db088beaf4fbd288cb8eee046a5f96610ed6cd748a116a3ced7ce74c69660d9943a7f7ccc016ba8a242174780275334b95a1ad4489c7
diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild b/media-video/vdr/vdr-2.2.0-r6.ebuild
index 7d6d36b78e95..14af4f56648e 100644
--- a/media-video/vdr/vdr-2.2.0-r6.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic l10n toolchain-funcs
 
 # Switches supported by extensions-patch
 EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
@@ -78,8 +78,7 @@ enable_patch() {
 	done
 }
 
-extensions_add_make_conf()
-{
+extensions_add_make_conf() {
 	# copy all ifdef for extensions-patch to Make.config
 	sed -e '1,/need to touch the following:/d' \
 		-e '/need to touch the following/,/^$/d' \
diff --git a/media-video/vdr/vdr-2.4.1-r3.ebuild b/media-video/vdr/vdr-2.4.1-r3.ebuild
index 2d62740dffe0..3655c860fee0 100644
--- a/media-video/vdr/vdr-2.4.1-r3.ebuild
+++ b/media-video/vdr/vdr-2.4.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic l10n toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.tvdr.de/"
diff --git a/media-video/vdr/vdr-2.4.6-r1.ebuild b/media-video/vdr/vdr-2.4.6-r1.ebuild
index d7ea137b4c6a..aac5f13f30e4 100644
--- a/media-video/vdr/vdr-2.4.6-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic l10n toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.tvdr.de/"
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 80ad9cb8781c..637574d4ca9b 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,10 +3,12 @@ AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6
 AUX vlc-3.0.11.1-srt-1.4.2.patch 976 BLAKE2B 1d5c6a2df44e2cc26c0b835b71f028b04457e1cfc37954d30d9f2b29d711ea80ae2ec5431ed87be626caa16effa1565a34520dd7a54e89ee470e6aace6d3c594 SHA512 333480c279ad743b30ae61ab2e4e1c7bdca8e406009075f669c84fbaffe7fd68a9e9c58615d44cdba1056b973726c486cacd8d2dbcfea6f282173a929f5f8d68
+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.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
-EBUILD vlc-3.0.12.1-r100.ebuild 13685 BLAKE2B be4307ed0dd0505ad4801fabb742ed1871c15c5a5b4b0a3290b2c13bbd67bbe2e54216dac0f4e3463ad0cdeaee879cb23263db6ae6d1bbcfc70bfed7da5881b1 SHA512 00da28f450d65e89529f2a7d2ecf699f9d671a925b0d3d229005cf774bfc916c39cb320e0d4dce031523c62994de2ccdf63bd5564ada31427ab7eec7e11ca698
+EBUILD vlc-3.0.12.1-r100.ebuild 13748 BLAKE2B 107691a0a6f7a25082845706fe39be5d51c48b23bca434075f2d86b53205cc528d1bfe09374c945e80510f59739cf610dd76d6fda4735406ae10d60fb525ee5a SHA512 747e7cf72eb2e01b324ad6b8526f11b5d55400f9a86a02674e72ee1666ac4ff5c486bc5fa03319e369c84b34f5e350862c5cee5ae5cee327e5006147273bc3e7
 EBUILD vlc-3.0.9999.ebuild 13483 BLAKE2B af6be5847112bbeb32dc8404f542a7ecb3a457d29056749bb35072abdb36980da94ae75b7786fc5e8b738fe07de2d5af1e0da8c8d9c60dc9b9e08849a4c8ec06 SHA512 ab63c99d7a7c31063a0c3af7db77b8564a13b51579b9154f561534c8a898d24f81b7e126249eda0fae78ee1f6f049a30fe6b9ae93f2fee521691d4ab28496568
 EBUILD vlc-9999.ebuild 13504 BLAKE2B 056a36925bf5f01177066bcbc443a46aef1f465e976d391c273181ed09c2d570c64bedfd66cd58237087a2639bc4a6569fd2d1b51e2d5ebd727bd3b7fa3e2c8d SHA512 60ba65cac3f024d9fa1182ee4790f3ef6afe35576c314b02d49cf3f514e23307d46a6969f6abf2490a661516924d2010caf2223e21a856c2cd04e5a66673adc1
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch b/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch
new file mode 100644
index 000000000000..aaa61a546adf
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/767796
+
+From: Robert-André Mauchin <zebob.m@gmail.com>
+Date: Mon, 14 Dec 2020 02:23:52 +0000 (+0100)
+Subject: hls: add missing <limits> include
+X-Git-Url: https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=3aea33378b0b317b99fce2eeaca8b31bf7cc6aba
+
+hls: add missing <limits> include
+
+Compilation would fail with:
+
+> error: 'numeric_limits' is not a member of 'std'
+
+without this include because of some hardening build
+flags mandated on Fedora Linux, with GCC 11.
+
+Refs #25325
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+Signed-off-by: Alexandre Janniaux <ajanni@videolabs.io>
+---
+
+--- a/modules/demux/hls/playlist/Parser.cpp
++++ b/modules/demux/hls/playlist/Parser.cpp
+@@ -42,6 +42,7 @@
+ #include <map>
+ #include <cctype>
+ #include <algorithm>
++#include <limits>
+ 
+ using namespace adaptive;
+ using namespace adaptive::playlist;
diff --git a/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch b/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch
new file mode 100644
index 000000000000..3832b2a1877c
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/767796
+
+From: Robert-André Mauchin <zebob.m@gmail.com>
+Date: Mon, 14 Dec 2020 02:23:52 +0000 (+0100)
+Subject: adaptive: add missing <limits> include
+X-Git-Url: https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=e3de1b709b258d2b0e316d927f5c828bdb1a738a
+
+adaptive: add missing <limits> include
+
+Compilation would fail with:
+
+> error: 'numeric_limits' is not a member of 'std'
+
+without this include because of some hardening build
+flags mandated on Fedora Linux, with GCC 11.
+
+Refs #25325
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+Signed-off-by: Alexandre Janniaux <ajanni@videolabs.io>
+---
+
+--- a/modules/demux/adaptive/playlist/Inheritables.cpp
++++ b/modules/demux/adaptive/playlist/Inheritables.cpp
+@@ -29,3 +29,4 @@
++#include <limits>
+ 
+ using namespace adaptive::playlist;
+ using namespace adaptive;
+--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
++++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
+@@ -34,6 +34,7 @@
+ 
+ #include <algorithm>
+ #include <cassert>
++#include <limits>
+ 
+ using namespace adaptive::playlist;
+ 
+--- a/modules/demux/adaptive/playlist/SegmentTimeline.cpp
++++ b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
+@@ -29,5 +29,6 @@
+ 
+ #include <algorithm>
++#include <limits>
+ 
+ using namespace adaptive::playlist;
+ 
diff --git a/media-video/vlc/vlc-3.0.12.1-r100.ebuild b/media-video/vlc/vlc-3.0.12.1-r100.ebuild
index 4463b83fc271..b2480e098733 100644
--- a/media-video/vlc/vlc-3.0.12.1-r100.ebuild
+++ b/media-video/vlc/vlc-3.0.12.1-r100.ebuild
@@ -236,6 +236,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
 	"${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.12.1-limits-p{1,2}.patch # bug 767796
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/vstrip/Manifest b/media-video/vstrip/Manifest
index d3ce7cb19462..f91eeb57886c 100644
--- a/media-video/vstrip/Manifest
+++ b/media-video/vstrip/Manifest
@@ -1,4 +1,4 @@
 AUX vstrip-0.8f-gentoo.patch 2047 BLAKE2B 253332bd66e176f39a685ced6f49a6478044c8f8d0ceae89aa8ea57d74f8963d19d8a86a31eec28ea8acdae2db0c0997384d907e5772b374b2261b183c68a6d1 SHA512 5c8ac7a49a50b701108b06bc5f3305d2a4553d74fe30c7f628cdc5c9f4391dbf1e75764a2900727ddd6e706bff9386dbbde63269facf563a1b59b96c593de6ed
 DIST vStrip_08f.zip 409157 BLAKE2B cdb31341d014adb10b8d83b09d11896351d298b49eefce2b506eaca26883ca14ad8f007e42363fa961e9839b548ce0c7fd1edf9d4aea17c1a5d135bf0feb9089 SHA512 5b8fa07e923709aa0defcbe3ad6fced02eddd5cacc7c33a5ec777e1d64d1e33f3163c82c7fd74eb80f02833c75593e7fe544fa93a56271926a51dbc663f39276
-EBUILD vstrip-0.8f.ebuild 707 BLAKE2B 0887d8b33fe182756582b4cb2c502903f66eae219b4ce64142f08e99c4d9f55c66cf598a87d85b9c3ddac77e6556000a5a219282c6753fc78e85e8f4d746efaf SHA512 bb73ba73219c40bf016389972ccf20eb5b5002580c8eaa5a8a454fab8e8a21cd23d412e5b8dabed5cad9b0b91fed0de837dc9ad174935b3e659c77a1c463a29b
+EBUILD vstrip-0.8f.ebuild 703 BLAKE2B 2c3205d3d545723ab937940c0248a0e07b9f1d162f5b67b684190fd3d3d1445a273e3ae16c2643381dcab2681c4437da6b41c2ad7c07ca55937f4fedb2270cd6 SHA512 b0194c9298cb601d6d0ddf57089368a29470b2e475c06e23848f5d8b56c4b9667ad557d134906401038ff242c5faabc1f5af91d4a47a4ad33a8b7384ceb88714
 MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/media-video/vstrip/vstrip-0.8f.ebuild b/media-video/vstrip/vstrip-0.8f.ebuild
index 7aa923068945..9e768fa5e9f9 100644
--- a/media-video/vstrip/vstrip-0.8f.ebuild
+++ b/media-video/vstrip/vstrip-0.8f.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit edos2unix toolchain-funcs
 
 DESCRIPTION="A program to split non-css dvd vobs into individual chapters"
 HOMEPAGE="http://www.maven.de/code"
@@ -12,9 +12,8 @@ SRC_URI="http://files.digital-digest.com/downloads/files/encode/vStrip_${PV/./}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 692db9f6748c..ccc347c35b9b 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,4 +1,4 @@
-AUX xine-ui-0.99.10-desktop.patch 996 BLAKE2B 3ea4d4f4c3a9c3fd93f211c949694abef94d9f115d41f45afce07632f96473912e393b14de8fba714f9d11bb351ff8df41d056d6c4aebd680f03f84b5498d60a SHA512 f4d40ff11f851ab2e56e902fd9c5cf51f530c76308d6f7f6675cd5b90486a1e265d29b12375c10a57a8a825b45132fef9ca471dad056c5524e817678ce79626f
+AUX xine-ui-0.99.10-desktop.patch 852 BLAKE2B 6341545955de64e3fc30a89c30b102b2bad33915f03a435786c18addc6d329ed65988b5ac6394039550136e3705c6cf03d9b34145d248671d3a98fe0d6f08bd8 SHA512 f901219cfe75fc4b4e9e25074a12e14366dae4c412866ff75c95f28ddb972a1237d8d33cd622deb812ec240bcd9d05bf6ec0c2cdec7d18de7ad88f2f93b77bc0
 DIST xine-ui-0.99.12.tar.xz 1980672 BLAKE2B ac1a9b17b48005c667d53129e51f4db2cfe2933c0fca9ba8b6f1d999f903568217a061c84806abfec31d4afcc238579c232a1ae6f4b04afcac465c340826f037 SHA512 bc04cb8df730abce147485b488250331a304e4318fc28ebab890c6485242a5edeafd953547c637622e2312c65aa1e36aaae6117d608dd668781d841804f2ae86
 EBUILD xine-ui-0.99.12.ebuild 2003 BLAKE2B 8e0d1e5e84f1950b83d31c134f8f9e9e410271fdd3980801d05025ca540400511630869d7b9ff4beaa3991c6aacf757067d6227edafc921cc5cbc4f9095635d9 SHA512 bcdca5162cd33839d715dec37be63e15d80c9b0e5f8e063ab64cf4eca8e8f87a73b4629aaf26ac4e7623749995d39ed08203a3c0ea31ad7e81385f2cac46a1c7
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
index 04aecb7ccf11..0be54c0958e2 100644
--- a/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
+++ b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
@@ -1,5 +1,5 @@
---- a/misc/desktops/xine.desktop.in	2017-12-28 17:34:15.000000000 +0100
-+++ b/misc/desktops/xine.desktop.in	2018-10-03 18:53:23.909196224 +0200
+--- a/misc/desktops/xine.desktop.in
++++ b/misc/desktops/xine.desktop.in
 @@ -6,5 +6,5 @@
  Icon=xine
  Terminal=false
@@ -10,8 +10,8 @@
 +Categories=AudioVideo;Player;
 +MimeType=
 \ No newline at end of file
---- a/misc/desktops/Makefile.am	2017-12-28 17:34:15.000000000 +0100
-+++ b/misc/desktops/Makefile.am	2018-10-03 19:52:23.262534618 +0200
+--- a/misc/desktops/Makefile.am
++++ b/misc/desktops/Makefile.am
 @@ -32,7 +32,7 @@
  if XINE_LIST
  xine.desktop: xine.desktop.in @XINE_LIST@
diff --git a/media-video/xvattr/Manifest b/media-video/xvattr/Manifest
index 5cb3f2860c84..307cfaa955bb 100644
--- a/media-video/xvattr/Manifest
+++ b/media-video/xvattr/Manifest
@@ -1,5 +1,5 @@
 AUX xvattr-1.3-gtk.patch 1255 BLAKE2B 471cfe05fbeaaa405771543d5c3b8900be848642724078a583321aa997b5e8c442894e6d2f6bf4ccb0eeed283f5f059b2be741c654c9a18f888034a105eb2eff SHA512 a81015dfa6c556d99e27765e9d793d1ab745925be212c8a3c21503ac73a6d7bbae5642e7cae067544578e7a1388968a354b759e72edcde1ccb0fa704c929e138
 AUX xvattr-1.3-pod-encoding.patch 303 BLAKE2B 127fa43fe4ab6586d30d85a685d98038f226f54286147c98fc4fa738cc996c2bb802cf8fa962bb9143dfc506d64243b1d3f8af5218705b24f0f435fff85f3256 SHA512 84be4a336efa6caffbacf15f2b68ddb1d6b60cc8212593662194d7a7df5891c6d5cefcb28c25412471e5e943359e6c4f076b77f9c92d1a93e084597d39697484
 DIST xvattr-1.3.tar.gz 82263 BLAKE2B 5e12c3001640c50294693eccf4e6b04c0e034634cc25a7be9e70dcd84c6da73e87be5a092ba4e9d9e5a70469d5018ac016d9812c2099bd68d35247ac6c522730 SHA512 f7b9f9f46961458be6aebfa5c40b28ab0757220ee5a20bcc3b635eaf6912afd7ca2ee9e9d0cfa1894e8ce6c97433e23f78f307fa216d16b5628b8b37202120a0
-EBUILD xvattr-1.3-r3.ebuild 773 BLAKE2B d538490b04c310400b88abdb45daa191f82ca4c45043b3c423c3ce1fb7ca5eadd85223d2515ef3d9b80da34c7762ae5908a9e99a9768928263a077f9b4eeb22f SHA512 88e81549eae790bc5141867ba7bbac2d4f0dd272181cffaf77bdd06c34b9eba3e2e839b9c3adaec42f862cb43f5478b20b3908339d9f5bfc1064c3f415617b5d
+EBUILD xvattr-1.3-r3.ebuild 770 BLAKE2B fcac1d11ea60af2b838fb9303c314f99ae4d01559e132c35022d963c7104af685f1ed0ff4bcf643a014d3758bc805869b7c3fc2fb7edd9cbaa8c69bae02d5d8f SHA512 4f2323510ba6bafacc719719d9bec4da5b002f028a9efec6107fd7fa13e0bc53fc03dbc62bb13b2d0093198440a140a9aa4903bb7c63207b135c74ecb080ae6a
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-video/xvattr/xvattr-1.3-r3.ebuild b/media-video/xvattr/xvattr-1.3-r3.ebuild
index 1a41d60604e0..54db3e63fb5a 100644
--- a/media-video/xvattr/xvattr-1.3-r3.ebuild
+++ b/media-video/xvattr/xvattr-1.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils autotools
+inherit epatch autotools
 
 DESCRIPTION="X11 XVideo Querying/Setting Tool from Ogle project"
 HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd"
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index c41133dcc41f..363218650a3f 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,3 +1,3 @@
 DIST yle-dl-20210212.tar.gz 64609 BLAKE2B 1cffaadd6c5628e0d2b2a02cda2c6a98939c0c92e9efda7a6fd0dc02c65f7e0b3a5de6d705143d4dbd1507bc8733d13dd9b0547592c86f6168de63d0fb73463a SHA512 cdef7ff929d3dacd8b599644b46d784412b232f64e3ba2f1d6d2338c8350d38e0ae089e2a79bf12a1d39311daff60a062432b945292c1728b310af3b3a68a98b
-EBUILD yle-dl-20210212.ebuild 1501 BLAKE2B 360b6015c19b751e08d2e38f47274c10267e92014f4d8811874f6cea3ef693093a5245a9c756582725056539dd70a5a5989f40813e3b1a386b7e1bfac6e9a5de SHA512 e3937167bf0c32b7997da501d68fdf9fad52a1c74fd8d4cfc4255dae6f5933ad1b39bbc9a2fc040ada322b3ac55dc478f3f59d9f7ada8cc1cc35f8c6f02df782
+EBUILD yle-dl-20210212.ebuild 1462 BLAKE2B 98d93097000e870959cbc04cc3b898bd7ab6d9ccec50c28da0523f96f7c8d1a9badda6e7005cbfe8c54bfb3705c956f5a7c33b75eb78fad5488e369010653069 SHA512 6bd5465392690f7c0790e09e9d64b4b698fb3356f189f82a8cd8ad118b0d5d5ac34f910bb8f667b6a90a3c76eb5c8f46dde50f0645d0f0f24a87fa1506aa8569
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/media-video/yle-dl/yle-dl-20210212.ebuild b/media-video/yle-dl/yle-dl-20210212.ebuild
index 5aa66d814d1f..125985473641 100644
--- a/media-video/yle-dl/yle-dl-20210212.ebuild
+++ b/media-video/yle-dl/yle-dl-20210212.ebuild
@@ -49,7 +49,6 @@ src_install() {
 pkg_postinst() {
 	elog "Sample configuration file has been installed to "
 	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample"
-	elog ""
-	elog "Optional download engines: "
+	elog
 	optfeature "youtube-dl download engine" net-misc/youtube-dl
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /media-video
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)