gentoo resync : 31.05.2021

34 files changed, 584 insertions, 243 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 89b585a4cec3..dfbb6a6aa16c 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dirac/Manifest b/media-video/dirac/Manifest
index 9f36f0a0e046..0984384cf6d8 100644
--- a/media-video/dirac/Manifest
+++ b/media-video/dirac/Manifest
@@ -1,4 +1,4 @@
 AUX dirac-0.5.2-doc.patch 2304 BLAKE2B 1753b2645553deac3479ffc776eba95e9c100ce2d1ee18fd5a43af1d333608ac1df885ff6d10954414357b0cf76110c101d246d9ef66e7691bf4ff03a9387ea1 SHA512 1cac4ce26efd5f28b1d671258d5b8b0612815ac41dff230eda0db2c3a0f7414e2266ed1f92de728c97c40319e5d035f42fd1882233f85e3ccfd83b36b84ac099
 DIST dirac-1.0.2.tar.gz 918366 BLAKE2B 16fb215958e0d772c0c7a89ee25603b25115b422a2e669d3256ea1384b5376e4df2bbf3303000ff26f08c3290a96958ace3391898bebe086b29116cf04180046 SHA512 71d49fe17da4069ea28581565d5a4c4f64565848b51d04b39a646bdaa9afc899a265e9ace34af57fba64b03562e8c2259f882f6f17c1e49d1057cd8e69d1250c
-EBUILD dirac-1.0.2-r1.ebuild 1453 BLAKE2B bbf6238fc5bfa881f0f43d49fb3b9b8bcc1f80aa127018ea9b5302ee9b54f945bddde0afbff180f5c75e33834c3145e0dd32b2ed0fa141d1ad8bf53c0a6bde0d SHA512 c7ee9ce20888bfea473ee2ab7a99defe84f331aff5b82fa4b13d6295c2a9e81c57d16c0f1731b1cfea9e460d1d7841c3badd0b336bac549a3f578d8e02e68d8e
+EBUILD dirac-1.0.2-r1.ebuild 1460 BLAKE2B cc5c935962dc19f88e87dc8ae32923fbd4d7e9e74096c75b23624ff704998064d2f80f1bc65263b4d1c3863b979e4e74d3273f7f744d4ca5363c825f9ec36d3f SHA512 02b75487780b3e69127742c0bc50bdc06208e429c2872213ca88228d1799891ffc4ea49ffd9e19ee613c2f593777bfb4a3736d8eb9beb189b9c9f65507bbe1cb
 MISC metadata.xml 298 BLAKE2B f1f8662f90d8bb126d611299d7b184d5b0d4fe7ca39415c7a1e9aa0f87f911469f7d423fd4f77c29e6734512131971a062b4eaf41ef2fed46f9e10b82aea3e84 SHA512 af4dca87e12f4378990ff854d7f6ad5af7ccc083694a3ad34521dece8cc740508aa2cecaf6ab8aae3cac66069ba9d6becc5fd7e0856af532a5011db50041dff6
diff --git a/media-video/dirac/dirac-1.0.2-r1.ebuild b/media-video/dirac/dirac-1.0.2-r1.ebuild
index e2ed5bb1e327..a7b84f26f577 100644
--- a/media-video/dirac/dirac-1.0.2-r1.ebuild
+++ b/media-video/dirac/dirac-1.0.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils ltprune multilib-minimal
+inherit autotools eutils multilib-minimal
 
 DESCRIPTION="Open Source video codec"
 HOMEPAGE="http://dirac.sourceforge.net/"
@@ -51,6 +51,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 	einstalldocs
 }
diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest
new file mode 100644
index 000000000000..65d681babb72
--- /dev/null
+++ b/media-video/droidcam/Manifest
@@ -0,0 +1,4 @@
+AUX droidcam-makefile-fixes.patch 1830 BLAKE2B f1a5c48b36160797c3f75b54620b673640a4bc41178a43bd3ffa80d11068afb2b683c29169b5158db03b7851b0ca7fe890239c844d6885d2b79c7b203d8861d7 SHA512 522a15aa19d8e2fe55d078558f530015919f21e438a3cd5e424ef460c62a5fbb8745ede24e76852d84ac5e0ca00bd8fbeec3b9ef05d891cade574cb6de017756
+DIST droidcam-1.7.3.tar.gz 83146 BLAKE2B b79d210a7d6a3cee7322b373cd92b2c1a326dd9887dff1df752e9818f9e7ed88dfdfd4a33a22ccb39c601df81c4e9538b1efa8029a9ad56f39d400fc50bc746b SHA512 39d6947b66f1be7896c56aa01d471cbd025deaeb2d2359f9434e5ea91e4302f4c16ee31486bb04fab1dfc7f6d8b2de3f6800ead665b7b3d366b01b25297beaba
+EBUILD droidcam-1.7.3.ebuild 3015 BLAKE2B 2d2104d1dec0389fae851e9a9b84e103f84355194b9aca64b0e3707ce36135b9206b798a8035475f6e1cd6a5a13abea83a1c3a983fb18bc392c593f956af2d63 SHA512 fc44d8d9b5c1b2beff2b2182aefd5c0884b403c94cf14c85164760530b89649b4da3035fb9df65d9af1260f5e99da75f021c4c72613434555bf4a318d4512f25
+MISC metadata.xml 1420 BLAKE2B 5169fa76ab742c2992797bf82e8f4a783134eddbb11c00d21c18b5d271bafdce6501ef31c35f461836081014ddf444070e27bf94e45a86d8f912bbf0519ca5ce SHA512 344a159166adba2beb80621d1d798038646af18878497b03e46c9458d306b1615e8feac8fad8be502474919da00cb550cc74499967f74157ce1b6a717eb0a8f8
diff --git a/media-video/droidcam/droidcam-1.7.3.ebuild b/media-video/droidcam/droidcam-1.7.3.ebuild
new file mode 100644
index 000000000000..9ac87c8084a8
--- /dev/null
+++ b/media-video/droidcam/droidcam-1.7.3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop linux-mod xdg
+
+DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app"
+HOMEPAGE="https://www.dev47apps.com/droidcam/linux/"
+SRC_URI="https://github.com/dev47apps/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk"
+
+# Requires connection to phone/tablet
+RESTRICT="test"
+
+DEPEND="
+	app-pda/libplist
+	app-pda/libusbmuxd
+	dev-libs/glib
+	dev-libs/libappindicator:3
+	dev-libs/libxml2
+	dev-util/android-tools
+	media-libs/alsa-lib
+	media-libs/libjpeg-turbo
+	>=media-libs/speex-1.2.0-r1
+	media-video/ffmpeg
+	gtk? (
+		dev-cpp/gtkmm:3.0
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
+MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
+
+CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
+ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
+
+PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
+
+src_prepare() {
+	if ! use gtk; then
+		sed -i -e '/cflags gtk+/d' Makefile || die
+		default
+	else
+		# remove path and extension from icon entry
+		sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' droidcam.desktop || die
+		sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
+		xdg_src_prepare
+	fi
+}
+
+src_configure() {
+	set_arch_to_kernel
+	default
+}
+
+src_compile() {
+	if use gtk; then
+		emake droidcam
+	fi
+	emake droidcam-cli
+	KERNELRELEASE="${KV_FULL}" linux-mod_src_compile
+}
+
+src_test() {
+	pushd "v4l2loopback"
+	default
+	./test || die
+	popd
+}
+
+src_install() {
+	if use gtk; then
+		dobin droidcam
+		newicon -s 32 icon.png droidcam.png
+		newicon -s 96 icon2.png droidcam.png
+		domenu droidcam.desktop
+	fi
+	dobin droidcam-cli
+
+	# The cli and gui do not auto load the module if unloaded (why not though?)
+	# so we just put it in modules-load.d to make sure it always works
+	insinto /etc/modules-load.d
+	if linux_config_exists; then
+		if linux_chkconfig_module SND_ALOOP; then
+			newins - "${PN}.conf" <<-EOF
+				v4l2loopback-dc
+				snd_aloop
+			EOF
+		else
+			newins - "${PN}.conf" <<-EOF
+				v4l2loopback-dc
+			EOF
+		fi
+	fi
+
+	einstalldocs
+	linux-mod_src_install
+}
+
+pkg_preinst() {
+	if use gtk; then
+		xdg_pkg_preinst
+	fi
+	linux-mod_pkg_preinst
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if use gtk; then
+		xdg_pkg_postinst
+	else
+		elog
+		elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
+		elog
+	fi
+
+	elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480."
+	elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf"
+	elog
+	elog "Links to the Android/iPhone/iPad apps can be found at"
+	elog "https://www.dev47apps.com/"
+}
+
+pkg_postrm() {
+	if use gtk; then
+		xdg_pkg_postrm
+	fi
+	linux-mod_pkg_postrm
+}
diff --git a/media-video/droidcam/files/droidcam-makefile-fixes.patch b/media-video/droidcam/files/droidcam-makefile-fixes.patch
new file mode 100644
index 000000000000..c413d7edd11c
--- /dev/null
+++ b/media-video/droidcam/files/droidcam-makefile-fixes.patch
@@ -0,0 +1,47 @@
+diff --git a/Makefile b/Makefile
+index b5f696c..bcb5800 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # Use at your own risk. See README file for more details.
+ 
+-JPEG_DIR ?= /opt/libjpeg-turbo
++JPEG_DIR ?= /usr
+ JPEG_INCLUDE ?= $(JPEG_DIR)/include
+ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+ 
+@@ -16,15 +16,15 @@ GTK   = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+ GTK  += `pkg-config --cflags --libs appindicator3-0.1`
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS  =  -lspeex -lasound -lpthread -lm
+-JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
++JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.so
+ SRC   = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c
+-USBMUXD = -lusbmuxd
++USBMUXD = -lusbmuxd-2.0
+ 
+ all: droidcam-cli droidcam
+ 
+ ifneq "$(RELEASE)" ""
+-LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a
+-SRC  += src/libusbmuxd.a src/libxml2.a src/libplist-2.0.a
++LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.so /usr/lib/x86_64-linux-gnu/libavutil.so
++SRC  += src/libusbmuxd-2.0.so src/libxml2.so src/libplist-2.0.so
+ package: clean all
+ 	zip "droidcam_$(RELEASE).zip" \
+ 		LICENSE README* icon2.png  \
+@@ -40,11 +40,11 @@ gresource: .gresource.xml icon2.png
+ 
+ droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS)
+ droidcam-cli: src/droidcam-cli.c $(SRC)
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
+ 
+ droidcam: LDLIBS += $(GTK) $(JPEG) $(LIBAV) $(LIBS)
+ droidcam: src/droidcam.c src/resources.c $(SRC)
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
+ 
+ clean:
+ 	rm -f droidcam
diff --git a/media-video/droidcam/metadata.xml b/media-video/droidcam/metadata.xml
new file mode 100644
index 000000000000..59c13c93d8bd
--- /dev/null
+++ b/media-video/droidcam/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<use>
+		<flag name="gtk">Build the <pkg>dev-cpp/gtkmm</pkg>:3.0 client.</flag>
+	</use>
+	<longdescription>
+		DroidCam turns your phone/tablet into a webcam for your PC.
+		Use it with chat programs like Zoom, MS Teams, and Skype.
+
+		Main Features:
+		– Chat using “DroidCam Webcam” on your computer, including Sound and Picture.
+		– Connect over WiFi or USB cable.
+		– Unlimited free usage at standard definition.
+		– Keep using your phone with DroidCam in background (Android).
+		– Simple, safe, efficient, and trusted by millions of people worldwide.
+
+		DroidCamX Pro Features:
+		– Switch to HD Mode for 720p/1080p high definition video.
+		– Camera controls: toggle light, enable continuous auto focus, zoom in/out.
+		– Rotate, Flip and Mirror the video to better match your setup.
+		– Adjust brightness, contrast, add video delay and adjust audio volume (Windows).
+		– USB-Only mode for extra privacy and security.
+		– Option to auto-mute phone calls.
+		– No Ads.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">dev47apps/droidcam</remote-id>
+		<bugs-to>https://github.com/dev47apps/droidcam/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f45b54d3e0a1..d743904d5f2b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,6 +11,6 @@ DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd2175
 EBUILD ffmpeg-4.2.4.ebuild 17661 BLAKE2B 4366ffd59e87da3187e619af6ad18b467f2991b53a229d05dd20ca6bfae9093d95ffcfd2eecabc542095cce2b182d03ae6bb2c682d8c9c76a23b9e557174403f SHA512 5b098a52a368f635aebf1d302ef9b84162e251d7aaf9ffe23963eeef731b92be3d397cf5f70f1f68028fc847a3ef4323c916d6c650a753e875725998fb4196ab
 EBUILD ffmpeg-4.3.1.ebuild 17765 BLAKE2B facecec39439dc19a9c2611cc3e902a84401b0ed8b5bcbb827fa38aaba7370f1ca21d4a8f1d4e22a2f9d8297b9024fe5dd654871968b4fb6589a03d69144a75d SHA512 411583535f592af3efcae090f0d820763f27f27b146694f55b1fd5798939463b2fd032801a9b3b14b5e6ce0fe89213bf5523e1c447af65790f5f565931814a5d
 EBUILD ffmpeg-4.3.2.ebuild 17748 BLAKE2B 49fb8aa388f9e2c999deefd0ab458f2c1d985bd0ab339bf60e07f2e96d1f5f0d6508d34980ebddc0347621ff49c0ca357ce535e4e76cffe27e861f2c5d43143a SHA512 858df025f7cfe5be9b318c1c51d23c2ea979cc1e699fd3f15c5a406f8464c06edb165bb586882a49bbb6d6704d4d6f4f0ad44afab67913f3ecd2bea86499d98f
-EBUILD ffmpeg-4.4.ebuild 17647 BLAKE2B f3f649c35d91f7953d8f74f2b65022ffdb398689cabc403cb8273e87077ee5b5d8d04bbbd9704b52ebab9816e45e5bdce0989fb4f02c47a137339f3f6b1195d4 SHA512 93ea1c9637c03fc95f01d125be888806e7d24782352d716b0877db365ef2732a7682422cb769ddf7ce8a3fec07882b1f40bd9525be019849fc151ea77f03816b
+EBUILD ffmpeg-4.4.ebuild 17791 BLAKE2B 5e46e7614814e9e04817f5a61bff6be7420b8fae665d6e244487980a4d1b51daa5f5fa7fb28e29d3b834175d81485b47cfb82ba1d7f9043b98ea7054d40c98c8 SHA512 fcb5b19cc0bfdc3979fdacaf14627d9cad44091c0499f498d7b4c685d9ce163f79e148b508b009658f1c53c4af89e47e075c16e58f5c1b0abb9d3626078ef5f7
 EBUILD ffmpeg-9999.ebuild 17604 BLAKE2B 1d4741e290c75ad74b280020b2add43038dfb30627f3919d2458949ad99337d3d83f412695184cbb21cfa1cd3d834a84cd0acd7cc296c2085d6d482c13145edd SHA512 5497138d8204ae86a1dccf38d62cb9fd9ece00ca56056997efc1bd0c0bab3a7a7d8a2a017613b343ec1127c08522a33414e3dc245f8cd7ad0d833c9d2791ba40
 MISC metadata.xml 5955 BLAKE2B 59329980a1e72c3899f09ddc2ac217aed5c540e91c1f1e0636ac2f84986e20ea7cdd0e07c9e350aed664933a4b02cfed2001bcd1e47723fba913b24b0d35b3aa SHA512 9c4d77572b982475313acddc8cd0df16a121d3a5363335d4d2a1e3021b3dd4bcda5efec9f4a913349efc532919441852dfa702df22dceda62d6f8af5fd491666
diff --git a/media-video/ffmpeg/ffmpeg-4.4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.ebuild
index 111ef05ca3d1..aa2fd13df6eb 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.ebuild
@@ -451,6 +451,13 @@ multilib_src_configure() {
 		$(multilib_native_enable manpages)
 	)
 
+	local extra_libs
+	if use arm || use ppc ; then
+		# bug #782811
+		# bug #790590
+		extra_libs+="-latomic "
+	fi
+
 	set -- "${S}/configure" \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -465,6 +472,7 @@ multilib_src_configure() {
 		--ranlib="$(tc-getRANLIB)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--optflags="${CFLAGS}" \
+		--extra-libs="${extra_libs}" \
 		$(use_enable static-libs static) \
 		"${myconf[@]}" \
 		${EXTRA_FFMPEG_CONF}
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index 3d459d052f9d..16c3b7917373 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -6,6 +6,6 @@ AUX kino-1.3.4-libav-0.8.patch 2622 BLAKE2B 7345a43a6bfb6473dda9899ab675426db102
 AUX kino-1.3.4-libavcodec-pkg-config.patch 451 BLAKE2B 87a6292a89627000437c07e60a39ee743e08e88e736e91db2728a19653c6d0eba22b3883e99e6c54f14b6f1262227aa883c067cd577eb69eef66caac3ee49339 SHA512 4351560f26ea47f3122ac5a44bea48eae48b8efcc6ca10e72adb31ff5c535ed17e7324444bd03a29482351c3100b07a4305f092c687f18d56f813839332f5847
 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
+EBUILD kino-1.3.4-r1.ebuild 2717 BLAKE2B 2ea6b94417da908dea197a9eab7ec90aa530581d0cdb10cec6c0f9f36f5b39c916bb0469536bf6c002eb6b9953496a343bc40771cda83eab54db570ccdf2c2ee SHA512 a42ac8d79175aa54c477d513ab92ccbb74751f81b505c39a9de3413b4b1ef9e4954703477ab6510ed1df58bcf1881c34d67f6fb7e120c43305ff1aa794c4ff54
+EBUILD kino-1.3.4-r2.ebuild 2762 BLAKE2B 8adc1d2a99586aad9a0ec335c270a65ad961f907aef5aafc7487c5fa0eb6fcebf31c6a3f72bd9adecf78141c32974df34edd99bc7cee93e9005cbf12f153528a SHA512 9d4d3e4aa98981c9d4c573810c8ddf6d59b6b64920988a9439cb4c86ce1f63c96d7850242aca2993be9dd6e71b0fb3e0e37115242202d9af7a458d1a6092a7d6
 MISC metadata.xml 439 BLAKE2B e5c5ba3dffa41f889738582a879e23b49a17ca31787c5461a6d136317d3fce8d1df4cc29657eec57af00ec8d810e52ad0a125cbd5b378fc1de63d018696e932b SHA512 b6c464f30ce0e75cad151021288fbf2e2fa360a978b707108eb39e23bb15d3d91212abbb23fa181c97959bd80ce519e4f26bf59c6a22a99ab19bc5051a0746a4
diff --git a/media-video/kino/kino-1.3.4-r1.ebuild b/media-video/kino/kino-1.3.4-r1.ebuild
index 77e78c8d8e24..bf3def0c1018 100644
--- a/media-video/kino/kino-1.3.4-r1.ebuild
+++ b/media-video/kino/kino-1.3.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools ltprune udev xdg
+inherit autotools udev xdg
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
@@ -99,5 +99,5 @@ 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
+	find "${ED}" -name '*.la' -delete || die #385361
 }
diff --git a/media-video/kino/kino-1.3.4-r2.ebuild b/media-video/kino/kino-1.3.4-r2.ebuild
index da4e9f6edd09..2d5b56e858fb 100644
--- a/media-video/kino/kino-1.3.4-r2.ebuild
+++ b/media-video/kino/kino-1.3.4-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools ltprune udev xdg
+inherit autotools udev xdg
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
@@ -100,5 +100,5 @@ 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
+	find "${ED}" -name '*.la' -delete || die #385361
 }
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index ae3c7b758333..b64ffd284305 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,4 +1,5 @@
 AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac528dda0227ccf2baf3732239b481ff6007bf5a8ddd9304dd7c2faff149f1cfbdbfb194eb30a3b19eea0803f10734572421 SHA512 d9a72bb0b8fc7c9915e4efa1e9758d4f9d6b68f1ad6ef9898dd0b5e693c8e1236b37fc97a9786c233f8909417309ea6bb9c1fb71054818f31eeb4c43faa46a06
+AUX mkvtoolnix-56.1.0-optlevel.patch 607 BLAKE2B 62c3ef3717a54030b1acc586e9468f4d8d783755f7762ccebe18b0f8b0214268477a5a218b2fc02f3e2f770664507d43119f13046a31c94f865f01d0000a8a68 SHA512 b8eec05844aa8ef4f27416a78f5231496e34a112126e8ef403d18cab26b94756bd60323b51cf0d59a5a44d7b379bbf09f6b7b1b7e29b9282a0a2e82a5b3f325e
 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
 DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8 SHA512 dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d
 DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739 SHA512 33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d
@@ -6,12 +7,14 @@ DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 2f1266a3c4117b8369b361e92728d0b19a
 DIST mkvtoolnix-50.0.0.tar.xz 7559852 BLAKE2B ffcc0c608915d32d20fc823208857bf54dc3d645d56d3b8b9f7e33b213ce5046b977b6f3de41d1b779d958d6ffc8578fe0cbac41d92d88bb4c779363739ee437 SHA512 ef0c6f4be768e32e3b0887c17d77f8441fd1b19294120c043dd9b2fdd9b76357bea721a156c3e99e0677d2e83dee92ea776df906347a0d44acbc2631b66c73ea
 DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69 SHA512 2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
 DIST mkvtoolnix-56.1.0.tar.xz 7632872 BLAKE2B 805ddc9fadca4eba2ea4f3d8371f191c20ab6ca74c1564a216f1c001d272d038ee9622a562034b4584e118859a24cdcf36840e9e0bf7d5f2cc9893b91cf1c29b SHA512 7ee1c580c5b8824491652571f30559829700e50b1a74cf92affba77154c2756bd613cfd5776cdd180d1eaa888949ca898caac1bfadc690c68086fb136d41b2a6
+DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
 EBUILD mkvtoolnix-37.0.0.ebuild 2633 BLAKE2B 4bb1bc4c3defb6dfd672ca24322f9c220155b29ee11a355720de0aea495b9dc5d9a9a21f76c75bf7a91df8d96ed52850ac8e8b371efee6a4fbc9eda4770b0028 SHA512 22ec4a4753909bd92426841c2e2025ace80b3bc6de57e00182c67ab1c2bc8d1e7d03acd0312123f6979b09f6756ecb511ec1f2f97b6e939a591476a03f40bc7b
 EBUILD mkvtoolnix-47.0.0.ebuild 2708 BLAKE2B fcae224ed255e1e3ae82e78d901b14e7e230fc9ac77d02901df03b9ca3f866af9695313ac1337ccf3f3b2480c7f71639926b98422388ec8c033d2146a3bb5ebb SHA512 aee260c756079917131a64721a109b65358081f9a5eb2098034e15fac7f601b69e35811efd28da20c601765505194a8d1f30af2aca66a0ccbe0292ab8152951f
 EBUILD mkvtoolnix-48.0.0.ebuild 2704 BLAKE2B bd58d60ce6c5f1d4365223b149790fea8558ec0aa458d0b21e08fe144d3140c3a3d8ea8f477ebe016da21b2db538eb4a21b31c10d6946718189d4de6d6af572b SHA512 754cd160947385bdc5e8cd5cc66bc2140c7706848b35baa2e9ec9b5f13017fa807c6c97d41609bcfe874a848a73df94b3c4998e97260c0e37a2368871f894a52
 EBUILD mkvtoolnix-49.0.0.ebuild 2813 BLAKE2B 3d6f8974419ec2a24030ddfb9bbdcb83b8d408dbe74bfe6516762738d8b4bb115e648518b6130f3aec14ee327ebc10eb576fa964b02699c94d9a76f1e7ccfe8a SHA512 b866c1f585b5fe1ce3d014236a4b139b0d394de0b7eb2b15c2c0ce338a319cb5b0f344ef0c41d0f259f671f9537358b7b485d265830293778a3e3f5ae2f70f02
 EBUILD mkvtoolnix-50.0.0.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505
-EBUILD mkvtoolnix-51.0.0.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505
-EBUILD mkvtoolnix-56.1.0.ebuild 2925 BLAKE2B d9584ae4c8c9fc2b15b8542d7d315711e92a683224c18069bf5383efb307ede48b5f233eae69184fe08ffed471fe2f6e6b79c9a311173ecc22e193a8bb15297e SHA512 f67f7cc9d7a1258fe2942a650047e5a1ffc061ef09379dcc98cfbae29fb93709dbc35ca4042fddc4ffd46be35d0439dba5477e0522a09141331e6037f309cce3
+EBUILD mkvtoolnix-51.0.0.ebuild 2921 BLAKE2B e71d3e988f14a21595f8666f57d5eee063088dc708d787c707bef93e2fe8d8c86614e8c81f2542eb7b8b91203927b04ae44b5d8c95f8710884acde992f0da6bd SHA512 76409b23ca27bd4c9528c153d016c72bb39778c80ee3c487dd6d9f23c228b475df80fbc10b2b37ce10e0f131d4d6a33e6af77117f25488218bf5a3c0057a8e2b
+EBUILD mkvtoolnix-56.1.0.ebuild 2973 BLAKE2B d2c5a209bf16fac4b98a093e3cc5ac7b11f12707e648d5cabed8d90ea6431020cdbeac918a2b3c7d61ddebe6eca42499c038e3c6abfea2332cd4e952c1948370 SHA512 e64b0c432ebf47a4b40d201ff83ebec6723214d44d72d9ac8757ef176319579bfcbc841ba2e595bb8870735e8ef4f846fea8670e59498fc737dacdb0f362bd20
+EBUILD mkvtoolnix-57.0.0.ebuild 2973 BLAKE2B d2c5a209bf16fac4b98a093e3cc5ac7b11f12707e648d5cabed8d90ea6431020cdbeac918a2b3c7d61ddebe6eca42499c038e3c6abfea2332cd4e952c1948370 SHA512 e64b0c432ebf47a4b40d201ff83ebec6723214d44d72d9ac8757ef176319579bfcbc841ba2e595bb8870735e8ef4f846fea8670e59498fc737dacdb0f362bd20
 EBUILD mkvtoolnix-9999.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch
new file mode 100644
index 000000000000..c0f91deed696
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch
@@ -0,0 +1,15 @@
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a
+https://bugs.gentoo.org/786978#c10
+diff --git a/Rakefile b/Rakefile
+index 8c9487436ac627cc503e5f233d3f9c756f67fd86..ce564127eeb136b1c1784568ad68a4d593d0931a 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -355,7 +355,7 @@ cxx_compiler = lambda do |*args|
+     # Even -O1 causes compilation time & memory usage to skyrocket,
+     # possibly exponentially, with the number of entries to
+     # emplace_back() into the vector.
+-    flags.gsub!(%r{ -O\d+ }, ' -O0 ')
++    flags.gsub!(%r{(^| )-O[^ ]*}, ' -O0')
+   end
+ 
+   args = [
diff --git a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
index d84291b28039..d19aae2ddc83 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.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 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
index c093e341ab9e..dbc45d73af89 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
@@ -64,7 +64,8 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch )
+PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch
+	"${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch )
 
 src_prepare() {
 	xdg_src_prepare
diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
new file mode 100644
index 000000000000..dbc45d73af89
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dbus debug dvd nls pch qt5 test"
+RESTRICT="!test? ( test )"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	>=dev-libs/boost-1.60:=
+	>=dev-libs/libebml-1.4.0:=
+	>=dev-libs/libfmt-6.1.0:=
+	dev-libs/libpcre2:=
+	dev-libs/pugixml:=
+	media-libs/flac:=
+	>=media-libs/libmatroska-1.6.3:=
+	media-libs/libogg:=
+	media-libs/libvorbis:=
+	sys-apps/file
+	sys-libs/zlib
+	dvd? ( media-libs/libdvdread:= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+		app-text/cmark:0=
+		dbus? ( dev-qt/qtdbus:5 )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/utfcpp
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-ruby/rake
+	virtual/pkgconfig
+	nls? (
+		sys-devel/gettext
+		app-text/po4a
+	)
+"
+
+PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch
+	"${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch )
+
+src_prepare() {
+	xdg_src_prepare
+	if [[ ${PV} == *9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# https://bugs.gentoo.org/692018
+	sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
+
+	eautoreconf
+
+	# remove bundled libs
+	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+	# bug 692322, use system dev-libs/utfcpp
+	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(usex pch "" --disable-precompiled-headers)
+		$(use_enable dbus)
+		$(use_enable qt5 qt)
+		$(use_with dvd dvdread)
+		$(use_with nls gettext)
+		$(usex nls "" --with-po4a-translate=false)
+		--disable-update-check
+		--disable-optimization
+		--with-boost="${ESYSROOT}"/usr
+		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+	)
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myeconfargs+=(
+			--with-moc=$(qt5_get_bindir)/moc
+			--with-uic=$(qt5_get_bindir)/uic
+			--with-rcc=$(qt5_get_bindir)/rcc
+			--with-qmake=$(qt5_get_bindir)/qmake
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	dodoc NEWS.md
+	doman doc/man/*.1
+}
diff --git a/media-video/motiontrack/Manifest b/media-video/motiontrack/Manifest
index 508c9bdcb57e..8bc9abd1d016 100644
--- a/media-video/motiontrack/Manifest
+++ b/media-video/motiontrack/Manifest
@@ -1,3 +1,3 @@
 DIST motiontrack-0.1.3.tar.gz 136592 BLAKE2B 2dbd994404db3fce43d59c866951d809f87b1739f244dd53566d673073c7376fbb83aa727e503a4e28ee22b07cd3a5500f405530626ac724180f58a96366c6ae SHA512 edda7e6019aab95ed93ae82ac4a09a763442073ba0eb5e9476daacbfdd0421019a3a0fd99ee2fa0a1930c69925e1494a2e2954bcefc0865d9f1d2f84cec15c0d
-EBUILD motiontrack-0.1.3-r2.ebuild 928 BLAKE2B 414004dfdd62bc0cc213e0e163adab121469d582cd1162077b54c3d8861053e08d234207646300abee4603195970602edba93e2e08dac45ac2333e9de78f928a SHA512 98a940fd2bf2afe24a7810e28828635d21344d5aae0daf399cc3ea334135011c26cc987f0d3bb07d2b0f448c0292dbe205e37687389f85df5da6df47c4440abd
+EBUILD motiontrack-0.1.3-r2.ebuild 966 BLAKE2B 3ba441109bf13e9589a57327e8c0c139e557265f605889f45f2a7621c8ee5f56f90e3b7499177c2e524f4d46b03ebd95014a42d326d573f58097a6b102b5abf4 SHA512 ba8b7d4036af953f5376b517d36a71586e34909dec2cd4f8512c18152519e83ed816c79b60493960d637ba9a66026101c442fac69fa1efb1c2e0d5bafe071468
 MISC metadata.xml 435 BLAKE2B 6ae9a0fc5795b879c60d5a77678a87842a9c8b33605c07a2a2eae9f6bfebf14de033557fecb2bfebf61f897a4f2616160a1db241f19087ccabd830c4374e1a29 SHA512 ac216d99f9648a27fc5f15ed15df4d28c59e14a4a4662732fd52e75bb725841cfa4a04e8d001a6631f4182116b418ed57e7a3bb858f36a69b1a29326046033cd
diff --git a/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild b/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
index 36f69311536f..58f8ed1713af 100644
--- a/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
+++ b/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,7 @@ src_configure() {
 	# with GCC 5, bug 570352
 	append-cflags -std=gnu89
 
+	CONFIG_SHELL="${EPREFIX}/bin/bash" \
 	econf \
 		$(use_enable debug) \
 		$(use_enable !imagemagick gd) \
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index 37abc9e28669..8c3fd2ac6fc3 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,7 +1,5 @@
-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_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.ebuild 1241 BLAKE2B c04f2f037697f5ec8e2f923b2273c527a1bd6f319c6941c08d84238699c7316bf9f52cef49fe96e3a16b4baec27ecaec166c8938f00570a2789bc2d6a895fbff SHA512 90b6328561c3f5ca3c89ce2e480b18382db96ebdc15a0e187e7f11aed4290b7ab0aac2c27bca4320ef52f351f201afc09d78d857a3c902b491313b6dbe7885be
 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.4.4-r1.ebuild b/media-video/openshot/openshot-2.4.4-r1.ebuild
deleted file mode 100644
index 5d25848a8ed9..000000000000
--- a/media-video/openshot/openshot-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE=xml
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg
-
-MY_PN="${PN}-qt"
-
-DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
-HOMEPAGE="https://www.openshot.org/"
-SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,webkit,widgets]
-		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-	')
-	>=media-libs/libopenshot-0.2.3[python,${PYTHON_SINGLE_USEDEP}]
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-	# prevent setup.py from trying to update MIME databases
-	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/media-video/openshot/openshot-2.5.1.ebuild b/media-video/openshot/openshot-2.5.1.ebuild
index b8deb7a53509..0aa6f146efcd 100644
--- a/media-video/openshot/openshot-2.5.1.ebuild
+++ b/media-video/openshot/openshot-2.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE=xml
 DISTUTILS_SINGLE_IMPL=1
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 31f626c41487..f006dcc31203 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,7 +1,4 @@
-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
 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
+EBUILD totem-3.38.0.ebuild 2788 BLAKE2B a510d93af942297fe1dde5835caad6a2cd5dc04f90d7314f3d02dae0b64c3fb6fec45894034e0b958e3d6d6968852a0bae5b9b8609a9bd456d8c8b98e9d35fd2 SHA512 ddd5ea038d0e5158689ecf67998b32ad0989ea3f2fe69dc4b1bdc0a0fd6f43de7a21d2bfe65ce095e5678b576bc35d1c630ad3c69801f11d32f949e56011b944
 MISC metadata.xml 1017 BLAKE2B de40f52bc4cc3c838b473d4c444e9c41673cd3c2925f17508d03f5130fe237784d4ee4d02581718c06ccd30fa204d27ba7691fb8046009a540c00f3535f6909d SHA512 9b89a8eaa90ad2f55abf7a53bfba7c065be999233a7bbfe243f4514ca1c3ec5a3934f23ea8ecd6b2674ac82d5e55e2f3e25e3869a0cec019485c9bb99549b625
diff --git a/media-video/totem/files/3.34.1-gst-inspect-sandbox.patch b/media-video/totem/files/3.34.1-gst-inspect-sandbox.patch
deleted file mode 100644
index 01ee15f8349d..000000000000
--- a/media-video/totem/files/3.34.1-gst-inspect-sandbox.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2108ed8d025499fbf11dfe750ebc7617bdbb795a 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 d6f8b4290..c8db92335 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -2,3 +2,4 @@ option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', '
- option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support')
- 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('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 7a63bab1b..5c4ebb996 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.20.1
-
diff --git a/media-video/totem/totem-3.34.1-r1.ebuild b/media-video/totem/totem-3.34.1-r1.ebuild
deleted file mode 100644
index 94346eec82b5..000000000000
--- a/media-video/totem/totem-3.34.1-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="gtk-doc +python test"
-# see bug #359379
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-DEPEND="
-	>=dev-libs/glib-2.43.4: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]
-	>=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
-	gnome-base/gnome-desktop:3=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/gobject-introspection-1.54:=
-
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	media-plugins/grilo-plugins:0.3
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		x11-libs/pango[introspection]
-		>=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-BDEPEND="
-	dev-lang/perl
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.5 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-# perl for pod2man
-# Prevent dev-python/pylint dep, bug #482538
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Drop pointless samplepython plugin from build
-	sed -e '/samplepython/d' -i src/plugins/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable-easy-codec-installation=yes
-		-Denable-python=$(usex python yes no)
-		-Dwith-plugins=all # in 3.34.1 only builtin and python plugins are left, and python is extra controlled by enable-python
-		$(meson_use gtk-doc enable-gtk-doc)
-		-Dgst-inspect=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use python ; then
-		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/media-video/totem/totem-3.38.0.ebuild b/media-video/totem/totem-3.38.0.ebuild
index 89b5506cb674..8370cbd704d1 100644
--- a/media-video/totem/totem-3.38.0.ebuild
+++ b/media-video/totem/totem-3.38.0.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.56.0:2
diff --git a/media-video/vidify-audiosync/Manifest b/media-video/vidify-audiosync/Manifest
new file mode 100644
index 000000000000..665d535c84c3
--- /dev/null
+++ b/media-video/vidify-audiosync/Manifest
@@ -0,0 +1,3 @@
+DIST vidify-audiosync-0.3.0.tar.gz 61854604 BLAKE2B d6ffb65152044932d1e0a57d573c14d9378815c714d680d7a446e54ba6f4e572346165eb3c0f9b7793eb03fc5d0e1f2a07a8d0a64c76971892ad5c5d0ea4fc50 SHA512 b245dea22353acae94de1f0c0465d5d1040d19f372702eba52790bf6ace861ede497562957178aa40e7a9c30ba47061b9e23761900cc18a6c7b1e3579db6ccd0
+EBUILD vidify-audiosync-0.3.0.ebuild 976 BLAKE2B ad67c9610fb90a07c0c4b85258ea0959e843df3b436889e980c3b0f3e6f2c074a83adeac72a539a05fdb6e970588b35b12fbd9c85ecef649c4adb84eb508dcb6 SHA512 78b0d2288d66e64f3c1e54a2472b3475414af58afcd32ebb59c045ab8b5d499037a64b7e381ac834b7a9cae1523918c06e5eaf20ed7b5fa58206384ec704005b
+MISC metadata.xml 523 BLAKE2B d04589f4b304043bb857f938c85bbbab5559e808eeae525d1bf9486abaa00ef773c1ba97c730b984db1fd33d14257f423e7900619b3a3703f93ef31f5744877c SHA512 acdbb3b24e7958fb81c41ef0ad5e1a104a5fcb55d54f448fa4ec94c65f2e3bd91b88060965186b408474e702c56a82a6db19ca6153bf185498f121ff6d641f79
diff --git a/media-video/vidify-audiosync/metadata.xml b/media-video/vidify-audiosync/metadata.xml
new file mode 100644
index 000000000000..af6bbe61a887
--- /dev/null
+++ b/media-video/vidify-audiosync/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>marioortizmanero@gmail.com</email>
+			<name>Mario Ortiz Manero</name>
+		</maintainer>
+		<remote-id type="github">vidify/old-audiosync</remote-id>
+		<bugs-to>https://github.com/vidify/old-audiosync/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
new file mode 100644
index 000000000000..e0e3a255570a
--- /dev/null
+++ b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Audio synchronization feature for vidify"
+HOMEPAGE="https://vidify.org"
+SRC_URI="https://github.com/vidify/old-audiosync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-sound/pulseaudio
+	media-video/ffmpeg[openssl]
+	media-video/vidify[${PYTHON_USEDEP}]
+	sci-libs/fftw
+	debug? ( sci-visualization/gnuplot )
+"
+BDEPEND="test? ( dev-util/cmake )"
+
+S="${WORKDIR}/old-audiosync-${PV}"
+
+python_prepare_all() {
+	if use debug; then
+		sed -i -e "/defines.append(('DEBUG', '1'))/s/^# *//" setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	mkdir "test_build_${EPYTHON}" || die
+	cd "test_build_${EPYTHON}" || die
+	cmake .. -DBUILD_TESTING=YES || die
+	emake
+	emake test
+	cd .. || die
+}
diff --git a/media-video/vidify/Manifest b/media-video/vidify/Manifest
new file mode 100644
index 000000000000..b75a8a54c4dc
--- /dev/null
+++ b/media-video/vidify/Manifest
@@ -0,0 +1,3 @@
+DIST vidify-2.2.6.tar.gz 2906511 BLAKE2B 3df48ca57e102f664852e2fc2abeb3d19427673e1fec5144a8c0afda112a0f3b281b18db43b4326244266d6e9dfbcb2443319ddad3f864098a61bd1e3c966307 SHA512 15487ee9dcbe647b2b287bd2eb3c09962b557320313a9a3885fb3c0d6af945909531111d5297c1a5fb5b451af5df6fd968b3953bbf79af113980ed368a5674b5
+EBUILD vidify-2.2.6.ebuild 2337 BLAKE2B 75c915d511a7ab1d0987633932ddbfbc35c011c614c4b302943ee9dd5e36b25036f4a2881105433f17623e608d89fa9dad9c558484b4ab8554e7a3ef0c20d152 SHA512 f65f7d4fa6aac96ac88fb05704f89e470aee7da43d1e02c10bc90b6773123a5aa00b65a0e09d26500d463a30a9a594b121440e02bd7d3145ba9e2b4320857306
+MISC metadata.xml 791 BLAKE2B 58d9b11d25213a1666a2c7bb10fcf8a717c9c9ac3dcd8b7a158ca0a61236ee33252ba82d2f6ae5b53d649320563929f5661a12c64ea6420ca378708e5161661a SHA512 8483e3fe402371289ee636e7001ee44844a40cc0c640507be6b806a2b88672e424a1a9bb4e987a15658e57abab9541e684c16ee08779f0a471388aa5270dae7f
diff --git a/media-video/vidify/metadata.xml b/media-video/vidify/metadata.xml
new file mode 100644
index 000000000000..7f12ddb07a53
--- /dev/null
+++ b/media-video/vidify/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<use>
+		<flag name="vlc">Use python-vlc as backend for vidify</flag>
+		<flag name="mpv">Use python-mpv as backend for vidify</flag>
+		<flag name="zeroconf">Use an external network player</flag>
+		<flag name="dbus">Support local MPRIS players</flag>
+	</use>
+	<upstream>
+		<maintainer>
+			<email>marioortizmanero@gmail.com</email>
+			<name>Mario Ortiz Manero</name>
+		</maintainer>
+		<remote-id type="github">vidify/vidify</remote-id>
+		<bugs-to>https://github.com/vidify/vidify/issues</bugs-to>
+	</upstream>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/media-video/vidify/vidify-2.2.6.ebuild b/media-video/vidify/vidify-2.2.6.ebuild
new file mode 100644
index 000000000000..d80a08f97932
--- /dev/null
+++ b/media-video/vidify/vidify-2.2.6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 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 xdg distutils-r1 optfeature virtualx
+
+DESCRIPTION="Watch music videos in real time for the songs playing on your device"
+HOMEPAGE="https://vidify.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="dbus vlc mpv zeroconf"
+
+REQUIRED_USE="|| ( vlc mpv zeroconf )"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/QtPy[gui,webengine,${PYTHON_USEDEP}]
+	net-misc/lyricwikia[${PYTHON_USEDEP}]
+	net-misc/youtube-dl[${PYTHON_USEDEP}]
+	dbus? ( dev-python/pydbus[${PYTHON_USEDEP}] )
+	!dbus? ( dev-python/tekore[${PYTHON_USEDEP}] )
+	mpv? ( dev-python/python-mpv[${PYTHON_USEDEP}] )
+	vlc? ( dev-python/python-vlc[${PYTHON_USEDEP}] )
+	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# skip online test
+	rm tests/api/test_spotify_web.py || die
+	rm tests/player/test_external.py || die
+
+	# this needs dbus and a player running
+	rm tests/api/test_mpris.py || die
+
+	# can't parse non-existent config
+	rm tests/test_api_and_player_data.py || die
+
+	# do not hard depend on this
+	sed -i \
+		-e '/qdarkstyle/d' \
+		-e '/python-vlc/d' \
+		-e '/python-mpv/d' \
+		-e '/pydbus/d' \
+		-e '/tekore/d' \
+		-e '/zeroconf/d' \
+		-e '/If PySide2 is installed and PyQt5/,/PyQtWebEngine/d' \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx "${EPYTHON}" -m unittest discover -v
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors"
+	elof "and recompile media-video/vlc or media-video/mpv with the missing codecs"
+
+	optfeature "using an MPRIS(D-Bus) audio player (e.g spotify)" dev-python/pydbus
+	optfeature "using the Spotify Web API as audio player" dev-python/tekore
+	optfeature "using an external network player" dev-python/zeroconf
+	optfeature "using media-video/mpv for video playback" dev-python/python-mpv
+	optfeature "using media-video/vlc for video playback" dev-python/python-vlc
+	optfeature "'vidify --dark-mode'" dev-python/qdarkstyle
+	optfeature "'vidify --audiosync'" media-video/vidify-audiosync
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 04f78911285a..3a65a133fb54 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -13,7 +13,7 @@ DIST vlc-3.0-3.0.13.tar.gz 34356102 BLAKE2B 93490278f47ab389c927a44bc84727b8067a
 DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 EBUILD vlc-3.0.12.1-r100.ebuild 13748 BLAKE2B 107691a0a6f7a25082845706fe39be5d51c48b23bca434075f2d86b53205cc528d1bfe09374c945e80510f59739cf610dd76d6fda4735406ae10d60fb525ee5a SHA512 747e7cf72eb2e01b324ad6b8526f11b5d55400f9a86a02674e72ee1666ac4ff5c486bc5fa03319e369c84b34f5e350862c5cee5ae5cee327e5006147273bc3e7
 EBUILD vlc-3.0.13.ebuild 13746 BLAKE2B b4a84533271235cde54783bc92f6cc7bcddd4f87c05fc67ca51b0d2dc9bd5b4d02e7f5e7da4329544169781f67dbc7e38a8fcb33139318f7ce12f0a29872d483 SHA512 ccd6e2232808764ef877df955ab5921a1761a511cf04c57413cc2a5bd54552166d3ded64164c958360d89de244bccb793c1a0b2a934823af4dd4187ecbf943fb
-EBUILD vlc-3.0.14.ebuild 13722 BLAKE2B dd733bf6882bdb463ba16677bb04bd1bb1b527e2ffd89c2e54acb37d31255808a7687b4e9ae6122139293344592fd5a969ef4cc8d0e4585f0f5d9077cc1b0d08 SHA512 e3a923177302ec208dd916384a19aa21853f2b9a34085b5aa0d59bb09e99e21fc8e80b26d3c4ee7ff478b31d1bc16103a31db1726a8cbc5667e3451c24c2dfee
+EBUILD vlc-3.0.14.ebuild 13719 BLAKE2B 8c4c1c29ecea79f26e8eb66a13db551ee367b90223100312544fb7045307b885a93c5b8d75c3b653940ea04f9816ab594068e9902e903d768fb6eb15cd6a57b9 SHA512 3f74bc9eaf49397ce2725912f3e18b359d8ba05cb0723abd04e7a686dd0ef7a4af37b7b469d069eb0af71e5c5d818af1035997207e7aebb8db94310e826b6eb2
 EBUILD vlc-3.0.9999.ebuild 13471 BLAKE2B b670f3966ef3b437efbc49c237723ee1b58eadd1072f9b019ccb42644e0699f1673acb53839c044e6dd3b5e0137e3c6562d5cc008e05793d9bdd1ac5329c74c6 SHA512 7175f7a47a3466e3e08e72064d4cf280dc528a9e98ef538a0f45d05ca63ab4a23c212393d66a5192ea892cdc62f5fed742efb0068977f76da0debd1e16e764d1
 EBUILD vlc-9999.ebuild 13492 BLAKE2B 4ce1ec116bd322cb97a258e5bc61e2ea068d19f5eea7c024df8c3e3662342b0395b01407a1dad74dc69200501e5d85d17102fb2d0adf0f5a27ff5a5ea6262b47 SHA512 aa17c24cfa15b04be911405523eaac1d5bc6003f32c21d32f9161e2d98820646344a5d7dde75ccd7784a36d18b2bf61c1d94bebd3ed2e10181fdb6153967b25a
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/vlc-3.0.14.ebuild b/media-video/vlc/vlc-3.0.14.ebuild
index 935a496030c1..5c49605d1c56 100644
--- a/media-video/vlc/vlc-3.0.14.ebuild
+++ b/media-video/vlc/vlc-3.0.14.ebuild
@@ -23,7 +23,7 @@ else
 	#else
 	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	#fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 -sparc x86"
 fi
 
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg