gentoo resync : 05.12.2021

19 files changed, 87 insertions, 273 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 5fc8d236171a..2efa8844c762 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 9ffb19f8f203..0d4822958888 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,7 +1,5 @@
-AUX audacious-plugins-3.10.1-cddb-use-gnudb.org.patch 1028 BLAKE2B 165ef008cb108ce1a90ca6decc85fd6cb7c37b5f7a118ec749476a7085d868385c161a8934b66591a6d2120f7485e2711f56d6ba3c6e374ae28c583308eea5d5 SHA512 a535cd6b04780a1f8b6f0262dec25f86690916ee12b45afbca2807f64474ea4c71b87d02fc960d93da9ad2d5562ea6f83004f8a7186d9644391fcfb7a7852dbe
-DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3 SHA512 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
 DIST audacious-plugins-4.0.5.tar.bz2 1759133 BLAKE2B b806ac110875f94f6e0f1db757d2ec0c7a0391f83efeb068f3e79c7e994fa33d0045095669b5e7ec771714419aaa98b0d0125a5dd18a00f4ee23fc899142858f SHA512 90ab2edbfc797fa835aae9937b5f478a0ca575f31c443d9e8ba7394e1615f605beb417372872874c94d4f804dba7bea9fbae2078e162178386683d8a3e36c108
-EBUILD audacious-plugins-3.10.1-r4.ebuild 3906 BLAKE2B b5ad29566b00f4f44f9623bd99485919603b767ce848e2ef87c328b1f15d0fc438c8a60b66aa4a9a1d88944a5105ab2ccee7b845d8d37db45d0eb93267a04c90 SHA512 24ba9dd7cf2286f2f1a072e37b6ca769502a4fe70cf44232008abc2749cbdd80c534d65c83805f9f241e5cc00a086da89aeb3c233a19e61324b460ec52f429c9
+DIST audacious-plugins-4.1.tar.bz2 1802825 BLAKE2B 253fddf82408708d8094836088bec1b9b7c932e75c959443579e4bbdc3a4b850757328d90b1ab7a6a0bdd85120d4b0a901f9fa22638f90938f19fd0fa35012ba SHA512 4adad3b4e9c264d52c6523fe84db56b9a87476a4ad5a86f85456a7e0276758d61675022e9e3da07e061dac45f604e54f83f9db85a37f0aaf0b75b3356a63932f
 EBUILD audacious-plugins-4.0.5.ebuild 4075 BLAKE2B 811e4373236b03297e42858b455edc1a988eef64fa8b810f566c26842bf457a93246ed3ada021b61640d4079263f8a21deeb3ff1b4b61549cf34582a980464d3 SHA512 88b73fd0db0cd40d173d05f55b57de860a6138595a435d042c210d92bb01126537ff1ab53bd01fe3d435008e1080aa4e119a626f72258dceb5e16b16eb3b7ecb
-EBUILD audacious-plugins-9999.ebuild 4135 BLAKE2B 47d3e518365c3bfe128a5a2aeb408fb65f826c5b45657145d4d52f8fc96dee1496b34b401fd980f4047064169481977788a4ebdef0303d149714d3ffb787f724 SHA512 6815e9ee457ee48470de9d0e8bf87a324def849989856fbd21cec7b016e6018f170b2698d25b7ec566239a860ead547e73c38c65a1cbd394bbf53dff2e7b0444
-MISC metadata.xml 1151 BLAKE2B c1a501964a32f0827f29da03ac657f0eef9209d28456c316586e143871683a0bafa212b3cb68216c3cb683a278ec1df28873bad7d722af548a1c587287f30fb4 SHA512 571421c81bc964254270cb1029988d7a309ada9935a2e1d25c249efb58ad696033b88cbd43318db48d774f7a5d039c5c1ce3204930fcc140b694a8d87adfe0e8
+EBUILD audacious-plugins-4.1.ebuild 3974 BLAKE2B afd357309c86249530594590ef704378b56b0b312c049c4df851cadb98c08d2a88e3918d5c4920ba5c97075bfe43677a8af5087b539de1dacc879c20da4db9fe SHA512 7ae497e09c2aad3dd52ef508c42bff919d4e6d98b49b96fa1e3797216cf678d90b0361118d4b755ecd6f752411ac35e8aea3b0bd8be4b76c27dbcf810ac94bad
+MISC metadata.xml 1347 BLAKE2B 2234e8c67fc7dd226d9f964878b5ee4d59d78cc63761ed2cad469732664f31148d320aed1de0402a504a646ec1db6ea5222673928374d5714b9626235b55f315 SHA512 e3d3eea22b25f86047aed716f7f865a905c619a96490146ba6e0453ba93616e8bf763e1644dddad8a5b7ed2a7509ecf2137f85723b01b2827034863578cf1c64
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r4.ebuild
deleted file mode 100644
index 5c6bbc225c8a..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r4.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac +alsa bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libnotify libsamplerate
-	lirc mms modplug mp3 nls opengl pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
-REQUIRED_USE="|| ( alsa jack pulseaudio sdl )"
-
-# The following plugins REQUIRE a GUI build of audacious, because non-GUI
-# builds do NOT install the libaudgui library & headers.
-# Plugins without a configure option:
-#   alarm
-#   albumart
-#   delete-files
-#   ladspa
-#   playlist-manager
-#   search-tool
-#   skins
-#   vtx
-# Plugins with a configure option:
-#   glspectrum
-#   gtkui
-#   hotkey
-#   notify
-#   statusicon
-BDEPEND="
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	app-arch/unzip
-	dev-libs/dbus-glib
-	dev-libs/glib
-	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[-qt5(-)]
-	x11-libs/gtk+:2
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	aac? ( >=media-libs/faad2-2.7 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia:=
-		>=media-libs/libcddb-1.2.1
-	)
-	cue? ( media-libs/libcue:= )
-	ffmpeg? ( >=media-video/ffmpeg-0.7.3 )
-	flac? (
-		>=media-libs/flac-1.2.1-r1
-		>=media-libs/libvorbis-1.0
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	http? ( >=net-libs/neon-0.26.4 )
-	jack? (
-		>=media-libs/bio2jack-0.4
-		virtual/jack
-	)
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate:= )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl2[sound] )
-	sid? ( >=media-libs/libsidplayfp-1.0.0 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	soxr? ( media-libs/soxr )
-	speedpitch? ( media-libs/libsamplerate:= )
-	vorbis? (
-		>=media-libs/libogg-1.1.3
-		>=media-libs/libvorbis-1.2.0
-	)
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-cddb-use-gnudb.org.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
-	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-
-	local myeconfargs=(
-		--enable-mpris2
-		--enable-songchange
-		--enable-aosd
-		--enable-gtk
-		--enable-hotkey
-		--disable-adplug # not packaged
-		--disable-ampache # needs Qt5
-		--disable-coreaudio
-		--disable-oss4
-		--disable-qt
-		--disable-qtaudio
-		--disable-sndio
-		$(use_enable aac)
-		$(use_enable alsa)
-		$(use_enable bs2b)
-		$(use_enable cdda cdaudio)
-		$(use_enable cue)
-		$(use_enable flac)
-		$(use_enable flac filewriter)
-		$(use_enable fluidsynth amidiplug)
-		$(use_enable gme console)
-		$(use_enable http neon)
-		$(use_enable jack)
-		$(use_enable lame filewriter_mp3)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate resample)
-		$(use_enable lirc)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable mp3 mpg123)
-		$(use_enable nls)
-		$(use_enable pulseaudio pulse)
-		$(use_enable scrobbler scrobbler2)
-		$(use_enable sdl sdlout)
-		$(use_enable sid)
-		$(use_enable sndfile)
-		$(use_enable soxr)
-		$(use_enable speedpitch)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg ffmpeg)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild
index b5081063135c..54a949a3a1f4 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P="${P/_/-}"
 
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~riscv ~x86"
-fi
 DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 
+KEYWORDS="~amd64 ~riscv ~x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
-	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio
-	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack X"
+IUSE="
+	aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+	openmpt lame libnotify libsamplerate lirc mms modplug mp3 nls opengl
+	pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis
+	wavpack
+"
+
 REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
@@ -46,14 +45,15 @@ BDEPEND="
 "
 DEPEND="
 	app-arch/unzip
-	dev-libs/dbus-glib
-	dev-libs/glib
+	dev-libs/glib:2
 	dev-libs/libxml2:2
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtwidgets:5
 	~media-sound/audacious-${PV}
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	ampache? ( =media-libs/ampache_browser-1* )
@@ -77,6 +77,7 @@ DEPEND="
 	)
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
+	openmpt? ( media-libs/libopenmpt )
 	libsamplerate? ( media-libs/libsamplerate:= )
 	lirc? ( app-misc/lirc )
 	mms? ( >=media-libs/libmms-0.3 )
@@ -96,7 +97,6 @@ DEPEND="
 		>=media-libs/libvorbis-1.2.0
 	)
 	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-	X? ( dev-qt/qtx11extras:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -109,9 +109,8 @@ pkg_setup() {
 src_prepare() {
 	default
 	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "Failed to sed" # bug #512698
 	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
@@ -122,7 +121,6 @@ src_configure() {
 		--enable-songchange
 		--disable-adplug # not packaged
 		--disable-gtk
-		--disable-openmpt # not packaged
 		--disable-oss4
 		--disable-coreaudio
 		--disable-sndio
@@ -140,6 +138,7 @@ src_configure() {
 		$(use_enable jack)
 		$(use_enable lame filewriter_mp3)
 		$(use_enable libnotify notify)
+		$(use_enable openmpt openmpt)
 		$(use_enable libsamplerate resample)
 		$(use_enable lirc)
 		$(use_enable mms)
@@ -157,9 +156,7 @@ src_configure() {
 		$(use_enable streamtuner)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
-		$(use_enable X qthotkey)
 		$(use_with ffmpeg ffmpeg ffmpeg)
 	)
-
 	econf "${myeconfargs[@]}"
 }
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.10.1-cddb-use-gnudb.org.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.10.1-cddb-use-gnudb.org.patch
deleted file mode 100644
index 3c1ab7372f5e..000000000000
--- a/media-plugins/audacious-plugins/files/audacious-plugins-3.10.1-cddb-use-gnudb.org.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 33edaf1a021bc466aea7c6b0bfdd624b951a15ab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Ketelaars?= <bjorn.ketelaars@hydroxide.nl>
-Date: Tue, 30 Jun 2020 07:10:28 +0200
-Subject: [PATCH] Move from freedb.org to gnudb.gnudb.org
-
-The freedb.org database of compact track listings has shut down. Any
-program functionality that tries to fetch from or submit data to
-freedb.org is broken now.
-
-An alternative service is available at gnudb.gnudb.org, see
-https://www.gnudb.org/
-
-Fixes https://redmine.audacious-media-player.org/issues/994
----
- src/cdaudio/cdaudio-ng.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cdaudio/cdaudio-ng.cc b/src/cdaudio/cdaudio-ng.cc
-index 6fd02de14..1b9c7bf1e 100644
---- a/src/cdaudio/cdaudio-ng.cc
-+++ b/src/cdaudio/cdaudio-ng.cc
-@@ -126,7 +126,7 @@ const char * const CDAudio::defaults[] = {
-  "use_cdtext", "TRUE",
-  "use_cddb", "TRUE",
-  "cddbhttp", "FALSE",
-- "cddbserver", "freedb.org",
-+ "cddbserver", "gnudb.gnudb.org",
-  "cddbport", "8880",
-  nullptr};
- 
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index bbcd7fe3d655..48c147d9acdd 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>asturm@gentoo.org</email>
-		<name>Andreas Sturmlechner</name>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
@@ -15,6 +19,7 @@
 		<flag name="cue">Support CUE sheets using the libcue library</flag>
 		<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
 		<flag name="gme">Support various gaming console music formats</flag>
+		<flag name="openmpt">Add support for OpenMTP</flag>
 		<flag name="http">Support HTTP streams through neon</flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
diff --git a/media-plugins/frei0r-plugins/Manifest b/media-plugins/frei0r-plugins/Manifest
index 65db3b94d1c7..1c265b495620 100644
--- a/media-plugins/frei0r-plugins/Manifest
+++ b/media-plugins/frei0r-plugins/Manifest
@@ -1,4 +1,4 @@
 AUX ocv4.patch 13850 BLAKE2B e385d97dea1e457642be0ee2bcce780b3fc62c06966ed2f88a9c081ea4d74a200a36d835b3a09809bf25d81a72126502fe3a99580fd6f420e22ec2dd23ca6b31 SHA512 b3c3817de2ff0d4738319ca47780d5e140d9e4d07e124b76ffc23133231ab9c7062fa786bc1f4b71d81c032044daae0e8845f4703720a6d4ec6c2f76bf68e8e6
 DIST frei0r-plugins-1.7.0.tar.gz 1214323 BLAKE2B 1b571361ced6dfc29c5b487ee78664995aab615b89ac9a0839254c5fc17ddc7147cf9eb7c2d6df33f518fa96b9761a185dba420037e6c9cdf7d0e70416aab76c SHA512 8c80e8e0ce8c302e633ea1f6ff4e2a141fd7a8bcb7fce25dc7f1f6521be11258a3efa1074c224c7323e6a17bc405413385be193a5c787e2f276252b50477ebce
-EBUILD frei0r-plugins-1.7.0.ebuild 1377 BLAKE2B 80d6e0a93a72c889593bce4acb4910293b6a9cd8bfe0f76f033608ddaebca2bdc9019e0a7cdc565e8f7a21237fd14e48691fd561fb389db28f2efea3ed33a16f SHA512 49c838a169207fdfbbb18c37e462882253a002710f81ab418e00417c393a4d010b8ea9980ac113ab40e58ca95709113f02c78511a6db2b4ea66c729e96751e80
+EBUILD frei0r-plugins-1.7.0-r1.ebuild 1399 BLAKE2B d5e01b3d00670e6a420f15f45778b5029a230cbfe1ce6efb6281e885acebffbcbb266268f955479ecc5f405c872832d1f6e0a63e7584530227fb9aabce5d0aea SHA512 809f076d169a71e1a21696c9fa8e2184a053f26c378d328397f728dd1966e361607fa604706da49ba643146ca19a6856806b2f51dd893714fcc0b836a4b5f82b
 MISC metadata.xml 639 BLAKE2B 6a7ec1b4bff3e8914a2a3e7a3c64e4888706e9cfbf45f9e67b498817e6bed385ad0659793e881d6f647acf4ba41bdba64f54a6da276ac75254383d75a85300cf SHA512 83a9293bfbc788fe3290efd9264b7bc3819dde7cb48eedad1c3ba709a1fe55fc4c4768fe00d2a31da009109a60e99c32faad43d573e71149042cbaeda24b2d98
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.7.0.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.7.0-r1.ebuild
index 20ad04e26c97..6a183eec5984 100644
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.7.0.ebuild
+++ b/media-plugins/frei0r-plugins/frei0r-plugins-1.7.0-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv x86"
 IUSE="doc +facedetect +scale0tilt"
 
 RDEPEND="x11-libs/cairo[${MULTILIB_USEDEP}]
-	facedetect? ( >=media-libs/opencv-2.3.0:=[${MULTILIB_USEDEP}] )
+	facedetect? ( >=media-libs/opencv-2.3.0:=[contribdnn,features2d,${MULTILIB_USEDEP}] )
 	scale0tilt? ( >=media-libs/gavl-1.2.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index 6e0445089241..1e4dcaefd082 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
 DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898 SHA512 764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
 EBUILD gst-plugins-gtk-1.16.3.ebuild 1179 BLAKE2B 7aaf5ff28b98509fec7816fc782741b861b6b4775bcebc6b09fe5052d09ac583a356ab394acb73959e16d70e0a6d4c9eedaac525506050686899c49dd620241e SHA512 26e6f770306c868b27b0d71a4de11b22755d22422109ea33ee8827987f155847b49016b3f455747cc216341f9b04d5381c2aee9e0a58333a68b3b94dcbbfad2c
-EBUILD gst-plugins-gtk-1.18.4.ebuild 1187 BLAKE2B a365e3c7d911ac0d0597fd212d1c84cdf64c73ea7eaa1ee2ab8d2b8a6249d7b583eba79d555b9cbfaece15a72e611f59d1404e173dcdd81abedf15851d6db179 SHA512 41e7fef0df32d10aa39960a9888d26f7a93f2d5efec5836b25f3e6c07302dfddae80a1eae1be53775a9cfeb3adfcd7d0f75d2d26e15e305aad3653ad09d78054
+EBUILD gst-plugins-gtk-1.18.4.ebuild 1194 BLAKE2B f6d9ed545840fa1d7468c8c3fa4785c43251495e9c29ab17cf359c47e303efd60a378cca98bded929633e225ce66e8ec1c08f0cdf4943b1729d6489a5d6dab1f SHA512 450d4186dada48e10e5ea35c5b3fce3983b25062f66f6d49b5d00f92c4bd4da2d2593f240bb398375046242cb6489641e4f07671107f4b7957e451831b0f506f
 MISC metadata.xml 791 BLAKE2B 5926a04f19bd8076a5c37efa479a13d2399c230295ff231cf6b16c2ba26da2d5082045ace8e27022618c9f2cf31bef986d664b3d9a795e029492f95ff000eb54 SHA512 b4caabc1551bb36f4c4e8edf70a88716ceeff90309b0268d7db59aa0fe8f4aa02ec3eb26d4cefcd0fdaaf8951c77c2cea57396d7ba0d30955de4db70e2200589
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.18.4.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.18.4.ebuild
index 235c855c9e8e..d02ace36a82d 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.18.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-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"
 IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-base is built with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 692afe5e0357..94b7bcdbf897 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -2,5 +2,5 @@ AUX gst-plugins-bad-1.18.4-use-system-libs-opencv.patch 2030 BLAKE2B 16b83f0a348
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-opencv-1.16.3.ebuild 719 BLAKE2B a4e976bec3993a280be39f01ebbc3f638c30ea480c5b2f8b2a30db8a5737524ebbafd7c52d6978210d89b4c4623c844a239f2148e82d900d87894f106b6adb21 SHA512 e8177d5e96db887ece39786677a92733096ee0c17c0452e621331a5c01187275b1a4a77896f81e24befe7f4ed6bf2d8db55dedaa5a0cabd167616a6a6b4cd7a1
-EBUILD gst-plugins-opencv-1.18.4-r1.ebuild 645 BLAKE2B 4e24ee84062d3c7595860ae766a9b52b8c726c1c3d93a514b971cf3ff3b8359b9a6bd595cbeb3372ff29fd82d70e1b338978de70db08f2f78c11d8d7345db081 SHA512 0c99cd471d2052331121b543e4a2fc022ae6dc0dbf60545dd146f532b8dccb35ac72dba35ceaa57de7fdc8dc58075bfd2f5993baaba49d7bf68cd4db446bd9fd
+EBUILD gst-plugins-opencv-1.18.4-r2.ebuild 656 BLAKE2B 34e9279139f834c186859d6a5a32861d5afc4807bed5c6c6e008d0970134880c398923bf5b0cfb5842147004e57e36256fc7f34e27fa5f93ccd81c55a671d1b8 SHA512 652a2239cd1032c0208c084694e56767c2c5dbd65b1744c7fa38e2a04fdf3877b41e581b45fdd1d580f3f673bd773b039e7dd1bc07984f3bb3d17e4aaf0408d2
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r1.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild
index 3b2c04d59fab..f1e18c62e1e4 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r1.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r2.ebuild
@@ -12,7 +12,7 @@ IUSE=""
 
 # >=opencv-4.1.2-r3 to help testing removal of older being fine
 RDEPEND="
-	>=media-libs/opencv-4.1.2-r3:=[contrib,${MULTILIB_USEDEP}]
+	>=media-libs/opencv-4.1.2-r3:=[contrib,contribdnn,${MULTILIB_USEDEP}]
 	<media-libs/opencv-4.6.0
 "
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 27a55419fd89..9b3dd6b893b3 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,5 +1,5 @@
 DIST gstreamer-vaapi-1.16.3.tar.xz 1103784 BLAKE2B 89b4f42a9d04f4a03f171f2d3db81a2122ae64147039053dc508bc70f346c976c42ee60455785c3d35762561fa421af13b8e04dae6bca6d64eacad4ed218a281 SHA512 043a53e9e8c5d66cf955c8bc60236846a4a51793bf467d835c0992f490f4e03f0a7c3430c95641a9c659b0f59ae2f99c48bc54985729b5703fa1ecbc062175a0
 DIST gstreamer-vaapi-1.18.4.tar.xz 783132 BLAKE2B 4ab7910dfc7dddc47dd538ed71a09f54ac217906ecfa3c93c10bfc63d5bab1825ada4c2e6076df35e1a8a4c6f20767fa8e43ea4197363a643d010a93026495a0 SHA512 355f0528929d459c8d0f009e7c8b75718ae175b648abfa1a65ed4a8b90e78a18d202b6a2fde2c5cc027a3321afc5adb90295c4f2635d68ebcedc045ac5f5664f
 EBUILD gst-plugins-vaapi-1.16.3-r1.ebuild 4340 BLAKE2B 39c8c41c412c549a120f0ed0ec5061111c40f8e85cf4f40d11ee22013f00c7a7f88a0fc3fb8775bdf13e0f470c807c93d0f38222cb4b7775fe3175a942df3a89 SHA512 3063a5dce13aac63b667bdcdb2c41827f474a900e6acadf68bbb2947e10013b683529460bb470116c1f50a21d6fe18631ae36117e60ea7524443e68ab1840b47
-EBUILD gst-plugins-vaapi-1.18.4-r1.ebuild 4144 BLAKE2B c3fe27f08a8aac591963c608cab0be86af77a3c4b8f18080a4276609f690b5e2bbed2aa5ad4b4e9bd695c3a29a202173db63bb15345bc8302dc2b1b514d489e4 SHA512 69b07e5354c0c5be0e8dc44c8f0874d8b3ec80044f321520172bc306bf32ebd1396fd9779be0b7a7de2b67701e2ae6152763c6ad8d65b607515b4c71e76dae2c
+EBUILD gst-plugins-vaapi-1.18.4-r2.ebuild 4222 BLAKE2B fe42b1a45755266592bdff94f115eb7ce4c092b663e6b872368295211749b760400c5114b4661271b342b6d67603564e6d080b35c1b52acbec158cb7d8af14f6 SHA512 0ef82d7b5be5f17371bdb9f77f72256d048d9ff1983223e30d6aa97c61b83aba29dbac3cd3dc4011cccbdd55d6931b80e1401ad8e18ee4bd811e6f33289df74b
 MISC metadata.xml 434 BLAKE2B bbc974951dbeb5b15d6c1aef4d79f0df6a9fb66ddcb370170deba060ea0c39be3d58dee5605de2c1cae8758621c548a4aff9fd26e59e6abe6aaedf7c33349cfb SHA512 64878569d6579302a606f6f9ef13cba96dcd950116653be2d1e7cdba51ae02d50b73ffb3f222ef9a009b720a425061cf3768eca8141b98dfb9513ee11cc9135b
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r1.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r2.ebuild
index d4d0052819e4..f56f160b793d 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r1.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r2.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit gstreamer-meson
+inherit gstreamer-meson python-any-r1
 
 MY_PN="gstreamer-vaapi"
 DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
@@ -66,6 +67,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
 "
+BDEPEND="${PYTHON_DEPS}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
@@ -75,7 +77,7 @@ RESTRICT="test"
 multilib_src_configure() {
 	local emesonargs=(
 		-Dwith_encoders=yes
-		-Ddrm=$(usex drm yes no)
+		-Dwith_drm=$(usex drm yes no)
 		-Dwith_x11=$(usex X yes no)
 		-Dwith_wayland=$(usex wayland yes no)
 	)
diff --git a/media-plugins/kodi-visualization-projectm/Manifest b/media-plugins/kodi-visualization-projectm/Manifest
index 1503b4b72dea..5fc72c143995 100644
--- a/media-plugins/kodi-visualization-projectm/Manifest
+++ b/media-plugins/kodi-visualization-projectm/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-visualization-projectm-19.0.0.tar.gz 2512848 BLAKE2B 34b5aaa3a3229565a887e9d030c43939837e9480d8e4d2cc718c06561f098054d41e293eaba15378e95d835cbec020171add0cd1d0a6ebb75c18625afa4a85c8 SHA512 d219f16784f4077c8823f680c0c6f6fe4109eaf3f6105fd0e6ca55d9a6f12942c03bce0f244edcf4778d3359850fd1f9939ebf76d9819791a45f8afd56d31ef7
+DIST kodi-visualization-projectm-19.0.1.tar.gz 2512570 BLAKE2B a402b4b0a0e1cd8489f9bfb600ac4d69741044af104c8e649061eb5f00d53891966fb44820b439b29d17725404e940da7a548baa2b610fd52bb217a90fb028d2 SHA512 be7a898e2646e0042efb93334ec61a668ffecaa64c51ce041f4a044461dd46b6964eea5a8ef9de5e97c6fa8bb841be4d6e153ca985e727eae1f399b15b5fa973
 DIST kodi-visualization-projectm-3.3.0.tar.gz 2497200 BLAKE2B 894e77cabd96f8862f1873c5b506d358d4808443a92947586ae6e4907cbfe931d2ab0af19a0d6d5a35e7d93a67c184eb886b217887b45895b552d14684bff60a SHA512 fbce9121a403279a9f54eced08f2069ab6e1f732ef5c6b82380323e2357b70ffa88157428afd4884b6d119aa5a02848718e48602ce9d5f1454c8fa5ed0f78e7b
 EBUILD kodi-visualization-projectm-19.0.0.ebuild 907 BLAKE2B 797d2d018f43fa668cedc41180b549fe5657a6251b46fc20714d5e5ea9504b3122c2f8df9476442e4a25b8c6c4624a036809507915e1bd3f7833a30315aec718 SHA512 cedd92cac001364d4f4c18214a959b3feac46fe938c56e39ce33aa6380f78a6f204dab6be6b6e20632161aa4b36ed931715614070af30a2961d743f899bf0f5b
+EBUILD kodi-visualization-projectm-19.0.1.ebuild 906 BLAKE2B 29abeba5df375bef5dd3944b037f903b5f75be7d1a107fb94a8f8a466cb89cddf9751594f03aa0379c981267f7bb002eb49cb01d2aa630af3f187c0d1f7d5bb4 SHA512 62a820dd3662182a48a6a2fad8d952297ec4c4da1b86950c7024457a1be3060295ce753ac277b010d12103fb8bc82d730b49edd07b8c5535c14c39a0b24a8bec
 EBUILD kodi-visualization-projectm-3.3.0.ebuild 906 BLAKE2B e23dcd339afecc961dc0734361163b4df642f249850ac509bc6c14245984a98ae85055adbadb7ef1f286dbb821ad10aa570fcd3709833299018caec70a1aa81a SHA512 2a68b6330079d2519ca484523589c84e25f1c4d149891cc28095cbc0f753dd7a52f42015141959f63ec36217730bf0b93d11c2e43c34b35cb4755d3666c7b6d5
 EBUILD kodi-visualization-projectm-9999.ebuild 907 BLAKE2B 797d2d018f43fa668cedc41180b549fe5657a6251b46fc20714d5e5ea9504b3122c2f8df9476442e4a25b8c6c4624a036809507915e1bd3f7833a30315aec718 SHA512 cedd92cac001364d4f4c18214a959b3feac46fe938c56e39ce33aa6380f78a6f204dab6be6b6e20632161aa4b36ed931715614070af30a2961d743f899bf0f5b
 MISC metadata.xml 371 BLAKE2B a325e7aefc03877668c082aded651df58cff959168ca4184db4e50c1d21688c10d1e1a3548f432de0d23ac248945524a85b9f2e8e0d5bc32b50c641d5e179d0f SHA512 0cf1a8c39c77aea359d0680c537280835a8d64c2a177d697d395d0d7a0c533b8a9e6e48ca8554f6b012e3a75a7a57315e1a3ba6d27029d6fd23dd27386fc5dcc
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-19.0.1.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-19.0.1.ebuild
new file mode 100644
index 000000000000..35289a53857e
--- /dev/null
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-19.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="ProjectM visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.projectm"
+KODI_PLUGIN_NAME="visualization.projectm"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/opengl
+	>=media-libs/libprojectm-3.1.2:=
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/x42-plugins/Manifest b/media-plugins/x42-plugins/Manifest
index be676ce82434..11387ff8d136 100644
--- a/media-plugins/x42-plugins/Manifest
+++ b/media-plugins/x42-plugins/Manifest
@@ -1,6 +1,4 @@
-DIST x42-plugins-20210714.tar.xz 3443752 BLAKE2B 8e871ba52a83139ace41ae68c09a99bcfc4402c76614f8b9afbd47177e9bb8f0f146e21edb00efaf8648dc4105ac9c5acb1336f7e64764424b162b8f48af11a8 SHA512 9ee50cd389b573044e36d903c6468dc3470ca2d6a0aeee9cc9c52c6caeb3f7a4e7855d5e7defcfb6908111a31bb91ed1f4fc90270b09aefa158c864d8e23f2ea
 DIST x42-plugins-20211016.tar.xz 3585184 BLAKE2B 0d053c0da317f65a61d95c787bc8ad85c1ab70ad4e392a217f0dca754cf627831826958b21424d667ee2d396650b3bf5f9fadda88e54558b0f804cdd6143abeb SHA512 44805f4ffc692bcb6263c7f2eea82925bdab1ad26a76cd2eda6991c8e3f1e2c173eb254185c1897f25910ee31bf74c4357715ab2605d157f0e4d3aba26a67b54
-EBUILD x42-plugins-20210714.ebuild 947 BLAKE2B 5ad534fa0954e9bbe4dcf494c9b75e73b769c1b89d67a74089ca9074fdcfc5533310fda5ed6c8a3d74dfbc6fbf4c97b18d0bbe7ba86bedd720e02147bfdba9ee SHA512 66b5f2a43c3de5105eaa42c6f54295950ddd99c0f811d1c9d50d9931fbad8d34e8fbf42238348a6a7ba858b507ae58d7bc3ed79d0256c38c76c1a967ff179415
-EBUILD x42-plugins-20211016.ebuild 948 BLAKE2B 7424af2904f562a89b95424c5a4e7f3b33fee9e446ca06f0f8adc7a41e67827d16f95ef351f4a89cae672937e6e40db63ffc3b88c5020b75e322fb9a6904d227 SHA512 fb140d12cd2485546360ece3d2002fc97c3aa640edfaf500ecf57dd2be8b2110b1ea7149d2e3f0a576d47fdebad25a3bbe7f9c1abf6eef853b47fd15218fa0a4
+EBUILD x42-plugins-20211016.ebuild 947 BLAKE2B 5ad534fa0954e9bbe4dcf494c9b75e73b769c1b89d67a74089ca9074fdcfc5533310fda5ed6c8a3d74dfbc6fbf4c97b18d0bbe7ba86bedd720e02147bfdba9ee SHA512 66b5f2a43c3de5105eaa42c6f54295950ddd99c0f811d1c9d50d9931fbad8d34e8fbf42238348a6a7ba858b507ae58d7bc3ed79d0256c38c76c1a967ff179415
 EBUILD x42-plugins-99999999.ebuild 948 BLAKE2B 7424af2904f562a89b95424c5a4e7f3b33fee9e446ca06f0f8adc7a41e67827d16f95ef351f4a89cae672937e6e40db63ffc3b88c5020b75e322fb9a6904d227 SHA512 fb140d12cd2485546360ece3d2002fc97c3aa640edfaf500ecf57dd2be8b2110b1ea7149d2e3f0a576d47fdebad25a3bbe7f9c1abf6eef853b47fd15218fa0a4
 MISC metadata.xml 340 BLAKE2B 18bfc086ea4e852a5b9c0e85c989fa02a89daaf114648d6f88569086d745823c92831548cb82089cf20092c0966bf7ec995c0918c0ce5a63701fb29078f2877c SHA512 3cbfc4312dc8f03c34aba0ae513fe8042b64cb570c0f408496d67bc7bb21688fa7939259bb67a7aaa1e1c1a3847a6f8d4bce5690d9aa025c27e15e74c24b8229
diff --git a/media-plugins/x42-plugins/x42-plugins-20210714.ebuild b/media-plugins/x42-plugins/x42-plugins-20210714.ebuild
deleted file mode 100644
index 1902a6a9dea8..000000000000
--- a/media-plugins/x42-plugins/x42-plugins-20210714.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 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-20211016.ebuild b/media-plugins/x42-plugins/x42-plugins-20211016.ebuild
index 62be7c10ec26..1902a6a9dea8 100644
--- a/media-plugins/x42-plugins/x42-plugins-20211016.ebuild
+++ b/media-plugins/x42-plugins/x42-plugins-20211016.ebuild
@@ -11,7 +11,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"