gentoo resync : 03.03.2021

31 files changed, 952 insertions, 531 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index fc728861ac17..b06f2ab99085 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index bc1b1db19d8a..fdb1602f4593 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,7 +6,9 @@ DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418
 DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275
 DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876bd1001ad185384fcabb3d0ae196c9ba591e680823b3c7b6e0ef9a0a9e9575a8b08439fdd89ef0e4dabb9d4a7f4e6 SHA512 5c74e3fe77ddf8ffede0e4692d574858dd0626e542380a819ab79c0f669c6c1329ffbccb872502f60306e561f10aa8bc1e61d09b2bea829870fe4a48b76460c6
 DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
+DIST ffmpeg-4.3.2.tar.bz2 11307134 BLAKE2B 97e1e598e4abe397b06298d545c3073ea2303e11c01e98343fe09d99174e02ca94f52c4df0d389fbefe7814686221446d30f107092f00cb0b69275c8747d6f32 SHA512 ec5566f8684f0ceb18184d59786ea1fc166ab28c46260ebcca5b919ad53137ba7317fd0c537e97df28553572a0d5e42c558773c808cf76995d67985aec2d6d4d
 EBUILD ffmpeg-4.2.4.ebuild 18169 BLAKE2B b771bf50bfce5c754963f431f085c29b962bed73e55e805e112986281abf025cf7723e8cdc5f15829d06424aadbc6899c644f5e4ca56a2a113920a13c5c8b13b SHA512 b26527dc7e5c46dbe8b958efd4d5ebd51d91e258c2a6b23d1d9c9fcc4ddbbe72f1ad9751b8dd9273ebd0840003db83db16babc15ca844e33df2a06ac16add793
 EBUILD ffmpeg-4.3.1.ebuild 18273 BLAKE2B eb5dc1bd75ed130f327d5e8c87b7124f43fcc6d1a6120ac3a19e8921d4364553afcd60d615f5cca1ad12321288306107486edcc57f300941af3a66e156a09969 SHA512 bab445d72698e907dd3d11b48bd1d86875d7f1f2db576a03f14623def6435569ac1e28052af4d7d464747a0067d26d6ae116766de707bb8d4f6a630b0b8377d4
-EBUILD ffmpeg-9999.ebuild 18049 BLAKE2B 3d1ebb9b9ce4abc8e5db6da31e600a9db93580a4fa876dde23e0ae4623a3aceba9351b40637d8a6ecc60f0f15c62c438fd8445633e325eaff25c69b64438927a SHA512 dce9ed532ac8a084c03e4d27898de3d5b9fc9afa577d1312e1c157657a3f372faaa594aa83006ec6397ef9cc35b684ce37865a2a0c59624ee88481026be00d1f
-MISC metadata.xml 5868 BLAKE2B afe06c266a6dce5dc2b13a1dcaae85c4288a4f45ef493d9b865bf476a624fb188ebab686708049149f1eac94e434b926b185d1bf0467f26f62f641a0f832dd22 SHA512 8b85ed0ba2d98135b3b2f7f4e13b7fcff52cd4238fa429e355c4e2033e51d945d8363ecf2bf73c0569e5a071a793bb01cd716113e4672603867a01d258d4aa77
+EBUILD ffmpeg-4.3.2.ebuild 18221 BLAKE2B 0724ca54f7e0633e822c5d8dd0089ae987e238b50cf14ef3a110c347a6b36bb0f0bc5e6a15b22cac9ee106de8a318b13a69f954a5bc453707d930f1d7ba08418 SHA512 9a5af768ab3962b28478155ab75e6165779df3e8f8094832d8be018a05c21ee5cb6d572be90cc9276ab73047f93ee96b77c80bc2b1336e7d4c6c117119873c78
+EBUILD ffmpeg-9999.ebuild 18119 BLAKE2B 55142a78f167d96d10769b5459018390ecf42e59ee5f0058d51c498c7d1f20b2228d00795d976b0e70259dfc6cfdadabb2d436b0323867f0710de87b56c7a3ef SHA512 bf2ab6684642c4e1f6e02d2a865460c1a0553a6e6047d634cf824fdd33512ffa9caec535d20729f6b31227e19e26045a00624f65a5066bc1b53613128d0d612c
+MISC metadata.xml 5955 BLAKE2B 59329980a1e72c3899f09ddc2ac217aed5c540e91c1f1e0636ac2f84986e20ea7cdd0e07c9e350aed664933a4b02cfed2001bcd1e47723fba913b24b0d35b3aa SHA512 9c4d77572b982475313acddc8cd0df16a121d3a5363335d4d2a1e3021b3dd4bcda5efec9f4a913349efc532919441852dfa702df22dceda62d6f8af5fd491666
diff --git a/media-video/ffmpeg/ffmpeg-4.3.2.ebuild b/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
new file mode 100644
index 000000000000..565891baca14
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
@@ -0,0 +1,559 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=56.58.58
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_MIN_CLONE_TYPE="single"
+	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
+HOMEPAGE="https://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	libaribb24? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
+		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
+		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
+		libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
+		# libavfilter options
+		appkit
+		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
+		rubberband:librubberband zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar libaom
+	openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame
+	webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode oss pic sndio static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 )
+PPC_CPU_REQUIRED_USE="
+	cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec )
+	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx )
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${MIPS_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${PPC_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
+	dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] )
+		rav1e? ( media-video/rav1e:=[capi] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
+	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
+	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
+	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}]
+	)
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	postproc? ( !media-libs/libpostproc )
+"
+
+# Crypto & co provider magic
+# - libressl is a useflag meaning it should always favor libressl over openssl
+# - libressl and openssl provide more features to ffmpeg than gnutls
+#
+# The ordering is thus: libressl > openssl > gnutls
+RDEPEND="${RDEPEND}
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	!libressl? (
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+	)
+"
+
+DEPEND="${RDEPEND}
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	>=sys-devel/make-3.81
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
+	doc? ( sys-apps/texinfo )
+	test? ( net-misc/wget sys-devel/bc )
+"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	rubberband? ( gpl )
+	vidstab? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+	)
+"
+REQUIRED_USE="
+	cuda? ( video_cards_nvidia )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	!test? ( test )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium-r1.patch
+	"${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch
+	"${FILESDIR}"/${PN}-4.3-altivec-novsx-yuv2rgb.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+build_separate_libffmpeg() {
+	use opencl
+}
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack sndio ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss sndio ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use libaribb24 && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# Incompatible features: openssl or libressl and gnutls
+	if use libressl ; then
+		myconf+=( --disable-gnutls --disable-openssl )
+	elif use openssl ; then
+		myconf+=( --disable-gnutls )
+	fi
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in librav1e libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
+		--disable-libcelt # bug #664158
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--nm="$(tc-getNM)" \
+		--ranlib="$(tc-getRANLIB)" \
+		--pkg-config="$(tc-getPKG_CONFIG)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}" \
+		${EXTRA_FFMPEG_CONF}
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--disable-opencl
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+
+				# When not built separately, libffmpeg has no code of
+				# its own so this QA check raises a false positive.
+				QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*"
+			fi
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 8e2d9a96ee42..2e4b8b8f43c8 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -102,7 +102,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-	alsa chromium doc +encode oss pic static-libs test v4l
+	alsa chromium doc +encode oss pic sndio static-libs test v4l
 	${FFMPEG_FLAG_MAP[@]%:*}
 	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -241,6 +241,7 @@ RDEPEND="
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
 	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
@@ -364,12 +365,12 @@ multilib_src_configure() {
 
 	# Indevs
 	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
+	for i in alsa oss jack sndio ; do
 		use ${i} || myconf+=( --disable-indev=${i} )
 	done
 
 	# Outdevs
-	for i in alsa oss ; do
+	for i in alsa oss sndio ; do
 		use ${i} || myconf+=( --disable-outdev=${i} )
 	done
 
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 7d2db195f9a3..a5e414383d3e 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -50,6 +50,7 @@
 	<flag name="rav1e">Enables AV1 encoding support via <pkg>media-video/rav1e</pkg>.</flag>
 	<flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag>
 	<flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag>
+	<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
 	<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag>
 	<flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
 	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 0fecf5cdafe5..8b44eb70444c 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,5 @@
 AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed
-DIST makemkv-bin-1.15.4.tar.gz 8976023 BLAKE2B 945d5efc61d4302690201a63caa959580476635729d78f8b9fcb0f252af9874b10b9f6a771c724eb76ffe00fa4217773890045b1657335d9910f753c8de5a5bd SHA512 f08377a77807bffc66e34f38975018ebf14a7bba91e0bb7ffce1d8376e52660b9c8f5da154ea5bf55b3d42b57ad301ac43a8c74ec97aad7d40f926029fa09c09
-DIST makemkv-oss-1.15.4.tar.gz 6405606 BLAKE2B 84e958b6004fa66a52186118be1ca696a181e300d21a2be583917181b3f1f87ee47b760e3cbcfc26b4fcdae4711fd18962c42763ce8ec6b176aaf865ab4e45b0 SHA512 f812d63363ddac68d50a0a4b3d2c3dd46000b8775d7885d61d5bf9dde013e3e9ff9cef558bcf54b2d59f5c4725dbfc014d48be3f3996d1055df761072fa4d62f
-EBUILD makemkv-1.15.4.ebuild 2967 BLAKE2B 3056d4075015a84f6878590eeedd697951e38e7bfd238296b7d8b1a07806b3e1983c08381dc4afcb24d039b9da07b0d101fa260b5f75c55d46d2ce5505965dd0 SHA512 9b8758710482309f68c1ad6e8fb862830be9c4affafc5b7dd95e37aaa4fd8b6003831c942d5886162e61bf8f300dde771af86b0d37ae94f9d8eb1b9f1011bbc4
+DIST makemkv-bin-1.16.0.tar.gz 15306173 BLAKE2B 337f367bb4bad174d7786607c4771fdbf1f382a00dee1e515c6ecd4f81351691482f6a6da55caabc00fd99973a17391480156b7852d7812c189a4491aa35bef3 SHA512 8fadeac4966c6b6e76ba3c4b937a7e0a3061a8ee9b48196b15e3ddee9a05b37ba15b4bdfd04c81bf775d780ce7a3703e02523f441b489d69fc20e5098933d05b
+DIST makemkv-oss-1.16.0.tar.gz 6409634 BLAKE2B 893ec6c33b83e77e7b8c4aba4ce17769c0cdc102e1eb2b04990122047a2310e173a6de4d5ba4beb6894fe51cca59317a3e157a89fb5dc005c035caace4e27166 SHA512 b4c3b14decd0d6a49e5a4e2bc3a042042006c248fbb5f9d6dc79695897a524bbc934b9e00cb1a18ea07b4c517093a1f8026e33a705ad14605fd9a5e0d863d945
+EBUILD makemkv-1.16.0.ebuild 2967 BLAKE2B 74b0362791559182073052251d34363cf00d476d80d92edee471e5b59098da9d6157fb13b9b3b38e6c46421058835c49ccc93926688354795c7ca555a0dd5e86 SHA512 ff8210b70501c8064ed5e3d110fe88289e1b9bde09b901a62e1e2a245e660f12c94f2b735f9f534fe936963594d6ca87c88bafb24f152c01674ba3bcb8574dd5
 MISC metadata.xml 1166 BLAKE2B f2e594a7e322225101561a998472a832c3d2559dbfd79817f2fd1eaf9b0e7145fb467b9b0421d13b3df90ece45ff969d97e9e44d9147d4b0a57e4d8fd9104345 SHA512 d8e8d898cf3ee9428fc1b08e292608da7a4f753ad22053a521c475e9445dafa9ac7c2c5139ed4ab9009b0d59e95737f77773d15f8590b8a4cf0f39961d714fb7
diff --git a/media-video/makemkv/makemkv-1.15.4.ebuild b/media-video/makemkv/makemkv-1.16.0.ebuild
index 643dfc37ef2a..f28d5a01e2db 100644
--- a/media-video/makemkv/makemkv-1.15.4.ebuild
+++ b/media-video/makemkv/makemkv-1.16.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
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 29bec4763b56..3b91b83252c7 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -3,6 +3,5 @@ DIST mpv-0.33.0.tar.gz 3259387 BLAKE2B c9ffaccb2258493517814490ab589ef298d6a0ba6
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
 EBUILD mpv-0.32.0-r2.ebuild 9724 BLAKE2B 53877f389a127a2bc44c8d1d30d28872dd93dc1051d03b80a68bc6404daffaf4bcec323f1811d559ae140c6b6db85e0286f8f91949c4438e4b2c3a93328acccf SHA512 07df033b25cb1d70033108e33410e02b65c1059b473fb971d8dd3958388d40dc2f9bb6f879020fcbfc10255508601ed886869b00982bfa93a8d35761006264c4
 EBUILD mpv-0.33.0-r100.ebuild 9704 BLAKE2B 99c260d0e41df5d24e93c3fd7c6a70c51f1a5a261f0f08d79b4a88e50257ad7f5ea441ce8955c9e4a472ff3f24c4da4aed97cec6419e9ed4dc0b30a36adda98e SHA512 47b5c874f8435e540f52b35c1807b691f888611a8f7e18769cdf3453de5b3b69ddde17d1d33bed38219b24925bc63214ae7e0627be3aae2832e34f88887137fa
-EBUILD mpv-0.33.0.ebuild 9402 BLAKE2B 27d1b87eb595164284c98259b9659964c54ff9afeb3bebea7966de2e912fbab21e4ee4be4129653942a6cad75f7dd98452f439c7e5b27892b078f977a8dd1c31 SHA512 3c80283e1cd1baf3dd63b9e81e5c340eb2eabb5df3f1c196706489928e63a7883eff32aed948b1319e5028096cefd14f070647780fc50b1c48fc72302d50c8ad
 EBUILD mpv-9999.ebuild 9402 BLAKE2B 27d1b87eb595164284c98259b9659964c54ff9afeb3bebea7966de2e912fbab21e4ee4be4129653942a6cad75f7dd98452f439c7e5b27892b078f977a8dd1c31 SHA512 3c80283e1cd1baf3dd63b9e81e5c340eb2eabb5df3f1c196706489928e63a7883eff32aed948b1319e5028096cefd14f070647780fc50b1c48fc72302d50c8ad
 MISC metadata.xml 2325 BLAKE2B ea9ce00b54f9aabf4f37dcbf20c94f6583e219638f6831e0f8f3292df0768d7e6c597a9072903604f8dbb7f88ef15cad87b2cbe57a41d22554e554cc6e9663b1 SHA512 84802287f2655571923a44c7383bac2f70838890b18222d0b060a371a79dbe5022bb7c186bb1ac6496b930c62dacafbc132178b60b0746bd2cce4eb08a5c6be7
diff --git a/media-video/mpv/mpv-0.33.0.ebuild b/media-video/mpv/mpv-0.33.0.ebuild
deleted file mode 100644
index e60b0b482c2b..000000000000
--- a/media-video/mpv/mpv-0.33.0.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV=2.0.9
-
-inherit bash-completion-r1 eapi7-ver flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-	DOCS=( RELEASE_NOTES )
-else
-	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-	inherit git-r3
-	DOCS=(); SRC_URI=""
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb
-	dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
-	luajit openal +opengl pulseaudio raspberry-pi rubberband sdl
-	selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
-
-REQUIRED_USE="
-	|| ( cli libmpv )
-	aqua? ( opengl )
-	cuda? ( opengl )
-	egl? ( || ( gbm X wayland ) )
-	gamepad? ( sdl )
-	gbm? ( drm egl opengl )
-	lcms? ( opengl )
-	luajit? ( lua )
-	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
-	raspberry-pi? ( opengl )
-	test? ( opengl )
-	tools? ( cli )
-	uchardet? ( iconv )
-	vaapi? ( || ( gbm X wayland ) )
-	vdpau? ( X )
-	vulkan? ( || ( X wayland ) )
-	wayland? ( egl )
-	X? ( egl? ( opengl ) )
-	xv? ( X )
-	${PYTHON_REQUIRED_USE}
-"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
-	alsa? ( >=media-libs/alsa-lib-1.0.18 )
-	archive? ( >=app-arch/libarchive-3.4.0:= )
-	bluray? ( >=media-libs/libbluray-0.3.0:= )
-	cdda? ( dev-libs/libcdio-paranoia
-			dev-libs/libcdio:= )
-	drm? ( x11-libs/libdrm )
-	dvd? (
-		>=media-libs/libdvdnav-4.2.0:=
-		>=media-libs/libdvdread-4.1.0:=
-	)
-	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
-	gamepad? ( media-libs/libsdl2 )
-	iconv? (
-		virtual/libiconv
-		uchardet? ( app-i18n/uchardet )
-	)
-	jack? ( virtual/jack )
-	javascript? ( >=dev-lang/mujs-1.0.0 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)]
-	virtual/ttf-fonts
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	lua? (
-		!luajit? ( <dev-lang/lua-5.3:0= )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	openal? ( >=media-libs/openal-1.13 )
-	pulseaudio? ( media-sound/pulseaudio )
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	rubberband? ( >=media-libs/rubberband-1.8.0 )
-	sdl? ( media-libs/libsdl2[sound,threads,video] )
-	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
-	vdpau? ( x11-libs/libvdpau )
-	vulkan? (
-		media-libs/libplacebo:=[vulkan]
-		media-libs/shaderc
-	)
-	wayland? (
-		>=dev-libs/wayland-1.6.0
-		>=dev-libs/wayland-protocols-1.14
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		opengl? (
-			x11-libs/libXdamage
-			virtual/opengl
-		)
-		xv? ( x11-libs/libXv )
-	)
-	zlib? ( sys-libs/zlib )
-	zimg? ( >=media-libs/zimg-2.9.2 )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	dev-python/docutils
-	cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	test? ( >=dev-util/cmocka-1.0.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	cuda? ( x11-drivers/nvidia-drivers[X] )
-	selinux? ( sec-policy/selinux-mplayer )
-	tools? ( ${PYTHON_DEPS} )
-"
-
-src_prepare() {
-	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
-	chmod +x "${S}"/waf || die
-	default
-}
-
-src_configure() {
-	python_setup
-	tc-export CC PKG_CONFIG AR
-
-	if use raspberry-pi; then
-		append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
-		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
-	fi
-
-	local mywafargs=(
-		--confdir="${EPREFIX}/etc/${PN}"
-
-		$(usex cli '' '--disable-cplayer')
-		$(use_enable libmpv libmpv-shared)
-
-		--disable-libmpv-static
-		--disable-static-build
-		# See deep down below for build-date.
-		--disable-optimize # Don't add '-O2' to CFLAGS.
-		$(usex debug '' '--disable-debug-build')
-
-		$(use_enable doc html-build)
-		--disable-pdf-build
-		--enable-manpage-build
-		$(use_enable cplugins)
-		$(use_enable test)
-
-		$(use_enable iconv)
-		$(use_enable lua)
-		$(usex luajit '--lua=luajit' '')
-		$(use_enable javascript)
-		$(use_enable zlib)
-		$(use_enable bluray libbluray)
-		$(use_enable dvd dvdnav)
-		$(use_enable cdda)
-		$(use_enable uchardet)
-		$(use_enable rubberband)
-		$(use_enable lcms lcms2)
-		--disable-vapoursynth # Only available in overlays.
-		$(use_enable archive libarchive)
-
-		--enable-libavdevice
-
-		# Audio outputs:
-		$(use_enable sdl sdl2) # Listed under audio, but also includes video.
-		$(use_enable pulseaudio pulse)
-		$(use_enable jack)
-		$(use_enable openal)
-		--disable-opensles
-		$(use_enable alsa)
-		$(use_enable coreaudio)
-
-		# Video outputs:
-		$(use_enable aqua cocoa)
-		$(use_enable drm)
-		$(use_enable gbm)
-		$(use_enable wayland wayland-scanner)
-		$(use_enable wayland wayland-protocols)
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable xv)
-		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
-		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
-		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
-		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
-		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
-		$(use_enable vdpau)
-		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
-		$(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
-		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
-		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
-		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
-		$(use_enable libcaca caca)
-		$(use_enable jpeg)
-		$(use_enable vulkan shaderc)
-		$(use_enable vulkan libplacebo)
-		$(use_enable raspberry-pi rpi)
-		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
-		$(usex opengl '' '--disable-gl')
-		$(use_enable vulkan)
-		$(use_enable gamepad sdl2-gamepad)
-
-		# HWaccels:
-		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable cuda cuda-hwaccel)
-		$(use_enable cuda cuda-interop)
-
-		# TV features:
-		$(use_enable dvb dvbin)
-
-		# Miscellaneous features:
-		$(use_enable zimg)
-	)
-
-	if use vaapi && use X; then
-		mywafargs+=(
-			$(use_enable egl vaapi-x-egl)
-		)
-	fi
-
-	# Not for us
-	mywafargs+=(
-		--disable-android
-		--disable-egl-android
-		--disable-uwp
-		--disable-audiounit
-		--disable-macos-media-player
-		--disable-wasapi
-		--disable-ios-gl
-		--disable-macos-touchbar
-		--disable-macos-cocoa-cb
-		--disable-tvos
-		--disable-egl-angle-win32
-	)
-
-	mywafargs+=(
-		--bashdir="$(get_bashcompdir)"
-		--zshdir="${EPREFIX}"/usr/share/zsh/site-functions
-)
-
-	# Create reproducible non-live builds.
-	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
-	waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use lua; then
-		insinto /usr/share/${PN}
-		doins -r TOOLS/lua
-	fi
-
-	if use cli && use luajit; then
-		pax-mark -m "${ED}"usr/bin/${PN}
-	fi
-
-	if use tools; then
-		dobin TOOLS/{mpv_identify.sh,umpv}
-		newbin TOOLS/idet.sh mpv_idet.sh
-		python_replicate_script "${ED}"usr/bin/umpv
-	fi
-}
-
-pkg_postinst() {
-	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
-
-	for rv in ${REPLACING_VERSIONS}; do
-		ver_test ${rv} -lt 0.18.1 && softvol_0_18_1=1
-		ver_test ${rv} -lt 0.21.0 && osc_0_21_0=1
-		ver_test ${rv} -lt 0.24.0 && txtsubs_0_24_0=1
-		ver_test ${rv} -lt 0.25.0 && ! use opengl && opengl_0_25_0=1
-	done
-
-	if [[ ${softvol_0_18_1} -eq 1 ]]; then
-		elog "Since version 0.18.1 the software volume control is always enabled."
-		elog "This means that volume controls don't change the system volume,"
-		elog "e.g. per-application volume with PulseAudio."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
-		elog
-	fi
-
-	if [[ ${osc_0_21_0} -eq 1 ]]; then
-		elog "In version 0.21.0 the default OSC layout was changed."
-		elog "If you want to restore the previous layout, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
-		elog
-	fi
-
-	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
-		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
-		elog
-	fi
-
-	if [[ ${opengl_0_25_0} -eq 1 ]]; then
-		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
-		elog "the 'opengl' video output and no longer explicitly requires"
-		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
-	fi
-
-	elog "If you want URL support, please install net-misc/youtube-dl."
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-src_test() {
-	cd "${S}"/build/test || die
-	local test
-	for test in *; do
-		if [[ -x ${test} ]]; then
-			./"${test}" || die "Test suite failed"
-		fi
-	done
-}
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index e02c2a5b2a63..6a26d7fb6d37 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,7 +1,7 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
 DIST openshot-2.5.1.tar.gz 60217543 BLAKE2B 3f195b14a9fb004e845c731be64138c20da84ac0c90db43b547ee9ea059d32f85ada04aa0462b755a7ea5c3d3b30088fab35414147dded55deb9d5eab5926d2d SHA512 8254a45254bbe523b6485b9598022de2c46ec30818e606ac4665790d29486693c4efe9f5bc55ee43d6342de6782cf0090e4bc880e831c08e3b1218bca555af14
-DIST openshot-2.5.1_p20210103.tar.gz 64704590 BLAKE2B 47f2f6543c21250cc3ec0be68f58825698914369c3f63a65705379d61ebd8feb884d3568b622dcd4f619f3bcc6884930ecf6614319000c3c9b06dc730c4717f6 SHA512 295a84e6d0a0e7604bd54f0c215a9bf8ff655bb325c8a80a9f1ab77da0cd63a9622b21e906f6a4208c898084795ccc7d0ad99009a5a57b5c4fb2593abe91117b
+DIST openshot-2.5.1_p20210130.tar.gz 64770353 BLAKE2B 4d7e25a6b8e174051fb0f1ef4bef8a118ac75084ff4a24fce1fdb86975ae87b23f92dc29202fe180c862ea1df3a1b47ef799757f6fb87f7d985a78a64f0a66cb SHA512 9881a099448fc94d413c0d8dab8b31952c6cea09723e56e55ce9b45453e6783cc9aab8c157704c48974a1cb502ff7d6d93b2b3cb08a60fcf05a85ab8ddfc3871
 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_p20210103.ebuild 1339 BLAKE2B c6faba09d6c411dc6ad2853d1a680a70302ddb65edfd0aaf3969795613d9747a4e6efec70ae3933377269d876dc34ec385b7f8188981573a1bcc8ff820ed687b SHA512 970e2e41a114f19c9edc229d7a83a800cb50ee990a560d340a368e037389e00ca6ed24fac95ea027b2170008c2012cac8d426d5f94290b01f110637e8009acca
+EBUILD openshot-2.5.1_p20210130.ebuild 1335 BLAKE2B 5840043488e70ecd343dbce4d1bfd3b6a498d7e55b50983d40d7dfc01bd474d0d911e0199411a679f7630cb36f4c0929e0f8d8c5e05c96bf3f845467e5b7f8a9 SHA512 e744ae23ff87e3a86b2f2d8b116f444273f0f52cc8c5a4f1105656ca48e98a6725c901586394a5f5005df5d02bcaac5a65ca2353b0fb56bd03bbff8b99626e57
 MISC metadata.xml 520 BLAKE2B 78c1c2c7058fe041a5aa1e783622529dd897a609ce801d718466c7d14b9b5ccd05ba496f468f9100301f20ccfa04c3824aed975f39f7febce487b87bddce9282 SHA512 3d2227d47b72451b5b600384ef70b3085a8e46cba1f076d05c558b69ef50d18084dd31d2f14323237c1500842ddea664bcc78a68de9f9d5d472f44ab90a6c325
diff --git a/media-video/openshot/openshot-2.5.1_p20210103.ebuild b/media-video/openshot/openshot-2.5.1_p20210130.ebuild
index 1811844172ee..b3e91e5b060e 100644
--- a/media-video/openshot/openshot-2.5.1_p20210103.ebuild
+++ b/media-video/openshot/openshot-2.5.1_p20210130.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE=xml
 DISTUTILS_SINGLE_IMPL=1
 
-COMMIT=2463d0ee137bfe3cbb097319173898849e26a2ba
+COMMIT=14ecc519d8390d6fa76cdc03e0d79a0fb5ca12a7
 MY_PN="${PN}-qt"
 inherit distutils-r1 xdg
 
 DESCRIPTION="Award-winning free and open-source video editor"
-HOMEPAGE="https://www.openshot.org/"
+HOMEPAGE="https://openshot.org/"
 SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${COMMIT}"
 
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 20b5108b8733..56cf782bb7d9 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,8 +1,3 @@
-AUX parole-1.0.5-desktop-QA.patch 580 BLAKE2B d72f55a3cfe31c5998f4659c49e8b2450170ba1961fe0db90df83686fbf7e69d0475d22dadea349409773c43c27b88b9bb64a0eba0d7fd3fd43183d41c8c4e05 SHA512 c3ce1187485d5b5d5baedfd3af6c1ecb2c79c0beee4edf24b5b68412ed11dbb026456f7ebe3260d9a70fd4569d3c4c43e8d395c56d5d2fc23d847315f469ffcc
-DIST parole-1.0.5.tar.bz2 929983 BLAKE2B 542cee0e45b0f2219235211daf161984a50849cb864f00351c3f1c112b4a6cd11fdda4dd8b2fd6ebc0bf5984542135453bbf9180b458c6cfa76b740419806bfd SHA512 458b042752919d4dd1bfdaceda2b281b07a3094d986a99ec2ff51c12b7ca32adba6ce67ecb67e9ab70bdf83cfa22f8b5027054e2c3a3cf71d50ec8b98eeb24df
-DIST parole-4.15.0.tar.bz2 914253 BLAKE2B 5f783e62be640194be2872d3e38cbba90f093bb7a788efa82be8a05cb32b8e62d5b1df695b173c4b0c3a3738b3ce0dd642a589324a3bfeb418c5ebb76b81e1aa SHA512 456a88769b6fb13e8f34df6b0533a8271d1bd8291a1d90f57a3827a06a8c97d04f3ead5446cc55fd765d77d6f919cf5c15b8ddc7c7774f24e098333654b25b58
 DIST parole-4.16.0.tar.bz2 924955 BLAKE2B 7f5c9994e65ce66aa34211047228840e1747cbbaebe0f03d27501d54ef0372e55f294f37869bfaba378e3ab6447e9824798d0c9906549b7c822ce60c54ac81a5 SHA512 fe4723ce3e2106935b4577647920d6759ade3311ef92d5633a309aeb930b81974dd8e5f65958a304a117e614341cba032a54d0c81bdd386d592c64ed2aa31124
-EBUILD parole-1.0.5.ebuild 1317 BLAKE2B 2f34fb5dc05c7065cbab972fbc799eb9299258d29b570476e04d8a39bcd6f98b563546b70a1bc7528a1b5f56997bf8da139c96f60c47eb5ab489ba71c28596c5 SHA512 44f97b2acb18fd8ee5a84e8753e2eb0d7bba350a5e69505e403f0d19c42cf55a3264305a1255f7c8d38a0a471c8138be81d482f1c5282c0a5a64ccfb4427d129
-EBUILD parole-4.15.0.ebuild 1344 BLAKE2B 35c18ad51e08c08a564d2c70cef30f6bdd760ee568e814877647bbca3cc0d4a852cadc8a3a953e582ba566a38f9f1e161f11ea3aeb8d12f30fba86c4a2d6d404 SHA512 8df6edf9315b47101d420ed9948f5c8178d2639081a4ea922f7022a55661e0ba92584929fd5c8c492680afb122bc9a9acab99a1956f7c32b3fa1582cb91ece39
-EBUILD parole-4.16.0.ebuild 1344 BLAKE2B f075b497a1dceef359ca9f4f25e1ba49e70b8b7533e79f8c18c92a6d55ded7be5d41fa17cb7c7c8557e2bd691dee27e9eef91022d0bb8325e7f45722c0b86bc2 SHA512 236bb45c634e841ce853d99b334c5edfebdce9185af9d4e8b0264db96e020f1477f23814ff34d50c6b9fe135b94aaad1658ae36134c2b53570df1ab9851b5e84
+EBUILD parole-4.16.0.ebuild 1342 BLAKE2B fb8b97521c55d8f1a1917dfff81a20ffe05129309b930885b44e6f910e62151728a068a6c56f10286265c5eddd2401aba80a6cf24d6c9b1ec6df10a3c97bca88 SHA512 5504fc93a5dd309be845b08a5bb12d6d6728a6513255938351557cd2b589805bada1d6942166c31409e14179b1a824f58bc18637127f1895d1ec620a1c909b89
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/media-video/parole/files/parole-1.0.5-desktop-QA.patch b/media-video/parole/files/parole-1.0.5-desktop-QA.patch
deleted file mode 100644
index 1b4d387837ec..000000000000
--- a/media-video/parole/files/parole-1.0.5-desktop-QA.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/data/desktop/desktop.sh
-+++ b/data/desktop/desktop.sh
-@@ -18,17 +18,14 @@ echo "[Desktop Action Play]"
- echo "Exec=parole --play"
- echo "_Name=Play/Pause"
- echo "Icon=media-playback-start-symbolic"
--echo "OnlyShowIn=Unity;"
- echo ""
- echo "[Desktop Action Previous]"
- echo "Exec=parole --previous"
- echo "_Name=Previous Track"
- echo "Icon=media-skip-backward-symbolic"
--echo "OnlyShowIn=Unity;"
- echo ""
- echo "[Desktop Action Next]"
- echo "Exec=parole --next"
- echo "_Name=Next Track"
- echo "Icon=media-skip-forward-symbolic"
--echo "OnlyShowIn=Unity;"
- echo ""
--- 
-2.26.2
-
diff --git a/media-video/parole/parole-1.0.5.ebuild b/media-video/parole/parole-1.0.5.ebuild
deleted file mode 100644
index f7e2dcaf64b0..000000000000
--- a/media-video/parole/parole-1.0.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A simple Xfce4 media player using GStreamer"
-HOMEPAGE="https://docs.xfce.org/apps/parole/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="libnotify taglib"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.32:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	sys-apps/dbus
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	taglib? ( >=media-libs/taglib-1.6:0= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS=( AUTHORS ChangeLog README THANKS TODO )
-
-PATCHES=(
-	# 740516
-	"${FILESDIR}"/${P}-desktop-QA.patch
-)
-
-src_configure() {
-	local myconf=(
-		# clutter backend does not work with new GTK+3 versions
-		--disable-clutter
-		$(use_enable taglib)
-		$(use_enable libnotify notify-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-video/parole/parole-4.15.0.ebuild b/media-video/parole/parole-4.15.0.ebuild
deleted file mode 100644
index 8eae0704c490..000000000000
--- a/media-video/parole/parole-4.15.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A simple Xfce4 media player using GStreamer"
-HOMEPAGE="https://docs.xfce.org/apps/parole/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="libnotify taglib"
-
-DEPEND="
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.32:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	sys-apps/dbus
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	taglib? ( >=media-libs/taglib-1.6:0= )"
-RDEPEND="${DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND+="
-	x11-base/xorg-proto"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# clutter backend does not work with new GTK+3 versions
-		--disable-clutter
-		$(use_enable taglib)
-		$(use_enable libnotify notify-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-video/parole/parole-4.16.0.ebuild b/media-video/parole/parole-4.16.0.ebuild
index 3cbe5981f0a4..185f0d300764 100644
--- a/media-video/parole/parole-4.16.0.ebuild
+++ b/media-video/parole/parole-4.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="libnotify taglib"
 
 DEPEND="
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 6cdacdc405ba..68bf2adc0e41 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,7 +1,9 @@
 DIST pipewire-0.3.18.tar.gz 1277055 BLAKE2B 4a18bd668afaf144d6e83590293a744b6d2c2a7d8e9fc6ab581f22d294fac5a4841098875f8569f36b794c083e4ec9f0b7d4e29a10dc79286a4843996f7fb64e SHA512 933b15908e30c389555dd9f82f87c2e571b4cb078bfbe5ed1858440166093cdee2b1c15da50bc5ab36087b62e216786b95c2aad9403e5047ae33e4fe8a6f4cc5
 DIST pipewire-0.3.20.tar.gz 1228482 BLAKE2B d5c51a7da984b075d4fd2504ecc2082527807a6319a42c44b09a687112c2ba10746a2554997e8f6fa36a06cdf5b94b4099adb1f8ee986673855db6e8e0356468 SHA512 7838cafe413e5082146e39a8d2cd29ec5193da68fa76c4d2b9390cbdf06d388c5a8b76f90fadf5f7ece4a8b1b86c3765b3fa968479f3bb9e11e84be006276c1c
 DIST pipewire-0.3.21.tar.gz 1243935 BLAKE2B b736a0253e8c0af96f7bdc47684d52bc8e70d4b2310b80a1b036ae3ef30fd042e1ad641aae342f9727b3191a38cfd36794879bf54954124b99984e2841aa7373 SHA512 cd1e7696c5712dfbd0f5ebffbb74f23ce5f6752744b062741546d55d524a4dca43776e1862fdc55faf5220c23f7ef9e0c5f9c3b1892a6b43ad50dfb99b9a66cc
-EBUILD pipewire-0.3.18.ebuild 3424 BLAKE2B b9ce5c2c50a0482f83e6496ab07d493a11701a6a21caf33c45343b985066f0dbaf689788b37043c478df9c304115852a93f93ec661f2e63ef8a8fdd9d152c733 SHA512 b284e43068eab2efe7405c6c02e7a93fa4f365766108c610cfc14d1eb905fcd151978e616a9cd75ba30ff02ba9465ab9c57d3ba670013de0855361cff5878500
+DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
+EBUILD pipewire-0.3.18.ebuild 3423 BLAKE2B a17234221cb84d36eab89a48f3dfe13a910bc02c67de3ab9462ad081d115922c53928cb0896393b7ff78a99447f588fbc9a31033e6048bbfb09a204ffb8d514b SHA512 1931d14b75e0e99ef4b7ff0d661a942dab3d8d9cb90e8dc6f5d723ece66824906c474aa40af6f03ab751db0356d9a36e336ad3b1aeece6bdd38276355f0b1d1d
 EBUILD pipewire-0.3.20.ebuild 3427 BLAKE2B ed91881ae1601a21ed6cd37b2f9bfe0115665fc7641556e82bb6909749897a05648deb4da277a56d4c33d984f608689b5e5a2bc2d219e8148ed87a0aefb41dfd SHA512 9d759021ed8c9e2827b2a42bce67d04346e7175792068730a4f69d25d527eda9a9e9d4c1b1ee41b80696274c007f28d089ca64954ebd956d34711da7d0f85d9c
 EBUILD pipewire-0.3.21.ebuild 3427 BLAKE2B ed91881ae1601a21ed6cd37b2f9bfe0115665fc7641556e82bb6909749897a05648deb4da277a56d4c33d984f608689b5e5a2bc2d219e8148ed87a0aefb41dfd SHA512 9d759021ed8c9e2827b2a42bce67d04346e7175792068730a4f69d25d527eda9a9e9d4c1b1ee41b80696274c007f28d089ca64954ebd956d34711da7d0f85d9c
+EBUILD pipewire-0.3.22.ebuild 3182 BLAKE2B 7efb20ec88851099d65bb7c81bd02f1879ae83f6cec4e60995481dc683525dfa8d441ef21130c57d8bcef6e25f52f0a94181de2d9c7ab361339876c45236ddba SHA512 0226e9fd616ffa406423e1869a330f01d4466d69c722195f41270944ecdb8eeba04eefc33eb56419afb792ad21201fe462744d4321cacfe6216fa7173c14a96f
 MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/pipewire-0.3.18.ebuild b/media-video/pipewire/pipewire-0.3.18.ebuild
index 759010548f6e..437e30b364af 100644
--- a/media-video/pipewire/pipewire-0.3.18.ebuild
+++ b/media-video/pipewire/pipewire-0.3.18.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/pipewire/pipewire-0.3.22.ebuild b/media-video/pipewire/pipewire-0.3.22.ebuild
new file mode 100644
index 000000000000..df878e910a63
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.22.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
+	EGIT_BRANCH="work"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="bluetooth debug doc ffmpeg gstreamer jack sdl sndfile systemd test vulkan X"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	>=media-libs/alsa-lib-1.1.7
+	sys-apps/dbus
+	virtual/libudev
+	bluetooth? (
+		media-libs/sbc
+		net-wireless/bluez:=
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack? ( >=media-sound/jack2-1.9.10:2 )
+	sdl? ( media-libs/libsdl2 )
+	sndfile? ( >=media-libs/libsndfile-1.0.20 )
+	systemd? ( sys-apps/systemd )
+	vulkan? ( media-libs/vulkan-loader )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	spa_use() {
+		if ! in_iuse ${1} || ! use ${1}; then
+			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-i src/daemon/pipewire.conf.in || die
+		fi
+	}
+
+	default
+	spa_use libcamera
+	spa_use rtkit
+	spa_use bluetooth bluez5
+	spa_use jack
+	spa_use vulkan
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dexamples=true # contains required pipewire-media-session
+		-Dman=true
+		-Dspa-plugins=true
+		--buildtype=$(usex debug debugoptimized plain)
+		# alsa plugin and jack emulation
+		-Dpipewire-alsa=true
+		$(meson_use jack pipewire-jack)
+		# spa-plugins
+		# we install alsa support unconditionally
+		$(meson_use bluetooth bluez5)
+		$(meson_use ffmpeg)
+		$(meson_use jack)
+		$(meson_use vulkan)
+		# libcamera is not packaged
+		# misc
+		$(meson_use doc docs)
+		$(meson_use gstreamer)
+		$(meson_use gstreamer gstreamer-device-provider)
+		$(meson_feature sdl sdl2)
+		$(meson_feature sndfile)
+		$(meson_use systemd)
+		$(meson_use test test)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+
+# 	# TODO: this breaks alsa users
+# 	if use alsa; then
+# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+# 	fi
+}
+
+pkg_postinst() {
+	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
+	elog "by setting DISABLE_RTKIT env var."
+	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
+	elog
+	if use jack; then
+		elog "Please note that even though the libraries for JACK emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
+		elog
+	fi
+	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
+}
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index 573aba5ef192..c3e213687dfd 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -209,6 +209,6 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST y4m-0.5.3.crate 11447 BLAKE2B d3a7081899f12a50907ecbce6f63f1b1119618aefdc97bf967d5fe5b908b234552aac0fe96cc359f12aad7018af8b47b34b6219e0d87d036c8b4df1c1bcf1a27 SHA512 2d414d178c4bc16db7f5804987494629d12b85b409327012db2e9e868a7bb952cb630a86190fb455228ae40776b2c30c042eca65a1d3730e8425daf53f034991
 DIST y4m-0.7.0.crate 12045 BLAKE2B 4f48eb7ad5be2486e0f723b9beb9109cd1b38a0d0c5ac4a64411fce0bd9371d45496e5e0e839d15e7d1616b3888cfc1a0fc1ca364e65ac508306cad9a4ed44a7 SHA512 b85b0dd6df46c9bf125eee3e51ea39545ea1c794a2a097bba0aa31c682532ed3a9ba141745c61915fff13535fc5fff5a490d7c9e731c75bb5ce38a702075467e
 EBUILD rav1e-0.3.5.ebuild 4218 BLAKE2B b4a4e63de87d673c12f814a174598ec8dea06bf208d6e4f0f7e6c6bb4e2f6b53051c1cf220be8335f1757cb85aa495104f91de621a079a1c9a7fb7b8d3e503f5 SHA512 69bd68f8a5b077f63eb43765c7d07a9681cf8ff2f9d89bf7c331fb35789a2f8ee779f45fc592618eced604b1b6e632ab4bbf5dc7e8ad93823b4c32133dbaf71f
-EBUILD rav1e-0.4.0.ebuild 4473 BLAKE2B cd09adfd6b818c15f7b235eeb8670e177e2861ece3789e4bcee2fdd1659194fdb8484dcf977b70dc9af9dd9fdd6d4b4844f3297050a331b4cc00de63872e1e41 SHA512 f46d6913e2475f2cc08f78437bee00609cfe766017337f6b49ce95bae353644373efa79a2f9eb7b193cbf36d458a382c36d78e142a0162e3540a9ea649c46c26
+EBUILD rav1e-0.4.0.ebuild 4468 BLAKE2B 8760cdb7b50991dd861b6010eff114e71af8ddc1979eff893f8e5b85729971ffc5d8fa46714ee80a488f2ba7b05a78e71bc1d377c5a477653239e1cf53d7d290 SHA512 2435c1737201fee6eeb7008f7f292abc29ea899d5f64c0e3a6475d78ae711d64306bd640232c3bc71d8d82dbf70f0a565fcd87b17e6661934109f4ab597f2a6e
 EBUILD rav1e-9999.ebuild 1361 BLAKE2B 8eaf63b69c5eef56c0e7fb725aea974e688da362dec3cfe1bac18562f281102e0f4430c1dd612c66425e60d7146b2b8e5504717229cd19e260834c2d2bd6e74b SHA512 e0f16779f8646fe7f283a5f0a07b3374aa5db1f31155637780a0dc3d25148664373e92907e27d4a1259e063d7a392c8a9e320a21bf05c4bbc4fe756fa5b8d1c9
 MISC metadata.xml 396 BLAKE2B 3f15123aeeca6df02c1b6a886418af6cfd4e4e977a5a93b2cc13301ae8e5a17a918a9e8116e19ae120cc27e42bcdaeb5e6c546f99b0333144bbc4aa9960b862e SHA512 4d650221196a5f48b12f2dcd6ccd3ea56abc7ec205e78d470aae267c7706cf81f03a691ca916d5c2a8c9e09a62c07b0802b5c688bc60bbc09d74ea7a135278ed
diff --git a/media-video/rav1e/rav1e-0.4.0.ebuild b/media-video/rav1e/rav1e-0.4.0.ebuild
index 3b505d6cad28..02ade85c4947 100644
--- a/media-video/rav1e/rav1e-0.4.0.ebuild
+++ b/media-video/rav1e/rav1e-0.4.0.ebuild
@@ -193,7 +193,7 @@ else
 		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		$(cargo_crate_uris ${CRATES})
 		"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 
 DESCRIPTION="The fastest and safest AV1 encoder"
diff --git a/media-video/snappy/Manifest b/media-video/snappy/Manifest
index 4633ed6952d8..a21e046cf76e 100644
--- a/media-video/snappy/Manifest
+++ b/media-video/snappy/Manifest
@@ -5,5 +5,7 @@ AUX snappy-1.0-configure2.patch 699 BLAKE2B d13d0341607ab5acbc134786d88cc522ec8e
 AUX snappy-1.0-string-concatenation.patch 921 BLAKE2B 5e8726793991b93e235529a219ab0cbf4ec899b3fe38cdfa2a30dadfaf410d139b9bb0590b3d486408fea8a87936911d753b9741b1596057687532bdd383dd03 SHA512 4ad47d7907ec77de2ffa866305ff23390915f7f6f27883e4a035e862116cd3e418addbd600954d2a52b8a8ae1c22803e57d672fddaf5e955da6e3110a950671e
 AUX snappy-1.0-video-texture.patch 1126 BLAKE2B fba2134c9a44429046c63b93db40d744ff1e658c8a5736b0e187f22b4b5a91e40b6774947deb9d9f36f390a0a75a08044b06f2cb9202cb31501c61bc46204aa2 SHA512 b139b5ed43ce85240015467330f17f244bcca59533d203c29d60955ba9992d8cca9f2715d928551fdb5cc92c0618ba60df6a51ffe798d19bbc0532dccf58a810
 DIST snappy-1.0.tar.xz 282964 BLAKE2B 9855e3c9397ccde1122c22066cc33e98fda93cb364c03d8649a823dddc9de81bb9eaa89002f3fd1410b6910433e554d231774524da1cd917138c3154c6ed153b SHA512 d8a3fd3a598efde4d699cc8fa13bee1239917a877627b26d5d278af5fd1824f02acf5ce685f8bf994087b3374de9917a5aa4f6f6ebe94f385c8d3bf91887eca9
+DIST snappy-ebf8e3ed30013e6577fa8994db40743d2ec05e94.tar.bz2 80663 BLAKE2B 1bf4b654c4c8c1b8b5cdbb71295c231588a03034e1ad3691e4c80f6e5439b420a76124d5f7a073eb225a13db99b32745dca3fe6845fbfe3bca6a685810fa7f61 SHA512 adc6c514dc38bab86d100aa481be09a75160a9641cfe32f467cc524ef7a006dabbbd450587c007d6a980e8e4b974b49629295e6cf791be3b42401b45168040f3
 EBUILD snappy-1.0-r1.ebuild 1360 BLAKE2B 4867a12555dfab28d6b3db9cf9c214796322cab950c016dc0f095d2b00524c9340fec05c72d1af2e0f474c980ac5100b118ca2f5391194f703d0a262e9adcdba SHA512 e40cee3f9d1a7bcb0bee096b876e36afc7eef9f09fdeb43497b6ba2a1a8b471f30352d866324bd788dad45273f584389eb3cba7a88f499563999bc7676c0be26
+EBUILD snappy-1.0_p20200428.ebuild 1054 BLAKE2B 82623450455ea4ac6da8a47098c4b01a1ada110bf87d50b796f7e14a02af0f708af1cb149d5c422d29a581106a3a36471316b3af3fdfe6c0c81da745555a8b0b SHA512 4ee1f80a7d4457a9c6044933eacf54595b48b950494b8bf44ee35fdb423a545eacf545ea5341196091da7a3a34c704d672caed82645167ea7c16276639b2afc6
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-video/snappy/snappy-1.0_p20200428.ebuild b/media-video/snappy/snappy-1.0_p20200428.ebuild
new file mode 100644
index 000000000000..572a173dfe7c
--- /dev/null
+++ b/media-video/snappy/snappy-1.0_p20200428.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="A simple media player written using GStreamer and Clutter"
+HOMEPAGE="https://wiki.gnome.org/Apps/Snappy"
+COMMIT_HASH="ebf8e3ed30013e6577fa8994db40743d2ec05e94"
+SRC_URI="https://gitlab.gnome.org/GNOME/snappy/-/archive/${COMMIT_HASH}/snappy-${COMMIT_HASH}.tar.bz2"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=media-libs/clutter-1.20.0:1.0
+	media-libs/clutter-gst:3.0
+	>=media-libs/clutter-gtk-1.6.0:1.0
+	>=x11-libs/gtk+-3.5.0:3
+	x11-libs/libXtst
+
+	>=media-libs/gstreamer-1.6.0:1.0
+	>=media-libs/gst-plugins-base-1.6.0:1.0
+
+	media-plugins/gst-plugins-meta:1.0
+
+	!!<net-misc/spice-gtk-0.19
+" # File collision -- /usr/bin/snappy with older versions
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	DOCS="AUTHORS README THANKS ToDo docs/*"
+	gnome2_src_configure --enable-dbus
+}
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 14193f4c673b..295cb61ae081 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,4 +1,5 @@
 AUX 3.34.1-gst-inspect-sandbox.patch 1828 BLAKE2B 9abd87afc62c784c4e5f79374d0172da0295cee520a9aa3ce2d4a2471f3e94accd7f14746fb93873767a5a11a2c9143b9387bf70295cc792199df62f501f73de SHA512 c312ddee62695b4344917eb2c7cca67284f3c7b24b21f35646f8b315bded9827aec05056fd17eadfe35da3dd876f20fd7b2cadd2141d04843c3c96d5f0346b21
 DIST totem-3.34.1.tar.xz 2157160 BLAKE2B 9ae9c8f6485c7377af07803c328e8ea3cc6fa80d8e30a7045bd2b50f7bc3d5a12582e5b60d901d22683f89e994c619c26ddb8b0890e343c873d4457fa177786d SHA512 9a3556f5cf522fca29926db185c2e5d25bdb80a25e14d0ba3062a7f15fc3ec40ae9f25752763bc444d4fd82ec2098efd732da662a1b1c5923ec19fde432606db
+EBUILD totem-3.34.1-r1.ebuild 2791 BLAKE2B aeed204e0cd252f1445fb9d97106d3e1c027352241bb5ea9f1bddb52dd9dd90016cc01020e7c40756aed4882c7d8df387ed5cd541d3a177b31db4e7510abd541 SHA512 051c6aed8c037fa27d4ad42da24a2aac4f98d79fe5edd8ae3372baa470761da49ac3df8cb8bc63f9623ff4b081c3ae64d6c4aae469c3bf3b6c3da7602bda3114
 EBUILD totem-3.34.1.ebuild 2787 BLAKE2B aa2b12503566a4bd278e0dc62e4e5a81043e7ae5eb1ea08e12f949ae466fc26fc107d9119ba1e117fd7c222bb06a396096e612c064b72dcd9698fc5b810ef797 SHA512 0b2878f608208b6a57e47e0db21e604631ee9438d064b667c287cbcc0d28b404652c5127215f9c801916d747e1fc48ee9fcb509c43dfa86f64ee3ca88998553e
 MISC metadata.xml 1017 BLAKE2B de40f52bc4cc3c838b473d4c444e9c41673cd3c2925f17508d03f5130fe237784d4ee4d02581718c06ccd30fa204d27ba7691fb8046009a540c00f3535f6909d SHA512 9b89a8eaa90ad2f55abf7a53bfba7c065be999233a7bbfe243f4514ca1c3ec5a3934f23ea8ecd6b2674ac82d5e55e2f3e25e3869a0cec019485c9bb99549b625
diff --git a/media-video/totem/totem-3.34.1-r1.ebuild b/media-video/totem/totem-3.34.1-r1.ebuild
new file mode 100644
index 000000000000..afdbd33dcf83
--- /dev/null
+++ b/media-video/totem/totem-3.34.1-r1.ebuild
@@ -0,0 +1,119 @@
+# 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/ushare/Manifest b/media-video/ushare/Manifest
index 878c365985c6..63b65131378a 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -6,5 +6,7 @@ AUX ushare.conf.d 781 BLAKE2B 03331d0e3e5d58aae6b8856d7273c8c6f4393c3f4a50f551d1
 AUX ushare.init.d.ng 954 BLAKE2B f62f987fcaaa217e0b3a75d225351be4a8d486f4ff025c7fea5dd34a69e58a993fbafb43ab3b7feab474cdd736c6978d8cd149f919b758dc972e33508918376a SHA512 c70e6f47f29a9d555821c3bc2000ebd6533778208b46a7bbe823454e4b26408ab9b6e31ce7449dc84ae32fcc6754c3ca2a5afa0a0393a59888bda294f0e78c98
 AUX ushare.service 189 BLAKE2B 29037c78c7fb3b263e166e06dd82a5785f499db24cfbe8227e1f4695d200fff89f5a1275255f06938d134b3871b1551fee1262eaf0580ec75fb3b87ad1888adf SHA512 141b1f592220d3785af821f085f9c03811a2370e1a8c6bb5d2739b4ae74421323df437d2a6672d943ab8371b6d5ccfb395a4943a10eb5c1e8bc0ff16a3177b15
 DIST ushare-1.1a_p20200824.tar.gz 72751 BLAKE2B 3f9116eab500ad9eb959ded9b1e406100cfbbc32c27b1cc599ef301f8d72e9acb1e053722b8724fc3d350fffda6e5b932eb78cd5fc3f2b5dbe67431f5f5de5b4 SHA512 530fe718e2d52acc27af670d7e44703b34fea33d15fcda3bd1fd4c5702794647576df8a329a11439f0eeca52e75390548a5417776add7b5ab3f09bb0eb85ac11
+DIST ushare-1.1a_p20210221.tar.gz 72759 BLAKE2B e5dd79cba08c3c7554fd19eb98ecf9920dc1939e5dfe34a803669628b2d4031ebb6e2f037550e5129a8cc6f0c84a9a8e234c3c9823108f374375405ea16b5263 SHA512 c3038d7e7da13a6adbf52a20ffa0b33ca92a7b03d39c0fa6f9bea98484cb062f0509d655f853f7eafe3dab54b2bd97e3c8a4f571686bfdf13dccaa012b0c8202
 EBUILD ushare-1.1a_p20200824.ebuild 1836 BLAKE2B a4be959aace10e0e5f4110b9f932774f640bc0da490cf0af891ff743e2df47eb736cbb10a5287a9ffcc8978f40ae9de06dd29d48986297df8154c481cd9d42df SHA512 747848b00f10d41c69a16dcc10c44ba7cb3a41bdc97b0aa3435670820685f029e531c7507191713b0b9c6a55a0d141245db2e8ffad59eec7994b0ef0e24c2c33
+EBUILD ushare-1.1a_p20210221.ebuild 1838 BLAKE2B 723d1b2f1613f49f136244a1dc8b0753db3fdf66bf90f0c587ab7ffbc63c8c3df3c2d217a7e939906a5f6ea4f98f58440c148d1647639cae6f6307c4c7010b1c SHA512 744363432a26d4f483fe7285db7572ac8c095acbca552d5feca091c051119be9f89973f0b347c4eb050dc886fbf1f28f7266e72cc2973accdf093da4822820b4
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/media-video/ushare/ushare-1.1a_p20210221.ebuild b/media-video/ushare/ushare-1.1a_p20210221.ebuild
new file mode 100644
index 000000000000..3abf6ffb0082
--- /dev/null
+++ b/media-video/ushare/ushare-1.1a_p20210221.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1 toolchain-funcs systemd
+
+COMMIT="79b0d6e41fd9af73c2ef7ee6b110f9b367295a76"
+
+DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
+HOMEPAGE="https://github.com/ddugovic/uShare/"
+SRC_URI="https://github.com/ddugovic/uShare/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND=">=net-libs/libupnp-1.14"
+RDEPEND="acct-user/ushare
+	${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/01_all_ushare_build_system.patch
+	"${FILESDIR}"/02_all_ushare_build_warnings.patch
+	"${FILESDIR}"/03_all_ushare_mp4_video_mime.patch
+	"${FILESDIR}"/07_all_drop_optimizations.patch
+)
+DOCS="NEWS README.md TODO THANKS AUTHORS"
+DOC_CONTENTS="Please edit /etc/ushare.conf to set the shared directories
+	and other important settings. Check system log if ushare is
+	not booting."
+
+S="${WORKDIR}/uShare-${COMMIT}"
+
+src_configure() {
+	local myconf
+	myconf="--prefix=/usr --sysconfdir=/etc --disable-strip --disable-dlna"
+	# nls can only be disabled, on by default.
+	use nls || myconf="${myconf} --disable-nls"
+
+	# I can't use econf
+	# --host is not implemented in ./configure file
+	tc-export CC CXX
+
+	./configure ${myconf} || die "./configure failed"
+}
+
+src_install() {
+	default
+	doman src/ushare.1
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.d.ng ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	enewuser ushare
+	readme.gentoo_print_elog
+	elog
+	elog "The config file has been moved to /etc/ushare.conf"
+	elog "Please migrate your settings from /etc/conf.d/ushare"
+	elog "to /etc/ushare.conf in order to use the ushare init script"
+	elog "and systemd unit service."
+	elog
+}
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
index 1a3b2e0644cc..f2511148a38a 100644
--- a/media-video/vcsi/Manifest
+++ b/media-video/vcsi/Manifest
@@ -1,3 +1,3 @@
 DIST vcsi-7.tar.gz 18350 BLAKE2B 840f17db49a0b538a53bc0c3cd426e117d6a29d4b6f7b1ab7bf2f3a1697ea903a908f19b798c5898abf3cb0d308b34aeffc863517c682b8b9a114f5f9dcefb42 SHA512 5b5a3b9db76003c364aef0574a1b43c1177f5b7dae1339be981d6358c38102f0e7f275c9ec074e7cdd6b042ae30b982cfbbffa35c67eb8e2fc887c00073f2e48
-EBUILD vcsi-7-r1.ebuild 697 BLAKE2B cb6a423c6aac31678ade8b0dfbcb5281d694470c6e5c0bdff538f7d31cda3826e85d2a334c3fc8dfe17ec0c74416df6a12c5682c0b0ea89756a99921c66f604c SHA512 291a016f7a8645ba48c1ffd56b336fc86c42dd61a8ba0172c8b8a47eaab2278989426c3a8c763fc868f08621ad21e16f85864516a51a5f015660af7ffe3f0def
+EBUILD vcsi-7-r1.ebuild 695 BLAKE2B aafb22c5aca13f8705e9fc0222eec4fed3ab2e0831a4ef6f7881abaf7dc513415404c59b053435d1d3d61e1a5b1afc0ad60fb4c0832c6555b2fea01e1b08ef6c SHA512 a8f52fe48d40b5e8f2056ed03d47a5815decc1a57ac21f1799409e06a010e6a04f62094db88bf57f1b02949bb97f7f2795f0582ff245333dc6fd86f7770bb06c
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/vcsi/vcsi-7-r1.ebuild b/media-video/vcsi/vcsi-7-r1.ebuild
index a841453cb152..e5ae4b42a493 100644
--- a/media-video/vcsi/vcsi-7-r1.ebuild
+++ b/media-video/vcsi/vcsi-7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/amietn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 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/webcamoid/Manifest b/media-video/webcamoid/Manifest
index f528634cc00f..584b37f22bf5 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,3 +1,3 @@
 DIST webcamoid-8.7.1.tar.gz 8900338 BLAKE2B f379811cf9e44e67caa80c301c2774f13c686fa4721b5adc85dcd803ea97edb07073e53575c7dae8dab4ebfa0a9ee4f3691511cc7ddd6b55f84ae2cc77cd3c52 SHA512 b9a4b1dd4c863ab126e304eabce47c025ec0e3eb85a5b42035d26caa004399bde733913c0a5598ada3deb01673bd42ea54c9d2b06d300608582e63dda75d9bf6
 EBUILD webcamoid-8.7.1.ebuild 1586 BLAKE2B 1e4d64b0bcf3ccab556890d5e1b4d05e57f7e7a52af1d2752a850f274a7b5686db1adf530705b05ff45f408724c3a62841aab96522b51351166dd45dbc7f1f96 SHA512 3527d48529234811384c36323290788cadd0a610ff53fea24d8defb36c8f031880f8fdc9fd6a12ff3406905386899aa07eb352de4c9f3f543ab9cbdec0b67fb4
-MISC metadata.xml 784 BLAKE2B ce617d4a9bcbf3f8e4ce651fd673bf3c0015e13bc8814d4b4e97eaa4a6c5428553d4a314054315fd3dc8a6b1362b4a322a4af78745f3c3d2378e2e731bdc9ef9 SHA512 6518965213e9deffdb6163243865c9e37ec0a14b6e83558761ff27ad7984003be1b6c6518d455631cd2af29f663b6e91f60dd061151e63b3a4f5ad73e35df5cf
+MISC metadata.xml 585 BLAKE2B b32bf34b5d97dea85aa3092844f169264dadc564fdf32aa509a530188e4a83ac71646d7e8f5e1da191a6cceb1bc13e04ca972b421ac59bf3e0479c6da4e594be SHA512 e5ec23053db9318e5cda75085882ddecd4ee53753c1d0e0cd39dc7edcc0b2eeed7cd3b71c2afb580943de1b476af3dde4ae1b607f66fa481dd8b65910ff3b0fd
diff --git a/media-video/webcamoid/metadata.xml b/media-video/webcamoid/metadata.xml
index 9140e9d45b53..6c1928478f40 100644
--- a/media-video/webcamoid/metadata.xml
+++ b/media-video/webcamoid/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>reagentoo@gmail.com</email>
-		<name>Dmitry Baranov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">webcamoid/webcamoid</remote-id>
 	</upstream>