gentoo resync : 25.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-26 00:10:07 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-26 00:10:07 +0100
commit: 95461df035e3867364495f065e5e805bf629b2d7 (patch)
tree: 867dce371a84a696e91be255d89f282975aa0480 /media-video
parent: 46eedbedafdb0040c37884982d4c775ce277fb7b (diff)
43 files changed, 829 insertions, 241 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 14a67b56f035..991fbad9fb01 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/acidrip/Manifest b/media-video/acidrip/Manifest
index 390aff6fcaba..3a8c59217ae1 100644
--- a/media-video/acidrip/Manifest
+++ b/media-video/acidrip/Manifest
@@ -1,5 +1,5 @@
 AUX acidrip-0.14-makefile.patch 2360 BLAKE2B 565554ea73dc3eefa7141ecd9fec35bba2837e0fbd74991241f1a07bfe63221c346335aa86a42d134cb28c9ceeb3d261d508a25b7285430406814a80c17bad2b SHA512 7e91ea9ad24e20f620f0d406f2dd5d5ed5364cf92d57566c969e17aef0a0bb3d172142692a08766b4cbce0f4e1c2594672542765e68c559e9c9679a27012441b
-AUX acidrip-mplayer.patch 1079 BLAKE2B 8115276151641042b854f7ddc0607a939eb67c86b2cc1d56037cd5209a5c898e6bba97ee974d58eba59d09bc43c2701176e0a54ad26aa4d17c2582c3a7b3fd30 SHA512 ae1b57efbd49de33f60dd0d6daffb4c4ddf6bf726ad5fc2fab485a4af39d5c1326c43471dbbe8a28147e3a0f42e1ea55bd98554a1fbd8ee0fa3a150a180f4f23
+AUX acidrip-mplayer.patch 1083 BLAKE2B 86a632a2c1d8e2faa5728334bf757effd3b34f66676f2140b23056ff608fa0c3cce0d56ff973a937bfee80b84105c4da9f33031939d2af8978c9f9a780f1f0f6 SHA512 6105dc7ad2e43e3676cc53a886b1d1d22c66707ed50445d57befe413b7994afbe0930cfbc340186ab364d71dc12ee08abbf436016bd75be04831175cbf3fd5dd
 DIST acidrip-0.14.tar.gz 92086 BLAKE2B 0f1dec1a6a35d41ecbc66fc4ccf5df82c3f0e6f9f958482ebf8965dd59ffdcae88b8f1b7453c06c48d6555067e00ca57f7b5d469f7780c78cb5180a883a45009 SHA512 3ee0e329bd7e5eb4067d618fc79a49707084526d53e8c10cd9ec560828cf621e8d7263259cc8bc7944e6f9d7b7fd1fc5b8a42a8f37f18666f1974f240edb99a0
-EBUILD acidrip-0.14-r4.ebuild 713 BLAKE2B 74fd071872e9826df865448ea3a31cb7c2cba689856f7b50bcd98f5c8fa37a61e527660c65d556ae9b41705e46467038658f579410aeb86d86d84a66f1c7765a SHA512 9c9a7c4ac8ce97ed75bb7fd2b39e1ecc835bb617864a9c7728c6bc9215cd8ca9c694f1cfcabc241ecd5a0814c98a9b4e76d034517bbc01ee091d81d5385f601c
+EBUILD acidrip-0.14-r4.ebuild 665 BLAKE2B 8b66fc96fee38068bc304bab3dd2d1ccaf4da01af75506374a7f66baeebd5fc1c0d7ec7598de7f6be6dcce8298b60a1f8cb0a4a5e6f2a78f54113438f5c3643b SHA512 cd461e061ff4e37245054ce608837a2c603ecddba41047545b14a7b443e3a02e01a8f33037f4b1868de1241279d96d2fc9185ecd9263bce9eae08ed6daedc851
 MISC metadata.xml 301 BLAKE2B b1cc23313c264b312c6df3f11305b9a65e4fcfb08c97192f26720df6c55f6d16c9365e2495866aee80f93b4a2347d427e8d5fb3f37cc130de5437e34df69b835 SHA512 f1fa9a12fd99ab6c9fc3bdc2c13a2d2b53a5d838a48f935631876223629f44af1d59b3175b55e24e7435b47876fbe136e8cef583bf7f4e3673cac4daf5970d5a
diff --git a/media-video/acidrip/acidrip-0.14-r4.ebuild b/media-video/acidrip/acidrip-0.14-r4.ebuild
index 030214ae78a7..88b0b061ce2b 100644
--- a/media-video/acidrip/acidrip-0.14-r4.ebuild
+++ b/media-video/acidrip/acidrip-0.14-r4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch perl-module
+EAPI=8
+
+inherit perl-module
 
 DESCRIPTION="A gtk-perl mplayer/mencoder frontend for ripping DVDs"
 HOMEPAGE="https://sourceforge.net/projects/acidrip/"
@@ -13,14 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="encode"
 
-RDEPEND="dev-perl/Gtk2
+RDEPEND="
+	dev-perl/Gtk2
 	media-video/lsdvd
 	media-video/mplayer[encode]
-	encode? ( >=media-sound/lame-3.92 )"
+	encode? ( >=media-sound/lame-3.92 )
+"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-mplayer.patch #168012
-	epatch "${FILESDIR}/${P}-makefile.patch" #299173
-	perl-module_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-mplayer.patch #168012
+	"${FILESDIR}/${P}-makefile.patch" #299173
+)
diff --git a/media-video/acidrip/files/acidrip-mplayer.patch b/media-video/acidrip/files/acidrip-mplayer.patch
index 5d9c84701d5e..edb2100aeb45 100644
--- a/media-video/acidrip/files/acidrip-mplayer.patch
+++ b/media-video/acidrip/files/acidrip-mplayer.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/168012
 
---- AcidRip/acidrip.pm
-+++ AcidRip/acidrip.pm
+--- a/AcidRip/acidrip.pm
++++ b/AcidRip/acidrip.pm
 @@ -680,7 +680,7 @@
      message( "Running " . get_command("cropdetect") );
      open( CROP, get_command("cropdetect") . " 2>&1 |" );
diff --git a/media-video/atomicparsley-wez/Manifest b/media-video/atomicparsley-wez/Manifest
index 8f1fe5db8439..c1532f46770f 100644
--- a/media-video/atomicparsley-wez/Manifest
+++ b/media-video/atomicparsley-wez/Manifest
@@ -1,3 +1,3 @@
 DIST atomicparsley-wez-0.9.6.tar.bz2 178956 BLAKE2B e7c9bc2f3b923194fef173b72b98e4654745e0811457a1e8cb29150ab265447c2bfa71b645869661f6fd92bb30a58f25ae3aa29b20255aa09ee63f3ab738b8c5 SHA512 1f094fd4d43f652319abd2eee70529d9a57e7843b4b725815b9939ad90cf56e3f061ffd9104507a7d74cabbdd9b7cb24ca12d30c88a89832629da3091bbcf1b6
-EBUILD atomicparsley-wez-0.9.6.ebuild 710 BLAKE2B 3ea5d79eedea3cc15f2bbafb23d2830d3a4e2dc8965c1cd88f9406c24bbe2d2193633e2e141bdb68b056650c712fe61b170f6c7b4e333f30f17496fd2d2ed2ef SHA512 3852772adc8f8c30b909498548ba9fe9414ef88d6600b4b1fb5995311e25498fca10d66e0cbe60b50756819bbb92446733041805e76e5c8a99167fadeb6f44aa
+EBUILD atomicparsley-wez-0.9.6.ebuild 725 BLAKE2B 4510d82663f08a8c9c8529710579a6f67dbc65310cb3f4bd6d229e9d3e66f8b9db743b5934e19dc5ba1a5fd83f07972669aa9d25c4f7bbdf3689a38a351f54d9 SHA512 6fe6fd010a0843f763640696765a35e75b11aab010a913c97a356846c9cc885d39c6f85d29500ae613475e659f5eb8f2b98129d5c57492188ececa3772ddca00
 MISC metadata.xml 366 BLAKE2B 3d4b050b8bbd4b17192df4b60b165faae307084a2dc081658c6dc22d5471cd19019c62453d13187035f62af73049bbaaad0cd17723080a3f69aac44bb24f0b31 SHA512 f684ca0c9a4172c43056c594829df51983662c6327e468bad4b20470d12d60f22cc73c35df06a97523908e6e6189366b74b521cc2c6493e85f5591c86a130690
diff --git a/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild b/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild
index 7f1cfc0f1f1d..348e5e72d02b 100644
--- a/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild
+++ b/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit autotools flag-o-matic
 
@@ -14,20 +14,20 @@ SRC_URI="https://bitbucket.org/wez/${MY_PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
 
 RDEPEND="sys-libs/zlib
 	!media-video/atomicparsley"
 DEPEND="${RDEPEND}"
 
-DOCS="Changes.txt CREDITS"
+DOCS=(Changes.txt CREDITS)
 
 src_unpack() {
-	unpack ${A}
-	mv *-${MY_PN}-* "${S}"
+	unpack ${A} || die
+	mv *-${MY_PN}-* "${S}" || die
 }
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
diff --git a/media-video/dvbsnoop/Manifest b/media-video/dvbsnoop/Manifest
index abcc3ea0ace5..f0f72f0cad2f 100644
--- a/media-video/dvbsnoop/Manifest
+++ b/media-video/dvbsnoop/Manifest
@@ -1,4 +1,4 @@
 AUX dvbsnoop-1.4.50-crc32.patch 2031 BLAKE2B c8255a57e2b27a4297cfe50ea813558d51c4eddefd747d00469d5e1c216dba28ee54b8c2c959703b616f66c6e0e171f885f8adce9f6c7d66ffbf4fe6d0096849 SHA512 29b0b0b4814680840df4ff5e9b480b939b2ed916357ae6cfaec26bf8275f2d1ab700b2d550384f437650932f2b1e98690afc470bb01e537ac4f556d15651d7a1
 DIST dvbsnoop-1.4.50.tar.gz 333992 BLAKE2B edd860feedbdc6457c9b55707fcdeaf2918e2fd96cad511967bf6909bc4f64a71697697f39f7ace314030308c4ded17a018fdb597de506c51b9b0a12f56f25ea SHA512 288b98e9205b9ee6638b65cd0d7c463c2c243c1f7e650a6df8592acd3f40eca3352a563cc8a1a04f0f2731b3718e6dc3d09f56f59da4b59fbe25b86acf434f81
-EBUILD dvbsnoop-1.4.50-r1.ebuild 520 BLAKE2B 19df4e3d8c45129437c0e0082420ff6661c4e8da69f5ec56b817b186c579e94259b47c11ca448e178dfaacfc111847650d718aceb61f9fea3acfe2bf023af247 SHA512 df0cef7049956243ac9c44f2abe0146199f5b2b0f1c6f11824931e5904a05787f1ed88511c1201cc09f1348697e8aea25cb55ec4c4d87199f55d49e67083e676
+EBUILD dvbsnoop-1.4.50-r2.ebuild 391 BLAKE2B 86e32dd10fbc3cedb6a5dd6032e0efd7021186100fc61c5d44edf47efcdbabc87dce811741d02c17a928a0b86b3ce49c917ca5e8c1482c769ad172e7cddc5235 SHA512 62f9a3cfa9ef06ae79f3a7e77ef4a2a84db0b8295cb409e7e29b8df1a693a0c625df77a942a1d6c047a36fec11f79266ee761c3051743364642e2bf3eb5da72a
 MISC metadata.xml 246 BLAKE2B a0da340a3669959aef01ea3eaf3b20e16749f33bf3440424d4005c95f1b08a1f4e71a39290ed23739f06dfa621bbf458c35be6f6beaaa829c9b753ce2ab69194 SHA512 d7982f3a6a6cf91666c3792f09b4d23f95938fa57f8dfeb6ec377bdead8148da87098e925a1e25534e922901f99ac8d2c44cd85d03e41a2e7d1b59279fff123f
diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild
index e8982ef10084..51ab1051f484 100644
--- a/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild
+++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild
@@ -1,27 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit epatch
+EAPI=8
 
 DESCRIPTION="DVB/MPEG stream analyzer program"
 SRC_URI="mirror://sourceforge/dvbsnoop/${P}.tar.gz"
 HOMEPAGE="http://dvbsnoop.sourceforge.net/"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-DEPEND="virtual/linuxtv-dvb-headers"
 
-RDEPEND=""
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-crc32.patch"
-}
+KEYWORDS="amd64 ~ppc x86"
 
-src_install() {
-	emake DESTDIR="${D}" install
+DEPEND="virtual/linuxtv-dvb-headers"
 
-	dodoc AUTHORS ChangeLog README
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-crc32.patch
+)
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index fa4eb36a552d..2aa78c4fc79e 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,5 +1,5 @@
 AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a
 AUX ffmpeg-chromium-94.patch 1617 BLAKE2B 83afc6ae7f6d3b802e7c074545f8e46980751065303dc80283af917771675c987b063a4d39d9ca853b2753c40d38c3484c09a32500011b8faac0fca7e1807dad SHA512 41f4d79581602c475f245fb08f14e065ae2ca5b4863dade0e9652e33786fec90a631aa1a0e67f262ab067a12298883aea2d40309d2303bef76d7d99d06329eb2
 DIST ffmpeg-chromium-94.tar.gz 14709687 BLAKE2B 06dedbd86befd8caed4c6cb34755b52cf70630f8fbd712f89d42e5b63e498f9d2a77935fbd7c87194f6d56fb0f83ff26beba00357dd51b3ac3e2e4480ff4351e SHA512 a6cf5404c892c878c50e3ba8369456db587e327bc3d77e857b9d34f3665ecfee7d3865b20e9871ccda570b30d9d34c03fd981cdc7f495809ea8f12cb8f15937e
-EBUILD ffmpeg-chromium-94.ebuild 5986 BLAKE2B 64395e82e554d833e387df630a3ec7027d1cdde92b217c399e7249a8a4645e92c06bdbc78fbdf04a4891920905d2e7b7a9d7025b4fccf66aef30b369c47077a6 SHA512 deb4b1aa42cfe1a04b7f15b62a33f3a7ea6db3c4bee36886d41af2960a8942353ad795f7a6a6ab7c2a0fd896e62455a659ba3cc2b851f2511ff502d4293827cc
+EBUILD ffmpeg-chromium-94.ebuild 5985 BLAKE2B 1eb0251b8f8e52ad66ec4cd098f83439930e1eb9859465720714f715b84388b21ea737405a8ac7814fb2f210ae2389693c2eb97d0b22417579b4384461cd483b SHA512 28553c78a5b9ebcd7d401e8e35051256603c8b5d01191f4152833201a7f630f4a0a4df645ced60a3d0498f3d23188cde6cf08de33cf1a03359647d4921ddfd0b
 MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
index ccadc52a33d8..46851bbea181 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 	gpl? ( GPL-2 )
 "
 
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 # Options to use as use_enable in the foo[:bar] form.
 # This will feed configure with $(use_enable foo bar)
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f9cdea0a7f2c..d82d1ee03651 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,6 +11,6 @@ DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd2175
 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 17799 BLAKE2B cc7c5ceba76077f1de30988497eba966081d2f79a112a8c322b6c78467ac95ed7aa4ed8c10edc7dae3b4aef6e946eecf5dc2ebadb252229d0fc7843333c8f56e SHA512 1c34f377abc5206b5b8e8c845648d0ba9d9ae7d8b610cde0ca8421511cd7418224b6976c271e82c47b9b9e4f47754d906c21c4fc080f8287e7e3d89bdd6afb0c
-EBUILD ffmpeg-9999.ebuild 17606 BLAKE2B 8089c420a6dba573766c12f343778c56d55dc83198514801329b79d466051d6e957b6ae1967ae0a827340803576f4e3c3682494ed46614a6965893f49b957753 SHA512 f6597bb038c6940541b4cea0267734ea0080c872b155d9e12b92e1f845f3fd44cc906cd75a6d043ac330a3605176916df70610d4ae4dc4ad9dd2d7c44c84e7e3
+EBUILD ffmpeg-4.4-r1.ebuild 17818 BLAKE2B 87e0944f0e72a80daf75867fad31224bf41af5fd769ef468734cdb5cc1827f077336596b66eee7e9fab0a44d12de65c28a6f03a5180e43312b965826200846fc SHA512 0373d1564a9ddce54022b204bb47c46c219000880607d4e33fae0c7adc02d1e530396eac7d28b794a18c7583c1a668880253856f21c24c926b45dce9237e7164
+EBUILD ffmpeg-9999.ebuild 17776 BLAKE2B 2f41cd9417090ea5badfb24cdad7b09d8cc6166be18045ae8d74853f8873b12f5777c6afdda5c7f58a88f92bc62dacd612844dccd93ac4b5dcf7315ac6957905 SHA512 65f28bcd2f03a3b55e72c6c9c0355e411aecc3bd78b72623d87533b7da6c411b3904921b661ca8109c273bee7c2158bf26e8c8bcc256f9f1bb4df473baa6f890
 MISC metadata.xml 5956 BLAKE2B bf1e10c3a081c721dbaccc7389d1b35c3fdb844be0d5a9b674b154e7cbcef10c00a21fc38401819dbc0d66d6f1c5755dbf482ecdf43e1a43f2c76217af4d4ee3 SHA512 1fc8eee61c9b2d4108cacf52f64173d72e55797e0d87201f71fd35d873256aa0944361305f4c47e3bea39dde0007319643e60adbc64b984de56f3251b2ffc5a8
diff --git a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild
index 9dfdeaccd48a..4f4969b77333 100644
--- a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild
@@ -455,7 +455,7 @@ multilib_src_configure() {
 	if use arm || use ppc ; then
 		# bug #782811
 		# bug #790590
-		extra_libs+="-latomic "
+		extra_libs+="$(test-flags-CCLD -latomic) "
 	fi
 
 	set -- "${S}/configure" \
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 21212b25c0a4..442b6f27b0f3 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -450,6 +450,13 @@ multilib_src_configure() {
 		$(multilib_native_enable manpages)
 	)
 
+	local extra_libs
+	if use arm || use ppc ; then
+		# bug #782811
+		# bug #790590
+		extra_libs+="$(test-flags-CCLD -latomic) "
+	fi
+
 	set -- "${S}/configure" \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -464,6 +471,7 @@ multilib_src_configure() {
 		--ranlib="$(tc-getRANLIB)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--optflags="${CFLAGS}" \
+		--extra-libs="${extra_libs}" \
 		$(use_enable static-libs static) \
 		"${myconf[@]}" \
 		${EXTRA_FFMPEG_CONF}
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index d04bc9b98829..5c6bb0d597ff 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,10 +1,14 @@
 AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb531df3f9b3e64aa17a2a3d03cf9d71577ba1961961d3d058dfa383ef3bb5215eba8a2c84231531b35f1a331850070ae0bcc5b5fa1586c67 SHA512 044b0cb7d9302f74e1ef92e37162135b8ac76d96bf7d647c269ef19b5cf2a8771ce0cc76cbc8817b2480cc3e40af6bafd717888a3982b3e679d831519aad4e64
 AUX handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch 1016 BLAKE2B ffe0a1dc7d693352010eeeafbc61c9d4df43f148ae2a67449c252d71dfc888589161aa88938ee333d9f082aed6873a2d8f2461c0da14d1af388e311a3f8f6058 SHA512 d6237cf24e97a80a6f407209199af281f31f3b2745051db270f9ff2e887a5da98323c6c48be5d7aa3e59a5da17f2691e503b00137c670a6569baed67d8bd39a0
+AUX handbrake-1.3.3-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
 AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6e884637c8dc9a900774db9db07d1c0686a1b5c2db9276ca1c14612615e3974a7f9b05cb48c23f8f30ed0851238b92c32 SHA512 a74a2d20972a01b89dbfd7b81c070608d57e646de2ce63d9ae2d2e1486d31ca63e96d5ec803052b52e68bee157d5a1882914e0009ae480d1f8192031d79852eb
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
-AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
+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
-EBUILD handbrake-1.3.3-r2.ebuild 4175 BLAKE2B 3e70f8e7c14d51b807fecff2d165c49136114379744ab8050c29dfbbdd7ea3cca04bb144e0ede35821d065ae9f5a87777944c6a18e3777560ed3b63a48414a1d SHA512 f740e0f0d564a93810e1c870e8941ab162c5cb41b5b9848bc06563db067d341e677221536c6c3617db6a31dff0c5ad1fed76b148cef2565c4714dccac938212d
-EBUILD handbrake-1.3.3-r3.ebuild 4340 BLAKE2B 36a49d49b47572a8b3e19e85f1c03ba6e799fb32d1adc14a771fbe1cc2a88eb7f57d99e48b93df28743e6dcc9c0a7250d9dc74261ccdcc192d212852f66f6b69 SHA512 daaccfe49fdaed9081e4358ec507de703d1b5db020611462595a87f4ab636db3f5a695fb552408431ed2cb009b17101bf486602915e133a9bf2c8853212ec984
-EBUILD handbrake-9999.ebuild 4175 BLAKE2B 3e70f8e7c14d51b807fecff2d165c49136114379744ab8050c29dfbbdd7ea3cca04bb144e0ede35821d065ae9f5a87777944c6a18e3777560ed3b63a48414a1d SHA512 f740e0f0d564a93810e1c870e8941ab162c5cb41b5b9848bc06563db067d341e677221536c6c3617db6a31dff0c5ad1fed76b148cef2565c4714dccac938212d
-MISC metadata.xml 887 BLAKE2B b1d57d0087bfd584903bfb4866e385ba5ec6802f6122cce50ad16b558df1f07f85f4e1fe61c2247aec2fa982d7093fb2741c9cb9c93f782f1fd99477f08582ae SHA512 f677e455ad104d74a9ae6a35cf76f87bedde7a96f92c34b951bffd0cf0591857dc52ec43d1226de2918363475b94ad2e9a9035d4e274693c73c95aa9b922e2d4
+DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b SHA512 ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e
+EBUILD handbrake-1.3.3-r2.ebuild 4170 BLAKE2B 7ffc36c8aadff17746d647668db1eb977ed2f888b9d2bab40acfb04da2b041e8822e54c40f5754773b3ba1db5027d7875cf34909aa2e0e1ccd45aafecf9a3d55 SHA512 9a9c86a864699dadfa22eeb28206105b25754a00b34d94eb6417432eeb6423669cabb86e19eaff1963cedd860d0bcda0020fc3b7935ff73b0b1bcaf6a3715a64
+EBUILD handbrake-1.3.3-r3.ebuild 4335 BLAKE2B 43ebad73211c6e45dce9646d2e4fa1566cb436ec698c0ac1eb2e88b0132390842fe6f037f3e2704d815939a8d17335da954124b5343f1b801a5036802425d31f SHA512 482a21578f5ea4cf8fbdd57b7540fd5c079a4d664abfb4dbead5346a664f673422bedb349217bd647252efee929ee4504a4c7b30fee4a2834ca977d6449c7a0c
+EBUILD handbrake-1.4.2-r1.ebuild 4065 BLAKE2B 993cd7edd283959c19d1571f09ca94fbf6e74580856ab68258ed6066c97441fe814c059fc57505181795519d511d21b356a8f553130aea430994c78da59d3a7b SHA512 8db90063b16e9c24a80e9a2530a4c368d1e6e33a44accea1f39120e8d3b75235e87f1238ece1c13e783f7d202f92e80146e75e2d396573f7b83ebd22f79e16ff
+EBUILD handbrake-9999.ebuild 4065 BLAKE2B 993cd7edd283959c19d1571f09ca94fbf6e74580856ab68258ed6066c97441fe814c059fc57505181795519d511d21b356a8f553130aea430994c78da59d3a7b SHA512 8db90063b16e9c24a80e9a2530a4c368d1e6e33a44accea1f39120e8d3b75235e87f1238ece1c13e783f7d202f92e80146e75e2d396573f7b83ebd22f79e16ff
+MISC metadata.xml 1111 BLAKE2B af0af39468b2c04ae8e9f4005ee813eec2c707fe0e39f28df0b18d7836f7b6c2b46cbe9a790ca5ff2d67e15548707dc080b2fb5a4028ebed711b92f0df09ad41 SHA512 e6adea6ce757118935546923c6073b6764e8ad93e2ed6cc96789f3fc0236c762f461f31fbf94cc49b4e191ec99ac903070b1496adff79fe3af91082dbc5bc4d1
diff --git a/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch
new file mode 100644
index 000000000000..7e8ab99730a8
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch
@@ -0,0 +1,84 @@
+--- a/libhb/common.c
++++ b/libhb/common.c
+@@ -243,7 +243,6 @@
+ {
+     // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
+     { { "",                   "dts",        NULL,                          HB_ACODEC_DCA_PASS,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS,   },
+-    { { "AAC (faac)",         "faac",       NULL,                          0,                     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
+     { { "AAC (ffmpeg)",       "ffaac",      NULL,                          HB_ACODEC_FFAAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
+     { { "AC3 (ffmpeg)",       "ffac3",      NULL,                          HB_ACODEC_AC3,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3,        },
+     { { "MP3 (lame)",         "lame",       NULL,                          HB_ACODEC_LAME,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3,        },
+--- a/scripts/manicure.rb
++++ b/scripts/manicure.rb
+@@ -349,7 +349,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -466,7 +466,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -753,7 +753,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -870,7 +870,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -1163,7 +1163,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -1298,7 +1298,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -1615,7 +1615,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -1732,7 +1732,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
index 7e8ab99730a8..a75bb24bf5b3 100644
--- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
+++ b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
@@ -1,16 +1,20 @@
+diff --git a/libhb/common.c b/libhb/common.c
+index f43efdbb5..c917151b7 100644
 --- a/libhb/common.c
 +++ b/libhb/common.c
-@@ -243,7 +243,6 @@
+@@ -375,7 +375,6 @@ hb_encoder_internal_t hb_audio_encoders[]  =
  {
      // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
-     { { "",                   "dts",        NULL,                          HB_ACODEC_DCA_PASS,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS,   },
--    { { "AAC (faac)",         "faac",       NULL,                          0,                     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
-     { { "AAC (ffmpeg)",       "ffaac",      NULL,                          HB_ACODEC_FFAAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
-     { { "AC3 (ffmpeg)",       "ffac3",      NULL,                          HB_ACODEC_AC3,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3,        },
-     { { "MP3 (lame)",         "lame",       NULL,                          HB_ACODEC_LAME,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3,        },
+     { { "",                   "dts",        NULL,                          HB_ACODEC_DCA_PASS,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_DTS_PASS,   },
+-    { { "AAC (faac)",         "faac",       NULL,                          0,                     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AAC,        },
+     { { "AAC (ffmpeg)",       "ffaac",      NULL,                          HB_ACODEC_FFAAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AAC,        },
+     { { "AC3 (ffmpeg)",       "ffac3",      NULL,                          HB_ACODEC_AC3,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AC3,        },
+     { { "MP3 (lame)",         "lame",       NULL,                          HB_ACODEC_LAME,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_MP3,        },
+diff --git a/scripts/manicure.rb b/scripts/manicure.rb
+index fb4afa9ec..424288298 100755
 --- a/scripts/manicure.rb
 +++ b/scripts/manicure.rb
-@@ -349,7 +349,7 @@
+@@ -349,7 +349,7 @@ class Display
            audioEncoders << "copy:dtshd"
          when /AAC Pass/
            audioEncoders << "copy:aac"
@@ -19,7 +23,7 @@
            audioEncoders << "av_aac"
          when "AAC (FDK)"
            audioEncoders << "fdk_aac"
-@@ -466,7 +466,7 @@
+@@ -466,7 +466,7 @@ class Display
      case hash["AudioEncoderFallback"]
        when /AC3/
          audioEncoderFallback << "ac3"
@@ -28,7 +32,7 @@
          audioEncoderFallback << "av_aac"
        when "AAC (FDK)"
          audioEncoderFallback << "fdk_aac"
-@@ -753,7 +753,7 @@
+@@ -748,7 +748,7 @@ class Display
            audioEncoders << "copy:dtshd"
          when /AAC Pass/
            audioEncoders << "copy:aac"
@@ -37,7 +41,7 @@
            audioEncoders << "av_aac"
          when "AAC (FDK)"
            audioEncoders << "fdk_aac"
-@@ -870,7 +870,7 @@
+@@ -865,7 +865,7 @@ class Display
      case hash["AudioEncoderFallback"]
        when /AC3/
          audioEncoderFallback << "ac3"
@@ -46,7 +50,7 @@
          audioEncoderFallback << "av_aac"
        when "AAC (FDK)"
          audioEncoderFallback << "fdk_aac"
-@@ -1163,7 +1163,7 @@
+@@ -1148,7 +1148,7 @@ class Display
            audioEncoders << "copy:dtshd"
          when /AAC Pass/
            audioEncoders << "copy:aac"
@@ -55,7 +59,7 @@
            audioEncoders << "av_aac"
          when "AAC (FDK)"
            audioEncoders << "fdk_aac"
-@@ -1298,7 +1298,7 @@
+@@ -1283,7 +1283,7 @@ class Display
      case hash["AudioEncoderFallback"]
        when /AC3/
          audioEncoderFallback << "ac3"
@@ -64,7 +68,7 @@
          audioEncoderFallback << "av_aac"
        when "AAC (FDK)"
          audioEncoderFallback << "fdk_aac"
-@@ -1615,7 +1615,7 @@
+@@ -1600,7 +1600,7 @@ class Display
            audioEncoders << "copy:dtshd"
          when /AAC Pass/
            audioEncoders << "copy:aac"
@@ -73,7 +77,7 @@
            audioEncoders << "av_aac"
          when "AAC (FDK)"
            audioEncoders << "fdk_aac"
-@@ -1732,7 +1732,7 @@
+@@ -1717,7 +1717,7 @@ class Display
      case hash["AudioEncoderFallback"]
        when /AC3/
          audioEncoderFallback << "ac3"
diff --git a/media-video/handbrake/files/handbrake-9999-system-tools.patch b/media-video/handbrake/files/handbrake-9999-system-tools.patch
new file mode 100644
index 000000000000..9d76e628ccbb
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-system-tools.patch
@@ -0,0 +1,24 @@
+# https://bugs.gentoo.org/738110
+
+diff --git a/make/configure.py b/make/configure.py
+index 87118fcbe..df869856d 100644
+--- a/make/configure.py
++++ b/make/configure.py
+@@ -1626,14 +1626,14 @@ try:
+ 
+     ## create tools in a scope
+     class Tools:
+-        ar         = ToolProbe( 'AR.exe',         'ar',         'ar', abort=True )
++        ar         = ToolProbe( 'AR.exe',         'ar',         os.environ.get('AR', 'ar'), abort=True )
+         cp         = ToolProbe( 'CP.exe',         'cp',         'cp', abort=True )
+         m4         = ToolProbe( 'M4.exe',         'm4',         'gm4', 'm4', abort=True )
+         mkdir      = ToolProbe( 'MKDIR.exe',      'mkdir',      'mkdir', abort=True )
+         patch      = ToolProbe( 'PATCH.exe',      'patch',      'gpatch', 'patch', abort=True )
+         rm         = ToolProbe( 'RM.exe',         'rm',         'rm', abort=True )
+-        ranlib     = ToolProbe( 'RANLIB.exe',     'ranlib',     'ranlib', abort=True )
+-        strip      = ToolProbe( 'STRIP.exe',      'strip',      'strip', abort=True )
++        ranlib     = ToolProbe( 'RANLIB.exe',     'ranlib',     os.environ.get('RANLIB', 'ranlib'), abort=True )
++        strip      = ToolProbe( 'STRIP.exe',      'strip',      os.environ.get('STRIP', 'strip'), abort=True )
+         tar        = ToolProbe( 'TAR.exe',        'tar',        'gtar', 'tar', abort=True )
+         python     = ToolProbe( 'PYTHON.exe',     'python',     os.path.basename(sys.executable), abort=True )
+ 
diff --git a/media-video/handbrake/handbrake-1.3.3-r2.ebuild b/media-video/handbrake/handbrake-1.3.3-r2.ebuild
index a0fb60145610..a8bf0bdbcbdf 100644
--- a/media-video/handbrake/handbrake-1.3.3-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r2.ebuild
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
+HOMEPAGE="https://handbrake.fr/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -81,7 +81,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
 
 	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+	"${FILESDIR}/${P}-remove-faac-dependency.patch"
 
 	# Use whichever python is set by portage
 	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
diff --git a/media-video/handbrake/handbrake-1.3.3-r3.ebuild b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
index a02d836a04b5..84a582a27b03 100644
--- a/media-video/handbrake/handbrake-1.3.3-r3.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
+HOMEPAGE="https://handbrake.fr/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -81,7 +81,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
 
 	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+	"${FILESDIR}/${P}-remove-faac-dependency.patch"
 
 	# Use whichever python is set by portage
 	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
diff --git a/media-video/handbrake/handbrake-1.4.2-r1.ebuild b/media-video/handbrake/handbrake-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..75a5cf2fa4aa
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.4.2-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+	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/ https://github.com/HandBrake/HandBrake"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+	app-arch/xz-utils
+	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/libdvdnav
+	media-libs/libdvdread:=
+	media-libs/libsamplerate
+	media-libs/libtheora
+	media-libs/libvorbis
+	>=media-libs/libvpx-1.8
+	media-libs/opus
+	media-libs/speex
+	media-libs/x264:=
+	media-libs/zimg
+	media-sound/lame
+	>=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
+		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
+	)
+	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
+"
+
+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}/${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"
+
+	# Fix x265 linkage... again again #730034
+	"${FILESDIR}/${PN}-1.3.3-x265-link.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" || 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
+	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
+}
+
+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_pkg_postinst
+}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index a0fb60145610..75a5cf2fa4aa 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2021 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="http://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.
@@ -83,6 +88,9 @@ PATCHES=(
 	# Remove faac dependency; TODO: figure out if we need to do this at all.
 	"${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/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index ffc4a33c70cb..2a996322704c 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>telans@posteo.de</email>
+		<name>James Beddek</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
 		<flag name="gtk">Install the GTK UI, ghb.</flag>
diff --git a/media-video/isight-firmware-tools/Manifest b/media-video/isight-firmware-tools/Manifest
index f92a9c6564c4..9ac2f0c5ba3a 100644
--- a/media-video/isight-firmware-tools/Manifest
+++ b/media-video/isight-firmware-tools/Manifest
@@ -1,4 +1,4 @@
-AUX isight-firmware-tools-1.5.90-build-O0.patch 598 BLAKE2B 7ad3392140e3fd416f6cc932b015cc21e0ececb97bb12a0c889e3059112ffbff4f328db7d0a0a9c3133986b88fc96417e88a319d7fc0283b746ad815b02e7c32 SHA512 f2b781a94f29ab5c539a8b6f0da9abf554e79ae84825d1d3deb63fcb3844efe36db73c831e359b3436a1b08a8a16218aa1dfff941f07f67e3e7007c71e67cc39
+AUX isight-firmware-tools-1.5.90-build-O0.patch 610 BLAKE2B fb6714beb61858fd21c70d02a7a41ba9e23b61a4e461daa0dbaf0d9965328a798454e451371b125b27b3264686c116aad1e8f00898dacf02da5c68fb3f7f2287 SHA512 26fce9c01356de000356e3ef886f4e88c4394abac962838adfaef5b4a218230185dd205aa4749dbef38254d541904aee499c086b642652039b82e61f42a0f139
 DIST isight-firmware-tools-1.6.tar.gz 229122 BLAKE2B 7838b342bc522a88d06ac01d062fa4cacd44bb4d2cef00ee0eb37d972bcdde2b5b0676efe54df77c59717ae8023bd60cce9550e78d5586ac7a81387ad212e2f4 SHA512 1d72e10d1ff97665c96113c70786307e0b5d1cd24cd8f5fcd15ddd7b608ff1596023139a41f550a9fd288bd8968f69d348b433f5a739179fc0e3f8fa3e143fea
-EBUILD isight-firmware-tools-1.6-r1.ebuild 1584 BLAKE2B fb0776858d03720e4a58138707929cf1f9886600f8ea1de15191b5d1636f4fb354d6e4f36f659bcf088855493621e69c314e445473a2d15f5337d0b3e94a068d SHA512 e527d94de1c008e02a674c55c5d16c663e231b3d8e683578aa30af19203044ad6d2cc1edb93aa4688366e46a6e9e1d8df344a9adb6799ebfe23bfc23edc62a52
+EBUILD isight-firmware-tools-1.6-r2.ebuild 1517 BLAKE2B 3ecca0d70f549f2438d13b6a0c752661c5f31ec3d73dde97e039f9b4d45e85d3807fe14659c7f39e73866ccfad878092241454b9b44548cf8f1cb47e165d2dbc SHA512 30abebd76430c8af7eca34fc0a7f3c1464f0609d99593d78c3846a19c554ab4366af0050004945455de1c9b2f8270349cfdce03dc2c391cf6f032ffa91659dbe
 MISC metadata.xml 257 BLAKE2B 44e37af7f571d89ddc1990a07d7d7450b496bfbabb67a43c152d63aec01af7ac8db612e4336a2305485ded11654a4199f127d46c9ff6311d78d2182c076009c9 SHA512 e5af72ad3a1c1cbd233a02e508899cfe0db11ef92f9c91e8b6aaa68e8e4d3606396494cf51aade2457144c509dc037d2e989466c87d26f721ec0dd1b0e558dc9
diff --git a/media-video/isight-firmware-tools/files/isight-firmware-tools-1.5.90-build-O0.patch b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.5.90-build-O0.patch
index 8308cf6860b2..2b8697079e16 100644
--- a/media-video/isight-firmware-tools/files/isight-firmware-tools-1.5.90-build-O0.patch
+++ b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.5.90-build-O0.patch
@@ -1,5 +1,5 @@
---- src/export.c
-+++ src/export.c
+--- a/src/export.c
++++ b/src/export.c
 @@ -35,6 +35,8 @@
  #include <glib/gi18n.h>
  #include <glib/gstdio.h>
@@ -9,8 +9,8 @@
  /* OPTIONS */
  static gchar *input	= NULL;
  static gchar *output	= "isight.ihx";
---- src/extract.c
-+++ src/extract.c
+--- a/src/extract.c
++++ b/src/extract.c
 @@ -36,6 +36,8 @@
  #include <glib/gi18n.h>
  #include <glib/gstdio.h>
@@ -20,8 +20,8 @@
  /*
   * Foreach file identified by their sha1sum, we store the offset where
   * the firmware begin in the file.
---- src/load.h
-+++ src/load.h
+--- a/src/load.h
++++ b/src/load.h
 @@ -36,6 +36,8 @@
  #include <glib.h>
  #include <usb.h>
diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r2.ebuild
index 1d92625a87c5..e588027bf107 100644
--- a/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild
+++ b/media-video/isight-firmware-tools/isight-firmware-tools-1.6-r2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch versionator udev
+EAPI=8
 
-MY_MAJORV="$(get_version_component_range 1).6"
+inherit udev
+
+MY_MAJORV="$(ver_cut 1).6"
 
 DESCRIPTION="Extract, load or export firmware for the iSight webcams"
 HOMEPAGE="https://launchpad.net/isight-firmware-tools"
@@ -13,20 +14,26 @@ SRC_URI="https://launchpad.net/${PN}/main/${MY_MAJORV}/+download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.14:2
+RDEPEND="
+	>=dev-libs/glib-2.14:2
 	dev-libs/libgcrypt:0
 	virtual/libusb:0
-	virtual/udev"
-DEPEND="${RDEPEND}
+	virtual/udev
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.40
 	sys-apps/texinfo
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.90-build-O0.patch
+)
 
 src_prepare() {
-	# Fix build with -O0, bug #221325
-	epatch "${FILESDIR}"/${PN}-1.5.90-build-O0.patch
+	default
 
 	sed -i \
 		-e "s:@udevdir@:$(get_udevdir):" \
@@ -45,10 +52,10 @@ src_install() {
 		rulesdir="$(get_udevdir)"/rules.d \
 		install
 
-	mv -vf "${D}/$(get_udevdir)"/rules.d/{isight.rules,70-isight.rules}
+	mv -vf "${ED}/$(get_udevdir)"/rules.d/{isight.rules,70-isight.rules} || die
 
-	dodoc AUTHORS ChangeLog HOWTO NEWS README
-	rm -f "${D}"/usr/share/doc/${PF}/HOWTO
+	einstalldocs
+	rm "${ED}"/usr/share/doc/${PF}/HOWTO || die
 }
 
 pkg_postinst() {
diff --git a/media-video/mkvalidator/Manifest b/media-video/mkvalidator/Manifest
index e95bcaa57080..d8e087431a53 100644
--- a/media-video/mkvalidator/Manifest
+++ b/media-video/mkvalidator/Manifest
@@ -1,3 +1,3 @@
 DIST mkvalidator-0.5.2.tar.bz2 612382 BLAKE2B a60b64902e068b82f95f61295088dbf56ab122918e46a36043246310fcf7e4a6c7f997866a8802a119e18305acbbe532acfb7cde907499168f75436b86ad7482 SHA512 c87d89ce97f8c701f73932012af8c8df3d6e5ac8b0ee24e48000f93b0e29e02ce74250565f6a662fa0c9c2fbd9910705e1d1403ac6d2ac2fe54331ef150d00cc
-EBUILD mkvalidator-0.5.2.ebuild 904 BLAKE2B 169859e797b251c69f3428836babf5416c4cd435dccc81f957e936a32a94291f55a0cc7c7d0fedf82377cfd33f9bf64396a06f31168dfea5fe09a40423896962 SHA512 9b36534bdd0068077da2814aab0cb72a03dc605e7e2626a2f753d8e6a0b277d9fd4fb85495b05c471d192629852e5cd29b448e4c2d7ae26a29cd5a57e371ea5a
+EBUILD mkvalidator-0.5.2.ebuild 893 BLAKE2B ba741177b7b5690c7f9da0202b646fe2ca8045908d8f606dc9e06605c9188a681595d9f9e8e570ca3815291be0e7b369ad0c3800a3cc79c36b46c1ded5794cfd SHA512 93284471572c1a13495442a0c912fc266294cc8942a2f272857809d0d0ee886b2d5543cb76771fe664af8c3bf1c652e2bbb0ec9aee5581e5bc5df11002f92217
 MISC metadata.xml 638 BLAKE2B 13b445e0a282a8a988ba4881c848d1e13f8a60d89f8d84b8b758cf86294448b7bc92d2615f7a1d5121e62bd0d37693d50a9b1d689712bea6b7e21123b985d803 SHA512 fb39cc2d70ef6ca50c005109ef2758ffe989adf617a9e68789e5e3c41a2000a0fe96ec44d91afa1f76a064d63978959d489115715897d5c4fa5d4f2cd47b0373
diff --git a/media-video/mkvalidator/mkvalidator-0.5.2.ebuild b/media-video/mkvalidator/mkvalidator-0.5.2.ebuild
index 45d0756c3054..776d0de60b28 100644
--- a/media-video/mkvalidator/mkvalidator-0.5.2.ebuild
+++ b/media-video/mkvalidator/mkvalidator-0.5.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,7 +12,6 @@ SRC_URI="https://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 src_configure() {
 	tc-export CC CXX
diff --git a/media-video/mpgtx/Manifest b/media-video/mpgtx/Manifest
index 3db7f1249015..0acfe05fc65a 100644
--- a/media-video/mpgtx/Manifest
+++ b/media-video/mpgtx/Manifest
@@ -1,5 +1,5 @@
-AUX mpgtx-1.3.1-configure.patch 2414 BLAKE2B 542e4e504040a190ec131d9339f943cbb6d11a65d23e1b29003c34e3e7111dfa5c8d9c27a5e17fa7f9d2cd9a0827530d5ab5870d3f89eeaee3e143576d18bbea SHA512 038ae7bb3ff09f65b01ebfe1d60c44d21f1c7347710191be86e65286de83b84ffe35c7f2a97795b4a6ac9eb50189e5a2b50bf452bb49cffa615c2bbc7ebfcad3
-AUX mpgtx-1.3.1-dont-ignore-cxx-flags.patch 364 BLAKE2B decbf12e2ba6fc66b98a0aa861ef9fa5af6cfb93c2ec44c24fd5ff828ad29d762a1015455807f4d14cc66ed9684b17fb7dbdeff89a0eeab20bb61326de096ebf SHA512 5845b7ad6d9ca7200074d8c90588b97cb623e08c2946c2902bca49e7861273468471db0b74d268d4ec458920f0c2c698208d768c6afd179c2ed9abd199e636aa
+AUX mpgtx-1.3.1-configure.patch 2342 BLAKE2B 957dfacd76ab3cb8e923bd5e4c771164ba4e18f2344d13d8a2a36b2f444d026a58e2f45304dfd169ebd97ff3a4bddb6ee88a9ff0be8208848ac9a77988fa4c48 SHA512 335b3672c083a33a3c7f6226d15b9d861a2e5c728c2061c800795cbbf7e3617c2b576603f1f5ed6c5d0e4d182b2ce0567b24d79420daa45fcec8e848c521312c
+AUX mpgtx-1.3.1-dont-ignore-cxx-flags.patch 268 BLAKE2B f0b3444e97570100c8c9f8911f2d56500cda2479ca00b04c8d1ef301bf68947f58574703210bd812df0e0ef9f199d5f56f0a1ab6b1c866167b7959a3ff18222c SHA512 f599ea7d4a86769acbf0aab29e81207dd145df72fa9a7f7e7286ae6ce41659ce7f1ed3c5451c50f17ebb2d288b4035cca8658c8db16434ee4c11de5d32f35dad
 DIST mpgtx-1.3.1.tar.gz 89170 BLAKE2B 30286aa86f5c073a10619bb09eb6f1a5fcde70792839de43a5fe8aa98fb7f94ed61e529288fff76ff64267f2de4582b168176cedd7dda2c19732e6667641f9f3 SHA512 0f568673811f709383b3f262b19d3ec69de6807671c05a98266b21f2bfa6a8b85d2a8b95c3cec38bb012afb9d8add19a3f38b74b3e90f66cf233a1d26aaca805
-EBUILD mpgtx-1.3.1-r2.ebuild 1202 BLAKE2B 879970c6b54e2173bfcb772395b6b786cc9d8fdcced70f2c20c13733e5253a74b4ee2b31cfe347b242f1befbc7bb6c6410c2ab353a6f10cf47c5ff226b8ead11 SHA512 4acad3a319988fea6eab0873959cd13a2afddce4159332b68dbcb304071aa4ac5434f07ce6fe7e54837d24a54753def234a8ab9e4b431ef90b6da72b83dac25c
+EBUILD mpgtx-1.3.1-r2.ebuild 1044 BLAKE2B 02ca9781edf9e68be9477ff19565b6f87b1bdff2581925a8595c075ca91edd273f761c93536d3fa0c85cea58b11cf494569f16826197d3a02eb9c3b3cecbd5c1 SHA512 af008f4de214a8c6c3a44b5b1170c1e1ac43f77512d70fb06e68553915bdeb4dc6c3ddf34dc8e2412d7dae749677cc15e603d9a69f490880bf18eece75f95edb
 MISC metadata.xml 307 BLAKE2B 29ff4143db414ac26fa42a117e6d08a6ca6aafc5a835ef4d10dca8844a07a43fac7db0958ea7d4e692a7a63d4cd85539fada4c5910192336e57abe4d9af10adf SHA512 cdcf974c015bebd436ef33b9f9edbd4245b1fcb716e217c4ab31919e6647242ff0a273d329dd81969a4de07f5e0efa75fd9ac6af4df5c2dd6c4fb4657db2ca29
diff --git a/media-video/mpgtx/files/mpgtx-1.3.1-configure.patch b/media-video/mpgtx/files/mpgtx-1.3.1-configure.patch
index ec36e76ba641..bfac4c5a016f 100644
--- a/media-video/mpgtx/files/mpgtx-1.3.1-configure.patch
+++ b/media-video/mpgtx/files/mpgtx-1.3.1-configure.patch
@@ -1,5 +1,5 @@
---- configure.old	2006-12-07 19:51:08.000000000 +0100
-+++ configure	2006-12-07 19:51:02.000000000 +0100
+--- a/configure
++++ b/configure
 @@ -9,7 +9,6 @@
  prefix="/usr/local"
  manprefix='$(PREFIX)'
diff --git a/media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch b/media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
index 3a7f5da67458..7d6004f1e0ea 100644
--- a/media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
+++ b/media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
@@ -1,5 +1,5 @@
---- mpgtx-1.3.1/configure.old	2006-12-09 00:26:18.000000000 +0100
-+++ mpgtx-1.3.1/configure	2006-12-09 00:28:52.000000000 +0100
+--- a/configure
++++ b/configure
 @@ -11,7 +11,7 @@
  #compiler flags
  common_cflags="-Wall"
diff --git a/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild b/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
index 11bb99459f44..5068956f28e9 100644
--- a/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
+++ b/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
@@ -1,27 +1,25 @@
 # Copyright 1999-2021 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 MPEG audio/video/system file toolbox"
 SRC_URI="mirror://sourceforge/mpgtx/${P}.tar.gz"
 HOMEPAGE="http://mpgtx.sourceforge.net/"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-dont-ignore-cxx-flags.patch
-	tc-export CXX
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-dont-ignore-cxx-flags.patch
+)
 
 src_configure() {
+	tc-export CXX
 	./configure --parachute || die
 }
 
@@ -37,11 +35,11 @@ src_install() {
 
 	doman man/mpgtx.1 man/tagmp3.1
 
-	dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgcat.1
-	dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgjoin.1
-	dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpginfo.1
-	dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgsplit.1
-	dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgdemux.1
+	dosym mpgtx.1 /usr/share/man/man1/mpgcat.1
+	dosym mpgtx.1 /usr/share/man/man1/mpgjoin.1
+	dosym mpgtx.1 /usr/share/man/man1/mpginfo.1
+	dosym mpgtx.1 /usr/share/man/man1/mpgsplit.1
+	dosym mpgtx.1 /usr/share/man/man1/mpgdemux.1
 
-	dodoc AUTHORS ChangeLog README TODO
+	einstalldocs
 }
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index d8ffeedeb160..6cdbac926ba2 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,3 +1,4 @@
+AUX gentoo-pipewire-launcher.in 1195 BLAKE2B 41185857d2337a197d8c572fc3ae58d44f4baac70df8dc4125bb3577bfa804d094579e0aad79c5c760da137c9cc3162f9484987a0275af2c9fce6634e6ed8fc7 SHA512 a8be142999ab3fa1431fc284e8ef1b3a9d26cbe7acad9407b4b4a3cbab95763847acb852f784486474283cbd40ceb8388aaf81a76bbdf7c1261eff89dbc736d9
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire-0.3.25-non-systemd-integration.patch 822 BLAKE2B e80245300313151c01ec56a9be74590d6ee9211a78d9c16180ef1bfb1938a8ad9f8e00f2086d220ca6f8ad2d1c55508cfcc3c240467ed66239808f76029fdcae SHA512 0a7570e0dadd9119ba81b91fc0831ad511ed793f2f10f304547152448e0cf079118c595944e22f31cea94a92a0819524aad26c3fc2d17e73b622b43637cdf06a
 AUX pipewire-0.3.29-revert-openaptx-restriction.patch 1228 BLAKE2B a282cd6f678ecd5fd27076cd945b86a8139caf644fae5f6420f45e47cfa1f1ef7edacb6e5c6c0ae860bfaa016de902accb916159f90a85bddb0b26b73658e3ff SHA512 cadfe7c54eec23d2619faf274d2c5c95b4f430525c7fc0b84e667e3f90775d27dbb6682d200d3af5d48475a2b37ab0ff2dd6e8be4f2d69bead68f6f1efb7a7ad
@@ -11,13 +12,16 @@ AUX pipewire-0.3.38-fix-arm-build.patch 550 BLAKE2B c5c178160841494ffcbf5285939a
 AUX pipewire-0.3.38-libcamera-null-deref.patch 2031 BLAKE2B a1bc641385bd762da8e0e523d48438eb703230a6c05b5064f49584dea990c5aae449ddd9e8fe29dacb35b41dc70f50c4ab2086b3ce6e3a139ca5b5b14754da1a SHA512 5e19f04613de8a85cf70d75a5c1816ba61c789dc35905428b6f0787f63feb41ffe8cef09b1528e608affb6a27cddc7530dfe4f00a7ca3f45fba9740d4093abf0
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
+AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
 DIST pipewire-0.3.37.tar.gz 1716320 BLAKE2B ce98b28015de69a0c91953a4839d5f86a29cfa19e2058ba0a2476a75a03b782ae67239b418306e4ed7dab81fe7e77928a417b966ff3c72ac552006cea66e3218 SHA512 3f4cf1ac66117a56a7a264262e2e238a54060457da6a986bd9227f51cc7e8d1a8fd282aef8462c096819282c5baec22779d2025c2e1918bbfb3d6ff75829aea6
 DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e SHA512 c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6
+DIST pipewire-0.3.39.tar.gz 1671751 BLAKE2B 6ed56d43a45244c29a29f714eba1dbf911997f91d3e3df2cc1547051d52a2853f4d4c745aaf866ae18b63668f3fb9b7d3338deaad90d229c5fab1641482c6761 SHA512 75ed35177577efe7559341394605777be21d0f3952b9379a23c8d4c71d35ed88ec45c3e9ad58832099c8f370753d8b47a5767f47453a599c4f4a4b641b2b0d9d
 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
 EBUILD pipewire-0.3.36.ebuild 10264 BLAKE2B 4c34ce0089bf417366a1cc2eb6e5a83d84af4816db5da53fe0293504c26ddd3d0caef8e4cb48fd3c1a48cb4424720f31319e6f3d99729213595498d447ace0dd SHA512 a4ad4dfe0969fd41533e6742843e8b4332fc0122c4327e3198ae8c7a84be166f008c9ed694f14a56b56bfc129a6678651a17a168b96b13329485be2af378930d
 EBUILD pipewire-0.3.37.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61
 EBUILD pipewire-0.3.38.ebuild 10338 BLAKE2B 7861add091c7a01562398c392f512426a71e09f2ea3026aa22f296d9c57074f09807790cdaa6f9dd8f8c6b8ed453e83e40bb6561f8d2277c551b84f0e051914b SHA512 3f0758cc305d9efe5ba1599dd47b24820c0100b1279e607607db0d36779da0e6e0c4803e9861887ed49205dba4fc1a22a33b634ddc5c4b02899a910e61c3cb59
-EBUILD pipewire-9999.ebuild 10126 BLAKE2B 26b722b3d6b6b603e9b73fc0272bd75b9e99fbb39c314e2cd8f864147cebe20b777d26d3ac922eef43addfdf94c1faf785279f0f6540b7b38fd6ef7f8c76e9cc SHA512 cd811868b41e04bf2c65884839910010d0641bea72f4afd3d2df9f23dd4a0a87d863f3481955dc1bde2db86893cbc08d4ddbe478f68e65a5aef2171ef4429dad
+EBUILD pipewire-0.3.39-r1.ebuild 10788 BLAKE2B eb1c937ac9125b31a8f0f77931e82b17c41ab1a551fe55ba38d50ee682ba61f3e809eec30ecbd1dffdb6d0a698d59a5b3549cf8cd25ccc63b71ec1b8cd56f142 SHA512 f480f128303b013ddcf50379ce3470bc86a143cc0332c4adc7bdb31e9480edfbd0b49882d583b0a3ae9605a21381fc4fc316c9827e973c3d9f284dff37e8603b
+EBUILD pipewire-9999.ebuild 10785 BLAKE2B 7bc2d17dc8f35d6b3e3430effabc16a2435d9524464014f7bab84aa0201441fd9bc58eccb07b33d4a20be1b2cb97ea94c58c894dc08642a6a2ffa3c2a6d724a4 SHA512 2295cad63d6fe5e4b9996fee4a5d7e5d5b1b410c030b6a142e1b062d3683a917b9a3b064b854f180a1a318256a20880662e1c84e08b103e569891728deaa33bb
 MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf
diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in b/media-video/pipewire/files/gentoo-pipewire-launcher.in
new file mode 100644
index 000000000000..4e66e2fe317d
--- /dev/null
+++ b/media-video/pipewire/files/gentoo-pipewire-launcher.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PipeWire launcher script for XDG compliant desktops on OpenRC.
+#
+# systemd users are very _STRONGLY_ advised to use the much
+# more reliable and predictable user units instead.
+
+# WARNING: This script assumes being run inside XDG compliant session,
+# which means D-Bus session instance is expected to be correctly set up
+# prior to this script starting. If that is not true, things may break!
+
+# Best to reap any existing daemons and only then try to start a new set.
+pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
+
+# The core daemon which by itself does probably nothing.
+@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire &
+
+# The so called pipewire-pulse daemon used for PulseAudio compatibility.
+# Commenting this out will stop the PA proxying daemon from starting,
+# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
+# clients will still have access to audio and may end up clashing with
+# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
+@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf &
+
+# Finally a session manager is required for PipeWire to do anything.
+exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber
diff --git a/media-video/pipewire/files/pipewire.desktop-r1 b/media-video/pipewire/files/pipewire.desktop-r1
new file mode 100644
index 000000000000..d950312930f6
--- /dev/null
+++ b/media-video/pipewire/files/pipewire.desktop-r1
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name[de]=PipeWire Mediensystem
+Name=PipeWire Media System
+Comment[de]=Das PipeWire Mediensystem starten
+Comment=Start the PipeWire Media System
+Exec=/usr/bin/gentoo-pipewire-launcher
+Terminal=false
+Type=Application
+X-GNOME-HiddenUnderSystemd=true
+X-KDE-HiddenUnderSystemd=true
+X-systemd-skip=true
diff --git a/media-video/pipewire/pipewire-0.3.39-r1.ebuild b/media-video/pipewire/pipewire-0.3.39-r1.ebuild
new file mode 100644
index 000000000000..3c425733a524
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.39-r1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="jack-sdk? ( !jack-client )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND="media-video/wireplumber"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
+		elog
+		elog "  systemctl --user disable --now pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable WirePlumber"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user enable --now wireplumber.service"
+		elog
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to `{ path = \"/usr/bin/pipewire*` should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
+			elog "autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable --now ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index b6c000cf8a53..7dabfed1cb8b 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 systemd udev
+inherit meson-multilib optfeature prefix python-any-r1 systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -33,7 +33,6 @@ REQUIRED_USE="jack-sdk? ( !jack-client )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	app-doc/xmltoman
 	>=dev-util/meson-0.59
 	virtual/pkgconfig
 	${PYTHON_DEPS}
@@ -83,6 +82,10 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND="media-video/wireplumber"
+
 # Present RDEPEND that are currently always disabled due to the PW
 # code using them being required to be disabled by Gentoo guidelines
 # (i.e. developer binaries not meant for users) and unready code
@@ -110,12 +113,6 @@ python_check_deps() {
 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}
@@ -130,10 +127,7 @@ 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 examples) # TODO: Figure out if this is still important now that media-session gone
 		$(meson_native_enabled man)
 		$(meson_feature test tests)
 		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
@@ -144,7 +138,7 @@ multilib_src_configure() {
 		$(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)
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
 		-Daudiomixer=enabled # Matches upstream
 		-Daudioconvert=enabled # Matches upstream
 		$(meson_native_use_feature bluetooth bluez5)
@@ -177,13 +171,14 @@ multilib_src_configure() {
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
 		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
 	)
 
 	meson_src_configure
 }
 
 multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
+	# Our custom DOCS do not exist in multilib source directory
 	DOCS= meson_src_install
 }
 
@@ -195,7 +190,7 @@ multilib_src_install_all() {
 
 	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
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
 		# And the current dosym8 -r implementation is likely affected by the same issue, too.
 		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
@@ -205,8 +200,9 @@ multilib_src_install_all() {
 		insinto /etc/xdg/autostart
 		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
 
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
 	fi
 }
 
@@ -240,26 +236,37 @@ pkg_postinst() {
 		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 WirePlumber"
 		elog "for relevant users:"
 		elog
-		elog "  systemctl --user enable --now pipewire-media-session.service"
+		elog "  systemctl --user enable --now wireplumber.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
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to `{ path = \"/usr/bin/pipewire*` should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
+			elog "autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
 		elog "NOTE:"
 		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
 		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
index 37297be489a0..f759f0745ee5 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -1,4 +1,3 @@
 DIST vdr2jpeg-0.2.0.tgz 20027 BLAKE2B c79a84c6e7010eae762fb31bdd9771dcdae1e78761afd07c536a55e834b0271fb55dcd4bb49f87a2d28695496d37f94c90350dd70b50229bb6248026422faee0 SHA512 65f3e0acb2ecd3a5341e527c45fafd454266841f1369c89b10750fce86f2326fba76329abd17a05d67aea3b43a7b1299a49cfa9eee9a784bb99c940253ca5952
-EBUILD vdr2jpeg-0.2.0-r5.ebuild 955 BLAKE2B 833f5f39df32de9e61346dc163a264a297de2405acc019dfd423a2e6bd5056b0e1adb332d23d6d959837c70d7a13ae863447bcf5f082effe869b1ec9c1cf48a3 SHA512 7691acf8b96078c33a0704c11156a8a6635af97f6cbdaa13793c15e056e94b142cfecd09ae843b3bdb37b762016b2c8ab1e83d30a7f8b93c9d8217f1934355b9
-EBUILD vdr2jpeg-0.2.0.ebuild 746 BLAKE2B 75735a74aa5919f60c0c6a0f96819171804924b4bf9fda3960b91917eb318adf5ed0e0eecf5e96e38307ef5d739128728e4dcc288e0c279787978ae9fca88582 SHA512 7926d51958586a15fca14872298dab5d97e46c3c7d4fbf82a81fb018bc5a027863337288a10f0534c6c93fb74f97d342c77ab8f6c95c69dca0c95499f119ad33
+EBUILD vdr2jpeg-0.2.0-r5.ebuild 953 BLAKE2B 5f62adf98f9c41c3b2e523573f1715e3a602d51e851a0374dc8d17782d6596c9b05de9afb237df44f36c07562744289f8521d8d4ecc6d70dd09e7a8019f70b9e SHA512 8dda6d44454acc0195818a608545966eed2e682f46007125f6455bf63ab6786de5a35bdb01cee7948e0f5ce9430f2e4773b68835c7f41d7981888af7cecc5f6a
 MISC metadata.xml 373 BLAKE2B 80feee9883732f1f03711dea28d557d786bde8204c6e9d712f17ea4c97c10bebe8ca9e0eff42fcb913995dabe50818e89eb77394155b62f361fc0b5178003f49 SHA512 31ae6d5d3c39a54b3ff54f94ff72b52a85c86427d69639d8bfff743cfc5f0bd99625082c3a22873c936fc2c27324621169f27f0f3d4553e7c0b3b640a202bae2
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild
index 5352e19c60ab..64c8bb388969 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="media-video/ffmpeg:0"
 DEPEND="${RDEPEND}"
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
deleted file mode 100644
index c6f14a605b83..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-VERSION="1911" # every bump, new version
-
-RESTRICT="strip"
-
-DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
-		mirror://gentoo/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="media-video/ffmpeg:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i \
-		-e "s:usr/local:usr:" \
-		-e "s:-o vdr2jpeg:\$(LDFLAGS) -o vdr2jpeg:" \
-		Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
-
-	dodoc README LIESMICH
-}
diff --git a/media-video/vidify-audiosync/Manifest b/media-video/vidify-audiosync/Manifest
index c1258e1887df..8478db1b4593 100644
--- a/media-video/vidify-audiosync/Manifest
+++ b/media-video/vidify-audiosync/Manifest
@@ -1,3 +1,3 @@
 DIST vidify-audiosync-0.3.0.tar.gz 61854604 BLAKE2B d6ffb65152044932d1e0a57d573c14d9378815c714d680d7a446e54ba6f4e572346165eb3c0f9b7793eb03fc5d0e1f2a07a8d0a64c76971892ad5c5d0ea4fc50 SHA512 b245dea22353acae94de1f0c0465d5d1040d19f372702eba52790bf6ace861ede497562957178aa40e7a9c30ba47061b9e23761900cc18a6c7b1e3579db6ccd0
-EBUILD vidify-audiosync-0.3.0.ebuild 976 BLAKE2B ad67c9610fb90a07c0c4b85258ea0959e843df3b436889e980c3b0f3e6f2c074a83adeac72a539a05fdb6e970588b35b12fbd9c85ecef649c4adb84eb508dcb6 SHA512 78b0d2288d66e64f3c1e54a2472b3475414af58afcd32ebb59c045ab8b5d499037a64b7e381ac834b7a9cae1523918c06e5eaf20ed7b5fa58206384ec704005b
+EBUILD vidify-audiosync-0.3.0.ebuild 977 BLAKE2B 622cc31b16bcc27b181980d70e9694ac9a271d084abec33517edaac8eaec7c8f96b07f613153eaf63c1590942f524197e929075fdd548be5ccc4ed8b48b9f608 SHA512 ec654b8083482ff1efc94add934401a04e31aada858f204417b6caf3ca7dc7ca64a31a55f67e1f71fc6c9fcf84e55f4af614ae7987e37c2758c4d919fc93c2ba
 MISC metadata.xml 524 BLAKE2B 9e2f9b899db9118cbae27dc47dc63d81ce75bc45dcfcca8d8f3d2675b30fcbe8e31cba034f9add557feccf255fc65a99862c95a3ca0d67060015e55eb4aa8b5d SHA512 1b69126e7ca2c60c33cc4a2781f2eedfa7bcc71ce51e2ed5ebb17e0ccc77db017081ba14c37ea9e7b0c156399cbab52d04e626c22a89f5d8c10496738835d2c9
diff --git a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
index e0e3a255570a..d1c6330734f4 100644
--- a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
+++ b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/media-video/vidify/Manifest b/media-video/vidify/Manifest
index 8a533e77ab83..8b1ba7975e05 100644
--- a/media-video/vidify/Manifest
+++ b/media-video/vidify/Manifest
@@ -1,3 +1,3 @@
 DIST vidify-2.2.6.tar.gz 2906511 BLAKE2B 3df48ca57e102f664852e2fc2abeb3d19427673e1fec5144a8c0afda112a0f3b281b18db43b4326244266d6e9dfbcb2443319ddad3f864098a61bd1e3c966307 SHA512 15487ee9dcbe647b2b287bd2eb3c09962b557320313a9a3885fb3c0d6af945909531111d5297c1a5fb5b451af5df6fd968b3953bbf79af113980ed368a5674b5
-EBUILD vidify-2.2.6.ebuild 2337 BLAKE2B 75c915d511a7ab1d0987633932ddbfbc35c011c614c4b302943ee9dd5e36b25036f4a2881105433f17623e608d89fa9dad9c558484b4ab8554e7a3ef0c20d152 SHA512 f65f7d4fa6aac96ac88fb05704f89e470aee7da43d1e02c10bc90b6773123a5aa00b65a0e09d26500d463a30a9a594b121440e02bd7d3145ba9e2b4320857306
+EBUILD vidify-2.2.6.ebuild 2304 BLAKE2B 791c43c4bf1bdd168ceafcc26e3b7646f7a23b87ec5eb61447d81475fae292da5e31b720abd175a90379deed515b5195d36dcd08cb2cc0cef0959c2d656d1021 SHA512 d26e4992414d5dd366b60cc0a79a47e7d0ced8658bacd4e1f76dc122cc64a5fa9a04e459969183ce74d76da6c73dc92cd269a6c427bbb757bd0cd7bb96e4967a
 MISC metadata.xml 792 BLAKE2B b06fd7f4c01b146b8dc6f45f4451ae592f59a7c917be4a315f4500e8a374670262614e500b7498d731e08ffd471b9da5983b22e79e538f67de914f4d43a7300e SHA512 5192430ceb4221ba5a97bd87d1c149d28dbf3613f3fff337b6fabb2b4452302ddd941765e20a3fc2975d74c5207fab728d59bbb7a80fb758ea74a0b391bea04e
diff --git a/media-video/vidify/vidify-2.2.6.ebuild b/media-video/vidify/vidify-2.2.6.ebuild
index d80a08f97932..94b2caead30c 100644
--- a/media-video/vidify/vidify-2.2.6.ebuild
+++ b/media-video/vidify/vidify-2.2.6.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit xdg distutils-r1 optfeature virtualx
 
@@ -68,7 +66,7 @@ pkg_postinst() {
 	xdg_pkg_postinst
 
 	elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors"
-	elof "and recompile media-video/vlc or media-video/mpv with the missing codecs"
+	elog "and recompile media-video/vlc or media-video/mpv with the missing codecs"
 
 	optfeature "using an MPRIS(D-Bus) audio player (e.g spotify)" dev-python/pydbus
 	optfeature "using the Spotify Web API as audio player" dev-python/tekore
author	V3n3RiX <venerix@koprulu.sector>	2021-10-26 00:10:07 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-26 00:10:07 +0100
commit	95461df035e3867364495f065e5e805bf629b2d7 (patch)
tree	867dce371a84a696e91be255d89f282975aa0480 /media-video
parent	46eedbedafdb0040c37884982d4c775ce277fb7b (diff)