gentoo auto-resync : 03:09:2022 - 10:18:49

18 files changed, 599 insertions, 14 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e5c9c4c6002b..ac7575f57495 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/atomicparsley/Manifest b/media-video/atomicparsley/Manifest
index 5608c3e7fcfa..a14bd66d20a6 100644
--- a/media-video/atomicparsley/Manifest
+++ b/media-video/atomicparsley/Manifest
@@ -3,5 +3,5 @@ AUX atomicparsley-0.9.0-glibc-2.10.patch 1988 BLAKE2B 5f1304e85beed2697787511641
 DIST AtomicParsley-source-0.9.0.zip 172616 BLAKE2B 6e2fa904cde622524ec51e3d084d89dd86c04db9942a27fae67b0d12db0542705d28e723c26db94d234f26c7249c6b8d4fd01a2bce891d2310a3a912667e1d84 SHA512 a4733893bb0d8bf824ee46d7da7f8c2ab9338ae56ea89810db1ac40282554e7e095b3e88631786b248a66aba878f166b9ac403769c66ef3ad45ac8ff7d411982
 DIST atomicparsley-0.9.6_p20210715_p151551.tar.gz 230214 BLAKE2B 986058a8e80b84f30df03f5dfc6e2019ef6949469d8554a5a06ecc75716463b3047820265fd22556f9087a64498e07e994fa2162660f440086eab276be496a9d SHA512 9f58fe7426c9728f8e5624250ff57d7707a4b040365135fa5149909d84c536ecbddaa3820dae85ca8a4c31fc8009685bf56875f1d4ff6f5c854f05a30da6974a
 EBUILD atomicparsley-0.9.0.ebuild 837 BLAKE2B 728dc681ca62e254a0fbd525d5ce0642226c85a9e478a554cd2ff7e78139e76ce5ab2e567198ea6e87b689eed84baaefb202fa4cb0f67de0da1ed2ac2139e2d6 SHA512 7459d82fd113b6c86f8eff3eac07815338719e24200e1dd4d8d12cf7f29d6259508710b3cd8a2967227eedac2dbf3767dd9852fec497195b4d4c62eb56daa3e0
-EBUILD atomicparsley-0.9.6_p20210715_p151551.ebuild 1010 BLAKE2B 8fe9379a1323160076104670c16079dde12d5dd90d5295e72917b7ac473cf2efdfe9a4418c2d5b1d87ed7818279b4ef4b19a6223c732d3a57f7d1dd93dd6d7e1 SHA512 4abd0fdacb6d43773cb5adee330c884ed3d7bd4f197d27bf420a8e1376ac3d58103eb18a61fb1090e23ae4c6c49236172ac505b2f48aecc85fbb8b3b6a7e8b74
+EBUILD atomicparsley-0.9.6_p20210715_p151551.ebuild 1008 BLAKE2B 385d347fd19a4910e63a5d20d084d835ac5dd33e4194b9aa47f5f3dc6a2577fff978eeb5fb7c57d34a3775c9a3d23db7ededd4657042d3bbcc93f5207757c3fa SHA512 5c5eeb209e1bf86db9d16055c0147ba58a06ed446130f44b3f9bfc70d8e21a975fb8faa5460c437718e6908da271d2a1185fc9434cf3240460a598de254559ae
 MISC metadata.xml 307 BLAKE2B 3640f77bf82eb56de11af0ff0bbd29c7e4ea63b24c5aa1a53010b1fca6a85941c659fe069679b6d7fd11bce1b4a120a4e93e0b128f4c5bdd5e8574a5e8e67c99 SHA512 35d4d49d8c98be6ce817c5bff2a744fbbe3f996996946ad6f4aa0a0025ab3063bc028f397ac704cd01b449b8f652927a243b3c4418cdcc8c8ca7ee2d463fafe2
diff --git a/media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild b/media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild
index c7c7cea6bd6c..a693b273856f 100644
--- a/media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild
+++ b/media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 src_configure() {
 	# APar_sha1.cpp:116:47 and 117:43: warning: dereferencing type-punned
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 64f6c7d92aa9..24b3e1f99b06 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,5 +1,6 @@
 AUX amf-env-vulkan-override 60 BLAKE2B 409985e6b5ef0e148076c16d8132db2b79ea53e0a922719a37d66fca9920c5fb94d23c22baef39f91e5d5157a7f58bba3e036355b1dbfb5a70153e0cb9764680 SHA512 7711a02b674638f71383a00b867f22fbd2e4d71ed397376fdfe2cb15655ec0a97eb0d613a339a04268726aae3c34efd29d51a3e8f7f90bf3d8634825c0ef3cc7
 AUX chromium-r1.patch 1582 BLAKE2B 48547a7d53fd1f0f44b682c7e2306e79f007f8e96b36253f76775c4a3ced54ffaaf403dfaae94e81aa26c60887677b2dabdd2c5cef9fc4553e203f8259453910 SHA512 808daad5afed13a6d3926c9f9ab5cb58f80e16969533022c7ee959147908bb2c12d066d2125a6b6975ef9304d9b8d49c39aeb0a047009adabb4529e3cf54498f
+AUX ffmpeg-4.2.7-libsdl2-new-version-scheme.patch 1132 BLAKE2B 59d40a3edcb19909a34000fc5e5fe2cb0565031fcb653d4ba3099b310e66ab1f3cf6ce11906d61657e472025bb9135342c7207b7c0536f850156e78e6a0e9cb7 SHA512 bc46370ffb830b32bc5c92ce31b2a2d51f2db1cb8a53bf6f03cc73f184a70448a0e744b5eb3d19990b58bb018e52d16a419ca030f42be4175c577a1d0ddf9f5e
 AUX ffmpeg-4.4.2-libsdl2-new-version-scheme.patch 1061 BLAKE2B bd2efcc869ad19acbf312568bda705c83999e31ac365a7fbdedc281186d2ec567afb1f0af021e750e5cd76e6715de7006b642a24a936115760da10371a3db982 SHA512 9a005a86b817fdccd0f05704348a8446c3a9b269bdd8ad0243f07a8d0bf9dc0f388a134065e0695073b1df2867a3c8e5e725917ce331bf1ee03c20d8187d1dbe
 AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb
 AUX ffmpeg-5.0.1-libsdl2-new-version-scheme.patch 1061 BLAKE2B 262d6baf3592044d5cc520cc25e213f41d1d6c02c8848178ec1001ef4d8893ca6f3630fe74b8a5171e46b8607687a899e9970a97915e5e903cb78d34afc6ece0 SHA512 00dae0ebf2fcc0e99fde2d0126cb32262831402e1119e93d0b091fd32431fb36c6ac8b122ba4bf5d8a917e9aa965c9c5624b88aef598c11f9e20ad27731b9d50
@@ -7,6 +8,7 @@ AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d
 DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407
 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.2.7.tar.bz2 10966448 BLAKE2B 91151a3ece19700fbc04f304ebad9f34ffce2de19416992ceccf3a347ab58195f746a0ace0a331cc1f34dafd87e4e8c6467268546b417d3f58a1cbbe41662807 SHA512 ab57fc370005d8f33eed2e0f18ac4f418372f47f03d43566c52f9ffc70de27e6ec1ba49faf6e3356fd8a495cff40a8073f8d85a625f6ee21bd7018e19b31734f
 DIST ffmpeg-4.4.2.tar.xz 9562968 BLAKE2B be044e9895acdd71a237a343a8d047c56db845c693b8c07877fc8049b630eb254e3430b6e9916330e6b3d53cbdc9f06680d80307a1fea1377bb818f4168bb276 SHA512 abce847c607ac6d63fe32ceff8bf8724888acf2b7db9a083cba50e3235590cdcb27feb7e0a314133d0030809fb54d474f64001fc9ab7d896a819159869c09d5a
 DIST ffmpeg-4.4.2.tar.xz.asc 520 BLAKE2B 1ff4a886c7703a05a19499ae5b2b6207df24e05844861cb52f2c56a97f47ab4fefa5011de46a385bab9684964470697ec5e74553098392877f7521a04ffe0fc4 SHA512 a4df97a6328fc076b5611023bd61254f1a5043db1ec2f3426bee305206b2b0937047ede9cb51db31a3387a16218fe95a7a40296770574fa32660118938a9d301
 DIST ffmpeg-5.0.1.tar.xz 9812524 BLAKE2B 0a37d425780f7e15836848048214411829bceb0de12bb7089803feb3dda07a077be9c8e8174b72792558ed86d92224bee9d4db20cc74690ea54312fbf2f10e83 SHA512 e5810c7379748a6bbe1a903bf36b4372b67cb3973179727b6af6f0118eef46f4c990155961cc37255e08a5bafdc4b4683503ad410ebb7afe7a35b891c01fa602
@@ -16,6 +18,7 @@ DIST ffmpeg-5.1.1.tar.xz.asc 520 BLAKE2B 8d5848b0807f11c82c3a6eb93aad129c4d3a1ac
 DIST ffmpeg-5.1.tar.xz 10001864 BLAKE2B b182b93210b7ee8115b657b2507c091f4839cc02d1ef2233d4d5e4aa12fccd4c07f62828501bda3b8f3d0e253036578a11985452d9c07433b465411f090f0c46 SHA512 9ba24f7488d1c7f8a3e3fbc3920e329724e75631d769400998f7a0858c58213f2eee2880fdd7caa9a701150217448a834b5008840327478314e4508c5e0e3b19
 DIST ffmpeg-5.1.tar.xz.asc 520 BLAKE2B aaacc60465574f4c49765b3054d2a26bca8a116bd2bcffd818d633f4ad9718d9cdd045b058b8012606ab58531573ce98d8d114cdf9723ac05e1e87be56e1a792 SHA512 41fe8f4865bcd6829f9e7223d05bd7ad58b15e52969c556f0e218ab562fbe0264b37248ea494cd7ae1c4968d79ad59d7f28a1692a8d0838d0de646818ea9b933
 EBUILD ffmpeg-4.2.4-r2.ebuild 17868 BLAKE2B e78ee4ec8c2b6ed7132f4a7b61d71df2c8a8af22f6b1206dea5d6a8f988922293827b5f3fd56dfc039933af849db58f7eeedb9531ba5c7a16a03806ec7e78e68 SHA512 f8eb67f028d2d062a11550e8e55446e6956bb88e9c5c50f0ee4fb2941b797777e4f6ba304fcabc99854456d439619e4f1d3cf0c74214214ae2d388279fb2d557
+EBUILD ffmpeg-4.2.7.ebuild 17934 BLAKE2B 548f6d2890d56594861228128ae1c236ada3f9e4dc1effb400ff8e9b9453c1ea3cca8a14c65989a82b6cde08d05e60b67fc536e77ee46286f082ed64acd6d40c SHA512 562f6a3d1a436344dff11ade32cfea82288bec78da897c26eeb8d0c8f5bdf291ff860f5e6b4db91b4403c337eeb39234b091be6b43e708f7b83c72b516353305
 EBUILD ffmpeg-4.4.2.ebuild 19707 BLAKE2B 7839be0b631ec26d346c7e6e63ff00a1d6dc799d20b832c5dd15b470c3b0318f9ac946389cefc8ef979df77b4ca769626fca0b1f6f4975b6a0c671196e825646 SHA512 a64861e453d9c5f3abb25720379ace501690fdbd26f7afb67ca89c76932c33c8d262578bede661def6ad01ab9b972057e2eaaa2e3e59d485177e141b09a577aa
 EBUILD ffmpeg-5.0.1.ebuild 19810 BLAKE2B 0ef2a72bc9c6fb5f9dafe7500751081912134aa06e2e7a6dfd712d1565733afc16849d31ae2157fdde9c7ea3422c0c348edaa8c95594e8d6064f0fc77de97f03 SHA512 df943b8b532d2441c9a6101430b883d0d2b5318cec967bc962d70ac08f26ea2a027ced6b969e32f8be007a2729e46e29ba1dd0fa5bf6721250eaa71523f72751
 EBUILD ffmpeg-5.1.1.ebuild 19870 BLAKE2B 59f22d5fca28068cf67dc428e59b930fbe0f2900ce6c1cf3d4924da13227579ea9cfba2340bb9701b63715123610239f3bd9b7fdb19b658302815129d7503b05 SHA512 35a64853802ace088afa7c0ef9e71627dfd65a53225aecba5bffa2e5744b158b2ebd99af0cde2264a8a0b5b76b6fa9e24cc921b93635c7aacd4ef93bdfdef159
diff --git a/media-video/ffmpeg/ffmpeg-4.2.7.ebuild b/media-video/ffmpeg/ffmpeg-4.2.7.ebuild
new file mode 100644
index 000000000000..a365853a6e20
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-4.2.7.ebuild
@@ -0,0 +1,556 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=56.58.58
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_MIN_CLONE_TYPE="single"
+	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
+HOMEPAGE="https://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2
+		https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-altivec.patch.gz
+		https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-gcc.patch.gz
+	"
+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 libxml2 lzma +network opencl
+		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
+		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 nvenc: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 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode oss pic 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}] )
+		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}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-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 )
+	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[${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}] )
+	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}] )
+	nvenc? ( >=media-libs/nv-codec-headers-9.0.18.0 )
+	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}] )
+	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 )
+"
+
+RDEPEND="${RDEPEND}
+		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 )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+	)
+"
+REQUIRED_USE="
+	cuda? ( nvenc )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	!test? ( test )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium-r1.patch
+	"${WORKDIR}"/${PN}-4.2.2-ppc64-gcc.patch     # both ppc patches from
+	"${WORKDIR}"/${PN}-4.2.2-ppc64-altivec.patch # https://trac.ffmpeg.org/ticket/7861
+	"${FILESDIR}"/${PN}-5.0-backport-ranlib-build-fix.patch
+	"${FILESDIR}"/${PN}-4.2.7-libsdl2-new-version-scheme.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=( ${EXTRA_FFMPEG_CONF} )
+
+	# bug 842201
+	use ia64 && tc-is-gcc && append-flags \
+		-fno-tree-ccp \
+		-fno-tree-dominator-opts \
+		-fno-tree-fre \
+		-fno-code-hoisting \
+		-fno-tree-pre \
+		-fno-tree-vrp
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && 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 ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss ; 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
+
+	if use openssl ; then
+		myconf+=( --disable-gnutls )
+	fi
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r 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)" \
+		--strip="$(tc-getSTRIP)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	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/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch
new file mode 100644
index 000000000000..ce552893d19b
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch
@@ -0,0 +1,26 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/839f98ff6719cf2db0cbd88cd787a1b19b9cbf47
+
+From 839f98ff6719cf2db0cbd88cd787a1b19b9cbf47 Mon Sep 17 00:00:00 2001
+From: Christopher Degawa <ccom@randomderp.com>
+Date: Wed, 11 May 2022 15:11:04 -0500
+Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
+
+sdl2 recently changed their versioning, moving the patch level to minor level
+https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
+and have said that they will instead ship sdl3.pc for 3.0.0
+
+Fixes ticket 9768
+
+Signed-off-by: Christopher Degawa <ccom@randomderp.com>
+Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
+--- a/configure
++++ b/configure
+@@ -6383,7 +6383,7 @@ fi
+ 
+ if enabled sdl2; then
+     SDL2_CONFIG="${cross_prefix}sdl2-config"
+-    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
++    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
+     if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
+         sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
+         sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 5b6033139938..284333669bfe 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -4,5 +4,5 @@ DIST guvcview-src-2.0.7.tar.bz2 449392 BLAKE2B 94140845dbe1209802a7109a3f30d3f7a
 DIST guvcview-src-2.0.8.tar.bz2 902736 BLAKE2B 3c4ced349a252f365d86dc30c5208d09372796cc6397a9643b31afb9904642c7a88481d6054b3523a4f9d037e69021ae84ced420364e69ab9e7f19fbc0b84c6a SHA512 ba959602bc5518426906786416e433cc8b6de1e0fd73b91378aa231ae4e469935921e87dd37827c3c6b409f0f9551e3e29d0cd3d30afd0e08ad3eb2e6bf5150a
 EBUILD guvcview-2.0.6-r2.ebuild 1561 BLAKE2B de1fd42c887e4f52fdabd6cd2f506957419efe2f9cae0121f78feb235f786737874c5c72fbd57ebb3ee80d2172f80b6ea1498183af0f2350388e4c0a3d075e53 SHA512 b9731b3e7547bf840da9761ff7b3a330403a0ff5341c768cbc2ff6e02da00dd4cebe063a8d2c8e3d01dca566f2cc9b8864c1c1b23b831329493e8e478cbc0f11
 EBUILD guvcview-2.0.7.ebuild 1596 BLAKE2B d5a8772f60daac0ba8844dc18c0d68b228f354f42b6fc9cc246eb3f8910a7e069d8b180cb0684eaeca1e71f70ef846a2ddb20cecec4d1a391c006e95d4d4229f SHA512 e5159005c4de168973b7f9b8c718ace7fa4286e64667d00aef9f2aa73e4c3dc3b6a156279ff1057098666aa95ead3b44b283b00b2f305dc6c1c58c160bf1f3d0
-EBUILD guvcview-2.0.8.ebuild 1572 BLAKE2B 1dfd0db031472651e9dd76f4d77b571db7d5eb37093aacf2ec9c3799928440f93bc19bb3611e11bff0c97cfb7e21bd1b3cbb9d82947e5088dcf08efe6d4d31d9 SHA512 36c7e19ed4537dd01bfbcc5f29d0c8420eea95bfec8322b6a71034878f091d62b11fdf89c168229d212abeed5aadd4aa8a3fb56eacd6ec5e75a900d34f936603
+EBUILD guvcview-2.0.8.ebuild 1570 BLAKE2B 834d6e5474c09ea995e7a00a344b1680ed7d9aac9834f17a444ea58ba29cf143ebc55f6713c66ae952d74bb9b601467891a832bbd75929a7c32ddc8a4cd1314a SHA512 36d5a28a1b3d78d8a8b302aba1a6c72df8090455800ac2f75a1d22abc956a0e30cfe423904eac8587d7191723bf5a287b93a77474ae8e8f950b685d96529a215
 MISC metadata.xml 381 BLAKE2B d720778a6b2eb8b44e4e14d00129463dfe9d1b00ae8f65df21e91dd5fd9a3a34a17fcd646227b8da5d38291d01b1cbc52050ec3f15e5ea983e6c4bc11268735d SHA512 28c16af3583e468277389a9a80a24b0e2a5b9515fcb5e3840edc399c20d57df669cea911d4f62461f4d75211c7396d5a12ef61d73554eeb0a8ea78ad7e6e7d1f
diff --git a/media-video/guvcview/guvcview-2.0.8.ebuild b/media-video/guvcview/guvcview-2.0.8.ebuild
index 28d2027fb414..9b1374457984 100644
--- a/media-video/guvcview/guvcview-2.0.8.ebuild
+++ b/media-video/guvcview/guvcview-2.0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gsl pulseaudio qt5"
 
 BDEPEND="
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 9f176b8672a4..894bd57438e3 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,5 +1,5 @@
 DIST mediainfo_21.09.tar.xz 1992000 BLAKE2B 8deb996c84ededd390a4fb91f77a4dd0ba60f3a165aefde2fe862720a7a3158888ba56f911533c347703e0a722f05b94edc5f649edef26031b519fc7bd4012cd SHA512 81545c936ec5f17f94246b2cd5343afd105d0b0791f151689fbecdb084778dd4e84da79f47529f16b8383542894819af995ec608588fc6d9f45e9be38a4304db
 DIST mediainfo_22.03.tar.xz 2005340 BLAKE2B 232f077a1e202271de8c0d07f1f2a27efac38c998cb5b7f465bf5e8e44c24d6dad9fcafc1a6d981863c13822bd8cbe921b4a06adf3b1f3ac7c8690de4026b597 SHA512 981c9fe410cf6fff1a87ecfe250216977e036e8606034621c18bbf66cc75261c2e0f411bbbf298a409b5b306f7f7ee993a1e24e70040cf48a7728550ef7d830b
 EBUILD mediainfo-21.09.ebuild 1657 BLAKE2B f93738fb8db95a76c3fe44cc9b3c86a52fcb979b33f89588abaa8c4acc91efe94de9d5ba26d12d4cee0c4abae47a680a493f7bcacd0f68a11b28f8d9c927b3b6 SHA512 2f69e14296cd8c95a5abbd9fe24288fe2e763de32e8b710294c9ee27fdb03e23922cacf7fa3f3026e4bd128255aa408454af6702d249396294c1c9399f8284e2
-EBUILD mediainfo-22.03.ebuild 1690 BLAKE2B 9308f2bf9649ff4aa6d8a66c57580a02740faac2243cf90764a5e102c912fda42350ea09932ca3e1a906a7a2b4d98d3dd92b451761958f67c2467bfde74550c6 SHA512 5c97ba08084337d33547ffe5d86c0aba709d33f875e0aabaed7a277dd3f8bd977324065c32f6b5d5a65a2c4de549b8192363d06bdf5a3660d6fbe57d2c3fea03
+EBUILD mediainfo-22.03.ebuild 1688 BLAKE2B bff9dc32f8ef6dc02c26dfca0add8b56c99d360e568b49d9b6742de4813749caff3f693b318776f88405c9ea5bf220b06ffd09804320d80756cbd920b0598f80 SHA512 cacc860ee112837d51c926271345baa28fe547532c01b25f13d45d9f048e3334097722613d4189a27093d6879b3a01f1b6ede59f5c9da42f393f37788345b32d
 MISC metadata.xml 344 BLAKE2B c70240ab3644a4c1d2367d1eb094a01b60198549456dfae21604c03bb30298f0abde2afda7dfdcf16425ca90856e98f57869481b85358e1724595454c8fdb308 SHA512 cdf31d4cd6185e0fdf604b611ee54b0bb90ffd369119cfd0bcc759e1e3d63a0d5ce673f508d3963b06c0c6152cdc1ef7d369ad2e84327ebd91c1e4a196e75d2e
diff --git a/media-video/mediainfo/mediainfo-22.03.ebuild b/media-video/mediainfo/mediainfo-22.03.ebuild
index c14b99437c34..0c36f3803996 100644
--- a/media-video/mediainfo/mediainfo-22.03.ebuild
+++ b/media-video/mediainfo/mediainfo-22.03.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/MediaInfo"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="~media-libs/libmediainfo-${PV}[curl=,mms=]
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 24cfaf474d99..788710919a19 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -16,6 +16,6 @@ EBUILD mkvtoolnix-61.0.0.ebuild 2733 BLAKE2B 4b3262642f5bf64e60ee3e5537f65881ec6
 EBUILD mkvtoolnix-64.0.0.ebuild 2743 BLAKE2B 128120db4c38bea554f5a19ceecee021cd9dac3e5b3771a901dbcc2180dad5ead753f53a373323a8b86d6ca18023f441253325174ae9cbd7b014cccb933734e4 SHA512 91fa7c061c2be25ab775156a163c552690d5f91ce797988e9f24689a0ccfc2a612dd1f7eb0dc2b4706cb16060f8f1d2e15c8db36d9ae298fbd94e00f51ff7afd
 EBUILD mkvtoolnix-67.0.0.ebuild 2953 BLAKE2B 3c3c1b2ca1234d7bec20a30ad859673be073655a8182021d4b1ae20e2132da41a949d5f9a8203cd466f0fe1008aa0a3778fff243328c9ed1119e84c9a916bbb6 SHA512 c3d1772e7363c6ca4c9760e6a40c87141d3da03e24fddb98255204b1320dbf104525082738a2a3c653acdf857ac6f868b5e6527e199748e9e86f75f68eae2845
 EBUILD mkvtoolnix-68.0.0-r3.ebuild 2980 BLAKE2B a7319bb5c1d79c2aae66e770ca1b47c7b31c8fcc4493464e5858d5b95bc7007cf57d1150d8d86e400d7e346fd410076461450ea605a6487269f37a03d57f0fdc SHA512 ae05fc55bc96b737dbbba190c8290fce78d9a745522fc5ac5c1e766ee80ab4cee2a72894fa236fab2858a50c5819cf9c9120a4cf70defb5b1e671a05ade08dbe
-EBUILD mkvtoolnix-69.0.0.ebuild 2948 BLAKE2B fb49d9e001092d07f347ec622247943d8a06b1b31d9b2ecf80bd2009d8e37118c6cc1751d2e5cf6529fa73cb1e73879c431d1329576525636a093fdbee7afe18 SHA512 8d5b9e3d413ce32b352f0dbc35c153f2b5dc765912bbd39597b7bcebdfe99966964c75ffe3f2ceb614d767a4557ddf2e979b702441e5929fb8d2441f8670d42b
+EBUILD mkvtoolnix-69.0.0.ebuild 2946 BLAKE2B 7d843329e0164dd24e17c377af5620cafe7959b8b7101d2eb3ab3b0855cf704aa2833e95ae4821bbf3ef3baac29a0db0eacc55968ae36286a26dc0fc5f285a9a SHA512 2c4afa4447a93f22e0823cb960d03dda3ae426ca8434b0da19afbe636487c5d177270a328ecc6242c16f925da92fecd5ec8a051dc90846669622537e2b5b4495
 EBUILD mkvtoolnix-9999.ebuild 2948 BLAKE2B fb49d9e001092d07f347ec622247943d8a06b1b31d9b2ecf80bd2009d8e37118c6cc1751d2e5cf6529fa73cb1e73879c431d1329576525636a093fdbee7afe18 SHA512 8d5b9e3d413ce32b352f0dbc35c153f2b5dc765912bbd39597b7bcebdfe99966964c75ffe3f2ceb614d767a4557ddf2e979b702441e5929fb8d2441f8670d42b
 MISC metadata.xml 256 BLAKE2B ff2b5536809c94dc64867bca73d779a31bd343559cd65520c9b5684091734b3ccf7bf495335890df5533857480794cb3258566e5836e8dce7514b6833ba93f37 SHA512 b7f3d0564d06254ff552beec9594236b84ebc3ad87adab673f68963bcc4dfbf2e29b401e75486ba41b9b526de74b73f65e9d5e901221f810363497aa694c8567
diff --git a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
index 3b7b072da517..d08f7cea93a7 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 2f751315c39c..164fe841b505 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -6,5 +6,5 @@ AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366
 DIST smplayer-21.10.0.tar.bz2 5186253 BLAKE2B e2da80e64c4cbb9a3977ae9f5570800a2c3e012f21fdd011d66dce681488805c309fb40aae72aff5858cc06beaf1e8bbe052816eb91d3700a222b3b10be57228 SHA512 3e4a046c704eeb181570c56a819afbca939257df370c909dab3af448553702feeebba542f123d18cf6b786a19f92ee67ba60ba25a649d83f1f31411b715f7ae4
 DIST smplayer-22.2.0.tar.bz2 5165034 BLAKE2B b10103907dc334f65bf1d0dfc55baef5fe330e84eabb0534d77b4ebeb6b93f677b5f39b9e8ab60f8a7fdaf405fee8ab683e7c5e284256b04a6628603fc476540 SHA512 62916d9df8493efbe810a5de36c2d45fd2e39173e061060c749c87ac498f43ca08caa073bd04b05e3e9de72c5efdf9bece8e08f4c57a0d283d9f78b7687e2d14
 EBUILD smplayer-21.10.0.ebuild 3286 BLAKE2B e04255eac738ab032f25aec209df7487cf8558cfa19c80ec0e3d2e38d670334c4f4284c1b68f7d25832cfc688bad62b020bdabea6c47fa679556a6d83211c112 SHA512 39d2f55d40baa085076c1ab63060dbaee2601ccb0f1c2931afd685dabf4aea77afa79d3227eb67bf10757093a038e586528e797b61d2350643a5c91ff902038c
-EBUILD smplayer-22.2.0.ebuild 3324 BLAKE2B b3dae3b7bc0d2de2ae9bc065ad03615f1cf1ce816c1ea687465a92b2918a7ff71b7e388e50cc1425bd2da0ad7b5f901e2695f3d9250abab7002f738b68ee5a35 SHA512 209bea1116f01a3ccf749821735b69556ecf5544c1713e3cbff59808fb4404959a5b5977d0c0ddb3426ed666f84742fac373a4f74d23e634534177ceacdba1f5
+EBUILD smplayer-22.2.0.ebuild 3322 BLAKE2B ffb3824b0fff2757de7bc709e76082ae10ceac1a81f80865671f846a39bb1ba6a22f45469ed6c5a1618a87b311b1b4c5829d168837966c20e6c7ab4680b5907b SHA512 fadea3047cbbdd4e60a09b9b9e3226f93a87eae8fa0f195e89169c063a1ad68c943456c4af22ca894f9ed5acdeb9e645422c96680bda4d770f66a4f4a2764dec
 MISC metadata.xml 887 BLAKE2B 30c1965dc7e5ef2126e33b995ea1668f51f9125f9f3549555d18e55fa52d5a311caa030f04e6bd1b02bbc3781ce1450e3184dd463bad8d9ab36cb1fc28e009ba SHA512 3d2f278f23cbb28b41eda0547591c6692809c281ea15030f6f6c29ca38f2e074cd29b540f925164aa522aa42e35890a166149a6cc9a0473253b3b678eaee3505
diff --git a/media-video/smplayer/smplayer-22.2.0.ebuild b/media-video/smplayer/smplayer-22.2.0.ebuild
index 75684168f00f..34a869fc45ab 100644
--- a/media-video/smplayer/smplayer-22.2.0.ebuild
+++ b/media-video/smplayer/smplayer-22.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/smplayer-dev/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+ BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 8813eca28434..a7fcf1dcf1f6 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -2,6 +2,6 @@ AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a4
 DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
 EBUILD x264-encoder-0.0.20190903.ebuild 2142 BLAKE2B 422b29b0d4610eddd2148dfffce1aeba8a2c6fec4165d5d1df021fe886c27074d8b0c52d713c0e7b15afc3c8e730a89859a7644e6a449f8ef4d9cf684c1c6c3b SHA512 ed34d8f38c5513c6ef3fa30f941d40d58725cf75acfdbab182df86642c839e3ee041ec67425e961fe1b5053a4af8964ce971d4580777dccb842a03916360f796
-EBUILD x264-encoder-0.0.20220222.ebuild 2148 BLAKE2B 3af75e2d3b63a9d6b74432673a76816cf351c6c9bbdc561ae813888287e8e05eb631727103f1a387e488883b1bd0dc875d0022c9d502d98d62649c2c1ef85739 SHA512 0a42a605a32defca7b835f47103f4851b8537627facdc1abc1c0855ef38e277f160995ae8d23a615bd25f6ee718449225b81e18e1b6e7b8912ad68bed4240a44
+EBUILD x264-encoder-0.0.20220222.ebuild 2146 BLAKE2B 5aa96436f28c6943e59f2fb8d1b061bb66ebaac901268b73c3651259346d1f1aa429c2f4f4a29bc6b1de7accc093f0e80166a4a7f1d98f0b95cd8065fed94238 SHA512 3a1c20eb9f93ad24c48d7bc5dc7e01195adef29ae90bff6b648f0f8a919a76b2210ea33e4b626aaeefe002e18a7cda684719e2657e6a29014425315b7b649ef7
 EBUILD x264-encoder-9999.ebuild 2148 BLAKE2B 3af75e2d3b63a9d6b74432673a76816cf351c6c9bbdc561ae813888287e8e05eb631727103f1a387e488883b1bd0dc875d0022c9d502d98d62649c2c1ef85739 SHA512 0a42a605a32defca7b835f47103f4851b8537627facdc1abc1c0855ef38e277f160995ae8d23a615bd25f6ee718449225b81e18e1b6e7b8912ad68bed4240a44
 MISC metadata.xml 531 BLAKE2B fbf3d1b3460773bd6cb8deaa7df7d1da8bd9597d8c1c1da2ea19fc8ced206f3424b4f10af6d019941a2a1e2974c53f21db1dc47a2062c6dae401e514051c58a8 SHA512 1a36bbd77bb5e526a42fe35382fef906d741fd51b0569c2255191222c4cf006e12767228ae0fdda9bf32f72cdb24cc1f250b6bd7e57aadb50a3bc09624a2e0c0
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
index f9d72081e46e..7be6d065c869 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	# Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
 	SRC_URI="https://dev.gentoo.org/~aballier/distfiles/x264-${PV}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 	S="${WORKDIR}/x264-master"
 fi
 
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 1c9f22ff5f7e..e0d36b22948c 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -2,5 +2,5 @@ AUX xine-ui-0.99.10-desktop.patch 852 BLAKE2B 6341545955de64e3fc30a89c30b102b2ba
 DIST xine-ui-0.99.12.tar.xz 1980672 BLAKE2B ac1a9b17b48005c667d53129e51f4db2cfe2933c0fca9ba8b6f1d999f903568217a061c84806abfec31d4afcc238579c232a1ae6f4b04afcac465c340826f037 SHA512 bc04cb8df730abce147485b488250331a304e4318fc28ebab890c6485242a5edeafd953547c637622e2312c65aa1e36aaae6117d608dd668781d841804f2ae86
 DIST xine-ui-0.99.13.tar.xz 2156892 BLAKE2B edb4cb082faeba5f9f64ea06f6561d471fddfc7672dd92ec1a0a99b5c8eb10f46c15df2044fa2a4eaafdeab1fa56d990afa443f912602fdc676d1e34e3cf6c84 SHA512 a0802d767a805c462f7ae05fa5c4860af5c281ffa74c70a6c2c8a3ecbf8060e6f3f40fed215e27a823985c7d5c3484715cbbe5e4bf43655353f59fa2230b41e7
 EBUILD xine-ui-0.99.12.ebuild 2010 BLAKE2B 1d42a6b64b39d7c48f3408d349f39e270af388f558f318dfa31d96aef9ded67b8f4d839d90c9abbd5083615375c3dc92810e39f92aa21376c61ad4c70251c77b SHA512 2ef4e1001e64de1eead5fba15536fad0dcec422353d13311d394a2c951c8da4bd10d832432aeb716164db7d5615a8d8e05a877c6c5e1eeee52a560d3137ba1d6
-EBUILD xine-ui-0.99.13.ebuild 2014 BLAKE2B 7bef783d0c95820b04fe8099646d52e8bdbbf61e1c9d2f04116729dfe6fa02b526f1cca6e246017f95adeb706e4db963d7c4dc3d62a6f4b58b119aa041ee82de SHA512 ab79d744b3988438377d7a5d4cffa77f00aa66d817238d26e62794fc4827ac9435abbc72fdfc5c08bde7f960d803284cc3c8f0cd872c3d06e25e5bce51e5a784
+EBUILD xine-ui-0.99.13.ebuild 2012 BLAKE2B 49d207c60dcb026fe53176e566f9425fc1f448639ff86a942c90e273f7e0c6438e8db5cc19808ecb269ea5e27f26eb9aa0dcf0ceb84a42f290ea3af2b22421fc SHA512 50ae1a84b9420d0f027306aa97fcf3b4414bc30662fc7820b0e4ba48ce715cdc3770277f164037eb5c39f5c208284ebff99f8ac7741699cb8e235dd9236c12e3
 MISC metadata.xml 387 BLAKE2B c8fa662bcdb54c05bd2360ee28622b8f41636ee93ac77d9db6f5a0a6fc68e0b0aa46b1bd8953243242fcd414088351a71331eaaf8838055d3c87c4120a45827e SHA512 de41930ed1d1133841980eec98872a74b05ad97196f01aa1c121806c2d726567327de3baaf5726b32e427efda38744ecbd16b5ab3568575844fe7e07f70a6621
diff --git a/media-video/xine-ui/xine-ui-0.99.13.ebuild b/media-video/xine-ui/xine-ui-0.99.13.ebuild
index bf151db66dbb..799cc50106f2 100644
--- a/media-video/xine-ui/xine-ui-0.99.13.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
 RDEPEND="