gentoo resync : 16.01.2021

34 files changed, 431 insertions, 554 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 5544f33fc500..3b70c5d0d4f9 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/celluloid/Manifest b/media-video/celluloid/Manifest
index 9b7fc1e7017d..58343c7b95ca 100644
--- a/media-video/celluloid/Manifest
+++ b/media-video/celluloid/Manifest
@@ -1,5 +1,5 @@
 DIST celluloid-0.20.tar.xz 388972 BLAKE2B 9f60bef311a33ed86a78b11742e9ea547dafe0431aba41d9f11a786c17ed6f67480f65507cca27223e7f0d1dfadc2c98f16eb3160a5e25f2165b696f15107e17 SHA512 53bb7ea155cf0b2b96da67851ec598782601ecb68504d4355aa03544fc89c0f64aefb507217d08f8ce49d2b7877215365c9ccce69f5f355ed1792a94ea1a6093
 DIST celluloid-0.21.tar.xz 413072 BLAKE2B 726eb035f15c24333151833ded843be611b6d6340d77de13f38d29f92307da1e30c63c657e654327f10b617987f8800e59b72e28bcc65cdcad4ef9ab002214c4 SHA512 6e48d982be127c21cc6afeec8e94ae5c78c667f865690f8fad6db2f0b8290922682334c4d905827e99765dc2084c1b8a36927ff3de485a7a456f4a2fb7058ae6
 EBUILD celluloid-0.20.ebuild 699 BLAKE2B dd4ff1e613ec1e4be49318b92fde90d07a4c3d33176f16c8ffc79bc13e034e1714b28e9c039b87db6731dcb3c09cef8a884c299aa57dbd888c473356e4fa0ae1 SHA512 d5be2ee8bb621a1cb39de249cb96a4452212cf067ad5707a8cf61179c963ed22467df4ba620d0c56d87b7ca64c764f46ca14060284fe7f9496aa507ce0243ebd
-EBUILD celluloid-0.21.ebuild 700 BLAKE2B 54d81c7ebeed2c34560a2fc88454ff49a94950d82f7540b043e440e825bd750ceae427c139805c7625e5ce86a7a8c33fb7b6994e7c0bfb8bc96b188220afe798 SHA512 99c3aedf0279ac6f734e3b3934b218196cae18e060942735cbe7fdc10fac194304756f690ad5bb80702b76fb37cc4272891045cc136c767a3dc13e6e511e3b16
+EBUILD celluloid-0.21.ebuild 707 BLAKE2B 8ed3a00e907070f2e79aa92717be2f9dd5c0ff055914d66f5204b26b23ab63afccae2bf38eae095204cae39fbfe1bd7dab6ba57c5299f1631e8eb0b67980b475 SHA512 d2ab39ca5cd1dd39a5dd04d648481b0c9d8a897265832e83ff946693623efbaf271e01f63575b7bd3eff52b48eb3020d1110f18f093e107996a06bcecd46d726
 MISC metadata.xml 241 BLAKE2B 976bb17a5de85e86e06973e02e7dfe782e7b4c2942907deaa9ec15a2d9a47d7eec5ff256069f78e789b7059a061c98641aaff1d21618b68c27fdccdc9474b08d SHA512 6a57f01af8ea264571202d1dcce35b702a444fb9da3e3fdc3930a349b19f9edac50fc04fa4facea682e9584c585c145aec629b2845a4c344332d7dac7d7005e3
diff --git a/media-video/celluloid/celluloid-0.21.ebuild b/media-video/celluloid/celluloid-0.21.ebuild
index 6a771a6e23fc..6427cae1f4e7 100644
--- a/media-video/celluloid/celluloid-0.21.ebuild
+++ b/media-video/celluloid/celluloid-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/celluloid-player/celluloid/releases/download/v${PV}/
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 
 RDEPEND=">=dev-libs/glib-2.44
 	>=x11-libs/gtk+-3.22.23:3
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f17516336573..9e65d2a87319 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,10 +9,10 @@ DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65
 DIST ffmpeg-4.3.2.tar.bz2 11307134 BLAKE2B 97e1e598e4abe397b06298d545c3073ea2303e11c01e98343fe09d99174e02ca94f52c4df0d389fbefe7814686221446d30f107092f00cb0b69275c8747d6f32 SHA512 ec5566f8684f0ceb18184d59786ea1fc166ab28c46260ebcca5b919ad53137ba7317fd0c537e97df28553572a0d5e42c558773c808cf76995d67985aec2d6d4d
 DIST ffmpeg-4.4.1.tar.bz2 11494996 BLAKE2B 050b0501cb21f44451d59bf3b20b18d55234636b5a69a4962103d63f80ce9af172cc2cecb1e33b92334fcf635b283afddbdfa20cbd6deb526008cdb34ae01c16 SHA512 c41e63ffa9f5465ea3a7f4a8b255b299a2f49d5868ada4310a2344b8fea02476365c44871defd5609da55c805cbb58f34063dbdd4b203ade932cba8b3cfefc72
 DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd21758e02c7a8d66a745ced2d1bbef4aa9c18c9b7cefef004b5ffa3fc859e2a2474c957bdf9ff27e82cec72ed4a5bf SHA512 212c330f477e9452b9d7873d6d3c452a5c946b6b9c17b01d94c60fda66e61e53b78388ef7686b8d9415a27cd3e05d5f0d6639a02a22467dbf1ed483b5594c80f
-EBUILD ffmpeg-4.2.4-r1.ebuild 17663 BLAKE2B c984c43f5f7d3298b7f9d577a62e9babe9003dcf4a5c6114005488f79e82a7e4a983cad7c05574773ca05cc425743fd5c74d42cc747989589d46527c1f0f73d6 SHA512 7d1bc4483da9b15fe9ecb83392f3010f5fec7c9e252d51416f1fd4d62291893c7f6ffb32a76a2ec528a8a0449a8d8c93d2f05cb1596d30b67a4cd2d1c9878dae
-EBUILD ffmpeg-4.3.1-r1.ebuild 17767 BLAKE2B 633604edd9a395d2fb03c7fa5145e4781a52c65ff53d7f2f7fbe6c2f4ae0e4df9ec5f308cb06fbfa197475e9514e961ff01afd1098881605ae5b1013587c9adc SHA512 17eed1b0ab7ecc1fea5b91e02acf686c4239b7bdb5a94777944d08c35889c22046665f8a0f7e7c40aa7946727f0bbbb4a6c9a9c043302419a83a5fbb8c7b1668
-EBUILD ffmpeg-4.3.2-r1.ebuild 17750 BLAKE2B 7d8a0ca3154efebe7192bde4953fc680eb91a2cca4abf771ca4a29ef2b5162504f0e27857d4d54b7ab8148538acbb79131f8d29b6ac775160786981d763dea49 SHA512 f6ec1e3e150f644063c241b52bdd607de12b6f87515f98581ad412ce6ab8b0e1864b6c045887b21702743980b9ac0eded342bb49e81883c22a389127dabbe221
-EBUILD ffmpeg-4.4-r1.ebuild 17818 BLAKE2B 87e0944f0e72a80daf75867fad31224bf41af5fd769ef468734cdb5cc1827f077336596b66eee7e9fab0a44d12de65c28a6f03a5180e43312b965826200846fc SHA512 0373d1564a9ddce54022b204bb47c46c219000880607d4e33fae0c7adc02d1e530396eac7d28b794a18c7583c1a668880253856f21c24c926b45dce9237e7164
-EBUILD ffmpeg-4.4.1-r1.ebuild 17860 BLAKE2B 9e3100a33095eb73b3cd3c5c9143a18a30478dd337911bf9b93fb915fb757cf4e21a19145891a00ebb15fdfe640ec3e80471c83ac029ff2b10f15629ef2996ce SHA512 1c988045156ad3a0dde4c4f66903f89c69617961fe64723dbd4eec3eee449c72fa8c68db9930622577b432c8d10c442b714bc9b72c0e3b4b32e59efebd143726
-EBUILD ffmpeg-9999.ebuild 17818 BLAKE2B 7d78e16959db094c7cedbf1a161a8c4858c358aa570bd9a549a945bba076c6498a1ca54bfd9f2e4dd67ff299469c4c3a8c78df9754d40896f15c3ae2ba9b37e3 SHA512 43cb6ff9d4c74ba472345ddda2db9c62e735716ae46c5c245274735072039378f220133140c9780ec636cabbb141317f2b286569c58e861a7aad3d275cecacef
-MISC metadata.xml 5956 BLAKE2B bf1e10c3a081c721dbaccc7389d1b35c3fdb844be0d5a9b674b154e7cbcef10c00a21fc38401819dbc0d66d6f1c5755dbf482ecdf43e1a43f2c76217af4d4ee3 SHA512 1fc8eee61c9b2d4108cacf52f64173d72e55797e0d87201f71fd35d873256aa0944361305f4c47e3bea39dde0007319643e60adbc64b984de56f3251b2ffc5a8
+EBUILD ffmpeg-4.2.4-r1.ebuild 17692 BLAKE2B 9654b34fbc80bf66dd03a8bb42a4aa2756475d4ca28ca9a731edb7b4bdffff675d7e707b5cba41260d76a7de2f7c580e7a450751cbc6aaf6ff0e3e9395583785 SHA512 cf4d863cbab82eb754de7820a5601d2682ded18e95ad620635067b803d6df12e12c5102c433b5367713af07cc4b6cfe94482b08852dd30c748ef396ab828389a
+EBUILD ffmpeg-4.3.1-r1.ebuild 17796 BLAKE2B 501db0e6e695fb6c92125d2fcaf1253b6cfb1b1de1c5c8e206693562ad82e6c3512aced041b08b05084cff7d201180cb941c69f372851e0b86d2a37aaad2bfab SHA512 a6ef98fdce4c6fc41bb82ea5fbc22e0f4ecaa34be21b78725b52a0aef37c92a99d03bb11505a3704d0c2526648d1f1525a9ff90942aae8bc7e3c56e3b1bb542b
+EBUILD ffmpeg-4.3.2-r1.ebuild 17779 BLAKE2B 05bff39a27b13816694c986c804688c41c9f30330bd7f059e18e0a0e7d723ea5280635107569cf8ba8e6197c462f243cf3e570bde495faba6299294abdfb5bdd SHA512 dad26631f5af6b5976728c2e882283c20ca24d5b64c27baccafcb960b0bd4d2327e25429bb807900ac731f2c7232df0459bb567cf7f42c175ed688d3adb6f372
+EBUILD ffmpeg-4.4-r1.ebuild 17847 BLAKE2B 4342e8ccc15388a2456f45a166f22449956755b718a769c757de73e897504b8cad1cd011f2e7265b5ea9ae14c72728e917bfcae98dc7155a9f5e3d9636b5356e SHA512 9a0dd4cb24d7955de560acd3e15285b7e1c72a86e0701137e233163b45e85757eefab20c3d372428a019f0d781ff6d24484750ba7c36e1429f7d2e76bb4889e5
+EBUILD ffmpeg-4.4.1-r1.ebuild 17968 BLAKE2B 8d08046835a635d0b86e6bc2c337d96e1a1aab43dfee7fd6a9f7c3a5f5e81df74633994e9a1a935c7651dc3886adad27c3739f4c02b8f055298eb81cc2f4bbaf SHA512 3d290d855935ce01573c52e0fe7f6af790cdac5ecdd746e4c068f0f59c37f5d3a5a12c4d5b5321a9e9ad31577d8b0f5b52bedd00df64827b39202a6ac07dd4f5
+EBUILD ffmpeg-9999.ebuild 17926 BLAKE2B 50fc3d229c161a3be3ffacfd8556f091aebda173d07fa1f428bc91173c287c07c7a7d6fa73f549bb4c8111a9def2d3e31c6f1ee39e2c881922f902740c23f68c SHA512 0915a7272bddb986678b76a6e41fd2a570dde154da1538449441b352e37fcd0698ac2002426259e94dde7161f93ea579999062839e72c6cac402fd9c640cb2cb
+MISC metadata.xml 6049 BLAKE2B 77d1c140a727f7502524b496badb024052581862093b141d743673c96f59a600cfc10796ef8af249dd1b66350a71ae7681232d13a4599c8f2c50995ddc57d9d7 SHA512 edee49b0166843a4a1f79e8c2ba413182498a7aa703715fc5de6babe2b74417fc27ae506221175047a604b57308d5a9862dc4e832a631f4891499e09f0e181ff
diff --git a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild
index 2457a735302d..82dafb11f513 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -463,6 +463,7 @@ multilib_src_configure() {
 		--cc="$(tc-getCC)" \
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
+		--strip="$(tc-getSTRIP)" \
 		--optflags="${CFLAGS}" \
 		$(use_enable static-libs static) \
 		"${myconf[@]}"
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild
index 7d3956a93641..a37c584452c6 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -464,6 +464,7 @@ multilib_src_configure() {
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
 		--nm="$(tc-getNM)" \
+		--strip="$(tc-getSTRIP)" \
 		--ranlib="$(tc-getRANLIB)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--optflags="${CFLAGS}" \
diff --git a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild
index 25d462c19509..02b369ae3848 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -464,6 +464,7 @@ multilib_src_configure() {
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
 		--nm="$(tc-getNM)" \
+		--strip="$(tc-getSTRIP)" \
 		--ranlib="$(tc-getRANLIB)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--optflags="${CFLAGS}" \
diff --git a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild
index 4f4969b77333..5bd35b407776 100644
--- a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -469,6 +469,7 @@ multilib_src_configure() {
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
 		--nm="$(tc-getNM)" \
+		--strip="$(tc-getSTRIP)" \
 		--ranlib="$(tc-getRANLIB)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--optflags="${CFLAGS}" \
diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild
index d28411d2bd94..5dbd2c460106 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -97,7 +97,7 @@ FFMPEG_FLAG_MAP=(
 FFMPEG_ENCODER_FLAG_MAP=(
 	amrenc:libvo-amrwbenc mp3:libmp3lame
 	kvazaar:libkvazaar libaom
-	openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame
+	openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 theora:libtheora twolame:libtwolame
 	webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
 )
 
@@ -249,6 +249,7 @@ RDEPEND="
 		gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
 		x11-libs/cairo[${MULTILIB_USEDEP}]
 	)
+	svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
 	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
@@ -472,6 +473,7 @@ multilib_src_configure() {
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
 		--nm="$(tc-getNM)" \
+		--strip="$(tc-getSTRIP)" \
 		--ranlib="$(tc-getRANLIB)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--optflags="${CFLAGS}" \
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index ebffc6b55085..4a5d570d6c24 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -97,7 +97,7 @@ FFMPEG_FLAG_MAP=(
 FFMPEG_ENCODER_FLAG_MAP=(
 	amrenc:libvo-amrwbenc mp3:libmp3lame
 	kvazaar:libkvazaar libaom
-	openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame
+	openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 theora:libtheora twolame:libtwolame
 	webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
 )
 
@@ -249,6 +249,7 @@ RDEPEND="
 		gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
 		x11-libs/cairo[${MULTILIB_USEDEP}]
 	)
+	svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
 	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
@@ -471,6 +472,7 @@ multilib_src_configure() {
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
 		--nm="$(tc-getNM)" \
+		--strip="$(tc-getSTRIP)" \
 		--ranlib="$(tc-getRANLIB)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--optflags="${CFLAGS}" \
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index be0716e194db..d9838e4cabf7 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -53,6 +53,7 @@
 	<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
 	<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag>
 	<flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
+	<flag name="svt-av1">Enables AV1 encoding support via <pkg>media-libs/svt-av1</pkg>.</flag>
 	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
 	<flag name="vidstab">Enables video stabilization filter using vid.stab library (<pkg>media-libs/vidstab</pkg>).</flag>
 	<flag name="vpx">Enables VP8 and VP9 codec support using libvpx: Decoding does not require this to be enabled but libvpx can also be used for decoding; encoding requires this useflag to be enabled though.</flag>
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 0b661e3f8120..0cd677989578 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -5,10 +5,9 @@ AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 4037 BLAKE2B fa3d059198f79334d2b4e8109fd5d39d9f02ded8e46c287009bb8486d9c968b5387813f894fb78ccdd584e4f72fbcc4ee42cd00fc834933f90601c7fb08d0737 SHA512 155b8f5585a66167ae39d568d4c12227ffb7cf327707b556ed28532e6f8adce1a81601ae35403e14d6850e3c9411b1b9142c90dc2af50be1083abe21fa3d68f7
 AUX handbrake-9999-system-tools.patch 1489 BLAKE2B 2a3286dc1cd37d85e1edb1312688a354f000d560a767dc4c4fc23b7874bec46692f21a5b7e2c2b6cc7b6efb221a00084355659ee9d9965a28a23c7012adfbd3d SHA512 eb07b8e675cf6a8b4eee1d0fcb682ae7d61c9ec8423202b6c8672fc94f6b011b1e01a5e9654b2e63d15b66c122e8c2c57b385e36a43d3c68fba69bf144beb508
-DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
 DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b SHA512 ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e
-EBUILD handbrake-1.3.3-r4.ebuild 4178 BLAKE2B a0ff4a6cf384aaf7712660f289e1936eecc17d14cd32a56a17bdc4ceb576bdfc15626870535728d1a256e76c32181ca82237f75de45a544f66a7923e6557c3c9 SHA512 9796e6b756a75c2f84038ce2bcbc1f9d341f032180d515b292262084de9cf8d309b23eb38348ad4a260b87b1555abbc26272cbe71e95a9fd0f30577f064644bf
-EBUILD handbrake-1.3.3-r5.ebuild 4343 BLAKE2B 90a574d179c050c2bb32fb24743e7671a592d58b1096f0d0fe61b6f869d854a4dffc1376ea5a03b0a2a1d7e0b50cae44fc594436d65023700d53f7e92b929dee SHA512 2dfb30c83671a3f06623ad28e2b324440416538c58674be37aac3c895598139f17370d3ebefe12d5cb97e8261314f78c1071fd1a887adbeb2adf39d873431786
+DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 9ce1f1ae7b2fe514ba1fb6ed30a345d18144829272a6298f2af0831e5ea7533ef2f8b201fd98389269b0ea12bbba15d0b76f09afeff6ed1d9ed313f20cf8f3a1 SHA512 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568
 EBUILD handbrake-1.4.2-r2.ebuild 4072 BLAKE2B 965d544ea6ebc761306ff09503ca4211f2d6283031d42a9fc5ae29e7bbb9988744dfec15b9549eb8c75f9e892cf64f0430384802d0ff867205c84612d09fbca6 SHA512 18e0e2b7794fcf39af1c1951fb4b0a8b4e046ac0d021af913502ad6fb3335aa184630b68f472a363edf075f2ff7fb9a7ffedcba152d70704595ce4a780c6a95a
+EBUILD handbrake-1.5.1.ebuild 4073 BLAKE2B 67d8825b04fe1ee55254e5b602a8f8c9c1e7c4818eaa9ffd90729ae9f2b9897af50dc30c093c64d85b3cc7470dc09f001e1d58f53ec678767d27375e6aa4d549 SHA512 34e63623fe7e6bf8c0bcde6b4308130ef97214aab742cdbd20d1704084c4707023edf30cc9c99fe7fccb303b222874800188654767dc8664977b85d1fa2cd8ac
 EBUILD handbrake-9999.ebuild 4073 BLAKE2B 8b2d6db78de39f0d96a3ebd2f5c1a2a68c683f59a7e0bcbc26e62f9c75c81d7f16f371e6d468b4295e5a1bd13d580ddb4681c5ce8becc38f0e6bcb72ce4735e3 SHA512 aefa37c8343d79e4bf283f7198a096356665f72c1387458f17ed905ff61b32c52c076eebcc265062edc808a555489bc8284bb39fee7c4f9eda7e16dc0bbef525
 MISC metadata.xml 1111 BLAKE2B af0af39468b2c04ae8e9f4005ee813eec2c707fe0e39f28df0b18d7836f7b6c2b46cbe9a790ca5ff2d67e15548707dc080b2fb5a4028ebed711b92f0df09ad41 SHA512 e6adea6ce757118935546923c6073b6764e8ad93e2ed6cc96789f3fc0236c762f461f31fbf94cc49b4e191ec99ac903070b1496adff79fe3af91082dbc5bc4d1
diff --git a/media-video/handbrake/handbrake-1.3.3-r5.ebuild b/media-video/handbrake/handbrake-1.3.3-r5.ebuild
deleted file mode 100644
index a0f00a16d9e2..000000000000
--- a/media-video/handbrake/handbrake-1.3.3-r5.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="https://handbrake.fr/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	app-arch/xz-utils
-	media-libs/speex
-	dev-libs/jansson:=
-	dev-libs/libxml2
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0:=
-	>=media-libs/dav1d-0.5.1:=
-	media-libs/libdvdnav
-	media-libs/libdvdread:=
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	>=media-libs/libvpx-1.8:=
-	nvenc? ( media-libs/nv-codec-headers )
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-		media-plugins/gst-plugins-gdkpixbuf:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		dev-libs/libgudev:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac:= )
-	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/nasm
-	dev-util/intltool"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${P}-remove-faac-dependency.patch"
-
-	# Use whichever python is set by portage
-	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
-
-	# Fix x265 linkage... again again #730034
-	"${FILESDIR}/${PN}-1.3.3-x265-link.patch"
-
-	# Fix missing audio stream when using MPEG-4 avformat with ffmpeg-4.4 #791220
-	"${FILESDIR}/${PN}-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch"
-)
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	# Libav was replaced in 1.2 with ffmpeg by default
-	# but I've elected to not make people change their use flags for AAC
-	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		--disable-flatpak \
-		--disable-gtk4 \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(usex !gtk --disable-gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable numa) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
-	einfo "do not use the bundled (and often patched) upstream libraries."
-	einfo ""
-	einfo "Please do not raise bugs with upstream because of these ebuilds,"
-	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-	if use gtk ; then
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.3.3-r4.ebuild b/media-video/handbrake/handbrake-1.5.1.ebuild
index 9c12dd2d8f8f..e8bee8b1fe39 100644
--- a/media-video/handbrake/handbrake-1.3.3-r4.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools gnome2-utils python-any-r1 xdg-utils
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-any-r1 toolchain-funcs xdg
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
@@ -17,7 +18,7 @@ else
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="https://handbrake.fr/"
+HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,25 +28,27 @@ REQUIRED_USE="^^ ( fdk libav-aac )"
 
 RDEPEND="
 	app-arch/xz-utils
-	media-libs/speex
 	dev-libs/jansson:=
 	dev-libs/libxml2
 	media-libs/a52dec
+	>=media-libs/dav1d-0.5.1:=
+	media-libs/libjpeg-turbo:=
 	media-libs/libass:=
 	>=media-libs/libbluray-1.0:=
-	>=media-libs/dav1d-0.5.1:=
 	media-libs/libdvdnav
 	media-libs/libdvdread:=
 	media-libs/libsamplerate
 	media-libs/libtheora
 	media-libs/libvorbis
 	>=media-libs/libvpx-1.8:=
-	nvenc? ( media-libs/nv-codec-headers )
 	media-libs/opus
+	media-libs/speex
 	media-libs/x264:=
+	media-libs/zimg
 	media-sound/lame
-	sys-libs/zlib
 	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+	sys-libs/zlib
+	fdk? ( media-libs/fdk-aac:= )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -67,13 +70,15 @@ RDEPEND="
 		x11-libs/libnotify
 		x11-libs/pango
 	)
-	fdk? ( media-libs/fdk-aac:= )
-	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
-
-DEPEND="${RDEPEND}
+	nvenc? ( media-libs/nv-codec-headers )
+	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+"
+DEPEND="
 	${PYTHON_DEPS}
+	${RDEPEND}
 	dev-lang/nasm
-	dev-util/intltool"
+	dev-util/intltool
+"
 
 PATCHES=(
 	# Remove libdvdnav duplication and call it on the original instead.
@@ -81,7 +86,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
 
 	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${P}-remove-faac-dependency.patch"
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Detect system tools - bug 738110
+	"${FILESDIR}/${PN}-9999-system-tools.patch"
 
 	# Use whichever python is set by portage
 	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
@@ -98,45 +106,41 @@ src_prepare() {
 
 	default
 
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	cd "${S}/gtk" || die
 	eautoreconf
 }
 
 src_configure() {
+	tc-export AR RANLIB STRIP
+
 	# Libav was replaced in 1.2 with ffmpeg by default
 	# but I've elected to not make people change their use flags for AAC
 	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		--disable-flatpak \
-		--disable-gtk4 \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(usex !gtk --disable-gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable numa) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
+	local myconfargs=(
+		--force
+		--verbose
+		--prefix="${EPREFIX}/usr"
+		--disable-gtk-update-checks
+		--disable-flatpak
+		--disable-gtk4
+		$(use_enable libav-aac ffmpeg-aac)
+		$(use_enable fdk fdk-aac)
+		$(usex !gtk --disable-gtk)
+		$(usex !gstreamer --disable-gst)
+		$(use_enable numa)
+		$(use_enable nvenc)
+		$(use_enable x265)
+	)
+
+	./configure "${myconfargs[@]}" || die "Configure failed."
 }
 
 src_compile() {
 	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
 }
 
 src_install() {
 	emake -C build DESTDIR="${D}" install
-
 	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
 }
 
@@ -152,11 +156,5 @@ pkg_postinst() {
 		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
 	fi
 
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
diff --git a/media-video/lxdvdrip/Manifest b/media-video/lxdvdrip/Manifest
index 405d67508146..c71b624f2e6f 100644
--- a/media-video/lxdvdrip/Manifest
+++ b/media-video/lxdvdrip/Manifest
@@ -1,5 +1,5 @@
-AUX lxdvdrip-1.77-makefile.patch 1341 BLAKE2B 8aaea5bfebfb0fa4cbb5be44d9c1e5204edad4c7e2200df848f44d304eeafd51de5f1b1fa258fb9d6dc90483f5cf459de4141a187f44bea5f06dc19d8daebda4 SHA512 4641e48fa2c7f35948788211a093f96506a74a5beee44b83787774627b52b85b36a65043e1b99cde6fb9352dde0a3838070e1f63a810f7f1433849be04e7e4a2
-AUX lxdvdrip-1.77-vamps-makefile.patch 389 BLAKE2B 52911721cd566f0fd648f698fd7fbc1f04cb1f21233924364369cc3e5a4feb9485f3fb550c9e81b43b742a922e18ade5dd886a1e05908d8f81bc432b4be90d0c SHA512 d51a411dd8bee365556b0ee275beccb99f00d4054e40080ca40fbb50f843a6646d2bb5fbc3ae97073dac7411706c0075266b00b7dfafcfa5977442143592e8b4
+AUX lxdvdrip-1.77-makefile.patch 1268 BLAKE2B f5bd7e75731ef372977684437bcb871ab405a5d14fd54f4e1bcc6a861c54dfd94ae4f2c4fd50e6fcd4bc120ed9fc351154a7fadefee615fd6c0457b25e8941ae SHA512 cb9903fe4921b1925cda6fe4d09725b1c0668a9c7f59cba603f0cb8e2a973e11ac8b67019fc4f9ea7ed36934d40d7c4bc0442d98b01d3acbef92742fd084ad42
+AUX lxdvdrip-1.77-vamps-makefile.patch 383 BLAKE2B bb9988a657d8573762b48822cd5a3386aa2da5b17f60b5257b478963f5f5a37eeb9e261f9d3eae585830ca27fdd7d66f8b4073790e0cae7209f3d5527ae81c39 SHA512 4ed8227ca7d25ab7c045f8307b2894b1b5ed903559c7a2436ba7ac3c1fe9a2153778320a0653cec955ce15a5a388b2aab87006b64f777f7d6488558c401ab295
 DIST lxdvdrip-1.77.tgz 714310 BLAKE2B 07ec19bc7ecd3c8dbe4be50b0f100f9e4ecd04cc09aedb6b0a24a0a1b3396e20628db611bb34ab1a53bbb32c887d34fe67c4002dbc220eb0802a28d1f1754a7b SHA512 d9b3003d52b90ad0f6c02054cb3171b4613b4210b5681c76f2e6e42d4a233438b1323c93b92457fd2e048e7ddef0df2089d82ea8bf3f9983c453ff99f122cca3
-EBUILD lxdvdrip-1.77.ebuild 1065 BLAKE2B aeb2c0a03153bfa1251ef695a7a9cca48f5b415d01c939032aa52c6c4983841f4fa281c1c5d7ebd5344cf3b110a5ed036d9f03b5754a9ad01cbeedefff967801 SHA512 e592f53c27cc3867ed61df6cb6a03ddbbe01fb66dec56c8cc1ee82b4c660568106f311c40f9ca3329b7e6ddc39ac518172ecf8023ab218e8118981d81f58d378
+EBUILD lxdvdrip-1.77-r1.ebuild 1003 BLAKE2B fdc4c49e79b5b3c1113e7b8a6920eb899a276938123ce96861ad6ceb2db6191513912751019ba70c9434bcefc4ca96e36281fcf99814af7d34f4b006894bc56d SHA512 34bcaf7858a98f0604a6aa89667f3a1ec5f9999d12e71ba267cfb95b3db67ec9e50fb17b3ac2850207d72d55e42ecad92c88ece9cc6afa1dc9fb95a708247d8b
 MISC metadata.xml 302 BLAKE2B 015155927bddbdf0da4bc053cf75a7f740e5fde1797d81ca2d852fae9e8c7fba173aab230f662040d9d3743355a80cf3e7225de454d4b506fd3e300fa9935ef2 SHA512 3abc4aa4ae66c40a1683ea378ca7149da05a6fef64334fc42b266d431cf9007f01304bc5730f14647be36d8031092c45e95d05e8c24e03cb9b51fc35a20d26ce
diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
index 35df8fb65400..5d2684c07c88 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2014-03-17 15:40:30.886570544 -0600
-+++ Makefile	2014-03-17 15:41:22.729159468 -0600
+--- a/Makefile
++++ b/Makefile
 @@ -3,31 +3,15 @@
  HINWEIS1 = 'Check the configuration file in /etc with the Changelog'
  HINWEIS2 = 'Comparez le fichier de config. en /etc avec le Changelog'
diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
index 7c32d44ef371..325e4cb05068 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
@@ -1,6 +1,11 @@
---- vamps/Makefile.orig	2014-03-17 15:44:50.086513525 -0600
-+++ vamps/Makefile	2014-03-17 15:44:56.443321441 -0600
-@@ -21,7 +21,7 @@
+--- a/vamps/Makefile
++++ b/vamps/Makefile
+@@ -17,11 +17,11 @@
+ 
+ PREFIX    ?= /usr/local
+ 
+-CC         = gcc
++CC        ?= gcc
  CFLAGS    ?= -O2  -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
  	       -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT
  CFLAGS    += -Wall
diff --git a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild b/media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
index f925ac98c665..367fd0494709 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Command line tool to automate the process of ripping and burning DVDs"
-SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
 HOMEPAGE="https://sourceforge.net/projects/lxdvdrip/"
+SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="media-libs/libdvdread"
 RDEPEND="${DEPEND}
 	>=media-video/dvdauthor-0.6.9
 	media-video/streamdvd
-	media-video/mpgtx"
+	media-video/mpgtx
+"
 
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-vamps-makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-vamps-makefile.patch
+)
 
 src_compile() {
-	CC="$(tc-getCC)" emake
-	cd "${S}/vamps"
-	emake CC="$(tc-getCC)"
+	tc-export CC
+	emake
+	emake -C vamps
 }
 
 src_install() {
@@ -45,6 +45,6 @@ src_install() {
 	insinto /etc
 	newins doc-pak/lxdvdrip.conf.EN lxdvdrip.conf
 
-	cd "${S}/vamps"
+	cd vamps || die
 	emake PREFIX="${D}/usr" install
 }
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 72b4c04baf9f..82cc6e7cb576 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -3,5 +3,5 @@ DIST movit-1.6.2.tar.gz 878822 BLAKE2B 02b1a5d9b05c944d0b39f93e6c4ea0ced26128e90
 DIST movit-1.6.3.tar.gz 605922 BLAKE2B b207e587a20aeccc16017b7b1a7334d88381d4268dfb516d0a030b864e41eb06771e6e2c466699ee6ff01a2c972456152b6450bed654e1961dacc9ff2b800c5d SHA512 6f7169710fbb60f79c44393aea57619f4c83d64fb296ea946d591e78fb9a71b513869dc6325f90e4c2dc843b7ed4841eaef41ca69f64787c8a57f4fde583b1e5
 DIST movit-googletest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 EBUILD movit-1.6.2.ebuild 911 BLAKE2B 2d96623c830c9d35355684d5c87cbda78b1714cdf963c3402542e87b2be248af5d0cf50de216d86067715b21365757ad4aeefa70a924fda3f8bf3aa5088d2189 SHA512 06110a012dd7782c377eb99186facc4daa81ce178e900d18a3b03fd3ff42a6305682cf95a4ef645815c1f262df752f43f46c2de17fa62c919c1df4951cb25df9
-EBUILD movit-1.6.3.ebuild 1041 BLAKE2B 68f61124294e92c5c256e01e2d6cdca2bbd4c3eac86aff018836fbce79d52cf5ff68d9e85029a4617d526a5f1732f4d76a0c66fb53217179094e948a4103c26e SHA512 bea603b710572d86eeab148f40f1ab7eeaa854d1c913fbd2a23b499abd7d2217e0a2be67acee26f9f55c87a519a32f781c806d7fe1d46595bd9346b2f04e9985
+EBUILD movit-1.6.3.ebuild 1038 BLAKE2B 957903208f0c430d6e83fc29844147cd7467fc4c9e4a1551470e5ef74bed145d09bcdf433ad4652f437d6c6b0571f82695c630be5ddd14020c2e8e9e87cd28c1 SHA512 720efd9ce1c7cb25561ddd8fda2370a41615aa7af92c1a17c83470a8d4e885c4a486d9ec26c22be1fae6c8657b83e592a584d2912ab9ecdbab9d7e4902c8fd91
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-video/movit/movit-1.6.3.ebuild b/media-video/movit/movit-1.6.3.ebuild
index 01c10ef697ac..2d77e1844390 100644
--- a/media-video/movit/movit-1.6.3.ebuild
+++ b/media-video/movit/movit-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://movit.sesse.net/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 # no sane way to use OpenGL from within tests?
 RESTRICT="test"
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 9f1ec7af1e1d..843b4bf5ec8a 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -18,6 +18,6 @@ DIST pipewire-0.3.43.tar.gz 1713131 BLAKE2B 3fa167d74e6104685760a9eac721bc359f12
 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
 EBUILD pipewire-0.3.36.ebuild 10263 BLAKE2B 033b26477ad91c843e9307504ce8eddcad7977a386925a1960409767946a88ac539954c7647075bb48ac373b4e36fecf0bbdb5d50351213b51465ea298cad336 SHA512 38d6225ab02d31d1fe33723f7c14a385648853b5f4f84cfd13fcf7f91489dffc2c5fbac5f649bdf80bdd9a4bd1b19977bae59eba83beca9c3d9e34030f6f332b
 EBUILD pipewire-0.3.42-r1.ebuild 11066 BLAKE2B d61bdc505e7fd86172392d0e1e7f3fe3166883fd0c76260d92c4ef832de67ce9d1e8c12d2a66874153e8c255801d9c852084a297204cbf6939acbe969e9b920a SHA512 878f82b0046e3a92881e313083f2e245f9833c0b1852ed87b54c60b0eb5a1927c3f1f6d534f2d257176ecd685fde7c3c67a4e3caa95810b7ed58cf688f0a94a0
-EBUILD pipewire-0.3.43-r2.ebuild 11619 BLAKE2B acf87c06044fca4264c2516c4dc034e8b48d25cec388f312dd07843d6db5482bf4fcad01603f07f341ddc582d5c958a0678195174c527e8b71701742cdcd8b20 SHA512 07a0e27dbf833dabf92f79aefddd002a6393ef0c66d929fe416479ac441383a481e56922af8dfeaac85a1bf7c66555a6492d1c211bd5e8911db462192c730952
-EBUILD pipewire-9999.ebuild 11619 BLAKE2B acf87c06044fca4264c2516c4dc034e8b48d25cec388f312dd07843d6db5482bf4fcad01603f07f341ddc582d5c958a0678195174c527e8b71701742cdcd8b20 SHA512 07a0e27dbf833dabf92f79aefddd002a6393ef0c66d929fe416479ac441383a481e56922af8dfeaac85a1bf7c66555a6492d1c211bd5e8911db462192c730952
+EBUILD pipewire-0.3.43-r3.ebuild 11620 BLAKE2B 64ff8aaaec2894008dfb32bbbcd6f8e6f9c0480089d3f19b5b1b2dec57b2ddf5880a11f9b4e383efd0ce05e1a4480671042947586deae5a849404dc7d9de17b7 SHA512 86e838d0792b78b46186e1645acc241e0bce35bae2ff58e3bf41c41f491cbf24e9cb82fa68f18adb1016d5df51659963e74c66578bdefe599f6f7c0f6ceade98
+EBUILD pipewire-9999.ebuild 11541 BLAKE2B c4b222450ce0612d7d03e03f75153564da47df72578b1e5f9d4659f2cfbe45805591845cefa5c5ec69355d4ccbed8ba9479dc6ce2428977d8ba7f87c8e4d36a5 SHA512 8520448226ede358041382373ab113f035ed224f7133a1ebf2744a5ae3de16cb70406e7e180de63aa06fb4afc7093f7a2cc55459f895ea3e2394f27c85de1fb4
 MISC metadata.xml 1451 BLAKE2B 2d30343eb8d6e5911491a2814287666a371adb1be2069f2afb30d69031b5ab19865a92fde4f478b78914a4c9e5cd15f59ad7ef6487ed94b0f0838ab29bedfe40 SHA512 68fdbacf47f006ee4a20bec6fe2bfc35d0a6509344bd410f0236d68f695401083f932e30769a1a61055b62b7626f3ca3065df352677af469c6ed83d3ca3b855b
diff --git a/media-video/pipewire/pipewire-0.3.43-r2.ebuild b/media-video/pipewire/pipewire-0.3.43-r3.ebuild
index 65a0e6a60d2d..c5225496882f 100644
--- a/media-video/pipewire/pipewire-0.3.43-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.43-r3.ebuild
@@ -73,7 +73,7 @@ RDEPEND="
 		!media-sound/jack-audio-connection-kit
 		!media-sound/jack2
 	)
-	lv2? ( media-libs/lv2 )
+	lv2? ( media-libs/lilv )
 	pipewire-alsa? (
 		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
 		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 65a0e6a60d2d..de92d3ebfb8e 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -73,7 +73,7 @@ RDEPEND="
 		!media-sound/jack-audio-connection-kit
 		!media-sound/jack2
 	)
-	lv2? ( media-libs/lv2 )
+	lv2? ( media-libs/lilv )
 	pipewire-alsa? (
 		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
 		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
@@ -105,9 +105,6 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-
-	# Upstream patches/backports
-	"${FILESDIR}"/${P}-systemd-user-unit-dir.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 63e02876421a..266439408229 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -4,12 +4,18 @@ AUX wireplumber-0.4.5-default-routes.lua-reevaluate-current-profile-only-f.patch
 AUX wireplumber-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch 742 BLAKE2B 480dfc48954a13323bc171e3b4672cedad27fdde05d8f28e263eddffd80c51ecdaa5046c30f57cd1a28a08270e59a38a3202fe496e4af84494d3b52614858880 SHA512 5400a2d4d1e61abe8d6c22c6540a83fafb25b6f4555156b66de9ad8350ce176faed00099c7a40b5286c82644ee09b5890da2521078f91e51d5a66fce7ed82a2a
 AUX wireplumber-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch 1672 BLAKE2B a5d8911754670c9303e35d15df45ecdd5bb4b2d837dea2000ff5e102bfb789ea678ace39356579f0fc86273ec58a7c5cc6eea701c3b7a274d742cddfaa3575d3 SHA512 8605622ed43fef37e1ca49edaae4812618e5ad83904b682b2b903e9de92060fd9b4a0a025d5716cd16339b94ae67b1ee9622949fae73153df0bbc5b9b3c2ebd9
 AUX wireplumber-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch 1203 BLAKE2B 12e07a42d99187cba61d5428c235aba9207bd708e9346d53618b92c0ed06893e6295dbb49b9529e198f53c7ce4b573b897c349de8bb688273656de237ab3bca1 SHA512 4a5bb0a79c507945652a5600304fae1c9bf6fe028053a890c1633be2c82491ada487c9943ac29c6ed26f9e86a5d7f76140ec78bbaa394e41e1f082d50a7b56ef
-AUX wireplumber-0.4.6-endianness-fixes.patch 8766 BLAKE2B b66d2176c88e1df5a3c9ecd78bff307bf97633c02e2a905fd70bf6d3a08d6cbaa935d769d763e76a95bf94240ff764a349758b9115d08aba6fb772388692a989 SHA512 ec75f535af1933f0432c87a3370156ffddc1acd7b2def92b7e4ff92a86d7d2758596acee9eed067cfb5fa4b465845ae93bad0db23414f06ce32ccad2ec0831fd
+AUX wireplumber-0.4.6-policy-node-find-best-linkable-if-default-one-cannot.patch 1612 BLAKE2B a207499560853e4c5c98e721a4e56abf4b6784b1d21eafc1c2c9021c6e103c4a111d8cc98b4699a50c412a9f5cdc5103df0ae7502c640dde75a31f08d01cf509 SHA512 43e4554a666c4c3af904707bb05f8d2449d73c70b98aa3da874429d7264fa33dcc3e666cd2beb596f95f88a03f15f901aa31b45bd4f49cc6759b15dd07c4a067
+AUX wireplumber-0.4.6-policy-node-fix-typo-when-finding-best-target.patch 810 BLAKE2B 2a93b30ad454ec57c12d658b9ad5341df1d7f9ffafb8b31b81d9beb803587ec604f5664c2d4414fba8f9f84e11a9d0d107de4be76498a0070e8b9da808594c1f SHA512 123b344aac418132de49a46928e2ecb242124a6a3e2df787050cd2d9f6d5a9dda72583445daaf39d0a35d1519a95e3cb33175b517333432849ed95141db3ab6b
+AUX wireplumber-0.4.6-policy-node-schedule-a-rescan-without-timeout-if-def.patch 1743 BLAKE2B 60955b67413f59ad7d9bbf962d9d226458416f39a45200f75602913a5d59038ad2bd65f12af461261b7ad76efffab9e9ebb11279e9a7a5a5b3e1360369ee1f84 SHA512 0916b4b7851b9303ef404c4026f39bb15a4f8cf433da5c96f32d510f8654997ba5e3f8b6b3891f7eab5ac5722096eed6fbbe2998cd2f9e72ae090efefb064420
+AUX wireplumber-0.4.6-spa-pod-fix-different-architecture-errors-for-boolea.patch 1253 BLAKE2B 933f5d49c34a4fd024b866c839b429ab6c0a0f13ac6864d03f91a05a87a8b724fca9faa8302ae6a3852738bdee8f2c5e4dff364b46dcbe3377939f0b3856f93a SHA512 e568ec08b9948a774fcc48024476582bc3b93d4db467ce1d4797c7e4e04b91c863c57aae1faa17686e8f07e780f8b25dceb40695033a181814452c895dba75d3
+AUX wireplumber-0.4.7-default-nodes-handle-nodes-without-Routes.patch 1837 BLAKE2B 7a621e0903283c9856c02844763d7091930ef122e3bee0577a556390cf7a0051d3cf26ca2af92b07ed055d4e9c925129a43e0cbf4830c0e4a8f9a06a8b36fe56 SHA512 6b3b3304a30f6b5c8f4fc2e2249596bc1f283b76962b529cdd16e534ada2e0e04f4620dedf85a9c974fab199878badc7d79e37b046f8381096d1a0957ead7a11
 DIST wireplumber-0.4.5-endianness-fixes.patch.bz2 2341 BLAKE2B 225b164a4624128b50fe8691e3577de9aea35e85ed0527c605a617227d96ad49646b658da120d118ab45fd1ed82ed188ad1073b0a8954632ec6501535d533009 SHA512 d5b64612aad6d462ffbc78a24cf50ebde83b29e183a6d169976f5d8fdb0ec3c72984135ee75d52f7d7e8261716482ca277c49cf5824028bfaf33e596857de97f
 DIST wireplumber-0.4.5.tar.gz 345035 BLAKE2B 177984901790228d8ddeb8ee2a548eb53db07c8077734590c3f964df36cfa47a4099e049ae9a19a136f4147c75b7122359a73b8387a641768f71484b9c4ab119 SHA512 b0d5962e7a83709cc3115fbf0a04b63660085aeea2ebda6d78d692065ccb193cea8b44bb506fa440cf0b88bfae71a4f69a192cd6cba885ebf3c9270bea50c67a
 DIST wireplumber-0.4.6.tar.gz 357392 BLAKE2B 03942930b1eafb37071c0f38071567fb6117a9a64b91f064982eafa34a8662e1cba26b634db9c74a4e0bd0a8765d9b827ab2afd5e364c6377fa7ecbc7e32c5d1 SHA512 4b4b9aff6e0e6d7c567e20e4df533cfd16287f2e7498ae8533a9a4251066e6d0a9cd99e3da48f525bb2010053f7c9918fe09a5ade39c8830ec08c24292527684
+DIST wireplumber-0.4.7.tar.gz 358718 BLAKE2B a7e708ccfb9e95b3f3e2ddc5dfc1dc437ac8a2831a7cdaf03f33af65fcce8fc27dd91b2a6f346e60f68873724c2d165616005b485189604863213b5d5565f894 SHA512 8b472e1b3c7a29045326b30989d24224e510f93021c1b5b6aee59859daf594e91a738b8ad9d46d24736b7de29624d9faff40e1061bd3eddc559c95e325bfbf19
 EBUILD wireplumber-0.4.5-r2.ebuild 3056 BLAKE2B 2485dea8d7a93b14231de12023ed023483abe1135a9dfed26779d4e4b14b514c01d0aa8fed279156be9165c60a5907ce01bc621a4f188e572246cba96d1c3a5b SHA512 a10e4d07bf89f035d4b81d6f1162d5dc584a4981dbb106451f6c7d45fbe8b1f71311cbafc2cdaea2d953ede18bb1f7743911ad06d99dd5a1a3b8d5577c027817
 EBUILD wireplumber-0.4.5-r4.ebuild 3271 BLAKE2B f69305218c798f6f34aa3e3716d8abfe2f32795286d46aa5412bad3d5d1fc717bbb92249e1c2ae3449a5f93e50b0d0ef942f02835140ca764c768ecfbf16435e SHA512 8f00d21c53f7911bf325133c4aedcc2b215630e2e7736e4f8f06557becd2d394f8006cc83fd4d0f2e26a3c40dd0b372e94520119e9a59902c46940ec574fef7f
-EBUILD wireplumber-0.4.6.ebuild 2619 BLAKE2B 1fb3e7a073e1e043c1eed9785a385e72fd6df3f10b2225e8c123ec930d8a6f2da8ac96424cc9147a4215ff05861a142c0744d173b1a87a72c17ed78ce2bd8436 SHA512 99b07db549ff61cb44cdd937cdfb637aeec49ed902e3f7e595e605b841490a85881513c0c618e45b4026c2362137c510ec9a6deb5ca935cf42d5d0ca8faff9f0
+EBUILD wireplumber-0.4.6-r1.ebuild 2885 BLAKE2B 9c1d9494281187560add126aef3642133220f7032118863e9ff3e7eec1e9f5e665907960accc089ba325040a3390147887a95532d6c04a59afa01f4c325cc2d7 SHA512 119aec5c069a3766725829e3db98340e281982d13502ba7759d9a4be345074d2b889ef0e3f14112c68368eb2e4154cff54536288914391cc7c994c81e0192c96
+EBUILD wireplumber-0.4.7-r1.ebuild 2644 BLAKE2B 68ddc0730654f5f112d388aca3ee40d5770b5e3c55944c09a5a3a3503e15b752fc0e05856e72a683718106ab83932240fbb59235af860981cbf78058bd86fade SHA512 8e8bcda79de1d7ca4b044049ac2cbb6e5b596f6f8a351b8f67d4dc237252e6ca31f894c069966213c1c85ec85a76643a5a8da268768e69faa696c6b4cd6cf45c
 EBUILD wireplumber-9999.ebuild 2563 BLAKE2B cb53fa8c1fe7b0dadd01ae5b703b10d1b3202104039bff37a06e22777e822fe3178a89f42a3172acccb575c0c9dda14c420095587b66ee2baa530a41fe2a5235 SHA512 6558a682dfff705adf1aa10c2e3e2b6cc2efed6330b0b57a9744e6e620bd264f4c1cf236770f1178f668a7931c5fa710b51cb195a5b6911200ae8fb404fa5a05
 MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96
diff --git a/media-video/wireplumber/files/wireplumber-0.4.6-endianness-fixes.patch b/media-video/wireplumber/files/wireplumber-0.4.6-endianness-fixes.patch
deleted file mode 100644
index 9b8bba93a8ab..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.6-endianness-fixes.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-Bunch of patches from https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-Requires pipewire 0.3.42 for 03f0a7c9bac3e61126fc852e543b8ea254471eb7.
-
---- a/tests/wp/spa-pod.c
-+++ b/tests/wp/spa-pod.c
-@@ -6,6 +6,8 @@
-  * SPDX-License-Identifier: MIT
-  */
- 
-+#include <stdbool.h>
-+
- #include <wp/wp.h>
- 
- static void
-@@ -428,12 +430,12 @@ test_spa_pod_object (void)
-         wp_spa_type_name (wp_spa_pod_get_spa_type (pod)));
- 
-     const char *id_name;
--    gboolean mute = TRUE;
-+    bool mute = true;
-     float vol = 0.0;
-     gint32 frequency;
-     const char *device;
-     gint64 device_fd;
--    gboolean custom = FALSE;
-+    bool custom = false;
-     g_assert_true (wp_spa_pod_get_object (pod,
-         &id_name,
-         "mute", "b", &mute,
-@@ -475,12 +477,12 @@ test_spa_pod_object (void)
-         wp_spa_type_name (wp_spa_pod_get_spa_type (pod)));
- 
-     const char *id_name;
--    gboolean mute = TRUE;
-+    bool mute = true;
-     float vol = 0.0;
-     gint32 frequency;
-     const char *device;
-     gint64 device_fd;
--    gboolean custom = FALSE;
-+    bool custom = false;
-     g_autoptr (WpSpaPodParser) p = wp_spa_pod_parser_new_object (pod, &id_name);
-     g_assert_nonnull (pod);
-     g_assert_true (wp_spa_pod_parser_get (p, "mute", "b", &mute, NULL));
-@@ -603,7 +605,7 @@ test_spa_pod_struct (void)
-     g_assert_true (wp_spa_pod_parser_get (p, "P", &value_object, NULL));
-     g_assert_nonnull (value_object);
-     const char *id_name;
--    gboolean mute = TRUE;
-+    bool mute = true;
- 
-     g_assert_true (wp_spa_pod_get_object (value_object,
-         &id_name,
---- a/tests/wp/endpoint.c
-+++ b/tests/wp/endpoint.c
-@@ -499,7 +499,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-     g_auto (GValue) item = G_VALUE_INIT;
-     g_autoptr (WpSpaPod) pod = NULL;
-     gfloat float_value = 0.0f;
--    gboolean boolean_value = TRUE;
-+    bool boolean_value = true;
- 
-     iterator = wp_pipewire_object_enum_params_sync (
-         WP_PIPEWIRE_OBJECT (fixture->proxy_endpoint), "Props", NULL);
-@@ -513,7 +513,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-             "mute", "b", &boolean_value,
-             NULL));
-     g_assert_cmpfloat_with_epsilon (float_value, 1.0f, 0.001);
--    g_assert_cmpint (boolean_value, ==, FALSE);
-+    g_assert_cmpint (boolean_value, ==, false);
-   }
- 
-   /* setup change signals */
-@@ -541,7 +541,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-     g_auto (GValue) item = G_VALUE_INIT;
-     g_autoptr (WpSpaPod) pod = NULL;
-     gfloat float_value = 0.0f;
--    gboolean boolean_value = TRUE;
-+    bool boolean_value = true;
- 
-     iterator = wp_pipewire_object_enum_params_sync (
-         WP_PIPEWIRE_OBJECT (fixture->proxy_endpoint), "Props", NULL);
-@@ -556,14 +556,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-             "mute", "b", &boolean_value,
-             NULL));
-     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
--    g_assert_cmpint (boolean_value, ==, FALSE);
-+    g_assert_cmpint (boolean_value, ==, false);
-   }
-   {
-     g_autoptr (WpIterator) iterator = NULL;
-     g_auto (GValue) item = G_VALUE_INIT;
-     g_autoptr (WpSpaPod) pod = NULL;
-     gfloat float_value = 0.0f;
--    gboolean boolean_value = TRUE;
-+    bool boolean_value = true;
- 
-     iterator = wp_pipewire_object_enum_params_sync (
-         WP_PIPEWIRE_OBJECT (fixture->impl_endpoint), "Props", NULL);
-@@ -577,14 +577,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-             "mute", "b", &boolean_value,
-             NULL));
-     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
--    g_assert_cmpint (boolean_value, ==, FALSE);
-+    g_assert_cmpint (boolean_value, ==, false);
-   }
-   {
-     g_autoptr (WpIterator) iterator = NULL;
-     g_auto (GValue) item = G_VALUE_INIT;
-     g_autoptr (WpSpaPod) pod = NULL;
-     gfloat float_value = 0.0f;
--    gboolean boolean_value = TRUE;
-+    bool boolean_value = true;
- 
-     iterator = wp_pipewire_object_enum_params_sync (
-         WP_PIPEWIRE_OBJECT (endpoint->node), "Props", NULL);
-@@ -598,7 +598,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-             "mute", "b", &boolean_value,
-             NULL));
-     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
--    g_assert_cmpint (boolean_value, ==, FALSE);
-+    g_assert_cmpint (boolean_value, ==, false);
-   }
- 
-   /* change control on the impl */
-@@ -618,7 +618,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-     g_auto (GValue) item = G_VALUE_INIT;
-     g_autoptr (WpSpaPod) pod = NULL;
-     gfloat float_value = 0.0f;
--    gboolean boolean_value = TRUE;
-+    bool boolean_value = true;
- 
-     iterator = wp_pipewire_object_enum_params_sync (
-         WP_PIPEWIRE_OBJECT (fixture->proxy_endpoint), "Props", NULL);
-@@ -633,14 +633,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-             "mute", "b", &boolean_value,
-             NULL));
-     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
--    g_assert_cmpint (boolean_value, ==, TRUE);
-+    g_assert_cmpint (boolean_value, ==, true);
-   }
-   {
-     g_autoptr (WpIterator) iterator = NULL;
-     g_auto (GValue) item = G_VALUE_INIT;
-     g_autoptr (WpSpaPod) pod = NULL;
-     gfloat float_value = 0.0f;
--    gboolean boolean_value = TRUE;
-+    bool boolean_value = true;
- 
-     iterator = wp_pipewire_object_enum_params_sync (
-         WP_PIPEWIRE_OBJECT (fixture->impl_endpoint), "Props", NULL);
-@@ -654,14 +654,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-             "mute", "b", &boolean_value,
-             NULL));
-     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
--    g_assert_cmpint (boolean_value, ==, TRUE);
-+    g_assert_cmpint (boolean_value, ==, true);
-   }
-   {
-     g_autoptr (WpIterator) iterator = NULL;
-     g_auto (GValue) item = G_VALUE_INIT;
-     g_autoptr (WpSpaPod) pod = NULL;
-     gfloat float_value = 0.0f;
--    gboolean boolean_value = TRUE;
-+    bool boolean_value = true;
- 
-     iterator = wp_pipewire_object_enum_params_sync (
-         WP_PIPEWIRE_OBJECT (endpoint->node), "Props", NULL);
-@@ -675,7 +675,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-             "mute", "b", &boolean_value,
-             NULL));
-     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
--    g_assert_cmpint (boolean_value, ==, TRUE);
-+    g_assert_cmpint (boolean_value, ==, true);
-   }
- 
-   /* change control on the node */
-@@ -695,7 +695,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-     g_auto (GValue) item = G_VALUE_INIT;
-     g_autoptr (WpSpaPod) pod = NULL;
-     gfloat float_value = 0.0f;
--    gboolean boolean_value = TRUE;
-+    bool boolean_value = true;
- 
-     iterator = wp_pipewire_object_enum_params_sync (
-         WP_PIPEWIRE_OBJECT (fixture->proxy_endpoint), "Props", NULL);
-@@ -709,14 +709,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-             "mute", "b", &boolean_value,
-             NULL));
-     g_assert_cmpfloat_with_epsilon (float_value, 0.2f, 0.001);
--    g_assert_cmpint (boolean_value, ==, TRUE);
-+    g_assert_cmpint (boolean_value, ==, true);
-   }
-   {
-     g_autoptr (WpIterator) iterator = NULL;
-     g_auto (GValue) item = G_VALUE_INIT;
-     g_autoptr (WpSpaPod) pod = NULL;
-     gfloat float_value = 0.0f;
--    gboolean boolean_value = TRUE;
-+    bool boolean_value = true;
- 
-     iterator = wp_pipewire_object_enum_params_sync (
-         WP_PIPEWIRE_OBJECT (fixture->impl_endpoint), "Props", NULL);
-@@ -730,14 +730,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-             "mute", "b", &boolean_value,
-             NULL));
-     g_assert_cmpfloat_with_epsilon (float_value, 0.2f, 0.001);
--    g_assert_cmpint (boolean_value, ==, TRUE);
-+    g_assert_cmpint (boolean_value, ==, true);
-   }
-   {
-     g_autoptr (WpIterator) iterator = NULL;
-     g_auto (GValue) item = G_VALUE_INIT;
-     g_autoptr (WpSpaPod) pod = NULL;
-     gfloat float_value = 0.0f;
--    gboolean boolean_value = TRUE;
-+    bool boolean_value = true;
- 
-     iterator = wp_pipewire_object_enum_params_sync (
-         WP_PIPEWIRE_OBJECT (endpoint->node), "Props", NULL);
-@@ -751,7 +751,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
-             "mute", "b", &boolean_value,
-             NULL));
-     g_assert_cmpfloat_with_epsilon (float_value, 0.2f, 0.001);
--    g_assert_cmpint (boolean_value, ==, TRUE);
-+    g_assert_cmpint (boolean_value, ==, true);
-   }
- 
-   /* destroy impl endpoint */
diff --git a/media-video/wireplumber/files/wireplumber-0.4.6-policy-node-find-best-linkable-if-default-one-cannot.patch b/media-video/wireplumber/files/wireplumber-0.4.6-policy-node-find-best-linkable-if-default-one-cannot.patch
new file mode 100644
index 000000000000..0cedea4ac6be
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.6-policy-node-find-best-linkable-if-default-one-cannot.patch
@@ -0,0 +1,48 @@
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/bee9827ae376b75feceea926b0afc727fecca51b
+
+From bee9827ae376b75feceea926b0afc727fecca51b Mon Sep 17 00:00:00 2001
+From: Julian Bouzas <julian.bouzas@collabora.com>
+Date: Fri, 7 Jan 2022 15:35:10 -0500
+Subject: [PATCH] policy-node: find best linkable if default one cannot be
+ linked
+
+Fixes issue with echo cancellation pipewire module.
+---
+ src/scripts/policy-node.lua | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/src/scripts/policy-node.lua b/src/scripts/policy-node.lua
+index c273c1fe..9df50072 100644
+--- a/src/scripts/policy-node.lua
++++ b/src/scripts/policy-node.lua
+@@ -477,13 +477,22 @@ function findBestLinkable (si)
+ end
+ 
+ function findUndefinedTarget (si)
+-  -- Find the default linkable if the default nodes module is loaded, otherwise
+-  -- just find the best linkable based on priority and routes
+-  if default_nodes ~= nil then
+-    return findDefaultlinkable (si)
+-  else
++  -- Just find the best linkable if default nodes module is not loaded
++  if default_nodes == nil then
+     return findBestLinkable (si)
+   end
++
++  -- Otherwise find the default linkable. If the default linkabke cannot link,
++  -- we find the best one instead. We return nil if default does not exist.
++  local si_target, can_passthrough = findDefaultlinkable (si)
++  if si_target then
++    if canLink (si.properties, si_target) then
++      return si_target, can_passthrough
++    else
++      return findBestLinkable (si)
++    end
++  end
++  return nil, nil
+ end
+ 
+ function lookupLink (si_id, si_target_id)
+-- 
+GitLab
+
diff --git a/media-video/wireplumber/files/wireplumber-0.4.6-policy-node-fix-typo-when-finding-best-target.patch b/media-video/wireplumber/files/wireplumber-0.4.6-policy-node-fix-typo-when-finding-best-target.patch
new file mode 100644
index 000000000000..f18920c475a8
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.6-policy-node-fix-typo-when-finding-best-target.patch
@@ -0,0 +1,27 @@
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/23fc4d21a9cfad492f8d3a367e438115197dff4a
+
+From 23fc4d21a9cfad492f8d3a367e438115197dff4a Mon Sep 17 00:00:00 2001
+From: Julian Bouzas <julian.bouzas@collabora.com>
+Date: Fri, 7 Jan 2022 10:12:04 -0500
+Subject: [PATCH] policy-node: fix typo when finding best target
+
+---
+ src/scripts/policy-node.lua | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/scripts/policy-node.lua b/src/scripts/policy-node.lua
+index 0d716c1c..8ca5a695 100644
+--- a/src/scripts/policy-node.lua
++++ b/src/scripts/policy-node.lua
+@@ -482,7 +482,7 @@ function findUndefinedTarget (si)
+   if default_nodes ~= nil then
+     return findDefaultlinkable (si)
+   else
+-    return findBestlinkable (si)
++    return findBestLinkable (si)
+   end
+ end
+ 
+-- 
+GitLab
+
diff --git a/media-video/wireplumber/files/wireplumber-0.4.6-policy-node-schedule-a-rescan-without-timeout-if-def.patch b/media-video/wireplumber/files/wireplumber-0.4.6-policy-node-schedule-a-rescan-without-timeout-if-def.patch
new file mode 100644
index 000000000000..28b5a5ea22a4
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.6-policy-node-schedule-a-rescan-without-timeout-if-def.patch
@@ -0,0 +1,50 @@
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/afe71d7e48c28b0ae5cbd9327433e3c55c103fcb
+
+From afe71d7e48c28b0ae5cbd9327433e3c55c103fcb Mon Sep 17 00:00:00 2001
+From: Julian Bouzas <julian.bouzas@collabora.com>
+Date: Thu, 6 Jan 2022 10:53:38 -0500
+Subject: [PATCH] policy-node: schedule a rescan without timeout if defined
+ target is not found
+
+Fixes #146
+---
+ src/scripts/policy-node.lua | 17 ++++-------------
+ 1 file changed, 4 insertions(+), 13 deletions(-)
+
+diff --git a/src/scripts/policy-node.lua b/src/scripts/policy-node.lua
+index 8ca5a695..c273c1fe 100644
+--- a/src/scripts/policy-node.lua
++++ b/src/scripts/policy-node.lua
+@@ -552,25 +552,16 @@ function handleLinkable (si)
+     si_target = nil
+   end
+ 
+-  -- wait up to 2 seconds for the requested target to become available
+-  -- this is because the client may have already "seen" a target that we haven't
+-  -- yet prepared, which leads to a race condition
++  -- if the client has seen a target that we haven't yet prepared, schedule
++  -- a rescan one more time and hope for the best
+   local si_id = si.id
+   if si_props["node.target"] and si_props["node.target"] ~= "-1"
+       and not si_target
+       and not si_flags[si_id].was_handled
+       and not si_flags[si_id].done_waiting then
+-    if not si_flags[si_id].timeout_source then
+-      si_flags[si_id].timeout_source = Core.timeout_add(2000, function()
+-        if si_flags[si_id] then
+-          si_flags[si_id].done_waiting = true
+-          si_flags[si_id].timeout_source = nil
+-          scheduleRescan()
+-        end
+-        return false
+-      end)
+-    end
+     Log.info (si, "... waiting for target")
++    si_flags[si_id].done_waiting = true
++    scheduleRescan()
+     return
+   end
+ 
+-- 
+GitLab
+
diff --git a/media-video/wireplumber/files/wireplumber-0.4.6-spa-pod-fix-different-architecture-errors-for-boolea.patch b/media-video/wireplumber/files/wireplumber-0.4.6-spa-pod-fix-different-architecture-errors-for-boolea.patch
new file mode 100644
index 000000000000..b11a2f6f70f6
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.6-spa-pod-fix-different-architecture-errors-for-boolea.patch
@@ -0,0 +1,40 @@
+https://gitlab.freedesktop.org/julian/wireplumber/-/commit/5afd176698aee835c8812eb7944ba12da53ffeab
+
+From 5afd176698aee835c8812eb7944ba12da53ffeab Mon Sep 17 00:00:00 2001
+From: Julian Bouzas <julian.bouzas@collabora.com>
+Date: Mon, 13 Dec 2021 12:01:52 -0500
+Subject: [PATCH] spa-pod: fix different architecture errors for boolean values
+
+---
+ lib/wp/spa-pod.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/lib/wp/spa-pod.c b/lib/wp/spa-pod.c
+index c1c22572..bd7b8876 100644
+--- a/lib/wp/spa-pod.c
++++ b/lib/wp/spa-pod.c
+@@ -2332,6 +2332,10 @@ wp_spa_pod_builder_add_valist (WpSpaPodBuilder *self, va_list args)
+         }
+         break;
+       }
++      case 'b':
++        spa_pod_builder_bool(&self->builder,
++            va_arg(args, gboolean) ? true : false);
++        break;
+       default:
+         SPA_POD_BUILDER_COLLECT(&self->builder, *format, args);
+         break;
+@@ -2778,6 +2782,10 @@ wp_spa_pod_parser_get_valist (WpSpaPodParser *self, va_list args)
+         }
+         break;
+       }
++      case 'b':
++        *va_arg(args, gboolean*) =
++            SPA_POD_VALUE(struct spa_pod_bool, pod) ? TRUE : FALSE;
++        break;
+       default:
+         SPA_POD_PARSER_COLLECT (pod, *format, args);
+         break;
+-- 
+GitLab
+
diff --git a/media-video/wireplumber/files/wireplumber-0.4.7-default-nodes-handle-nodes-without-Routes.patch b/media-video/wireplumber/files/wireplumber-0.4.7-default-nodes-handle-nodes-without-Routes.patch
new file mode 100644
index 000000000000..3451ea73f74b
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.7-default-nodes-handle-nodes-without-Routes.patch
@@ -0,0 +1,51 @@
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/163
+
+From 211f1e6b6cd4898121e4c2b821fae4dea6cc3317 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Fri, 14 Jan 2022 16:28:48 +0100
+Subject: [PATCH] default-nodes: handle nodes without Routes
+
+When a node has not part of any EnumRoute, we must assume it is
+available.
+
+Fixes selection of Pro Audio nodes as default nodes.
+---
+ modules/module-default-nodes.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/modules/module-default-nodes.c b/modules/module-default-nodes.c
+index 32b2725b..15aadeaa 100644
+--- a/modules/module-default-nodes.c
++++ b/modules/module-default-nodes.c
+@@ -108,6 +108,7 @@ node_has_available_routes (WpDefaultNodes * self, WpNode *node)
+   gint dev_id = dev_id_str ? atoi (dev_id_str) : -1;
+   gint cpd = cpd_str ? atoi (cpd_str) : -1;
+   g_autoptr (WpDevice) device = NULL;
++  gint found = 0;
+ 
+   if (dev_id == -1 || cpd == -1)
+     return TRUE;
+@@ -168,6 +169,7 @@ node_has_available_routes (WpDefaultNodes * self, WpNode *node)
+         for (; wp_iterator_next (it, &v); g_value_unset (&v)) {
+           gint32 *d = (gint32 *)g_value_get_pointer (&v);
+           if (d && *d == cpd) {
++            found++;
+             if (route_avail != SPA_PARAM_AVAILABILITY_no)
+               return TRUE;
+           }
+@@ -175,6 +177,10 @@ node_has_available_routes (WpDefaultNodes * self, WpNode *node)
+       }
+     }
+   }
++  /* The node is part of a profile without routes so we assume it
++   * is available. This can happen for Pro Audio profiles */
++  if (found == 0)
++    return TRUE;
+ 
+   return FALSE;
+ }
+-- 
+GitLab
+
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317
diff --git a/media-video/wireplumber/wireplumber-0.4.6-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..16b0e2144871
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.4.6-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
+LICENSE="MIT"
+SLOT="0/0.4"
+IUSE="elogind systemd test"
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
+BDEPEND="
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+"
+
+DEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.62
+	>=media-video/pipewire-0.3.43:=
+	virtual/libc
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+
+# Any dev-lua/* deps get declared like this inside RDEPEND:
+#	$(lua_gen_cond_dep '
+#		dev-lua/<NAME>[${LUA_USEDEP}]
+#	')
+RDEPEND="${DEPEND}"
+
+DOCS=( {NEWS,README}.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-policy-node-fix-typo-when-finding-best-target.patch
+	"${FILESDIR}"/${P}-policy-node-schedule-a-rescan-without-timeout-if-def.patch
+	"${FILESDIR}"/${P}-policy-node-find-best-linkable-if-default-one-cannot.patch
+	"${FILESDIR}"/${P}-spa-pod-fix-different-architecture-errors-for-boolea.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
+		-Dintrospection=disabled # Only used for Sphinx doc generation
+		-Dsystem-lua=true # We always unbundle everything we can
+		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
+		$(meson_feature elogind)
+		$(meson_feature systemd)
+		-Dsystemd-system-service=false # Matches upstream
+		$(meson_use systemd systemd-user-service)
+		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
+		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if systemd_is_booted ; then
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable pipewire-media-session.service"
+		ewarn "systemctl --user --force enable wireplumber.service"
+	else
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
+	fi
+	ewarn
+}
diff --git a/media-video/wireplumber/wireplumber-0.4.6.ebuild b/media-video/wireplumber/wireplumber-0.4.7-r1.ebuild
index 92ffe0cec0a2..a071b5b2b18f 100644
--- a/media-video/wireplumber/wireplumber-0.4.6.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.7-r1.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}"
 DOCS=( {NEWS,README}.rst )
 
 PATCHES=(
-	"${FILESDIR}"/${P}-endianness-fixes.patch
+	"${FILESDIR}"/${P}-default-nodes-handle-nodes-without-Routes.patch
 )
 
 src_configure() {
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index cc10eb960447..fd13e757db83 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,3 @@
-DIST yle-dl-20210917.tar.gz 66746 BLAKE2B 91849a5d88615fc01f12ac19cd6c5bc3acf40548c5c024eff6141b6996d0b7b2c9363d1a2d2820cd61f99105fdd1bca835506ba199bf05d2a3b537dc88f41f10 SHA512 a26d4516f932561fe49da4a2c5e7dbc5eb65bcc4e5a7073f3636b70825c54fa9ba74feea55b3f6fcc538f4a300f99262eb4f26ba1e73efd56ff612a86971ac81
 DIST yle-dl-20211213.tar.gz 67655 BLAKE2B 7283ecd6e3502dbceae9aeecee1dcea992c3ba8a9433360e7f1a10cb198b352ce0efd450fcd60a6aada6041c15132e6fd7819fa8975b669c7abc4f543cb65d45 SHA512 d696d5aab8c4a4612ee6dc5e80d81f875e52807ff1704a3c08e449f76d8cf57b89f96830aedd8862063d42d8a84276abbaf6ec6e389657e2ef25c350017d863f
-EBUILD yle-dl-20210917.ebuild 1416 BLAKE2B 907d00143913da09ace5c35e88dccc76559677059eb3332b7f451fb8ee77a6096ee018bde13b8a2f25665b31916336fec467c7cad3ce39efd9408df824dd2770 SHA512 e069ac257aa7aa01e0e419a31ff8c3c12985e5ab1b422f9b6d3f6d0781c171e6f7ded419de8c64b766c1be534fe7fb465271bb35167d3c102bf732abc6818de8
 EBUILD yle-dl-20211213.ebuild 1432 BLAKE2B e2ba41ccc4cddfcbde05b4a6a8150c0f4c8caf2f043c4a0633f4a26d74f21b09f6808a5d2a42dafc675b3b4ab54d714bb2b2a0f2bee720ba63c142d3509f9384 SHA512 989b9e733d7486130d2c28958b0c73aafe021976354a0a7cd9085f2e0233cb1e013a9713e671bcfdb60b882586844f0fc39cee08b528240c4c33355074f35130
 MISC metadata.xml 280 BLAKE2B 30756c19f90277ebe700cf4641848ae376453c6031a019f348f04ee8d4c30146947ec383fa4bf12b669df790417eec9285df363210138e39f611d345d127ed27 SHA512 cf301b82fada2d4ca02e1dd9ba7b5234c42b7c63f87b96d81cb06ebc7853934533b75d0fc77eff0dc39f3c0a9e2d468b6bc03ac98fcb3834da67a11b254a0b77
diff --git a/media-video/yle-dl/yle-dl-20210917.ebuild b/media-video/yle-dl/yle-dl-20210917.ebuild
deleted file mode 100644
index 1e5ecd0a0abd..000000000000
--- a/media-video/yle-dl/yle-dl-20210917.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
-SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Requires an active internet connection during tests,
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="media-video/ffmpeg
-	net-misc/wget
-	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/progress[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-		${RDEPEND}
-		media-video/ffmpeg[gnutls]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests setup.py
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	elog "Sample configuration file has been installed to "
-	elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample"
-	elog
-	optfeature "youtube-dl download engine" net-misc/youtube-dl
-}