gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-plugins
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
58 files changed, 584 insertions, 618 deletions
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index da90fb89e943..8d4f0ec4d95f 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/amb-plugins/Manifest b/media-plugins/amb-plugins/Manifest
index 3739326864ac..75901c273f26 100644
--- a/media-plugins/amb-plugins/Manifest
+++ b/media-plugins/amb-plugins/Manifest
@@ -1,4 +1,4 @@
 AUX amb-plugins-0.8.1-Makefile.patch 1490 BLAKE2B 5274789504fd46d939210c5c1fdd90ca2a903779771ba9536dd97487b7930001bcde7362443a27c18a28dcc0634a79d10df66a7db05ca0e41aa6d0974e79c2be SHA512 5909563375e3337a613147c2cc7f189d7e2b2b0ddf98193631b7bb5313d57f93cb2f2727fcd3bc447c325b7bd436ff1969440e240e69c2c6e7d315f9e9af9851
 DIST AMB-plugins-0.8.1.tar.bz2 28988 BLAKE2B 10146c75f26d6225e69a1214d25d8e28508e722938193bbb1ccf109956986a62a6cc382e81387da31a03f39a31e79fd77720129ab42d9108bdf2e11283b936d3 SHA512 cdf0f6f656012f1e9d31f54d4446392223165327804f44c8d767904c51ab54a858099f8ad5f57362494d1a3cd73c4b258b4748022b5d9b3f860ab4bb84dd4a71
-EBUILD amb-plugins-0.8.1-r1.ebuild 727 BLAKE2B c033f128fb4a52eb37c707cea8fbe5cd2156baccf770ad035ec636e9c3e5f0f3724040ae1e709c2b01ec44b8bc5f563edf4a79d0f83453e93f3bb3a1769d7d94 SHA512 080f44ac2e400b84f04e4f9893c640b2a9ecd0c9ce890e668adfa1e5ea152c0fd7c8332b17ffd7b659d7db2c1f6cc7ad81b8d91ff5133eeedc6972653358da45
+EBUILD amb-plugins-0.8.1-r1.ebuild 718 BLAKE2B 95506a902450ecb66dda0812172c464a005472fcfa0f5d396645eb6c1725fa5917473d2303ef8d0b6f1ed58b2cfbcf4781d3a890231e144dadab12e23e4534e6 SHA512 db18baa53024b1230372eaed1fe0d8c42353e24dd92c6cf4a23b436527379f7c4e9d1f1925981ade31755e4ef7ece12b6521e090b078976f3f195d93d9011887
 MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600
diff --git a/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild b/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
index d3620b95e120..8e810637c6d7 100644
--- a/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
+++ b/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit multilib toolchain-funcs eutils
+
+inherit epatch multilib toolchain-funcs
 
 MY_P=${P/amb/AMB}
 
 DESCRIPTION="AMB-plugins ladspa plugin package. Filters by Fons Adriaensen"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
 SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND="media-libs/ladspa-sdk"
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index a46315e57edb..5b475291dfbd 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,8 +1,7 @@
 AUX calf-0.90.1-desktop.patch 1207 BLAKE2B f4af4c5a7a366bb204d0317fb7b6cf47b1cc31859392d360cd4acb46e89e98044bef6bd61d017dcb11ea8c6b264b908ffc0039ddc32c01c4a2ab12f7dc70a981 SHA512 e48183918f1ea2f12d59236a2b62ae68a6e66946e67d7ea8a84b8b1232b93556af222a8536a5fa0347e13af46566582a796b8f357799d53fc4ee987a1ed147ba
 AUX calf-0.90.1-htmldir.patch 3997 BLAKE2B 657248c76dfb82f39e8f6589c485e2993122b4d26c7b4c223191e3e97c8b36e723efcbbfbf324dc0bc72eee2da4a1cb23e1095ce9b638bf2485e3dade00b65be SHA512 ecace91bfdb2599ac98d7bc5e6b441c6bcedaab20c928177c74f5bb8810416ab6035f6b0efa6962bfd2d85969c902eaf2a640bc77efd97501f0b08e878b14c48
 AUX calf-0.90.1-no-automagic.patch 1268 BLAKE2B 1a6a7038a9beb9bdbe370c37c1283dfbbec21e378e063fb87aeb49b993a75b6ff16f9b7f0f94e8bb5e0ccdb524f786ae3679b9dc497e73ec3fd4f84d196f6e98 SHA512 ed96d843b6733bbe89c3fda2d21e1cb6b7e812471df73bf2ccbc96af8153cd7fd20d52047ab53693382894ac77c7ab70017d923e4f148c3079766536ae5dab6f
-AUX calf-0.90.3-slibtool.patch 6284 BLAKE2B 17d52b66524ddbe5c9fdaa3f39a850a115068cc53d2bd6feb85df4962c9585a05188b39df60fa647242ee2b0ca1610cf6e02fdcb77af6336f1acc1b3ca9817dd SHA512 11db5f699b25ee858b16548400f21782f0c96fa7c928f5d4fda7b28cdbf46a7e936c8075b18ca615d36c5c94894162b26f906dd7da1b5b19d88a47cfd926ef55
 DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7
-EBUILD calf-0.90.3.ebuild 1701 BLAKE2B 61de7c6263b23a9f640193636ff92a2dc1564a456364af0accdace4ebf00afd37e9f215f365fafd85cb2d09ba1ced96bf48e601752f0ad73ab15ef65b94f1f43 SHA512 d8b993b3fa10288b070f812559bcf676a13fff7ace2e4e8d51f4ad41ffdb613255e6d9c19cbbeb56d76abcc6c16720880130356fbb3c8190106ea7adbbc1b0c9
+EBUILD calf-0.90.3-r1.ebuild 1658 BLAKE2B b0cbca070fd998a80c844b05b876fbafa6890723eb792411328b61cc87d58be46f4bc8566e9c3be063f60f7e5dfffe55c92e64cf507589bf7a070470415eca7d SHA512 a4f3a18368c695b588feabb64cce1966e839dbee288d43501790b252dd64e45669004335f15bc53240790b14df5a618bee5e87061b86d75f625295a58d00a164
 EBUILD calf-9999.ebuild 1636 BLAKE2B 26944eed996b1f7c0c2db5871c858f33268f95a3a82dce479462b1866af682d4e241c526eb5dd948f2141d131c3051721dc1a22c6403aefe13cc32bfa63e2edc SHA512 867ed42443ba883ccde95fca8e1b6b72b6a4dbd45e9984dd488d43325d66f93eeb0e8f13733f25533cb34f675fc315791a41b6dbf4fae17fd821d50729a558d5
 MISC metadata.xml 500 BLAKE2B 79be90120221b85a9bd6960b4245d17085b158e3653d1560998e0f5bcf154f9955af7fd1a5b04e54769189753c3b1ac176df45d838bf6c6a3b1dac5cbabb422f SHA512 a88cde96e4ca78145f3214ce16552d43ef974b5235829e51e98a5c7c8f60bcaa259ba7da166e5e4c59aade062fe16de915355c67ea7ded9ba9d83a04a98bb37b
diff --git a/media-plugins/calf/calf-0.90.3.ebuild b/media-plugins/calf/calf-0.90.3-r1.ebuild
index ca5c968e7df3..c459fd25c342 100644
--- a/media-plugins/calf/calf-0.90.3.ebuild
+++ b/media-plugins/calf/calf-0.90.3-r1.ebuild
@@ -46,7 +46,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.90.1-no-automagic.patch"
 	"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
 	"${FILESDIR}/${PN}-0.90.1-desktop.patch"
-	"${FILESDIR}/${PN}-0.90.3-slibtool.patch"
 )
 
 src_prepare() {
diff --git a/media-plugins/calf/files/calf-0.90.3-slibtool.patch b/media-plugins/calf/files/calf-0.90.3-slibtool.patch
deleted file mode 100644
index 35a4c4ee9412..000000000000
--- a/media-plugins/calf/files/calf-0.90.3-slibtool.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-https://github.com/calf-studio-gear/calf/pull/288
-https://bugs.gentoo.org/778314
-
-From d18a873ebc92bd1eee2b3f61b7768a195fe6906a Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 26 Mar 2021 17:47:11 -0700
-Subject: [PATCH 1/2] build: Use canonical libtool library names.
-
----
- src/Makefile.am | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index dd6bb8aa0..66119b4d1 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,7 +8,7 @@ bin_PROGRAMS =
- noinst_LTLIBRARIES =
- 
- noinst_PROGRAMS = calfbenchmark
--pkglib_LTLIBRARIES = calf.la
-+pkglib_LTLIBRARIES = libcalf.la
- 
- AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
- # TODO: Remove -finline flags is clang is used
-@@ -22,7 +22,7 @@ AM_CXXFLAGS += $(JACK_DEPS_CFLAGS)
- noinst_LTLIBRARIES += libcalfgui.la
- bin_PROGRAMS += calfjackhost 
- calfjackhost_SOURCES = gtk_session_env.cpp host_session.cpp jack_client.cpp jackhost.cpp gtk_main_win.cpp connector.cpp session_mgr.cpp
--calfjackhost_LDADD = libcalfgui.la calf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS)
-+calfjackhost_LDADD = libcalfgui.la libcalf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS)
- if USE_LASH
- AM_CXXFLAGS += $(LASH_DEPS_CFLAGS)
- calfjackhost_LDADD += $(LASH_DEPS_LIBS)
-@@ -32,31 +32,31 @@ endif
- AM_CXXFLAGS += $(GLIB_DEPS_CFLAGS)
- noinst_PROGRAMS += calfmakerdf
- calfmakerdf_SOURCES = makerdf.cpp
--calfmakerdf_LDADD = calf.la
-+calfmakerdf_LDADD = libcalf.la
- 
- calfbenchmark_SOURCES = benchmark.cpp
--calfbenchmark_LDADD = calf.la
-+calfbenchmark_LDADD = libcalf.la
- 
--calf_la_SOURCES = audio_fx.cpp analyzer.cpp lv2wrap.cpp metadata.cpp modules_tools.cpp modules_delay.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_filter.cpp modules_mod.cpp modules_pitch.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp
--calf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS) 
-+libcalf_la_SOURCES = audio_fx.cpp analyzer.cpp lv2wrap.cpp metadata.cpp modules_tools.cpp modules_delay.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_filter.cpp modules_mod.cpp modules_pitch.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp
-+libcalf_la_LIBADD = $(FLUIDSYNTH_DEPS_LIBS) $(GLIB_DEPS_LIBS)
- if USE_DEBUG
--calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
-+libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static
- else
--calf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
-+libcalf_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor"
- endif
- 
- if USE_LV2_GUI
- 
- # Version WITH out-of-process GUI - links GTK+, UI controls etc.
- 
--noinst_LTLIBRARIES += calflv2gui.la
-+noinst_LTLIBRARIES += libcalflv2gui.la
- 
--calflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
-+libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
- 
- if USE_DEBUG
--calflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
-+libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
- else
--calflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
-+libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
- endif
- 
- endif
-
-From 75f33e02d3c9d0acf2bee59fd286cbc98f0d3d67 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 26 Mar 2021 17:47:39 -0700
-Subject: [PATCH 2/2] build: Use libtool to isntall libtool libraries.
-
----
- src/Makefile.am | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 66119b4d1..93361aaad 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -49,7 +49,8 @@ if USE_LV2_GUI
- 
- # Version WITH out-of-process GUI - links GTK+, UI controls etc.
- 
--noinst_LTLIBRARIES += libcalflv2gui.la
-+if USE_LV2_GUI
-+pkglib_LTLIBRARIES += libcalflv2gui.la
- 
- libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp ctl_keyboard.cpp ctl_knob.cpp ctl_led.cpp ctl_tube.cpp ctl_vumeter.cpp ctl_frame.cpp ctl_fader.cpp ctl_buttons.cpp ctl_notebook.cpp ctl_meterscale.cpp ctl_combobox.cpp ctl_tuner.cpp ctl_phasegraph.cpp ctl_pattern.cpp metadata.cpp giface.cpp plugin_gui_window.cpp preset.cpp preset_gui.cpp lv2gui.cpp osctl.cpp utils.cpp ctl_linegraph.cpp drawingutils.cpp
- 
-@@ -58,6 +59,7 @@ libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat $(GUI
- else
- libcalflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static  -Wl,-z,nodelete
- endif
-+endif
- 
- endif
- 
-@@ -78,9 +80,6 @@ endif
- if USE_LV2
- 	install -d -m 755 $(DESTDIR)$(lv2dir)
- 	ln -sf $(pkglibdir)/calf.so $(DESTDIR)$(lv2dir)/calf.so
--if USE_LV2_GUI
--	install -c -m 755 $(top_builddir)/src/.libs/calflv2gui.so $(DESTDIR)$(lv2dir)/calflv2gui.so
--endif
- 	rm -f $(DESTDIR)$(lv2dir)/*.ttl
- 	$(top_builddir)/src/calfmakerdf -m ttl -p $(DESTDIR)$(lv2dir)/ -d $(DESTDIR)$(pkgdatadir)/
- if USE_SORDI
diff --git a/media-plugins/cmt-plugins/Manifest b/media-plugins/cmt-plugins/Manifest
index 94be999dbb6b..57896a25434f 100644
--- a/media-plugins/cmt-plugins/Manifest
+++ b/media-plugins/cmt-plugins/Manifest
@@ -3,5 +3,5 @@ AUX cmt-plugins-1.17-darwin.patch 361 BLAKE2B 64947385e7a1cb3cad87ff8036bd7b3c09
 AUX cmt-plugins-1.17-makefile.patch 851 BLAKE2B bcc73d4da76d201c7907991cb2bb982867c424432d70e7cadf91a03f778025b85fcc7945af2bd14466ff779e77ebcf13af2cf3d006ccb2b3053ebfbd455188d8 SHA512 d2efb151f1bbbf58fe7f2699f6ebb81fd4adce216833b08bd56a5149f6f2965f65033953ec8ec18be6499b562d50e18ea81f9a0b7fcf0baddc9c15c4d1c4d0b5
 AUX cmt.rdf 3943 BLAKE2B e45e6b1e25a8be51d687e0eb931e62bba4a2c821bb35e7784077983df8b66b3b5f9a9497df19588acf68ab2f55a28a50c1cc392fcdc58651befda54f8e60edc3 SHA512 265bb9ed2cff657a2698dc1182bb3079a6d3f70a6db86aa20cfc992b5cf54a341a65f9af278630671c3657dc730de85a0b95caae785893412ad5659a195b820c
 DIST cmt_1.17.tgz 64070 BLAKE2B 903b540f0232e34dadb4683f5fe2478a0124dd1864c49868f8d5db4742cd89e55600c1b7aadea56b04b831b528b8930c472c2d05149b00e81cec503c69dc9c87 SHA512 7df31a44c41622785b569ef79bef91cba098fed89ca65dcb31b9fdd751caff863cf42eb7ca2ffab08e883fbcd040ab1c7290a96abf58e908be44ab803d672e26
-EBUILD cmt-plugins-1.17-r1.ebuild 1060 BLAKE2B d4ea5144dac4decca21c9cbe20baa474902c09b2ea2604974b8c77ba38261d2e468745881725cb83f0a654a33d1365ff7ec2a174ed126bb2723d2edd422db001 SHA512 d32f0924e827ed836ddac0c78b736c2761b0f4ad3be077aa8dba64c9ef92e89560a4d69f5c1d283fb22200de4e4278317ddae7128a474b726aa722fc3e01b1bd
+EBUILD cmt-plugins-1.17-r1.ebuild 1053 BLAKE2B 4cca9b358005984f1981907e8a84886104a2fe3265cb88f10899b4ee8609c35f371b489fcd2fb104ed8b5501d4e5e5bf6981a2e590a0f6c286107d23f432b318 SHA512 d1c2ca500434b78417ced31d079e8c3ec51f23e818d395f8ac602f4f0295b1008b796e2f53803686ae332a2bad555ee93499834fe5bc8f570cc8db4f19994e25
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild b/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
index 67e6bfabbd49..279af96ff689 100644
--- a/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
+++ b/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils multilib toolchain-funcs multilib-minimal
+inherit multilib toolchain-funcs multilib-minimal
 
 MY_P="cmt_${PV}"
 S="${WORKDIR}/${MY_P}"
diff --git a/media-plugins/fil-plugins/Manifest b/media-plugins/fil-plugins/Manifest
index 1d3f5de1e6ec..2a984a0e59ae 100644
--- a/media-plugins/fil-plugins/Manifest
+++ b/media-plugins/fil-plugins/Manifest
@@ -1,4 +1,4 @@
 AUX fil-plugins-makefile.patch 628 BLAKE2B 35722d064103916ae6022ebf68fc56138fc2e0bec4e94d54dfc59ca92dc836d9d67ea576e1a8560fd4373de21288e4b4417fa9bd3e7c866827245790c53d7eb6 SHA512 c8c7c6e871e165a0a619f854c7565659213a7994429ed7a56be4290f99b433592e0c6b24ce45a15518c4456c68f51d62eba8c159e971d117e315babfa38e7a42
 DIST FIL-plugins-0.3.0.tar.bz2 16833 BLAKE2B 2acd2875c1cce2f2b7379f626fd0e508ff5a2af228cc238cbbe1b3232e244a64d491a214fbd59b2a00fbfdf688910cee13861cdf149b2a86b7f17bf36d2aca3d SHA512 9054d2bdbceb2a55d7772958f3bdcc03fb1bd15109de931bee07f3ab55f437c4076c5a740187252a406142c9438febe269c5b25364eddab3191de75ca56a81b1
-EBUILD fil-plugins-0.3.0-r1.ebuild 731 BLAKE2B 4545f7df3a1ff3bac0755f9cea44ac6b3b73da7833180d36ca998b6b7dc4bc5cf4f1d605f6c0e02d37cba308f1fb44987e9787499357977236875eea9da6aff2 SHA512 bdd87665982a2f414f50d3e3cd21a7c66714c50f1f7088d04579f388565d006f72540d1670b89607ecca639b7bbf027133d751066a0b56d8bd3fa156fcb6d1d6
+EBUILD fil-plugins-0.3.0-r1.ebuild 731 BLAKE2B 8e159979d9e26306a347804ce0d9f2adf9f47ed156d1275a4409eb2106a418e7571f50bde637db45578bf216ade362c0ea9371708a0142d252197eb09efcb85d SHA512 da0943a6e11f0749774a5a1f20fe5aa5132a3b348e74d8e2db8a4979b6a4b9a4810aa04d7414d4e47d37a42091610e3d78a21f29ed61514c13554c8874085da4
 MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600
diff --git a/media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild b/media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild
index ed3c268ab8d3..72569cb02377 100644
--- a/media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild
+++ b/media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils multilib toolchain-funcs
+inherit epatch multilib toolchain-funcs
 
 MY_P=${P/fil/FIL}
 
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index a085fec82574..88e7e6df1ed6 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,4 +1,8 @@
+AUX 0.3.13-meson-goa.patch 2376 BLAKE2B 35a35af7aebf3c7f735affdcb2775a556eef8aafbde8aada3e8ea83fa67db9d0a0f992115eb4d54dd69736ae813b0cdef8d25b2991f4cb1361f0d451fe1f43a6 SHA512 ee3959e0c7eabc7f7fbdd6ddbd0c10242ffb9ebe427915115430f10bec821fc5b66dc8315a75337e69875ea060ec3a8c10ef6979534a1e47b408ebbf4785e6bd
+AUX 0.3.13-meson-tracker3-test.patch 966 BLAKE2B 85daac660794ae43c592a7a344d82dff0bc008b2f32a5a66e724a867ead059bb4c9f2f6a9c4c9a3fbf6ace8b7f2b12abd353b2ace08e1c5d2e712837721c36e8 SHA512 da7677753209a8da8d75cb258bd88e003fd2ea647bd1c2bfde4e63bcc48b7d0df3600b5d9e0192461f49b20bb56c605613c088e85b8b4e955b34457d231f8a00
 AUX 0.3.8-meson-goa.patch 2086 BLAKE2B 82bcd7de7d96caeed6f5448e36666acbb3870e4e8361c8890a73e031cb241261b98d8c97a3caf45187d2a7deebdf712a5447ccb29f96509a256eff8b5c257b6a SHA512 b5a6942092b32c91518e6142e7b0fbb46994eaa0f03eb83b0fbb561bf1ee27d435c1f0982cb036700fcff04bab27cf1080cb068bfdce44eeb6238f4f642c486d
 DIST grilo-plugins-0.3.11.tar.xz 1449408 BLAKE2B 8ed9bd49f779eadb486a13be3bbdee0df797ebffb7833eaf2632cbb6fac90b33e2f3c92223c7e6d268257aabd710e0b9fd6c8e9395bfae776990a64e7537b41a SHA512 eefeabf333568d06ce77ba865f2dc96592428ae41c459f51e2ea7f37914c2b3d52778e5548b7d49059f1e4b83c8c07e5a8798272c5ced0259de1900d9e3f6991
-EBUILD grilo-plugins-0.3.11.ebuild 2983 BLAKE2B ffaab8fd28e8663e377244727773e47c4990a0975086055001a3c87a81593057e0b14653f9e23aaed80cce8e09af16ecc128c46ea66f8378b9d60f4e171d6f90 SHA512 0c171d77f9e010663bad26efd5268778e5760a79dc16fd5c45ab8a2a18055fa1d110ef592b120d574e3b397f5a39e551eb833691fad38a6c395d98659158f262
+DIST grilo-plugins-0.3.13.tar.xz 1835320 BLAKE2B 3c39c652700eba0d6c557dbfa700a4f8f1b52ecadb757d7c36b5a3023f096fcb7587f4b054f75eb12ffee61b423abbca73d7847d902450d23b5527024f260058 SHA512 7edccc7366623c3dab56f7c95156327db08efdf038563c9be3e423c517a1117003ef516a069f9a2e877f6a610dad6783d3087d111b039ce7bdc6657124cf8e25
+EBUILD grilo-plugins-0.3.11-r1.ebuild 2987 BLAKE2B 8b946ceb3ddee6fae619624915f970b9aeb8df81359b6e103c5f1fc3aa9b00da19df0381948538e3933cafd9ad2dafca9311a4b74dde7d3cec40738dffec327b SHA512 b2c546d0bfedc72cb92a4d1da144ba4696d34cee09e54233879e46c74dba742c92704496f8c173c01e8fb828718b500410db566aa97b587cdf81277fe33969fb
+EBUILD grilo-plugins-0.3.13.ebuild 3233 BLAKE2B be0ad3a6e75d5f2b61d23d0959566d1ddf47916cd10766e41a7341d874ae95b0bc202ca0a6d8c59201bd9b0f6bd75c31eb599c3c6b32a102d8d66af8a86bf157 SHA512 3525d03ec78ad6dbcc05226b0cccd6234de8bd34d7c854be9143f8823fb79fff41b03b7bfed910d303dd888d940f48c73d0933c006028696a77645e705363521
 MISC metadata.xml 920 BLAKE2B c6119dc73ede7e500e3113f03677f81d65d4a2a524e84847f010e6c9215b96feed5fcaf400166471c25075742268cbe7639e23cd11447e0e795146b29dec797e SHA512 322b01e064c5656e9d9c7e2343d7feb76f35bd9ea6e5174ce3702747e5c4dd5de9ab60e9c91d72db171ad62a90f84eedcc03b3547ef7bc8e231090c7eaef9ac7
diff --git a/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch b/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch
new file mode 100644
index 000000000000..8122e57db3fd
--- /dev/null
+++ b/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch
@@ -0,0 +1,49 @@
+https://gitlab.gnome.org/GNOME/grilo-plugins/-/merge_requests/109
+
+From 27585cd5bcfba9e75d8ca9bc86dc0b7b3e5a2e59 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 16 Feb 2019 14:44:44 +0200
+Subject: [PATCH] build: Support controlling gnome-online-accounts dep
+
+On Gentoo, some users prefer to disable gnome-online-accounts since it
+brings in the large WebKitGTK dependency.
+---
+ meson.build       | 4 ++--
+ meson_options.txt | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 74a5d2a9..5f8c7cd4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -13,7 +13,7 @@ project('grilo-plugins', 'c',
+             'warning_level=1'
+         ],
+         license: 'LGPL 2.1',
+-        meson_version: '>= 0.44.0')
++        meson_version: '>= 0.47.0')
+ 
+ plugin_version = meson.project_version()
+ version_array = plugin_version.split('.')
+@@ -52,7 +52,7 @@ avahi_glib_dep = dependency('avahi-glib', required: false)
+ avahi_gobject_dep = dependency('avahi-gobject', required: false)
+ gio_dep = dependency('gio-2.0', required: false)
+ gio_unix_dep = dependency('gio-unix-2.0', required: false)
+-goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: false)
++goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: get_option('goa'))
+ gom_dep = dependency('gom-1.0', version: '>= 0.4', required: false)
+ grilo_net_dep = dependency('grilo-net-0.3', version: '>= 0.3.0', required: false,
+                            fallback: ['grilo', 'libgrlnet_dep'])
+diff --git a/meson_options.txt b/meson_options.txt
+index f5132228..1e0ea090 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -21,4 +21,5 @@ option('enable-tmdb', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'a
+ option('enable-tracker', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Tracker plugin (DEPRECATED)')
+ option('enable-tracker3', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Tracker3 plugin')
+ option('enable-youtube', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable YouTube plugin')
++option('goa', type: 'feature', value: 'auto', description: 'Enable gnome-online-accounts usage')
+ option('help', type: 'combo', choices: [ 'yes', 'no' ], value: 'yes', description: 'Build examples developers')
+-- 
+2.26.3
+
diff --git a/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch b/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch
new file mode 100644
index 000000000000..0812d7936b6d
--- /dev/null
+++ b/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch
@@ -0,0 +1,29 @@
+https://gitlab.gnome.org/GNOME/grilo-plugins/-/merge_requests/110
+
+From 62229a03614add0d3cb6e1087f241407f952de12 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Wed, 14 Apr 2021 22:08:13 -0400
+Subject: [PATCH] build: Only run tracker3 test when enabled
+
+Previously -Denable-tracker3=no would not build the tracker3 plugin but
+if the dependency was found on the system the unit test would still be
+enabled (and would fail).
+---
+ tests/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 97e196db..7ba2236b 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -39,6 +39,6 @@ if local_metadata_enabled and lua_factory_enabled
+     subdir('local-metadata')
+ endif
+ 
+-if tracker3_dep.found() and tracker3_testutils_dep.found()
++if get_option('enable-tracker3') != 'no' and tracker3_dep.found() and tracker3_testutils_dep.found()
+     subdir('tracker3')
+ endif
+-- 
+2.26.3
+
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.11.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.11-r1.ebuild
index 38ccceb0e65a..6eb11b5c703e 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.11.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.11-r1.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 # TODO: validate upnp-av dleyna deps
 RDEPEND="
 	>=dev-libs/glib-2.44:2
-	>=media-libs/grilo-0.3.8:${SLOT}=[network,playlist]
+	>=media-libs/grilo-0.3.8:${SLOT}=[network(+),playlist]
 	freebox? (
 		net-dns/avahi[dbus] )
 	>=dev-libs/gom-0.3.2-r1
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-db/sqlite:3
 	>=dev-libs/totem-pl-parser-3.4.1
 	tracker? (
-		>=app-misc/tracker-2.3.0:= )
+		>=app-misc/tracker-2.3.0:0= )
 	upnp-av? (
 		net-libs/dleyna-connector-dbus
 		net-misc/dleyna-server )
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
new file mode 100644
index 000000000000..b1aa867de4f8
--- /dev/null
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LUA_COMPAT=( lua5-3 )
+inherit gnome.org lua-single meson xdg
+
+DESCRIPTION="A collection of plugins for the Grilo framework"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+# GOA is only optionally used by flickr and lua-factory plugins (checked at v0.3.13)
+# json-glib used by tmdb and lua; tmdb currently non-optional
+# TODO: validate upnp-av dleyna deps
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=media-libs/grilo-0.3.13:${SLOT}=[playlist]
+	freebox? ( net-dns/avahi[dbus] )
+	>=dev-libs/gom-0.4
+	chromaprint? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-chromaprint:1.0
+	)
+	dev-libs/json-glib
+	daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
+	media-libs/libmediaart:2.0
+	net-libs/libsoup:2.4
+	dev-libs/libxml2:2
+	flickr? (
+		net-libs/liboauth
+		gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
+	)
+	dev-db/sqlite:3
+	>=dev-libs/totem-pl-parser-3.4.1
+	tracker? ( app-misc/tracker:3= )
+	upnp-av? (
+		net-libs/dleyna-connector-dbus
+		net-misc/dleyna-server
+	)
+	lua? (
+		${LUA_DEPS}
+		app-arch/libarchive
+		dev-libs/libxml2:2
+		gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
+	)
+	thetvdb? ( app-arch/libarchive )
+	youtube? ( >=dev-libs/libgdata-0.9.1:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	upnp-av? ( >=dev-util/gdbus-codegen-2.44 )
+	virtual/pkgconfig
+	lua? ( dev-util/gperf )
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.3.13-meson-goa.patch
+	"${FILESDIR}"/0.3.13-meson-tracker3-test.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-plugins-${SLOT%/*}':" meson.build || die
+	sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" po/meson.build || die
+	sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" help/meson.build || die
+
+	# libdmapsharing-4 is not packaged
+	sed -i -e "s:libdmapsharing4_dep.found():false:" meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable-bookmarks=yes
+		-Denable-chromaprint=$(usex chromaprint yes no)
+		-Denable-dleyna=$(usex upnp-av yes no)
+		-Denable-dmap=$(usex daap yes no)
+		-Denable-filesystem=yes
+		-Denable-flickr=$(usex flickr yes no)
+		-Denable-freebox=$(usex freebox yes no)
+		-Denable-gravatar=yes
+		-Denable-local-metadata=yes
+		-Denable-lua-factory=$(usex lua yes no)
+		-Denable-magnatune=yes
+		-Denable-metadata-store=yes
+		-Denable-opensubtitles=yes
+		-Denable-optical-media=yes
+		-Denable-podcasts=yes
+		-Denable-raitv=yes
+		-Denable-shoutcast=yes
+		-Denable-thetvdb=$(usex thetvdb yes no)
+		-Denable-tmdb=yes
+		-Denable-tracker=no
+		-Denable-tracker3=$(usex tracker yes no)
+		-Denable-youtube=$(usex youtube yes no)
+		$(meson_feature gnome-online-accounts goa)
+		-Dhelp=no
+	)
+	meson_src_configure
+}
diff --git a/media-plugins/hdx-realtime-media-engine/Manifest b/media-plugins/hdx-realtime-media-engine/Manifest
index 52426abf56eb..1ac7454eb0d1 100644
--- a/media-plugins/hdx-realtime-media-engine/Manifest
+++ b/media-plugins/hdx-realtime-media-engine/Manifest
@@ -2,6 +2,6 @@ DIST HDX_RealTime_Media_Engine_2.9.200_for_Linux.zip 30107965 BLAKE2B e0ffad7f86
 DIST HDX_RealTime_Media_Engine_2.9.200_for_Linux_x64.zip 30135671 BLAKE2B 9547e51ac3d1eaa3dc3f8b2ef21b02f500a579029ee3685503199f0308f52131a6135d726a98d0bb7b58332b7e5931cdf2a6028343cd1b4286edd25c584068ca SHA512 79b0e5db35dcb0635a645622a9609ccb20859deb98ceae0c6e6dde9232723a1ef9625dd97b54697662b4a42c39e9de0cc96ab6b38d5587a39ba208120f027e92
 DIST HDX_RealTime_Media_Engine_2.9.300_for_Linux.zip 30099613 BLAKE2B 2d5b266587685a71b7f79fdba64899eb8ea566c18041c5d8407f3563a418bba6abaa0566e10d3d82fd9d33b87520e0af634aa6649ee0184113151e2072be4c28 SHA512 ee025724627f0dae84b81083df867b282770c0a2c84da397655f7db45037e2562d64a6f4efed920be0ff017be176d54616213ee8b9d0aa2e606e3e93af62cc20
 DIST HDX_RealTime_Media_Engine_2.9.300_for_Linux_x64.zip 30133167 BLAKE2B 0fec6d03f7a26a2fe162c9cfbb15fce57b323f5bc0880bccb3105aa1881532479c40f827595bcc3f55096c49dc0be30b0732349d8a1c8dc55fdeafaf2f05995d SHA512 f09936706d0ed64c72843fab95ef9434106d813ec7388f241da65ee1d69fc8e8b9f367a72a443f6db1b867b0811936e8583cfce6ae2a75fb3cf13ac1b15a2627
-EBUILD hdx-realtime-media-engine-2.9.200.2506-r1.ebuild 2113 BLAKE2B 8d3b41d94a5dae6d773153cfeeaef4cc752cfc34602fb8c7867c2c66ee4b5fc19adcb270d7524fc088e72001f40ce70d7e9b5942b17856364c09d4a016cd5981 SHA512 b49eb15816bf41592bc2a0f9614c58858ae90a5129120baca4027380c691c06e9863b94c617268b9cfd1eef1fdccb59a8dc17af4da2a8fa93235cf680fd7b4fa
-EBUILD hdx-realtime-media-engine-2.9.300.2604.ebuild 2113 BLAKE2B 8d3b41d94a5dae6d773153cfeeaef4cc752cfc34602fb8c7867c2c66ee4b5fc19adcb270d7524fc088e72001f40ce70d7e9b5942b17856364c09d4a016cd5981 SHA512 b49eb15816bf41592bc2a0f9614c58858ae90a5129120baca4027380c691c06e9863b94c617268b9cfd1eef1fdccb59a8dc17af4da2a8fa93235cf680fd7b4fa
+EBUILD hdx-realtime-media-engine-2.9.200.2506-r1.ebuild 2106 BLAKE2B 15d7c655c26f42fef63471dfed547996632dc2563f00a634c894203a8c964e4b1cb99a755497b7ad116b5e7c5b867b0d14557b1f47904af3b6c33ff40c55f48e SHA512 a5afe84c382670178da1514bb700005715e9659f7df5ac840a340b40227161c18ec8eb88e2c6434289de357fd958c2936422014f04e287fb2c4282bb3261ee9e
+EBUILD hdx-realtime-media-engine-2.9.300.2604.ebuild 2106 BLAKE2B 15d7c655c26f42fef63471dfed547996632dc2563f00a634c894203a8c964e4b1cb99a755497b7ad116b5e7c5b867b0d14557b1f47904af3b6c33ff40c55f48e SHA512 a5afe84c382670178da1514bb700005715e9659f7df5ac840a340b40227161c18ec8eb88e2c6434289de357fd958c2936422014f04e287fb2c4282bb3261ee9e
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.200.2506-r1.ebuild b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.200.2506-r1.ebuild
index 54b8d7300593..4d98faaa90f9 100644
--- a/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.200.2506-r1.ebuild
+++ b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.200.2506-r1.ebuild
@@ -15,10 +15,9 @@ LICENSE="icaclient"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="fetch mirror strip"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 RDEPEND="
 	>=net-misc/icaclient-20.12.0.12-r1
 	|| (
diff --git a/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.300.2604.ebuild b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.300.2604.ebuild
index 54b8d7300593..4d98faaa90f9 100644
--- a/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.300.2604.ebuild
+++ b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.300.2604.ebuild
@@ -15,10 +15,9 @@ LICENSE="icaclient"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="fetch mirror strip"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 RDEPEND="
 	>=net-misc/icaclient-20.12.0.12-r1
 	|| (
diff --git a/media-plugins/ir_lv2/Manifest b/media-plugins/ir_lv2/Manifest
index 8b5738a0fc33..8c2cd8e93ad6 100644
--- a/media-plugins/ir_lv2/Manifest
+++ b/media-plugins/ir_lv2/Manifest
@@ -1,5 +1,5 @@
 AUX ir_lv2-1.3.4-lv2.patch 433 BLAKE2B 3f831851c2354b4695780a6df057dcd3885855ef19bffb0cd0a12e2671d18fc789a7ffa5ad38176a006e5ea2f43361caa8baae50157db3898af2b2b965bda3f7 SHA512 cb2208857e61912fdd1e2f6b5c7e81fd3bb86ae2d8195926d1c23ed99cacc8bc90a1758767c6f9733696a8aa128573098cefeeb2271d9df5bd0a751689489963
-AUX ir_lv2-1.3.4-respect-flags.patch 2213 BLAKE2B 110fc8963f65f4e520b395d7ead9605d94f65030e61277ca7d6b5d34d41c3e847a6313d67c7b0b0e2ab7a4fac77e3aca2f022179ef0398cf27562df65aec308a SHA512 88d9d7739be0ae0b202e94e1d4f40615e876419624ea8af743365c761fbe440c077c40e7dae3b4f43b29fa4e7c33e2dc2931c2334101d835e14f13782f594de7
+AUX ir_lv2-1.3.4-respect-flags.patch 2159 BLAKE2B 28d1d2a834eb65838b73a87e6c8bafa9d473a755761b4c35f9102ba0591e83c6f102f332023060d4c53db1f0ed0a86091e0212636982529093d5b8a26fe4e54e SHA512 ff7f31aa1cd4f80325df97f0c7acddb241ae1e39e942622286bbd580f967eedef179a49c1b37b08314289119d2af926c73d68f1453c5339e8a6c300bb3f29087
 DIST ir_lv2-1.3.4.tar.gz 126552 BLAKE2B 52f5b236c4680a759c0621ed0f9a394e6e82bdb9aaf4110b325902ae382d2f640a079c53d89c662a192a97d0e79349082cf100636c1a7d6c00738602ca652962 SHA512 6a9c8f906a07c6ed0daa53d8dc3693d535ec4cf63f07b5fcc62ab6638c66992ff7951918b0ce2ef8c65289b19988363be49bba9bb75a20b0463fa972b07ff58c
-EBUILD ir_lv2-1.3.4-r1.ebuild 1403 BLAKE2B 0744931a106821c25366de148df9e35a0446024ae764a164263472376e9258b554be7b89e77f7fc1b4098bca7d930a64fc48860e17b88dfb164daf8a63980449 SHA512 4cedc7b1685ccdce55d2a24b9dcdeaa3ca77a9a6e3a2461e8c54a6015245e900962d512ce680aa4484d341a8645d69fb00fdd52a0464046027fe9420f53215a2
+EBUILD ir_lv2-1.3.4-r1.ebuild 1407 BLAKE2B 4c6385aabe8934e206352b6b1e9a7d9be7a3322910601c00404306e284565413fd08e419b7c2fe8e68d7ae41f3043036e0f52388d32186d654d425757d6203c1 SHA512 15e1fba8b4e434154ef101d4b86d07f4a40ba0fc7c2616eb11d74c89d34df702b4126fb4c6de20f5cc21129d83c86e354b99d1c8712cb8830a6f559539ee0cdf
 MISC metadata.xml 319 BLAKE2B de7f0ee9cfe123a77f79cce2ade2dce0e5c3e5243ce13611bf6e9b613f04b7b2824bb70185796ed81d8fdbfc023722c1a45f9cecca16a35f8bf8cfb376dcc322 SHA512 d01e35b0d4b6fac4baefdac78473637585ae45a47f486c114f6fbaaa0c781ccc4d5f55e143c67dfe5fa074fe60cb60dcf5e6f5fd59b6dcd3e582c3e5dac68064
diff --git a/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
index e375969072e3..f92ad7dac25b 100644
--- a/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
+++ b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 031f865..4d25e97 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -20,7 +20,7 @@ CC ?= gcc
@@ -7,7 +5,7 @@ index 031f865..4d25e97 100644
  
  # change "-O2 -ffast-math" to "-g -O0" below if you want to debug the plugin
 -CPPFLAGS += -Wall -I. -I/usr/include `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gthread-2.0` -D__STDC_FORMAT_MACROS -O2 -ffast-math
-+CPPFLAGS += -Wall -I. -I/usr/include `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gthread-2.0` -D__STDC_FORMAT_MACROS -ffast-math
++CPPFLAGS += -Wall -I. -I/usr/include `${PKG_CONFIG} --cflags gtk+-2.0` `${PKG_CONFIG} --cflags gthread-2.0` -D__STDC_FORMAT_MACROS -ffast-math
  LIBS += -lc -lm -lzita-convolver -lsamplerate -lsndfile `pkg-config --libs gthread-2.0` `pkg-config --libs gtk+-2.0`
  
  ifeq ($(shell pkg-config --atleast-version='2.16' gtk+-2.0; echo $$?), 1)
@@ -16,7 +14,7 @@ index 031f865..4d25e97 100644
  endif
  
 -C4CFLAGS = -Wall -I. -I/usr/include `pkg-config --cflags gthread-2.0` -O2 -ffast-math
-+C4CFLAGS = -Wall -I. -I/usr/include `pkg-config --cflags gthread-2.0` -ffast-math
++C4CFLAGS = -Wall -I. -I/usr/include `${PKG_CONFIG} --cflags gthread-2.0` -ffast-math
  C4LIBS = -lsndfile `pkg-config --libs gthread-2.0`
  
  all: ir.so ir_gui.so
diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.4-r1.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.4-r1.ebuild
index 232d3932b3de..ede744418cca 100644
--- a/media-plugins/ir_lv2/ir_lv2-1.3.4-r1.ebuild
+++ b/media-plugins/ir_lv2/ir_lv2-1.3.4-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic multilib
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="LV2 convolver plugin especially for creating reverb effects"
 HOMEPAGE="https://tomszilagyi.github.io/plugins/ir.lv2/"
 SRC_URI="https://github.com/tomszilagyi/ir.lv2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN/_/.}-${PV}
+S="${WORKDIR}"/${PN/_/.}-${PV}
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -31,7 +31,7 @@ PATCHES=(
 DOCS=( README.md sshot.png ChangeLog )
 
 src_compile() {
-	tc-export CC CXX
+	tc-export CC CXX PKG_CONFIG
 	emake
 	use tools && emake convert4chan
 }
diff --git a/media-plugins/kodi-imagedecoder-heif/Manifest b/media-plugins/kodi-imagedecoder-heif/Manifest
index 8c1c50076484..8d5580ea4396 100644
--- a/media-plugins/kodi-imagedecoder-heif/Manifest
+++ b/media-plugins/kodi-imagedecoder-heif/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-imagedecoder-heif-1.3.0.tar.gz 32393 BLAKE2B 76981fe8759e93b2aaf5db5452db4fb414d295d637bdd38950fb89ba0e21c9b22a7ed87dc183bd3c47f457c09672348e9af74a9015408ce4214dc847599cbae0 SHA512 63181558f31804a1dd12f4a895535ab303c5e3c5f75b5fcc5bdda892b31a78d9b48b917d85dba66df23a8d118eea83825d24c4b797b289be11169b3a1a29df4a
+DIST kodi-imagedecoder-heif-1.4.0.tar.gz 32045 BLAKE2B 87da40bcb13d4ca26df4563231b08cd9535dca0197d40ed0a2baff991db05978bdaa074ce16f631822b06a660086e222427bc43fe34c153cc6eb1084f790d398 SHA512 a26fc84aeba8a9aaffde3a2187b50c99697df542faffda10b4958db1947fd9c0c4fb7cc02c2e1f959c6d3296ed47430b8d2a0be460aa497ab94fb67f1a25a8e4
 EBUILD kodi-imagedecoder-heif-1.3.0.ebuild 884 BLAKE2B 1e69301d94bf4bf583c66ded081ff191234fdc87218e9e372c36dd0caec7368290bff4bea2e13a9fc63f2410acd0387d07ff120d038bbff383b96e910369e0a2 SHA512 5807c66ba348329784067c89ff6eab698bf3b037d7d0d9b613f604b0eb24cfeadbd7a771c129f71474ac37421288fa6d7f1781d7da5ed02b4d97befb47dd0269
-EBUILD kodi-imagedecoder-heif-9999.ebuild 872 BLAKE2B 6be25f0b8c58570e85ad19127d4105f358e4dc8f4b531c8e5a94c2fb23fbaceea45bcac9f19dcbab1181c96c44dae54aa15fc2c55182d614717f17464a8805cf SHA512 f54a57869c93cdcbd2f23845c5bd1388e87cba5a204455945d5c30ee22b81da2b25707876a73f0daadd7bcc255aed6c59e0cc79e305c463ea86393bf215b48b4
+EBUILD kodi-imagedecoder-heif-1.4.0.ebuild 884 BLAKE2B 83e813a0cf3e51f8377ede94f298754f0474f673a06f487fea4c8f45e76dab5311055481b3b4428a25d0f22a5fb73d6a7f648b7495bd2d877ad265463c963987 SHA512 76ddbb2f30a8859b74e57c1aba0389195e68ab02078c760cebdfd9fa3b3e667d85034484dd41f8221284c325ff819cd0b22c9eb35cd0f7e05b5e9f46b9ac4549
+EBUILD kodi-imagedecoder-heif-9999.ebuild 884 BLAKE2B 83e813a0cf3e51f8377ede94f298754f0474f673a06f487fea4c8f45e76dab5311055481b3b4428a25d0f22a5fb73d6a7f648b7495bd2d877ad265463c963987 SHA512 76ddbb2f30a8859b74e57c1aba0389195e68ab02078c760cebdfd9fa3b3e667d85034484dd41f8221284c325ff819cd0b22c9eb35cd0f7e05b5e9f46b9ac4549
 MISC metadata.xml 509 BLAKE2B 1d779aecbb0c70795ee2022e634922fcfd0951d654a63ebf777b6a69d9fc5c5d2404dda687de298cd81ee40f836d6088fc57136db337f2c506f65c7419a6f245 SHA512 8fee416035a69cf7391eeef4d5c679d6c4861616d6999d38d32c3ef6acf7d76ecd552b3246a125b8d026173d45b28568698bf6e61a2bfce3b3c8a6d9d4dcd2a8
diff --git a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.4.0.ebuild b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.4.0.ebuild
new file mode 100644
index 000000000000..69a9164cf053
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="imagedecoder.heif"
+DESCRIPTION="HEIF image decoder for Kodi"
+HOMEPAGE="https://github.com/xbmc/imagedecoder.heif"
+
+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*"
+
+	;;
+*)
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	CODENAME="Matrix"
+	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+="
+	>=media-libs/libde265-1.0.8
+	>=media-libs/libheif-1.6.2
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild
index feadc6204739..69a9164cf053 100644
--- a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild
+++ b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.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
@@ -18,7 +18,7 @@ case ${PV} in
 
 	;;
 *)
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
@@ -31,7 +31,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND+="
-	>=media-libs/libde265-1.0.5
+	>=media-libs/libde265-1.0.8
 	>=media-libs/libheif-1.6.2
 	"
 
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 9e36b8c44f15..d3f196206375 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-inputstream-adaptive-2.6.7.tar.gz 748459 BLAKE2B 389525128fb8178d6de2e58d72225bf5a96cbe4f446e190e930aa42afa804c659b35cef281cb8e55c87891f1949087571dac45af218bdb7092680535ff804586 SHA512 60c1f051d50fef21697e6f1e1570bebbaaf3b8f5d4fd207bfdfbd553f1eafb26305af1138c224b2ddfb4ea9c88931991cf46fcbde39b35992ea93884705760c8
-EBUILD kodi-inputstream-adaptive-2.6.7.ebuild 805 BLAKE2B 1dc782e09d1583881228a8010586e7d7e2f2bf0d66f55054c51f1fcc836b9b8760bac8faaa8c1937af8507e82f2de3f1176304b6b8246329ea9154bf98782f3b SHA512 99862aab4b4bca5fcb25881d60c07f7412fcbce0a6402194468d79efccebb8e9d7998af42270b7ba40e17f8cae2ce221bbe1f33415eac17894f60849a97b2837
-EBUILD kodi-inputstream-adaptive-9999.ebuild 876 BLAKE2B 40d3153ecc7418d1c0c4b5406e9ddbefa877aa1ab4d3b63b1223754d4c0630405471e63317843696bd1165175bc74d41e3156c89e13fabd72e0372118cb562c7 SHA512 9458947596c7edee381a5d27d105277506f04ac5472c9f2c4e0cee25a46034955ed9164466571a9b04d54e37482f3ec74346b98389f2154870a7f11dbaf5255b
+DIST kodi-inputstream-adaptive-2.6.14.tar.gz 750124 BLAKE2B 0a00ed8ef5351877077a85b1952464223bfeed688ac28015222a3f415128c2a46e0927be2970ef01c8215ca471c7a91a24cfbbe3d202cefd106768be8d6af33a SHA512 469e685f0b00739de4e609c6f5bc099f4079fccb629221fa12d17da641a4daddc9ad1ea1a268d1bb3a1efb4704366b2a938e51749cc57d6188d5e7628a79d010
+EBUILD kodi-inputstream-adaptive-2.6.14.ebuild 1002 BLAKE2B 1d3abb0c33d1b61d5b24cbb73b772fc83aed7c0821b3ac382b80b4a790a13bbc6f7f608d8026b00a7cf0410cf493f00faa51ddc376d5773c09d5a2555a87d0fe SHA512 8603bfc240ed2237a7a10778666a393559ce84736d278f0c0ae11be7a4c8b564b7dec14772e36a73284b62e10154214237933f46fc32c34824721dcc7d2bc26b
+EBUILD kodi-inputstream-adaptive-9999.ebuild 1002 BLAKE2B 1d3abb0c33d1b61d5b24cbb73b772fc83aed7c0821b3ac382b80b4a790a13bbc6f7f608d8026b00a7cf0410cf493f00faa51ddc376d5773c09d5a2555a87d0fe SHA512 8603bfc240ed2237a7a10778666a393559ce84736d278f0c0ae11be7a4c8b564b7dec14772e36a73284b62e10154214237933f46fc32c34824721dcc7d2bc26b
 MISC metadata.xml 370 BLAKE2B 3cb26d2c0afe08e8bfd5d0074439528252d30a4d46952f48ead0f06e959f29dae992be1410aee15b62b4daae154c2973ddd5278e0515cb25221955c9d5f35593 SHA512 41ea83a2731d3a135075842b41bab398acb3f2c9c8c0bd6c589e00669eea8b9e23bd3dd71b3be8cac954138259a91eeffa4eddbaab3774b8750531b63999e1f3
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.7.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.14.ebuild
index 48e18f09b005..eb913a08d263 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.7.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.14.ebuild
@@ -26,17 +26,29 @@ esac
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+RESTRICT="!test? ( test )"
+IUSE="test"
 
-DEPEND="
+COMMON_DEPEND="
 	dev-libs/expat
 	=media-tv/kodi-19*
 	"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+	"
 RDEPEND="
-	${DEPEND}
+	${COMMON_DEPEND}
 	"
 
 src_prepare() {
 	[ -d depends ] && rm -rf depends || die
 	cmake_src_prepare
 }
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
index 18e80d341a6d..eb913a08d263 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
@@ -1,43 +1,54 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's Adaptive inputstream addon"
 HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-KODI_PLUGIN_NAME="inputstream.adaptive"
+SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}.git"
+	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
 	EGIT_BRANCH="Matrix"
 	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
 	;;
 esac
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+RESTRICT="!test? ( test )"
+IUSE="test"
 
-DEPEND+="
+COMMON_DEPEND="
 	dev-libs/expat
+	=media-tv/kodi-19*
+	"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+	"
+RDEPEND="
+	${COMMON_DEPEND}
 	"
-
-RDEPEND="${DEPEND}"
 
 src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
+	[ -d depends ] && rm -rf depends || die
 	cmake_src_prepare
 }
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 3c0b541cfb25..0a42d6cd48a9 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-pvr-iptvsimple-7.5.1.tar.gz 188853 BLAKE2B 9f5e391c7884d59a86960a7e7ba7e341a9f70911207d8f87850e47b1c151bb8d3b398ee02920ec08a53058515261bd3a2c37ee5b363ebb0866c5eb11ceb2e0ed SHA512 da6dbd2dfe62ab30df293cdd055d9375c621ff17f9ea151f672d7978a8e486548a65f8385f66ed89085d92e5594f379b32bd2954a7f5916e83d086812ec91354
-EBUILD kodi-pvr-iptvsimple-7.5.1.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
+DIST kodi-pvr-iptvsimple-7.6.1.tar.gz 191765 BLAKE2B 9d5e9d446f5c9770bba83e7725ab9cda8d169ac5542d82754b47c701af26a53a35764b6dd393329f9ed9be22dc85ba83af8163ec4a82b04e7bb1dad4f9a32982 SHA512 b9830f3093d2cbb14039e049808b7098c00baaf470d1ab350f2275477fae8d1c7262d0b58438e62caf5d3f87f26561783525b19102b35d0ca0fc837591c717a5
+EBUILD kodi-pvr-iptvsimple-7.6.1.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 EBUILD kodi-pvr-iptvsimple-9999.ebuild 777 BLAKE2B 1f18d43d3ce74c2dffbba99b6ad31c572d5fc5235409ddfb864abc8b2dcb3e5c1b584d7c58fd34b6aee45503198361c5b0b1d90b3946be18ac7cc9429330c214 SHA512 98b61705920ca7daf65b16c5c38e10f7e0a832e2b91c8eee0a513f2f459591ddfdd59a4146eca101630a7ccf863218c8d5e593a4704ffa70eccb4c7133679328
 MISC metadata.xml 366 BLAKE2B 7e2c022e027a3c4d0c1f5d5aa889b390fa079d8c71b16ea773403b9bbce28c7dae01d370d741575255b20dd4b7cf1b9d3f58161ac271c8829ed26d65920f5876 SHA512 379194149299ccced43f0c2054ef9fd8c049e4d9397c062ece4dd2e517f1f10a670cf53626daf7f53261981ac346c38e7aed9ae0710527843051a2d861c7f655
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.5.1.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.1.ebuild
index 36d5b715c65a..36d5b715c65a 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.5.1.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.1.ebuild
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index ec2ae531014e..90d5bf8fda16 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-pvr-nextpvr-8.2.1.tar.gz 150120 BLAKE2B 9e5fcc20b551b20a51a57702b85895327134a229ae03b93bb67e3cbf6e3767d13f81bcb321c2038fb4ed9348665daab03a744322d13b21b5de8c93718cd91371 SHA512 ba48a3f944c83ca8abcf60e9c921f969b564fafc415d0670d94e34e83000b3b87349a0082c1b8dd75505020b4e8e248f77ff7651e8bc623ec48f711868c82240
-EBUILD kodi-pvr-nextpvr-8.2.1.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
+DIST kodi-pvr-nextpvr-8.2.2.tar.gz 150133 BLAKE2B f1b320f407d84e4a03a4a0647c59ca6c0b984b4d23126966e7f97aef693b2b2689f4fe216929e054607cf04ec5e4ab00e96bcac4e5ad85b864af37cfc0ffcdfc SHA512 182728189279f4607219cc0d8da1534d271e3771f307ecb3e19c98c1421870ea69f541e7bcbd1a562e81667f32654d977f79fc01e6f3fb88e174f41af8c2fe0a
+EBUILD kodi-pvr-nextpvr-8.2.2.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
 EBUILD kodi-pvr-nextpvr-9999.ebuild 669 BLAKE2B 2df674d0426fa7f3195e7ec54e507955811e2dd2d0d0ed70d2d7d61b43e466b15fa0a5539905f88b07159a3eb220e205c95daca2f42b0ed386ca4e2899f083cb SHA512 e25dda696230ab5f661277943e9265c4efb37091beabce465460893765f4758b6f5a72f88e9697c9bdfe6014f0638599db1c59226b9672dc387d9da1734992e1
 MISC metadata.xml 363 BLAKE2B 360045b62c00991268efd908e4d47cd2468232ce63afb72b10528ffaf853f5d467d4930415a0fc56360d9a7290a4e2a17225ac40b19f3d92998cfee0f47fafa9 SHA512 db285760307fda62a5e608534a3a5e531ff9a1efb6893450144f5d295b1e66b494f4daaabe41ffaf53da803f5be8ca9dd55dec7a5aa5bd118c37bd93ec2c9b9a
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.1.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.2.ebuild
index f1d5484de0ab..f1d5484de0ab 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.1.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.2.ebuild
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index cafbb5859090..e9d0d7cd618b 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-pvr-vuplus-7.4.2.tar.gz 284972 BLAKE2B a785aa6b94939edc7f5e24957ee0338544135702cba1265da83751ee7a1d7638a3b504a13ce258c1f14340f2ce122fded0bc387cb5c6d275f1f9d861d18b8a4c SHA512 9f39a2bcc73fbcd28847d42d889cf0ce1fc79d3b185054e8c04bea5110ddcb5b94724640eecb34b1e1f3252b492b466845cd289565f9a6b7c2d870c5dbe5371d
-EBUILD kodi-pvr-vuplus-7.4.2.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
+DIST kodi-pvr-vuplus-7.4.3.tar.gz 285230 BLAKE2B 0ef24cb24f745494ea86ea025943bd4c159beaa684cacad569ef603d355b917351b92dd145d1fc8e3069896f404727f6aaa2567b5f3633fcfa9dbdd1c60fd09e SHA512 b563c29600126ac0d25c744be64d060691331a875b7945c211f1267daa43d8db034c717b1def49ad85aaf50f81826e4c7ffcff08ad4422fa67abe2ea3cf5557f
+EBUILD kodi-pvr-vuplus-7.4.3.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
 EBUILD kodi-pvr-vuplus-9999.ebuild 765 BLAKE2B 65a7bb78532a89ffa205709e64b92a14f6088412e8456d8a836ab496f1a010150b602ce9f8841f38cdb585dcf1135662405f2ca200658a88ff0dd0944ad07852 SHA512 70534928d3d77fe610b75048d73443481ea0eaa0419a22a6376774aff60d04382f8e9305c5a8d42cd7425dbe5c4bde17dd81026ea8074323bfd3599c094d4b8f
 MISC metadata.xml 362 BLAKE2B b551dbe10d765427e74ffc88979ea464caa79988f4204b05ced79d38745ffb4dff3fefd0464a999af66de4d132dcc0439ceb1239ccea3f924bf2a2c9083fd3ee SHA512 c9053d27b0f39fcef4c226c9a6c5578ae9cb076288fdd8f6ee39fb12b12b445499005515e79e5de8e4ba9e96fa991fd0210b3621b682960b41143ded1d84ac14
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.2.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.3.ebuild
index 20323489f843..20323489f843 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.2.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.3.ebuild
diff --git a/media-plugins/kodi-vfs-libarchive/Manifest b/media-plugins/kodi-vfs-libarchive/Manifest
index d869a2627fd5..9065289b936d 100644
--- a/media-plugins/kodi-vfs-libarchive/Manifest
+++ b/media-plugins/kodi-vfs-libarchive/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-vfs-libarchive-2.0.0.tar.gz 56515 BLAKE2B da4e7634b908677871931eef458d44d7088e6bc9ed19c39462154b3eda0c5347e42306e8116bf072acd1d59642113be1f213b23113680c4e4b45896d2d425502 SHA512 689734fe24a74a756a8243e0ea721d1e3877b485f5294040b34c763c905d53754daba857982875b3df1dc5630efefc71f17558b89b5470fb2bb084402beb4199
-EBUILD kodi-vfs-libarchive-2.0.0.ebuild 915 BLAKE2B b5ab69ffd29d2e9989af56554236753a3eb0ffcca84fcfb821173f5fe5f45c289f5eef31464915afa2e16509022d8bce699bdf8c1a8d91a4b4825c8a0206ed00 SHA512 caa9e7d511fb8d091b21984d71dad754d3e9aeb3113754e1cf835180b667273c2eef42dd6e3e1d847b86c95fe10be506425707833eea2a6108202d45f868d2e0
+DIST kodi-vfs-libarchive-2.0.1.tar.gz 56520 BLAKE2B 32d2fe05da176cbbbd601e62434595aa6b597074fd9c22495ccbf8db97abb479cc8df22a3b45cb7a79734245d29fe15e429410fa638cd98f5fac26198c89a8f4 SHA512 8a72a1ef01beedf6cbbc4349b4f1cec135dc99158cdd1d5fcda0bfbde74ed3cced9f2f8c01dafdb3891109c5b257b16a2448124de2396cb6db50b0316f67efb7
+EBUILD kodi-vfs-libarchive-2.0.1.ebuild 915 BLAKE2B 0c671028b2ca5096f20ed125c063509f579d561c2ac6ab56479b63d64acc32040949f3a2c58c90b3099800d748d09287ecece71073584f405f3cd082e618fadf SHA512 f8fe92674593a9d0ef9068e285fc3e4866366bf1f8b4bdee54aa92b00372b2b0e851891f2a8dd11657ec2c24387d5f8e0baaab008c79a795e6263b664ebb4c6c
 EBUILD kodi-vfs-libarchive-9999.ebuild 916 BLAKE2B cd40e056a5c3717e4d0ed9e73e002e101b618a8f46e3f5379bac8fd34852f10a10668dae337fd53a1819f24c341d137b37ff62c3201eda463007c62b255f2add SHA512 6ae39b87ac61c199f40262f559e8089f36572081bef86fe747b98104039fcaf4f657fe1b9a5514e1d2ad738829dfd777202fbd17d1e6b1ab24b9cf2a6394a6a0
 MISC metadata.xml 362 BLAKE2B 15fb984aa73d64305e9a4c0a5485faeffe8b8c34327be293a42e30ba9c1e3bdf7ddd289d3dc883e4fa74f97ef0ddedea89776ecafb552adf842b165b69634aae SHA512 2149d21665d378f0a48a50916f22aa19769062388cfa96885595268730b0536d4b5d3c182bf90dad4a96471809dfe2e295d395a11af49c00bc3ae47635fc02d8
diff --git a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-2.0.0.ebuild b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-2.0.1.ebuild
index 551c21eef802..eff36cf2fc22 100644
--- a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-2.0.0.ebuild
+++ b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-2.0.1.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
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 985b4bcfa6d7..24e16d9e85ec 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,6 +1,4 @@
 AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
-DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
 DIST live.2020.05.15.tar.gz 7229400 BLAKE2B 74532c178aa1044750110eb52561b99cd70874574ee84992201a145b18091d4f8475e2a299a83f0fe42c7e64483d46175fb76465a22509db3ba2633aff1327f6 SHA512 d53fb7e8c586f50e561aa361567ccd45babdbbcbe96a06d95e42a04a54b23ac3f474fefcacf94a49b604008623acf06789b92238364713853babbe356eeac4aa
-EBUILD live-2020.03.06.ebuild 3298 BLAKE2B 129514fe85a92a8d81a01ae26073b45a9ad76a505af10097f7aff1b61fe273fb3fb61c04c05146139ac8ca553d3c99e1ce8b13e59a88902e4468d1393f963251 SHA512 49c24dcfa8d5f24d1743e42ff4b49f18c31adac631c612c08eebb2d7f342b08cb51411fc96dbc914e44b730445f40d031cdc84f78111c8e920d3036cc2e7b792
-EBUILD live-2020.05.15.ebuild 3154 BLAKE2B 9c20b39704767d590025d46b8541c9bec6adab5410dd5284ff292cd821102c6e98bbc1d75b2df5399ab23172873b1a6dcdca69100a550cfe96dcaae6ea623c92 SHA512 4767b270ab195e7e2b780c6088ef454fba07acdf594cfb27e9b37096dbc8bbdc614695f49abe674db3ce61bd5c04fc29e9b2fa1a41aaf5a2aa56b89bad818ab5
+EBUILD live-2020.05.15.ebuild 3163 BLAKE2B 3f2a4ea97c868030ee08feb3b9601c8e897f0d4ecb81d6905d78ebd0436400e0163db84eb7db6cdd37448f748e55ecbd7b13b78ae20cd3b217af2794fb10850b SHA512 5f1975ad48ee3f2ec37467858b9980b38fd16044d59cdb116ae0663667086b99f9d44746bc7cc052a496a14b91d98e73482579d813ea1f3af9dde9a415068c8e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2020.03.06.ebuild b/media-plugins/live/live-2020.03.06.ebuild
deleted file mode 100644
index ac9a6a590b9e..000000000000
--- a/media-plugins/live/live-2020.03.06.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-# Upstream aggressively remove old versions: bug #719336.
-#SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
-SRC_URI="https://cmpct.info/~sam/gentoo/distfiles/${CATEGORY}/${PN}/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="libressl ssl"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>, Sam James <sam@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-# You may wish to use a site like https://abi-laboratory.pro/index.php?view=timeline&l=live555
-LIVE_ABI_VERSION=8
-SLOT="0/${LIVE_ABI_VERSION}"
-
-S="${WORKDIR}/live"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/config.gentoo-so-r3" "${S}/config.gentoo-so-r1" || die
-
-	# This is all legacy stuff which needs to be cleaned up
-	case ${CHOST} in
-		*-solaris*)
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live/config.gentoo-so-r1 \
-				|| die
-		;;
-	esac
-}
-
-src_configure() {
-	# This ebuild uses its own build system
-	# We don't want to call ./configure or anything here.
-	# The only thing we can do is honour the user's SSL preference.
-	if use ssl ; then
-		sed -i 's/-DNO_OPENSSL=1//' "${S}/config.gentoo-so-r1" || die
-	fi
-
-	# Bug 718912
-	tc-export CC CXX
-
-	# And defer to the scripts that upstream provide.
-	./genMakefiles gentoo-so-r1 || die
-}
-
-src_compile() {
-	export suffix="${LIVE_ABI_VERSION}.so"
-	local link_opts="$(usex ssl "$(pkg-config --libs libssl libcrypto)" '') -L. ${LDFLAGS}"
-	local lib_suffix="${suffix#.}"
-
-	einfo "Beginning shared library build"
-	emake LINK_OPTS="${link_opts}" LIB_SUFFIX="${lib_suffix}"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		cd "${S}/${i}" || die
-		ln -s "lib${i}.${suffix}" "lib${i}.so" || die
-	done
-
-	einfo "Beginning programs build"
-	for i in proxyServer mediaServer ; do
-		cd "${S}/${i}" || die
-		emake LINK_OPTS="${link_opts}"
-	done
-}
-
-src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock ; do
-		dolib.so "${S}/${library}/lib${library}.${suffix}"
-		dosym "lib${library}.${suffix}" "/usr/$(get_libdir)/lib${library}.so"
-
-		insinto /usr/include/"${library}"
-		doins "${S}/${library}"/include/*h
-	done
-
-	dobin "${S}"/mediaServer/live555MediaServer
-	dobin "${S}"/proxyServer/live555ProxyServer
-}
diff --git a/media-plugins/live/live-2020.05.15.ebuild b/media-plugins/live/live-2020.05.15.ebuild
index 50d236a95c7a..431d011ee95e 100644
--- a/media-plugins/live/live-2020.05.15.ebuild
+++ b/media-plugins/live/live-2020.05.15.ebuild
@@ -77,7 +77,7 @@ src_configure() {
 
 src_compile() {
 	export suffix="${LIVE_ABI_VERSION}.so"
-	local link_opts="$(usex ssl "$(pkg-config --libs libssl libcrypto)" '') -L. ${LDFLAGS}"
+	local link_opts="$(usex ssl "$($(tc-getPKG_CONFIG) --libs libssl libcrypto)" '') -L. ${LDFLAGS}"
 	local lib_suffix="${suffix#.}"
 
 	einfo "Beginning shared library build"
diff --git a/media-plugins/noise-repellent/Manifest b/media-plugins/noise-repellent/Manifest
new file mode 100644
index 000000000000..e001caf87421
--- /dev/null
+++ b/media-plugins/noise-repellent/Manifest
@@ -0,0 +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
+MISC metadata.xml 426 BLAKE2B aa1fc23cb11938eae31d52508105d8f67861b1cf6249bb8c292b2cb28fa547331f96550949c05d4898bbc75df66b0bfdd58807b62aa3c522896579de74fd541c SHA512 696f32d8c1225f1b692c556488557ed925fed8e2d3c80ab6e2ac1e564d1d4d0d16562e97af0f510115f6d3525fc47b00079e98b7f7b361d27fac61d56003fcf6
diff --git a/media-plugins/noise-repellent/metadata.xml b/media-plugins/noise-repellent/metadata.xml
new file mode 100644
index 000000000000..10c7c11cfd8c
--- /dev/null
+++ b/media-plugins/noise-repellent/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lucianodato/noise-repellent</remote-id>
+		<bugs-to>https://github.com/lucianodato/noise-repellent/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-plugins/noise-repellent/noise-repellent-0.1.5.ebuild b/media-plugins/noise-repellent/noise-repellent-0.1.5.ebuild
new file mode 100644
index 000000000000..528e355dc08e
--- /dev/null
+++ b/media-plugins/noise-repellent/noise-repellent-0.1.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="An lv2 plug-in for broadband noise reduction"
+HOMEPAGE="https://github.com/lucianodato/noise-repellent"
+SRC_URI="https://github.com/lucianodato/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	media-libs/lv2
+"
+RDEPEND="
+	sci-libs/fftw:3.0
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		--prefix="${EPREFIX}/usr/$(get_libdir)/lv2"
+	)
+	meson_src_configure
+}
diff --git a/media-plugins/tap-plugins/Manifest b/media-plugins/tap-plugins/Manifest
index fd09890c8e5a..18264fa891b7 100644
--- a/media-plugins/tap-plugins/Manifest
+++ b/media-plugins/tap-plugins/Manifest
@@ -1,5 +1,5 @@
 AUX tap-plugins-1.0.1-makefile.patch 1548 BLAKE2B b718586d51cb7e843c71a41965f08331510214cbb533d6464df5c33520021d818b9943bdb39c526f42611accc4000ff62e0f1175b3ccbccacd7b462312957f27 SHA512 c56af56531b10b6b0ff016813779280ff1c9bd52e6b79208d431ebc4c0e1e3cbf4150005997466492791867a1a8044824f0d3339cb4db567f8823bcf6e2d4ea2
 DIST tap-plugins-1.0.1.tar.gz 64649 BLAKE2B 2b8ac9a26197f5c980512d33daf4c604d7bb3046fb40e3826d559d4420921a0e124a5577d53d0896bc92111f69765f714d5f55a9da60546e2e6f29e5c851b2a5 SHA512 25f72bba83a5a40d480bc9d4659b64096102281d02e43ad93d5064b0ef7972184db40162d1ef78fd783f431740a4c4d5e03160cdd5f43da3bc1570ff462c863a
-EBUILD tap-plugins-1.0.1.ebuild 938 BLAKE2B 7b81e27ead9d427e86007362250bfc4f8497cf2f81efcba1cae2add9adaaff80ae25ba0f68744074993a89a81878e999f29eefe5bd13a2dc53d5e92d2bec4e87 SHA512 0e75d0a9d340b1b84bd950c3173c5b8d8f4e40716ef7e6777b4bc9213aec40db37edde5569e6bc2449505c912d259d41f5a0dd66a28bd0c5a47b2ce64a6f85d7
-EBUILD tap-plugins-9999.ebuild 940 BLAKE2B 43694aa289c1e86d42e1903365046d305e6f082badcba31369a51407aa3db42e29d2069f4150fb8e4550116774d749db168a0dbba6962857ac531e84cdffd48e SHA512 7b51ce3808366a13d03408fbd3b739ce52d8b6f444c3e73eaf8fe91c1361a9c04c0b3b5d20c809cbaec38f256495e1e3aecdf44f94f2c7ceefdcd208a503ec62
+EBUILD tap-plugins-1.0.1.ebuild 933 BLAKE2B f2114a6926c6db92ea732e7fb1705210e7a3ad00b5f75ecf76ac109fa5d414d37831677f8f52169ca1c47cbb7236abed3eff0758cd8cf114eebf8d641b58e4e1 SHA512 9839619b8c6efc1ceb5302b455ce40cb222c409c938c69be3267eda734a03cb6d5c38bb3ad00a2386a378fc01bd7a5e40a6c03198ff622a1d35c160b975a145d
+EBUILD tap-plugins-9999.ebuild 935 BLAKE2B 0a180239fa73087cfe3f2fa9d0282b64c10e2be43cd090ecbbdfcbf03accc7a4b0b236023a097a1d0d3983395622ff9eaac506651fff1bd7e21521702102dc54 SHA512 4f9aaa28850ec84d7f612f23c597c1e68bbf84d1da2f2673337e5ce1f140a30e0fe34c0d4d7bb2aa75a25c912891d541d1ea040b9c4baa02524fd72da7d0ab58
 MISC metadata.xml 1616 BLAKE2B 55ad5ec5fb9218329bd3454b553115c4139d71d6d31a182e0e35750e99963b8b83de92b9c82df3928f7a570395b9bfdf8d5a171a1ff33c7c8443875dca7af9e7 SHA512 876598a8cda8a0331c5fd97d04984a222b2e6a9c0aeffe780f5e970dc1914c75c7e56701fcfa42ef318b0aa88183149f498346a23c5990d6bd7383199c875e01
diff --git a/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild b/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
index cfd02417218d..691543d5b8dc 100644
--- a/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
+++ b/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_PROJECT="${PN}.git"
 else
 	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-	SRC_URI="https://github.com/tomszilagyi/tap-plugins/archive/v${PV}.tar.gz -> $P.tar.gz"
+	SRC_URI="https://github.com/tomszilagyi/tap-plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="Tom's audio processing (TAP) LADSPA plugins"
diff --git a/media-plugins/tap-plugins/tap-plugins-9999.ebuild b/media-plugins/tap-plugins/tap-plugins-9999.ebuild
index 4e6300510894..8bd2c913c9b2 100644
--- a/media-plugins/tap-plugins/tap-plugins-9999.ebuild
+++ b/media-plugins/tap-plugins/tap-plugins-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_PROJECT="${PN}.git"
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-	SRC_URI="https://github.com/tomszilagyi/tap-plugins/archive/v${PV}.tar.gz -> $P.tar.gz"
+	SRC_URI="https://github.com/tomszilagyi/tap-plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="Tom's audio processing (TAP) LADSPA plugins"
diff --git a/media-plugins/vdr-osdteletext/Manifest b/media-plugins/vdr-osdteletext/Manifest
index f11ffcae127f..600c31c4dca7 100644
--- a/media-plugins/vdr-osdteletext/Manifest
+++ b/media-plugins/vdr-osdteletext/Manifest
@@ -5,6 +5,8 @@ AUX rc-addon.sh 1191 BLAKE2B d85ac441b2899b48188bbaa8c021c6ce858a5e93f29b9476406
 AUX vdr-osdteletext.sudo 41 BLAKE2B 0667dd49014acdd7ebcd30fed09020dd72d96f1721c7482ee227ce8609456831c75dd7cd7e4791057daad13ae56712dff9e5e382ef36f7e08a8043c64048dad6 SHA512 bf67c332d86cc4d85c6e67a7d9d4fe8271dec1ca3a319bcb22c234278545120de99a97409c19c7f5e37d1f87e97a09306688ce868f385b502305c730bfa0263f
 DIST vdr-osdteletext-0.9.7.tgz 101400 BLAKE2B 52cabda446701ce4898705487e47e5ca5146e58b42b47814f3835326c72118c62212ab81cad036f147e23b0c330b08bd2b2ba82bb7cc41f1bfcbd2525dbfe179 SHA512 d7ebd74ba5411bc8c7596b4f5f30eba7bc71e09d137a10650e78761c58045a96f804468f87fbf0c27e8fa161b64b06035878e5fac9940f75ea728646e92e6c76
 DIST vdr-osdteletext-0.9.8.tar.gz 100954 BLAKE2B def803093a3726a7c9b1905e04e5790ad3959d8d66664ccc3b0147cf4ed5ff37389525cbc1504fed7e8da782c5c9e58128e35c6adaa1f4ab04ad15cc3e2ae8ba SHA512 48196382fba247ac3d0140d028e23a3474e9a3b440c33b7a27e6127abfa949b1a7ab6748416d3430b68a80830bfbff1831de9d7e902ff9701b9dfd2d873a1f58
+DIST vdr-osdteletext-1.1.1.tar.gz 111113 BLAKE2B 5f9f44ad0615877896a9080f1b32fe4e2c6cd1916dcf6ad50c32bc22ac0cec22f44339ad2d4df7ac3135c1533bde039d0497bc5d7dc365c8b869900d8a9191db SHA512 a4f7e5bd8845917868dcb2041dbb679884595611db796cf5a58d05e41a96efcf47f3fbb92314c58f1f3d9af656d6ab5ef985f3867ea8bd45dd1c0c6e7c745a3a
 EBUILD vdr-osdteletext-0.9.7.ebuild 1206 BLAKE2B 26d9c561a70002d6531181fc039203d8f7292fd23966f42f1d4080948d04c168d3c91df83454473ff13e8179a3c6ae21b8988cebd633723280a2635f9d119e51 SHA512 6b06ee1321f69fadb3eb9a1fd3af39c7942f85f35ce19ccac8ffb0aa45e9353a608d0f4fa4acdc75e367e5341262a4f9e13922d6a027b9f62b1b9a9d0a6e2644
 EBUILD vdr-osdteletext-0.9.8.ebuild 1234 BLAKE2B 65693a600e0378b9adccdde33aa8aa2dde04f8f7147af8d63189a9ef53f7356ef2d0270e0b33f112328fb9750e66fdedae4fe6b42ad993685a989434eb677b28 SHA512 cde3e9da20239555bce2bea3af95915e791e853afe94c367fad8b38abeae393eb56c943edaa170b0c549a08ec5b1b058ec58c0c03cccf23ec4a3a0057007e865
+EBUILD vdr-osdteletext-1.1.1.ebuild 1234 BLAKE2B 65693a600e0378b9adccdde33aa8aa2dde04f8f7147af8d63189a9ef53f7356ef2d0270e0b33f112328fb9750e66fdedae4fe6b42ad993685a989434eb677b28 SHA512 cde3e9da20239555bce2bea3af95915e791e853afe94c367fad8b38abeae393eb56c943edaa170b0c549a08ec5b1b058ec58c0c03cccf23ec4a3a0057007e865
 MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild
new file mode 100644
index 000000000000..58ca915916a6
--- /dev/null
+++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user-info vdr-plugin-2
+
+MY_P="vdr-plugin-osdteletext-${PV}"
+
+DESCRIPTION="VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/"
+SRC_URI="https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ public-domain" #teletext2.ttf, not copyrightable
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-video/vdr"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-.*
+	usr/lib64/vdr/plugins/libvdr-.*"
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /etc/sudoers.d
+	insopts -m440
+	newins "${FILESDIR}/vdr-osdteletext.sudo" vdr-osdteletext
+
+	local vdr_user_home=$(egethome vdr)
+	insinto "${vdr_user_home}/.local/share/fonts/"
+	insopts -m444
+	doins teletext2.ttf
+	fowners -R vdr:vdr "${vdr_user_home}/.local"
+}
+
+pkg_postinst() {
+	elog "This ebuild has installed a special teletext font"
+	elog "named \"teletext2\""
+	elog "You may go to the plugin's setup menu and select"
+	elog "the font."
+}
diff --git a/media-plugins/vdr-rpihddevice/Manifest b/media-plugins/vdr-rpihddevice/Manifest
index 1ba8c2ede357..200cca8f6580 100644
--- a/media-plugins/vdr-rpihddevice/Manifest
+++ b/media-plugins/vdr-rpihddevice/Manifest
@@ -1,5 +1,5 @@
 DIST vdr-rpihddevice-1.0.3.tgz 89445 BLAKE2B e459ca823e36ebf16c71bdc7db08311bfb31fabe3233ec62a076d69bf3428e2a6fc4cdc9a2cf906ba801942be559d98d68c28b7219fa3fbdba517eb80880be8c SHA512 9f5a9e06f382a11354d31531ad8a6277a49ce0b29c1ce2d96f952cdf1670779e5e3cd6e07eadcdd8eab151bd2467b53eeeb01d48f74f8e4f5232019110196c5e
 DIST vdr-rpihddevice-1.0.5.tgz 93199 BLAKE2B 32afd2ef30bfbfa3893f0be98cb4316c9a090fa3d99c3fb2632f818c590aebf0a095768c7bef64b22ece42eac979f7f80565a5a9587761546473682a25904286 SHA512 3a122a3b96851653cb626090307034a19d6968f923c300899c8c661c4a68ed86bd3212454098622c8813a4cad80bacd491469083661e50852509e99479784ab1
-EBUILD vdr-rpihddevice-1.0.3.ebuild 621 BLAKE2B 31d9645721aa415aa936d02d77144e676b029d6a20b1444be3d0c669d4baa927ce1cdf0f22171ebd5edf597afb86d3e5e784a56e2e32effbcad293c226e90c92 SHA512 23db7e129725f0112798453d540b6c2dc760533f29a9182313f9a10567d701d18052a0fe5e12faa086402c4e2d93f36de7922d42b3b0820ddd3087ec800abe98
+EBUILD vdr-rpihddevice-1.0.3.ebuild 621 BLAKE2B 80e43f5000ec182cbbbb2656ce8b003846b4c4c42bca946d27a061c15d4d61e226b785050ff8f8697de6b09a0d351510b67ce67b78b85466a0bea8f6dd35a129 SHA512 aa8e929835eb1fa020e123c21faeadd14597f9bbe2b94d651297caa2c743de01ea746972ccfb6ae448ae3040bbc269378f53562b9c2d0118d1ae0e4b0ec7a680
 EBUILD vdr-rpihddevice-1.0.5.ebuild 784 BLAKE2B 6f09879f9a85d5fda8ae71cee84802e99427a4e3e306d11524adf916bd46d73a742be9e14ba654a37415d34e62d09b945ddd7c4ee56e02e8dd0056a8872118e9 SHA512 6135ff19c862fa0123ce69c0a43953f4be1b06d8ee2e66bc978be21b5526053f87d4e33a4b7e80e94c5ca2c06993dd41673c646e2f17af5db101cbeebe2116fa
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.3.ebuild b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.3.ebuild
index bf5ba349408d..f04b9a32e2c2 100644
--- a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.3.ebuild
+++ b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.3.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
@@ -19,8 +19,7 @@ DEPEND="media-libs/raspberrypi-userland
 		media-video/vdr
 		media-video/ffmpeg"
 
-src_prepare()
-{
+src_prepare() {
 	sed -i "${S}"/Makefile -e '/LDFLAGS.*VCLIBDIR/s/$/ -Wl,--no-as-needed/' || die "sed failed"
 	vdr-plugin-2_src_prepare
 }
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index ffb0ee521e2b..e1c2f32dac61 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,10 +1,9 @@
 AUX confd-2.0.0 1476 BLAKE2B a1f852cb07940ff54125d88bae9467e5068e66e903b4dcdbde295cb3aa89a49d92ff7e89632882ad8be59037ff44e1f6f1d6a4f53d7200024e0fe69b499da693 SHA512 8ab8b99e770dacbaadfc97ccc80f3d2c857bf95b662b9152959ccd88b940f4d2f7d2957ea4f6390f30470aca809cb3bb04b8b9e696122131fbb6d9f5d010f579
 AUX vdr-frontend 392 BLAKE2B 99afb106dce6908c8d3a02d22c6072bbe4f9917bb8090175997769c465eede475a84329bb7b7bbd5ab1cde9a77d459652fb8b1c8b7630ebcb99034398a78fb55 SHA512 1c25d59809c7fafb837755eb9719bc11526b333cea01c6467aa83bf8b3284f10a4a62fafba00321a15f6cef4b462456ece1313b1fca00ce36b828418af883351
-DIST vdr-xineliboutput-2.1.0.tgz 415333 BLAKE2B 8311271dda889cde5ab69d5bf1f643c8f6b1991ca615ce6322ea5585aac12b07b32f6fd933bf6c3797d45971597e61d429e4d9de356246109cab7c8f059b4d79 SHA512 226654dcd47864e9df8282ef401509d291677587b2850872c535abb7bee468a7c6d72c30953090890d002f0977aa1ee357a0fe6938ce3f3c1b6324e82b926537
+AUX vdr-xineliboutput-2.2.0_no-gcc.patch 981 BLAKE2B ea8daf82a19d7f8dd7cf5b56e90ed51ea5b9a986d589611c3922a750e61f1a1208d2291f761c2bce1992cd4de9c15d41de93fd1ceccb3d17cf59d5f0c6268eba SHA512 c8861a49f9c9849dafc6ac600df3696606d810f6b58ee24026355899aa1708ad309548c2c8f7b00850faa2ebd54674aec450af276c3eb556c4a5f9b7dc5d28c0
 DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9
-EBUILD vdr-xineliboutput-2.1.0-r1.ebuild 3201 BLAKE2B 1d057379decee9e23aff0a443d655ff7793bec2cfd06d4e19f6c05505442f7baa3a1058017c21a0d5b1816f8e096c47db69ed30783faa328d49f0a4526002e08 SHA512 e0ebb6a9968b85fca262fa246e9a4d47c8ab2ceccb09b5acf288a3b7054b0fad8066de4f989311c5b2171175a0f4f15de587bf8e7dfd4e8f3d7719b9764c95e1
-EBUILD vdr-xineliboutput-2.1.0-r2.ebuild 3318 BLAKE2B f25c8ac3e048007869b5227400925715daae5ddf982c60ff219330647f2ecb55cde5995467a84b50acfa942e4e833243d0daaaff3c84993c299cb4ebf950b883 SHA512 9b5293041b576fa295584e64830aa2536c984f84331410ae0462503ddb94bb4325395a77aa45e4b6de3965417b9e346ba5ace208b0e5bfb7763dc1d6b8b61bc5
-EBUILD vdr-xineliboutput-2.2.0-r1.ebuild 3177 BLAKE2B 11e044f0c5012d8c88d73d033a2e20038135d0d325a117642e937031b93c26e039dc7bc6ced959d78bdcf142f275a9eb86cde4ea220a8e2478ac6b6fc06cf11a SHA512 49e2aee2f8004805b733d2ddb9da424ec991d13bba198eaf7c61675035ee62539a83963349a9cf87b88e7f250ee20715d1f6c1537bf8ef888de3b332478a4c92
-EBUILD vdr-xineliboutput-2.2.0-r2.ebuild 3293 BLAKE2B d42ae8f3753098b65dd9f06cfcbb00a8b758e4d0934154503ab866515c58b898a8e637ecb02c2a4fb43b0f4fb005b3689a1142337bc70dde9195800d95388487 SHA512 892b34de3311128690475d41bdd190b040031f0c1ef7415e1d0afa9e406abec54408aa9c7185913ded27377d7995af87c32ebe72cc5b9393798cff68798ca9a8
+DIST vdr-xineliboutput-2.2.0_clang.patch.bz2 7405 BLAKE2B 80d4a0ca3673f61cd14538c2fbdc03017f8c993a55b4c3de0349c799b7239052bc452fbd78689e9ccace2e865b4d08ec69365ed9ad6900e08205676135dac3b9 SHA512 c02cc9a6ee8c9b3458dec6439ea4fa85421f3ac01828e65b123d13db689a75cbba5622a7e1fd76066a19a714c2debdb08f4c78139573a4563aefab19107a5512
+EBUILD vdr-xineliboutput-2.2.0-r2.ebuild 3302 BLAKE2B fdf7d87e60040c920e51471a355502bc16bcb2d90d283e61d6372df570c905eb5f9a60e704452d3caa6231305d69db682bc9c9608e5a5ad747d9fed15aeb980c SHA512 ef250e619f44b4171cc81bd9b7c31d2fa16d915d024efe6a59b730f48961508035a36045be484af9a02b9ab5fbff6e361fd274c0a01f8d8a3dce7b0e5d10daac
+EBUILD vdr-xineliboutput-2.2.0-r4.ebuild 3445 BLAKE2B b1b14d6f9223524d5ab239d85e3f64b6670852b6f042aefb3cd35b3e397edfac81913b33ac3df4dfb5fc2dbf9538a6ba6c6d0095ddf42a130de7dc02ff576f9d SHA512 2a5ae525383b7ca2883420f4b9d742e126c90714fa05a681e48689bd86949b08bcc7d8c2ab77dddce932c32a3b212edd289380deaa438f39fc3a8d205133e57b
 EBUILD vdr-xineliboutput-9999.ebuild 3352 BLAKE2B a41dec91c3b93b71253984d17bc9bf4c959d25c112983d379f7e919fcd840f5cbc836a1ec1ad93ac2b129679e86d571594be8c1bd59e8e05065a93d4b98a40ca SHA512 6a9b0b7df8b77304b347b574840b69295d2916296e39298a74e7f0f90d84e4d19cba212b7eadad6cd2023b74126cc0db4dacd3983d654e999627db81e6927278
 MISC metadata.xml 830 BLAKE2B 04a0e0ba5a0afc1b2c3669a442bb5b62f44d25159c16c3a6539c541b43d22b4f30c8c6ea60b076f6326aed51ca4308af52971c3b3cc5bb5c93c3128ec22f6302 SHA512 4407810d8c94d896214a12e33698432024ffed5e788be0bf850aa706f2b3eefd9a5ecb58eaf37d6f3d28611ccaae9683b8feb97d2b1cc074386e67b6dc58e1e0
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch
new file mode 100644
index 000000000000..ac7cf5007ce4
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch
@@ -0,0 +1,33 @@
+get rid off call cc gcc directly
+disabled apple darwin check
+we are on gentoo!!!
+https://bugs.gentoo.org/show_bug.cgi?id=780462
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2021/April/07 )
+diff -Naur xineliboutput-2.2.0.orig/Makefile xineliboutput-2.2.0/Makefile
+--- xineliboutput-2.2.0.orig/Makefile	2021-04-07 20:28:54.667000000 +0200
++++ xineliboutput-2.2.0/Makefile	2021-04-07 20:29:31.558000000 +0200
+@@ -19,9 +19,9 @@
+ 
+ # check for Apple Darwin
+ ARCH_APPLE_DARWIN = no
+-ifeq ($(shell gcc -dumpmachine | grep -q 'apple-darwin' && echo "1" || echo "0"), 1)
+-    ARCH_APPLE_DARWIN = yes
+-endif
++#ifeq ($(shell gcc -dumpmachine | grep -q 'apple-darwin' && echo "1" || echo "0"), 1)
++#    ARCH_APPLE_DARWIN = yes
++#endif
+ 
+ #
+ # Override configuration here or in ../../../Make.config
+@@ -43,8 +43,8 @@
+ ### The C++ compiler and options:
+ ###
+ 
+-CXX      ?= g++
+-CC       ?= gcc 
++#CXX      ?= g++
++#CC       ?= gcc 
+ OPTFLAGS ?= 
+ 
+ ifeq ($(ARCH_APPLE_DARWIN), yes)
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
deleted file mode 100644
index 26cc8d658f5c..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs vdr-plugin-2
-
-GENTOO_VDR_CONDITIONAL=yes
-
-DESCRIPTION="VDR Plugin: Xinelib PlugIn"
-HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
-
-COMMON_DEPEND="
-	vdr? (
-		media-video/vdr
-		libextractor? ( >=media-libs/libextractor-0.5.20 )
-		caps? ( sys-libs/libcap )
-	)
-
-	xine? (
-		( >=media-libs/xine-lib-1.2
-			media-video/ffmpeg )
-		fbcon? ( jpeg? ( virtual/jpeg:* ) )
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-			bluray? ( media-libs/libbluray )
-			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
-			jpeg? ( virtual/jpeg:* )
-			opengl? ( virtual/opengl )
-			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
-			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-kernel/linux-headers
-	nls? ( sys-devel/gettext )
-	xine? (
-		X? (
-			x11-base/xorg-proto
-			x11-libs/libXxf86vm
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}"
-
-REQUIRED_USE=" || ( vdr xine )"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
-
-pkg_setup() {
-	vdr-plugin-2_pkg_setup
-
-	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
-		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if has_version ">=media-libs/xine-lib-1.2"; then
-		myconf="${myconf} --enable-libavutil"
-	else
-		myconf="${myconf} --disable-libavutil"
-	fi
-
-	# No autotools based configure script
-	./configure \
-		--cc=$(tc-getCC) \
-		--cxx=$(tc-getCXX) \
-		$(use_enable X x11) \
-		$(use_enable X xshm) \
-		$(use_enable X xdpms) \
-		$(use_enable X xshape) \
-		$(use_enable X xrandr) \
-		$(use_enable X xrender) \
-		$(use_enable fbcon fb) \
-		$(use_enable vdr) \
-		$(use_enable xine libxine) \
-		$(use_enable libextractor) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable xinerama) \
-		$(use_enable vdpau) \
-		$(use_enable dbus dbus-glib-1) \
-		$(use_enable nls i18n) \
-		$(use_enable bluray libbluray) \
-		$(use_enable opengl) \
-		${myconf} \
-		|| die
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
-	if use vdr; then
-		vdr-plugin-2_src_install
-
-		# bug 346989
-		insinto /etc/vdr/plugins/xineliboutput/
-		doins examples/allowed_hosts.conf
-		fowners -R vdr:vdr /etc/vdr/
-
-		if use nls; then
-			emake DESTDIR="${D}" i18n
-		fi
-
-		if use xine; then
-			doinitd "${FILESDIR}"/vdr-frontend
-
-			insinto $XINE_PLUGIN_DIR
-			doins xineplug_inp_xvdr.so
-
-			insinto $XINE_PLUGIN_DIR/post
-			doins xineplug_post_*.so
-
-			if use fbcon; then
-				dobin vdr-fbfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-fbfe.so.*
-			fi
-
-			if use X; then
-				dobin vdr-sxfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-sxfe.so.*
-			fi
-		fi
-	else
-		emake DESTDIR="${D}" install
-
-		dodoc HISTORY README
-	fi
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
deleted file mode 100644
index 5f905220218f..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs vdr-plugin-2
-
-GENTOO_VDR_CONDITIONAL=yes
-
-DESCRIPTION="VDR Plugin: Xinelib PlugIn"
-HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
-
-COMMON_DEPEND="
-	vdr? (
-		media-video/vdr
-		libextractor? ( >=media-libs/libextractor-0.5.20 )
-		caps? ( sys-libs/libcap )
-	)
-
-	xine? (
-		( >=media-libs/xine-lib-1.2
-			media-video/ffmpeg )
-		fbcon? ( jpeg? ( virtual/jpeg:* ) )
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-			bluray? ( media-libs/libbluray )
-			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
-			jpeg? ( virtual/jpeg:* )
-			opengl? ( virtual/opengl )
-			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
-			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-kernel/linux-headers
-	nls? ( sys-devel/gettext )
-	xine? (
-		X? (
-			x11-base/xorg-proto
-			x11-libs/libXxf86vm
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}"
-
-REQUIRED_USE=" || ( vdr xine )"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
-
-pkg_setup() {
-	vdr-plugin-2_pkg_setup
-
-	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
-		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if has_version ">=media-libs/xine-lib-1.2"; then
-		myconf="${myconf} --enable-libavutil"
-	else
-		myconf="${myconf} --disable-libavutil"
-	fi
-
-	# No autotools based configure script
-	./configure \
-		--cc=$(tc-getCC) \
-		--cxx=$(tc-getCXX) \
-		$(use_enable X x11) \
-		$(use_enable X xshm) \
-		$(use_enable X xdpms) \
-		$(use_enable X xshape) \
-		$(use_enable X xrandr) \
-		$(use_enable X xrender) \
-		$(use_enable fbcon fb) \
-		$(use_enable vdr) \
-		$(use_enable xine libxine) \
-		$(use_enable libextractor) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable xinerama) \
-		$(use_enable dbus dbus-glib-1) \
-		$(use_enable nls i18n) \
-		$(use_enable bluray libbluray) \
-		$(use_enable opengl) \
-		${myconf} \
-		|| die
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
-	if use vdr; then
-		vdr-plugin-2_src_install
-
-		# bug 346989
-		insinto /etc/vdr/plugins/xineliboutput/
-		doins examples/allowed_hosts.conf
-		fowners -R vdr:vdr /etc/vdr/
-
-		if use nls; then
-			emake DESTDIR="${D}" i18n
-		fi
-
-		if use xine; then
-			doinitd "${FILESDIR}"/vdr-frontend
-
-			insinto $XINE_PLUGIN_DIR
-			doins xineplug_inp_xvdr.so
-
-			insinto $XINE_PLUGIN_DIR/post
-			doins xineplug_post_*.so
-
-			if use fbcon; then
-				dobin vdr-fbfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-fbfe.so.*
-			fi
-
-			if use X; then
-				dobin vdr-sxfe
-
-				insinto $VDR_PLUGIN_DIR
-				doins libxineliboutput-sxfe.so.*
-			fi
-		fi
-	else
-		emake DESTDIR="${D}" install
-
-		dodoc HISTORY README
-	fi
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
index 67a25eda7352..c3df9aff749c 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.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
@@ -61,7 +61,7 @@ pkg_setup() {
 	vdr-plugin-2_pkg_setup
 
 	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir libxine)
 		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
 	fi
 }
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
index 22b0356c3c50..b9d615c9322d 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs vdr-plugin-2
+inherit vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 
 DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz
+		http://vdr.websitec.de/download/${PN}/${P}_clang.patch.bz2"
 
 SLOT="0"
 LICENSE="GPL-2+"
@@ -71,6 +72,10 @@ src_prepare() {
 
 	# bug 711978
 	sed -e "s:X11  opengl:X11  OpenGl:" -i configure || die
+
+	# bug 771036,780462 do not call cc directly
+	eapply "${FILESDIR}/${P}_no-gcc.patch"
+	eapply "${WORKDIR}/${P}_clang.patch"
 }
 
 src_configure() {
@@ -100,7 +105,6 @@ src_configure() {
 		$(use_enable cec libcec) \
 		$(use_enable jpeg libjpeg) \
 		$(use_enable xinerama) \
-		$(use_enable vdpau) \
 		$(use_enable dbus dbus-glib-1) \
 		$(use_enable nls i18n) \
 		$(use_enable bluray libbluray) \
diff --git a/media-plugins/x42-plugins/Manifest b/media-plugins/x42-plugins/Manifest
new file mode 100644
index 000000000000..54668d792af2
--- /dev/null
+++ b/media-plugins/x42-plugins/Manifest
@@ -0,0 +1,4 @@
+DIST x42-plugins-20210409.tar.xz 3442288 BLAKE2B d6d4e6e20935b400b96a944b9e8aea7797129f09be79313092760a32b69913c94a7b3ea0b434e35052adc9b348a03788e73bd22556941315f39c15c7d66c0dd4 SHA512 4f551af86904368b2cf13367bb0ea47055c1bff43f32d4e846a1758dc014bb83b69a6612cae30357a734195bbb3802b943d3c64f6f5a264403c4dbcb14b467a6
+EBUILD x42-plugins-20210409.ebuild 948 BLAKE2B 7424af2904f562a89b95424c5a4e7f3b33fee9e446ca06f0f8adc7a41e67827d16f95ef351f4a89cae672937e6e40db63ffc3b88c5020b75e322fb9a6904d227 SHA512 fb140d12cd2485546360ece3d2002fc97c3aa640edfaf500ecf57dd2be8b2110b1ea7149d2e3f0a576d47fdebad25a3bbe7f9c1abf6eef853b47fd15218fa0a4
+EBUILD x42-plugins-9999.ebuild 948 BLAKE2B 7424af2904f562a89b95424c5a4e7f3b33fee9e446ca06f0f8adc7a41e67827d16f95ef351f4a89cae672937e6e40db63ffc3b88c5020b75e322fb9a6904d227 SHA512 fb140d12cd2485546360ece3d2002fc97c3aa640edfaf500ecf57dd2be8b2110b1ea7149d2e3f0a576d47fdebad25a3bbe7f9c1abf6eef853b47fd15218fa0a4
+MISC metadata.xml 339 BLAKE2B 6bbc98489c148507b921e5135a8d6adb02da4491c6058b80e02993372e017d66607a279cc0286a48707c2716ec2a7ab8dc2570149c48a7655bcf18246fbdaacf SHA512 fe60864eb9c9ce69a21f2f1d3625823fc28f0b8eb2ad6b9087b7e8746bd17824497767303e10c5a1063c2cf0dea6357cf382c127b5f734c2b673838c0e9b8134
diff --git a/media-plugins/x42-plugins/metadata.xml b/media-plugins/x42-plugins/metadata.xml
new file mode 100644
index 000000000000..52a852d5202d
--- /dev/null
+++ b/media-plugins/x42-plugins/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">x42/x42-plugins</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-plugins/x42-plugins/x42-plugins-20210409.ebuild b/media-plugins/x42-plugins/x42-plugins-20210409.ebuild
new file mode 100644
index 000000000000..62be7c10ec26
--- /dev/null
+++ b/media-plugins/x42-plugins/x42-plugins-20210409.ebuild
@@ -0,0 +1,46 @@
+# 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-9999.ebuild b/media-plugins/x42-plugins/x42-plugins-9999.ebuild
new file mode 100644
index 000000000000..62be7c10ec26
--- /dev/null
+++ b/media-plugins/x42-plugins/x42-plugins-9999.ebuild
@@ -0,0 +1,46 @@
+# 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
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /media-plugins
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)