gentoo resync : 13.11.2021

35 files changed, 1208 insertions, 1298 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index d7c5d4ea712c..0d6d53676fb7 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index be0a2a15fd85..d5abfa025dbe 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,5 +1,8 @@
 AUX avidemux-2.7.4-qt-5.15.patch 523 BLAKE2B 3fdbf41edb47f2827a2bb25d553b6adc9cc872c032762754ce182d75496f705be2e33b210587f436b7d30e1ff3db88fd1596bb5b85b011924244b9fe806816d1 SHA512 c651d4bf4f60d85c068ed1c7733481ea57f9528656bea50193e80006d8102100cb881737553a93dd9d1bfcf8216abb08463f494bebef5fec3fb217099c1c91fb
 DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
+DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
 DIST avidemux-i18n-2.7.6.tar.gz 2268693 BLAKE2B dedf6d015e6bbd58f432e05e72c4d8d175ce4f5567331b5e51e7a14d2a8180e92211efc172a4d7001a2947f46c2e910a485d42970b99df05c1ba12002974cfbf SHA512 26ada29c4b7c23739ddcc4ca1dc9819bbc64fa2b6472fd7ff5706905dbd9b382e7a7d69ba78f72afa6f3db55cf3c5373a5e2d244f1cf189aeb187984dd1f4187
+DIST avidemux-i18n-2.7.8.tar.gz 2488165 BLAKE2B 9e6bfb10e938c880d372570cfe35ba9422a8c0081b116230d831bd421b205a555415350be96b0e3149beb164a0151e04205bded403354d7052aa24884a068407 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f
 EBUILD avidemux-2.7.6-r1.ebuild 3875 BLAKE2B c15aca32cd898627b877dff0c1afbefce824df8a206ed410879af7281a94225c6680d83535738496b3ac411d82547b6dbbbb4dc721ca8f0b6c5456d803ac4038 SHA512 f654b2f5be78f96790d2e28632eb324635a5d66ee8aac08981bbbf873a083746ef574fb3123cdaa66e4e62f185aff1d19d94b401eb0d059cce24440f709b39cb
+EBUILD avidemux-2.7.8.ebuild 3884 BLAKE2B 91acfbb9a930ae9314088e767da2ba94698193353b458448f81b68960e52aa7e265df3d7c24208f9aa29628f5913106f3356e81b86ff62596a08600f5144c6ff SHA512 90f79565cde6627c6f57b452d62f9342842af01a53d62555ed19ab8f3aa31310b7874e860bd9be8cd4fc7f0946734fafde472f39eacb45555a17a0bbec645872
 MISC metadata.xml 490 BLAKE2B 087641991d41e39396b689741c615e8f9599c73859b8a804eeedbd8d31485cdd0b54392e36c7e863e98b090e6aaebd372af3a7d50ed33eabb5cc5ee5e9989418 SHA512 edbc3b07ffc5a41be3a249639e405cde684812d25b1392bbd4e6c5ca4cba70bcd0ed629cf6152f9bae5b0b3ef7ea6bcec40bbc883812fe62f2cb0a35418c06f5
diff --git a/media-video/avidemux/avidemux-2.7.8.ebuild b/media-video/avidemux/avidemux-2.7.8.ebuild
new file mode 100644
index 000000000000..b251f2f04609
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.7.8.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake desktop flag-o-matic qmake-utils xdg
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="
+	https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.tar.gz
+"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
+
+BDEPEND="
+	dev-lang/yasm
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+	opengl? ( virtual/opengl:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	vaapi? ( x11-libs/libva:0= )
+"
+RDEPEND="
+	${DEPEND}
+	nls? ( virtual/libintl:0 )
+	!<media-video/avidemux-${PV}
+"
+
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
+
+S="${WORKDIR}/avidemux2-${PV}"
+
+src_unpack() {
+	default
+	mv -f -T avidemux2_i18n-"${PV}" "${S}"/avidemux/qt4/i18n >/dev/null || die
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.7.4-qt-5.15.patch"
+
+	processes="buildCli:avidemux/cli"
+	use qt5 && processes+=" buildQt4:avidemux/qt4"
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
+	done
+
+	if use qt5; then
+		# Fix icon name -> avidemux-2.7
+		sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/"${PN}".desktop || die "Icon name fix failed."
+
+		# The desktop file is broken. It uses avidemux3_portable instead of avidemux3_qt5
+		sed -i -re '/^Exec/ s:(avidemux3_)portable:\1qt5:' appImage/"${PN}".desktop || die "Desktop file fix failed."
+
+		# QA warnings: missing trailing ';' and 'Application' is deprecated.
+		sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/"${PN}".desktop || die "Desktop file fix failed."
+
+		# Now rename the desktop file to not collide with 2.6.
+		mv appImage/"${PN}".desktop "${PN}-${SLOT}".desktop || die "Collision rename failed."
+	fi
+
+	# Remove "Build Option" dialog because it doesn't reflect
+	# what the GUI can or has been built with. (Bug #463628)
+	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
+}
+
+src_configure() {
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	# The build relies on an avidemux-core header that uses 'nullptr'
+	# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DGETTEXT="$(usex nls)"
+		-DSDL="$(usex sdl)"
+		-DLibVA="$(usex vaapi)"
+		-DOPENGL="$(usex opengl)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVIDEO="$(usex xv)"
+	)
+
+	use qt5 && mycmakeargs+=(
+			-DENABLE_QT5="$(usex qt5)"
+			-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+	)
+
+	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake_src_compile
+	done
+}
+
+src_test() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake_src_test
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake_src_install
+	done
+
+	if use qt5; then
+		cd "${S}" || die "Can't enter source folder"
+		newicon "${PN}"_icon.png "${PN}-${SLOT}".png
+		domenu "${PN}-${SLOT}".desktop
+	fi
+}
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index f9df063ad142..f03192d569ae 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -2,6 +2,6 @@ AUX cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch 4008 B
 AUX cheese-3.38.0-buildfix.patch 736 BLAKE2B 3118378b5b125ae6fe223d3b114e07805eb2b5d300bb78ec6b8ff3888f19a0b68af0091aa33918c885991a86293c5cc530d65a75d433cd7c5d343889e5740fbe SHA512 6633f5ebdb2662d199d3f44f49754c8e2c9cd2d864084bff079f4f4de9f20d15489f84ca3acba46df0c9af36920c57b1eca94748c097cb744f71669a69fada47
 AUX cheese-3.38.0-vala-genericarray.patch 6731 BLAKE2B 83f283e629106eba1174197f4b0afc9929fcaaaaa6d29ecaa59cbee97a373589638c2aa0da122db0bd11142ef2790e08b8e3a97e757837f4ce420c0f588609a7 SHA512 de93e2664331a792205c29cf893317719b182bece4185452e705cc349d48dbe46d7320a337e16d923dee4da693c07ba0542b4bc4367162212c7df549313849c2
 DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae
-EBUILD cheese-3.38.0-r1.ebuild 2329 BLAKE2B 0c19811bb84284d07bc8e51e2b085195d37550e41c9c510ff44cac4596b4aecc2690cbf8d82a9f21e5b1e9f1ed5ad663230b151dbad8f81eb366ca187d222ae6 SHA512 45b5bbc7b567c44172cac4cf4b2414f842e8c9e05c34c2bbc324cfcd985b7fad107933ea92d9c182d800285540d9ec00d7e050acf26b162c62baa077d6a961c7
+EBUILD cheese-3.38.0-r1.ebuild 2328 BLAKE2B 692671c66e723ef87f83efd05db51d0f3e595170892bf17b8b437458acd0b337610a2a395548b1da96c17c863b5a34c537f4f490b64f1ad43f96eb0f2521dbac SHA512 d54cb3648889ba2a88d889c38704b1e2fc070b1341d411e2e97375a97f621234de74d4585009b20c46989216ae00b70ee6c1e1fcf1bc197b600a42152e4f7339
 EBUILD cheese-3.38.0.ebuild 2120 BLAKE2B c28699d5912d6bcf91c9c95b02f00bb1e2c5c88964b67dd46681549eccc0570fe1cd55a3d21bacf5b557ba0bb4c4cd9ac1e4ecea4d13cd067577bca19abda7fa SHA512 5af98575aafab5be072e221cc54d4f317cca56fd1bb60a17c80b5811760d2f63c4140ffeecaa350677491737c2bc4bd66ffc2ca7d7d6be835b978246aad62b4b
 MISC metadata.xml 429 BLAKE2B 7874cf680a041c34e7c5f29b164552d311d333853050e5486aa0f8bdae3fce50316cd00038ba8cbbd102912cdb0c8c7fd5d6370af0004c8977e053eb89be9687 SHA512 ea2a94d4981bc40d13235bfa9a544855cdeb638e46293c84bfaf14f13dc255651c0eb01752b5987b42e285765ed2dbd65dbd58eb23c730e4cbd7fc31e0003fc8
diff --git a/media-video/cheese/cheese-3.38.0-r1.ebuild b/media-video/cheese/cheese-3.38.0-r1.ebuild
index 1bb93338d5ae..f721a44d310e 100644
--- a/media-video/cheese/cheese-3.38.0-r1.ebuild
+++ b/media-video/cheese/cheese-3.38.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index 2aa78c4fc79e..138d31fb3d7f 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,5 +1,7 @@
 AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a
 AUX ffmpeg-chromium-94.patch 1617 BLAKE2B 83afc6ae7f6d3b802e7c074545f8e46980751065303dc80283af917771675c987b063a4d39d9ca853b2753c40d38c3484c09a32500011b8faac0fca7e1807dad SHA512 41f4d79581602c475f245fb08f14e065ae2ca5b4863dade0e9652e33786fec90a631aa1a0e67f262ab067a12298883aea2d40309d2303bef76d7d99d06329eb2
 DIST ffmpeg-chromium-94.tar.gz 14709687 BLAKE2B 06dedbd86befd8caed4c6cb34755b52cf70630f8fbd712f89d42e5b63e498f9d2a77935fbd7c87194f6d56fb0f83ff26beba00357dd51b3ac3e2e4480ff4351e SHA512 a6cf5404c892c878c50e3ba8369456db587e327bc3d77e857b9d34f3665ecfee7d3865b20e9871ccda570b30d9d34c03fd981cdc7f495809ea8f12cb8f15937e
-EBUILD ffmpeg-chromium-94.ebuild 5985 BLAKE2B 1eb0251b8f8e52ad66ec4cd098f83439930e1eb9859465720714f715b84388b21ea737405a8ac7814fb2f210ae2389693c2eb97d0b22417579b4384461cd483b SHA512 28553c78a5b9ebcd7d401e8e35051256603c8b5d01191f4152833201a7f630f4a0a4df645ced60a3d0498f3d23188cde6cf08de33cf1a03359647d4921ddfd0b
+DIST ffmpeg-chromium-96.tar.gz 14782341 BLAKE2B 686f5e0970ab49663e43d54cdb9b0216560dabc676711666c9e51840af64d2c78d47b55bcf36625751676839869e1b1f3b65516499646db00fd29f5ed2ff90d3 SHA512 169a1bf58000be0799b05b1d3f3a63b5a93ec66023d31f1ac6f5d9cd77408a390a9308fb626e94c3f1d4e1170638c1c81ac68b248e06c28d318d731ddda8e4d2
+EBUILD ffmpeg-chromium-94.ebuild 6148 BLAKE2B 3dcc0310ab9cf7280f64bddca3dd9bb120e217afacca2eff0cdb31be84cc8398eb35da3937dec968e6b5e1afeab24ebb51f100bb3db44d8d91243e22f1f3fdfb SHA512 ac8e2cd29c98a89881580d5ae4e6cba3a0f1143e36ad553520dd12244caddc02e753b4f775454f09b1ef602765713753e2976c6d3851ae3b1f4d458728e4f5c2
+EBUILD ffmpeg-chromium-96.ebuild 6153 BLAKE2B f24b6866de0a6386e1c47475609da520e49bc578a2bc6a89eef6bccf8440f68cf427b3a62103d76b3d6220bb398f136ae8f5017b754ca108895ed8db5a5b0da9 SHA512 6b44d445e12eeaaec9c8fa06f23c1abc48a0294d09f28df238b32ac3a5e4d046545f5bee9da0507fb3e633bcbeec72ea31c08f8cf3fc37c334256201b5a29e2d
 MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
index 46851bbea181..94e036354132 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
@@ -180,6 +180,13 @@ src_configure() {
 		esac
 	fi
 
+	local extra_libs
+	if use arm || use ppc ; then
+		# bug #782811
+		# bug #790590
+		extra_libs+="$(test-flags-CCLD -latomic) "
+	fi
+
 	set -- "${S}/configure" \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -191,6 +198,7 @@ src_configure() {
 		--ranlib="$(tc-getRANLIB)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--optflags="${CFLAGS}" \
+		--extra-libs="${extra_libs}" \
 		--disable-all \
 		--disable-autodetect \
 		--disable-error-resilience \
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild
new file mode 100644
index 000000000000..8dafc5bbbacc
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+COMMIT="d772086c1ec3d79dbf7098f0ba96beffc501e16f"
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers"
+HOMEPAGE="https://ffmpeg.org/"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz"
+
+SLOT="${PV}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		cpudetection:runtime-cpudetect debug
+		+gpl
+		vaapi vdpau vulkan
+		# decoders
+		mmal +opus:libopus
+		video_cards_nvidia:ffnvcodec
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+IUSE="
+	${FFMPEG_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+RDEPEND="
+	mmal? ( media-libs/raspberrypi-userland )
+	opus? ( >=media-libs/opus-1.0.2-r2 )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1:0= )
+	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 )
+	vdpau? ( >=x11-libs/libvdpau-0.7 )
+	vulkan? ( >=media-libs/vulkan-loader-1.1.97:= )
+"
+
+DEPEND="${RDEPEND}
+"
+BDEPEND="
+	>=sys-devel/make-3.81
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+"
+
+REQUIRED_USE="
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	test
+"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-94.patch
+	"${FILESDIR}"/chromium.patch
+)
+
+src_prepare() {
+	export revision=git-N-g${COMMIT:0:10}
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+src_configure() {
+	local myconf=( )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282, bug #754654
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+	filter-flags "-flto*"
+
+	# Mandatory configuration
+	myconf=(
+		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
+		--disable-libcelt # bug #664158
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	local extra_libs
+	if use arm || use ppc ; then
+		# bug #782811
+		# bug #790590
+		extra_libs+="$(test-flags-CCLD -latomic) "
+	fi
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--nm="$(tc-getNM)" \
+		--ranlib="$(tc-getRANLIB)" \
+		--pkg-config="$(tc-getPKG_CONFIG)" \
+		--optflags="${CFLAGS}" \
+		--extra-libs="${extra_libs}" \
+		--disable-all \
+		--disable-autodetect \
+		--disable-error-resilience \
+		--disable-everything \
+		--disable-faan \
+		--disable-iconv \
+		--disable-lzo \
+		--disable-network \
+		--enable-avcodec \
+		--enable-avformat \
+		--enable-avutil \
+		--enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \
+		--enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \
+		--enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \
+		--enable-pic \
+		--enable-static \
+		"${myconf[@]}" \
+		${EXTRA_FFMPEG_CONF}
+
+	echo "${@}"
+	"${@}" || die
+}
+
+src_compile() {
+	emake V=1 libffmpeg
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install-libffmpeg
+}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 380be9154a21..869520511481 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,8 @@
 DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B 97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04 SHA512 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b
+DIST mpv-0.34.0.tar.gz 3287976 BLAKE2B 9fc412544d81b249c71eed0d6669121a1942771ecb48d50d3fda16b8f967c8a777529e28a234d7169617981cd909ff03aed0deaf15db900d605b8d8849939218 SHA512 9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0
+DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
 EBUILD mpv-0.33.1-r2.ebuild 9711 BLAKE2B 17210d955f7094943a593240070e6243133f7df704c2f15c07f29d0ffcf7d26ce8c1e6c8932340eaa24119149fd46392714bb9cdeee6aa1dd301702fb0f54c63 SHA512 1e8ce64678b3e133aea2ba356d398fe037a9164dc6c46c8b416982e4a57388ca0c4e80006aedfc20d9ecfd5e5445bfc8951135f436eef07cb9234c54d60bffa0
-EBUILD mpv-9999.ebuild 9711 BLAKE2B 9a98603fe5b9230ddaab263ddcaec980458dac78448e8b1c2fa5cd280cb53b1e7bd58e8bbde5323dd9023d0e51d356d546ed8e5106c37d45f85672f539e11b7b SHA512 de49b4bf2c7aec15b784705c288e72c554ca283694563ce6324d17d07f8bdc97c1c96e64dbd83a8c4160bda002cb26c42bfeeac8177005800341d7cf536c0301
+EBUILD mpv-0.34.0.ebuild 9714 BLAKE2B 79b9faee5bcb728af688b0994a8d0f930f45eb1c37c435ab3e28885182ae1bdf4c37ea5eee152221f01ba980d2ebbbe39b510eb01c43e5ca57c5ea19f02142e9 SHA512 86b8aa38ebc3a935448729c3c0c3ad50fab477334d9d2a429e17e660b56b231b2556d36beb86f31873fe8f81d95a39f611b4c97515b3bb8504640a6395a4d895
+EBUILD mpv-9999.ebuild 9714 BLAKE2B 79b9faee5bcb728af688b0994a8d0f930f45eb1c37c435ab3e28885182ae1bdf4c37ea5eee152221f01ba980d2ebbbe39b510eb01c43e5ca57c5ea19f02142e9 SHA512 86b8aa38ebc3a935448729c3c0c3ad50fab477334d9d2a429e17e660b56b231b2556d36beb86f31873fe8f81d95a39f611b4c97515b3bb8504640a6395a4d895
 MISC metadata.xml 2211 BLAKE2B fe97872a6f1307d4522e803e62bb8d6da1da94b7fcebe5e114a49f51736f1a3ea7471ddd7570712f7dfce59ad761b395dcdf3cfa48f23eb4f57e99390963daf9 SHA512 941350cda9ad14cbd6c5f34f41b7f99bd80365d4ee6f5d4115547c96dea1c30d22e509473fe492efe24acc72612a2b55e864948a5ad0c952063a1a115d579935
diff --git a/media-video/mpv/mpv-0.34.0.ebuild b/media-video/mpv/mpv-0.34.0.ebuild
new file mode 100644
index 000000000000..dd43d1178adb
--- /dev/null
+++ b/media-video/mpv/mpv-0.34.0.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=2.0.22
+
+inherit bash-completion-r1 flag-o-matic lua-single optfeature 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 ~riscv ~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
+	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 )
+	lua? ( ${LUA_REQUIRED_USE} )
+	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? ( ${LUA_DEPS} )
+	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-3.104.0:=[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}
+	cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
+	dvb? ( virtual/linuxtv-dvb-headers )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+BDEPEND="dev-python/docutils
+	virtual/pkgconfig
+	test? ( >=dev-util/cmocka-1.0.0 )
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+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)
+		$(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 lua; then
+		if use lua_single_target_luajit; then
+			mywafargs+=( --lua="luajit" )
+		else
+			# Because it would be too simple to just let the user directly
+			# specify the package name to check, wouldn't it.
+			mywafargs+=( --lua="$(ver_rs 1 '' $(ver_cut 1-2 $(lua_get_version)))" )
+		fi
+	fi
+
+	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 lua_single_target_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
+
+	optfeature "URL support" net-misc/yt-dlp
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_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/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 6cfe318953d5..dd43d1178adb 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -4,10 +4,10 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='threads(+)'
 
-WAF_PV=2.0.9
+WAF_PV=2.0.22
 
 inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
 
@@ -16,7 +16,7 @@ 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 ~riscv x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
@@ -93,7 +93,7 @@ COMMON_DEPEND="
 	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
 	vdpau? ( x11-libs/libvdpau )
 	vulkan? (
-		>=media-libs/libplacebo-2.72.2:=[vulkan]
+		>=media-libs/libplacebo-3.104.0:=[vulkan]
 		media-libs/shaderc
 	)
 	wayland? (
@@ -336,7 +336,7 @@ pkg_postinst() {
 		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
 	fi
 
-	optfeature "URL support" net-misc/youtube-dl
+	optfeature "URL support" net-misc/yt-dlp
 
 	xdg_icon_cache_update
 	xdg_desktop_database_update
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 228c651285dc..ef1d5c9c68be 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-pipewire-launcher.in 1195 BLAKE2B 41185857d2337a197d8c572fc3ae58d44f4baac70df8dc4125bb3577bfa804d094579e0aad79c5c760da137c9cc3162f9484987a0275af2c9fce6634e6ed8fc7 SHA512 a8be142999ab3fa1431fc284e8ef1b3a9d26cbe7acad9407b4b4a3cbab95763847acb852f784486474283cbd40ceb8388aaf81a76bbdf7c1261eff89dbc736d9
+AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire-0.3.25-non-systemd-integration.patch 822 BLAKE2B e80245300313151c01ec56a9be74590d6ee9211a78d9c16180ef1bfb1938a8ad9f8e00f2086d220ca6f8ad2d1c55508cfcc3c240467ed66239808f76029fdcae SHA512 0a7570e0dadd9119ba81b91fc0831ad511ed793f2f10f304547152448e0cf079118c595944e22f31cea94a92a0819524aad26c3fc2d17e73b622b43637cdf06a
 AUX pipewire-0.3.29-revert-openaptx-restriction.patch 1228 BLAKE2B a282cd6f678ecd5fd27076cd945b86a8139caf644fae5f6420f45e47cfa1f1ef7edacb6e5c6c0ae860bfaa016de902accb916159f90a85bddb0b26b73658e3ff SHA512 cadfe7c54eec23d2619faf274d2c5c95b4f430525c7fc0b84e667e3f90775d27dbb6682d200d3af5d48475a2b37ab0ff2dd6e8be4f2d69bead68f6f1efb7a7ad
@@ -20,10 +20,12 @@ DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee
 DIST pipewire-0.3.37.tar.gz 1716320 BLAKE2B ce98b28015de69a0c91953a4839d5f86a29cfa19e2058ba0a2476a75a03b782ae67239b418306e4ed7dab81fe7e77928a417b966ff3c72ac552006cea66e3218 SHA512 3f4cf1ac66117a56a7a264262e2e238a54060457da6a986bd9227f51cc7e8d1a8fd282aef8462c096819282c5baec22779d2025c2e1918bbfb3d6ff75829aea6
 DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e SHA512 c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6
 DIST pipewire-0.3.39.tar.gz 1671751 BLAKE2B 6ed56d43a45244c29a29f714eba1dbf911997f91d3e3df2cc1547051d52a2853f4d4c745aaf866ae18b63668f3fb9b7d3338deaad90d229c5fab1641482c6761 SHA512 75ed35177577efe7559341394605777be21d0f3952b9379a23c8d4c71d35ed88ec45c3e9ad58832099c8f370753d8b47a5767f47453a599c4f4a4b641b2b0d9d
+DIST pipewire-0.3.40.tar.gz 1675384 BLAKE2B b7df4f1ca363b764a5230099d32dd5ba5dceaadc8ca2d4ce55f42810a91628b4e32891757b22fd5eb7a7f497163936c63b86330ab2d5efa261a82d450660c371 SHA512 63109b87d50be160a6cde632470849564d4743f4cb469f5e3713bb1cbefc08f80416210ddedc09439555b702193c0266a1b9724e366a3b850bdf1a346c5e80cb
 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
 EBUILD pipewire-0.3.36.ebuild 10264 BLAKE2B 4c34ce0089bf417366a1cc2eb6e5a83d84af4816db5da53fe0293504c26ddd3d0caef8e4cb48fd3c1a48cb4424720f31319e6f3d99729213595498d447ace0dd SHA512 a4ad4dfe0969fd41533e6742843e8b4332fc0122c4327e3198ae8c7a84be166f008c9ed694f14a56b56bfc129a6678651a17a168b96b13329485be2af378930d
 EBUILD pipewire-0.3.37.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61
 EBUILD pipewire-0.3.38.ebuild 10338 BLAKE2B 7861add091c7a01562398c392f512426a71e09f2ea3026aa22f296d9c57074f09807790cdaa6f9dd8f8c6b8ed453e83e40bb6561f8d2277c551b84f0e051914b SHA512 3f0758cc305d9efe5ba1599dd47b24820c0100b1279e607607db0d36779da0e6e0c4803e9861887ed49205dba4fc1a22a33b634ddc5c4b02899a910e61c3cb59
 EBUILD pipewire-0.3.39-r4.ebuild 10888 BLAKE2B 9a229f85583bd255a3f2ad0c432db4e8b5cd0f628a778ddca5ca7a7d97acf90f0af4cb8a22a238f7a0a4706cc268f7278a5d44406457e5026e9a00a8d76c0cee SHA512 a95610efddadb30ee1db556bd6fef7d5d090b416354f39bab80a8cf912eaed78f50c4d8333a82fb617a822c22b97c8541d83d425fbac73959fa5577c8bafc294
-EBUILD pipewire-9999.ebuild 10783 BLAKE2B 898d127277ee046d55a3d4c2f4fca5bcbfa528835d94c02c75534c76395dc22cae3617950ac2040d35d2d1a5a8fd06e312b319a370f5e2ccb3b5411563bf883a SHA512 14e179d0e485b6077f8fa276e4ae63e1a0e89e199cb4347477aee57a7b5fde892ecb7dddac63c4b669e4ef03669be17c233db928077227e8806adb4bd7bbadf5
+EBUILD pipewire-0.3.40-r1.ebuild 10786 BLAKE2B 2dd1b5222a5622c95b981d2279db8a2ca91dd39193c3c5df101adba4d8f349c22fa8f53452afda7ff4b5df932f049a5de93b0337f00b7153c799da64af2be3cc SHA512 1fca338325deda74acfd0c2bc673e2329e109b943e27e61b9d042d58a4b32f3ae92ef76ff5237b30407bf13c200fff50943d6d329d5775e24969e5cccaba6554
+EBUILD pipewire-9999.ebuild 10786 BLAKE2B 2dd1b5222a5622c95b981d2279db8a2ca91dd39193c3c5df101adba4d8f349c22fa8f53452afda7ff4b5df932f049a5de93b0337f00b7153c799da64af2be3cc SHA512 1fca338325deda74acfd0c2bc673e2329e109b943e27e61b9d042d58a4b32f3ae92ef76ff5237b30407bf13c200fff50943d6d329d5775e24969e5cccaba6554
 MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf
diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in b/media-video/pipewire/files/gentoo-pipewire-launcher.in
index 4e66e2fe317d..495c47f6c7e1 100644
--- a/media-video/pipewire/files/gentoo-pipewire-launcher.in
+++ b/media-video/pipewire/files/gentoo-pipewire-launcher.in
@@ -22,5 +22,8 @@ pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
 # non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
 @GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf &
 
+# Hack for bug #822498
+sleep 1
+
 # Finally a session manager is required for PipeWire to do anything.
 exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber
diff --git a/media-video/pipewire/pipewire-0.3.40-r1.ebuild b/media-video/pipewire/pipewire-0.3.40-r1.ebuild
new file mode 100644
index 000000000000..9de3b924f048
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.40-r1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="jack-sdk? ( !jack-client )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND="media-video/wireplumber"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
+		elog
+		elog "  systemctl --user disable --now pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable WirePlumber"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user enable --now wireplumber.service"
+		elog
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
+			elog "autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable --now ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 2e84b38f88d3..9de3b924f048 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -198,7 +198,7 @@ multilib_src_install_all() {
 
 	if ! use systemd; then
 		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
 
 		exeinto /usr/bin
 		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 652088a41771..58440e67cb76 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,10 +3,6 @@ AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b6
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d
 AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca775336174dbef69e6054361173886be26d941cabfe2c5b486a05f2b3bee7029b439652d4dfb10e5651a7db68db8b70af SHA512 6bdb6d57be84c1d020c6f2e2f547eda9a0118bfcd0e4d2cdbb940501a0853ec388f359e04a52b8ff9c6c6b38d60f3837ed2c2e127a4df5bf79751486d9ed9ed6
 AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366a0a2e77eea881277d7b8a7928e851d2456f8fe5220ee50ae77296b622187758b7f6f3a4c298c0400becfee0d2fa074e7706e3 SHA512 b330aee54397a3fce5cda3a1244918351831ffe37cc7d45bcfa93384952bdce3166875afd5cd4bae9f1d6e83281b6b6bfc3ad777317a0b2c6c5dcc5593ddcb54
-DIST smplayer-20.6.0.tar.bz2 5227856 BLAKE2B 5cf77acd7098aa81d1bd40c62d6cf5cd743167ee07a86f9d0d856eba5e7ce1befe4e7a384126dc3b244588758ab40b19804bfc3e0ff8e17d1e0d5d504e57c0ae SHA512 2cf7b7abf44b301331a5389e1ca512bd41928724b412d8cf55d77cb5cde87a4fdb9038d77c31da14b548d38ebfadd461d588d60a6b6f13b1781b9b961e81637d
 DIST smplayer-21.10.0.tar.bz2 5186253 BLAKE2B e2da80e64c4cbb9a3977ae9f5570800a2c3e012f21fdd011d66dce681488805c309fb40aae72aff5858cc06beaf1e8bbe052816eb91d3700a222b3b10be57228 SHA512 3e4a046c704eeb181570c56a819afbca939257df370c909dab3af448553702feeebba542f123d18cf6b786a19f92ee67ba60ba25a649d83f1f31411b715f7ae4
-DIST smplayer-21.8.0.tar.bz2 5145128 BLAKE2B a13146dac8c78d70c8e9db64aaf9da6c64267b389d6b06cb523548306733853276623d8d9e0ba1e94fb2bee5ab1da97109edb1fef4ce88a3569ca96f26e4d653 SHA512 4513718ca8cf1529ef5e4b8595cba9d9177073acaada6f7e8aed242a1fd56cb8fdf932a757ae147aa645a5422c1e8f52863b562f7e697f643769b1c57f7e647e
-EBUILD smplayer-20.6.0.ebuild 3273 BLAKE2B 97d27b8cf51c8bd752ae9aca64c5ce8f723bee4da7340ed82c1ccc341fdf552cd67c16ed68cf366a5ec76df61a4ff614dc16dcbe03d7f83087aef8d0d7ebc0f0 SHA512 b48d4ca7be60773612d26d232cfe6a502555366f993677b7cb7a880cc7baa93c97280e4946c0436420f9301b875d5967fa314a26d388841b4c47a7190ea3713e
-EBUILD smplayer-21.10.0.ebuild 3288 BLAKE2B 8cfd22d5351b19d54f048db210b551d6d91f02ef12337de6bd0b2b59b33911cdc1dabd0d58d7183526e2b0518cfbf3474e764378dd4b9dd33d319798531038ca SHA512 07e572afcf34db11dacbee0c7dbe413e7888aa48e2dc74278dd47d8da485d8284a8f54ada34d923ce094f7322a4c49e703e7d82a26f3e0500b0cfb1498ff2b0a
-EBUILD smplayer-21.8.0.ebuild 3292 BLAKE2B 830ba06e00e5b6f53961bc971e0dadfe983a6affef63f56b8e5e2a114c9005442644cb038e773888cb163c1c15b1ea0d9b0758ed2abe232eba47df728be62d20 SHA512 a97fadfcc5ae526c608cbd14dc2e5162627f2522b26266c6875bbd8d2cee2fd9e8bc7eb2b0f6fe7e7a70771c8835a5dabd7a79d1ce3649644b40bf06ba21e295
+EBUILD smplayer-21.10.0.ebuild 3286 BLAKE2B e04255eac738ab032f25aec209df7487cf8558cfa19c80ec0e3d2e38d670334c4f4284c1b68f7d25832cfc688bad62b020bdabea6c47fa679556a6d83211c112 SHA512 39d2f55d40baa085076c1ab63060dbaee2601ccb0f1c2931afd685dabf4aea77afa79d3227eb67bf10757093a038e586528e797b61d2350643a5c91ff902038c
 MISC metadata.xml 887 BLAKE2B 30c1965dc7e5ef2126e33b995ea1668f51f9125f9f3549555d18e55fa52d5a311caa030f04e6bd1b02bbc3781ce1450e3184dd463bad8d9ab36cb1fc28e009ba SHA512 3d2f278f23cbb28b41eda0547591c6692809c281ea15030f6f6c29ca38f2e074cd29b540f925164aa522aa42e35890a166149a6cc9a0473253b3b678eaee3505
diff --git a/media-video/smplayer/smplayer-20.6.0.ebuild b/media-video/smplayer/smplayer-20.6.0.ebuild
deleted file mode 100644
index 666e88b97024..000000000000
--- a/media-video/smplayer/smplayer-20.6.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2007-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
-he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
-sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit plocale qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://www.smplayer.eu/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	autoshutdown? ( dev-qt/qtdbus:5 )
-	mpris? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		media-video/mpv[libass(+),X]
-		media-video/mplayer[bidi?,libass,png,X]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
-)
-
-src_prepare() {
-	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
-
-	default
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
-		-e '/\.\/get_svn_revision\.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		Makefile || die
-
-	# Turn off online update checker, bug #479902
-	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
-		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
-		-i src/smplayer.pro || die
-
-	# Turn off intrusive share widget
-	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
-		-i src/smplayer.pro || die
-
-	# Toggle autoshutdown option which pulls in dbus, bug #524392
-	if ! use autoshutdown ; then
-		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# MPRIS2 pulls in dbus, bug #553710
-	if ! use mpris ; then
-		sed -e 's:DEFINES += MPRIS2:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#plocale_find_changes "${S}"/src/translations ${PN}_ .ts
-
-	# Do not default compress man page
-	sed '/gzip -9.*\.1$/d' -i Makefile || die
-	sed 's@\.gz$@@' -i smplayer.spec || die
-}
-
-src_configure() {
-	cd src || die
-	eqmake5
-}
-
-gen_translation() {
-	local mydir="$(qt5_get_bindir)"
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-
-	cd src/translations || die
-	plocale_for_each_locale gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of the GPL
-	rm -f Copying* docs/*/gpl.html || die
-	# don't install empty dirs
-	rmdir --ignore-fail-on-non-empty docs/* || die
-
-	default
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "If you want URL support with media-video/mpv, please install"
-	elog "net-misc/youtube-dl."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-video/smplayer/smplayer-21.10.0.ebuild b/media-video/smplayer/smplayer-21.10.0.ebuild
index 9eaa9830fec8..7d4285f41a33 100644
--- a/media-video/smplayer/smplayer-21.10.0.ebuild
+++ b/media-video/smplayer/smplayer-21.10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 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/smplayer/smplayer-21.8.0.ebuild b/media-video/smplayer/smplayer-21.8.0.ebuild
deleted file mode 100644
index 5263612b36d3..000000000000
--- a/media-video/smplayer/smplayer-21.8.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 2007-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
-he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
-sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit plocale qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://www.smplayer.eu/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	autoshutdown? ( dev-qt/qtdbus:5 )
-	mpris? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		media-video/mpv[libass(+),X]
-		media-video/mplayer[bidi?,libass,png,X]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
-)
-
-src_prepare() {
-	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
-
-	default
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
-		-e '/\.\/get_svn_revision\.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		Makefile || die
-
-	# Turn off online update checker, bug #479902
-	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
-		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
-		-i src/smplayer.pro || die
-
-	# Turn off intrusive share widget
-	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
-		-i src/smplayer.pro || die
-
-	# Toggle autoshutdown option which pulls in dbus, bug #524392
-	if ! use autoshutdown ; then
-		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# MPRIS2 pulls in dbus, bug #553710
-	if ! use mpris ; then
-		sed -e 's:DEFINES += MPRIS2:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#plocale_find_changes "${S}"/src/translations ${PN}_ .ts
-
-	# Do not default compress man page
-	sed '/gzip -9.*\.1$/d' -i Makefile || die
-	sed 's@\.gz$@@' -i smplayer.spec || die
-}
-
-src_configure() {
-	cd src || die
-	eqmake5
-}
-
-gen_translation() {
-	local mydir="$(qt5_get_bindir)"
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-
-	cd src/translations || die
-	plocale_for_each_locale gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of the GPL
-	rm -f Copying* docs/*/gpl.html || die
-	# don't install empty dirs
-	rmdir --ignore-fail-on-non-empty docs/* || die
-
-	default
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "If you want URL support with media-video/mpv, please install"
-	elog "net-misc/youtube-dl."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index ddbe9b39845b..253ed0a7c71a 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,9 +1,4 @@
-AUX subtitlecomposer-0.7.0-mpv-0.33.patch 8812 BLAKE2B 00f0f9eb715c080b7a3f117f88a2aa69c08e553d3370637a09e27d04efdd01615b1f381a31efc415d0a114a0bfbf1ccf2d4d271377094f9bc20b29992ce953e2 SHA512 fe965b896358b969c6eef9e1a0262a59f6776e6f302da5356f447939992a9755285d95a495bd7acfb75fb28e78053557b0414b80c8315588e2f943545f16517f
-AUX subtitlecomposer-0.7.0-tests-optional.patch 242 BLAKE2B 6a3d88a537ad39a151b8a6ac071376eda0d1e5d504e92052b9f55e4693633b47fc2b6986d560bd086adf76630ad24bc3671b88f3bc97f9cb429a9e14ad9376bc SHA512 65f5c8db0c5e99b51600db772c918acb7154c7999bbbbbed18ed859f4defcb70d4f907c02a08d9a7529f3aaf4867d6154b9987fb3528cb100f4daa4466e33e74
-AUX subtitlecomposer-0.7.0-valid-desktop-file.patch 1090 BLAKE2B 4491d0bf738fe19374d40b2d278322694a456ac2d11394853653f44351ddf06714143164773eb6597ba4b6f55cf510803231c1241cca20cdc9822d3892f8e646 SHA512 4f2802be511da0b9f132d4368e23c06510fd0c115c8a19f5c05d0e737c355b3c061d290e38370a5992b85a48d77b23949ce3ebf675b9086d585df5be056e358b
 AUX subtitlecomposer-0.7.1-tests-optional.patch 762 BLAKE2B cc8f7408e165422788ed9f6c3641e816237ef1230e64853ceb0fe83acbbe9a10b3cd2b5670270904984ab3e23ebfe6ea1d07278826a6ab89346ec7502076f477 SHA512 a02f847164f2f117f024c09311b00a55b268f80089c6304b29ffd5bb7166ea3b81c14e65befc36379124f18600cb6d57ae8f320261ecd25bb0e05c754d55cbcb
-DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7 SHA512 b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04
 DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92
-EBUILD subtitlecomposer-0.7.0.ebuild 2005 BLAKE2B 7ef30553b68f40208e46ca6f3338458d7c3269cf8227b8e965dcfd88ef590e6929e40a334135f83e5f2a69161668cfd2e4eede8a8100aa1915526f0b3e29808e SHA512 147ac6581658b440958fa2df73ac346c5656762a2889bd596c8c5bca99faa101b775771bd62b4567187e1e2edf2b780f567c0932f72b5d5b27a1edd2f07ae714
-EBUILD subtitlecomposer-0.7.1.ebuild 1452 BLAKE2B 2be1ce1779b917621b684349c0d4dc6cd225577fbc618eb154c16843cb122545fce024574c15e0fdeed571f5d81a2fd9c2cde74bbd78acfa22b215638f12965b SHA512 664c6addf505a78e8575554ecabdcf236ffb56d9fa0e75e196beaaa0a768e791d2bfef2c627fce53116d33423a6ef960bf1ae39709b96dd57696fab3613cfd68
-MISC metadata.xml 505 BLAKE2B 541cb4fa01f37c2ffe524afedad709d2148a6a6e06887c385ef39beced7f1b65a4ce3754a048563cd1d1463e28d795c9792c5e3ac661c7c1ff86155e7b5df2d7 SHA512 b097071bfcd874fc223a53c6d1772cd93c4da69f342afb1bc463e050b6d155ed7a181599abb15407b4ff7c3d7aa953302a8b919a6c59ca788cbd29c0ea9e7e0d
+EBUILD subtitlecomposer-0.7.1.ebuild 1450 BLAKE2B 139a8fb6c99b28a5d0ad928a3470460f196d967c273875ed1f3b672c6c3a056f5d0391f125852f65efc7d0b2d0366c1e58c858160dc477a7eb4d9303f5a44c75 SHA512 b922e2b045bd91949050bd9c6e4525d2d7a3d70bcafb1d3dda75b29d6632a4f17d9eaaf758b7cd0c646db515f24e4217a26ea5df3dddf419bf695295e6bcafea
+MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch
deleted file mode 100644
index a97ab22543bc..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-From d09a3cbc60da86f57d06477dea1a57962a11ffb2 Mon Sep 17 00:00:00 2001
-From: Mladen Milinkovic <maxrd2@smoothware.net>
-Date: Mon, 8 Jul 2019 20:19:03 +0200
-Subject: [PATCH] MPV player config options aren't hardcoded anymore.
-
----
- src/videoplayerplugins/mpv/mpvbackend.cpp     |  37 ++++++-
- src/videoplayerplugins/mpv/mpvbackend.h       |   8 +-
- .../mpv/mpvconfigwidget.cpp                   | 102 ++++++++++++++++--
- src/videoplayerplugins/mpv/mpvconfigwidget.h  |   8 ++
- 4 files changed, 139 insertions(+), 16 deletions(-)
-
-diff --git a/src/videoplayerplugins/mpv/mpvbackend.cpp b/src/videoplayerplugins/mpv/mpvbackend.cpp
-index d85a56c..9fdcd95 100644
---- a/src/videoplayerplugins/mpv/mpvbackend.cpp
-+++ b/src/videoplayerplugins/mpv/mpvbackend.cpp
-@@ -33,8 +33,6 @@
- #include <KMessageBox>
- 
- using namespace SubtitleComposer;
--using namespace mpv;
--using namespace mpv::qt;
- 
- MPVBackend::MPVBackend()
- 	: PlayerBackend(),
-@@ -218,6 +216,37 @@ MPVBackend::mpvEventHandle(mpv_event *event)
- 	}
- }
- 
-+static QVariant
-+node_to_variant(const mpv_node *node)
-+{
-+	switch(node->format) {
-+	case MPV_FORMAT_STRING:
-+		return QVariant(QString::fromUtf8(node->u.string));
-+	case MPV_FORMAT_FLAG:
-+		return QVariant(static_cast<bool>(node->u.flag));
-+	case MPV_FORMAT_INT64:
-+		return QVariant(static_cast<qlonglong>(node->u.int64));
-+	case MPV_FORMAT_DOUBLE:
-+		return QVariant(node->u.double_);
-+	case MPV_FORMAT_NODE_ARRAY: {
-+		mpv_node_list *list = node->u.list;
-+		QVariantList qlist;
-+		for(int n = 0; n < list->num; n++)
-+			qlist.append(node_to_variant(&list->values[n]));
-+		return QVariant(qlist);
-+	}
-+	case MPV_FORMAT_NODE_MAP: {
-+		mpv_node_list *list = node->u.list;
-+		QVariantMap qmap;
-+		for(int n = 0; n < list->num; n++)
-+			qmap.insert(QString::fromUtf8(list->keys[n]), node_to_variant(&list->values[n]));
-+		return QVariant(qmap);
-+	}
-+	default: // MPV_FORMAT_NONE, unknown values (e.g. future extensions)
-+		return QVariant();
-+	}
-+}
-+
- void
- MPVBackend::updateTextData(const mpv_event_property *prop)
- {
-@@ -230,7 +259,7 @@ MPVBackend::updateTextData(const mpv_event_property *prop)
- 				if(val.format != MPV_FORMAT_NODE_MAP)
- 					continue;
- 
--				const QMap<QString, QVariant> &map = mpv::qt::node_to_variant(&val).toMap();
-+				const QMap<QString, QVariant> &map = node_to_variant(&val).toMap();
- 
- 				if(map[QStringLiteral("type")].toString() != QStringLiteral("sub")
- 				|| map[QStringLiteral("external")].toBool() == true)
-@@ -269,7 +298,7 @@ MPVBackend::updateAudioData(const mpv_event_property *prop)
- 				if(val.format != MPV_FORMAT_NODE_MAP)
- 					continue;
- 
--				const QMap<QString, QVariant> &map = mpv::qt::node_to_variant(&val).toMap();
-+				const QMap<QString, QVariant> &map = node_to_variant(&val).toMap();
- 
- 				if(map[QStringLiteral("type")].toString() != QStringLiteral("audio"))
- 					continue;
-diff --git a/src/videoplayerplugins/mpv/mpvbackend.h b/src/videoplayerplugins/mpv/mpvbackend.h
-index d0edf2e..5e19fa1 100644
---- a/src/videoplayerplugins/mpv/mpvbackend.h
-+++ b/src/videoplayerplugins/mpv/mpvbackend.h
-@@ -23,7 +23,7 @@
- 
- #include "videoplayer/playerbackend.h"
- 
--#include <mpv/qthelper.hpp>
-+#include <mpv/client.h>
- 
- #include <QWidget>
- #include <QString>
-@@ -76,14 +76,10 @@ signals:
- protected slots:
- 	void onMPVEvents();
- 
--protected:
--	void setupProcessArgs(const QString &filePath);
--
-+private:
- 	void mpvEventHandle(mpv_event *event);
--
- 	static void wakeup(void *ctx);
- 
--private:
- 	void updateTextData(const mpv_event_property *prop);
- 	void updateAudioData(const mpv_event_property *prop);
- 	void updateVideoData();
-diff --git a/src/videoplayerplugins/mpv/mpvconfigwidget.cpp b/src/videoplayerplugins/mpv/mpvconfigwidget.cpp
-index 78458f8..6958141 100644
---- a/src/videoplayerplugins/mpv/mpvconfigwidget.cpp
-+++ b/src/videoplayerplugins/mpv/mpvconfigwidget.cpp
-@@ -20,6 +20,11 @@
- 
- #include "mpvconfigwidget.h"
- 
-+#include <locale>
-+#include <mpv/client.h>
-+
-+#include "scconfig.h"
-+
- using namespace SubtitleComposer;
- 
- MPVConfigWidget::MPVConfigWidget(QWidget *parent)
-@@ -27,14 +32,99 @@ MPVConfigWidget::MPVConfigWidget(QWidget *parent)
- {
- 	setupUi(this);
- 
--	kcfg_mpvVideoOutput->addItems(QString("vdpau vaapi opengl opengl-hq sdl xv wayland x11 null").split(' '));
--	kcfg_mpvVideoOutput->setProperty("kcfg_property", QByteArray("currentText"));
-+	// FIXME: libmpv requires LC_NUMERIC category to be set to "C".. is there some nicer way to do this?
-+	std::setlocale(LC_NUMERIC, "C");
-+	m_mpv = mpv_create();
-+	mpv_request_log_messages(m_mpv, "info");
-+	if(mpv_initialize(m_mpv) >= 0) {
-+		getHelpResponse(); // make sure there are no log messages
-+		static QStringList bad = {
-+			QStringLiteral("libmpv"),
-+			QStringLiteral("null"),
-+			QStringLiteral("image"),
-+			QStringLiteral("tct"),
-+			QStringLiteral("caca"),
-+			QStringLiteral("pcm"),
-+		};
-+
-+		mpv_set_property_string(m_mpv, "vo", "help");
-+		for(QString row : getHelpResponse()) {
-+			int pos = row.indexOf(QChar(' '));
-+			if(pos == -1)
-+				continue;
-+			const QString name = row.left(pos);
-+			if(bad.contains(name))
-+				continue;
-+			row.insert(pos, "\t-");
-+			if(SCConfig::mpvVideoOutput() == name)
-+				kcfg_mpvVideoOutput->setCurrentIndex(kcfg_mpvHwDecode->count());
-+			kcfg_mpvVideoOutput->addItem(row, name);
-+		}
-+		kcfg_mpvVideoOutput->setProperty("kcfg_property", QByteArray("currentData"));
-+
-+		mpv_set_property_string(m_mpv, "hwdec", "help");
-+		kcfg_mpvHwDecode->addItem(QStringLiteral("auto\t- Choose best HW decoder"), QStringLiteral("auto"));
-+		for(QString row : getHelpResponse()) {
-+			int pos = row.indexOf(QChar(' '));
-+			if(pos == -1)
-+				continue;
-+			const QString name = row.left(pos);
-+			const QString lastName = kcfg_mpvHwDecode->itemData(kcfg_mpvHwDecode->count() - 1).toString();
-+			if(lastName == name || bad.contains(name))
-+				continue;
-+			if(SCConfig::mpvHwDecode() == name)
-+				kcfg_mpvHwDecode->setCurrentIndex(kcfg_mpvHwDecode->count());
-+			kcfg_mpvHwDecode->addItem(name, name);
-+		}
-+		kcfg_mpvHwDecode->setProperty("kcfg_property", QByteArray("currentData"));
-+
-+		mpv_set_property_string(m_mpv, "ao", "help");
-+		for(QString row : getHelpResponse()) {
-+			int pos = row.indexOf(QChar(' '));
-+			if(pos == -1)
-+				continue;
-+			const QString name = row.left(pos);
-+			if(bad.contains(name))
-+				continue;
-+			row.insert(pos, "\t-");
-+			if(SCConfig::mpvAudioOutput() == name)
-+				kcfg_mpvAudioOutput->setCurrentIndex(kcfg_mpvHwDecode->count());
-+			kcfg_mpvAudioOutput->addItem(row, name);
-+		}
-+		kcfg_mpvAudioOutput->setProperty("kcfg_property", QByteArray("currentData"));
- 
--	kcfg_mpvHwDecode->addItems(QString("auto vdpau vaapi vaapi-copy").split(' '));
--	kcfg_mpvHwDecode->setProperty("kcfg_property", QByteArray("currentText"));
-+		mpv_detach_destroy(m_mpv);
-+	} else {
-+		kcfg_mpvVideoOutput->addItems(QString("vdpau vaapi opengl opengl-hq sdl xv wayland x11 null").split(' '));
-+		kcfg_mpvVideoOutput->setProperty("kcfg_property", QByteArray("currentText"));
- 
--	kcfg_mpvAudioOutput->addItems(QString("pulse alsa oss portaudio jack null").split(' '));
--	kcfg_mpvAudioOutput->setProperty("kcfg_property", QByteArray("currentText"));
-+		kcfg_mpvHwDecode->addItems(QString("auto vdpau vaapi vaapi-copy").split(' '));
-+		kcfg_mpvHwDecode->setProperty("kcfg_property", QByteArray("currentText"));
-+
-+		kcfg_mpvAudioOutput->addItems(QString("pulse alsa oss portaudio jack null").split(' '));
-+		kcfg_mpvAudioOutput->setProperty("kcfg_property", QByteArray("currentText"));
-+	}
-+}
-+
-+const QStringList
-+MPVConfigWidget::getHelpResponse()
-+{
-+	QStringList res;
-+	while(m_mpv) {
-+		mpv_event *event = mpv_wait_event(m_mpv, .1);
-+		if(event->event_id == MPV_EVENT_LOG_MESSAGE) {
-+			mpv_event_log_message *msg = reinterpret_cast<mpv_event_log_message *>(event->data);
-+			if(msg->log_level == MPV_LOG_LEVEL_INFO && strcmp(msg->prefix, "cplayer") == 0) {
-+				QString row = QString::fromUtf8(msg->text).simplified();
-+				if(row.endsWith(QChar(':')))
-+					continue;
-+				res << row;
-+			}
-+		} else if(event->event_id == MPV_EVENT_NONE) {
-+			break;
-+		}
-+	}
-+	return res;
- }
- 
- MPVConfigWidget::~MPVConfigWidget()
-diff --git a/src/videoplayerplugins/mpv/mpvconfigwidget.h b/src/videoplayerplugins/mpv/mpvconfigwidget.h
-index f4105d7..775b507 100644
---- a/src/videoplayerplugins/mpv/mpvconfigwidget.h
-+++ b/src/videoplayerplugins/mpv/mpvconfigwidget.h
-@@ -23,6 +23,8 @@
- 
- #include "ui_mpvconfigwidget.h"
- 
-+#include <mpv/client.h>
-+
- namespace SubtitleComposer {
- class MPVConfigWidget : public QWidget, private Ui::MPVConfigWidget
- {
-@@ -31,6 +33,12 @@ class MPVConfigWidget : public QWidget, private Ui::MPVConfigWidget
- public:
- 	explicit MPVConfigWidget(QWidget *parent = 0);
- 	virtual ~MPVConfigWidget();
-+
-+private:
-+	const QStringList getHelpResponse();
-+
-+private:
-+	mpv_handle *m_mpv;
- };
- }
- 
--- 
-2.29.2
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-tests-optional.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-tests-optional.patch
deleted file mode 100644
index b2db3d9975e6..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-tests-optional.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/core/CMakeLists.txt	2019-07-04 21:15:26.000891815 +0200
-+++ b/src/core/CMakeLists.txt	2019-07-04 21:15:26.005891858 +0200
-@@ -13,4 +13,6 @@
- 	CACHE INTERNAL EXPORTEDVARIABLE
- )
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
deleted file mode 100644
index 932fc6770f04..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From ce2a1a94a6a0802d9a289d701e76b7975d5baa0d Mon Sep 17 00:00:00 2001
-From: Mladen Milinkovic <maxrd2@smoothware.net>
-Date: Thu, 9 Apr 2020 12:21:07 +0200
-Subject: [PATCH] Removed invalid subpicture/x-pgs mime - refs #20
-
----
- src/subtitlecomposer.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/subtitlecomposer.desktop b/src/subtitlecomposer.desktop
-index 4195b076..af8a80af 100644
---- a/src/subtitlecomposer.desktop
-+++ b/src/subtitlecomposer.desktop
-@@ -14,6 +14,6 @@
- Comment[hr]=KDE uređivač podnaslova
- Icon=subtitlecomposer
- Exec=subtitlecomposer %f
--MimeType=text/x-ssa;text/x-ass;text/x-microdvd;text/x-mpsub;application/x-subrip;text/x-subviewer;text/x-mplsub;text/x-tmplayer;text/x-tmplayer+;application/x-vobsub;subpicture/x-pgs;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
-+MimeType=text/x-ssa;text/x-ass;text/x-microdvd;text/x-mpsub;application/x-subrip;text/x-subviewer;text/x-mplsub;text/x-tmplayer;text/x-tmplayer+;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
- Terminal=false
- Categories=Qt;KDE;AudioVideo;
diff --git a/media-video/subtitlecomposer/metadata.xml b/media-video/subtitlecomposer/metadata.xml
index e0450d427a62..d14e6df997e3 100644
--- a/media-video/subtitlecomposer/metadata.xml
+++ b/media-video/subtitlecomposer/metadata.xml
@@ -9,9 +9,6 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="mpv">Build mpv backend support</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
deleted file mode 100644
index 6dbfebafa05d..000000000000
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm
-
-DESCRIPTION="Text-based subtitles editor"
-HOMEPAGE="https://subtitlecomposer.kde.org/"
-SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="gstreamer mpv unicode xine"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	media-libs/phonon[qt5(+)]
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	media-video/ffmpeg:0=
-	mpv? ( media-video/mpv[libmpv] )
-	unicode? ( dev-libs/icu:= )
-	xine? (
-		media-libs/xine-lib
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests-optional.patch"
-	"${FILESDIR}/${P}-valid-desktop-file.patch" # bug 745429
-	"${FILESDIR}/${P}-mpv-0.33.patch" # bug 760006
-)
-
-S="${WORKDIR}/SubtitleComposer-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
-		$(cmake_use_find_package gstreamer GStreamer)
-		$(cmake_use_find_package mpv MPV)
-		$(cmake_use_find_package unicode ICU)
-		$(cmake_use_find_package xine Xine)
-		$(cmake_use_find_package xine X11)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "Some example scripts provided by ${PN} require dev-lang/ruby"
-	elog "or dev-lang/python to be installed."
-}
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
index 6f8b7b633568..aef529fbf604 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="unicode"
 
 DEPEND="
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 6a33023fbe10..62dae207eea4 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,4 +1,6 @@
 AUX 3.38.0-gst-inspect-sandbox.patch 1823 BLAKE2B 14be244c4bd9d96264ff776fb68381df5ea153fac41bf358e2253628bdb09733846a9331e6b129a1abd9186b967357549d6247d5ac021a37362a34206d8e17d8 SHA512 45f7602233b2f64debe1624442a2f6a21e0bf0b2cddf06b49dcdae7dcf0fc0ae6c3f16e5ec2603340df7cd89271501be70a31a0e0b0a737f85f667ac10c3ad53
 DIST totem-3.38.1.tar.xz 2196156 BLAKE2B a9f5771d7406df9490b6eb0f9dc03ef449bee05d6ff038fce9adbac63692b5555de6ff36fe90b3b63cf4bc59739d91b23e57b3a03bf953594567e6a21060b509 SHA512 f33583b0890bfdd0dfff0722f73242b1d38605564a3055b587a30eae4c0ba51159c105ef577ab144792ca1994f385c2b8a9375a356b7cdf2b93bfeb6317f6040
+DIST totem-3.38.2.tar.xz 2190700 BLAKE2B 3b3b8166cf674b882a3a66a5729d794489fe779944bb277fad35fe027b56270e6ef578590924309b9fe28aca0544754696acd98d31a7243a33a533abe73ed6fd SHA512 1dac3a0afe31b47147a129c70dddf7480446fc1bb5432f9cd537384e3be25da6a9b87918fa7bcf7e7cd68c8dac45e75f6b1f7c1885edefac846c52f96b40567f
 EBUILD totem-3.38.1.ebuild 2829 BLAKE2B a0cafb192ae7fc7d6416d48be2d8d04590a7ec786c3f81bad2f02848b1e7cfd77842171f5a75f67f793f75b5d2e6e3c91ffaaa95672cc0f2826f9410f51e24b4 SHA512 d4a50e2a85e822faef1ad4f7692c0bfbbf5f1ed13459ac20fe1863884aa19d9f55827706a9daa7692d2b0077205437c2a96281f2978b4a715122704a4a2f0116
+EBUILD totem-3.38.2.ebuild 2831 BLAKE2B 3520151103d19604fd7943a18b21210ce8172a44e06bf01a6791bba6300be863a072a05f422a5e48a90a8c555620b24fb5c3fe4a23542c9c252c2ec1b52bfab7 SHA512 8a107249a81e513af33907ea6903e8b463939e60eb7c9c9c0e5bee7fbc82dd3a07b14ec963829aede6835afb24110fa60f4e00e224a0eb447195a0fb50c9e7f9
 MISC metadata.xml 1018 BLAKE2B 1cb6fbaa86e0aa6bc60901e7e0b30765de1bea563666af206bfd75c8ed779332e1536dfebbe8d83d0a940bb4266157d0673b19f64021c76e3fa549a208945335 SHA512 3cb85a567ae7573ec0cf7cc12440ff3d879a3566b4773930752142b9e83ab366b983a470d3ae1f212acd78b217136c1ee681ff7d98d1e980e769867b1791d1d6
diff --git a/media-video/totem/totem-3.38.2.ebuild b/media-video/totem/totem-3.38.2.ebuild
new file mode 100644
index 000000000000..277b992dec5e
--- /dev/null
+++ b/media-video/totem/totem-3.38.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+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.56.0:2
+	>=x11-libs/gtk+-3.22.0: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.26.5: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_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_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}"/3.38.0-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() {
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0= # bug 812170
+	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/vlc/Manifest b/media-video/vlc/Manifest
index f2aced530621..6205353bbe58 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,16 +3,12 @@ AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6
 AUX vlc-3.0.11.1-srt-1.4.2.patch 976 BLAKE2B 1d5c6a2df44e2cc26c0b835b71f028b04457e1cfc37954d30d9f2b29d711ea80ae2ec5431ed87be626caa16effa1565a34520dd7a54e89ee470e6aace6d3c594 SHA512 333480c279ad743b30ae61ab2e4e1c7bdca8e406009075f669c84fbaffe7fd68a9e9c58615d44cdba1056b973726c486cacd8d2dbcfea6f282173a929f5f8d68
-AUX vlc-3.0.12.1-limits-p1.patch 874 BLAKE2B c46ce7c774c378601e39fac6c0013e0cf6a8b008becdaea9e35f56ed21d6efaa28ce9ae55cf3e2ba70e7d116f17dca12b348ff75c692a83ccfc79d2728ec0e86 SHA512 28dcba99106ac2e3b40bab90fceb206d98f47852d8be12b865c6cdb03febc2f6a39610854424bdd513b537ac5fe05cdfe261598497e67c5f55012f95908f5b7e
-AUX vlc-3.0.12.1-limits-p2.patch 1311 BLAKE2B bcef3a4d0fd2b7bf033132c9b30098cf4c97992da027a862e8bef197d2fc90f65986a9c4188dc72732ce50d1a2683d411cb69f75f04c814a40306a41517f1e10 SHA512 1eee525ce5f10fcc4f778cd1249e3e930b1605b68b096ff61b33a38dff513f547e3baa05ed7d448da5ff61def55f6822c4dfcce94a0c3d693c936ed33ae12d7b
 AUX vlc-3.0.13-srt-1.3.0.patch 446 BLAKE2B e02bad6bcc81508fd8d28a2b10f1760339c6a9432e951bf04596053493f2cec197468032ec29773fdf1b980cee5e2c71b556a4cdef4076fb08f0b1edc6965dba SHA512 1b4165bdb95d128ae9afdb1f650f629c219801eaf6f6e1f12659eb45026e732099ad3a714406e8ad0cdeb1f4e6988c187b7e60b69a8d00bdc759649f1d08b5e5
 AUX vlc-3.0.14-fix-live-address-api.patch 2233 BLAKE2B 50b40430978996e5302b08bcb8a68e5f106fe43f4fd66ad69dd1e6c1e8097abc32c671cdfc8dc87b7526cabadf847bf359f81927919ff3ab8ea7a80274bc7075 SHA512 d79e03677e404ef853499ac7b72977f1d6368d003720ce663581a5527b5b6327b36d5b240bec0aa2d4c3bff4c1b04ce1c4dc904fc648c98498ba2f88f1acd82a
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da34afd4ddce4e21f2aeff8ebe2be760857d169f904a0ce96658b6810e1030031f0a33d0c57f7bc514b1bbdc17e0d67157c SHA512 119f2fff52b334cb073c73979a6bec8710695c67e5ab3ff80d846ede52e922138ac77f8f3f9cccb6f750c74a00baf1529e27c683f0b93a6698436bdcdd930e99
-DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
-EBUILD vlc-3.0.14-r7.ebuild 13813 BLAKE2B c65604fa710fd31c775fcc9b27b66c6756c7f3ff8b87427f46df59edf38629ef27080b8dac49cb87cf485d4981167753a4143c7ba6d2e961922ffd41d57b211f SHA512 06f1e5a6c2e92a2f49556f78ec2aa2f20af263a73038c892f0b8c93a83a5bdc7c11cd0adab8fe2aee0d9ba4c8b1157119c12ed7f338521ef954722925a6c9173
 EBUILD vlc-3.0.16-r7.ebuild 13944 BLAKE2B 3d5bf8d410492da8614845eab3e1fb58756f5b01559f014856dab785df4f5877df92d16e776fc73e6fd3be8d44d10aa3dd4b76bbd8d32129ccecb36d768665a7 SHA512 c459f6b79d293ca0ca42c80331b0948044042eee77d97308b4540738332c26bbc9dd556f1d7dc08d20018bfa301eb25b5d281c985373c1a8ceff0788e368669e
 EBUILD vlc-3.0.9999.ebuild 13486 BLAKE2B 51ee12e042e6d656b4a5cb016397e70e1fcd5d9c13a37170dffc4100b127ded3817764d68591b7303695e697fd004f184c251c332908ecc0f68236dca6d5eb1f SHA512 f88809f93fde7e0190cc8fdca801446a212d2e15b83b7511be24a353ca8e45555f57a3218195d973f2b8b1ab6473f9b3313715f7d53cb8632e8b2bcc5a962cf0
 EBUILD vlc-9999.ebuild 13498 BLAKE2B 5c5dcc2579d2935b643298f17ad8ca7e21c9602fa17eac72f63324efb29ff25c39d6ce4a4509daccaf9a63b86da55e9aeeca4923802bcb21849d7d55aed1deae SHA512 dd8094cb589b74dfbfd5e802e0e8de52c9c724b4a5cde660615beccca3af9d490e645f85070e196f0dac46231cb2e1bcfc946640e96b30820e474489e8c92145
diff --git a/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch b/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch
deleted file mode 100644
index aaa61a546adf..000000000000
--- a/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/767796
-
-From: Robert-André Mauchin <zebob.m@gmail.com>
-Date: Mon, 14 Dec 2020 02:23:52 +0000 (+0100)
-Subject: hls: add missing <limits> include
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=3aea33378b0b317b99fce2eeaca8b31bf7cc6aba
-
-hls: add missing <limits> include
-
-Compilation would fail with:
-
-> error: 'numeric_limits' is not a member of 'std'
-
-without this include because of some hardening build
-flags mandated on Fedora Linux, with GCC 11.
-
-Refs #25325
-
-Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
-Signed-off-by: Alexandre Janniaux <ajanni@videolabs.io>
----
-
---- a/modules/demux/hls/playlist/Parser.cpp
-+++ b/modules/demux/hls/playlist/Parser.cpp
-@@ -42,6 +42,7 @@
- #include <map>
- #include <cctype>
- #include <algorithm>
-+#include <limits>
- 
- using namespace adaptive;
- using namespace adaptive::playlist;
diff --git a/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch b/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch
deleted file mode 100644
index 3832b2a1877c..000000000000
--- a/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/767796
-
-From: Robert-André Mauchin <zebob.m@gmail.com>
-Date: Mon, 14 Dec 2020 02:23:52 +0000 (+0100)
-Subject: adaptive: add missing <limits> include
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=e3de1b709b258d2b0e316d927f5c828bdb1a738a
-
-adaptive: add missing <limits> include
-
-Compilation would fail with:
-
-> error: 'numeric_limits' is not a member of 'std'
-
-without this include because of some hardening build
-flags mandated on Fedora Linux, with GCC 11.
-
-Refs #25325
-
-Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
-Signed-off-by: Alexandre Janniaux <ajanni@videolabs.io>
----
-
---- a/modules/demux/adaptive/playlist/Inheritables.cpp
-+++ b/modules/demux/adaptive/playlist/Inheritables.cpp
-@@ -29,3 +29,4 @@
-+#include <limits>
- 
- using namespace adaptive::playlist;
- using namespace adaptive;
---- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
-+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
-@@ -34,6 +34,7 @@
- 
- #include <algorithm>
- #include <cassert>
-+#include <limits>
- 
- using namespace adaptive::playlist;
- 
---- a/modules/demux/adaptive/playlist/SegmentTimeline.cpp
-+++ b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
-@@ -29,5 +29,6 @@
- 
- #include <algorithm>
-+#include <limits>
- 
- using namespace adaptive::playlist;
- 
diff --git a/media-video/vlc/vlc-3.0.14-r7.ebuild b/media-video/vlc/vlc-3.0.14-r7.ebuild
deleted file mode 100644
index dadbb25cc1af..000000000000
--- a/media-video/vlc/vlc-3.0.14-r7.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 2000-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
-	#if [[ ${MY_P} = ${P} ]] ; then
-	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	#else
-	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	#fi
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
-fi
-
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
-	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
-	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
-	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
-	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
-	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
-	cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	lua? ( ${LUA_REQUIRED_USE} )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	media-libs/libvorbis
-	net-dns/libidn:=
-	sys-libs/zlib[minizip]
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz:=
-		virtual/ttf-fonts
-	)
-	bluray? ( >=media-libs/libbluray-1.3.0:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.1.2:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-6.1.1:0=
-		>=media-libs/libdvdread-6.1.2:0=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( >=media-plugins/live-2021.05.22:= )
-	lua? ( ${LUA_DEPS} )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.4.2:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123 )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		>=media-libs/libprojectm-3.1.12:0=
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( >=net-libs/srt-1.4.2:= )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:=[ipv6] )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
-	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
-	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
-	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	#rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	# Fix gettext version mismatch errors.
-	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
-
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		--enable-vorbis
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	if use omxil; then
-		# bug #723006
-		# https://trac.videolan.org/vlc/ticket/24617
-		append-cflags -fcommon
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
-		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index eb5726772562..4d6a61ef5bff 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -4,8 +4,8 @@ AUX wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch 2
 AUX wireplumber-0.4.2-meson-Build-tests-conditionally.patch 1232 BLAKE2B f828160ff6e86f3a6b693a4e09fcc6f0647d742998777264483906d8974e294fa1fb9522d67c7a12c3893f6182a248cc14c50c785a50115d65a6f0779b615079 SHA512 b89c1519fb10c1b59ea8ed42f24cfff9b03c7024b33fb88ad8d5bfa57042ee6d1baf8f1a17e897b7da97b4fd4b91c04e7a66ee5105762a4ae690998145b20995
 AUX wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch 1466 BLAKE2B bfbec8088c33d38a637cbdc517c1bad3b472b296c6302872cefaa444b1524248ce73b14aef3b9d1d7ef35528b46cadce8dd9a846c2e9b43d8b232f894c58a839 SHA512 4b654808c2e3c9b5b8f401d2874040e32efaa25bfb76cd5080c529c75922685e3466d570bd7278e2b6079f6fa28134e5b493f3d54c26d06993572f7aa08ce142
 DIST wireplumber-0.4.2.tar.gz 332499 BLAKE2B 4747ae405a824b019415188ff1a586d32fc2e97aba6777cd1e403aadf0e44458156d1f8b6dbc706b812a7ea8c873d0f506f2b42817d1bc5312874530edaf7234 SHA512 8ded43fba5de58068516558918d49c86be7d67330e8a14e735561fefadba5e27952d556987b7304dead52b4e2f72a7d9626da0170e768c4702dd164840b08e3c
-DIST wireplumber-0.4.4.tar.gz 346770 BLAKE2B cc2768db3a4f6f26a176c9fff759384fedb020c98540ecbe1e02e28a7f16fa3ecc4ec25de50a65021cabb4e5746c41c683b714e0bc5cf5003f2a7d9c9414516c SHA512 f8d764c1728c2e550fc41044a8ebbbeba27157540077648431796d7de5a04281df00d9742b04c6f76b50e446b2a723f2555520cb953d432f90b05148967de4ef
+DIST wireplumber-0.4.5.tar.gz 345035 BLAKE2B 177984901790228d8ddeb8ee2a548eb53db07c8077734590c3f964df36cfa47a4099e049ae9a19a136f4147c75b7122359a73b8387a641768f71484b9c4ab119 SHA512 b0d5962e7a83709cc3115fbf0a04b63660085aeea2ebda6d78d692065ccb193cea8b44bb506fa440cf0b88bfae71a4f69a192cd6cba885ebf3c9270bea50c67a
 EBUILD wireplumber-0.4.2-r1.ebuild 2581 BLAKE2B 95aad145ac9fb82a4264306c1035ffa7ec565f9dd73480020d42b30c87ca4e3a549deb37e5e458c24408ab4cdf03e9ebb98c259c921cb2b0636860aa524e17bc SHA512 6fae3994707b949385fb72f60c771563617fdb2e46e7d0e076b38c96bf7d6308f2c2fcc61cf94311a5786b1a9b1fff9dbac6bc06b7b8c0453848c0fe19cc2679
-EBUILD wireplumber-0.4.4.ebuild 2304 BLAKE2B e59f4b3c5d883183943fa465c06d057995c792feaae52b6a83e8596915f2953a757ab3addd67440b6bbd8ab44624dbb5bd70a90efa9a190612048695a20cb1d0 SHA512 51dabf46bbe405fbab21f0dead03d16f01c7b43ae2227823357028657bcfac3549eb8eee02e39d9e72dcb354ad7d0118d77a1e8a0eb34969bc648d052ff201c6
-EBUILD wireplumber-9999.ebuild 2304 BLAKE2B e59f4b3c5d883183943fa465c06d057995c792feaae52b6a83e8596915f2953a757ab3addd67440b6bbd8ab44624dbb5bd70a90efa9a190612048695a20cb1d0 SHA512 51dabf46bbe405fbab21f0dead03d16f01c7b43ae2227823357028657bcfac3549eb8eee02e39d9e72dcb354ad7d0118d77a1e8a0eb34969bc648d052ff201c6
+EBUILD wireplumber-0.4.5.ebuild 2484 BLAKE2B c1c7818835dc033b59b9807953376bb7a32a662c532962054dfb4c5f0a6d2476e1f88efbe49728bdde44305665be8fad9ad487c7de6789bab4e7e6a8cbf079f7 SHA512 e8952d878d24051e98d5a7827dd571f25643e0d085439b1b312dbe7c50d97908d2ebd80dc1ac1c5f8d4112922a643c08f023a943d2475017952c18d62abead5a
+EBUILD wireplumber-9999.ebuild 2484 BLAKE2B c1c7818835dc033b59b9807953376bb7a32a662c532962054dfb4c5f0a6d2476e1f88efbe49728bdde44305665be8fad9ad487c7de6789bab4e7e6a8cbf079f7 SHA512 e8952d878d24051e98d5a7827dd571f25643e0d085439b1b312dbe7c50d97908d2ebd80dc1ac1c5f8d4112922a643c08f023a943d2475017952c18d62abead5a
 MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96
diff --git a/media-video/wireplumber/wireplumber-0.4.4.ebuild b/media-video/wireplumber/wireplumber-0.4.5.ebuild
index bcb971cdf84c..8bac4b024755 100644
--- a/media-video/wireplumber/wireplumber-0.4.4.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.5.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.37
+	>=media-video/pipewire-0.3.39
 	virtual/libc
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
@@ -73,14 +73,17 @@ src_configure() {
 
 pkg_postinst() {
 	if systemd_is_booted ; then
-		elog "To replace media-session with WirePlumber immediately:"
-		elog "systemctl --user disable --now pipewire-media-session.service"
-		elog "systemctl --user enable --now wireplumber.service"
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable --now pipewire-media-session.service"
+		ewarn "systemctl --user enable --now wireplumber.service"
 	else
-		elog "OpenRC users need to copy ${EROOT}/usr/share/pipewire/pipewire.conf"
-		elog "to ${EROOT}/etc/pipewire/pipewire.conf and in it replace"
-		elog "${EROOT}/usr/bin/pipewire-media-session with ${EROOT}/usr/bin/wireplumber"
-		elog "The switch to WirePlumber will happen the next time pipewire is started."
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
 	fi
-	elog
+	ewarn
 }
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index bcb971cdf84c..8bac4b024755 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.37
+	>=media-video/pipewire-0.3.39
 	virtual/libc
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
@@ -73,14 +73,17 @@ src_configure() {
 
 pkg_postinst() {
 	if systemd_is_booted ; then
-		elog "To replace media-session with WirePlumber immediately:"
-		elog "systemctl --user disable --now pipewire-media-session.service"
-		elog "systemctl --user enable --now wireplumber.service"
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable --now pipewire-media-session.service"
+		ewarn "systemctl --user enable --now wireplumber.service"
 	else
-		elog "OpenRC users need to copy ${EROOT}/usr/share/pipewire/pipewire.conf"
-		elog "to ${EROOT}/etc/pipewire/pipewire.conf and in it replace"
-		elog "${EROOT}/usr/bin/pipewire-media-session with ${EROOT}/usr/bin/wireplumber"
-		elog "The switch to WirePlumber will happen the next time pipewire is started."
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
 	fi
-	elog
+	ewarn
 }