gentoo resync : 08.10.2021

31 files changed, 673 insertions, 313 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 00c3be2f4873..68683e9cd602 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 36fcf90295c9..f9df063ad142 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -2,6 +2,6 @@ AUX cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch 4008 B
 AUX cheese-3.38.0-buildfix.patch 736 BLAKE2B 3118378b5b125ae6fe223d3b114e07805eb2b5d300bb78ec6b8ff3888f19a0b68af0091aa33918c885991a86293c5cc530d65a75d433cd7c5d343889e5740fbe SHA512 6633f5ebdb2662d199d3f44f49754c8e2c9cd2d864084bff079f4f4de9f20d15489f84ca3acba46df0c9af36920c57b1eca94748c097cb744f71669a69fada47
 AUX cheese-3.38.0-vala-genericarray.patch 6731 BLAKE2B 83f283e629106eba1174197f4b0afc9929fcaaaaa6d29ecaa59cbee97a373589638c2aa0da122db0bd11142ef2790e08b8e3a97e757837f4ce420c0f588609a7 SHA512 de93e2664331a792205c29cf893317719b182bece4185452e705cc349d48dbe46d7320a337e16d923dee4da693c07ba0542b4bc4367162212c7df549313849c2
 DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae
-EBUILD cheese-3.38.0-r1.ebuild 2331 BLAKE2B 1bd7b4a93b1446b91ae8bee5502bf59d4dcc6ebe4aee14327541754fb311d3f8538f5fcc8df59bdd5026d9a03719b89e77fa2e438af3fd087e4cf513f2aa9397 SHA512 79c7e624fb27c226474a0c4727955cec05ab09a67f53b81860a61e8faa61eb91f724fc8b0995969ed4e16f8db75415b2fefb79f513d5ed5cad7588798463ed4c
+EBUILD cheese-3.38.0-r1.ebuild 2329 BLAKE2B 0c19811bb84284d07bc8e51e2b085195d37550e41c9c510ff44cac4596b4aecc2690cbf8d82a9f21e5b1e9f1ed5ad663230b151dbad8f81eb366ca187d222ae6 SHA512 45b5bbc7b567c44172cac4cf4b2414f842e8c9e05c34c2bbc324cfcd985b7fad107933ea92d9c182d800285540d9ec00d7e050acf26b162c62baa077d6a961c7
 EBUILD cheese-3.38.0.ebuild 2120 BLAKE2B c28699d5912d6bcf91c9c95b02f00bb1e2c5c88964b67dd46681549eccc0570fe1cd55a3d21bacf5b557ba0bb4c4cd9ac1e4ecea4d13cd067577bca19abda7fa SHA512 5af98575aafab5be072e221cc54d4f317cca56fd1bb60a17c80b5811760d2f63c4140ffeecaa350677491737c2bc4bd66ffc2ca7d7d6be835b978246aad62b4b
 MISC metadata.xml 429 BLAKE2B 7874cf680a041c34e7c5f29b164552d311d333853050e5486aa0f8bdae3fce50316cd00038ba8cbbd102912cdb0c8c7fd5d6370af0004c8977e053eb89be9687 SHA512 ea2a94d4981bc40d13235bfa9a544855cdeb638e46293c84bfaf14f13dc255651c0eb01752b5987b42e285765ed2dbd65dbd58eb23c730e4cbd7fc31e0003fc8
diff --git a/media-video/cheese/cheese-3.38.0-r1.ebuild b/media-video/cheese/cheese-3.38.0-r1.ebuild
index 300eeb32e4ed..1bb93338d5ae 100644
--- a/media-video/cheese/cheese-3.38.0-r1.ebuild
+++ b/media-video/cheese/cheese-3.38.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest
index 141f332cb662..58c71a968ec2 100644
--- a/media-video/droidcam/Manifest
+++ b/media-video/droidcam/Manifest
@@ -1,4 +1,5 @@
 AUX droidcam-makefile-fixes.patch 1834 BLAKE2B de9b0ae494e419d89dee767afcc78fc8d5222dcd54706ec94a875c032e835015ef60b8a60285a99974df5dde35becd742432bb81e818574022fd699af021e9ad SHA512 5490ce729f622ae93319a299317c1d394cb7af1f1b71c71c1927ae259a6cce682b705eb26fc0c95c467716c9f79b81688ba2d12e33c1c8af4b454333d8cdbca8
 DIST droidcam-1.8.0.tar.gz 84376 BLAKE2B 581e57e2c80dd9662764e399dd797e5893f617e69ee2501a1063d1c51434baf64d7d2b72779debede6d679127f31fa95a4e67953978da591acbf6a41bd05551d SHA512 b448f686562030b352630c6b677a098ecb5041582dd06e57809b04674cb334d02ddfdf1d09b43e1ecc70897e8073714ad6913ab14d894a7679fc433adb3fda82
+EBUILD droidcam-1.8.0-r1.ebuild 3474 BLAKE2B 9cfbca9e3254ddece5369b932294497c1f27bb8e73904d663eb7e727a82cce1a132221a59cd0de8afb8d12ed1cadcd19c4bd19328c9ef104f7d72c5f82579b43 SHA512 c849bb9cbbc84d987da9bf54a7972016142d562dceb8ae4ce81fd04b3a3c6d2da6073f38dabb240eb429244098d48ced1ecbd0254642e4c2573389f55a3d514c
 EBUILD droidcam-1.8.0.ebuild 3094 BLAKE2B 942b8790090c2edbd1a9f35bf7d34e451f51b903a96c62424433b982959c7fc3ecb55a01c5b069869953b416cc6aa421760ca680da7d36dfdaed2fb0f3b5ea98 SHA512 6dc37f34ca0f9f0c4c8e2d0ceb0c8e778726baddd59c3e9c58177f128e8088bb0c92113093ae05e617f54f9fde1f42163908301420aef730c0105902950cc221
 MISC metadata.xml 1421 BLAKE2B 6d46f5cbd0a226d749b35d8e90a965d4f12fa609b6e95ea6effe87730bce525c0fadb14aa3eb8b99d60f91c7c46a542df5073a55f018f9c06877758360b91e60 SHA512 9dfe075ab79599ecfa3cb9cbf607e4e9a14dd6d002fb3f84bd2d809d962a8bf52b7a0a7166b6805ce4816a57c08e57ab4b224ae1de4e44130bb52f1674ea1e02
diff --git a/media-video/droidcam/droidcam-1.8.0-r1.ebuild b/media-video/droidcam/droidcam-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..d81482560789
--- /dev/null
+++ b/media-video/droidcam/droidcam-1.8.0-r1.ebuild
@@ -0,0 +1,156 @@
+# 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 and Exec entry
+		sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
+			-e 's/\/usr\/local\/bin\/droidcam/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
+
+	if linux_chkconfig_present CC_IS_CLANG; then
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+	export KERNEL_DIR || die
+	linux-mod_src_compile
+}
+
+src_test() {
+	pushd "v4l2loopback" || die
+	default
+	./test || die
+	popd || die
+}
+
+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() {
+	linux-mod_pkg_preinst
+	if use gtk; then
+		xdg_pkg_preinst
+	fi
+}
+
+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() {
+	linux-mod_pkg_postrm
+	if use gtk; then
+		xdg_pkg_postrm
+	fi
+}
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
new file mode 100644
index 000000000000..fa4eb36a552d
--- /dev/null
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -0,0 +1,5 @@
+AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a
+AUX ffmpeg-chromium-94.patch 1617 BLAKE2B 83afc6ae7f6d3b802e7c074545f8e46980751065303dc80283af917771675c987b063a4d39d9ca853b2753c40d38c3484c09a32500011b8faac0fca7e1807dad SHA512 41f4d79581602c475f245fb08f14e065ae2ca5b4863dade0e9652e33786fec90a631aa1a0e67f262ab067a12298883aea2d40309d2303bef76d7d99d06329eb2
+DIST ffmpeg-chromium-94.tar.gz 14709687 BLAKE2B 06dedbd86befd8caed4c6cb34755b52cf70630f8fbd712f89d42e5b63e498f9d2a77935fbd7c87194f6d56fb0f83ff26beba00357dd51b3ac3e2e4480ff4351e SHA512 a6cf5404c892c878c50e3ba8369456db587e327bc3d77e857b9d34f3665ecfee7d3865b20e9871ccda570b30d9d34c03fd981cdc7f495809ea8f12cb8f15937e
+EBUILD ffmpeg-chromium-94.ebuild 5986 BLAKE2B 64395e82e554d833e387df630a3ec7027d1cdde92b217c399e7249a8a4645e92c06bdbc78fbdf04a4891920905d2e7b7a9d7025b4fccf66aef30b369c47077a6 SHA512 deb4b1aa42cfe1a04b7f15b62a33f3a7ea6db3c4bee36886d41af2960a8942353ad795f7a6a6ab7c2a0fd896e62455a659ba3cc2b851f2511ff502d4293827cc
+MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
new file mode 100644
index 000000000000..ccadc52a33d8
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+COMMIT="2d6591aa0835768c437c221c88840ac0c99a50dc"
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers"
+HOMEPAGE="https://ffmpeg.org/"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz"
+
+SLOT="${PV}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		cpudetection:runtime-cpudetect debug
+		+gpl
+		vaapi vdpau vulkan
+		# decoders
+		mmal +opus:libopus
+		video_cards_nvidia:ffnvcodec
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+IUSE="
+	${FFMPEG_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+RDEPEND="
+	mmal? ( media-libs/raspberrypi-userland )
+	opus? ( >=media-libs/opus-1.0.2-r2 )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1:0= )
+	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 )
+	vdpau? ( >=x11-libs/libvdpau-0.7 )
+	vulkan? ( >=media-libs/vulkan-loader-1.1.97:= )
+"
+
+DEPEND="${RDEPEND}
+"
+BDEPEND="
+	>=sys-devel/make-3.81
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+"
+
+REQUIRED_USE="
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	test
+"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}.patch
+	"${FILESDIR}"/chromium.patch
+)
+
+src_prepare() {
+	export revision=git-N-g${COMMIT:0:10}
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+src_configure() {
+	local myconf=( )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282, bug #754654
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+	filter-flags "-flto*"
+
+	# Mandatory configuration
+	myconf=(
+		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
+		--disable-libcelt # bug #664158
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--nm="$(tc-getNM)" \
+		--ranlib="$(tc-getRANLIB)" \
+		--pkg-config="$(tc-getPKG_CONFIG)" \
+		--optflags="${CFLAGS}" \
+		--disable-all \
+		--disable-autodetect \
+		--disable-error-resilience \
+		--disable-everything \
+		--disable-faan \
+		--disable-iconv \
+		--disable-lzo \
+		--disable-network \
+		--enable-avcodec \
+		--enable-avformat \
+		--enable-avutil \
+		--enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \
+		--enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \
+		--enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \
+		--enable-pic \
+		--enable-static \
+		"${myconf[@]}" \
+		${EXTRA_FFMPEG_CONF}
+
+	echo "${@}"
+	"${@}" || die
+}
+
+src_compile() {
+	emake V=1 libffmpeg
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install-libffmpeg
+}
diff --git a/media-video/ffmpeg-chromium/files/chromium.patch b/media-video/ffmpeg-chromium/files/chromium.patch
new file mode 100644
index 000000000000..e24ea84b3df6
--- /dev/null
+++ b/media-video/ffmpeg-chromium/files/chromium.patch
@@ -0,0 +1,41 @@
+Allow libffmpeg to be built for Chromium-based browsers
+https://patchwork.ffmpeg.org/patch/4500/
+
+NOTE: This patch lacks the Makefile include line. We append it
+manually instead to make patching across different versions easier.
+
+diff --git a/ffbuild/libffmpeg.mak b/ffbuild/libffmpeg.mak
+new file mode 100644
+index 0000000..992cf3c
+--- /dev/null
++++ b/ffbuild/libffmpeg.mak
+@@ -0,0 +1,27 @@
++LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF)
++LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG)
++
++ifeq ($(CONFIG_SHARED),yes)
++LIBFFMPEG_DEPS = libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++else
++LIBFFMPEG_DEPS = libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF)
++endif
++
++$(LIBFFMPEG): $(LIBFFMPEG_DEPS)
++ifeq ($(CONFIG_SHARED),yes)
++	$(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
++else
++	$(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil)
++endif
++
++libffmpeg: $(LIBFFMPEG)
++
++install-libffmpeg: $(LIBFFMPEG)
++	$(Q)mkdir -p "$(SHLIBDIR)/chromium"
++	$(INSTALL) -m 755 $< "$(SHLIBDIR)/chromium/$<.$(SLOT)"
++	$(STRIP) "$(SHLIBDIR)/chromium/$<.$(SLOT)"
++
++uninstall-libffmpeg:
++	$(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG).$(SLOT)"
++
++.PHONY: libffmpeg install-libffmpeg uninstall-libffmpeg
+--
+2.13.1
diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-94.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-94.patch
new file mode 100644
index 000000000000..ba1dfd2c0518
--- /dev/null
+++ b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-94.patch
@@ -0,0 +1,26 @@
+--- FFmpeg-chromium/configure	2021-10-07 22:32:34.230130424 +0100
++++ FFmpeg/configure	2021-10-07 22:34:30.978861042 +0100
+@@ -6474,15 +6464,14 @@
+                                { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
+ enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
+ enabled libopenvino       && require libopenvino c_api/ie_c_api.h ie_c_api_version -linference_engine_c_api
+-# Chromium uses a built in copy of libopus that is not visible to pkg-config.
+-# enabled libopus           && {
+-#    enabled libopus_decoder && {
+-#        require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create
+-#    }
+-#    enabled libopus_encoder && {
+-#        require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create
+-#    }
+-# }
++enabled libopus           && {
++    enabled libopus_decoder && {
++        require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create
++    }
++    enabled libopus_encoder && {
++        require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create
++    }
++}
+ enabled libpulse          && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new
+ enabled librabbitmq       && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection
+ enabled librav1e          && require_pkg_config librav1e "rav1e >= 0.4.0" rav1e.h rav1e_context_new
diff --git a/media-video/ffmpeg-chromium/metadata.xml b/media-video/ffmpeg-chromium/metadata.xml
new file mode 100644
index 000000000000..5e0aeba3b15e
--- /dev/null
+++ b/media-video/ffmpeg-chromium/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>chewi@gentoo.org</email>
+	<name>James Le Cuirot</name>
+</maintainer>
+<use>
+	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
+	<flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag>
+	<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
+	<flag name="vulkan">Enables support for the vulkan API for GPU offload.</flag>
+</use>
+</pkgmetadata>
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index bc30fd775f23..1a302d8f08aa 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,6 +1,5 @@
-AUX gaupol-1.8-fix-audio-tracks-order.patch 6462 BLAKE2B 96e09112adf27ece07b65eee4b69d7dd1813c3b882afe790b8e35237e8e3c996809a0e71c00ce64f3c7cd0efbaf325933473f52439db31ba60869035c5a59feb SHA512 f7c001f698650c8c757818d44624201888aefe0d65689ee0fd357d85d45bd712a9f09b57e833a503c5b639ec430a6df2eebf02a40bed03a091abcd0da0bfae69
-DIST gaupol-1.8.tar.gz 558627 BLAKE2B a7243310b97fe7187311585762faaff512364ca043630eb43c1ee99c55fa5400e14698e391b410b67f70f1bc7a741adb0737868d7b40c868bb4c6badacd14fb1 SHA512 a6b65316b5750a4d636b39b75393b0b2f2c44d978f1fc8cc3bd2cd2d2bcf9ba68d0161afb41bdca5b381ec39e5a2e06440f4f4676f344019966b297c4112e691
+DIST gaupol-1.10.1.tar.gz 580890 BLAKE2B eb3f5bc3f9ec371d4169a9517f83bd42371aa41532f99f650b51e4649f813f0a37c0de5a01f69ee0c73f38cf2b57dd3260b5cac88f4c09785e86da2ec82c0cba SHA512 f294ea10c73dcf9941f70988ae58066917d7b321141e3a3ba3e12810e5f20a4711feca45d354dddc0e104a1ee2496fad24e529b129bdeee1cdb92010ec20be1d
 DIST gaupol-1.9.tar.gz 579382 BLAKE2B c326e800ebd56bab53757d13e075c7499d9b37c6677a3f2ef710e71ab427bc9d502d1539778e87625e43a6218a358b15dfc3c84fd22b42e95d808fc8495feb43 SHA512 c115409afe68a0981f7c29e5d6d3e23950081f186b74de460045de9976a6c7a674701d316214ee2b91bc59f1dd856fdc9cf999e328aba8abeb8eaf71911c68d2
-EBUILD gaupol-1.8-r2.ebuild 1731 BLAKE2B b5af853dde513fb149ec2d2e9389caa2cc53c645ac676d832d5200ae6c5b278175de30eeda28639c6602cf27a3e83bf692aac68d21d00e0825ca6c65870b2444 SHA512 442d211c393b5f2613616f15e73a58e253045431190cd9abe6f7f7fc2b6c3b018f29f9516f97bedb05d243b04119661cb15cfd970e6e9ede728ae33486705641
+EBUILD gaupol-1.10.1.ebuild 1613 BLAKE2B 77960f555aac48bfb01f1451a2c5e5b9e902ed75fb4ebd72c82494acab536cb196a8a9d687578780b0b50cca9e6c0d553fd7cb57570eabc0cf2ec8a562637e43 SHA512 0f5c5239924f2c97be2d575111002379c1c0bba66dad3bee9947f345e4ab3506e36482e2d60da9bff8ce5a45cb4ca948b57fbeae98d7a77f7b539db9be953290
 EBUILD gaupol-1.9.ebuild 1618 BLAKE2B e039e80ce001fc413fd6b264d7b776db08944295ef166648b40b50e56de3e8c7bbf8ced7d74e93e22efba13a9346e20c555236db686749c73a828d9d19248cbb SHA512 2f5f6b9c00bfac63deb93f693ca5f17c2b0d974675c4568c67b8c56fa2cddabf60a085d87cadecc514ab54ae8bef41064c5743b63a135895eedb8c6b1c58bb89
 MISC metadata.xml 533 BLAKE2B eb6d56dbe104832c594f306fc020b591b04e4f21d7533740ab613ecf105cdfdc4bc9232fe18bbfc4276cc08063a7a570a1c98025e9c74561b4abda0119e3801e SHA512 49859f8f6b75f20c6cf94f60764c1e688ddf907a7657815574b666fcc7873de0a3105cda9acd9f4bbdb7f658bd0003c67ec1ced72e3d84e15b5d86b64ca91abe
diff --git a/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch b/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch
deleted file mode 100644
index 3f554c4ef335..000000000000
--- a/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From e26cfcfe002c87a39eac63bbaa5ad0d4d69c95a4 Mon Sep 17 00:00:00 2001
-From: Quentin Gliosca <quentin.gliosca@gmail.com>
-Date: Tue, 12 May 2020 16:48:31 +0200
-Subject: [PATCH 1/3] Fix the order of languages in audio track selection
-
-Fix #129
----
- gaupol/player.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/gaupol/player.py b/gaupol/player.py
-index 836abea2..c266e0b9 100644
---- a/gaupol/player.py
-+++ b/gaupol/player.py
-@@ -118,7 +118,8 @@ def _ensure_default_segment(self):
- 
-     def get_audio_languages(self):
-         """Return a sequence of audio languages or ``None``."""
--        return tuple(x.get_language() for x in self._info.get_audio_streams())
-+        return tuple(self._playbin.emit("get-audio-tags", i).get_string("language-code")[1]
-+                     for i in range(self._playbin.props.n_audio))
- 
-     def get_duration(self, mode=None):
-         """Return duration of video stream or ``None``."""
-@@ -356,6 +357,10 @@ def set_uri(self, uri):
-             dialog.add_button(_("_OK"), Gtk.ResponseType.OK)
-             dialog.set_default_response(Gtk.ResponseType.OK)
-             gaupol.util.flash_dialog(dialog)
-+        else:
-+            # Make stream tags available from _playbin
-+            self._playbin.set_state(Gst.State.PAUSED)
-+            self._playbin.get_state(Gst.CLOCK_TIME_NONE)
- 
-     def stop(self):
-         """Stop."""
-
-From 9ace4fefe5d246c5588538a715a185c796e218ef Mon Sep 17 00:00:00 2001
-From: Quentin Gliosca <quentin.gliosca@gmail.com>
-Date: Tue, 12 May 2020 17:27:35 +0200
-Subject: [PATCH 2/3] Improve names of audio tracks in menu
-
----
- gaupol/agents/video.py | 18 ++++++++++++++----
- gaupol/player.py       | 20 ++++++++++++++++----
- 2 files changed, 30 insertions(+), 8 deletions(-)
-
-diff --git a/gaupol/agents/video.py b/gaupol/agents/video.py
-index d434255a..0f6b935c 100644
---- a/gaupol/agents/video.py
-+++ b/gaupol/agents/video.py
-@@ -27,7 +27,11 @@
- from gi.repository import Gtk
- 
- with aeidon.util.silent(Exception):
-+    from gi import require_version
-+    require_version('GstTag', '1.0')
-     from gi.repository import Gst
-+    from gi.repository import GstTag
-+
- 
- 
- class VideoAgent(aeidon.Delegate):
-@@ -348,11 +352,17 @@ def _update_languages_menu(self):
-         """Update the audio language selection menu."""
-         menu = self.get_menubar_section("audio-languages-placeholder")
-         menu.remove_all()
--        languages = self.player.get_audio_languages()
--        for i, language in enumerate(languages):
--            language = language or _("Undefined")
-+        tracks = self.player.get_audio_infos()
-+        for i, track in enumerate(tracks):
-+            title = track.title or "{} {}".format(_("Track"), i + 1)
-+            lang = None
-+            if track.language_code is not None:
-+                lang = GstTag.tag_get_language_name(track.language_code)
-+            if lang is None:
-+                lang = track.language_name
-+            name = title if lang is None else "{} - [{}]".format(title, lang.title())
-             action = "win.set-audio-language::{:d}".format(i)
--            menu.append(language, action)
-+            menu.append(name, action)
-             if i == self.player.audio_track:
-                 action = self.get_action("set-audio-language")
-                 action.set_state(str(i))
-diff --git a/gaupol/player.py b/gaupol/player.py
-index c266e0b9..ee1e96dc 100644
---- a/gaupol/player.py
-+++ b/gaupol/player.py
-@@ -21,6 +21,7 @@
- import gaupol
- import time
- 
-+from collections import namedtuple
- from aeidon.i18n   import _
- from gi.repository import GLib
- from gi.repository import Gtk
-@@ -56,6 +57,8 @@ class VideoPlayer(aeidon.Observable):
- 
-     signals = ("state-changed",)
- 
-+    TrackInfo = namedtuple("TrackInfo", ["title", "language_code", "language_name"])
-+
-     def __init__(self):
-         """Initialize a :class:`VideoPlayer` instance."""
-         aeidon.Observable.__init__(self)
-@@ -116,10 +119,19 @@ def _ensure_default_segment(self):
-         self._playbin.seek_simple(Gst.Format.TIME, seek_flags, pos)
-         self._in_default_segment = True
- 
--    def get_audio_languages(self):
--        """Return a sequence of audio languages or ``None``."""
--        return tuple(self._playbin.emit("get-audio-tags", i).get_string("language-code")[1]
--                     for i in range(self._playbin.props.n_audio))
-+    def get_audio_infos(self):
-+        """Return a sequence of audio track infos."""
-+        return tuple(
-+            self._make_track_infos(self._playbin.emit("get-audio-tags", i))
-+            for i in range(self._playbin.props.n_audio)
-+        )
-+
-+    def _make_track_infos(self, tags):
-+        return self.TrackInfo(
-+            tags.get_string("title")[1],
-+            tags.get_string("language-code")[1],
-+            tags.get_string("language-name")[1]
-+        )
- 
-     def get_duration(self, mode=None):
-         """Return duration of video stream or ``None``."""
-
-From f50b4e54dc9aa84fc1b3eb403d680b8a0be77dc3 Mon Sep 17 00:00:00 2001
-From: Quentin Gliosca <quentin.gliosca@gmail.com>
-Date: Wed, 13 May 2020 07:29:27 +0200
-Subject: [PATCH 3/3] Cosmetic changes
-
----
- gaupol/__init__.py     | 1 +
- gaupol/agents/video.py | 4 +---
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/gaupol/__init__.py b/gaupol/__init__.py
-index f7a9663d..fc02287b 100644
---- a/gaupol/__init__.py
-+++ b/gaupol/__init__.py
-@@ -44,6 +44,7 @@
-     "Gst": "1.0",
-     "GstPbutils": "1.0",
-     "GstVideo": "1.0",
-+    "GstTag": "1.0",
- }.items():
-     with aeidon.util.silent(Exception):
-         gi.require_version(module, version)
-diff --git a/gaupol/agents/video.py b/gaupol/agents/video.py
-index 0f6b935c..3c9e3113 100644
---- a/gaupol/agents/video.py
-+++ b/gaupol/agents/video.py
-@@ -27,8 +27,6 @@
- from gi.repository import Gtk
- 
- with aeidon.util.silent(Exception):
--    from gi import require_version
--    require_version('GstTag', '1.0')
-     from gi.repository import Gst
-     from gi.repository import GstTag
- 
-@@ -354,7 +352,7 @@ def _update_languages_menu(self):
-         menu.remove_all()
-         tracks = self.player.get_audio_infos()
-         for i, track in enumerate(tracks):
--            title = track.title or "{} {}".format(_("Track"), i + 1)
-+            title = track.title or _("Track {:d}").format(i + 1)
-             lang = None
-             if track.language_code is not None:
-                 lang = GstTag.tag_get_language_name(track.language_code)
diff --git a/media-video/gaupol/gaupol-1.8-r2.ebuild b/media-video/gaupol/gaupol-1.10.1.ebuild
index 034cd5a9dd3d..cc4e0d9d820e 100644
--- a/media-video/gaupol/gaupol-1.8-r2.ebuild
+++ b/media-video/gaupol/gaupol-1.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 virtualx xdg-utils
@@ -14,9 +14,8 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="spell test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="spell"
 
 RDEPEND="
 	app-text/iso-codes
@@ -28,17 +27,15 @@ RDEPEND="
 BDEPEND="
 	sys-devel/gettext
 	test? (
-		${RDEPEND}
 		app-dicts/myspell-en
 		app-text/enchant[hunspell]
 		app-text/gspell[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
 
-DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
+distutils_enable_tests pytest
 
-PATCHES=( "${FILESDIR}/${P}-fix-audio-tracks-order.patch" )
+DOCS=( AUTHORS.md NEWS.md README.md README.aeidon.md )
 
 python_test() {
 	virtx pytest -vv
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 8f728eca3ca1..391eb81b7f0b 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -5,4 +5,4 @@ AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287
 DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
 EBUILD handbrake-1.3.3-r2.ebuild 4175 BLAKE2B 3e70f8e7c14d51b807fecff2d165c49136114379744ab8050c29dfbbdd7ea3cca04bb144e0ede35821d065ae9f5a87777944c6a18e3777560ed3b63a48414a1d SHA512 f740e0f0d564a93810e1c870e8941ab162c5cb41b5b9848bc06563db067d341e677221536c6c3617db6a31dff0c5ad1fed76b148cef2565c4714dccac938212d
 EBUILD handbrake-9999.ebuild 4177 BLAKE2B 25cb3cfc7d3ceb109bec0000e28c686774135de354e247c05c065c04da16902f7e7f9865aa857358b6c34dabbc0973081d4c89528c5d4a477182f7ea3692a675 SHA512 7f3d69592b79bfa420f60d692cc6c2e6ed17220fb782a93686ae0d84e3c95f953e3faddf85af2d4f7d204d4ced7d0f9a6c92127a59ddf09ef912a03d720bb82c
-MISC metadata.xml 966 BLAKE2B f6c02a468a505d238d9800831bf0bb74557d3c4975eb7708952bd30708edff587a32c6b50f53c2190327e9ad172de2c9aa85d38a2fadfc4c41676c10186fbb80 SHA512 1849d7132897355e89b0e8fcadaf6b1a5041d5df4a5433f964ac2a6a97ce1adde340e5304e6fc3e0f5b9fd345b827ea709323bcbfc30f9a3448fbd9dca0f10d2
+MISC metadata.xml 887 BLAKE2B b1d57d0087bfd584903bfb4866e385ba5ec6802f6122cce50ad16b558df1f07f85f4e1fe61c2247aec2fa982d7093fb2741c9cb9c93f782f1fd99477f08582ae SHA512 f677e455ad104d74a9ae6a35cf76f87bedde7a96f92c34b951bffd0cf0591857dc52ec43d1226de2918363475b94ad2e9a9035d4e274693c73c95aa9b922e2d4
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index 4e5442f360ac..ffc4a33c70cb 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>thev00d00@gentoo.org</email>
-		<name>Ian Whyman</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
 		<flag name="gtk">Install the GTK UI, ghb.</flag>
diff --git a/media-video/mplayer/files/dump_ffmpeg.sh b/media-video/mplayer/files/dump_ffmpeg.sh
index 885946df8cc7..885946df8cc7 100644..100755
--- a/media-video/mplayer/files/dump_ffmpeg.sh
+++ b/media-video/mplayer/files/dump_ffmpeg.sh
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index eacbf5fff0ce..fbefdfe209d0 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,10 +1,10 @@
-AUX obs-studio-26.1.2-fix-alsa-crash.patch 1047 BLAKE2B 5c7417042565beb47bd57ad770358e6d751f3ed08b849f279439f07ac48a1f4dace780ed23b60a3c26988e06ae9899e1ad088c04ffccd42d953e6d05f5287719 SHA512 e5261c1e6fdc5bdbdd3663225c71ee9aa40ec3f724ab69426a96f7180f2a3f6193d1a1b171aac2ba78d6a4c2a9362d060d6b7e99841754829001f087bcde7062
 AUX obs-studio-26.1.2-python-3.8.patch 653 BLAKE2B 6fbafacb2b2a7dc7dbb15f63eea9463e7c26744caab9399146bd404227d6b7e4119cbeb8f93b4b5c81399d342f02b002d79ad72d2a8dde3317d8f5a67f163dc9 SHA512 598701d227feab450d2f8db40d18b7380dcbedb13b6586deb481b7164c33e12e04b1d5babdadbe073d5af0ac899d783f7a2a2d2ed020f19edb6146cfd00798af
 DIST cef_binary_4280_linux64.tar.bz2 79740715 BLAKE2B c648a9a4205094450f9eae407e98cbc3da2b7cd81b3c19c4f52cfa3efcca01dce40528018996c65f026eb97520d78040165d1906b0d19236a86e76ec39c58c26 SHA512 060a5a8716a75b4b96dfb6ac28c132e22b93107915d680311c1b9d4fd12c7712a9e3497338eac6d2b9f4e74f2dc005a75d195c597bba049e4731fe3724f519ba
+DIST obs-browser-2a338b7c76d5dd0a6b23f1d49affefd40213b0e9.tar.gz 89474 BLAKE2B ff76a884ffbb7765430a14a7de2955164e9d8823f5dd48bd85e6d0452022b706517e935d813ad78a45adf5eca95fda02e17ae81dbd721145d3ecd169c5a70537 SHA512 bcc8e38505b3cabd7c0e3edcd34ed21141efaa09a9bb0af79fefb57e315531f0ee089b79696802fa052659f66e0becf304286ef82afcf16283ed6664cb5cedd4
 DIST obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz 79259 BLAKE2B 28cfa46928de0b5e626b384673f7b92b3a48cb631066dda06288c51df78f06b913707a1295a5142d4521505b0678a6c639bfbb5b8a066d585fa12849578a382e SHA512 3ecab39bfb36774ac501de087ca70ecde12f408cfd54cdf12539a92e89d0cf531767a066ff77139389158c46beee423cf1848081ed187890b86241aa96f7b179
-DIST obs-studio-26.1.2.tar.gz 16624899 BLAKE2B 655a6c71d3a0ae6ae1fc2d166a148002bb17d6eaec06d5633a10fdbfe7f42e073526ede83cd36ad21c440debe870b41b43724caa00633733f1e196d918304adc SHA512 cd95fbf587f7edfe415cae75299d65c1d771bb118649fb839ae43d77145d87725c23df3360aa7b8c35ab8b62e5ec7983a8b02f8b102caa78f768eb58b4263417
 DIST obs-studio-27.0.1.tar.gz 15787807 BLAKE2B c2ea571f06a81b2e87ce5d9fd010610ea6cc2753223e6373025f0389972d4638a5f3ff1802f9f0af2c631d71ebcf4603e064da804e8c89eb032b1ad5743d1bd4 SHA512 c15dda62c1f212f623914e61a90c6b1e035720fb84d64726c14f43d77ae7569777a23d04221db34347ce610e7c3407c29e726ae36412e98e34ea2ddb2072b7f3
-EBUILD obs-studio-26.1.2-r2.ebuild 4008 BLAKE2B f4dff57e5e7edf5c6b5a7512cdaab44c764704ae4f9faa2023258d53c1f7f80246c8625b18b7148df37a457c84a9d3e70b9f0d2005a22de0911e5dd7010bfb8f SHA512 08a92ab707e07d73a89cb2227f9bec4790fdc2d62d7e7f8c5cc35a2375ba1269906b90a00f08b70b1737705fd4c7bd619a3ead879fef3d91fda1b605f604d26e
+DIST obs-studio-27.1.3.tar.gz 15994678 BLAKE2B 5544a1ecdb04dca7f6422936ea5499a206b4beb8e5332605c18cd72a91ce73aa74ff06c49a106931822c1c413ee94d383942f173a71f2b21168a00495b4e301f SHA512 04c11c79e3b091aa9ea8fc6674c9fbcaa1c924fe049f68e9be63f63724c31305d6e4fb33aecdd4d0095d20013e2ee188983f6938b175257368d2260681c2fb39
 EBUILD obs-studio-27.0.1-r1.ebuild 5401 BLAKE2B 33a0bde9d9e7ca353f7b14ace507eefaca53dc9ba52ee079c02032789dc851060386d114a5d9f0d5936e6f8bce8d7c535e99ad10a5b2778bbdff0aa6ee41a2a9 SHA512 e95c75cb4c6f08794a12501941660b7a8a2f75bcb4e26315101c67d5e34bdd66b62213f707f176a146531cb314ed9931603df0c3c60f6c52076a8dc4e6e7de34
-EBUILD obs-studio-9999.ebuild 5401 BLAKE2B 33a0bde9d9e7ca353f7b14ace507eefaca53dc9ba52ee079c02032789dc851060386d114a5d9f0d5936e6f8bce8d7c535e99ad10a5b2778bbdff0aa6ee41a2a9 SHA512 e95c75cb4c6f08794a12501941660b7a8a2f75bcb4e26315101c67d5e34bdd66b62213f707f176a146531cb314ed9931603df0c3c60f6c52076a8dc4e6e7de34
-MISC metadata.xml 1581 BLAKE2B d05f9c5d2df5f8c866391d442b464d861d0fcf969dd2509e61b0c6de37fd297a9c89d4610642f87ad12e1fec5b13c401cd7121b2edbfc75e070ddea2c6e5ad86 SHA512 809d3758b41687a9e107cc3f14e7592cba52a74833c6f49581e7c20abb77bb88ff23ee8bb923ee0fee5c090408ceb4aa9799b51a477c2e6feb50ce38eb373a19
+EBUILD obs-studio-27.1.3.ebuild 5234 BLAKE2B e89b74d8a6bf22634981acc3c6dfbbc6dbb1c9bd00356ee87afbe45c182014779bd54cc3666c06dfd7c888ada0b467d2bb471cdcd00edb44e326422e52750283 SHA512 1dde6de38391affd8d3b4c20e6ee8902f88dcdf53c9e134e43d658f28ee6470d05b346aa9b44611c9e0936dd8d431760043080567e65698be69e306974e28dbb
+EBUILD obs-studio-9999.ebuild 5234 BLAKE2B e89b74d8a6bf22634981acc3c6dfbbc6dbb1c9bd00356ee87afbe45c182014779bd54cc3666c06dfd7c888ada0b467d2bb471cdcd00edb44e326422e52750283 SHA512 1dde6de38391affd8d3b4c20e6ee8902f88dcdf53c9e134e43d658f28ee6470d05b346aa9b44611c9e0936dd8d431760043080567e65698be69e306974e28dbb
+MISC metadata.xml 1492 BLAKE2B 640e009dbc42a2f994c0737bf7e301738a52b541cc21b3a569d8988aa75614bf36541a0560fd6c690fca2d65134d8e71e8dae5ee8c19ab6d471dc431c7e2d38b SHA512 47de7d50138f441074dc81157410345790e4def50abe109b961781aba36f47fe413642f44143398be3a23ab8e8c40479622654b8d845bf976468ac8c994007fa
diff --git a/media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch b/media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch
deleted file mode 100644
index 2e52926febac..000000000000
--- a/media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 41367bb2b4732507248f2b3c2e43e2aa46c5ef2a Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Wed, 30 Dec 2020 03:14:34 +0200
-Subject: [PATCH] UI: Fix crash when no audio backends are available
-
-This commit prevents a crash in, for example, Linux configurations
-where PulseAudio is disabled, which leads into 'mod' being 'null',
-which in turn leads into a segmentation fault when an ALSA source
-is selected.
-
-Closes https://github.com/obsproject/obs-studio/issues/3485
----
- UI/context-bar-controls.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/UI/context-bar-controls.cpp b/UI/context-bar-controls.cpp
-index 9dff8979a2..9ef850b6d1 100644
---- a/UI/context-bar-controls.cpp
-+++ b/UI/context-bar-controls.cpp
-@@ -179,6 +179,10 @@ void AudioCaptureToolbar::Init()
- 
- 	obs_module_t *mod =
- 		get_os_module("win-wasapi", "mac-capture", "linux-pulseaudio");
-+	if (!mod) {
-+		return;
-+	}
-+
- 	const char *device_str =
- 		get_os_text(mod, "Device", "CoreAudio.Device", "Device");
- 	ui->deviceLabel->setText(device_str);
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index de6926e47499..b16a1b2e5db5 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -19,7 +19,6 @@
     <flag name="browser">Enable browser source support via (precompiled) CEF.</flag>
     <flag name="decklink">Build the Decklink plugin.</flag>
     <flag name="fdk">Build with LibFDK AAC support.</flag>
-    <flag name="imagemagick">Use ImageMagick for image loading instead of FFmpeg.</flag>
     <flag name="nvenc">Build with NVENC encoding support for nVidia video cards.</flag>
     <flag name="pipewire">Build with PipeWire support.</flag>
     <flag name="python">Build with scripting support for Python 3.</flag>
diff --git a/media-video/obs-studio/obs-studio-26.1.2-r2.ebuild b/media-video/obs-studio/obs-studio-27.1.3.ebuild
index 0ff7ff59c0e0..6e23d6b2b473 100644
--- a/media-video/obs-studio/obs-studio-26.1.2-r2.ebuild
+++ b/media-video/obs-studio/obs-studio-27.1.3.ebuild
@@ -1,30 +1,39 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit cmake lua-single python-single-r1 xdg-utils
+inherit cmake lua-single python-single-r1 xdg
 
-if [[ ${PV} == *9999 ]]; then
+OBS_BROWSER_COMMIT="2a338b7c76d5dd0a6b23f1d49affefd40213b0e9"
+CEF_DIR="cef_binary_4280_linux64"
+
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=()
+	EGIT_SUBMODULES=( plugins/obs-browser )
 else
 	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" browser? ( https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz )"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
+SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )"
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
 HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc"
+IUSE="
+	+alsa browser decklink fdk jack lua nvenc pipewire
+	pulseaudio python speex +ssl truetype v4l vlc wayland
+"
 REQUIRED_USE="
+	browser? ( || ( alsa pulseaudio ) )
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -34,10 +43,11 @@ BDEPEND="
 	python? ( dev-lang/swig )
 "
 DEPEND="
-	>=dev-libs/jansson-2.5:=
+	dev-libs/glib:2
+	dev-libs/jansson:=
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[wayland?]
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtquickcontrols:5
@@ -46,24 +56,46 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
+	media-libs/libglvnd
 	media-libs/x264:=
 	media-video/ffmpeg:=[x264]
 	net-misc/curl
 	sys-apps/dbus
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/udev
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXfixes
 	x11-libs/libXinerama
 	x11-libs/libXrandr
-	x11-libs/libxcb
+	x11-libs/libxcb:=
 	alsa? ( media-libs/alsa-lib )
+	browser? (
+		app-accessibility/at-spi2-atk
+		app-accessibility/at-spi2-core:2
+		dev-libs/atk
+		dev-libs/expat
+		dev-libs/glib
+		dev-libs/nspr
+		dev-libs/nss
+		media-libs/alsa-lib
+		media-libs/fontconfig
+		media-libs/mesa[gbm(+)]
+		net-print/cups
+		x11-libs/libdrm
+		x11-libs/libXScrnSaver
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)
 	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
 	jack? ( virtual/jack )
 	lua? ( ${LUA_DEPS} )
 	nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
+	pipewire? ( media-video/pipewire:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
 	speex? ( media-libs/speexdsp )
@@ -74,12 +106,21 @@ DEPEND="
 	)
 	v4l? ( media-libs/libv4l )
 	vlc? ( media-video/vlc:= )
+	wayland? ( dev-libs/wayland )
 "
 RDEPEND="${DEPEND}"
 
+QA_PREBUILT="
+	usr/lib*/obs-plugins/chrome-sandbox
+	usr/lib*/obs-plugins/libEGL.so
+	usr/lib*/obs-plugins/libGLESv2.so
+	usr/lib*/obs-plugins/libcef.so
+	usr/lib*/obs-plugins/swiftshader/libEGL.so
+	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
+"
+
 PATCHES=(
-	"${FILESDIR}/${PN}-26.1.2-fix-alsa-crash.patch"
-	"${FILESDIR}/${PN}-26.1.2-python-3.8.patch" # https://github.com/obsproject/obs-studio/pull/3335
+	"${FILESDIR}/${PN}-26.1.2-python-3.8.patch"
 )
 
 pkg_setup() {
@@ -87,24 +128,45 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	elif use browser; then
+		rm -d ${P}/plugins/obs-browser || die
+		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
+	fi
+}
+
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
+		$(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
+		-DBUILD_BROWSER=$(usex browser)
+		-DBUILD_VST=no
+		-DENABLE_WAYLAND=$(usex wayland)
 		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_DECKLINK=$(usex !decklink)
 		-DDISABLE_FREETYPE=$(usex !truetype)
 		-DDISABLE_JACK=$(usex !jack)
 		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DENABLE_PIPEWIRE=$(usex pipewire)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		$(cmake_use_find_package pulseaudio PulseAudio)
 		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
 		-DDISABLE_VLC=$(usex !vlc)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
 		-DUNIX_STRUCTURE=1
 		-DWITH_RTMPS=$(usex ssl)
+
+		# deprecated and currently cause issues
+		# https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608
+		-DLIBOBS_PREFER_IMAGEMAGICK=no
 	)
 
-	if [[ ${PV} != *9999 ]]; then
+	if [[ ${PV} != 9999 ]]; then
 		mycmakeargs+=(
 			-DOBS_VERSION_OVERRIDE=${PV}
 		)
@@ -125,13 +187,14 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	#external plugins may need some things not installed by default, install them here
+
+	# external plugins may need some things not installed by default, install them here
 	insinto /usr/include/obs/UI/obs-frontend-api
 	doins UI/obs-frontend-api/obs-frontend-api.h
 }
 
 pkg_postinst() {
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 
 	if ! use alsa && ! use pulseaudio; then
 		elog
@@ -141,18 +204,6 @@ pkg_postinst() {
 		elog
 	fi
 
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-}
-
-pkg_postinst() {
 	if use python; then
 		ewarn "This ebuild applies a patch that is not yet accepted upstream,"
 		ewarn "and while it fixes Python support at least to some extent, it"
@@ -161,7 +212,3 @@ pkg_postinst() {
 		ewarn "Please report any such issues to the Gentoo maintainer."
 	fi
 }
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 4c9f4cd3f3a8..6e23d6b2b473 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit xdg cmake lua-single python-single-r1
+inherit cmake lua-single python-single-r1 xdg
 
-OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b"
+OBS_BROWSER_COMMIT="2a338b7c76d5dd0a6b23f1d49affefd40213b0e9"
 CEF_DIR="cef_binary_4280_linux64"
 
 if [[ ${PV} == 9999 ]]; then
@@ -43,6 +43,7 @@ BDEPEND="
 	python? ( dev-lang/swig )
 "
 DEPEND="
+	dev-libs/glib:2
 	dev-libs/jansson:=
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
@@ -55,6 +56,7 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
+	media-libs/libglvnd
 	media-libs/x264:=
 	media-video/ffmpeg:=[x264]
 	net-misc/curl
@@ -70,6 +72,7 @@ DEPEND="
 	alsa? ( media-libs/alsa-lib )
 	browser? (
 		app-accessibility/at-spi2-atk
+		app-accessibility/at-spi2-core:2
 		dev-libs/atk
 		dev-libs/expat
 		dev-libs/glib
@@ -77,7 +80,9 @@ DEPEND="
 		dev-libs/nss
 		media-libs/alsa-lib
 		media-libs/fontconfig
+		media-libs/mesa[gbm(+)]
 		net-print/cups
+		x11-libs/libdrm
 		x11-libs/libXScrnSaver
 		x11-libs/libXcursor
 		x11-libs/libXdamage
@@ -137,7 +142,7 @@ src_unpack() {
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
-		$(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '')
+		$(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
 		-DBUILD_BROWSER=$(usex browser)
 		-DBUILD_VST=no
 		-DENABLE_WAYLAND=$(usex wayland)
@@ -148,6 +153,7 @@ src_configure() {
 		-DDISABLE_LIBFDK=$(usex !fdk)
 		-DENABLE_PIPEWIRE=$(usex pipewire)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		$(cmake_use_find_package pulseaudio PulseAudio)
 		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
 		-DDISABLE_VLC=$(usex !vlc)
@@ -198,16 +204,6 @@ pkg_postinst() {
 		elog
 	fi
 
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-
 	if use python; then
 		ewarn "This ebuild applies a patch that is not yet accepted upstream,"
 		ewarn "and while it fixes Python support at least to some extent, it"
diff --git a/media-video/peek/Manifest b/media-video/peek/Manifest
index af6b39f7f23d..fd5e5bc30095 100644
--- a/media-video/peek/Manifest
+++ b/media-video/peek/Manifest
@@ -1,4 +1,4 @@
 AUX peek-1.5.1-meson.patch 2447 BLAKE2B 414f23e6ee45c0d259fe591c0bb9cf8a630990d829093275d9e6695525cb7fcd6e064c62bca0f70cfc258b626e0672e59128d4925ef783200b0b939408926db7 SHA512 4685282db9f5730368fb41f93d49dd12785070a44a8df08693e584f13cd78eb571bf48ebf067a026e4bc88b6390123b270433883e59eb88531abbddfd763ce3b
 DIST peek-1.5.1.tar.gz 2659772 BLAKE2B f33686bb023c5589cc61693854337b8ffda35da26ae8b0ea32ebb38d0738fc438424bae67d7eb600889ceb7377e8cc53eb9eaeef9f6bcf9d1a0d285265b4580b SHA512 dc25f24b1f5954ff26f399f86bf0a2a9b90c4d63c9cd33fcd44f16e447d23070c04e760c57bdc8a946e699c3038b8ee7afc44ce6daa7030e2f9e6f071be6eae4
-EBUILD peek-1.5.1.ebuild 1054 BLAKE2B 31a88431bbcde3623fad52f536ba9926ca2c42a6ea5c528a876dae524a577627836a023efce1d25e302fe96afd5b525e7d79c7b891384f379934b2a5453c9af1 SHA512 8b2d67f63d8b971355a12aef4b394b95e7ea412622ef4d3f97a8dcab77becd930ccee7070a6570d4bc23f9cb77c6a7b166adfb53893785a126c0de2033f09419
+EBUILD peek-1.5.1.ebuild 1059 BLAKE2B 97d06f79c531af02137cfdf6d85e0ce49a4a8eaad770275623a99652bdeeabca4b59a906faa4743d8aba08f7e55a9cfa7183067512c0f5d26a38d1255a11c898 SHA512 4d28e0d62d632dcd40d087037fe0647da211c3f274cfaf3fc6df43ac0b502060184be4d2ad150d463c9ff7ad7ea1e0abcc2f65f0b0eea300ee712c221af42d79
 MISC metadata.xml 443 BLAKE2B b6fc092ec03226b755d5b4b9a6cccbd960c5cd80f8abff4021191a1ed75c06ad639e59c81df76ecd68947490f674aab0aab2c717aede0f450eecbb9805ecd0ab SHA512 5383ff30287fb405051e537e2cd9e1a3ebc6ef61fa71ee6fc88aa00cf05c09a6f77a9a3093d4f03373d6eb995562d0e07dce0b3e66fc2bc86ddd8d1a0090832f
diff --git a/media-video/peek/peek-1.5.1.ebuild b/media-video/peek/peek-1.5.1.ebuild
index 3fbafaeb7dc3..93f9631cc1ff 100644
--- a/media-video/peek/peek-1.5.1.ebuild
+++ b/media-video/peek/peek-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="keybinder test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.38:2
-	media-video/ffmpeg[X,encode,vpx,xcb(+)]
+	media-video/ffmpeg[X,encode,x264,vpx,xcb(+)]
 	virtual/imagemagick-tools
 	>=x11-libs/gtk+-3.20:3
 	keybinder? ( dev-libs/keybinder:3 )"
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index c97bf1ab369e..ddbe9b39845b 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,6 +1,9 @@
 AUX subtitlecomposer-0.7.0-mpv-0.33.patch 8812 BLAKE2B 00f0f9eb715c080b7a3f117f88a2aa69c08e553d3370637a09e27d04efdd01615b1f381a31efc415d0a114a0bfbf1ccf2d4d271377094f9bc20b29992ce953e2 SHA512 fe965b896358b969c6eef9e1a0262a59f6776e6f302da5356f447939992a9755285d95a495bd7acfb75fb28e78053557b0414b80c8315588e2f943545f16517f
 AUX subtitlecomposer-0.7.0-tests-optional.patch 242 BLAKE2B 6a3d88a537ad39a151b8a6ac071376eda0d1e5d504e92052b9f55e4693633b47fc2b6986d560bd086adf76630ad24bc3671b88f3bc97f9cb429a9e14ad9376bc SHA512 65f5c8db0c5e99b51600db772c918acb7154c7999bbbbbed18ed859f4defcb70d4f907c02a08d9a7529f3aaf4867d6154b9987fb3528cb100f4daa4466e33e74
 AUX subtitlecomposer-0.7.0-valid-desktop-file.patch 1090 BLAKE2B 4491d0bf738fe19374d40b2d278322694a456ac2d11394853653f44351ddf06714143164773eb6597ba4b6f55cf510803231c1241cca20cdc9822d3892f8e646 SHA512 4f2802be511da0b9f132d4368e23c06510fd0c115c8a19f5c05d0e737c355b3c061d290e38370a5992b85a48d77b23949ce3ebf675b9086d585df5be056e358b
+AUX subtitlecomposer-0.7.1-tests-optional.patch 762 BLAKE2B cc8f7408e165422788ed9f6c3641e816237ef1230e64853ceb0fe83acbbe9a10b3cd2b5670270904984ab3e23ebfe6ea1d07278826a6ab89346ec7502076f477 SHA512 a02f847164f2f117f024c09311b00a55b268f80089c6304b29ffd5bb7166ea3b81c14e65befc36379124f18600cb6d57ae8f320261ecd25bb0e05c754d55cbcb
 DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7 SHA512 b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04
+DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92
 EBUILD subtitlecomposer-0.7.0.ebuild 2005 BLAKE2B 7ef30553b68f40208e46ca6f3338458d7c3269cf8227b8e965dcfd88ef590e6929e40a334135f83e5f2a69161668cfd2e4eede8a8100aa1915526f0b3e29808e SHA512 147ac6581658b440958fa2df73ac346c5656762a2889bd596c8c5bca99faa101b775771bd62b4567187e1e2edf2b780f567c0932f72b5d5b27a1edd2f07ae714
+EBUILD subtitlecomposer-0.7.1.ebuild 1452 BLAKE2B 2be1ce1779b917621b684349c0d4dc6cd225577fbc618eb154c16843cb122545fce024574c15e0fdeed571f5d81a2fd9c2cde74bbd78acfa22b215638f12965b SHA512 664c6addf505a78e8575554ecabdcf236ffb56d9fa0e75e196beaaa0a768e791d2bfef2c627fce53116d33423a6ef960bf1ae39709b96dd57696fab3613cfd68
 MISC metadata.xml 505 BLAKE2B 541cb4fa01f37c2ffe524afedad709d2148a6a6e06887c385ef39beced7f1b65a4ce3754a048563cd1d1463e28d795c9792c5e3ac661c7c1ff86155e7b5df2d7 SHA512 b097071bfcd874fc223a53c6d1772cd93c4da69f342afb1bc463e050b6d155ed7a181599abb15407b4ff7c3d7aa953302a8b919a6c59ca788cbd29c0ea9e7e0d
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-tests-optional.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-tests-optional.patch
new file mode 100644
index 000000000000..75d4f71a2ff7
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-tests-optional.patch
@@ -0,0 +1,27 @@
+From 6e25dd4670f0d14bdc8aff050bdacb050e0327ff Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 6 Oct 2021 20:30:03 +0200
+Subject: [PATCH] Make tests optional
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1cb7098..97d60a3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -124,7 +124,9 @@ else()
+ 	message(STATUS "ICU Library not found. KEncodingProber fallback will be used for charset detection.")
+ endif()
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(scripting)
+ 
+ add_executable(subtitlecomposer WIN32 main.cpp ${subtitlecomposer_RES_SRC})
+-- 
+2.33.0
+
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
new file mode 100644
index 000000000000..6f8b7b633568
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Text-based subtitles editor"
+HOMEPAGE="https://subtitlecomposer.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	media-libs/openal
+	media-video/ffmpeg:0=
+	unicode? ( dev-libs/icu:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
+		$(cmake_use_find_package unicode ICU)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "Some example scripts provided by ${PN} require dev-lang/ruby"
+	elog "or dev-lang/python to be installed."
+}
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
index 2ca96b0f09d7..98a04462eb0f 100644
--- a/media-video/vcsi/Manifest
+++ b/media-video/vcsi/Manifest
@@ -1,5 +1,3 @@
 DIST vcsi-7.0.13.tar.gz 24343 BLAKE2B d3bacb95f470f118d7d0e8cc1f810a069f85bb07eaa15c25e4bee35f8b8fa4c6eb908b1fa791fc48e8510e627e2bd7d1b915a1525cc214130829c03498d9bf8c SHA512 bd5b20635a3184e1bfae5b1ba804124c6af884af5b3a12fcc9130451f084c0496b87b6f1193cd8d6a2b39676a2b91e2266e17c80c2013444cee5bd1dfefc3b1c
-DIST vcsi-7.tar.gz 18350 BLAKE2B 840f17db49a0b538a53bc0c3cd426e117d6a29d4b6f7b1ab7bf2f3a1697ea903a908f19b798c5898abf3cb0d308b34aeffc863517c682b8b9a114f5f9dcefb42 SHA512 5b5a3b9db76003c364aef0574a1b43c1177f5b7dae1339be981d6358c38102f0e7f275c9ec074e7cdd6b042ae30b982cfbbffa35c67eb8e2fc887c00073f2e48
-EBUILD vcsi-7-r2.ebuild 710 BLAKE2B b1d9b77ed98987eeeb969a0d551119528317da3ddad8c633f44d2c0093e15cce48e3714870a5636744027b6f844dc0d25bd990b42e2001ee49daf5f96c5c67ff SHA512 4a5b79d40529f4b63a1015d4785d32381dc427d3db21babbce6daa73543ac22d51034806a0a0aff9c1690725aad558cc7683a1e0a3fa90d28d497ce2faa662f3
-EBUILD vcsi-7.0.13.ebuild 772 BLAKE2B d2ce13ac0feb9dafedaafa425ff1394286361dca3f72aae32f6003d95de1054d9d9f033942f7b7713072645c914912aeb76103d87e08d5080f40661ecc74a5b7 SHA512 255705ad31144af8dc47f9088a65127a66f15dc84eafa72b646a77ad7c896ca59dea13f98d40b380e6ddbb76e23a32edea6a23adbda80146534d70ec94f85de0
+EBUILD vcsi-7.0.13.ebuild 770 BLAKE2B 955b87e4ccc27d2087a52ee0fdf7b88540732ef5fa81df2998112b8ee1419ee5a35869573b12f3631e0f6a8b2e4a110ee97d5f65bae6c9c08f6f01fb78b9fa80 SHA512 2a97f65f11a560adafd20ab18221b22f3be802a4de1ec66a73cd8cef5c7d81088b233d25bdb48fe8eb3305a1799c457867f0cf73976b629591ba65fee858b9be
 MISC metadata.xml 280 BLAKE2B 30756c19f90277ebe700cf4641848ae376453c6031a019f348f04ee8d4c30146947ec383fa4bf12b669df790417eec9285df363210138e39f611d345d127ed27 SHA512 cf301b82fada2d4ca02e1dd9ba7b5234c42b7c63f87b96d81cb06ebc7853934533b75d0fc77eff0dc39f3c0a9e2d468b6bc03ac98fcb3834da67a11b254a0b77
diff --git a/media-video/vcsi/vcsi-7-r2.ebuild b/media-video/vcsi/vcsi-7-r2.ebuild
deleted file mode 100644
index 758e644704a3..000000000000
--- a/media-video/vcsi/vcsi-7-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Create thumbnail sheets from video files"
-HOMEPAGE="https://github.com/amietn/vcsi"
-SRC_URI="https://github.com/amietn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/parsedatetime[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg,truetype,${PYTHON_USEDEP}]
-	dev-python/texttable[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-video/ffmpeg"
-
-distutils_enable_tests nose
diff --git a/media-video/vcsi/vcsi-7.0.13.ebuild b/media-video/vcsi/vcsi-7.0.13.ebuild
index f87b27c9a242..fedc09b71e5e 100644
--- a/media-video/vcsi/vcsi-7.0.13.ebuild
+++ b/media-video/vcsi/vcsi-7.0.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/amietn/vcsi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 5d5d44131c40..1512d0fddfca 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -13,7 +13,7 @@ AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da
 DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
 EBUILD vlc-3.0.14-r6.ebuild 13811 BLAKE2B c7bfa970ce2ed6474b08486cc80d781b71a8149184fe3a61a655417440f530198d2eedceb0f022b54b25f720453925a34fabb41cf539dafb532162614311596e SHA512 e838d26950efa98ba4b39c171c5246beb61d57a25005ed6d04899ccff8c37c0f37081e9545b8ff6d70bbe2b7ab3dff804f4c49fc762178ff05352b66a3a98fe9
-EBUILD vlc-3.0.16-r6.ebuild 13944 BLAKE2B 5de8781f879b874c0fe5f2f52a1ee9d5c07951ff76520b8a8c4cba3583971376b24a21e21199f2990ff58cec3bffacd42916e341b52eb7359d43309276218658 SHA512 5523b34bb9af6a517c8e5c852299801ff35d6bb72a9b2f2e9e4739b45a13f9274ca4c3b6f7811ab1a91e620a3c3e78d418cca2240d933ad3e7241202e180917e
+EBUILD vlc-3.0.16-r6.ebuild 13943 BLAKE2B d723108fe54d617f050da68e70e9ef18efb5dcb34744fb7ae3fe7af0c4da83b32df5e2ce0beb19ad6232f8b4a77c98918a05c6d1d1535651cfde98f908403f1e SHA512 111168b0229b80e9e48d47f09528673e424bc76eb63b1fc4e89b2bc3b6e208a5f79567371e1b5775c62faa9105f14a07d8389314bd4cbc38b545b95b30fe799a
 EBUILD vlc-3.0.9999.ebuild 13484 BLAKE2B 4af596070d8b9a4f4c22d14540863221725a591d34d26979b1b60c06d24923963dd3f1279c8de4f9adefc90b87bf08a88267d1a42324988099c4d656f2a3f843 SHA512 f5cf094b7eb9ce67b10a71719b476f9a960086587dfdb469d09c58e5c449fc1a06aea8532f479d51478d095dd0b92cb04e015d036752c56ad7e188e1ec8b2ade
 EBUILD vlc-9999.ebuild 13496 BLAKE2B 34f910ff15c32ccd8394a2ff55743e242ad89a81188f3f14a064c35825f6bec3cfeb5a07921e3e90aa84a4e4a7f69e9c0e1f3a921335ca64e57200a11461f02d SHA512 1b6da672d51b83c8fab3adca52c4b77cbb731f9d4d0158f41009230cfb384e9c1e0541dad652c5af325df5cf3ac0a612e4f6774e42ff6a44259109f9c2b25d16
 MISC metadata.xml 4912 BLAKE2B 97661f54c1c16cb3084e12ce7899c080e7e69b203c1539b90048cf3d7c1f673b29051fd68216b6bed54f8842990f0c47e2c67038d85e911dcd1c905b54093719 SHA512 c24db55603932f9b52808e0b9d5687a333078d1735c05e1b561d91c08b99246b321b5b60f8111b286041c524d5913ec6f4f321a79c0773cbb9aaaa3fea9a50d6
diff --git a/media-video/vlc/vlc-3.0.16-r6.ebuild b/media-video/vlc/vlc-3.0.16-r6.ebuild
index ec3dc0e57d2a..71358f7fda0c 100644
--- a/media-video/vlc/vlc-3.0.16-r6.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r6.ebuild
@@ -24,7 +24,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 ~riscv -sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv -sparc x86"
 fi
 
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg