gentoo resync : 20.03.2021

44 files changed, 293 insertions, 676 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 27d7ef5c2a9d..ef8592de8c46 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/baka-mplayer/Manifest b/media-video/baka-mplayer/Manifest
index b4753125278f..89b368018875 100644
--- a/media-video/baka-mplayer/Manifest
+++ b/media-video/baka-mplayer/Manifest
@@ -5,4 +5,4 @@ DIST baka-mplayer-2.0.4.tar.gz 988060 BLAKE2B 4d73e6626bab90b2ac818fdc1b0d8ab775
 EBUILD baka-mplayer-2.0.4-r1.ebuild 1393 BLAKE2B ba613bc4a7a2739f6ab9dba43865f8dc8f002809eb9058339f2659c32a1f6f37ed4fc10174dfec7662d50577aef27ff1779037cda3e6abeca787cc20c07e1e5b SHA512 0b06a8ccfb022400166c77fde48f8114f4d7a53adeb9916e4508b8dd90e7e3eb927e3e3303fd18dc0de6ef369fe1cac7814b3d72c1ffc2a0debf042a1d3d323d
 EBUILD baka-mplayer-2.0.4.ebuild 1135 BLAKE2B 22e814220d9493f077d266aee064a279e105d4ed4d35db3ffb8d3447b99580a9abe380042a1bd9a8fa9fe68138893f90bfff657c520168ff8d4cea1e73201431 SHA512 21bef7f1e283eb3a60cacb6502525ba46299aeaed11ae77da182755428adcfb526027452fbcdf80576854fa9d05d6eae5f720d9e10fe0e8ea5af649eb201a8f3
 EBUILD baka-mplayer-9999.ebuild 1187 BLAKE2B f2ce2028cc9c86799e1e676ccc4cf8fd2fd8dd663605deb74801ae812471295cf1f6537dea13a1960400abbc7f0694ed7015688ea2097575738227598fc8cf25 SHA512 c345059930ff6da0691eddd5e6c3a4c5c445af70bf4bb26b1492a65c337ad3c091455e2a22df67dc918774f7712971e727a9f3accd993adca0e6a3ce942cea46
-MISC metadata.xml 710 BLAKE2B 14de96f0e5bc84ecbd15d2d0518e6332fdf022a850464a1e56eb1338384ebe7eafb1d1ac016779eb95717b03331c6c9eb2592b7db5efe9ab9202c33a07db3e42 SHA512 17f1484753f6610e64013d76077e0963a6475861aec91af9f3b16638d49886038c8d40852eabc6eacf6a9f0429d5290700d9a19e1e69ff63049fe8fe50131a30
+MISC metadata.xml 740 BLAKE2B 28d3dac3e8ff89a4076a5810830c53814b32c265c05e4ed1f17b5e01d5667c78d612e56e08258ab362a965a1e467ea3668f9f85d0bbeaa8ae07c34a0e7ddc9d4 SHA512 8d8e0382163d0ceb048292651b7a53f805138564f1650363bd56b564507fbb3c47319d1f16115f2d2fd6661fe3df90ff667848c8b26bf137943c915f60c09c61
diff --git a/media-video/baka-mplayer/metadata.xml b/media-video/baka-mplayer/metadata.xml
index 0e74b241272f..f393f0b7ba3b 100644
--- a/media-video/baka-mplayer/metadata.xml
+++ b/media-video/baka-mplayer/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>cstew764@gmail.com</email>
     <name>Christopher Steward</name>
   </maintainer>
@@ -13,7 +13,7 @@
     <email>media-video@gentoo.org</email>
     <name>Gentoo Video project</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index a5911fa7ea76..a60bd7050950 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,5 +1,8 @@
 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
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.38.0.ebuild b/media-video/cheese/cheese-3.38.0.ebuild
new file mode 100644
index 000000000000..c12f4984c2fb
--- /dev/null
+++ b/media-video/cheese/cheese-3.38.0.ebuild
@@ -0,0 +1,95 @@
+# 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
+)
+
+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/files/cheese-3.38.0-buildfix.patch b/media-video/cheese/files/cheese-3.38.0-buildfix.patch
new file mode 100644
index 000000000000..a7d685e68628
--- /dev/null
+++ b/media-video/cheese/files/cheese-3.38.0-buildfix.patch
@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index 7ef4075f..36638472 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/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 4af028c88885..9427b1081341 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -5,4 +5,4 @@ DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedf
 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
-MISC metadata.xml 2256 BLAKE2B d224c6932982a05615b3e5094f1f1aa077682cbbe6589ea9806f47a604e7b51063c8382d542b474a078094657690cc8f785889efa696d2aca25f38ea8b3c9369 SHA512 9672bf9ac08cbd33e4effc8456c152edb1d2d7985fd21028ef06b9698077052c509b29d3f72311b5b62d36400c8cda45699026e91cb92f5d63f2f1f10597bbb6
+MISC metadata.xml 2286 BLAKE2B d731cd148e5f11d3128b94f0b1c7b08575bba8904d41a4a1ce92948f52a68bc5c6274cd707dc70bc071897e320bbf0c75bb5fabcdfd66575a8bd518309b43236 SHA512 97829259b665317f51cee00190c341765d0fc4fad72af7ce3e652a661bb6e79cc09d4eb85402d43e2ea51b29bdc2c9e60b650e249a1603d9af8d0cf41a68cc28
diff --git a/media-video/ffdiaporama/metadata.xml b/media-video/ffdiaporama/metadata.xml
index 84064cda7423..8f113844a555 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>olivier.laurantin@laposte.net</email>
 		<name>Olivier Laurantin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-video/gnome-video-effects/Manifest b/media-video/gnome-video-effects/Manifest
index dcd0972a755c..6af2f73288f4 100644
--- a/media-video/gnome-video-effects/Manifest
+++ b/media-video/gnome-video-effects/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 488 BLAKE2B 202c977557ebfa4dd1d9da6c558c1094758a403396d255c8aaafc62f746aa42b650ec597a7f5ef1cf3507cedd6bf4dce2f109e4da02a4906e451fbc73b4a3462 SHA512 db1e3250d928428f492fca5e87c5824d7cf8e19746e433292faa19544ba89c043f046305c650c5c18e6d94fb429ff5f4e634dd5c0609d8c6aead26e3ec9d50ec
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
new file mode 100644
index 000000000000..e033177c23fd
--- /dev/null
+++ b/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson
+
+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"
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="
+	>=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/libva-utils/Manifest b/media-video/libva-utils/Manifest
index c7dfd1fcb9b2..c5bac7e92058 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -12,4 +12,4 @@ EBUILD libva-utils-2.8.0.ebuild 1264 BLAKE2B 184c33bb8683bb8d86e9fdf8f12dfb33a4f
 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 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57
+MISC metadata.xml 414 BLAKE2B 172a3ddb5fec4b701f6f0fdf1c99ec916312151513e3505a6b37087204283040cffaced290a092f6ce71e8e499a134c882754b011a2dce2e9195f74d8b3eab4c SHA512 180a80f82f063806dac28be27bedc9d968ac74134e4c63a45a11b94db8cbd531971530844d1988f1fa1d4e389fa40bfdc8ce0c65109ae8f64accf9e5a607970a
diff --git a/media-video/libva-utils/metadata.xml b/media-video/libva-utils/metadata.xml
index 6a47b632dfe2..8d6b2fa413db 100644
--- a/media-video/libva-utils/metadata.xml
+++ b/media-video/libva-utils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/media-video/metadata.xml b/media-video/metadata.xml
index 21e3aff12af5..c4c6f8c06838 100644
--- a/media-video/metadata.xml
+++ b/media-video/metadata.xml
@@ -33,4 +33,3 @@
 		przetwarzaniem filmów.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index d84202b46d9f..1f1275018f1e 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -2,5 +2,7 @@ AUX mjpegtools-2.1.0-no_format.patch 2800 BLAKE2B fd608ca5b9700fc0ab216f99be79fe
 AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704700782ff3118c44e6434585b66a21ae713b544e57d33beae6193b7ff499fc6be1ddb9147cf93cc3c00ccec676f76 SHA512 d90c30e097f3f2694f611b3e52d76834f9f6e1c9020680e87cc353b28492d36dfb49a7a1167792450cb6f7ed88c20ed891b9282693be9d8583e4948fd998802c
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
+DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46 SHA512 d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f
 EBUILD mjpegtools-2.1.0-r4.ebuild 2850 BLAKE2B 5ed1abde176b50de2e0484a0f89e88fd70703a8861b072cf8b487505faff0aba9ff7e33320e81df8ecc7387d6e1114d81ebf54e2e64cf559a3d825c5ed682c91 SHA512 6f626cc2e4d1f060ec1d64699a98ee52766a18f29a78c8859e96162518e4c1ab76e347b6ffb81153faff8b4063c16e48377ef260c5838bc5fd99943a5db887e8
+EBUILD mjpegtools-2.2.0.ebuild 2607 BLAKE2B cd21aa87e5057ee795e5e3ff7c80f42de5971a2bdc24129488777726e9c691bbe8edf1f7f7cb19885ce037169efd906ef1a0345109d14acf9d106bf29b4414a9 SHA512 b4842643215afc3cfccd8c565be62bc23f5464631a70e2fc7ec13603d8a380daf708474f93b0d32d8b08febd5fe644417280ca09fce52638b24ce169f3858cc1
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
new file mode 100644
index 000000000000..9dd316d8a9c1
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
+REQUIRED_USE="sdlgfx? ( sdl )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0= )
+	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
+	sdl? (
+		>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		sdlgfx? ( media-libs/sdl-gfx )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-apps/sed-4
+	virtual/awk
+	cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+	local myconf=(
+		--enable-compile-warnings
+		$(use_enable cpu_flags_x86_mmx simd-accel)
+		$(use_enable static-libs static)
+		--enable-largefile
+
+		$(use_with quicktime libquicktime)
+		$(use_with dv libdv)
+		$(use_with sdl libsdl)
+		--without-v4l
+		$(use_with sdl x)
+
+		# used by tools only
+		$(multilib_native_use_with gtk)
+		$(multilib_native_use_with png libpng)
+		$(multilib_native_use_with sdlgfx)
+	)
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# avoid building programs
+		emake bin_PROGRAMS=
+	fi
+}
+
+multilib_src_test() {
+	# there are no tests at the moment, so it would just build
+	# all programs in non-native ABIs...
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install \
+			bin_PROGRAMS=
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "mjpegtools installs user contributed scripts which require additional"
+		elog "dependencies not pulled in by the installation."
+		elog "These have to be installed manually."
+		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
+		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
+	fi
+}
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest
index c91b9b492eef..3684c5d840c1 100644
--- a/media-video/mjpg-streamer/Manifest
+++ b/media-video/mjpg-streamer/Manifest
@@ -4,4 +4,4 @@ AUX mjpg-streamer.initd 1265 BLAKE2B e42564a98636a1a5dc059bd418e281ab6da494f88cb
 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
-MISC metadata.xml 1709 BLAKE2B e68108cfd6fba5555d3834c00c6a43493fb278b499102da1432c78af65baea7c81084258d0ad7b562b563edc9018c862fd099c397ee7d97377eccb4e14f0b293 SHA512 df182d8bf1ea185956bd63b6e0bca6edddd279d515beb9745013c4f9be4130a49feeae3ff5f5a0fbfa5ef834f1d0869ddeb852efb22487c68167d720f662e0d5
+MISC metadata.xml 1739 BLAKE2B eb540aa61dc989023ab95953685d26a490919bc1faf9a4a3a144d47a9ff7b2947613114008365aec1f78163dd556be8251fc7532bb7d8ea17691ba1ba166531b SHA512 6efd0e69791aa856af7c404f380887a1936709bec939b2dd5b6082dd3f02519797070fee34a10e22072d630dfd4293bcb6a8d8b1b8c677b40009ef309cc7e6f1
diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml
index 65cd83e8d96f..2e4cb6515fd8 100644
--- a/media-video/mjpg-streamer/metadata.xml
+++ b/media-video/mjpg-streamer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>andrzej.pauli@gmail.com</email>
 		<name>Andrzej Pauli</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 32e3f5a45dae..8f5c995d563f 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -7,4 +7,4 @@ DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d
 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 850 BLAKE2B b9ead6c9f74bb359c2bb282c0f6f8c33707fbd42aa458314c93bc754e2f707dc51fcfe5e0e0e2216af8435c2aa10d9e1c5885a838236b1ea274453c84f95f303 SHA512 419521643cbaefd58973bc764594ec44fdc927890c837eda0733af575073a8655e58da76f4a22467ae1d014898d828b84e9de85bb442cd9505911af1a04395b1
+MISC metadata.xml 880 BLAKE2B eb7167f5b1c6cea244e553aad747ad114c46e1f8dad0d26c271afb7630ef88bea28e824c454913dc5a1f56e80ecba1ff7b518384eff503e06c18fa02ea80b13f SHA512 b44ede0bcef1053fb097cdb8f243ad8d9e17ee2ba627ceb1ca31a360b8d22f58d5fe43a81d0c81494916698f8c448d1254299c5358cef977405396846cda7320
diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index 301a7616abbe..45dcbfba21ef 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hfern@fernhout.info</email>
 		<name>Hans Fernhout</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-video/nvidia-video-codec/Manifest b/media-video/nvidia-video-codec/Manifest
index f86b6c689da6..e119c08dd2aa 100644
--- a/media-video/nvidia-video-codec/Manifest
+++ b/media-video/nvidia-video-codec/Manifest
@@ -6,4 +6,4 @@ EBUILD nvidia-video-codec-7.0.1.ebuild 543 BLAKE2B 21cbdf9ee4312087212b2b0192193
 EBUILD nvidia-video-codec-7.1.9.ebuild 543 BLAKE2B 21cbdf9ee4312087212b2b0192193bd3713f5ef00f140dd3b0313bdf7805017bd4496ec80f93f8dd852aaa04ed2c1e736856352a2d2e55166543308c05b3e41d SHA512 450fc1260cea3a1295ad49c56718398f1711917169b3d51b7596725ccefccf6b898d3d5a6f73e9d4c0366d21d53ba257c44af31260894f61135392eea18b8a9a
 EBUILD nvidia-video-codec-8.0.14.ebuild 543 BLAKE2B 21cbdf9ee4312087212b2b0192193bd3713f5ef00f140dd3b0313bdf7805017bd4496ec80f93f8dd852aaa04ed2c1e736856352a2d2e55166543308c05b3e41d SHA512 450fc1260cea3a1295ad49c56718398f1711917169b3d51b7596725ccefccf6b898d3d5a6f73e9d4c0366d21d53ba257c44af31260894f61135392eea18b8a9a
 EBUILD nvidia-video-codec-8.2.16.ebuild 540 BLAKE2B 06180170f102cf9c52d0774a25d06fe61401671184128990f5f6613c0e907042761c04c7d63980025e97c25a492c345a1bdf37a6ae6805c92120ef29bb03f87d SHA512 30bd0dddfc3f1bf76c863fdc5140179e44d6c2f0bc5faa2ebfe0e5c3d8705813a8f819cbb8af4b063533e68c80a1b0dc674e32f7fed32084510ac9213530985f
-MISC metadata.xml 322 BLAKE2B 631129a38bbe26c8289d032210c2df0d0dd8160aefd5f05fb8da83c9a9fe8bd0e1916dbeaae883389869eae1b3420902c355c0ab473624f0756f29daa72009d2 SHA512 605ce8c99fd9be9627fd9b3afd491df585b9e5aff955af1964fb51482c4fa0b18e8047cc3715be2977bad4ace03cfe0330eed44fdaa5267feb9c2840cd233870
+MISC metadata.xml 322 BLAKE2B eb47d9c5747b6e4880382844ff80388be6cd2f49c88406597b28d8020e49664ed4f51f4d46b24679cc4f528add21527dbcd84c06a3b1a0f0e050b9e92cb04ebe SHA512 eb6171b463e5e804f6f9f6049dac0fc7c2cb9514e20ff8fe4ac9153630858dd81bb4690062cc2b086d2ac1982817e71f6d08d8e1fb085c69bc728ace38f3dc32
diff --git a/media-video/nvidia-video-codec/metadata.xml b/media-video/nvidia-video-codec/metadata.xml
index 004fbed2edda..bc50d99929fa 100644
--- a/media-video/nvidia-video-codec/metadata.xml
+++ b/media-video/nvidia-video-codec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index 6a26d7fb6d37..37abc9e28669 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,7 +1,7 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
 DIST openshot-2.5.1.tar.gz 60217543 BLAKE2B 3f195b14a9fb004e845c731be64138c20da84ac0c90db43b547ee9ea059d32f85ada04aa0462b755a7ea5c3d3b30088fab35414147dded55deb9d5eab5926d2d SHA512 8254a45254bbe523b6485b9598022de2c46ec30818e606ac4665790d29486693c4efe9f5bc55ee43d6342de6782cf0090e4bc880e831c08e3b1218bca555af14
-DIST openshot-2.5.1_p20210130.tar.gz 64770353 BLAKE2B 4d7e25a6b8e174051fb0f1ef4bef8a118ac75084ff4a24fce1fdb86975ae87b23f92dc29202fe180c862ea1df3a1b47ef799757f6fb87f7d985a78a64f0a66cb SHA512 9881a099448fc94d413c0d8dab8b31952c6cea09723e56e55ce9b45453e6783cc9aab8c157704c48974a1cb502ff7d6d93b2b3cb08a60fcf05a85ab8ddfc3871
+DIST openshot-2.5.1_p20210228.tar.gz 64780534 BLAKE2B c31bd2531df28ce9bed688fbc34dc383018024ffe9364699e45c08135f5c0692d97f601bc578ba07fd44e2f8f58f0b27c5bc10bb3af48c8cf0be17a45b966116 SHA512 b5ce39d31bc1b997d272b3817ccdcef4749126755e329a278700f6735a1484b0c2b917e04a5f1b9826ee0e5ea983a624be59af16bf79f038be44a29763cc68b5
 EBUILD openshot-2.4.4-r1.ebuild 1261 BLAKE2B b8fa7aba6fd7e2ee2dd23be0f08e4faa9fa6aa9d531069a7393fae570efd32d506da8ccf6a6743271356ce3e5b3af8dc274d2303b1c3eb8137d89eeb97993d95 SHA512 6653f3d0348a53acf3cedda9e53e0676d8e847ee3f63ae99082b174dad86779061e93778ae76b28071d1a6d0af0a5ff4bc70d89e9dcb8d09fff637f20c5447fa
 EBUILD openshot-2.5.1.ebuild 1240 BLAKE2B 733ca99178900d80d546c1c31674c61360e1726bdbd853bf2c4c26001a2880d318c14b1926a429773a9a6d438bea9a29c74c264e8e87c1057fd1e72549cbfd39 SHA512 6205921cd13f18a42124d413517bfa61708896404710012a6aa4d2f88eb710651eed0fb71ac7bae93310c9b2cbb999c77588f9064fb6b9ddf8e797dbce9019ea
-EBUILD openshot-2.5.1_p20210130.ebuild 1335 BLAKE2B 5840043488e70ecd343dbce4d1bfd3b6a498d7e55b50983d40d7dfc01bd474d0d911e0199411a679f7630cb36f4c0929e0f8d8c5e05c96bf3f845467e5b7f8a9 SHA512 e744ae23ff87e3a86b2f2d8b116f444273f0f52cc8c5a4f1105656ca48e98a6725c901586394a5f5005df5d02bcaac5a65ca2353b0fb56bd03bbff8b99626e57
+EBUILD openshot-2.5.1_p20210228.ebuild 1335 BLAKE2B fa1de51206b4c92add5075a218df9b5efba55bfd392c1c1f3593b2eca0103f60d2a0aee659452a26db6da305202e584a11c7240d5a606758f4c2fbce08443c9f SHA512 9de80c57c34ab236d24cfef7b1afb24f4f7aee5b5d9c9ed14c751b9e97e116dd283bca0c0d675781cb5efbc7b01c0873ab0685320d16f16072a11c07b051290f
 MISC metadata.xml 520 BLAKE2B 78c1c2c7058fe041a5aa1e783622529dd897a609ce801d718466c7d14b9b5ccd05ba496f468f9100301f20ccfa04c3824aed975f39f7febce487b87bddce9282 SHA512 3d2227d47b72451b5b600384ef70b3085a8e46cba1f076d05c558b69ef50d18084dd31d2f14323237c1500842ddea664bcc78a68de9f9d5d472f44ab90a6c325
diff --git a/media-video/openshot/openshot-2.5.1_p20210130.ebuild b/media-video/openshot/openshot-2.5.1_p20210228.ebuild
index b3e91e5b060e..7eb405299fe5 100644
--- a/media-video/openshot/openshot-2.5.1_p20210130.ebuild
+++ b/media-video/openshot/openshot-2.5.1_p20210228.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE=xml
 DISTUTILS_SINGLE_IMPL=1
 
-COMMIT=14ecc519d8390d6fa76cdc03e0d79a0fb5ca12a7
+COMMIT=146189dc050a9462f71a8b37e783aa52b73e4d9b
 MY_PN="${PN}-qt"
 inherit distutils-r1 xdg
 
diff --git a/media-video/orion/Manifest b/media-video/orion/Manifest
index 10b9ae23fcb3..4abeb28522ed 100644
--- a/media-video/orion/Manifest
+++ b/media-video/orion/Manifest
@@ -1,3 +1,3 @@
 DIST orion-1.6.7.tar.gz 644899 BLAKE2B 7aa188bc5eaf1f1781735416152a9324a2945f10b2c1ccd55fa5a2b557c31e4bdad55d282c4efc0552dbf998db7193bc19ec0679034ec53cbd97f688b572f74c SHA512 dc4c4d364423cae52f95c4ad2d241e311d6947066c2a7b02b5754df2b69a7bb7aeed54d4515afe31b4437b8e47057e939e9444e7812ca0125ba3a8c65678d3d0
 EBUILD orion-1.6.7.ebuild 1048 BLAKE2B 3e3078f2d55514ac96928d982697e9b7e342709e242f6cd1d0ed3e4659878fa31d7169141468189c039e030dc26d3880986d6b43917bb5578151a2f01a8a69fd SHA512 11c13933d6598b859c6945285eba8e8adf4f1248bd6ca1d7e5e3b2fcbc6517e949b17e747f554993e2450b0b23232633c85be9a408d09f2cb0f6c4dba2590803
-MISC metadata.xml 574 BLAKE2B de16e0fa5f9fbb443c5218a093048811e4ad9e633ec0e23cbd8b00e5322f7709af121ff3fa8cc4ef9cbc164f84d57cbf9ce9c542b7753195f09735e859fb5a55 SHA512 4ffbe221d97a40411dbaefc31fad97978f2ae823d14e1fbfef1aa9d84697c9ea06f7d58c7174ff1daa3b8f64863d62350dc469414e0b55917a227e2953b86bc9
+MISC metadata.xml 574 BLAKE2B 494aba77b88c66e35f0fc59e2a188f15f50d678dcb155bdedd2590d44a2732ebd4554fdd483797ba316fdda3d4e25c1eceef4b0f2a2ad597c36e6d8d899d5dc4 SHA512 260fa2ae47d8d2bce4e6355d42ccf077ed10855c500eb8048fa6fc9b484260a53652d8432a3a9d5b3c1342c21915249e8807fb9594db85ad81d68bf4d259ab05
diff --git a/media-video/orion/metadata.xml b/media-video/orion/metadata.xml
index 9c91e6887c8b..6c00b2de8dd7 100644
--- a/media-video/orion/metadata.xml
+++ b/media-video/orion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 461d4183b54a..3ebfeb79463f 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,9 +1,5 @@
 DIST pipewire-0.3.18.tar.gz 1277055 BLAKE2B 4a18bd668afaf144d6e83590293a744b6d2c2a7d8e9fc6ab581f22d294fac5a4841098875f8569f36b794c083e4ec9f0b7d4e29a10dc79286a4843996f7fb64e SHA512 933b15908e30c389555dd9f82f87c2e571b4cb078bfbe5ed1858440166093cdee2b1c15da50bc5ab36087b62e216786b95c2aad9403e5047ae33e4fe8a6f4cc5
-DIST pipewire-0.3.20.tar.gz 1228482 BLAKE2B d5c51a7da984b075d4fd2504ecc2082527807a6319a42c44b09a687112c2ba10746a2554997e8f6fa36a06cdf5b94b4099adb1f8ee986673855db6e8e0356468 SHA512 7838cafe413e5082146e39a8d2cd29ec5193da68fa76c4d2b9390cbdf06d388c5a8b76f90fadf5f7ece4a8b1b86c3765b3fa968479f3bb9e11e84be006276c1c
-DIST pipewire-0.3.21.tar.gz 1243935 BLAKE2B b736a0253e8c0af96f7bdc47684d52bc8e70d4b2310b80a1b036ae3ef30fd042e1ad641aae342f9727b3191a38cfd36794879bf54954124b99984e2841aa7373 SHA512 cd1e7696c5712dfbd0f5ebffbb74f23ce5f6752744b062741546d55d524a4dca43776e1862fdc55faf5220c23f7ef9e0c5f9c3b1892a6b43ad50dfb99b9a66cc
 DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
 EBUILD pipewire-0.3.18.ebuild 3423 BLAKE2B a17234221cb84d36eab89a48f3dfe13a910bc02c67de3ab9462ad081d115922c53928cb0896393b7ff78a99447f588fbc9a31033e6048bbfb09a204ffb8d514b SHA512 1931d14b75e0e99ef4b7ff0d661a942dab3d8d9cb90e8dc6f5d723ece66824906c474aa40af6f03ab751db0356d9a36e336ad3b1aeece6bdd38276355f0b1d1d
-EBUILD pipewire-0.3.20.ebuild 3427 BLAKE2B ed91881ae1601a21ed6cd37b2f9bfe0115665fc7641556e82bb6909749897a05648deb4da277a56d4c33d984f608689b5e5a2bc2d219e8148ed87a0aefb41dfd SHA512 9d759021ed8c9e2827b2a42bce67d04346e7175792068730a4f69d25d527eda9a9e9d4c1b1ee41b80696274c007f28d089ca64954ebd956d34711da7d0f85d9c
-EBUILD pipewire-0.3.21.ebuild 3427 BLAKE2B ed91881ae1601a21ed6cd37b2f9bfe0115665fc7641556e82bb6909749897a05648deb4da277a56d4c33d984f608689b5e5a2bc2d219e8148ed87a0aefb41dfd SHA512 9d759021ed8c9e2827b2a42bce67d04346e7175792068730a4f69d25d527eda9a9e9d4c1b1ee41b80696274c007f28d089ca64954ebd956d34711da7d0f85d9c
-EBUILD pipewire-0.3.22.ebuild 3181 BLAKE2B 8e6cc3c81e908aebf9636f292dbd839c4ebe24c21b078ec28bdcd24aa5eead5e75e44e777af5716177c5dd685d4bc509ff230ce0070cd8904932a09426a164d2 SHA512 089d797a420d92a796cd9be7edc28854c43f8ddfde5466ba241bad7ffb19ecad0042e700d4264ced9b82566078b9b4d0a4136405570821b2e5c6af31f161cd67
+EBUILD pipewire-0.3.22.ebuild 3180 BLAKE2B a2c337f799010c37734af0fedd47eed02717e268c5cb2915516dc291f3d07dc70a9b97c868d1e124182fb8a27b20be7652461538e729ceda04da991e7c559ccb SHA512 732ff816b1ddaa2553c7b3d87938b38d17c10e66e0fff8674736d8e5175a4db8bf1002a12b962210bbfe8d71bd54064c17e1a4bc9e53c8b1ceb611d054855248
 MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/pipewire-0.3.20.ebuild b/media-video/pipewire/pipewire-0.3.20.ebuild
deleted file mode 100644
index c5f8c1bd95ad..000000000000
--- a/media-video/pipewire/pipewire-0.3.20.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.21.ebuild b/media-video/pipewire/pipewire-0.3.21.ebuild
deleted file mode 100644
index c5f8c1bd95ad..000000000000
--- a/media-video/pipewire/pipewire-0.3.21.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 fdf60d2768fe..ca830f18aed3 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/qmplay2/Manifest b/media-video/qmplay2/Manifest
index dea3ec38f00c..d3d402db390f 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,8 +1,4 @@
-DIST QMPlay2-src-20.05.02.tar.xz 1553364 BLAKE2B f436a8e970278d47ef1ade86d07fd3460c2628d7f93c238093425779f896c44b3e0c7b4c6a40ffc8b79f1749563016cb62ac853c94b236859287066bfbdbe59f SHA512 b587d80128c334450552b2a6f0fa4c7426409b4d7a7bcca2065f83eab3e2f8b7ecc0df92f50fa276f42c84a201222cae2dd7f5c3f4bbdabf321895212db936b6
 DIST QMPlay2-src-20.07.04.tar.xz 1552680 BLAKE2B cc53ef842f91312f72e8d347a2d6d2e4239fe9435d0b7ac39e47e9f1f48a9a570ce614dd496512079d3701e1823ab75123b40ad752fdd2348cdb7bc8de425225 SHA512 4a6316f03d1b77bcd6c08de0daefc3f29b4c8c575eae9f901951e2b43f2739904136b9455f567b66fc9a4e4c64fe92584608f1878dd8c30c0352ea9ee1e2e314
-DIST qmplay2-19.12.19.tar.gz 1285009 BLAKE2B e4f644513ac0e7d33574e4b1b157dfe775222df74ba5041099e9bcaa87f8b052880dfd2c19005380783d9ca7b2bdbf7aedb233e12e2af839d40af224981d593e SHA512 a03d70c5bd3b2644810b9ec5fd39bd0340ddcc460646228a2799053a27117a54ead09f046b58ff7e0ae2cd959a92980cf8336a12d49ef297e1de30dd32f604a0
-EBUILD qmplay2-19.12.19-r2.ebuild 3482 BLAKE2B 79cd37a3a6cf4298dccfe958f7a5d2dd39d28dbf07cf60dacaf90a3a750ca5d41261086ce28c5b3ca28acf733eee2bab18c22465c486b614c0791eefe4a5bd51 SHA512 5298d2fb7995031bb24657254dfc89fb3852e02458c9fee7fae621ee4d9852e5920bb4db5ef67d0a476b66f827ec51644c6c7bb23f84a380754b0d4597a63b71
-EBUILD qmplay2-20.05.02.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
 EBUILD qmplay2-20.07.04.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
 EBUILD qmplay2-9999.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
-MISC metadata.xml 1822 BLAKE2B d6c18ae3653d2a809609ed350c20796a690ecb69e5f3b9b06d134524596379f8ebfb565b22c584a3fccff153b0771ede17d67c91d029f6e26668ba91e0ee5d79 SHA512 5ed1acf242b8e02dd3f31564000b13dc91c9c25f750ba6f93a296e5fa9c83b48a0a6c92f868a5b088187870af8b3c345ab0c79935e8afcea7f86125ceed80afc
+MISC metadata.xml 1547 BLAKE2B bec5bcc60b7dc19bc1f0c9fbfdf86d7a62fcd5312fa8a5505727b38dce7be1d8fb909995555625373d4fb3ba3ea2019eed841113efdf904e8af46dfdbe5ff709 SHA512 c00d0c95211535d067c5f8ffe59b72e8c652f2194baf7178addfb5de76a051619a7b9983a0c175b393afb3a56e7c30f722abd29767ea7c587cfd0ad7733871bc
diff --git a/media-video/qmplay2/metadata.xml b/media-video/qmplay2/metadata.xml
index 0a9ff717a2af..dd91b14c1c27 100644
--- a/media-video/qmplay2/metadata.xml
+++ b/media-video/qmplay2/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>reagentoo@gmail.com</email>
 		<name>Dmitry Baranov</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>email@linxon.ru</email>
 		<name>Yury Martynov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -19,17 +19,12 @@
 	<use>
 		<flag name="audiofilters">Build with AudioFilters module</flag>
 		<flag name="avdevice">Build FFmpeg module with libavdevice suport</flag>
-		<flag name="avresample">Use libavresample instead of libswresample</flag>
 		<flag name="cdio">Build with AudioCD module</flag>
 		<flag name="cuvid">Build with CUVID module</flag>
 		<flag name="extensions">Build with Extensions module and enable other plugins</flag>
 		<flag name="gme">Build Chiptune with GME support</flag>
 		<flag name="inputs">Build with Inputs module</flag>
-		<flag name="lastfm">Build with LastFM support</flag>
 		<flag name="libass">Build with SSA/ASS subtitles rendering support</flag>
-		<flag name="lyrics">Build with lyrics support</flag>
-		<flag name="mediabrowser">Build with MediaBrowser support</flag>
-		<flag name="mpris2">Build Extensions with MPRIS2 support</flag>
 		<flag name="notifications">Build additional notifications module</flag>
 		<flag name="sid">Build Chiptune with SIDPLAY support</flag>
 		<flag name="shaders">Compile Vulkan shaders using <pkg>media-libs/shaderc</pkg></flag>
diff --git a/media-video/qmplay2/qmplay2-19.12.19-r2.ebuild b/media-video/qmplay2/qmplay2-19.12.19-r2.ebuild
deleted file mode 100644
index 62cc3038bdd2..000000000000
--- a/media-video/qmplay2/qmplay2-19.12.19-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-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/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/QMPlay2-${PV}"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters avresample +alsa cdio cuvid dbus +extensions
-	+ffmpeg gme inputs +lastfm libass lyrics mediabrowser modplug mpris2
-	notifications opengl portaudio pulseaudio sid svg taglib vaapi vdpau
-	+videofilters visualizations xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa portaudio pulseaudio ) )
-	avdevice? ( ffmpeg )
-	avresample? ( ffmpeg )
-	lastfm? ( extensions )
-	lyrics? ( extensions )
-	mediabrowser? ( extensions )
-	mpris2? ( extensions dbus )
-	vaapi? ( ffmpeg opengl )
-	vdpau? ( ffmpeg )"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	dev-qt/qtcore:5
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dbus? ( dev-qt/qtdbus:5 )
-	ffmpeg? ( media-video/ffmpeg )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	mediabrowser? ( dev-qt/qtdeclarative:5 )
-	opengl? ( virtual/opengl )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sid? ( media-libs/libsidplayfp )
-	svg? ( dev-qt/qtsvg:5 )
-	taglib? ( media-libs/taglib )
-	vaapi? (
-		>=media-video/ffmpeg-4.1.0[vaapi]
-		x11-libs/libva[drm,opengl] )
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	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_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_AVRESAMPLE=$(usex avresample)
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL2=$(usex opengl)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_EXTENSIONS=$(usex extensions)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# gui
-		-DUSE_TAGLIB=$(usex taglib)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# extensions
-		-DUSE_LASTFM=$(usex lastfm)
-		-DUSE_LYRICS=$(usex lyrics)
-		-DUSE_MEDIABROWSER=$(usex mediabrowser)
-		-DUSE_MPRIS2=$(usex mpris2)
-	)
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( USE_GIT_VERSION=ON )
-	else
-		mycmakeargs+=( USE_GIT_VERSION=OFF )
-	fi
-
-	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/qmplay2/qmplay2-20.05.02.ebuild b/media-video/qmplay2/qmplay2-20.05.02.ebuild
deleted file mode 100644
index 264d28c79f26..000000000000
--- a/media-video/qmplay2/qmplay2-20.05.02.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-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 portaudio
-	pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa 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 )
-	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_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
-}
-
-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/shotcut/Manifest b/media-video/shotcut/Manifest
index d9369ffa6e7a..0854864f9205 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -3,4 +3,4 @@ DIST shotcut-21.02.27.tar.gz 4101402 BLAKE2B ef5320fd9b353fed0b429763cf1fa57bfef
 EBUILD shotcut-21.01.29.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
 EBUILD shotcut-21.02.27.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
 EBUILD shotcut-9999.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
-MISC metadata.xml 450 BLAKE2B 979a125701ee0da3a2ead50518500e32a7d4bbd78f42069b268aedd5d1c933f2a10022d63b98e2f135a2e3156a6019d4b82da62394ebd8724d55001b7d470e8a SHA512 c742013bd49807786261384f73d9350962affba6d914a6dcb1542376b760fc7cfbb847ce38b281fde1b67ea3db3d299db235c7f9716b20426329c971a485e7c3
+MISC metadata.xml 480 BLAKE2B 73a38f8b538f121032bea4148cf2721020e4fd53c5e41479dc7163bd9f637edfdac5c5f67cca191d96af4159dc51567b1009122f9f6aa47368d66386d7410d3c SHA512 38373130a0ed4bf237232b7ad6fa0fa499874206ca0d50d1e44cb0b0ae115ef0b56104464732e7305a54d99485880d7e5a4d6466ddc54d516bc279632e2bd34e
diff --git a/media-video/shotcut/metadata.xml b/media-video/shotcut/metadata.xml
index f6e4473d5c5f..83c7ace698ce 100644
--- a/media-video/shotcut/metadata.xml
+++ b/media-video/shotcut/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>xdch47@posteo.de</email>
 		<name>Felix Neumärker</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index dab8ecc039d5..8bb9284a4aee 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -3,4 +3,4 @@ AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2
 AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
 DIST unifi-video.Ubuntu18.04_amd64.v3.10.13.deb 178800688 BLAKE2B b35f91e77514fcf0165298473be503f6d977cb9f8f53e88f5bb700a2c76a3636e2f475c93c395eab6af4a215074521e47e1dc2d868695c1de83968b64e157cc8 SHA512 58d03b1004ba6da58b52c20720137639167647539c135c71c6abb36b80e37c4f33f0d0ae4092f98858bed8fcb4a3c9f05cc2a0a25e96fee957da176b9b6801d2
 EBUILD unifi-video-3.10.13-r2.ebuild 1965 BLAKE2B 21f735f65e95f3d0f0169a7be009d43b9a1525318faa50d9639264bba9c23a119a3bedc255a1bc7881dc94cad9346decb3acdf473732ab87ffe75caa31d8dcb6 SHA512 5c0d9af2a50cdbf82029e1b6aefad026779592828ca99a1223b1602886b078bcf383197f4a1299d7ebffbbd74b67abcbac93f911a73170cd3ec112ec85e48b32
-MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/media-video/unifi-video/metadata.xml b/media-video/unifi-video/metadata.xml
index ee9a82ac4170..c67d4dcaca5b 100644
--- a/media-video/unifi-video/metadata.xml
+++ b/media-video/unifi-video/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Ben Kohler</name>
 	</maintainer>
 </pkgmetadata>
-
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index f7124b81fd3d..614820261255 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -31,4 +31,4 @@ EBUILD vdr-2.2.0-r6.ebuild 8161 BLAKE2B ec2b998268125743b19d22d94262d2082b66e20d
 EBUILD vdr-2.4.1-r2.ebuild 5767 BLAKE2B 2340c0841188d28d825271b8a291d0c97171facc8fdad3566b230e6eff94e70dd41d0f8156445131ec9e0be59a53e9b70cf4a7e74212616e1046c445139bb7f3 SHA512 b6e44cfe1de02f2aa02001bcb78c478b98bf675b8164569615ddd9ddba1afda0f2c40cbb4008b6b59555151a9e89d10052dcb9abb92e9b1a8dcd1a4c2b2b5647
 EBUILD vdr-2.4.1-r3.ebuild 6092 BLAKE2B 222efc8feee22c150c1c8a2eb395bb0f33cb59c7dedaf7f2a12734f05dbc39bd97764174d1352afc661e48d90bbb372b1d608caad9034814d59dfd960460dffb SHA512 509e606bff521f2f33f93a98e69d8dc1a40b834cdadc1b8b70f22898446ab38b046258221b1e5e0a77c972f555c7cb14b06f266074ba2b36cf4411a59ca112aa
 EBUILD vdr-2.4.6-r1.ebuild 5994 BLAKE2B 32fed77708c0df98811c1bc5552abe90d824c013ea5e94225444c434110e38d0f01d2fcc2d161072caf76d60b6e8978c93cbb6c0163d11c6e7a9808f4c405995 SHA512 0f37bad860a11e80439e9f13424e4b26ba1846305bd9e48b5d93b74488ca656b9a39dc221cd1c0571944b9e0753bd630255ae94a2ea544f799a227675a7bf7de
-MISC metadata.xml 1862 BLAKE2B 7dc6b96c3e05f9e4b34e6c2eb755e7326b5398e16ebee51768676003127becae8cd744de9a749b529452ca262caf4ccda9889d169297a0cf2134bdc2e22ca439 SHA512 3272e780bac7ae35449902621e7ff7ed7da099b9633d7cb47e6a2f6708cf069c220b5d67f6be3092459cbb254931f52b2e4d9b08f983c6b8841b74ae7239b1b2
+MISC metadata.xml 1892 BLAKE2B 2a233ceb745f8df9350e37d99d8dce2cc56d3c21e0d187de483a2d2d18c0129a047d48cf7cddff7ea2500ae044d1eb196efb508cce0424368e03bbddb75c6d82 SHA512 dba266e22f0d99b98284db088beaf4fbd288cb8eee046a5f96610ed6cd748a116a3ced7ce74c69660d9943a7f7ccc016ba8a242174780275334b95a1ad4489c7
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index eea6df4fdb23..9343c3d544bb 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -5,11 +5,11 @@
 		<email>hd_brummy@gentoo.org</email>
 		<name>Joerg Bornkessel</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index 584b37f22bf5..a9aea95c0a26 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,3 +1,3 @@
 DIST webcamoid-8.7.1.tar.gz 8900338 BLAKE2B f379811cf9e44e67caa80c301c2774f13c686fa4721b5adc85dcd803ea97edb07073e53575c7dae8dab4ebfa0a9ee4f3691511cc7ddd6b55f84ae2cc77cd3c52 SHA512 b9a4b1dd4c863ab126e304eabce47c025ec0e3eb85a5b42035d26caa004399bde733913c0a5598ada3deb01673bd42ea54c9d2b06d300608582e63dda75d9bf6
 EBUILD webcamoid-8.7.1.ebuild 1586 BLAKE2B 1e4d64b0bcf3ccab556890d5e1b4d05e57f7e7a52af1d2752a850f274a7b5686db1adf530705b05ff45f408724c3a62841aab96522b51351166dd45dbc7f1f96 SHA512 3527d48529234811384c36323290788cadd0a610ff53fea24d8defb36c8f031880f8fdc9fd6a12ff3406905386899aa07eb352de4c9f3f543ab9cbdec0b67fb4
-MISC metadata.xml 585 BLAKE2B b32bf34b5d97dea85aa3092844f169264dadc564fdf32aa509a530188e4a83ac71646d7e8f5e1da191a6cceb1bc13e04ca972b421ac59bf3e0479c6da4e594be SHA512 e5ec23053db9318e5cda75085882ddecd4ee53753c1d0e0cd39dc7edcc0b2eeed7cd3b71c2afb580943de1b476af3dde4ae1b607f66fa481dd8b65910ff3b0fd
+MISC metadata.xml 585 BLAKE2B b14cedca2e5ef031571c1e3345b42b43ffaaf0ec4a5433235eac523d885fe9a3199a02d37890955d06e00f5e9f2fd007a325c47425e83404aa4fdd97af3ce683 SHA512 6af635fb163a73a42538bb2c9c893f04f98c0ef3bd746b54d3efac4640bd14ed999c11bab2734d0cb86c96de3b66046952dc6594cedad70352b6f35b95ea1242
diff --git a/media-video/webcamoid/metadata.xml b/media-video/webcamoid/metadata.xml
index 6c1928478f40..867cc541597e 100644
--- a/media-video/webcamoid/metadata.xml
+++ b/media-video/webcamoid/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index b8f0f5b55308..c41133dcc41f 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,3 @@
-DIST yle-dl-20201022.tar.gz 63423 BLAKE2B af79aa27528b9cfafcf297497fe5711d7c9260c5fd245bb556ff340bad3938bf48dac74e1875ae2013346c546d3dc745b2c552b1c32c15cc47106183a6d8cb82 SHA512 14d1bb7e814355dad48a02c240103baec39d831de9a08fb8f1eecdeb13522fd55d891bc519d8303dc156f2b0e300a7c8c4a42feba29b3d7c80c906edc9aadc89
 DIST yle-dl-20210212.tar.gz 64609 BLAKE2B 1cffaadd6c5628e0d2b2a02cda2c6a98939c0c92e9efda7a6fd0dc02c65f7e0b3a5de6d705143d4dbd1507bc8733d13dd9b0547592c86f6168de63d0fb73463a SHA512 cdef7ff929d3dacd8b599644b46d784412b232f64e3ba2f1d6d2338c8350d38e0ae089e2a79bf12a1d39311daff60a062432b945292c1728b310af3b3a68a98b
-EBUILD yle-dl-20201022.ebuild 1464 BLAKE2B 5dbe2ad03f3fe508e8d27c24e00364e66e23df2a066a414496ee0b730c204ffec972020f7ae81d74449b475c19465947209066e5e8c523151da0bc4809e20d14 SHA512 f67237c916ad8b5ec03578475314fb6e7710382fe7b5ac65840c50889dc1a1a0dff8f751bfcd2bb8a383aedd0b10c30452cd75398697f5d45b05c40bfe1d0444
-EBUILD yle-dl-20210212.ebuild 1503 BLAKE2B 21d0a060a45b8bf59608ac148165ea6e6e257cb046abe9c0c03d61fc595a39f629aa2d76f9985c07164e353d014c8c9c8cc492217f71b25618eed40f3513dc33 SHA512 63cd6b7a43e33d79138abc10aca82990304c749676280fb8411dfbcb30ed191d11c86c2d35d7617b0d54d3b7e870b0bc80042c57d1443be1d77156cf601a1920
+EBUILD yle-dl-20210212.ebuild 1501 BLAKE2B 360b6015c19b751e08d2e38f47274c10267e92014f4d8811874f6cea3ef693093a5245a9c756582725056539dd70a5a5989f40813e3b1a386b7e1bfac6e9a5de SHA512 e3937167bf0c32b7997da501d68fdf9fad52a1c74fd8d4cfc4255dae6f5933ad1b39bbc9a2fc040ada322b3ac55dc478f3f59d9f7ada8cc1cc35f8c6f02df782
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/media-video/yle-dl/yle-dl-20201022.ebuild b/media-video/yle-dl/yle-dl-20201022.ebuild
deleted file mode 100644
index b1b101098ab6..000000000000
--- a/media-video/yle-dl/yle-dl-20201022.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
-SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Requires an active internet connection during tests,
-# FEATURES="-network-sandbox" to test.
-RESTRICT="test"
-
-RDEPEND="media-video/ffmpeg
-	net-misc/wget
-	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/progress[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-		${RDEPEND}
-		media-video/ffmpeg[gnutls]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests setup.py
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
-	distutils-r1_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: "
-	optfeature "youtube-dl download engine" net-misc/youtube-dl
-}
diff --git a/media-video/yle-dl/yle-dl-20210212.ebuild b/media-video/yle-dl/yle-dl-20210212.ebuild
index fe8df8d34f55..5aa66d814d1f 100644
--- a/media-video/yle-dl/yle-dl-20210212.ebuild
+++ b/media-video/yle-dl/yle-dl-20210212.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"