gentoo resync : 03.07.2021

19 files changed, 372 insertions, 54 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 8dbbb222ba6d..bdacf4136976 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index a063bd154591..83acef48de74 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,6 +1,10 @@
 AUX obs-studio-26.1.2-fix-alsa-crash.patch 1047 BLAKE2B 5c7417042565beb47bd57ad770358e6d751f3ed08b849f279439f07ac48a1f4dace780ed23b60a3c26988e06ae9899e1ad088c04ffccd42d953e6d05f5287719 SHA512 e5261c1e6fdc5bdbdd3663225c71ee9aa40ec3f724ab69426a96f7180f2a3f6193d1a1b171aac2ba78d6a4c2a9362d060d6b7e99841754829001f087bcde7062
-AUX obs-studio-26.1.2-python-3.8.patch 850 BLAKE2B dbaab7b41598bbbd08d77d386de58638f2dfb6d3f7254314068bed2d3ec9171903484d711d27e53b86f6585ddca7b989580f5c6968c1c04ac003157c2d9dbe73 SHA512 eba28d2027143c9ea30248b50eefc27b1cb761a24ca4561d6aca2d4813c1f57f47c6a0421d244479a9afa8d5dbc6e54066f3d70622edbf78039f3738eb2c37a3
+AUX obs-studio-26.1.2-python-3.8.patch 653 BLAKE2B 6fbafacb2b2a7dc7dbb15f63eea9463e7c26744caab9399146bd404227d6b7e4119cbeb8f93b4b5c81399d342f02b002d79ad72d2a8dde3317d8f5a67f163dc9 SHA512 598701d227feab450d2f8db40d18b7380dcbedb13b6586deb481b7164c33e12e04b1d5babdadbe073d5af0ac899d783f7a2a2d2ed020f19edb6146cfd00798af
+DIST cef_binary_4280_linux64.tar.bz2 79740715 BLAKE2B c648a9a4205094450f9eae407e98cbc3da2b7cd81b3c19c4f52cfa3efcca01dce40528018996c65f026eb97520d78040165d1906b0d19236a86e76ec39c58c26 SHA512 060a5a8716a75b4b96dfb6ac28c132e22b93107915d680311c1b9d4fd12c7712a9e3497338eac6d2b9f4e74f2dc005a75d195c597bba049e4731fe3724f519ba
+DIST obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz 79259 BLAKE2B 28cfa46928de0b5e626b384673f7b92b3a48cb631066dda06288c51df78f06b913707a1295a5142d4521505b0678a6c639bfbb5b8a066d585fa12849578a382e SHA512 3ecab39bfb36774ac501de087ca70ecde12f408cfd54cdf12539a92e89d0cf531767a066ff77139389158c46beee423cf1848081ed187890b86241aa96f7b179
 DIST obs-studio-26.1.2.tar.gz 16624899 BLAKE2B 655a6c71d3a0ae6ae1fc2d166a148002bb17d6eaec06d5633a10fdbfe7f42e073526ede83cd36ad21c440debe870b41b43724caa00633733f1e196d918304adc SHA512 cd95fbf587f7edfe415cae75299d65c1d771bb118649fb839ae43d77145d87725c23df3360aa7b8c35ab8b62e5ec7983a8b02f8b102caa78f768eb58b4263417
+DIST obs-studio-27.0.1.tar.gz 15787807 BLAKE2B c2ea571f06a81b2e87ce5d9fd010610ea6cc2753223e6373025f0389972d4638a5f3ff1802f9f0af2c631d71ebcf4603e064da804e8c89eb032b1ad5743d1bd4 SHA512 c15dda62c1f212f623914e61a90c6b1e035720fb84d64726c14f43d77ae7569777a23d04221db34347ce610e7c3407c29e726ae36412e98e34ea2ddb2072b7f3
 EBUILD obs-studio-26.1.2-r1.ebuild 4006 BLAKE2B f7bbf701f886efa63171ea25bcc8303c54fa60bea7ad72b7160d625193aa929ccfd4a4a5adb91628025b6a5240441ee52c79a01757b22a41cf933994978789f8 SHA512 0ce7a598bf46398e054981a71a7a6e904a0f45078d2014c8c43b85b164d9c812f4a60b75f57343ea89709c73cf60cdc83f751aedd34dbc71b9bff035197c0c1b
-EBUILD obs-studio-9999.ebuild 4208 BLAKE2B 5ea108c780d22293779d1228b93e0e6e34ff5e86b49bdce31790a5c7c633bd1dcec019cc27ba94deaf6e3c2521f61b938435d44eac619d2b207bbecc725d2a47 SHA512 fea4eb48342a6fa9fa697095fd6b93c629994f6632e27b4ffeb26680512ca0a67f4a6ac9af8c5ffc30f2b336088888e9995d74fedab6b86affee9ee8396490d0
-MISC metadata.xml 1289 BLAKE2B 4004638114baeb19100daf3903ae17005853b9fa95ca4a27380c1351d2fb9245baa3b127fd6eb4c641698787a248ccc4878a884ed1d61c58f88b64df221a8ac4 SHA512 276a74edcc1109218f4a3761759e43866f59bc547999cdf186fb6296d94e122e30c09520492742f53ae5785c72ac1abfa75a024dabb8b8d07862b3011cbdaa0b
+EBUILD obs-studio-27.0.1.ebuild 5399 BLAKE2B 0152786b6afc434d43fd4ddb4e1759457eb0dfcd82df0c0eca94419d28cc74ca24117f011c28b454b0ac7c56389042a1e09aaf65646b9a7bb67c95dd88b07a04 SHA512 00e97f618485ccad4af4aea7850e132116eb72c8f0456e5b4b8ddd8cf9510fa0fe50b1044c28ad4c3b7edca3592f46617438f91935fe2a5f28104e746c90adea
+EBUILD obs-studio-9999.ebuild 5399 BLAKE2B 0152786b6afc434d43fd4ddb4e1759457eb0dfcd82df0c0eca94419d28cc74ca24117f011c28b454b0ac7c56389042a1e09aaf65646b9a7bb67c95dd88b07a04 SHA512 00e97f618485ccad4af4aea7850e132116eb72c8f0456e5b4b8ddd8cf9510fa0fe50b1044c28ad4c3b7edca3592f46617438f91935fe2a5f28104e746c90adea
+MISC metadata.xml 1580 BLAKE2B 8acaa24642b2ec1dff1b9e899eb71d1b7a0aba123ae5a5a0267e38b5745b46bf6aab5db036e425244c102d459ff5d987bc0464b7e1ced108dca02b5fc98fd78c SHA512 4aac89628f080d1121ccb63a0a8a597e6c74c80dd2b36fd5edb5ec4b7325bc887111b9e49ec346e6b99aa67f05ade0d8fb88f9b7b755475e5efa2f8a83b458e3
diff --git a/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
index c4709c654688..d9e328ea4efb 100644
--- a/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
+++ b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
@@ -1,15 +1,9 @@
-From 413fbe27ee68881f60265f0f2dd670ce42ca220e Mon Sep 17 00:00:00 2001
+https://bugs.gentoo.org/754006
+
+https://github.com/obsproject/obs-studio/pull/3335
 From: Matt Gajownik <matt@obsproject.com>
 Date: Tue, 25 Aug 2020 19:28:26 +1000
 Subject: [PATCH] libobs/util: Fix loading Python binary modules on *nix
-
-Fixes #2222
----
- libobs/util/platform-nix.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libobs/util/platform-nix.c b/libobs/util/platform-nix.c
-index 26800d52f7c..997b62db1a3 100644
 --- a/libobs/util/platform-nix.c
 +++ b/libobs/util/platform-nix.c
 @@ -71,7 +71,8 @@ void *os_dlopen(const char *path)
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 07659c3e82fa..4d0c222ec605 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>chiitoo@gentoo.org</email>
     <name>Jimi Huotari</name>
   </maintainer>
+  <maintainer type="person" proxied="proxy">
+    <email>ionen@gentoo.org</email>
+    <name>Ionen Wolkens</name>
+  </maintainer>
   <longdescription>
     A rewrite of what was formerly known as "Open Broadcaster Software",
     software originally designed for recording and streaming live video
@@ -12,6 +16,7 @@
     internally.
   </longdescription>
   <use>
+    <flag name="browser">Enable browser source support via (precompiled) CEF.</flag>
     <flag name="decklink">Build the Decklink plugin.</flag>
     <flag name="fdk">Build with LibFDK AAC support.</flag>
     <flag name="imagemagick">Use ImageMagick for image loading instead of FFmpeg.</flag>
@@ -24,5 +29,6 @@
   </use>
   <upstream>
     <remote-id type="github">obsproject/obs-studio</remote-id>
+    <remote-id type="github">obsproject/obs-browser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-video/obs-studio/obs-studio-27.0.1.ebuild b/media-video/obs-studio/obs-studio-27.0.1.ebuild
new file mode 100644
index 000000000000..56839893506e
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-27.0.1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit xdg cmake lua-single python-single-r1
+
+OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b"
+CEF_DIR="cef_binary_4280_linux64"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
+	EGIT_SUBMODULES=( plugins/obs-browser )
+else
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" browser? ( https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz )"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )"
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="
+	+alsa browser decklink fdk jack lua nvenc pipewire
+	pulseaudio python speex +ssl truetype v4l vlc wayland
+"
+REQUIRED_USE="
+	browser? ( || ( alsa pulseaudio ) )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+BDEPEND="
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+DEPEND="
+	dev-libs/jansson
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[wayland?]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/x264:=
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/udev
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libxcb:=
+	alsa? ( media-libs/alsa-lib )
+	browser? (
+		app-accessibility/at-spi2-atk
+		dev-libs/atk
+		dev-libs/expat
+		dev-libs/glib
+		dev-libs/nspr
+		dev-libs/nss
+		media-libs/alsa-lib
+		media-libs/fontconfig
+		net-print/cups
+		x11-libs/libXScrnSaver
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)
+	fdk? ( media-libs/fdk-aac:= )
+	jack? ( virtual/jack )
+	lua? ( ${LUA_DEPS} )
+	nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
+	pipewire? ( media-video/pipewire:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	speex? ( media-libs/speexdsp )
+	ssl? ( net-libs/mbedtls:= )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc:= )
+	wayland? ( dev-libs/wayland )
+"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="
+	usr/lib*/obs-plugins/chrome-sandbox
+	usr/lib*/obs-plugins/libEGL.so
+	usr/lib*/obs-plugins/libGLESv2.so
+	usr/lib*/obs-plugins/libcef.so
+	usr/lib*/obs-plugins/swiftshader/libEGL.so
+	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-26.1.2-python-3.8.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	elif use browser; then
+		rm -d ${P}/plugins/obs-browser || die
+		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
+	fi
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		$(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '')
+		-DBUILD_BROWSER=$(usex browser)
+		-DBUILD_VST=no
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_DECKLINK=$(usex !decklink)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DENABLE_PIPEWIRE=$(usex pipewire)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_SPEEXDSP=$(usex !speex)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DDISABLE_VLC=$(usex !vlc)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DUNIX_STRUCTURE=1
+		-DWITH_RTMPS=$(usex ssl)
+
+		# deprecated and currently cause issues
+		# https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608
+		-DLIBOBS_PREFER_IMAGEMAGICK=no
+	)
+
+	if [[ ${PV} != 9999 ]]; then
+		mycmakeargs+=(
+			-DOBS_VERSION_OVERRIDE=${PV}
+		)
+	fi
+
+	if use lua || use python; then
+		mycmakeargs+=(
+			-DDISABLE_LUA=$(usex !lua)
+			-DDISABLE_PYTHON=$(usex !python)
+			-DENABLE_SCRIPTING=yes
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=no )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# external plugins may need some things not installed by default, install them here
+	insinto /usr/include/obs/UI/obs-frontend-api
+	doins UI/obs-frontend-api/obs-frontend-api.h
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+
+	if use python; then
+		ewarn "This ebuild applies a patch that is not yet accepted upstream,"
+		ewarn "and while it fixes Python support at least to some extent, it"
+		ewarn "may cause other issues."
+		ewarn ""
+		ewarn "Please report any such issues to the Gentoo maintainer."
+	fi
+}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index f1b911e33918..56839893506e 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -5,26 +5,35 @@ EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit cmake lua-single python-single-r1 xdg-utils
+inherit xdg cmake lua-single python-single-r1
 
-if [[ ${PV} == *9999 ]]; then
+OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b"
+CEF_DIR="cef_binary_4280_linux64"
+
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=()
+	EGIT_SUBMODULES=( plugins/obs-browser )
 else
 	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" browser? ( https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz )"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
+SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )"
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
 HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa decklink fdk imagemagick jack lua nvenc pipewire pulseaudio python speex +ssl truetype v4l vlc wayland"
+IUSE="
+	+alsa browser decklink fdk jack lua nvenc pipewire
+	pulseaudio python speex +ssl truetype v4l vlc wayland
+"
 REQUIRED_USE="
+	browser? ( || ( alsa pulseaudio ) )
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -34,7 +43,7 @@ BDEPEND="
 	python? ( dev-lang/swig )
 "
 DEPEND="
-	>=dev-libs/jansson-2.5
+	dev-libs/jansson
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5[wayland?]
@@ -50,21 +59,38 @@ DEPEND="
 	media-video/ffmpeg:=[x264]
 	net-misc/curl
 	sys-apps/dbus
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/udev
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXfixes
 	x11-libs/libXinerama
 	x11-libs/libXrandr
-	x11-libs/libxcb
+	x11-libs/libxcb:=
 	alsa? ( media-libs/alsa-lib )
+	browser? (
+		app-accessibility/at-spi2-atk
+		dev-libs/atk
+		dev-libs/expat
+		dev-libs/glib
+		dev-libs/nspr
+		dev-libs/nss
+		media-libs/alsa-lib
+		media-libs/fontconfig
+		net-print/cups
+		x11-libs/libXScrnSaver
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)
 	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
 	jack? ( virtual/jack )
 	lua? ( ${LUA_DEPS} )
 	nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
-	pipewire? ( media-video/pipewire )
+	pipewire? ( media-video/pipewire:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
 	speex? ( media-libs/speexdsp )
@@ -79,17 +105,40 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" ) # https://github.com/obsproject/obs-studio/pull/3335
+QA_PREBUILT="
+	usr/lib*/obs-plugins/chrome-sandbox
+	usr/lib*/obs-plugins/libEGL.so
+	usr/lib*/obs-plugins/libGLESv2.so
+	usr/lib*/obs-plugins/libcef.so
+	usr/lib*/obs-plugins/swiftshader/libEGL.so
+	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-26.1.2-python-3.8.patch"
+)
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }
 
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	elif use browser; then
+		rm -d ${P}/plugins/obs-browser || die
+		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
+	fi
+}
+
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
-		-DBUILD_BROWSER=no
+		$(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '')
+		-DBUILD_BROWSER=$(usex browser)
 		-DBUILD_VST=no
 		-DENABLE_WAYLAND=$(usex wayland)
 		-DDISABLE_ALSA=$(usex !alsa)
@@ -102,13 +151,16 @@ src_configure() {
 		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
 		-DDISABLE_VLC=$(usex !vlc)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
 		-DUNIX_STRUCTURE=1
 		-DWITH_RTMPS=$(usex ssl)
+
+		# deprecated and currently cause issues
+		# https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608
+		-DLIBOBS_PREFER_IMAGEMAGICK=no
 	)
 
-	if [[ ${PV} != *9999 ]]; then
+	if [[ ${PV} != 9999 ]]; then
 		mycmakeargs+=(
 			-DOBS_VERSION_OVERRIDE=${PV}
 		)
@@ -129,13 +181,14 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	#external plugins may need some things not installed by default, install them here
+
+	# external plugins may need some things not installed by default, install them here
 	insinto /usr/include/obs/UI/obs-frontend-api
 	doins UI/obs-frontend-api/obs-frontend-api.h
 }
 
 pkg_postinst() {
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 
 	if ! use alsa && ! use pulseaudio; then
 		elog
@@ -154,9 +207,7 @@ pkg_postinst() {
 		elog "(if 'x11-misc/xdg-utils' is installed)."
 		elog
 	fi
-}
 
-pkg_postinst() {
 	if use python; then
 		ewarn "This ebuild applies a patch that is not yet accepted upstream,"
 		ewarn "and while it fixes Python support at least to some extent, it"
@@ -165,7 +216,3 @@ pkg_postinst() {
 		ewarn "Please report any such issues to the Gentoo maintainer."
 	fi
 }
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 43f5f9f0733b..78d485107ebc 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,6 +3,8 @@ AUX pipewire-0.3.25-fix-docdir-path.patch 1231 BLAKE2B 7e361262d4ccc6f21159dfce6
 AUX pipewire-0.3.25-non-systemd-integration.patch 822 BLAKE2B e80245300313151c01ec56a9be74590d6ee9211a78d9c16180ef1bfb1938a8ad9f8e00f2086d220ca6f8ad2d1c55508cfcc3c240467ed66239808f76029fdcae SHA512 0a7570e0dadd9119ba81b91fc0831ad511ed793f2f10f304547152448e0cf079118c595944e22f31cea94a92a0819524aad26c3fc2d17e73b622b43637cdf06a
 AUX pipewire-0.3.28-revert-openaptx-restriction.patch 955 BLAKE2B 17b6adc21205fd47a8759103d680976fff64ca4f5bb02a0ebbf5dba2115036710798dce5ca3b0964848c047eaf1790ab68e0c4e884544b9fea66cffea05aad0b SHA512 4b8e3330deac02ff5788fc26b63e19b2f6ecc82f156981321e6abc397c9b6e7111c5bff8107dc455d9246bf25fc9ed3b2d674335dda396d20c6387e1623dbcc7
 AUX pipewire-0.3.29-revert-openaptx-restriction.patch 1228 BLAKE2B a282cd6f678ecd5fd27076cd945b86a8139caf644fae5f6420f45e47cfa1f1ef7edacb6e5c6c0ae860bfaa016de902accb916159f90a85bddb0b26b73658e3ff SHA512 cadfe7c54eec23d2619faf274d2c5c95b4f430525c7fc0b84e667e3f90775d27dbb6682d200d3af5d48475a2b37ab0ff2dd6e8be4f2d69bead68f6f1efb7a7ad
+AUX pipewire-0.3.31-non-systemd-integration.patch 854 BLAKE2B 361b01278d2525768edd33881ebfa78e15006d346612422cc11817df6cc6c5079d166f3185b8d48312294a6a225ecdb607f180339f416131c7acd638b6efe3fb SHA512 495a7568a1c19e0a24edab7d0572032234efd2380fc9c0fe282a891ff316a235cdb97d5df4524233ed6d8ebfc7724ba9870393b8a5c2a192974865aa706760ab
+AUX pipewire-0.3.31-revert-openaptx-restriction.patch 1368 BLAKE2B 7f995c53ea843282ea802304365833c1464393f7e3e4edeb93cb400c1ed85d2cb7e9f3aa47565139e80ee0fae33e83f5306062e4d26c43d5d544a7f9ca4a4e17 SHA512 0ef4262d5d7c95061dbb68c998539c5a3f70084b6ecbed4b237f699df4f1fdb95539ab35fe0295acf46e729065295cb75750bd99eaa1ff565a26369116b52855
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
@@ -19,5 +21,5 @@ EBUILD pipewire-0.3.27-r1.ebuild 9298 BLAKE2B 92e91609706d83720cd6aefd0afa5d3f06
 EBUILD pipewire-0.3.28.ebuild 9370 BLAKE2B 305b012d603420eb7c6c8bd70747889a89b2321649f43d3108eb21cf8046ddc64b7884045656793a9787bcd45973698aa61351c0930d4181cdecc34ebcda3388 SHA512 904e6c09d47ee6198bfcb6c3a8d3f1edf9eb69af5676f6401e1e54509ac8d510c33d62d146c3104e5c7ff571e08db50bfc6568e8cf269b654c4fefef3330019b
 EBUILD pipewire-0.3.29.ebuild 9389 BLAKE2B 3809e908b15e24a41137880a37c2e4eec2fbbb8c03387131bf3b7a57dbde220980480156843565134f29c9ae0d21a038dd9be55c681a92b689e1d6e12210f070 SHA512 822b0134c90bdb01b7019b94b5676e149fb8d6801a47ddfee831288a6e6139334308302b5654b49469dee07f1f52701a3b021aebf40d4c49acc6278955c82bf8
 EBUILD pipewire-0.3.30.ebuild 9454 BLAKE2B f6a4987ff7159f3039e1bc4a1f96ab5d74eab65d15a610283e940fd4a25d4a9c95f876bfc3cf2337a8b07725304b8446715abb0f892b8d2c3cae8e11fee0bdab SHA512 fbee1686d182adb55675f02de39a6bd7a4e9213e93d7b352facea92f676535f36052db31a1c93480bc995f159290ae3608a688bacc9750eb37469b0c5af64cee
-EBUILD pipewire-9999.ebuild 9454 BLAKE2B f6a4987ff7159f3039e1bc4a1f96ab5d74eab65d15a610283e940fd4a25d4a9c95f876bfc3cf2337a8b07725304b8446715abb0f892b8d2c3cae8e11fee0bdab SHA512 fbee1686d182adb55675f02de39a6bd7a4e9213e93d7b352facea92f676535f36052db31a1c93480bc995f159290ae3608a688bacc9750eb37469b0c5af64cee
+EBUILD pipewire-9999.ebuild 9454 BLAKE2B fb9441155d5f40abbab3b0587c1732e071f4ec20bf7f2997cb7b613ac2e77b865dd547a50012357884f60f0a674529d93fefd7309315b29ae6da33cb5ee089af SHA512 3b6c5b8b27de1f5c8e0a7569a1d8b614561ff46f5ded1f79e3f9c94e9a366dbf15cc2620c6dc46321580d8646cb6fa7980c7b23da625276ec220631e80141d39
 MISC metadata.xml 1600 BLAKE2B 1138c789841fae8ea509ba2becdfef8376b87525b5b1822854ca083ab49e63124cbde6d8064849e0114a0e39269f63cf76d63f49396d709f6b3da865cf539487 SHA512 5ca5105edecf2515049b61e71327236c3e0fd949a25e91a9ed9dc0a9ad5d9d66f0b99329276c824e8840352b699bb9995b9ae073b43f30f87f4a8cc4bc4237a5
diff --git a/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
new file mode 100644
index 000000000000..ccc89f1310b7
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
@@ -0,0 +1,17 @@
+--- a/src/daemon/pipewire.conf.in	2021-06-30 22:22:09.520402459 +0200
++++ b/src/daemon/pipewire.conf.in	2021-06-30 22:22:30.620404999 +0200
+@@ -234,12 +234,12 @@
+     # but it is better to start it as a systemd service.
+     # Run the session manager with -h for options.
+     #
+-    @comment@{ path = "@session_manager_path@"  args = "@session_manager_args@" }
++    { path = "@session_manager_path@"  args = "@session_manager_args@" }
+     #
+     # You can optionally start the pulseaudio-server here as well
+     # but it is better to start it as a systemd service.
+     # It can be interesting to start another daemon here that listens
+     # on another address with the -a option (eg. -a tcp:4713).
+     #
+-    @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
++    { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
+ ]
diff --git a/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
new file mode 100644
index 000000000000..d8496bc5a694
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
@@ -0,0 +1,30 @@
+From 3449214466c4dac866ec9f47ecc573efaf4505bb Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Fri, 21 May 2021 10:32:52 +0200
+Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
+
+This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
+
+Doesn't apply to us.
+
+Bug: https://bugs.gentoo.org/785634
+---
+ spa/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spa/meson.build b/spa/meson.build
+index e13802e94..885b25405 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
+     summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
+     summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+-    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
++    aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx'))
+     summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
+     summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+-- 
+2.32.0
+
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index d2c5423d5e5d..4520c8074913 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -101,7 +101,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${PN}-0.3.29-revert-openaptx-restriction.patch
+	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1
@@ -114,7 +114,7 @@ src_prepare() {
 	if ! use systemd; then
 		# This can be applied non-conditionally but would make for a
 		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+		eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
 	fi
 
 	einfo "Generating ${limitsdfile}"
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 102d0befd7e0..31e6b59c695c 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -4,6 +4,6 @@ AUX rtmpdump-swf_vertification_type_2_part_2.patch 868 BLAKE2B a5014fdc8bcf2cecb
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
 DIST rtmpdump-2.4_p20190330.tar.gz 143037 BLAKE2B ab0edbca444fc71034a1c6386f304d8f49f92075f6d4ca87992a7b9c4b4058f84333011e86cf38470f7b1dbf5e69f27e8b1fe34267104191c447342a03c18e3c SHA512 5357d01b51d3ec8c3c584c4e5aa9720a4c04b86573bc6cb7d724d660937b04b6dd35338b17721d6521fde2627e83763ed3b7c010f959bd72573016f3c47480b0
 EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2696 BLAKE2B ac811b42e9812140688c9b5a33a2255b4457e095de83b096eaae4f9959d0de8a50e919d1e6fb7385e7d256af25ab23c8bd980da70532bc67d8c730e2da4d6af5 SHA512 653d227609c0c1a38a85ce9ceb0eeaca3b6628ba79af5e877d1a2a76e58d2296222ba584da04a55abb784a05c2a8dfdc9d27a95ab07fb16317f36c1c22b73edc
-EBUILD rtmpdump-2.4_p20190330.ebuild 2626 BLAKE2B f27169162b747cabe0feee80cd643ba8216a8d0034c0fff6671e09bc05ca53d59ecf9582850ca8ce27396c1422da2020e4cf08c580e617dfad04603746848029 SHA512 36b3792e7320513001c2986163d6dd7205d2d5ce9e64571a28e7772dfd34d807f8970499ae165d09a90d98e10a8d3dd66377fc6452fb4565c7611584fce26f93
-EBUILD rtmpdump-9999.ebuild 2628 BLAKE2B d42035baeef31109ce56ff60db20b0f6a90938549d005d67e423742b771851ffccae8b85e885e8449dc82d96f2ca40db0f2799cc14b26630670a215579f5ff80 SHA512 50db9397b5e4c51b5c31b5b1c8116a14e8bfea5f620df4f43fd2cd76d09eff74cc1d80c22a0b485a04256c0e91b3bd02251ee685db45382b8a942f99dbc172e5
+EBUILD rtmpdump-2.4_p20190330.ebuild 2633 BLAKE2B 2e115cd1d1710de282de394fef7aac3b10a002606f2da149317f21e685b6e47cffff4b720d5bd303d2f0e6f91f555499f5ae66767d832a9a4b9e67c163224012 SHA512 18ecef8e51588fb946e12de48c9033908bf1988b4681129851f27c176e8b4cfb77fc229c4f0772837f54ed52b11443b1a158e8ed04e3b1673753dc250dcf902f
+EBUILD rtmpdump-9999.ebuild 2633 BLAKE2B 2e115cd1d1710de282de394fef7aac3b10a002606f2da149317f21e685b6e47cffff4b720d5bd303d2f0e6f91f555499f5ae66767d832a9a4b9e67c163224012 SHA512 18ecef8e51588fb946e12de48c9033908bf1988b4681129851f27c176e8b4cfb77fc229c4f0772837f54ed52b11443b1a158e8ed04e3b1673753dc250dcf902f
 MISC metadata.xml 745 BLAKE2B 82d1570828f878a8c32cf642e4405c481d17134321b2046fc602107e3d2873cfcbcab439a2d94a341ddb223d0efdecf6b264c0816b768a15b10e1072df1c7c77 SHA512 b1ced41c93cd142aae5808f35fffdcb99c919a524fb386a463fddbba74f51c221121350fbfd2ca2807c2ee370bbf77a14127a9e7f215841b5d0bc72dd3343745
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
index 839b25613c0b..77b536382925 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
@@ -33,7 +33,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-c5f04a5"
 fi
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index fcab996e0c09..77b536382925 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -18,7 +18,7 @@ DEPEND="ssl? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		!gnutls? (  dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		!gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -33,7 +33,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-c5f04a5"
 fi
@@ -57,7 +57,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls  && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index c54cca7ea0d0..1967d03031d2 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -29,9 +29,9 @@ DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511c
 DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882 SHA512 14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
 DIST vdr-2.4.7.tbz2 919632 BLAKE2B be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab SHA512 41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
-EBUILD vdr-2.2.0-r6.ebuild 8159 BLAKE2B 383a0d759dea10033288f365a2d4c5ea90598a7254c7cd2179aa8ad98d111a84c2b324e2f63f2a8fac120a99038ab872ccf2f301f13a6a1e0e09da0877bade3b SHA512 195696b43bd21ea93bcf2a1056beb1557251f451ae52f5f4234afdbb78f82c99e3a628a19c3a6575cfb82b3530b4be0ecdd87eca349afc8afd5af1f4a535866c
-EBUILD vdr-2.2.0-r7.ebuild 8201 BLAKE2B 570575adafaa3d80d46d59f40f179ab1ac702b9bfd0df6697f27af944cbd63e3d4541efa26fe981c184e02180aed21de85dfc94a3c7445cc6d56eb032a3b4917 SHA512 5a1c355cfe87b2be49ac3d746d929585c188c43a8465da21f2eee323736b923117cff96faad915703e2fc242d22dd18564e2ce585c677d30653f3f67a38fda7c
-EBUILD vdr-2.4.1-r3.ebuild 6081 BLAKE2B 4bf9470dff3b8997e3e5c87755a8a1aed655c8bbe66c67a01cac6e13daad63da17347dd3b870db7e3326a2f5e6d4eea779103b3c79aac42c4b34341e82ff873e SHA512 eef8e4e4e9059126cbd4745b1d5ece8b79204d81d0f3bc0ffebad64cd52508446aea6c2af227befb971a913fcf6195abfa4c008069e83532cf914c95933599f2
-EBUILD vdr-2.4.6-r1.ebuild 5988 BLAKE2B 9e1f65d254097dacf0e416bb1d40678b6bad06f63e64fa57e294af16c34d146f7b44d48fe065e0ae8fcc1eec5a7eeac578a10462fd9f6e9fdb091958e0612d14 SHA512 0be0b0f2cdc169c76ccba7dd271c21f8c147eeb49f5687b3c6de23b4cb4718e00ab8fe97450ade8177c2e4d435cb1cac17709ce8dc61468277c8999aad45d71d
-EBUILD vdr-2.4.7-r1.ebuild 6162 BLAKE2B 49015e4234c9509c09622e05e816c94d5959ff18b02cf578b9b82c9ef2387637d3c0b0392906b23c49ae90c3faf7b980300c9c60a118148101c684fb5bc4ed18 SHA512 918fa2b26963d7b16e2799bb1bd22eb8b657523be4ad070337cc2e8e1679f3d94c155f4b10399ea39033fae97b0090088e1b5479f7fdbd1bf0aabe1b1bd66100
+EBUILD vdr-2.2.0-r6.ebuild 8168 BLAKE2B 4965d23936592348a37cdba6c6b89e0f651780b32436e113d94a79f1ba1b5d581a259d47160e499e28b5380a932e778b4d9a4c4a0cf675525031d19dd24e6110 SHA512 f47051d63715a36276ced33653928adc5d3378d3b3a28da3f6e68896c9d796b4887eaa78d76e9c6e8b42f65af1ebbd3019b56d8a1e912dddfe0c3e31d7212502
+EBUILD vdr-2.2.0-r7.ebuild 8210 BLAKE2B 004d8448d54dfe58ca1e83d6e1cfd9b84a22e8b0bb837900eba90666d55d4aae91e2e2d55095ab68665af104f52010b10268f5f730f451cedb54570d0271f8e9 SHA512 ca05beee04a50a8af95e4a990050c3430ac5a5829d4162e9c35f29bfd14deff2aa70e6ce6fcee10ceb506c48eca6a5bc15c418894e6d23ad5fb9d58da594e638
+EBUILD vdr-2.4.1-r3.ebuild 6090 BLAKE2B 5fa4d91be87dbd1edd93eced6f6f2c8916777fe8ded5472e15b0ec9ef19f817646eb82261965b7a2757887821e1282c7513c4aa06ca67f7825009a8f7f664368 SHA512 5b38708119e60fd4d87c8640952b16532c2df18b8541c64395e4c953ecf553631e85539b21c458f83eb4511be243d25486ebb21e85ad1fee6e153c12e3d687f8
+EBUILD vdr-2.4.6-r1.ebuild 5997 BLAKE2B 503afbd4a766bd4b050f05e74fe9ee9cef98718077eae7b34478e413d93ecdd97721813d6551ea4367a9c8eea9776bbfacd627ae110349fa7b1d4e7688d6ff9d SHA512 eaf2e9d0e2dd6c67b44d124261737fd4ba4ffcfe33550e951c93fae350b443556fc47ff5ddd343aeeda83fe890ea5f12a1eb6987505dd3af028929637c63f09f
+EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 7d0bd4f3d09e2f531b250af3a882fee46bd93d2883fd7464f38daa39d441e3fa0c7f7b642b6ee08020da076e3047b31203c8d3ea9d1fec1b0466bbbd69074a9b SHA512 a5bb20d7b4e606ed2728e10657c20bbf02828f15144715cfdffc182169dfc7a8bc1fe3347da2692c7ed4d53327a5690f77778dcb3abe25f6a7f36a105a6ad3d7
 MISC metadata.xml 1892 BLAKE2B 2a233ceb745f8df9350e37d99d8dce2cc56d3c21e0d187de483a2d2d18c0129a047d48cf7cddff7ea2500ae044d1eb196efb508cce0424368e03bbddb75c6d82 SHA512 dba266e22f0d99b98284db088beaf4fbd288cb8eee046a5f96610ed6cd748a116a3ced7ce74c69660d9943a7f7ccc016ba8a242174780275334b95a1ad4489c7
diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild b/media-video/vdr/vdr-2.2.0-r6.ebuild
index 14af4f56648e..73bef819af6e 100644
--- a/media-video/vdr/vdr-2.2.0-r6.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 # Switches supported by extensions-patch
 EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild b/media-video/vdr/vdr-2.2.0-r7.ebuild
index 42c9e675b2b5..ead539ebbd1f 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 # Switches supported by extensions-patch
 EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
diff --git a/media-video/vdr/vdr-2.4.1-r3.ebuild b/media-video/vdr/vdr-2.4.1-r3.ebuild
index 3655c860fee0..98642f9c6fd9 100644
--- a/media-video/vdr/vdr-2.4.1-r3.ebuild
+++ b/media-video/vdr/vdr-2.4.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.tvdr.de/"
diff --git a/media-video/vdr/vdr-2.4.6-r1.ebuild b/media-video/vdr/vdr-2.4.6-r1.ebuild
index 0a8de8f2ee00..5c62f03f569c 100644
--- a/media-video/vdr/vdr-2.4.6-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.tvdr.de/"
diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild b/media-video/vdr/vdr-2.4.7-r1.ebuild
index 8fda32ee217b..a0e8811b5dbf 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.tvdr.de/"