gentoo resync : 25.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
commit: c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree: 620cbf137661399a3fb1eff92914204f9a970713 /media-video
parent: cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)
39 files changed, 802 insertions, 941 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 2f625865b79a..241f04ea7468 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 675c1ea3555c..36fcf90295c9 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 2215 BLAKE2B 8556a48fb5703373ec99ec1100dd2573748f1cbdd83489f0d2896c34202e411462b41eeac8cbcffb3634ba5868ef466bf46c015294e34942ad2628b26f02fb29 SHA512 98ea52ee01d3b26e1f82cc18d020a391052405c0fd743a0733104ec1ab7f2dbb9bcb9b0fd43ae366b4d3bdb16d99c3544e2cb68793ddf517e1ae98c8a7041eed
+EBUILD cheese-3.38.0-r1.ebuild 2331 BLAKE2B 1bd7b4a93b1446b91ae8bee5502bf59d4dcc6ebe4aee14327541754fb311d3f8538f5fcc8df59bdd5026d9a03719b89e77fa2e438af3fd087e4cf513f2aa9397 SHA512 79c7e624fb27c226474a0c4727955cec05ab09a67f53b81860a61e8faa61eb91f724fc8b0995969ed4e16f8db75415b2fefb79f513d5ed5cad7588798463ed4c
 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 9b233fac2198..300eeb32e4ed 100644
--- a/media-video/cheese/cheese-3.38.0-r1.ebuild
+++ b/media-video/cheese/cheese-3.38.0-r1.ebuild
@@ -83,6 +83,7 @@ src_configure() {
 }
 
 src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
 	virtx meson_src_test
 }
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 5472b7376ade..e964d6a8a817 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,11 +1,9 @@
 AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac528dda0227ccf2baf3732239b481ff6007bf5a8ddd9304dd7c2faff149f1cfbdbfb194eb30a3b19eea0803f10734572421 SHA512 d9a72bb0b8fc7c9915e4efa1e9758d4f9d6b68f1ad6ef9898dd0b5e693c8e1236b37fc97a9786c233f8909417309ea6bb9c1fb71054818f31eeb4c43faa46a06
 AUX mkvtoolnix-56.1.0-optlevel.patch 607 BLAKE2B 62c3ef3717a54030b1acc586e9468f4d8d783755f7762ccebe18b0f8b0214268477a5a218b2fc02f3e2f770664507d43119f13046a31c94f865f01d0000a8a68 SHA512 b8eec05844aa8ef4f27416a78f5231496e34a112126e8ef403d18cab26b94756bd60323b51cf0d59a5a44d7b379bbf09f6b7b1b7e29b9282a0a2e82a5b3f325e
 AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e
-DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69 SHA512 2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
 DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
 DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
 DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1 SHA512 9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582
-EBUILD mkvtoolnix-51.0.0.ebuild 2921 BLAKE2B e71d3e988f14a21595f8666f57d5eee063088dc708d787c707bef93e2fe8d8c86614e8c81f2542eb7b8b91203927b04ae44b5d8c95f8710884acde992f0da6bd SHA512 76409b23ca27bd4c9528c153d016c72bb39778c80ee3c487dd6d9f23c228b475df80fbc10b2b37ce10e0f131d4d6a33e6af77117f25488218bf5a3c0057a8e2b
 EBUILD mkvtoolnix-57.0.0.ebuild 2969 BLAKE2B 402ed70eb494854ce19cebf3e78809b8f96df652dcdaa385210eb0b7417a342aed1065245ffc06a76b62c05a5be009ff38f562049fc07ad2f7100f32e4fbc8d9 SHA512 2f6ee7dbfb8702dcd1cb9c358906e0fc850f8cd3d209ae21144311f0cef58f5a037cb3d748390206ec65b026ac22797636f1d11b81afc4c7ba75ed4a0fbf4d37
 EBUILD mkvtoolnix-60.0.0.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f
 EBUILD mkvtoolnix-61.0.0.ebuild 2711 BLAKE2B f65c05d6faecf9c9ad869232e7d1b40bb0dbf4e2a67aedaada65cd585174262d69c4b77c449e90475dace61c630f1f335d372611c304472068a82ebf6995a943 SHA512 d451cdac938f712b621cf5fdbd2ccb5eee64043fb14e96b49c70a7dc5245441787e5e799096cbb18de95647b9e94ec660d603fc8d18fe5b05318aca6deb51427
diff --git a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
deleted file mode 100644
index d19aae2ddc83..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug dvd nls pch qt5 test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	>=dev-libs/boost-1.60:=
-	>=dev-libs/libebml-1.4.0:=
-	>=dev-libs/libfmt-6.1.0:=
-	dev-libs/libpcre2:=
-	dev-libs/pugixml:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.0:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-apps/file
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-		app-text/cmark:0=
-		dbus? ( dev-qt/qtdbus:5 )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-cpp/nlohmann_json
-	dev-libs/utfcpp
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch )
-
-src_prepare() {
-	xdg_src_prepare
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# https://bugs.gentoo.org/692018
-	sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug 692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-		$(use_enable qt5 qt)
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--with-boost="${ESYSROOT}"/usr
-		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
-
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myeconfargs+=(
-			--with-moc=$(qt5_get_bindir)/moc
-			--with-uic=$(qt5_get_bindir)/uic
-			--with-rcc=$(qt5_get_bindir)/rcc
-			--with-qmake=$(qt5_get_bindir)/qmake
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index cf3ccd1160cc..d84a4779cf95 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -3,11 +3,6 @@ AUX noad-reccmd 145 BLAKE2B f4cfd8f3a3b4651bc3afcdfd74e171b69d3fbfe6f95948db1650
 AUX pre-shutdown-15-noad.sh 771 BLAKE2B ce0053c6fb813c28d0c653ba0ba68819f03532c82b3ac5ce018b72c9feb93d20c096b1fe83ed0694849b6629cbe0e455ffc749f0caf9977de8eea2a075c41d5f SHA512 d40625e0704bc228879bd5d19d7a62eed4e56d1a688699dde8f628aedf320e86b4bfca474b42edc3f6a93e7f8528ba15d654a818d9b19bd3ac196c1ca8324910
 AUX reccmds.noad.conf 61 BLAKE2B 4600a5a2fc948b0695c487e87013b1207873b2f1f70e30604cb20288bbf7f107b2fbdb9a63d7f7eb2a8612569bb4975756109c804eb351635582f87e68eda8e5 SHA512 953af51444af1e4a853e2a501fe0fb31ef0b982795e8a7b350cf0851f6f572884de87d74b71ce0630fcd59082290ce8b9730e343032fea6512da96f1a934fddb
 AUX record-50-noad.sh 1443 BLAKE2B 98cba3a0024bc8c4426d2cd5d1e0d5b9d2e2ead2c50f9f8186a6567d01f656adb4b5385bb29bf8ce3a68a747a973f9bb00f64a65b21e1c7d43b7f60e2f54c55a SHA512 6ef839ad9c4d7b238e9e02dfdca486623902a5e9f3de722f18b9f50eff03888d58d03f8a17448903bbec2f04d1abcee22d6672798dd23eee024339a6474b98c9
-DIST noad-0.8.6-ffmpeg3.4.diff.bz2 6261 BLAKE2B 4c1de8b72c9b25a056cabb5a74b4d9bbc42f6586b4e2166bf2cf5ac76d7617df3318a4a4b21fa5dbfb601e2f9bacc7bd2d8b54705750a2d761c5a73c5c745578 SHA512 f7b4879902e2344099ef337094fc8be1c4322d2fa1ed5d7c275adfed9dfcc1644cc18743191ffd4daaa44a83cf3936a8dd8a978c66aaeae18a38c6164a608b02
-DIST noad-0.8.6.tar.bz2 188085 BLAKE2B fa9ae43984509f6da17028cda11f69dae0a74afcabe8daaaf2661d9791229bf1d5374b26abbcc9cd8f887b42c188a0d4871ae059dabac3b9bb9175533f096100 SHA512 ffca9e8bc78719350ffdfe59a4f258033f843ddf761ca5d8893cde5a4968a644c0318fd86b60e7b9e78b0650f8f02c68e6f7a95f4dfb702ab30d84ad3750c9e9
-DIST noad-0.8.6.tar.gz 226169 BLAKE2B c8aa44a868a7592b66a94a58065df5b3dc19562bf6bfb946fe60acebd2ea9f9090750836368bc6aeecf2fbd9938b0ec3f653d7908d3b34f27c3362fcea48e445 SHA512 abec49ea7d4dc4233d42bd42ba267bc7b235aace1597c5cd3dcbb7b4ede00c3778eaa2a0d8697fca4caf2b0ca94b540b87a862523a3028eb5cfe84db3c460ede
 DIST noad-0.8.7.tar.gz 144339 BLAKE2B e7492f63e7326cdced041332e05051a6bda2e92798f4b694ff626e65306d6ebe606f871eabc37df1613677c2f739b3caed033b443cbe7edce913b83a0365e3e5 SHA512 fa1d0226144175de586f938a594fe0a3c0b8a924a258f1406cf52078d5e6d84f46ae685ee3c9f3ce28e62f9eee719d6a938504e39a6b3b9c96043f4bd4aaf69d
-EBUILD noad-0.8.6-r5.ebuild 1854 BLAKE2B bfb1a46ad9e03b964d3f1a27e1e4602e459a56f0a8497615050d8d341b7e4a0b35f3c896ae4f367963e1b191c16c13fc90d3ed28e3fa858c37afdc48b5e19293 SHA512 793c1e77ed94cb155c1aaa39bbc54f24e3e323a40b261f9bb73089d0ae0dad3f4a2bf1f0d8c4969148c1e45144cfd1bb1d8bff2d27f47218ba2ab16c76af8eb4
-EBUILD noad-0.8.6-r6.ebuild 1877 BLAKE2B 883f67181c265f0f2a0427150d5dbe864fac7abf5f33c2ad4f4608ad0b29a38c5bf1f5447076874cbbc876a37833dcf28b18d5a46a99db8d8818931f032fc8c3 SHA512 5ba550ee36d2c6c84737a5cc32eb59e8f839cc71f12b947a3f1fa272b01f8c8eda02867c05c0ebf6d34bb56ec50e0486c91d5c6263c23662773ae85565b763c9
 EBUILD noad-0.8.7.ebuild 1699 BLAKE2B 864a1b6b29519e830d973a7366cca1c06e9aa351d5164aba611eb0ba6cc3c91f16490576b59cc269a2db0262dbe7405a3b178dc7217ae73b62cce5ba1516017f SHA512 d25a0810d608d8f37ce04a1c39dfeb294d15b4ba50e8281894d16ef94a2bfc0d516bbec84b31d2202379d6f0c5660e8c101623febdc146d54fbe7f7b16389293
 MISC metadata.xml 864 BLAKE2B 2978ee81c7da71ad061ad74b4e54b58f9432039cadb5958b39a10377c46aa8d501a50b5add07ece74c015a026b0452cd30d9f7725df5f490092ee711257320b0 SHA512 b02e2e8f4554019cbef42cc43a3af3ee3119dbeef0c05d8bd929215b131aeb7e0dffd2fb5d7d110bfc9af3e96c0ab73d2e94949e5ba4e8bc9f96298cb889d8e3
diff --git a/media-video/noad/noad-0.8.6-r5.ebuild b/media-video/noad/noad-0.8.6-r5.ebuild
deleted file mode 100644
index d589220b2609..000000000000
--- a/media-video/noad/noad-0.8.6-r5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Mark commercial breaks in VDR recordings"
-HOMEPAGE="http://noad.net23.net/"
-SRC_URI="http://noad.net23.net/${P}.tar.bz2
-		http://vdr.websitec.de/download/${PN}/${P}-ffmpeg3.4.diff.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+ffmpeg imagemagick libmpeg2"
-
-RDEPEND="
-	libmpeg2? ( media-libs/libmpeg2:= )
-	ffmpeg? ( media-video/ffmpeg )
-	imagemagick? ( media-gfx/imagemagick )
-	!media-plugins/vdr-markad"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( ffmpeg libmpeg2 )"
-
-src_prepare() {
-	default
-
-	#compile tested libav-13, ffmepg-3.4
-	eapply "${WORKDIR}/${P}-ffmpeg3.4.diff"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(usex imagemagick '--with-magick') \
-		$(usex ffmpeg '' '--without-ffmpeg') \
-		$(usex libmpeg2 '' '--without-libmpeg2') \
-		--with-tools
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"		# see bug #469810
-}
-
-src_install() {
-	dobin noad showindex checkMarks
-	use imagemagick && dobin markpics
-
-	dodoc README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd
-
-	newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
-
-	insinto /usr/share/vdr/record
-	doins "${FILESDIR}"/record-50-noad.sh
-
-	insinto /usr/share/vdr/shutdown
-	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
-
-	insinto /etc/vdr/reccmds
-	doins "${FILESDIR}"/reccmds.noad.conf
-
-	exeinto /usr/share/vdr/bin
-	doexe "${FILESDIR}"/noad-reccmd
-}
-
-pkg_postinst() {
-	elog
-	elog "To integrate noad in VDR you should do this:"
-	elog
-	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
-	elog
-	elog "Note: You can use here all parameters for noad,"
-	elog "please look in the documentation of noad."
-}
diff --git a/media-video/noad/noad-0.8.6-r6.ebuild b/media-video/noad/noad-0.8.6-r6.ebuild
deleted file mode 100644
index 3235fcc88d74..000000000000
--- a/media-video/noad/noad-0.8.6-r6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Mark commercial breaks in VDR recordings"
-HOMEPAGE="https://github.com/madmartin/noad"
-SRC_URI="https://github.com/madmartin/noad/archive/v0.8.6.tar.gz -> ${P}.tar.gz
-		http://vdr.websitec.de/download/${PN}/${P}-ffmpeg3.4.diff.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ffmpeg imagemagick libmpeg2"
-
-RDEPEND="
-	libmpeg2? ( media-libs/libmpeg2:= )
-	ffmpeg? ( media-video/ffmpeg )
-	imagemagick? ( media-gfx/imagemagick )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( ffmpeg libmpeg2 )"
-
-src_prepare() {
-	default
-
-	#compile tested libav-13, ffmepg-3.4
-	eapply "${WORKDIR}/${P}-ffmpeg3.4.diff"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(usex imagemagick '--with-magick') \
-		$(usex ffmpeg '' '--without-ffmpeg') \
-		$(usex libmpeg2 '' '--without-libmpeg2') \
-		--with-tools
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"		# see bug #469810
-}
-
-src_install() {
-	dobin noad showindex checkMarks
-	use imagemagick && dobin markpics
-
-	dodoc README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd
-
-	newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
-
-	insinto /usr/share/vdr/record
-	doins "${FILESDIR}"/record-50-noad.sh
-
-	insinto /usr/share/vdr/shutdown
-	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
-
-	insinto /etc/vdr/reccmds
-	doins "${FILESDIR}"/reccmds.noad.conf
-
-	exeinto /usr/share/vdr/bin
-	doexe "${FILESDIR}"/noad-reccmd
-}
-
-pkg_postinst() {
-	elog
-	elog "To integrate noad in VDR you should do this:"
-	elog
-	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
-	elog
-	elog "Note: You can use here all parameters for noad,"
-	elog "please look in the documentation of noad."
-}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index e126e10e097f..3cc4fd8f8c28 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -5,6 +5,10 @@ AUX pipewire-0.3.31-non-systemd-integration.patch 854 BLAKE2B 361b01278d2525768e
 AUX pipewire-0.3.31-revert-openaptx-restriction.patch 1368 BLAKE2B 7f995c53ea843282ea802304365833c1464393f7e3e4edeb93cb400c1ed85d2cb7e9f3aa47565139e80ee0fae33e83f5306062e4d26c43d5d544a7f9ca4a4e17 SHA512 0ef4262d5d7c95061dbb68c998539c5a3f70084b6ecbed4b237f699df4f1fdb95539ab35fe0295acf46e729065295cb75750bd99eaa1ff565a26369116b52855
 AUX pipewire-0.3.33-revert-libfreeaptx-switch.patch 1709 BLAKE2B e66bd84b0e297899dfa5167179394b2e5b0d7e98da35171cd9f37c0c100fb593d21955e44643ac7df00d4aa087d7e4e7d26017fc8d2b60477adb7c619978c874 SHA512 d91a7985d32e33d24e05145c567483b50d2a0049f0641a06abc295be776c1eb1a8c2935aa96118d1d71dce2e0538837bf4a18e3c235a2bdab6f9188f012da41b
 AUX pipewire-0.3.35-non-systemd-integration.patch 820 BLAKE2B bbde90ab174a0101f7c48f682d40b0457a19db23c42c9df9b50d29af9643dcb29d5c03fd5faaa467ef94090c00c9022a01ed699f15bf4b69239ead6a41586880 SHA512 8a545da244ad3cbba35c75c9ea15607ff012bb10143cc349c1feea077ac2db09a28f7e06b3b04095b39b217f4b97af679027aee631d93ea3b281801e799bf60e
+AUX pipewire-0.3.36-fix-crash-uaf-media-session.patch 1295 BLAKE2B 7c32a70c48e2cdcaab5cba0315845026ce4feadd2531724e92aa0932f20783253aa00ff4c6f96eeb6124f4ac6011c22afee07fd4cc22488c6ad4619655972155 SHA512 a46341fa86b61f0bf8b80736b411b870d7ac809d556358f4994aaa876a7827811073f99591fb1269ee70dc3b62157d2f1f3d4db63c1cd7729c9f160bf0e621a9
+AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e3497996a3834e5d5d468dcc63f0e36c117a31158634c08b8acc724f0ce5b599594b05f79ef3e3128ac28843cc08df03fed SHA512 74c757edf20c911df9299b4322486a34746eec8c4aa212441082f954cebe7c7d9c836a757dd134d71b3c31a97abe1494c13dc470495846ffaf52f943ec397532
+AUX pipewire-0.3.36-missing-limits-include.patch 452 BLAKE2B b498e4ec11ab3d5bc4cebdd0975802b68594678aa928dc85b5a7031276af9ec12edb1423714e3e96c7d658e574c679efa9c18afbee1b47b15f3ce582bc021fff SHA512 decd44a59152e4fdc64b79c2e330a09ca9b8f776e72ef7a0150dfe43d9c25f4e501d41c86a445a979137c412dc85e1ffa38fed91f976596500d2a28010d78407
+AUX pipewire-0.3.36-non-systemd-integration.patch 911 BLAKE2B 6c6df1080821cefa1786da4db762a78011672226836525413d10fed3a18d43457277b6b868dfe0ee8e189143f76c971dd9c53809794864bcc642c804bf962ab8 SHA512 08b4998a3129f824c68310d2fc87245311e1d4b85a09a57f1d9bab76f990aa5d95686f22f3835a1072b7e6c0b6eb0246cc9c81884588f0146d26f9c215d9c565
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
@@ -12,10 +16,14 @@ DIST pipewire-0.3.32.tar.gz 1604622 BLAKE2B cab83a17a2b27f710e1377a2ad2ad7003053
 DIST pipewire-0.3.33.tar.gz 1629559 BLAKE2B de48956ac87ed6d63a08dd354b1e4abf81b9db99825ca65cbb5b522e71eb6920b35173e1c3abd9a710c28709e2b0a459db67654cfeac42149cdfa91c84833a8b SHA512 bc3d5658d6fda11dd55f22ba5293b4ff6c3e9a8d083b0cf7b3356bc18f4f65967557602a0d6603a2a2a548ecb42c6b7fbb9d315ed0fce435f4bb884ab4dd263b
 DIST pipewire-0.3.34.tar.gz 1682396 BLAKE2B 1a3524a833bde6facf637071f905bb0237f3fc53a86d6160083f36c7a42fb7c71c873a0dc9eea04cfb08cbec08807557c2b83efc1ac403adf6a9998d83441338 SHA512 cbf8eb410d2cd1923e67ac9ee9eca0e74567bb7e8ea407a536e64b3ec27b5bbb1e7fdd74a5a7cbffbac3f9996d8a08f8c723401fb44cb2920f044a3a2f3a6c18
 DIST pipewire-0.3.35.tar.gz 1704419 BLAKE2B 5c0debd19b29a9488be26125794f04e57e8b3cd3842654cb935decae18ffefc4137927d969448f60f1c1c2985d54db139fc3dcf07e36e81014021d63490096d8 SHA512 08a2e305fe4e9d3c3f4533c163b725dd32d26513e51a9f476bd18d6157ebf67e97e48b8df9595d45c81599f416e6b3f76e90df575dd460a8d26fe951db30e0f6
-EBUILD pipewire-0.3.30-r2.ebuild 9676 BLAKE2B 7ce07fb1a10797b988842acdeb71e43e92b96af7ebc42c2c14ab2e72bfcadedf843c38ee72af8901c03826d414b9beba55a81b6a2fae3e2f2099b814584e489a SHA512 a5fca98e84b2e12ed3c21ea027fd3f18d17e9ab1f65c6f783b0ae1d29aa8a71c332bf1e0ea4a7456e01e2b2271ee59650fbec6852943b6456232e9f64ca32cea
+DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
+DIST pipewire-0.3.37.tar.gz 1716320 BLAKE2B ce98b28015de69a0c91953a4839d5f86a29cfa19e2058ba0a2476a75a03b782ae67239b418306e4ed7dab81fe7e77928a417b966ff3c72ac552006cea66e3218 SHA512 3f4cf1ac66117a56a7a264262e2e238a54060457da6a986bd9227f51cc7e8d1a8fd282aef8462c096819282c5baec22779d2025c2e1918bbfb3d6ff75829aea6
+EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
 EBUILD pipewire-0.3.32.ebuild 9601 BLAKE2B 4c01a9a3f04b8ec73583b0a6329fd728d025366cec1cc8bb5ad00d700643fcf1a2b0970f625e57cf847df533699a4e2ab7833429663842b37a9790d0071b55d5 SHA512 650385d711644a743144659a6f5642bd5ec73c93a5992354d87c4b6942967e7eccd251be481ccd79b44295aef52411608ac8c4d75c3ecd45087d23d42acfec4d
-EBUILD pipewire-0.3.33-r1.ebuild 9795 BLAKE2B 59a275ed5543e9d5e5a2db1b68eb5f666b552b60fbaff32e91473110ad5ef9e3ba9ea2941271f28e615617db067969169024486504c2a1843db5d3477529ebad SHA512 e12c0b17980d9273ff30b95acb3f310290a3455df6f668fd9297e852de39f8a5b59feb6bbb627b0d2019657aebe70dd0778df02fe54ba3495bb0cc4fb9a56853
-EBUILD pipewire-0.3.34.ebuild 9814 BLAKE2B fa86ddd37b0eade61e0c60be27b382e122b2d960e1c17d091d7857eaee8da61ed6c3297c5922351930afcdffd83528afe17c49c6330d35f9865dd489b0de2c19 SHA512 713a47a206884860a10f118e83c608c334572472001990a381f25f99afbafdb3850ce6db944d78b537005a9545921d00a984537370453c64959f0b8401239708
-EBUILD pipewire-0.3.35.ebuild 9977 BLAKE2B 1c39473eb52ee33536f16367c98fa2219a3c6183ee45179c743174d37ab5421aab09f9aa1293dde8d42f493ddcde7aa7b6b69639df7b477eb838a88f3b352056 SHA512 dfeb33b87fd5ede5ca59f59c8a46f3b153a5eedfa6db42b6a9dc9430963c71a31c6db4b0f23e26d03cf98bdbe6326b106c0952d0459e87e14f6b49f14085d5c1
-EBUILD pipewire-9999.ebuild 9965 BLAKE2B 0e66e8dcdee43804e1974729c78334df787d178822d77c0199b4e47ae99f18c4737656f6888f936d48f520ec44db8068c61a27af21328626c3e37cae510a78b6 SHA512 a59e05171658926d5efee5aae1c9f9fa35f4df866bf9e2c81f6a14e14066a64751e1dc9391b8064653142d2cced23fba6e79d6a668a39f2d473f72124ac38f08
+EBUILD pipewire-0.3.33-r1.ebuild 9797 BLAKE2B ef2472ea8e6e06d286a72b00cc77fa04dbf6ffef5cf93cb1db75fca910114bf09442a72fe06709ab40f54f36206de47ff2b068381bb8d82c1e8077c79a7f683c SHA512 f2fcd471370696005008ec8614493cab105e08faf07f13effc76866c7f022f474a9e255c184069d5a371507713b1ca1e967ef0d254ea8e314dec3a105c13ec6e
+EBUILD pipewire-0.3.34.ebuild 9816 BLAKE2B 067c01652c0dbb7981606af3818735c37772ad4c2852761ccba4f94c1983246699b6445351458faed259024454052f69ca2ea03e5ad9b47581900ce32f458a0d SHA512 1b7ee3e5ebf11b27bf6c276d83dccc8c3b0fc013e9b75f82ffdedf70e712e9de1bd268b06e8c7cbeed4a71bd0ab5ec249055c817e17c655a011666e35bf62801
+EBUILD pipewire-0.3.35.ebuild 9979 BLAKE2B 12d3135ef817c2266c911dd3182f9f876acee795038b77b7674d41521dd603fa7c8d874887cf841d4dcbb0376a4d0fcbd36f9e03245a9e359810338f69303b58 SHA512 5c3c314dca12e15736c4a16fd28799c3c982a5bca9bddc0ba0033727696aa685d4d52d2d7c5fe25e23e95c0930d11420845fc531b3388de7a33a9ee0a8d25587
+EBUILD pipewire-0.3.36.ebuild 10268 BLAKE2B a471b8d685b05244db999f568d7cb1d434f21273219357e0257f1234754e9752d9d8c1f3eade8a7e12e0a4edcc3de635e6f83abb7b03252dd82bee42a3436661 SHA512 e0531808150431e59560d40c9fc4fb34af096f7182439662e32913396d906356de13b6b487ca6c9aeb1ea9e04ae274d3c8495710a631776f341d7741cc441a64
+EBUILD pipewire-0.3.37.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61
+EBUILD pipewire-9999.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61
 MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf
diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch
new file mode 100644
index 000000000000..6080ff4fd7ab
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch
@@ -0,0 +1,36 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/39c8ed4f62172026036281691cd3b67b469a8629
+
+From 39c8ed4f62172026036281691cd3b67b469a8629 Mon Sep 17 00:00:00 2001
+From: Pauli Virtanen <pav@iki.fi>
+Date: Thu, 16 Sep 2021 19:18:52 +0300
+Subject: [PATCH] media-session: don't use-after-free if linking node removed
+
+Should fix an ASAN crash.
+---
+ src/examples/media-session/policy-node.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/examples/media-session/policy-node.c b/src/examples/media-session/policy-node.c
+index d83613d0b..e273434fa 100644
+--- a/src/examples/media-session/policy-node.c
++++ b/src/examples/media-session/policy-node.c
+@@ -869,6 +869,7 @@ static int link_nodes(struct node *node, struct node *peer)
+ 	struct pw_properties *props;
+ 	struct node *output, *input;
+ 	int res;
++	uint32_t node_id = node->id;
+ 
+ 	pw_log_debug(NAME " %p: link nodes %d %d remix:%d", impl,
+ 			node->id, peer->id, !node->dont_remix);
+@@ -902,7 +903,7 @@ static int link_nodes(struct node *node, struct node *peer)
+ 
+ 	if (impl->linking_node_removed) {
+ 		impl->linking_node_removed = false;
+-		pw_log_info("linking node %d was removed", node->id);
++		pw_log_info("linking node %d was removed", node_id);
+ 		return -ENOENT;
+ 	}
+ 	node->linking = false;
+-- 
+GitLab
+
diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch
new file mode 100644
index 000000000000..ace05b9e4a14
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch
@@ -0,0 +1,25 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/10abcd92d76ddd02b690ff06d67c013bfc5fa5c2
+
+From 10abcd92d76ddd02b690ff06d67c013bfc5fa5c2 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 16 Sep 2021 17:57:47 +0200
+Subject: [PATCH] update version number as well
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index c9b98c8ba..ea35ac674 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,5 +1,5 @@
+ project('pipewire', ['c' ],
+-  version : '0.3.35',
++  version : '0.3.36',
+   license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
+   meson_version : '>= 0.54.0',
+   default_options : [ 'warning_level=3',
+-- 
+GitLab
+
diff --git a/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch b/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch
new file mode 100644
index 000000000000..c7ed7b973a91
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch
@@ -0,0 +1,17 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/6168067cb2a45ffa3c92aff1135659feaf9c1240
+
+From: Leonardo Neumann <leonardo@neumann.dev.br>
+Date: Sat, 18 Sep 2021 04:36:20 -0300
+Subject: [PATCH] fix missing limits.h include
+
+--- a/src/pipewire/impl-module.c
++++ b/src/pipewire/impl-module.c
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <dlfcn.h>
+ #include <dirent.h>
++#include <limits.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+ 
+GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch
new file mode 100644
index 000000000000..b8d3271eecdd
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.36-non-systemd-integration.patch
@@ -0,0 +1,19 @@
+diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
+index 648e13069..d985208b4 100644
+--- a/src/daemon/pipewire.conf.in
++++ b/src/daemon/pipewire.conf.in
+@@ -235,12 +235,12 @@ context.exec = [
+     # but it is better to start it as a systemd service.
+     # Run the session manager with -h for options.
+     #
+-    @sm_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).
+     #
+-    @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
++    { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
+ ]
diff --git a/media-video/pipewire/pipewire-0.3.30-r2.ebuild b/media-video/pipewire/pipewire-0.3.30-r2.ebuild
index 07b96608c2c4..c27f6c9196f0 100644
--- a/media-video/pipewire/pipewire-0.3.30-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.30-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/pipewire/pipewire-0.3.33-r1.ebuild b/media-video/pipewire/pipewire-0.3.33-r1.ebuild
index b5167316316d..d0320fcb4b38 100644
--- a/media-video/pipewire/pipewire-0.3.33-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.33-r1.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
 		media-libs/sbc
 		>=net-wireless/bluez-4.101:=
 	)
-	echo-cancel? ( media-libs/webrtc-audio-processing )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
 	extra? (
 		>=media-libs/libsndfile-1.0.20
 	)
diff --git a/media-video/pipewire/pipewire-0.3.34.ebuild b/media-video/pipewire/pipewire-0.3.34.ebuild
index 3c4d544cb906..2ce80ce5a7d4 100644
--- a/media-video/pipewire/pipewire-0.3.34.ebuild
+++ b/media-video/pipewire/pipewire-0.3.34.ebuild
@@ -56,7 +56,7 @@ RDEPEND="
 		media-libs/sbc
 		>=net-wireless/bluez-4.101:=
 	)
-	echo-cancel? ( media-libs/webrtc-audio-processing )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
 	extra? (
 		>=media-libs/libsndfile-1.0.20
 	)
diff --git a/media-video/pipewire/pipewire-0.3.35.ebuild b/media-video/pipewire/pipewire-0.3.35.ebuild
index fc34f8ee3e18..d68355c9f4c4 100644
--- a/media-video/pipewire/pipewire-0.3.35.ebuild
+++ b/media-video/pipewire/pipewire-0.3.35.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-libs/sbc
 		>=net-wireless/bluez-4.101:=
 	)
-	echo-cancel? ( media-libs/webrtc-audio-processing )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
 	extra? (
 		>=media-libs/libsndfile-1.0.20
 	)
diff --git a/media-video/pipewire/pipewire-0.3.36.ebuild b/media-video/pipewire/pipewire-0.3.36.ebuild
new file mode 100644
index 000000000000..43ac9052449d
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.36.ebuild
@@ -0,0 +1,284 @@
+# 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 python-any-r1 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 ~ppc ~ppc64 ~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="
+	app-doc/xmltoman
+	>=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/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}"
+
+# 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
+	"${FILESDIR}"/${P}-fix-crash-uaf-media-session.patch
+	"${FILESDIR}"/${P}-fix-version.patch
+	"${FILESDIR}"/${P}-missing-limits-include.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
+
+	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.35-non-systemd-integration.patch
+	fi
+
+	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) # Disabling this implicitly disables -Dmedia-session
+		# Replaced upstream by -Dsession-managers=..., needs more work, bug #812809
+		# but default is same as before and right now, this is fatal with unreleased Meson.
+		#$(meson_native_enabled media-session)
+		$(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 (-Dmedia-session depends on this)
+		-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)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs 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 symbol 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 pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh 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 pipewire-media-session"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user enable --now pipewire-media-session.service"
+		elog
+	else
+		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}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		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
+
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.37.ebuild b/media-video/pipewire/pipewire-0.3.37.ebuild
new file mode 100644
index 000000000000..7725dfa300f5
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.37.ebuild
@@ -0,0 +1,285 @@
+# 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 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 ~ppc ~ppc64 ~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="
+	app-doc/xmltoman
+	>=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/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}"
+
+# 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
+
+	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.36-non-systemd-integration.patch
+	fi
+
+	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) # Disabling this implicitly disables -Dmedia-session
+		# Replaced upstream by -Dsession-managers=..., needs more work, bug #812809
+		# but default is same as before and right now, this is fatal with unreleased Meson.
+		#$(meson_native_enabled media-session)
+		$(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 (-Dmedia-session depends on this)
+		-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)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs 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 symbol 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 pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh 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 pipewire-media-session"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user enable --now pipewire-media-session.service"
+		elog
+	else
+		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}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		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 3ea2e98cae96..7725dfa300f5 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -5,14 +5,14 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit meson-multilib optfeature python-any-r1 udev
+inherit meson-multilib optfeature 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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -57,7 +57,7 @@ RDEPEND="
 		media-libs/sbc
 		>=net-wireless/bluez-4.101:=
 	)
-	echo-cancel? ( media-libs/webrtc-audio-processing )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
 	extra? (
 		>=media-libs/libsndfile-1.0.20
 	)
@@ -73,10 +73,7 @@ RDEPEND="
 	)
 	pipewire-alsa? (
 		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
+		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
 	)
 	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
 	systemd? ( sys-apps/systemd )
@@ -115,7 +112,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.35-non-systemd-integration.patch
+		eapply "${FILESDIR}"/${PN}-0.3.36-non-systemd-integration.patch
 	fi
 
 	einfo "Generating ${limitsdfile}"
@@ -230,25 +227,27 @@ pkg_postinst() {
 	fi
 
 	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		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 pipewire.socket pipewire-pulse.socket"
+		elog "  systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
 		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
 		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		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 pipewire-media-session:"
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session"
+		elog "for relevant users:"
 		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
+		elog "  systemctl --user enable --now pipewire-media-session.service"
 		elog
 	else
 		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
+		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
@@ -261,10 +260,10 @@ pkg_postinst() {
 		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
 		elog
 		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
+		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 "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override sections you want 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"
@@ -273,9 +272,14 @@ pkg_postinst() {
 
 	optfeature_header "The following can be installed for optional runtime features:"
 	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+
+	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/shotcut/Manifest b/media-video/shotcut/Manifest
index 007fc6ec847f..a2ef47803ac8 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,6 +1,6 @@
 DIST shotcut-21.03.21.tar.gz 4101401 BLAKE2B fb716215ba31b4b057080f05a59462a674aebfa364924240f96ebf87bb94e4ccb649c2452e952b507037a8e62840cb7c805ee258761bb21d515173bba26dfdd1 SHA512 402d714df7285d49269891e5def0b8a1a46f54b6ec88b0201981bdf8d866c49e83bbbf513805795630e39335e0fddc2457e1a7db582affe4a4d057ac5ab4e2bb
-DIST shotcut-21.06.29.tar.gz 4234142 BLAKE2B 32fa68d07e442fc60301733862d09b8723ff00d49af84a604e5a58c5c4a672c63407387f134b7ffd06a236b55a95c870fcd300d76d0de4a2e864dffef3e54b47 SHA512 b6256b2d6b6f5040321a227e60c447455b9026fc5315ddc0d16fcf76930162552fd883029536de201cb2b58e2544dd58203a4dbc9e27144c4ef399fb53fdb996
+DIST shotcut-21.09.20.tar.gz 4358591 BLAKE2B 3919cb0f5c3f0aaa665729227d077cdeac1569102509bbf6be7f9451cadda8e22b38a8e796ef5fd2f5dd84bff2abbd98103a0917eb9acacdc9db771968f723ef SHA512 6c2463c8d81c4e61b59d97ba2ee8f9aba5c420ee50b6c46c0e5f1c177e44cea6bc1fab5a7184ce8b13d2818b207efffe3c12f4d1682ce002279ba16c1c9bd624
 EBUILD shotcut-21.03.21.ebuild 1388 BLAKE2B 00e1700637768e7559366da0a1e4a7b523ee41e8a07104696cc81298d5617dc032ab9cdd08d4a258b5872f1ef806d04bf3733dfa4097601d15ab5c3471d17e86 SHA512 2745d89a9e8b0eb25afe019994f207aa9d63d07fa34d5baf6972a1af1524516b6fae61f6dbcb9f57fc596d7b3426b07e1980706d186c72500f8965a3edb52ef7
-EBUILD shotcut-21.06.29.ebuild 1382 BLAKE2B d05783d958a8cfd20ba6cd86259e0e19fd46f3bb41e5e0e9e3ad1da7779ba170cfc4036572acc1b753c53389a35d560f866136b48f7b31668577c234f30b9b1f SHA512 f1e3d175743517531446eb00f4fed89d3c99a8dabcc558505098fcd70fb124f250bafab5c50fcdbd99edc3f9aa48b5ddcfc1ca9d906d816c4f6b5cac4ce87137
-EBUILD shotcut-9999.ebuild 1382 BLAKE2B d05783d958a8cfd20ba6cd86259e0e19fd46f3bb41e5e0e9e3ad1da7779ba170cfc4036572acc1b753c53389a35d560f866136b48f7b31668577c234f30b9b1f SHA512 f1e3d175743517531446eb00f4fed89d3c99a8dabcc558505098fcd70fb124f250bafab5c50fcdbd99edc3f9aa48b5ddcfc1ca9d906d816c4f6b5cac4ce87137
+EBUILD shotcut-21.09.20.ebuild 1382 BLAKE2B d498cffb6d88936881ea8a4140b9db4cadd12b78c5520a2cf0a911d52cdba7d7c85365b6e7cdd22a6baf02dd3472e3fc5c28fd20f50ee27bc60a3e7e51527d30 SHA512 1c1786983c05577e57ddbc35d4733214c417b3e3566b0575e6839e6e24bcd5cf7a7546214cc75731c936bc3a743a9dcf08b3cb2648731b4c613add6b85ed1e68
+EBUILD shotcut-9999.ebuild 1382 BLAKE2B d498cffb6d88936881ea8a4140b9db4cadd12b78c5520a2cf0a911d52cdba7d7c85365b6e7cdd22a6baf02dd3472e3fc5c28fd20f50ee27bc60a3e7e51527d30 SHA512 1c1786983c05577e57ddbc35d4733214c417b3e3566b0575e6839e6e24bcd5cf7a7546214cc75731c936bc3a743a9dcf08b3cb2648731b4c613add6b85ed1e68
 MISC metadata.xml 481 BLAKE2B 183f296894a3deb21038399eec0a637f2080d029fb8ea539a5a165206868704e472ed554bec67325fb54a4d8aeea54c01857635e32abdd229c91f3ba7855d095 SHA512 95af90837128290393f798b1561ebcbad057da1b5dafb583f9f9ba56878ff1d48245438ea3605601fad608e749235619d2195290c04c5c31eb8bbe627b58f4a7
diff --git a/media-video/shotcut/shotcut-21.06.29.ebuild b/media-video/shotcut/shotcut-21.09.20.ebuild
index 94b278e81817..c758f989295d 100644
--- a/media-video/shotcut/shotcut-21.06.29.ebuild
+++ b/media-video/shotcut/shotcut-21.09.20.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils xdg
 
diff --git a/media-video/shotcut/shotcut-9999.ebuild b/media-video/shotcut/shotcut-9999.ebuild
index 94b278e81817..c758f989295d 100644
--- a/media-video/shotcut/shotcut-9999.ebuild
+++ b/media-video/shotcut/shotcut-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils xdg
 
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index 056bf51e0aea..acc8a1025c9a 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,4 +1,6 @@
 AUX subtitleeditor-0.52.1-disable-nls-fix.patch 1080 BLAKE2B fe400d4c2a16508e2889539ca963839f1118b1df916c9cb6c3b2e8d575aa40fa61e32eeb2612406c51ef5f3d56296a42b0980919a14e1f0290ccea3cf4821c94 SHA512 7775e9527a5e1b7f2a469eb3ea5f3d5422797c4ca61f02b486578f60e5a118ab1d6479079cae35ed29324a1579ed3363ed77b18ceda1dad5b10f8def1a11b650
 DIST subtitleeditor-0.54.0.tar.gz 1783077 BLAKE2B a802124c9b81ad5fecc4914b6231e7efaf3326f231115f334fd53b79d8a851bf2f09fdccdee85c53b0cc828fe67c72e9924f47f0881d0438e563b18b1f77f00b SHA512 4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c
+DIST subtitleeditor_0.54.0-5.debian.tar.xz 9100 BLAKE2B 249048228aab601524bb1f6e222863d1d3f96e3be4a05e08196a164d0e4ed3ff4b662fbac5a468a546f871e314a99f68ed9132692a5be8997d8338810ab91808 SHA512 9e15c0f6d4ddc88650f6f7962b09175fddbae1c1ac295a83c33e29e1212f09a1d88711a4e1250c5f125d72ea02f4b77c3ca9f62594ee0010f0cf8d383fbe0832
 EBUILD subtitleeditor-0.54.0-r1.ebuild 1372 BLAKE2B 4a99b55ac6c225eb8e68fce93582d54da3668219ae7fb6c3d069e67f534e064bee29c36c7333769e30346df9e9c46cacd1e98a2cfa9b7573878da4d7e146859e SHA512 2a3e552a168960397346d3f511d2845f78f824952aa2ffbfac62a252746886e120dc428c11fb6e89e1bd6e2a6097226eba17a7a376d2eed575a1a79c799892dc
+EBUILD subtitleeditor-0.54.0_p5.ebuild 1742 BLAKE2B b97d8fc74bf51e2f781170c5b35f537e8cd08f5f1c37c737b2d1f2dad52084d57fefca21b88d533c705514e00062fb704b2e12a72cb75a965ac259afb332ed5d SHA512 95d33c0e2211623fe5005c2eddfd697ff3e48678a3df5b667206e58c640de71162418d0a0e2135f6179c97b01b9d19d241a3ce3013e8aebe6a7d2e9a4cc937f1
 MISC metadata.xml 566 BLAKE2B b09b71c48220f14cd4011d478827db5be88f445816a0ce948b63351ff3de904c2fe477cc876ba2fba82f366a6e78d25c94fb220e4603a964fa4d0116fe9ca612 SHA512 846fae1386c767aaa2f9521ebc93a7cd91c4df52ffdf6d973552ddcc9d89b0591d9ee6c2a406fd1a0d3207fa393c783cd024c4c66847354b865dbb0977469cea
diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
new file mode 100644
index 000000000000..5929fb7bc8c0
--- /dev/null
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="GTK+3 subtitle editing tool"
+HOMEPAGE="https://kitone.github.io/subtitleeditor"
+SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls"
+# opengl would mix gtk+:2 and :3 which is not possible
+
+RDEPEND="
+	>=app-text/enchant-2.2.0:2
+	app-text/iso-codes
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-cpp/gtkmm-3.18:3.0
+	>=dev-cpp/gstreamermm-1.0:1.0=
+	>=dev-cpp/libxmlpp-2.40:2.6
+	dev-libs/glib:2
+	>=dev-libs/libsigc++-2.6:2
+	media-libs/gst-plugins-base:1.0[X,pango]
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-plugins/gst-plugins-meta:1.0
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )
+"
+#	opengl? (
+#		>=dev-cpp/gtkglextmm-1.2.0-r2:1.0
+#		virtual/opengl )
+# X needed for video output and pango needed for text overlay
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_p*}"
+
+PATCHES=(
+	# https://github.com/kitone/subtitleeditor/issues/49
+	"${FILESDIR}"/${PN}-0.52.1-disable-nls-fix.patch
+)
+
+src_prepare() {
+	# Debian patches
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
+	use debug && append-cxxflags -DDEBUG
+
+	gnome2_src_configure \
+		--disable-debug \
+		--disable-gl \
+		$(use_enable nls)
+#		$(use_enable opengl gl)
+}
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 8de4acbb065d..74c3fd6ac095 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -6,10 +6,6 @@ AUX vdr-2.2.0_gentoo.patch 2395 BLAKE2B 72f238b09ae26f915b9de53c357815a757f158da
 AUX vdr-2.2.0_glibc-2.24.patch 1395 BLAKE2B 83a82c516554c2fce3b47078c494ddbbd0dbdbe148f1e6525532865b6f61a79110da5d55d17e6357887655ba840525f7349b221bb356a180813ae28bdfd7d1de SHA512 73acef83ada40d067b1c7207e527d782de5bc16027571a31f6411a5a075ef6fbdbd3ecd466314aaa08a01b0bf90a35c36306b5533ea4fecc0e024f7df939517a
 AUX vdr-2.2.0_glibc-2.31.patch 818 BLAKE2B f63347ecac626d06477e7bf3f5d203dc81d988d8f69590b5c1bcbcefc44657a36f3a3edc7b97c4cbb1f5a6019b5109cf4fb12042b62872c176b8b68d3b032e98 SHA512 b800bc04b984b06b5943473d1726ef198558a62f8c633791272a4ed0ce18ac54b85eefe973b18531beaa8626401c7b38687790692182c787c9b04380b2ebecb0
 AUX vdr-2.2.0_unsignedtosigned.patch 5237 BLAKE2B 21c3eddc9e5684337be332ae22c97b6068681ebc8c9ff39a8d673f3511c216fd78ff9bbb43f90fd8f60d8e9bef3b4f0ac4b982469887e91a50919c0d786809ed SHA512 eb740bbfa70d205ee5db66b0aa234a09c54a49cfd60027536af86a208097f0a47dc84e7dae4a6af2cd5c34187b41cd0905ad678c7d610159fe09684b645d6a45
-AUX vdr-2.4.1_gentoo.patch 2128 BLAKE2B dd10816931a5801f0ecef5025d750a8a0f16795fd70234792b6721ef31909350682a8f5ddae091d3c39a383b9715a281f178059798b9c5cd37b9e4c22f36dd6e SHA512 4ed95f894fa37a1a2fea6c568e5e3878b16afa172ebdde8181203a88bcbef4b3691449a1e07b0912675a67200ae8137f0ae0a78b8f1ebe2e5fe17a729c418284
-AUX vdr-2.4.1_glibc-2.31.patch 819 BLAKE2B f2862c53102ceff07f2b3416b41c2e38f254ee1b09cc0426be1116a0f18623f6f5f67661a25617e38782886b589609db45e1474ee634bec9dbe83e3546608902 SHA512 a81c8c175477d61f71ce76144619936a5ba4a3e6b25873d44ebc7507d265bbaa95c4475c658714ed03abc724bf39a53fa001cad8bbe418587b1309e77029e1c4
-AUX vdr-2.4.1_makefile-variables.patch 929 BLAKE2B e74beddacd12800107905355118e257fbbc854749b768af5f192d6d57b6e97fe8d8a817647ff8bb89727fe963d3b38875ac009ca115be90158f55fd4e55b4bc8 SHA512 ad8acc48b3c5d10fe4f61b6aa02346d5be992fe61badcff4be2620b22667e5c41ba7a906c30853bec1f695cbdf924cb713b043d43ee2f923a16a5e507948d07f
-AUX vdr-2.4.1_ttxtsubs_segfault.patch 2484 BLAKE2B 73af246884dd3da39c53c53031f5a7ddd42786446dec1c7d28218dfa3f6679db181e5ec91f32d28981de1fb8876aeadafd2ccdf81ac05bfa44fc893a5fdc9356 SHA512 de00f7521d08bc61abec6328fe5d697f5de3a976ebd6414a603a0798efe348d55956ebe1d6ab41329a10cf188e5e86bb506f10cd720a4b61b1ceb47c521cae3e
 AUX vdr-2.4.6_clang.patch 527 BLAKE2B 6f74ee8a96657df7280ea51b55199768ed3bd968cd377df12674b29616b3a43703e4cc76c4c4fa43412a564bc51bdcb32ec565832177397200f5bd7aef9b05c6 SHA512 5ad498c5784551fdcde9911e2890b236c75e47f20dabe85b561bdb0e8771d7d6ce6ab160fa8831361799ed9d5da0cfa4f3788b509dd0eadf1cdb1eeeb6aad8a7
 AUX vdr-2.4.6_gentoo.patch 2236 BLAKE2B c7372e3bfe04ea14f1bb12459d4385d6001c6acafbf96b4d1d8a69e194e076af656b76bb349ce07a30b131dd9e779d39441a34cc41ff0ae651fd14c8f2791fef SHA512 6ff8d20e4c596e3705ac6814e0ea1562e4b1f2809d585440bd5940b7094127fce21e7f6a738281305d6782c9806336f2d030c864e189d2c85e3b302635f07685
 AUX vdr-2.4.6_makefile-variables.patch 1094 BLAKE2B eabc93d2bb383b1146c15c8b0bdff5979e172a5190a9c755071f1be66a662f89ce6f92c230a0df14ec5ca1958ac53326624e16c54457d83296a0b117047ac22a SHA512 5ee06df94028fc7bbd70fae718aab544f562a1a4d2cf380c282a24db33cdef1bea7224608c01e5ecb4a92cf1a709706342314918f36c0b6f65f5861c872fe499
@@ -18,20 +14,13 @@ AUX vdr-2.4_remove_plugins.patch 876 BLAKE2B 27f36cd30e11ec85f8c91d0b4da77d2a6a9
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
 DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175 SHA512 d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
-DIST vdr-2.4-patch-for-permashift.diff 20424 BLAKE2B 426139bd890e50e491d0061111445d988468441c6bf2f489d35b2b0e290c064ac87e8989cdd9a05e2befd0488300a0d4faa017ab9901152003c6b0f066cce5de SHA512 f21bd6d7b883354c254e1c92d730449dad6eac8ebdd2a593c907a962c2bf3a74859d66e1418984da5b62892d7b7d170282956f15af11d7a788bc759506454ba8
 DIST vdr-2.4-patch-for-permashift.diff.bz2 5298 BLAKE2B ebd00ba1c66783f97f5a6cc757cc9be6d937bd460f46b1880eec8b86ead1a5673a25ab64b733b8030e1c9a94123af28a5d6383905da265c67b2a945ba2c06c33 SHA512 3ba1968d2710061627e2a3b320e24ffeb08be6d8a7e71ed0c6732ebe6ed02d25f3a8afff524a6185ad0025d187ed9c7b259a9fb63dcf0c91e3fd2a079b5ef9d3
-DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B d5c3da713cd82ed8c3baccd1336d283404ebf1099116e76776c26a41ac193aa88bcb5bc2aaa8409a6d40e61c122bbc8ac0d67cb6ff8f83b0dbaea392101643b9 SHA512 99f2cab268d3f6af11607333a35583e5802f90636712e0429eb89eb66ccea7b1fb16a0d3ed2ff266e6f87c338bf77f97028a372eef5e6116b27220a5670a6d31
-DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3 SHA512 b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d
 DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f SHA512 9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
-DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 339bb23ed0f505087bdbbefb192824d5def37bb00c4d5dc300f545c7951f11504115d058c157d1964f5f32e483e668675e13254465b5acce76cfdcf07faae216 SHA512 f402fa51314ad6c34439f71b7cb81e1ca51e0fa3b120a1fdaee119c2dd1b13174db2e666bf5e6204aa28e4acef8f6bd6e3ab8324793c3484eafb16dc8cf808d5
-DIST vdr-2.4.6.tar.bz2 951272 BLAKE2B 52e92eb7e5fdc9bb9209cbef61f8db47e2e9a4750c75bc5b4f88069f95e54faac6b1af5b4c77a6a53990d8f083b6ff8ddeb33418386081c128617217129374fd SHA512 bed8b7740a97b681cf4273c01b6ce80046c1e5914c06d12cffc46fdca615331d0e97771ec09697cf72897583fcf272d83b6bf188ef476715cd0c0c5fd4c5e9d4
 DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f SHA512 d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
 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 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 6169 BLAKE2B 006d0156bebd83ad5200e0f6587e3252d85fc0818203915c5af3d27e0f3e0b5f99cf272f11f855a344535be6dc4cc8a121a424369fda6bf5cb941a295e48642d SHA512 702c24d7dfda3d4664432ae93b5bfcc063093fb9e5fca2b2f8fd26f1daf8283a9a1dde0028d6a23ba97acf4a5cb3576c4234d7461e9e17c379bdcc8bdb5f4192
 MISC metadata.xml 1893 BLAKE2B 6be07ef9608162ddbaf4da4fd6ca7f7e919fd9b54e4817575ff9fdbb56c084554c4126f26e4459bc8b51dd02b35030c0cd1b2afd7ba38e2bf46a0e065994ac0b SHA512 631a40da1627a71e3290ee527b3aeeb2babdc6abc650b21a7038a1ad9bcdd8d053c62c769fd1d04332d4564d41ff8988ea7bd79a21bef5583a26ed40cea59260
diff --git a/media-video/vdr/files/vdr-2.4.1_gentoo.patch b/media-video/vdr/files/vdr-2.4.1_gentoo.patch
deleted file mode 100644
index 71aca7f5f96b..000000000000
--- a/media-video/vdr/files/vdr-2.4.1_gentoo.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-this patch will disable some handling in the core Makefile
-as we use for Linux FHS a different handling in gentoo
-demoplugins from core vdr install disabled
-support from Linguas variable
-
-Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
-Reviewed-by: Joerg Bornkessel <hd_brummy@gentoo.org>
---- a/Makefile
-+++ b/Makefile
-@@ -182,7 +182,7 @@
- 
- PODIR     = po
- LOCALEDIR = locale
--I18Npo    = $(wildcard $(PODIR)/*.po)
-+I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot   = $(PODIR)/vdr.pot
-@@ -209,7 +209,7 @@
- 
- install-i18n: i18n
- 	@mkdir -p $(DESTDIR)$(LOCDIR)
--	cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+	@(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
-@@ -283,12 +283,11 @@
- 
- install-dirs:
- 	@mkdir -p $(DESTDIR)$(VIDEODIR)
--	@mkdir -p $(DESTDIR)$(CONFDIR)
- 	@mkdir -p $(DESTDIR)$(ARGSDIR)
--	@mkdir -p $(DESTDIR)$(CACHEDIR)
- 	@mkdir -p $(DESTDIR)$(RESDIR)
- 
- install-conf: install-dirs
-+	@mkdir -p $(DESTDIR)$(CONFDIR)
- 	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
- 
- # Documentation:
-@@ -296,9 +295,9 @@
- install-doc:
- 	@mkdir -p $(DESTDIR)$(MANDIR)/man1
- 	@mkdir -p $(DESTDIR)$(MANDIR)/man5
--	@gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
--	@gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
--	@gzip -c svdrpsend.1 > $(DESTDIR)$(MANDIR)/man1/svdrpsend.1.gz
-+	@cp vdr.1 $(DESTDIR)$(MANDIR)/man1/
-+	@cp vdr.5 $(DESTDIR)$(MANDIR)/man5/
-+	@cp svdrpsend.1 $(DESTDIR)$(MANDIR)/man1/
- 
- # Plugins:
- 
-@@ -315,8 +314,9 @@
- # Includes:
- 
- install-includes: include-dir
--	@mkdir -p $(DESTDIR)$(INCDIR)
--	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+	@cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+	@cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
- 
- # pkg-config file:
- 
diff --git a/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch b/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch
deleted file mode 100644
index 0db8c5064ac5..000000000000
--- a/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Replace obsolete stime() function with clock_settime()
-bug 708802
-
-
-Suggested-by: Manuel Reimer <manuel.reimer@gmx.de>
-Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2020 Feb 10 )
-diff -Naur vdr-2.4.1.orig/eit.c vdr-2.4.1/eit.c
---- vdr-2.4.1.orig/eit.c	2020-02-10 21:25:03.594761113 +0100
-+++ vdr-2.4.1/eit.c	2020-02-10 21:26:32.443761113 +0100
-@@ -391,7 +391,9 @@
-   if (abs(diff) > MAX_TIME_DIFF) {
-      mutex.Lock();
-      if (abs(diff) > MAX_ADJ_DIFF) {
--        if (stime(&dvbtim) == 0)
-+        timespec ts = {};
-+        ts.tv_sec = dvbtim;
-+        if (clock_settime(CLOCK_REALTIME, &ts) == 0)
-            isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
-         else
-            esyslog("ERROR while setting system time: %m");
diff --git a/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch b/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch
deleted file mode 100644
index 5923d643c13a..000000000000
--- a/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-we change some variables in the Makefile
-for a better handling in gentoo ebuild
-
-Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 22 Dec 2019 )
---- a/Makefile
-+++ b/Makefile
-@@ -54,7 +54,7 @@
- 
- # Output control
- 
--ifdef VERBOSE
-+ifeq ($(VERBOSE),1)
- Q =
- else
- Q = @
-@@ -89,7 +89,7 @@
- ifdef HDRDIR
- HDRDIR   := -I$(HDRDIR)
- endif
--ifndef NO_KBD
-+ifeq ($(USE_KBD),1)
- DEFINES += -DREMOTE_KBD
- endif
- ifdef REMOTE
-@@ -98,12 +98,12 @@
- ifdef VDR_USER
- DEFINES += -DVDR_USER=\"$(VDR_USER)\"
- endif
--ifdef BIDI
-+ifeq ($(BIDI),1)
- INCLUDES += $(shell pkg-config --cflags fribidi)
- DEFINES += -DBIDI
- LIBS += $(shell pkg-config --libs fribidi)
- endif
--ifdef SDNOTIFY
-+ifeq ($(SDNOTIFY),1)
- INCLUDES += $(shell pkg-config --silence-errors --cflags libsystemd-daemon || pkg-config --cflags libsystemd)
- DEFINES += -DSDNOTIFY
- LIBS += $(shell pkg-config --silence-errors --libs libsystemd-daemon || pkg-config --libs libsystemd)
diff --git a/media-video/vdr/files/vdr-2.4.1_ttxtsubs_segfault.patch b/media-video/vdr/files/vdr-2.4.1_ttxtsubs_segfault.patch
deleted file mode 100644
index deba01979610..000000000000
--- a/media-video/vdr/files/vdr-2.4.1_ttxtsubs_segfault.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-fixing segfault, reported on IRC #gentoo-vdr & vdr-portal.de
-https://www.vdr-portal.de/forum/index.php?thread/132017-videotextuntertitel-f%C3%BCr-vdr-2-4-0/&postID=1306478#post1306478
-
-Signed-Off-By: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2020 Mar 02 )
-diff -Naur vdr-2.4.1.orig/channels.c vdr-2.4.1/channels.c
---- vdr-2.4.1.orig/channels.c	2020-03-02 19:52:51.052496538 +0100
-+++ vdr-2.4.1/channels.c	2020-03-02 19:54:05.096496538 +0100
-@@ -429,7 +429,7 @@
-   return Modified;
- }
- 
--void cChannel::SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int numberOfPages)
-+bool cChannel::SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int numberOfPages)
- {
-   int mod = CHANNELMOD_NONE;
-   LOCK_CHANNELS_WRITE;
-@@ -447,7 +447,7 @@
-       totalTtxtSubtitlePages++;
-       }
-   modification |= mod;
--  Channels->SetModified();
-+  return true;
- }
- 
- void cChannel::SetSeen(void)
-diff -Naur vdr-2.4.1.orig/channels.h vdr-2.4.1/channels.h
---- vdr-2.4.1.orig/channels.h	2020-03-02 19:52:51.052496538 +0100
-+++ vdr-2.4.1/channels.h	2020-03-02 19:54:31.745496538 +0100
-@@ -212,7 +212,7 @@
-   bool SetName(const char *Name, const char *ShortName, const char *Provider);
-   bool SetPortalName(const char *PortalName);
-   bool SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
--  void SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int numberOfPages);
-+  bool SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int numberOfPages);
-   bool SetCaIds(const int *CaIds); // list must be zero-terminated
-   bool SetCaDescriptors(int Level);
-   bool SetLinkChannels(cLinkChannels *LinkChannels);
-diff -Naur vdr-2.4.1.orig/pat.c vdr-2.4.1/pat.c
---- vdr-2.4.1.orig/pat.c	2020-03-02 19:52:51.053496538 +0100
-+++ vdr-2.4.1/pat.c	2020-03-02 19:55:40.819496538 +0100
-@@ -649,7 +649,7 @@
-               if (manualPageNumber)
-                  TeletextSubtitlePages[NumTPages++] = tTeletextSubtitlePage(manualPageNumber);
-               }
--           Channel->SetTeletextSubtitlePages(TeletextSubtitlePages, NumTPages);
-+           ChannelsModified |= Channel->SetTeletextSubtitlePages(TeletextSubtitlePages, NumTPages);
-            ChannelsModified |= Channel->SetCaIds(CaDescriptors->CaIds());
-            ChannelsModified |= Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
-            }
diff --git a/media-video/vdr/vdr-2.4.1-r3.ebuild b/media-video/vdr/vdr-2.4.1-r3.ebuild
deleted file mode 100644
index 98642f9c6fd9..000000000000
--- a/media-video/vdr/vdr-2.4.1-r3.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
-	mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_mainmenuhook-1.0.1.patch.bz2 )
-	menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
-	naludump? ( http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
-	pinplugin? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
-	ttxtsubs? ( http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.0-ttxtsubs.patch.bz2 )
-	permashift? ( https://raw.githubusercontent.com/eikesauer/Permashift/master/vdr-2.4-patch-for-permashift.diff )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump pinplugin permashift systemd ttxtsubs verbose"
-
-COMMON_DEPEND="
-	virtual/jpeg:*
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	media-tv/gentoo-vdr-scripts
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )
-	systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE="pinplugin? ( !mainmenuhooks )
-	permashift? ( !naludump !pinplugin )"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	# use the corrected DIR /var/lib/vdr/* for acct/{user,group) handling
-	if has_version ">=media-tv/gentoo-vdr-scripts-3.0_rc1"; then
-		VIDEO_DIR="/var/lib/vdr/video"
-	else
-		VIDEO_DIR="/var/vdr/video"
-	fi
-
-	tc-export CC CXX AR
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_configure() {
-	# support languages, written from right to left
-	export "BIDI=$(usex bidi 1 0)"
-	# systemd notification support
-	export "SDNOTIFY=$(usex systemd 1 0)"
-	# with/without keyboard
-	export "USE_KBD=$(usex keyboard 1 0)"
-	# detailed compile output for debug
-	export "VERBOSE=$(usex verbose 1 0)"
-}
-
-src_prepare() {
-	# apply maintenance-patches
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT || die "cannot write to Make.config"
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		ARGSDIR			= \$(CONFDIR)/conf.d
-		VIDEODIR		= ${VIDEO_DIR}
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-
-	EOT
-	eend 0
-
-	eapply "${FILESDIR}/${P}_gentoo.patch"
-	eapply "${FILESDIR}/vdr-2.2.0-jpeg-9c.patch"
-	use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
-	eapply "${FILESDIR}/${P}_makefile-variables.patch"
-	eapply "${FILESDIR}/${P}_glibc-2.31.patch"
-
-	use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"
-	use permashift && eapply "${DISTDIR}/${PN}-2.4-patch-for-permashift.diff"
-	use pinplugin && eapply "${WORKDIR}/${P}_pinplugin.patch"
-	use ttxtsubs && eapply "${WORKDIR}/${PN}-2.4.0-ttxtsubs.patch"
-	use ttxtsubs && eapply "${FILESDIR}/${P}_ttxtsubs_segfault.patch"
-	use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
-	use mainmenuhooks && eapply "${WORKDIR}/${P}_mainmenuhook-1.0.1.patch"
-
-	add_cap CAP_UTF8 \
-		CAP_IRCTRL_RUNTIME_PARAM \
-		CAP_VFAT_RUNTIME_PARAM \
-		CAP_CHUID \
-		CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}" || die "cannot write to CAP_FILE"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-
-	default
-}
-
-src_install() {
-	# trick the makefile to not create a VIDEODIR by supplying it with an
-	# existing directory
-	emake VIDEODIR="/" DESTDIR="${ED}" install
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	# backup for plugins they don't be able to create this dir
-	keepdir "${CONF_DIR}/plugins"
-
-	if use html; then
-		local HTML_DOCS=( *.html )
-	fi
-	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS UPDATE-2* )
-	einstalldocs
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	fowners vdr:vdr "${CONF_DIR}" -R
-}
-
-pkg_postinst() {
-	elog "Please read the /usr/share/doc/${PF}/UPDATE-2.4"
-	elog "for major changes in this version\n"
-
-	elog "It is a good idea to run vdrplugin-rebuild now.\n"
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup\n"
-
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.4.6-r1.ebuild b/media-video/vdr/vdr-2.4.6-r1.ebuild
deleted file mode 100644
index 5c62f03f569c..000000000000
--- a/media-video/vdr/vdr-2.4.6-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
-	mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${PN}-2.4.1/${PN}-2.4.1_mainmenuhook-1.0.1.patch.bz2 )
-	menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
-	naludump? ( http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
-	pinplugin? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
-	ttxtsubs? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_ttxtsubs_v2.patch.bz2 )
-	permashift? ( http://vdr.websitec.de/download/${PN}/${P}/vdr-2.4-patch-for-permashift.diff.bz2 )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose"
-
-COMMON_DEPEND="
-	virtual/jpeg:*
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	media-tv/gentoo-vdr-scripts
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )
-	systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE="pinplugin? ( !mainmenuhooks )
-	permashift? ( !naludump !pinplugin )"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	# use the corrected DIR /var/lib/vdr/* for acct/{user,group) handling
-	if has_version ">=media-tv/gentoo-vdr-scripts-3.0_rc1"; then
-		VIDEO_DIR="/var/lib/vdr/video"
-	else
-		VIDEO_DIR="/var/vdr/video"
-	fi
-
-	tc-export CC CXX AR
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_configure() {
-	# support languages, written from right to left
-	export "BIDI=$(usex bidi 1 0)"
-	# systemd notification support
-	export "SDNOTIFY=$(usex systemd 1 0)"
-	# with/without keyboard
-	export "USE_KBD=$(usex keyboard 1 0)"
-	# detailed compile output for debug
-	export "VERBOSE=$(usex verbose 1 0)"
-}
-
-src_prepare() {
-	# apply maintenance-patches
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT || die "cannot write to Make.config"
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		ARGSDIR			= \$(CONFDIR)/conf.d
-		VIDEODIR		= ${VIDEO_DIR}
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-
-	EOT
-	eend 0
-
-	eapply "${FILESDIR}/${P}_gentoo.patch"
-	use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
-	eapply "${FILESDIR}/${P}_makefile-variables.patch"
-
-	# fix clang/LLVM compile
-	eapply "${FILESDIR}/${P}_clang.patch"
-
-	use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"
-	use permashift && eapply "${WORKDIR}/${PN}-2.4-patch-for-permashift.diff"
-	use pinplugin && eapply "${WORKDIR}/${P}_pinplugin.patch"
-	use ttxtsubs && eapply "${WORKDIR}/${P}_ttxtsubs_v2.patch"
-	use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
-	use mainmenuhooks && eapply "${WORKDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch"
-
-	add_cap CAP_UTF8 \
-		CAP_IRCTRL_RUNTIME_PARAM \
-		CAP_VFAT_RUNTIME_PARAM \
-		CAP_CHUID \
-		CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}" || die "cannot write to CAP_FILE"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-
-	default
-}
-
-src_install() {
-	# trick the makefile to not create a VIDEODIR by supplying it with an
-	# existing directory
-	emake VIDEODIR="/" DESTDIR="${ED}" install
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	# backup for plugins they don't be able to create this dir
-	keepdir "${CONF_DIR}/plugins"
-
-	if use html; then
-		local HTML_DOCS=( *.html )
-	fi
-	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS UPDATE-2* )
-	einstalldocs
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	fowners vdr:vdr "${CONF_DIR}" -R
-}
-
-pkg_postinst() {
-	elog "Please read the /usr/share/doc/${PF}/UPDATE-2.4"
-	elog "for major changes in this version\n"
-
-	elog "It is a good idea to run vdrplugin-rebuild now.\n"
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup\n"
-
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index bed13c0c6842..5d5d44131c40 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -13,7 +13,7 @@ AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da
 DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
 EBUILD vlc-3.0.14-r6.ebuild 13811 BLAKE2B c7bfa970ce2ed6474b08486cc80d781b71a8149184fe3a61a655417440f530198d2eedceb0f022b54b25f720453925a34fabb41cf539dafb532162614311596e SHA512 e838d26950efa98ba4b39c171c5246beb61d57a25005ed6d04899ccff8c37c0f37081e9545b8ff6d70bbe2b7ab3dff804f4c49fc762178ff05352b66a3a98fe9
-EBUILD vlc-3.0.16-r6.ebuild 13945 BLAKE2B 80c7a6c38f274b58537838640815ea91cf110af96fb13aab0e51e4eec2300d85c113ac677c2bdb392c629774b988253cfa44ea28be8d404a4217f0b9a4109e8e SHA512 4d7720f81b11d509f47bfa53888cad42e85ad83b496f05084bf93fce89fc4fbf226c167d9d8f27408165bd61c2de0df439c2b3a9cd563c825b3a044c66c7a0a1
+EBUILD vlc-3.0.16-r6.ebuild 13944 BLAKE2B 5de8781f879b874c0fe5f2f52a1ee9d5c07951ff76520b8a8c4cba3583971376b24a21e21199f2990ff58cec3bffacd42916e341b52eb7359d43309276218658 SHA512 5523b34bb9af6a517c8e5c852299801ff35d6bb72a9b2f2e9e4739b45a13f9274ca4c3b6f7811ab1a91e620a3c3e78d418cca2240d933ad3e7241202e180917e
 EBUILD vlc-3.0.9999.ebuild 13484 BLAKE2B 4af596070d8b9a4f4c22d14540863221725a591d34d26979b1b60c06d24923963dd3f1279c8de4f9adefc90b87bf08a88267d1a42324988099c4d656f2a3f843 SHA512 f5cf094b7eb9ce67b10a71719b476f9a960086587dfdb469d09c58e5c449fc1a06aea8532f479d51478d095dd0b92cb04e015d036752c56ad7e188e1ec8b2ade
 EBUILD vlc-9999.ebuild 13496 BLAKE2B 34f910ff15c32ccd8394a2ff55743e242ad89a81188f3f14a064c35825f6bec3cfeb5a07921e3e90aa84a4e4a7f69e9c0e1f3a921335ca64e57200a11461f02d SHA512 1b6da672d51b83c8fab3adca52c4b77cbb731f9d4d0158f41009230cfb384e9c1e0541dad652c5af325df5cf3ac0a612e4f6774e42ff6a44259109f9c2b25d16
 MISC metadata.xml 4912 BLAKE2B 97661f54c1c16cb3084e12ce7899c080e7e69b203c1539b90048cf3d7c1f673b29051fd68216b6bed54f8842990f0c47e2c67038d85e911dcd1c905b54093719 SHA512 c24db55603932f9b52808e0b9d5687a333078d1735c05e1b561d91c08b99246b321b5b60f8111b286041c524d5913ec6f4f321a79c0773cbb9aaaa3fea9a50d6
diff --git a/media-video/vlc/vlc-3.0.16-r6.ebuild b/media-video/vlc/vlc-3.0.16-r6.ebuild
index afa4eab76e82..ec3dc0e57d2a 100644
--- a/media-video/vlc/vlc-3.0.16-r6.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r6.ebuild
@@ -24,7 +24,7 @@ else
 	#else
 	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	#fi
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv -sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv -sparc x86"
 fi
 
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 74193405f87d..f06e74d81047 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -4,6 +4,6 @@ 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
-EBUILD wireplumber-0.4.2-r1.ebuild 2574 BLAKE2B b6b09c8828e190f7e19f1cc8cfdcf9be23e0d539d797558c33be54b69a956cfbbeb0a7a8c6145e62228152d21acb359c9d144e39ba0cdaab6a1dfa99ac84cc90 SHA512 610e2e83cf5e6acd6a357745c73c88ff0e691da47487004a0e08d9f1d764e1dafae33f990d5980cef6594a2d350cbd57e195667c23a1557e0d7b4c72c0a884ff
-EBUILD wireplumber-9999.ebuild 2187 BLAKE2B 451e20a529c57583f7b39094b46f8c30ec06fd8acc5adc26af4f2cc96ac7c820745d624ebca9e2cf33b5779a25dea4e6c61ed135e4498bc59c9c4ca22d563408 SHA512 3b2462420644bc818095052e29db07dce4fdc71f79635435f34a3951ebdbd3fa606f74161b88aa74795470c6e4f3d101710f6229f267ab64b5ac11f8687e3e98
+EBUILD wireplumber-0.4.2-r1.ebuild 2581 BLAKE2B 95aad145ac9fb82a4264306c1035ffa7ec565f9dd73480020d42b30c87ca4e3a549deb37e5e458c24408ab4cdf03e9ebb98c259c921cb2b0636860aa524e17bc SHA512 6fae3994707b949385fb72f60c771563617fdb2e46e7d0e076b38c96bf7d6308f2c2fcc61cf94311a5786b1a9b1fff9dbac6bc06b7b8c0453848c0fe19cc2679
+EBUILD wireplumber-9999.ebuild 2194 BLAKE2B 7fa180a3b5c16004076a955e2973dd80f7704a88de1e9038911f82707850517d11a08e6e2c7d372eabab311f8dbbe7e43c3dee90df31e4c81334601056444bb1 SHA512 b37500fd4fa62152de475b3061d5759b3f5fa6085e0d3097598b90c9a30728d636d7418b9f69e5b9096f10758a816d98d7e594210dcfbf8222bb9fb668f04c3b
 MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96
diff --git a/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild
index a52dbd454714..dbee3e92073a 100644
--- a/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~riscv"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 6477107a785b..88f08ce12c07 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~riscv"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 0c40495975bc..be828e2b2eb5 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,3 +1,3 @@
-DIST yle-dl-20210808.tar.gz 66360 BLAKE2B 6c6baa1f90dc7f1a58e5883611a61b01f78eee4cf377e1d7a38f88acc966462482daa35e6f87b264bcd34bc6ed4a668377c236ea5660cfc25560aae359013c72 SHA512 38da5d14e9485ada768dd6c05ea93dbfa948b581167029313feb365b89c5f2a81836d5a8739f8a77fe77178c7d9731292578370a868e8c8058a37a98606e6e32
-EBUILD yle-dl-20210808.ebuild 1415 BLAKE2B 1632ec76cdbcf0ab7218138a6c173517176491d67863cf63d893a14d4154d99edef1e0359ba892b2e8a39bea42df04664efbc6d2551349c0f4c1b5e6a42eade2 SHA512 3557d5e0d9067be1e7b71dd2104158e003a873b42ac2e6f6e59efd5502a963c1e215c56272902322cd8db54f77c66870983358a32a36d07686479631db5b790e
+DIST yle-dl-20210917.tar.gz 66746 BLAKE2B 91849a5d88615fc01f12ac19cd6c5bc3acf40548c5c024eff6141b6996d0b7b2c9363d1a2d2820cd61f99105fdd1bca835506ba199bf05d2a3b537dc88f41f10 SHA512 a26d4516f932561fe49da4a2c5e7dbc5eb65bcc4e5a7073f3636b70825c54fa9ba74feea55b3f6fcc538f4a300f99262eb4f26ba1e73efd56ff612a86971ac81
+EBUILD yle-dl-20210917.ebuild 1416 BLAKE2B 907d00143913da09ace5c35e88dccc76559677059eb3332b7f451fb8ee77a6096ee018bde13b8a2f25665b31916336fec467c7cad3ce39efd9408df824dd2770 SHA512 e069ac257aa7aa01e0e419a31ff8c3c12985e5ab1b422f9b6d3f6d0781c171e6f7ded419de8c64b766c1be534fe7fb465271bb35167d3c102bf732abc6818de8
 MISC metadata.xml 280 BLAKE2B 30756c19f90277ebe700cf4641848ae376453c6031a019f348f04ee8d4c30146947ec383fa4bf12b669df790417eec9285df363210138e39f611d345d127ed27 SHA512 cf301b82fada2d4ca02e1dd9ba7b5234c42b7c63f87b96d81cb06ebc7853934533b75d0fc77eff0dc39f3c0a9e2d468b6bc03ac98fcb3834da67a11b254a0b77
diff --git a/media-video/yle-dl/yle-dl-20210808.ebuild b/media-video/yle-dl/yle-dl-20210917.ebuild
index 8ebf86026b6c..1e5ecd0a0abd 100644
--- a/media-video/yle-dl/yle-dl-20210808.ebuild
+++ b/media-video/yle-dl/yle-dl-20210917.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 optfeature
 
@@ -48,7 +48,7 @@ src_install() {
 
 pkg_postinst() {
 	elog "Sample configuration file has been installed to "
-	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample"
+	elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample"
 	elog
 	optfeature "youtube-dl download engine" net-misc/youtube-dl
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
commit	c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree	620cbf137661399a3fb1eff92914204f9a970713 /media-video
parent	cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)