gentoo resync : 12.05.2022

25 files changed, 136 insertions, 198 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index b4f2d135a0b5..6dd2868cb9e9 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 0abba71d6aba..b17554198bb3 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,9 +1,9 @@
-AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2722d07a55e63e3a1ad36507bb15c970507450fcc29b51b8cfb77a1a15d8a68a9b1e5dca3279f5b2df85e731f8 SHA512 325c323ad4dcf03a4cf2528d6f5d6a0769c3e3d7bcf09c6fc11fb9cb61bef2cec1e8ad5073c07b6865ffdec4c32165cd80a7c856d13d538ff8320be1c83f9af7
+AUX 51-pulseaudio-probe.conf 419 BLAKE2B 160a48988dd26156f569fb9acbb6094dc3efbf027f1fc8a45af991ac2d2ab74efda410c4611a02a706f21876f651e429f8c0026c79573f5d802a8407bcdeb5f8 SHA512 84cfa49b0d4e216b8fbe8f033f54ff87d99d06d5102df3d9ae82f1c0ff1209fbd1481b7317a4a2ede589e49b8bd41c8a075eb96acf7de3cae6e102e286cb17c7
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
 DIST alsa-plugins-1.2.2.tar.bz2 406494 BLAKE2B 64148e3e6fcf651a2ac62b6b5f3cc915fe6718d35fea53da08f6f4b1a5ff06ba29e69b8cd2a95e3b9edf3880570b1d0b9267239f705043dab592c27fdd150ef3 SHA512 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb
 DIST alsa-plugins-1.2.5.tar.bz2 406134 BLAKE2B a1bb2f187c92a2999722e22775baf2c1fc4240162bb71f454c60359ef61b46934ff8ecd5af97589bafe2c7f737530cf5a4dcc139af7ed001d8dfe24bf3ae045c SHA512 32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf
 DIST alsa-plugins-1.2.6.tar.bz2 408596 BLAKE2B bead0b9514725560a4fb738c4b1e14b148bf888cc82e0d7611cb6c494ed97a7e366b57f233095372c26a7bd614655bd58a6505202910de421561b540c94d5cca SHA512 ac54a6f227f1ca5f6e01e08d869e7c06f4bcd68f148932e1902a6fcf3e5ccd3667ac4d8c1a00b77e4b5cb27e17c01cf7526ded4aaf35c4b26fc69e14e6e341f9
-EBUILD alsa-plugins-1.2.2.ebuild 3043 BLAKE2B 765efc4efd1a9066af87a18fda76c6b3699069bd369e65b255988b9a5bcbfd59a8e805bcfc17ac1e0c35422f25185009511822f19792e8893882286dc5d07801 SHA512 c71161cb35b059916c5493bf3830d3e072f9e0840fdd5df41b2e6c71f70b4cb7ce2df37550c7a612c7fb0eeaf84c86b1061f69b9791cbd8424427df42cf0dd92
-EBUILD alsa-plugins-1.2.5.ebuild 3050 BLAKE2B 5500ac442070171a1fdb75dd95578bcc264005c2667a82ea8de9956cdde60b1e90bf38890b3d92bf40530dcfa109f7ab439bbde701148dd44629fd4fd5d597a2 SHA512 35c9f1732e65c4059e246d4e150a11ba3afcf50592438c8cd221d548856039138363dea7fc2ae0db3506fa9e2ef3a78accc9b6d644cb86f973a93c1a45627a8d
-EBUILD alsa-plugins-1.2.6.ebuild 3050 BLAKE2B c2bd1c77fc3ce4ad343076c78fda99f23347a0cd307b483c0f3b2b5a81f1e41b68ff770d681cbb84917b31549191eda2430f8808d602516d91051ced03755645 SHA512 ae87a3872ba2d0ba3bf7d54fcabb96fabd15c4242da78360ccd4df2bbd065f42a446b1f0d9e1c0bd4054f71a8a5aae9c053d347c45e51bcd15a600fc8c3d661c
+EBUILD alsa-plugins-1.2.2.ebuild 2853 BLAKE2B 638cb04313ef1d6ef71d7e735d6d9f667e9c4e03b267c4925d608047304a4f134fb0b3fe2012d5aad1b66bb0645357ad2f90df8ae8cb1779ec471672a1366fdf SHA512 86186c7d5b094db3151f404af4d4ea54f1f1a98371179731d6c98ccc3395198ca2abf1b75077bdc99e7b927a1853e0dab58687591c392402c11778bc807437a5
+EBUILD alsa-plugins-1.2.5.ebuild 2860 BLAKE2B f3e82782524e9bfaedb1cb70d2e41c1a97b0206e92eee2e3a3015239666a88f41ac12af1626c5d4459e7c2ec04a04f898ae81c8e0052a2f620468faa9e7424c3 SHA512 ffdfe28aab5af51fa05dd7ceeff4ffab68d372a057cd4a3a07c897357aaea2b1ab76b7b807e2d0d3c7630d6a8068da6efca6efff9b323034595a586bd05f6c5e
+EBUILD alsa-plugins-1.2.6.ebuild 2988 BLAKE2B 540b83fa3b0349d6bb159b8e668979dc94b02996bfc6dacdc8f8fd9087f8f6d605ce669cb0e3c64153706339936476bc6938c77cf80b9b0982696826fd13a238 SHA512 aea0d840613baf67604d0d53fa5cbf419da8d25914fe15f3e7b74eda1a6d139fe37371cea81a421f17de612772d38b5a72dd9b61eea91b7fc5fbe72c10ed459e
 MISC metadata.xml 513 BLAKE2B e1725c32fd402ffd327c40965ea3f632237a6533bba78d4be59d729de1e46c24727aa7037aa185bac5da5c3066c03caf47d8047271ea93b4f62b15ac70cc6e81 SHA512 675a6013aec3ea092710b9bea4576495f23445ddb47eb8a230064093457dcccc75bef932036cf0174aad3909890243278bd89af53cf1c6c14ba8a1784070afef
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
index e5d2ab885c4d..b6e088bd7f06 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -78,11 +78,6 @@ multilib_src_install_all() {
 		doins "${FILESDIR}"/pulse-default.conf
 		insinto /usr/share/alsa/alsa.conf.d
 		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #410261, comment 5+
-		# seems to work fine without any path
-		sed \
-			-e "s:/usr/lib/alsa-lib/::" \
-			-i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
 		dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \
 			/etc/alsa/conf.d/51-pulseaudio-probe.conf #670960
 	fi
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild
index a11e006b4711..3b7332e08747 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -78,11 +78,6 @@ multilib_src_install_all() {
 		doins "${FILESDIR}"/pulse-default.conf
 		insinto /usr/share/alsa/alsa.conf.d
 		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #410261, comment 5+
-		# seems to work fine without any path
-		sed \
-			-e "s:/usr/lib/alsa-lib/::" \
-			-i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
 		dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \
 			/etc/alsa/conf.d/51-pulseaudio-probe.conf #670960
 	fi
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
index 5aada389cb21..0ed85e7dcab9 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 IUSE="arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream"
 
 RDEPEND="
@@ -61,6 +61,14 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
+multilib_src_install() {
+	# Needed to workaround parallel build failure
+	# bug #835920
+	dodir /usr/$(get_libdir)/alsa-lib
+
+	default
+}
+
 multilib_src_install_all() {
 	einstalldocs
 
@@ -78,11 +86,6 @@ multilib_src_install_all() {
 		doins "${FILESDIR}"/pulse-default.conf
 		insinto /usr/share/alsa/alsa.conf.d
 		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #410261, comment 5+
-		# seems to work fine without any path
-		sed \
-			-e "s:/usr/lib/alsa-lib/::" \
-			-i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
 		dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \
 			/etc/alsa/conf.d/51-pulseaudio-probe.conf #670960
 	fi
diff --git a/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf b/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf
index c2272c85b072..68f3f994025f 100644
--- a/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf
+++ b/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf
@@ -2,7 +2,7 @@
 # default output for applications using alsa when pulseaudio is running.
 
 hook_func.pulse_load_if_running {
-	lib "/usr/lib/alsa-lib/libasound_module_conf_pulse.so"
+	lib "libasound_module_conf_pulse.so"
 	func "conf_pulse_hook_load_if_running"
 }
 
diff --git a/media-plugins/gkrellmpc/Manifest b/media-plugins/gkrellmpc/Manifest
index e42f1fb09025..b6fe6c5c11c2 100644
--- a/media-plugins/gkrellmpc/Manifest
+++ b/media-plugins/gkrellmpc/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellmpc-0.1_beta10-mt.patch 4392 BLAKE2B 2a249c576091573c4f5c92f622b0d9ac1a8ffb1a38c0b4a6f8b1d475ea2db85c1358deaec8ac72570d09379167f63deb5a947711928ab86525a7eeb5980b7b9d SHA512 5928192cde4513470f9af952d6aa8a3b5044a6bdcc8aead26420a2cc7e9ed21dd3ac0043a5d481559c6eaad770de54c44b6d5395efb1baa2de80bc26d2536cdb
 AUX gkrellmpc-0.1_beta10-r1-make-test.patch 285 BLAKE2B 44ea0867743d219907fde694b05cc7567f86105546b0fbf47186a00467e5d07c294ea22a3c620b702efdbd479d5620f84c92e4c049947493967c6bd80ca27486 SHA512 ca89fa4f53b3c31ca0902be258980510d71355156606ae84fa187fefb1574c11f0f71cf20b41a56c4f86835a170b801df0e0918873d3d28c01a7d7bbf3579c09
 DIST gkrellmpc-0.1_beta10.tar.gz 25388 BLAKE2B 2e3c97e7d5887e1c3ea6a693cde19470e476943658de607266aac9a3ecbc2a5215fcc266638909d2ad024f303adb19475504ea4f7b79b3e97f566d90899721d3 SHA512 f5d687264f08146bf1eb54aee6d42a200fb97008a355d26a68be91b04e4bd622fc222725bf498c0837eacb8b94d6aede5aa1a05ed504fe5f9b790a9cd08d3973
-EBUILD gkrellmpc-0.1_beta10-r1.ebuild 864 BLAKE2B 84aaa3f316e955a9b9f61ce8b181a3cb1be779129bafcc92aef15be8041df3879b9377384c899ef88cf903228e168484b66b3e5461795462934cbcca971db398 SHA512 bbbd780a420280fb2273cdd45ee3cdaeef7f033f35a025d933d0be72f74b15e7183ac9d0a8f00ccc45236209c8d899ce614b175220b2ab63b52d54e6d7ba4105
-EBUILD gkrellmpc-0.1_beta10.ebuild 859 BLAKE2B 89421c770f6ced3a94022a4a3659b9a180644431c395145b4093e7b3177f40933c22bfb6bc6cee152a41c8841a9339507ffcda64f9976c3ab50c7941946c1471 SHA512 37bbf33f883dd373f490e947030c4dcf4d92fdbbf0d8d79cbe17795e085def544e05e3c8016e53eff7eb6e94276aebb59bb0b630a2eecb2afccc446b5a61bad4
+EBUILD gkrellmpc-0.1_beta10-r1.ebuild 862 BLAKE2B f9236ae29b78d2cc66a4864b10101522540526c841fe190a8fdb00ea7ae35e620c44bc61996e11c0f075d9ea4697f23b4092e3fcc16462b788fd633bf3ba050e SHA512 ea3b9ebfcbd211c806089e93579bc0183c5387891252294f31f1dc9137b629eedaa040c6b21fc6df841421a01d0d68a491874c8839058b527b116ae10cf80010
 MISC metadata.xml 347 BLAKE2B d62b664aa75bf7dd141b70486d142f2db34c1580eaaa872d73457dbbdcc7b7967abc9096eee7a14ef22f5e6eb01e2df04fa7f87afdaa6a23d0a0470e2795fb68 SHA512 07bc016c43af13a53dd6ff3024c9412625e8e88472dfb45349b6cbcfc2b5a7e5451f7ac4cfeb5d1d88a8ea778e9b3e2c73d03f854d002d78a99e00bf35559b2f
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
index 22adb571df55..cd9c53fc2644 100644
--- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
+++ b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mina.naguib.ca/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="threads"
 
 RDEPEND="
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
deleted file mode 100644
index a309150dbc98..000000000000
--- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A gkrellm plugin to control the MPD (Music Player Daemon)"
-HOMEPAGE="http://mpd.wikia.com/wiki/Client:GKrellMPC"
-SRC_URI="http://mina.naguib.ca/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="threads"
-
-RDEPEND="
-	app-admin/gkrellm:2[X]
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-
-# Will open gkrellm in X11 display
-RESTRICT="test"
-
-src_prepare() {
-	use threads && eapply "${FILESDIR}"/${P}-mt.patch
-	eapply_user
-
-	sed -i -e 's:gkrellm2 -p:gkrellm -p:' Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-}
-
-pkg_postinst() {
-	if use threads; then
-		elog "If you can't connect MPD, please unset USE threads."
-		elog "See, https://bugs.gentoo.org/276970 for information."
-	fi
-}
diff --git a/media-plugins/gst-plugins-libnice/Manifest b/media-plugins/gst-plugins-libnice/Manifest
index 4c5381ab7890..ff0cac1fe07f 100644
--- a/media-plugins/gst-plugins-libnice/Manifest
+++ b/media-plugins/gst-plugins-libnice/Manifest
@@ -1,6 +1,9 @@
 AUX gst-plugins-libnice-0.1.18-use-installed-libnice.patch 1778 BLAKE2B 24fe51b4f66c667dacf64b79bf5136fa7a041ec0249dee3f1a2a690acd2dba6eff19868c27f2d096a2aa70ac28989783006e015e07297654864020b8dae15138 SHA512 903b92865e060a67b301897a40c24b3861d57b7a66049c9d85427d99c1a0b726fb80b5f83363670c3f41c14004685be7cad662fcf95b7bb790a741e03ac2c30d
+AUX gst-plugins-libnice-0.1.19-use-installed-libnice.patch 1778 BLAKE2B 24fe51b4f66c667dacf64b79bf5136fa7a041ec0249dee3f1a2a690acd2dba6eff19868c27f2d096a2aa70ac28989783006e015e07297654864020b8dae15138 SHA512 903b92865e060a67b301897a40c24b3861d57b7a66049c9d85427d99c1a0b726fb80b5f83363670c3f41c14004685be7cad662fcf95b7bb790a741e03ac2c30d
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 DIST libnice-0.1.18.tar.gz 439791 BLAKE2B 6bb68bb1484b4a622a580bc9c66b8be260d2615b211cf7991cb50a9f692df525cd0c3c9fc54ef86534426f396f8d2201966cdacfd3f69ff27193971f95886540 SHA512 08bac05874708f7e7a669d28727d8951a10c464b22dd6fada1a4644850bcf5c4cc022cce46bb24c806086a7869b274c4c7d3d6ddaa9ed0ce0bc2c47f72933227
+DIST libnice-0.1.19.tar.gz 453407 BLAKE2B 7bffde82a3e55d9aeeaadd159d944346a5192871e7f574e278dc43e8171e5fde472cd28186777a0b6cddd8bde34e035794b1c6b8f152c7fb4fae5202025bfdac SHA512 1c63cc0b7655186fd6f83da4dd607183d6ccfab9b7ad7189c1bea2ba7413183f24076aba5d6c7231d2ab3fbd471827256729a8a0c0d1bda48803586e68b3778b
 EBUILD gst-plugins-libnice-0.1.15-r100.ebuild 1663 BLAKE2B 1d76f0223d291e6be4bb2b94e8c34539f78a3fae8eef212c76884e59abfbd970ba3f8127ca13ed6ef1e5895ae7911403ae11f3be16683b50a045da73a86b3e2c SHA512 28f23f8bb2f117e9f52c3d2e90d15e6300150676edb2db33942c74ca94eb35940f30e4a99df91440930e091f1d9f89b8db93d9894fa508c083e3dd3c30ccdc03
 EBUILD gst-plugins-libnice-0.1.18.ebuild 1236 BLAKE2B 0b838016fa8f83e5c136f85266729af551b1bab083292c88c3b26875ce6f2b8457bd6aedbb13f9da990cf84db08db673ecfea2cfbfa7b834f3dee38a433f1fa7 SHA512 66da3b6c3844e5515a355e30ea5db1e01792d9b974b322245225661cb3864243ed40f4107c62ab78e22f7cab31fb35a89c0f5225f16d20a49fe07e4b4f6fdd8c
+EBUILD gst-plugins-libnice-0.1.19.ebuild 1236 BLAKE2B 0b838016fa8f83e5c136f85266729af551b1bab083292c88c3b26875ce6f2b8457bd6aedbb13f9da990cf84db08db673ecfea2cfbfa7b834f3dee38a433f1fa7 SHA512 66da3b6c3844e5515a355e30ea5db1e01792d9b974b322245225661cb3864243ed40f4107c62ab78e22f7cab31fb35a89c0f5225f16d20a49fe07e4b4f6fdd8c
 MISC metadata.xml 373 BLAKE2B 440aa17e59153e87321e231c92b943329e7726c23255fe76ba8934b34e8a636adda880e90bc3ac285609cfccf6449dbff02dfe0ec6b2318ef039df4f1e780c8c SHA512 a92cce75c15b414f1821cfe274c78717f68c1b44254d9028934abc652ccacd8ff2261105aaf0b5c688e58c787d434b1358c0a5c239ad2ec7625d91de63dba0b1
diff --git a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.19-use-installed-libnice.patch b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.19-use-installed-libnice.patch
new file mode 100644
index 000000000000..1b0782e00d6e
--- /dev/null
+++ b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.19-use-installed-libnice.patch
@@ -0,0 +1,59 @@
+Carve out everything but gstreamer plugin part, libnice-0.1.18
+
+Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+
+diff -udBbr libnice-0.1.18-original/gst/meson.build libnice-0.1.18/gst/meson.build
+--- libnice-0.1.18-original/gst/meson.build	2020-10-21 04:03:07.271845300 +0300
++++ libnice-0.1.18/gst/meson.build	2022-03-20 23:38:28.826178730 +0300
+@@ -12,8 +12,7 @@
+   gst_nice_sources,
+   c_args : gst_nice_args,
+   include_directories: nice_incs,
+-  dependencies: [nice_deps, gst_dep],
+-  link_with: libnice,
++  dependencies: [libnice_dep, gst_dep],
+   install_dir: gst_plugins_install_dir,
+   install: true)
+ 
+diff -udBbr libnice-0.1.18-original/meson.build libnice-0.1.18/meson.build
+--- libnice-0.1.18-original/meson.build	2020-10-21 04:03:07.272845300 +0300
++++ libnice-0.1.18/meson.build	2022-03-20 23:38:05.116302874 +0300
+@@ -263,9 +263,7 @@
+ 
+ libm = cc.find_library('m', required: false)
+ 
+-nice_incs = include_directories('.', 'agent', 'random', 'socket', 'stun')
+-
+-nice_deps = gio_deps + [gthread_dep, crypto_dep, gupnp_igd_dep] + syslibs
++nice_incs = include_directories('.')
+ 
+ ignored_iface_prefix = get_option('ignored-network-interface-prefix')
+ if ignored_iface_prefix != []
+@@ -278,11 +276,7 @@
+ 
+ gir = find_program('g-ir-scanner', required : get_option('introspection'))
+ 
+-subdir('agent')
+-subdir('stun')
+-subdir('socket')
+-subdir('random')
+-subdir('nice')
++libnice_dep = dependency('nice', version: nice_version, required: true)
+ 
+ if gst_dep.found()
+   subdir('gst')
+@@ -298,14 +292,6 @@
+   endif
+ endif
+ 
+-if not get_option('tests').disabled()
+-  subdir('tests')
+-endif
+-
+-if not get_option('examples').disabled()
+-  subdir('examples')
+-endif
+-
+ add_test_setup('valgrind',
+ 	       exe_wrapper: ['valgrind',
+ 			     '--leak-check=full',
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild
new file mode 100644
index 000000000000..99b81c3f7797
--- /dev/null
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson-multilib
+
+DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
+HOMEPAGE="https://nice.freedesktop.org/wiki/"
+MY_P=libnice-${PV}
+SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="
+	~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
+	media-libs/gstreamer:${SLOT}[${MULTILIB_USEDEP}]
+	media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-libnice-${PV}-use-installed-libnice.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+multilib_src_configure() {
+	# gnutls vs openssl left intentionally automagic here - the chosen USE flag configuration of libnice will ensure
+	# one of them is present, configure will be happy, but gstreamer bits don't use it, so it doesn't matter.
+	# gupnp is not used in the gst plugin.
+	local emesonargs=(
+		-Dgstreamer=enabled
+		-Dcrypto-library=auto
+		-Dintrospection=disabled
+		-Dgupnp=disabled
+	)
+
+	meson_src_configure
+}
diff --git a/media-plugins/libvisual-projectm/Manifest b/media-plugins/libvisual-projectm/Manifest
index 539c3b20487b..6561da5050b3 100644
--- a/media-plugins/libvisual-projectm/Manifest
+++ b/media-plugins/libvisual-projectm/Manifest
@@ -1,4 +1,3 @@
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD libvisual-projectm-2.1.0-r1.ebuild 641 BLAKE2B 328b9d0f62aed16b891102bf24ef7cf31af3d41e3161faa0da2d955f9d8d51ae3032df397b5ecef0015e07335215c7125e661fce0a24e5ace183e5a609550c5e SHA512 76ca87d605df2666943573e614f21cb044033c04359a49610b749475f44b70e0088f99c0bb3cb05516adeef9146275f7cd2c9babe824ee5c95c278e32e825f2c
-EBUILD libvisual-projectm-2.1.0-r2.ebuild 627 BLAKE2B 7053c1362a33fb1d8f85b3d84525d05d691f1e23cee048cca282c914b65c41449e328a17193a307c6a9dcbc135170667ce78710ef5614291d642dabdf63049ce SHA512 dad6e12b0188d1fca96656ffb98d10b46b5db8a9421f6c5279ee937c18296fee6e8e27e516f2503589227698436b93447b86e8fd0c3056211196ae4a29443b20
+EBUILD libvisual-projectm-2.1.0-r2.ebuild 625 BLAKE2B b03c8bd3dc4fb44398a8c3763b49cc33264aa883785c3136a304f31e962fbdd93843c4dac77cb5b3e90285e61414e2d74f9aa59ac17ee7ab088959d556ef3810 SHA512 561dd91b8feb3dafd4bfae4c8e3dc6452c96cb9761e8a1b52057b62314464685877cf6be427a64e41f0ab9a3b6d9d3af6cc61a517c0a67ba2ca1f94ac9ba9666
 MISC metadata.xml 332 BLAKE2B 8034cb808895ae101c20a49aa41a95734f4ee149d38f2b5b8c7baa46a30c64f5d3f807201edeed336540a2f33bc334f7473591a300552ba08bd6b41baad7213a SHA512 73a1cfe48e1afe3bc8be7a7b3ccd037a45284c49f1275ad2e014c1eba86c48b55a6527f4ba6cb4ac9e6a7dda35efef1626f43681a96a040e351d4cc13af14961
diff --git a/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r1.ebuild b/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r1.ebuild
deleted file mode 100644
index 7d5ece8ffe22..000000000000
--- a/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_P=projectM-complete-${PV}-Source
-
-DESCRIPTION="A libvisual graphical music visualization plugin similar to milkdrop"
-HOMEPAGE="http://projectm.sourceforge.net"
-SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	>=media-libs/libprojectm-3.1.12:0=
-	media-libs/libsdl
-	=media-libs/libvisual-0.4*
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}/src/projectM-libvisual/
-
-DOCS=( AUTHORS ChangeLog )
diff --git a/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r2.ebuild b/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r2.ebuild
index 9d572eb95db2..60e19cb1b2cd 100644
--- a/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r2.ebuild
+++ b/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}/src/projectM-libvisual/
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=media-libs/libprojectm-3.1.12:0=
 	media-libs/libsdl
diff --git a/media-plugins/noise-repellent/Manifest b/media-plugins/noise-repellent/Manifest
index 1bc8c7448c03..ac1df5fff950 100644
--- a/media-plugins/noise-repellent/Manifest
+++ b/media-plugins/noise-repellent/Manifest
@@ -1,3 +1,3 @@
 DIST noise-repellent-0.1.5.tar.gz 29973 BLAKE2B b840df30a5b374be7df2797f970e115083aa97e1ba4219466a659d29ff5791f34c8d7f7352cfb615ea8d109b92a27b47b29ca1dd6b77031a6f7fd3f15e2ddf5f SHA512 85fcafdaead400efa3ba9e87f2ecf96c02a41334f933902d456a2d5e714e72ef4124e68534f87b60421ef7139bea4e5e768a89d5ed13e6fcf95a9923cc89e383
-EBUILD noise-repellent-0.1.5.ebuild 565 BLAKE2B fdb8edb6cfabf1a18264c48aeab19514c51d8f08a81fe70f6c59d9eb8f27b36925c54f3958ea4504758f2ab66c48f142a8a9d479b028fc76f8ef171b8b831ba0 SHA512 21170c236605d8fd2791406bfa74b96f824c74932d43ff2284d46c71fef3f3d341c08cf3c29d8d6614f1f3bb6fac87982c7a5e2bbb73643876d61765e2e53a52
+EBUILD noise-repellent-0.1.5.ebuild 564 BLAKE2B 7c04d726ef9deefe88b820e6cef3bbf4a9f1c1ded1d8a82988e31399155d31154353ca3c88dbb717660be19e47304abe4d77a5e0edecf444e5c7e5abb963bb9a SHA512 df47386137496be70ef79a0d7210902e72545604b757c1fafc8dc63abf01a2aafe08456831bf5d87f7371a057d145af63bed08e76b3ca5229ab24f437c06b56d
 MISC metadata.xml 427 BLAKE2B 470a689314c3e56c386e071190b03b0594871a6a564ab0d402ebc7197ff1764552182fdd39abe8176467a56ce4823cab61a7967f08f6e61a577bb2fc2418ba7d SHA512 abcaf62c9d53c334c2f7e8ae3c6566809e378385bc15abd7d5d0e47585bc66185d0580311a1ef1107414b8d3b7412be9e822648cb8d0a4d3e420f9eb195e929f
diff --git a/media-plugins/noise-repellent/noise-repellent-0.1.5.ebuild b/media-plugins/noise-repellent/noise-repellent-0.1.5.ebuild
index 528e355dc08e..5393104f9766 100644
--- a/media-plugins/noise-repellent/noise-repellent-0.1.5.ebuild
+++ b/media-plugins/noise-repellent/noise-repellent-0.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lucianodato/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="
 	media-libs/lv2
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index c9822e894141..9488ccca56ad 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,5 +1,3 @@
-DIST qmmp-plugin-pack-1.5.2.tar.bz2 230341 BLAKE2B 4959be4423f08cf1c0d16cf8f454167a7f7795786258526ce72ed694e8a33388cfe6308ff861f29011fcbb63563552965cea6c04a002b9ac40f1ab959d7fc232 SHA512 d2e7b1545e41ec40fa4b165f7154d76211fd4fb004c79f801caced0fb8972d182e9c393705ce2d9aa4359e00dbe51c9efdf499ae85f8d8578d68fcb4e108d7d5
 DIST qmmp-plugin-pack-1.5.3.tar.bz2 231118 BLAKE2B 6de426871f978a87be9fecf89e779cae3a60de02e5666f4193870fa1f79846831291d6115813e026b005ba29f437015403a4cd7e45cb67c6fc3441e6730aa0cf SHA512 992d511310dfaf0bf6e9a57cd7611ae11461197da8edea6765433028c911c3a28cec06883bfecf8ec9d07f3cfd264d644d63ebece15b0784ffd56e6e7853db2c
-EBUILD qmmp-plugin-pack-1.5.2.ebuild 683 BLAKE2B 55cc2fdc439fa5b59cb6585dcb3431f66b8f9a01278f4c9230b2f0cf2b2257e7917b83510a67c6c5486234d0d5081c9a00dbdd167d7a2163c7ebea521dfca9c9 SHA512 5c6724829bcb79ce0b67952867823b2ff940138d8a625ac5a89307623df289a5b915d1f532fcc59d03b41a5a1952f7f0b717b7f4a5c7f5eef95fa9012ad7e891
-EBUILD qmmp-plugin-pack-1.5.3.ebuild 685 BLAKE2B 7552fe14da7f848850ad0206a695485e5eba3ac1960e5349b517e8bdf10a8d0d0fd7990de385be874c5f8263748202d2deea549e9fb6fbb69181e91ae3926a1f SHA512 e017bbc243f4f924f7b588a10b513e1a8dfa2850fe9b2f827049c4cfcbab3a3eaffa2197fb69850fa6a42f94c963bab11264b2a521770fe720336c94df6c77c0
+EBUILD qmmp-plugin-pack-1.5.3.ebuild 683 BLAKE2B 45c8435fd664a404eb0f18db2b667e03a2b33c3ac15f1df18b1752be7d44763549f591365a064e4c71befd072e18c659083ee66d9bcaa09c70b3e29a19f6d4ae SHA512 95b3054128939917ccd227f5f139def7463aff52fa20727a66cdb577b72c437993c857c0f43b8a9858796086deabeb44c1b6aac0659764fa7cf364c74b78a38b
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.2.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.2.ebuild
deleted file mode 100644
index db3d82b3054f..000000000000
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A set of extra plugins for Qmmp"
-HOMEPAGE="http://qmmp.ylsoftware.com/"
-SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/libsamplerate
-	media-libs/taglib
-	=media-sound/qmmp-$(ver_cut 1-2)*
-	media-video/ffmpeg
-"
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	cmake_src_configure
-}
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.3.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.3.ebuild
index 1632b05b61da..dd48571ce913 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.3.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/vdr-mplayer/Manifest b/media-plugins/vdr-mplayer/Manifest
index 0e32e80221ca..7d5456102228 100644
--- a/media-plugins/vdr-mplayer/Manifest
+++ b/media-plugins/vdr-mplayer/Manifest
@@ -4,5 +4,5 @@ AUX mplayersources.conf 55 BLAKE2B 5c035fb8f8347f8544f23e88ebd8003e12071fdce4e1e
 AUX rc-addon-0.9.15.sh 529 BLAKE2B ba056ce8fd1b2f543b791f613e8d129e3ce6dafd47039ca6a4dbe746622bcabbf81a05f7bfab168768abbec70af35ee84d905d9010bc49b11d6b4e039375a3fd SHA512 0a8861634e0bd2f1778f62fb3c9a0ba2ec41561fd755d022cdce18ca65a6429fce97f5d87df1ee536a1bb5cac518ecb2f5e7c5fe63d591208f84c3f192d622e9
 AUX vdr-mplayer-0.10.2_tc-directly.patch 1762 BLAKE2B fef91edc1c7d0705521985616589eba685b04aa7d1fb4f0a080fbd919c0cf97824a59cbfef7eb89e40c4c88164c9d741cc5c567f5226c1f8af26a95955cf949d SHA512 923f8c0adb9e9f0e8cd1a00160afa11b46480133016d9f43dfbf6cbb96d7be284aaae72a9f5e88c6baac095374164d3404ecf01513e9e8bc899bfaddeb7ce679
 DIST vdr-mp3-0.10.2.tar.gz 131512 BLAKE2B 12f6e0ff495a9349a7bebb323a68216a203470cb9020ab62a72d09d2072797069418dd1e55fe6e827c9e8e4b65e521a33090293a69b37ef02c85047735e55127 SHA512 8f65d9f41643266137fcc950d0da66ef9c4ce5dff82828c88230cda9d8ef4f7e39d096557d69bf124a287496276508dc9464c0868b4cbef9059de1108cd35f40
-EBUILD vdr-mplayer-0.10.2-r2.ebuild 1574 BLAKE2B 81bbb457e26316a61dd6eeebfe5925d74e6cbed462fee90f3f53db1a915fad9dfea834025e01e8c4f3edcb0271e60fb5ca2c94b442fc200dd0177e696d0491e8 SHA512 17f023ac7e95461fc86b62ad021e1c2fb6e27f356c0c56a9c043fc5efe4f7ae42f259dccc25a3f523ecfab988b6f5a332f2369955f99d05d24c17e5009a08e99
+EBUILD vdr-mplayer-0.10.2-r2.ebuild 1533 BLAKE2B b08692f57053ed9151cdd2da36bba0fc68bf5da12ee3ca254b2b4a0a597361742f7e04f46adb084b888368f8e3496f58c2a7a5c9bfb4abf276332878ea5a9b1f SHA512 d481fe3abaab35a87f97b4ddf9bc877cf1a4a869fc37f2cd521abee69e5607b3326e3d0cec3f2ef02b869aa0de57109fd6a336de1dd4b6856392e7d253ab1210
 MISC metadata.xml 501 BLAKE2B 9dde2e883ac81adb929ab9c8d8252fb628690c025ce1cb4f83f945919d09d5d28faa06886d4ba0ac8a391cdac5c86ae3de5fb5c726a141579332ff5e060e0842 SHA512 a66d6a7b9dc67b3ded7678c2d71e6ec3faf97ed29614f38c3cf1c50d6a4ed6c171bd12f6f133ce29c4e9cc46c666ff56b65c8d33aa934925b7e564d6692f9fa3
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r2.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r2.ebuild
index b4c5d4ef33e6..d3d0a34dbf4b 100644
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r2.ebuild
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND=">=media-video/vdr-1.4.2"
 
 RDEPEND="${DEPEND}
-	|| ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 )
+	media-video/mplay-sh
 	sys-apps/util-linux"
 
 S=${WORKDIR}/mp3-${PV}
diff --git a/media-plugins/x42-plugins/Manifest b/media-plugins/x42-plugins/Manifest
index 168a0c0fc3cf..64513028685e 100644
--- a/media-plugins/x42-plugins/Manifest
+++ b/media-plugins/x42-plugins/Manifest
@@ -1,6 +1,4 @@
-DIST x42-plugins-20220107.tar.xz 3587704 BLAKE2B 124d33cc282ab638cf19c8b3ec32bf67faf712638ebc70d556bca7e1ef1ff8cbac8e5e94be2ad0e607bfff627902d5a93633103a5f0208063b39a2de41aa1d76 SHA512 aaae12f2f5b4ec52c3422ae94d49b045505d81cd7ae7ce347a16f6ed0651be5ecf7d6c994bd56da50b26b08a8670850df7de0cb6c6913150227f4d6f33420e98
 DIST x42-plugins-20220327.tar.xz 3582880 BLAKE2B b6de7f499e2889cbd4ddcc57a92468cce254b8ade277c173b62dd5a7a2fa84f72987325ea5889989c46a3cbb36050341ded2dbf83f7196eec8a2aa5929448a6e SHA512 a60d2eda1ed9a56338d1b08dc5352e26d0e4c8cba225c7759318c1d6c186664f64ac32b01e190094b4626626b329f81f688a0e4b6584f6c756daf805e6d419da
-EBUILD x42-plugins-20220107.ebuild 989 BLAKE2B 64c52e23d7fd76f44de6e6876709c383b39cdb76d2e1d6fe167c1a31d37956059f579a948ada905d542e4f83b107be99c7df105d95b48ece960ffe8a14aa74c3 SHA512 14bd1a6ff5cf67d033a95bcda843dee0b0939985b3c1a47907ae0b7396e3de90edb4af6662afcff81158dc0826ee496a8f66f6981689e19b02e75844a7517c3d
-EBUILD x42-plugins-20220327.ebuild 990 BLAKE2B 7b2a33cfbf7cd6f7851ea53cc02b2a9f3e28be408d3971b191ba754f8f715117e249ad9cb54a9fab7e5f13425322cc5b2519389aa71890ff8c646e6a96ee8723 SHA512 58440fc8423fc6a29f1a133e0e4d70e7a2ad67b14fb963b5055481db5a954e296f66cc34049f846d25a8ae65f432dc706ae6bede61f51cdac59696b146a1c36a
+EBUILD x42-plugins-20220327.ebuild 989 BLAKE2B 64c52e23d7fd76f44de6e6876709c383b39cdb76d2e1d6fe167c1a31d37956059f579a948ada905d542e4f83b107be99c7df105d95b48ece960ffe8a14aa74c3 SHA512 14bd1a6ff5cf67d033a95bcda843dee0b0939985b3c1a47907ae0b7396e3de90edb4af6662afcff81158dc0826ee496a8f66f6981689e19b02e75844a7517c3d
 EBUILD x42-plugins-99999999.ebuild 990 BLAKE2B 7b2a33cfbf7cd6f7851ea53cc02b2a9f3e28be408d3971b191ba754f8f715117e249ad9cb54a9fab7e5f13425322cc5b2519389aa71890ff8c646e6a96ee8723 SHA512 58440fc8423fc6a29f1a133e0e4d70e7a2ad67b14fb963b5055481db5a954e296f66cc34049f846d25a8ae65f432dc706ae6bede61f51cdac59696b146a1c36a
 MISC metadata.xml 340 BLAKE2B 18bfc086ea4e852a5b9c0e85c989fa02a89daaf114648d6f88569086d745823c92831548cb82089cf20092c0966bf7ec995c0918c0ce5a63701fb29078f2877c SHA512 3cbfc4312dc8f03c34aba0ae513fe8042b64cb570c0f408496d67bc7bb21688fa7939259bb67a7aaa1e1c1a3847a6f8d4bce5690d9aa025c27e15e74c24b8229
diff --git a/media-plugins/x42-plugins/x42-plugins-20220107.ebuild b/media-plugins/x42-plugins/x42-plugins-20220107.ebuild
deleted file mode 100644
index f57cf56abcb2..000000000000
--- a/media-plugins/x42-plugins/x42-plugins-20220107.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Collection of LV2 plugins"
-HOMEPAGE="https://github.com/x42/x42-plugins"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/x42/x42-plugins.git"
-else
-	SRC_URI="http://gareus.org/misc/x42-plugins/${P}.tar.xz"
-	KEYWORDS="amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT="mirror"
-
-RDEPEND="dev-libs/glib
-	media-fonts/dejavu
-	media-libs/ftgl
-	media-libs/glu
-	media-libs/liblo
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/libltc
-	media-libs/lv2
-	media-libs/zita-convolver
-	sci-libs/fftw:3.0
-	virtual/jack
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP="#" FONTFILE="/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" LV2DIR="/usr/$(get_libdir)/lv2" install
-}
diff --git a/media-plugins/x42-plugins/x42-plugins-20220327.ebuild b/media-plugins/x42-plugins/x42-plugins-20220327.ebuild
index 2ee199d0ef8f..f57cf56abcb2 100644
--- a/media-plugins/x42-plugins/x42-plugins-20220327.ebuild
+++ b/media-plugins/x42-plugins/x42-plugins-20220327.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/x42/x42-plugins.git"
 else
 	SRC_URI="http://gareus.org/misc/x42-plugins/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="GPL-2"