gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-plugins
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
568 files changed, 2994 insertions, 4341 deletions
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 5b2030a6fa6c..5ce3d0997ba3 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index fbb4b7a7fecd..69ec2bd998fa 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -3,6 +3,8 @@ AUX calf-0.90.1-fluidsynth-2.patch 2410 BLAKE2B 199e9c5f4ae4253073ef80ef1ba3cc8e
 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
 DIST calf-0.90.1.tar.gz 15872959 BLAKE2B 5d2d9e77ea600690814e503a0af0fcbc413b7a21496271add0ea3b1e83f3dc2d56b0df249447a861884422ac5b159befe2632c232fed4721cc7e0e7ac45f12b1 SHA512 48e5489fd3e1dd43ff520b3653597dea6903c60adcdd0462ac2ce4db6f35e2355a0386f8a29066b301dd9c3190f8f836a61d12f37cfc3a4fea3170947cec03ff
+DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7
 EBUILD calf-0.90.1.ebuild 1656 BLAKE2B c1b17477020a7e2e602770604a752647a844b28728aa8fd1b89d0932b6c03cc1e03604d0dd8a8b8b50ad0555a4e8f932c6c55aa30940cd115ba36324e06ba3c6 SHA512 2ecea54b241edd15a99c069ea4ca6cc39cc29cf64ecbf345055817c7a5cfcfdec4fe4feeebc136fa09a3518bd35ef32eca7de95d763fee1ff210e15d67eccda4
+EBUILD calf-0.90.3.ebuild 1636 BLAKE2B 26944eed996b1f7c0c2db5871c858f33268f95a3a82dce479462b1866af682d4e241c526eb5dd948f2141d131c3051721dc1a22c6403aefe13cc32bfa63e2edc SHA512 867ed42443ba883ccde95fca8e1b6b72b6a4dbd45e9984dd488d43325d66f93eeb0e8f13733f25533cb34f675fc315791a41b6dbf4fae17fd821d50729a558d5
 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.ebuild
new file mode 100644
index 000000000000..e8aaa6330d72
--- /dev/null
+++ b/media-plugins/calf/calf-0.90.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
+HOMEPAGE="http://calf-studio-gear.org/"
+
+if [[ "${PV}" = "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
+else
+	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2 static-libs"
+
+REQUIRED_USE="jack? ( gtk )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	media-sound/fluidsynth:=
+	gtk? (
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.90.1-no-automagic.patch"
+	"${FILESDIR}/${PN}-0.90.1-htmldir.patch"
+	"${FILESDIR}/${PN}-0.90.1-desktop.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/usr
+		--without-obsolete-check
+		$(use_enable experimental)
+		$(use_enable gtk gui)
+		$(use_enable jack)
+		$(use_with lash)
+		$(use_with lv2 lv2)
+		$(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "")
+		$(use_enable static-libs static)
+		$(use_enable cpu_flags_x86_sse sse)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/share/bash-completion/completions/calf \
+		"${ED}"/usr/share/bash-completion/completions/calfjackhost
+}
diff --git a/media-plugins/gmpc-alarm/Manifest b/media-plugins/gmpc-alarm/Manifest
index 531c6c453c90..569d95d5202f 100644
--- a/media-plugins/gmpc-alarm/Manifest
+++ b/media-plugins/gmpc-alarm/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-alarm-11.8.16.tar.gz 312427 BLAKE2B 52e1cd819dd93041c83d460672df0933d7912645b1a2001e801fc449fe092b9651027a1d388bf91b8411370c94468f1c4f89f1377446b90d65e2a77174f3eb67 SHA512 a1fbb66137d9bbbdcf5e4d59fa57628193fde049e9dde08a73ec16dfebdf84a674a643971b6be8d40f2727bf0e591f5aade898080ec5ccb39ec764ff86d041fb
-EBUILD gmpc-alarm-11.8.16.ebuild 625 BLAKE2B bf1811384767bea5bafdfef06e099438409528107a44df279358ced8760f91f2511ab2998b79c9e25df03d24e740ee4104a7a33e950e6a14b69baed5f223c286 SHA512 2823969240517a0631b32fdb2b13e5a0f14715a2a34184b679b226f69ca7e32ba228eff49142ae3bbd95845116717c64d487f8fd1bd1c6f022713de6aa13fc78
+EBUILD gmpc-alarm-11.8.16.ebuild 642 BLAKE2B 9f7d24a418dd014d70da5ccb0c6b68806dd0b12cde1b4c354c3bffeb397b2239d69d9827e9cc3d276052cc8a180912ad67695fedda6f0b8e986111ddffb7f666 SHA512 ef9dfc7ac80010c6e633ea0c58f6638781e132981c93cf079d98db60e040b88bd9fba2541ea3f27e686bed4fddce7528031cefa88ddd86d4af8553461f3d79cc
 MISC metadata.xml 251 BLAKE2B 2dfd71705b87048051ac1b7d303539286ef25dbbba483975030d49f6da7209cd95ff14a945742127d5db25ca9190ff54252a0f0c573e03a8389b2cb632f90adf SHA512 62aceffd66c33efd4210c0d088e70390e489479a4085244e76e25f599bebbee78bdb994209bc5371e6d762f9f0bb94d164774e0a3182d58fb40de166710c0b75
diff --git a/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild b/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild
index 7a00add6813d..e50d034f8191 100644
--- a/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild
+++ b/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="This plugin can start/stop/pause your music at a preset time"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_ALARM"
@@ -13,17 +13,21 @@ KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 RDEPEND=">=media-sound/gmpc-${PV}"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 src_configure() {
-	econf \
-		$(use_enable nls)
+	econf $(use_enable nls)
 }
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-albumview/Manifest b/media-plugins/gmpc-albumview/Manifest
index a06cf7ab8e96..74d0d1d23ccf 100644
--- a/media-plugins/gmpc-albumview/Manifest
+++ b/media-plugins/gmpc-albumview/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-albumview-11.8.16.tar.gz 438771 BLAKE2B f3c82d319fd116c12d6408d94e9c0d33586e99367331157bf0792cd726599c76260491808323681d0c2540e1ce255ce61bbbf1bd12be3a191cb8910b8ef180d2 SHA512 fb77a8ea5db798b730532eb950b0003da97c5b0bfba1d32486d4c5bb40ac6661c73f37f12662b32b28e4311707c9fc7b2722c47686ebd953105d7cd2b9d86cc4
-EBUILD gmpc-albumview-11.8.16.ebuild 611 BLAKE2B f447637544e54d7772505714bdd9b1772d194e23db5e8896343725781d8e2128b3a1ed5d9aa2e9c1bbe6b57e622df9fb4db489f2d6e69939ea0a56efcbb9243f SHA512 2fd992d18911301eb1d608e091b8875cb16e8588fc9b18cf8cd5ddcd968bc4f159ed98ec7595b3408cbf8508f3d3f23f80322c19537fa62f5a03164d039b19df
+EBUILD gmpc-albumview-11.8.16.ebuild 632 BLAKE2B 3756c8e3828709712f6a31427c983fbd0489033a631dba569f9d520bd32551e484d661206f115d597f1a0a288f5c6a7a61754c099b7c13a038d98f22cfef7aed SHA512 f8d3c7e770eee3c21c2eae530a4d3232b52aae63d98190bfe2ba2b5e11244c61b6379ee2ec971a1ceca937e06ab5bb2608a1b830f88f2a0813830814bee08632
 MISC metadata.xml 251 BLAKE2B 2dfd71705b87048051ac1b7d303539286ef25dbbba483975030d49f6da7209cd95ff14a945742127d5db25ca9190ff54252a0f0c573e03a8389b2cb632f90adf SHA512 62aceffd66c33efd4210c0d088e70390e489479a4085244e76e25f599bebbee78bdb994209bc5371e6d762f9f0bb94d164774e0a3182d58fb40de166710c0b75
diff --git a/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild b/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild
index 002f45ed0e8f..fd03c1bb0fc8 100644
--- a/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild
+++ b/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="This plugin shows your music collection in albums"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_ALBUMVIEW"
@@ -13,10 +13,13 @@ KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND=">=media-sound/gmpc-${PV}"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 src_configure() {
 	econf $(use_enable nls)
@@ -24,5 +27,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-avahi/Manifest b/media-plugins/gmpc-avahi/Manifest
index 6cac4b6467e0..da9c60320ad6 100644
--- a/media-plugins/gmpc-avahi/Manifest
+++ b/media-plugins/gmpc-avahi/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-avahi-11.8.16.tar.gz 305195 BLAKE2B 8ee542c2bb2668b768a8aad53b53570de1090fa150f7564ac9226e0130af6bc6cf69e891ed3a74a319007b7568ff56d197dc86de646a6f496d705e9b29a4e64c SHA512 0d9177e959fc4b929ab9117c338db96397b7130f121f3990937690d6bded0c1e4b10dba2c416bb6327c1523c51a377f2fa0492f9f0c9815736d2b5b3e6c4f358
-EBUILD gmpc-avahi-11.8.16.ebuild 648 BLAKE2B 7c8c7184ba2b5dab6182ca851baec184df4b5ecfee8596ce81b695c356d31e41701a040d878b331b5f268283ceeebb0cb95821e1281521d87cb77fccca83575c SHA512 c6c76664e6f8445032b6568a53a7961485d2a785f4f1b22bcbf3efa45144e2bf80095f9d5a355012901dd072ab6bc76cc13cef73c6a2096258ce4446f9eb12be
+EBUILD gmpc-avahi-11.8.16.ebuild 675 BLAKE2B c5ee33fe591ab44dbde97cb26e4d979ca1cb3de8b4f67d05f2bde5586a30519ed6c462b7a4a8a10f3392c8a523d8ec84adb28725c0e616839bc938fdb58510c4 SHA512 bbce9b4bf509a2354fb70f7a9cc1feadd32aa1fce352fe03e824be86100182044977fe118a8d972c934807e562fa9ea411f178574361ce824518803df92e889f
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild b/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild
index 3bd0b417b8aa..5a9d5ddb0d35 100644
--- a/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild
+++ b/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="This plugin discovers avahi enabled mpd servers"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_AVAHI"
@@ -12,13 +12,17 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND=">=media-sound/gmpc-${PV}
-	dev-libs/libxml2
-	net-dns/avahi[dbus]"
-DEPEND="${RDEPEND}
+RDEPEND="
+	>=media-sound/gmpc-${PV}
+	dev-libs/libxml2:2
+	net-dns/avahi:=[dbus]"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 src_configure() {
 	econf $(use_enable nls)
@@ -26,5 +30,7 @@ src_configure() {
 
 src_install () {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-awn/Manifest b/media-plugins/gmpc-awn/Manifest
index 39f32637166f..e7d52ae95484 100644
--- a/media-plugins/gmpc-awn/Manifest
+++ b/media-plugins/gmpc-awn/Manifest
@@ -1,4 +1,4 @@
 AUX gmpc-awn-0.20.0-multilib.patch 314 BLAKE2B 3ccf43ef832dd9a12e06862cee46a2b299d135d742e0a0ccc8c86db83c100d8cb6a9fa3c7d346d6256d52bc9eb92882b77a2d6d3e2bfffe1e927cbc723114cc8 SHA512 0310fb42849a46513e6ac19648258739462874ed7ee2a43bf1e5194c5a9558567810c089bc0eef2e2b619c9902f92c0678036b7310517ba073d8508377bbb27f
 DIST gmpc-awn-11.8.16.tar.gz 303112 BLAKE2B 737950450428e1a46aad11b04edc3f9fd837e1831a9dfcde1ad46a29ca84597f19a8611f5774ba0d8898d69ee46fbc2dbc097b801f10b4cc0f13f8e3f98f7679 SHA512 74c1eb2134fa495634b4fbdda08a314ad1b2c809355eec9e368b693d7a245855eac76c5e63693b12edf187a9bc371295831dcb7856c896ce539ce0123c5c3574
-EBUILD gmpc-awn-11.8.16.ebuild 741 BLAKE2B d94bf240a49a78f1ec251fd23f2e66c74b226816a3bfb87a6182c212b3e6caa4bf48b063b30dbf5e80562d0cfcc2e7a3b8c61b316689dd164910a26f88866517 SHA512 585fab5c1b977adbc4a3dfff5b7ae305d68ddc985311f5d4a7281c425a862eff0ae80a88b9e052e8b35810f4321f27bb4541dfcf1c288806c5209e72e40eba49
+EBUILD gmpc-awn-11.8.16.ebuild 772 BLAKE2B c405ee9c1eb6f18328486590e68b3ea5e25bffd89f5c64c1e91947a17db293ed92ca6fde64b5e7d7af581f53e164f3ac924827372d5d4c5736c436c2cf305558 SHA512 7ba43163e705af0f1e3c2bddfbb2fddb1945165769f049f8514ff360c9cd0001c8b1d8e0e52af7668afd60c2f7970062922112f9cb84595a87296b2a4f94c5eb
 MISC metadata.xml 251 BLAKE2B 2dfd71705b87048051ac1b7d303539286ef25dbbba483975030d49f6da7209cd95ff14a945742127d5db25ca9190ff54252a0f0c573e03a8389b2cb632f90adf SHA512 62aceffd66c33efd4210c0d088e70390e489479a4085244e76e25f599bebbee78bdb994209bc5371e6d762f9f0bb94d164774e0a3182d58fb40de166710c0b75
diff --git a/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild b/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
index e884f68df569..59b7b155be36 100644
--- a/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
+++ b/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="This plugin integrates GMPC with the Avant Window Navigator"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_AWN"
@@ -13,15 +14,21 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND=">=media-sound/gmpc-${PV}
+RDEPEND="
+	>=media-sound/gmpc-${PV}
 	dev-libs/dbus-glib"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-multilib.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.20.0-multilib.patch
+	default
 	eautoreconf
 }
 
@@ -31,5 +38,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-jamendo/Manifest b/media-plugins/gmpc-jamendo/Manifest
index ec6e63025fcb..98fdfe022b71 100644
--- a/media-plugins/gmpc-jamendo/Manifest
+++ b/media-plugins/gmpc-jamendo/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-jamendo-11.8.16.tar.gz 328998 BLAKE2B 441b849fddba1802098b73085f6ad44d80d12495483b545d2f4a41e7874535941851abade370e669a4e075de950ddd4ca7d6ba89514a36797e7a70796119f269 SHA512 387b41407db868da69cab4192e353cf5bf3e281103dd0376d852fdeaad8a2e84f4a4858ceda8fe5edb853a205c7abe529b516c82a8e713a9fbd7bfbbd662a56f
-EBUILD gmpc-jamendo-11.8.16.ebuild 676 BLAKE2B de97df5a70d8d72e79ac364e7be26646a5eb12af21649d51358e756f4e943798ec74c10207f86e6107dae4ff35d4e5c537f09f66477c955d90c9b23190ef0a9d SHA512 b8bc1923776f05db7afc86a363342901486d13422fef0f166279e7918b85f12064f56be7b1d46728e915cfe7dbbca6c1c46c545bdb36839eaa68b200a384f554
+EBUILD gmpc-jamendo-11.8.16.ebuild 699 BLAKE2B 9a085ef3499eeb845f8cc33b51d7c644e7e976ae65e3c12f1b1b5a6b74b8fd5ab2a79b91d234e08409f85bbadddd47445899cc97ac5d86fc638fb664f024e9c2 SHA512 0428d66ee3dc0d879e623376e0e890a1c306564e5ebdfd8a0e0e021b1f7dc2fbff9ebdfbd3d1f067f550ac5f1b60b3ee64ec68687e4aca4141c364f723872279
 MISC metadata.xml 251 BLAKE2B 2dfd71705b87048051ac1b7d303539286ef25dbbba483975030d49f6da7209cd95ff14a945742127d5db25ca9190ff54252a0f0c573e03a8389b2cb632f90adf SHA512 62aceffd66c33efd4210c0d088e70390e489479a4085244e76e25f599bebbee78bdb994209bc5371e6d762f9f0bb94d164774e0a3182d58fb40de166710c0b75
diff --git a/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild b/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild
index bf20216ce05a..fc37e3e4d09a 100644
--- a/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild
+++ b/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Plugin allows you to browse and preview music available on jamendo"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_JAMENDO"
@@ -12,14 +12,18 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND=">=media-sound/gmpc-${PV}
+RDEPEND="
+	>=media-sound/gmpc-${PV}
 	dev-db/sqlite:3
 	dev-libs/libxml2:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	dev-util/gob
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 src_configure() {
 	econf $(use_enable nls)
@@ -27,5 +31,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-libnotify/Manifest b/media-plugins/gmpc-libnotify/Manifest
index 9f399937ad7c..48517c765d57 100644
--- a/media-plugins/gmpc-libnotify/Manifest
+++ b/media-plugins/gmpc-libnotify/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-libnotify-11.8.16.tar.gz 303691 BLAKE2B 6c841caf831b7cd2a4f8037e4b4d2912dd927296c07d1b6da0269f58a2d28a798619f2eacd6d634f2b1edaa992cca14d46b1a4a0590d79ce58ec445c0e0e145b SHA512 a9422e9f2c23c642967f81b75ca6915c54c364e11ff55321052e7db7dafb12bb832f4fc165a844f43c6db464b999f0cc28e7f8731a84afa643108b0633642967
-EBUILD gmpc-libnotify-11.8.16.ebuild 662 BLAKE2B 23e3db5905a82a8e32e1fc84ab97c2b67c7748c9feb31e618f68d547e8a787a42ec30145e0863c05e6b59c7753ded4c7dd13d96f325f05f7a47842f506e28fbc SHA512 c5877ea5663001597490a4f1fb27bd2da2281e4dd8cbbcfc48d63b43926570ff0d4aa5c40cbcd495cb1a29874a8ca4e64779c5b6a7f4d8a80df251bb2e767fe4
+EBUILD gmpc-libnotify-11.8.16.ebuild 687 BLAKE2B 505fcb49741754d7fd847cddc82fab3a971849432e9ab129def48d05894a94228466285c0dd59ff6557c1919c892bb0865e6f530f2440a6b4150f7c50a859591 SHA512 c57fdc136341b026503b3739dd1f8733a6187392738713b8f0ca0d6f6d65538915693f222280ea793f8ac232b63688759c889ca5c7146f6a1ca297693f5970d3
 MISC metadata.xml 330 BLAKE2B ae3e6e55e7242be59fb78c323c1cd469cb0aa389bcde7f8bca9b6f15ffb60bef085f46c0ec89a0f4c875a0497cf90ea6978975bc3a84f4cbae9d18f4516db64d SHA512 4057990697f90e26393a6703378247c2d0eaa5a3d459a72ed90c5cbd20ed1d74afecae9265fde640f8acb603d3f4f5dbedfb18a957606fe96b9a2c26ede51574
diff --git a/media-plugins/gmpc-libnotify/gmpc-libnotify-11.8.16.ebuild b/media-plugins/gmpc-libnotify/gmpc-libnotify-11.8.16.ebuild
index 93b469028709..7bca10979738 100644
--- a/media-plugins/gmpc-libnotify/gmpc-libnotify-11.8.16.ebuild
+++ b/media-plugins/gmpc-libnotify/gmpc-libnotify-11.8.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="This plugin sends an announcement to the notification daemon on song change"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LIBNOTIFY"
@@ -12,13 +12,17 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND=">=media-sound/gmpc-${PV}
-	dev-libs/libxml2
+RDEPEND="
+	>=media-sound/gmpc-${PV}
+	dev-libs/libxml2:2
 	x11-libs/libnotify"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 src_configure() {
 	econf $(use_enable nls)
@@ -26,5 +30,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-lyrics/Manifest b/media-plugins/gmpc-lyrics/Manifest
index 169ea72c4fc4..5a08892ff9f7 100644
--- a/media-plugins/gmpc-lyrics/Manifest
+++ b/media-plugins/gmpc-lyrics/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-lyrics-11.8.16.tar.gz 306510 BLAKE2B 6a1e2fca6de6e930bc139724d3eef5c4bf6b5166325a59321634cf00873638df24421d65bffba9e80e0c7619f6e12c38eabe366ced8c90bca70853222d4ea3b9 SHA512 88737fddd75e564b9cf403ebc2c49964e8df59007467b688cd40879b35a14d8d8d6625213db91cab7e3d0abb47fb345e6f13501f9fdd5fe26ad8e43d0e88ea3f
-EBUILD gmpc-lyrics-11.8.16.ebuild 592 BLAKE2B e7d3f835111816a463ae02bc01ac49c90fbbc2cbe472b40c861ff7c4c11ab332730a2aa4365e4fea98d09b702bb220012744034ce38097c069804dc9033fcc2f SHA512 dbc285d5bbe3bd7dd7e336a9f3cd364672793e7f4624a83877317e5f44156f5956abc006bf9fcd45bbaae331b655d83c40d2887f2417e34d0ea657de87b2e617
+EBUILD gmpc-lyrics-11.8.16.ebuild 615 BLAKE2B a076e1b108ca477523a0b0d25687638129da143f86cf1b1343937f09dc43ff9e59438efaafb36a827cf5adcb4250c74069b93ac1592e33f23a48e3fc5df3ef2b SHA512 a4a53c2db32456b0462f08889daf9d4cdc34e156a6299902ea1f22a00e2e419784f7f50f79369ab04ef035c1efbffea9596878d839398144823f2d2e945d4305
 MISC metadata.xml 508 BLAKE2B 2f860a617e9060c9fa3667fa9d7da011d994f860cef350664fe16c6d1c72691454152855275a072e47af4f88156eb20891b18db51d8c3df0e0d7fac5c3bbd0e8 SHA512 5f09b90dde8c72d4f41ac45eac1c7d2cd79ee0f23af4522fe270de4f826a03aed1fc83fc0a4b167675571957e149c555048124537e3769f26a377a88f6285c91
diff --git a/media-plugins/gmpc-lyrics/gmpc-lyrics-11.8.16.ebuild b/media-plugins/gmpc-lyrics/gmpc-lyrics-11.8.16.ebuild
index a579690cdb18..54536f76f229 100644
--- a/media-plugins/gmpc-lyrics/gmpc-lyrics-11.8.16.ebuild
+++ b/media-plugins/gmpc-lyrics/gmpc-lyrics-11.8.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="This plugin fetches lyrics"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LYRICS"
@@ -12,12 +12,16 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND=">=media-sound/gmpc-${PV}
+RDEPEND="
+	>=media-sound/gmpc-${PV}
 	dev-libs/libxml2:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 src_configure() {
 	econf $(use_enable nls)
@@ -25,5 +29,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-lyricwiki/Manifest b/media-plugins/gmpc-lyricwiki/Manifest
index 4ea7c0580bec..877a5fb6041a 100644
--- a/media-plugins/gmpc-lyricwiki/Manifest
+++ b/media-plugins/gmpc-lyricwiki/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-lyricwiki-11.8.16.tar.gz 306508 BLAKE2B bbc990c19fb3280abcbc227172c3b2121a3a8195f13a674b3ac529d37cac74f5b6ac9f356c47c6ba04250f973d4bb3929eab9986e2f0787603b19b9559abae97 SHA512 32d9788c15a03973725990d01ef2bdd8979a9fc17c3b70a90f42fff7bd1f5241de2824077b48adddbce66a6c7e8592bb0f729346d48f8cdaa172c1924b6ecd11
-EBUILD gmpc-lyricwiki-11.8.16.ebuild 610 BLAKE2B 1d13711767fee3c3440a22dcbd9397b8c492043053b578e2813e7597355d0ad5fa07fe9b37998da25b36b7110c26309ebe207963ef35707c247d8d44020d57a9 SHA512 3944bb3e03b2da9445ae0cab224d999e6ce0fc47783451a876b142a625bd99e6736b5f603658e782a4bb9769b30a868c28391af80bf26754ad476000f2a49702
+EBUILD gmpc-lyricwiki-11.8.16.ebuild 635 BLAKE2B 86a96e6c0e9c7f73641a257485c4a7f8da028239e62f4830c7665d34dc2fbf06da1e3f4e820f14f60ec574ab058b71b55f3881462359ac1f02d137a6aa82633d SHA512 978a7fc7d05ac767af70b5d89bac388b6772aa6a699bbb5c16b73b1b289c4168052ff55f7033ad2092ece74f027bf239bc80afaac2bf17f640b0333433630b9c
 MISC metadata.xml 330 BLAKE2B ae3e6e55e7242be59fb78c323c1cd469cb0aa389bcde7f8bca9b6f15ffb60bef085f46c0ec89a0f4c875a0497cf90ea6978975bc3a84f4cbae9d18f4516db64d SHA512 4057990697f90e26393a6703378247c2d0eaa5a3d459a72ed90c5cbd20ed1d74afecae9265fde640f8acb603d3f4f5dbedfb18a957606fe96b9a2c26ede51574
diff --git a/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild b/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild
index 154402ca990a..7241fd4d91eb 100644
--- a/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild
+++ b/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="This plugin uses lyricwiki to fetch lyrics"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LYRICWIKI"
@@ -12,12 +12,16 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
-RDEPEND=">=media-sound/gmpc-${PV}
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
+RDEPEND="
+	>=media-sound/gmpc-${PV}
+	dev-libs/libxml2:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 src_configure() {
 	econf $(use_enable nls)
@@ -25,5 +29,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-magnatune/Manifest b/media-plugins/gmpc-magnatune/Manifest
index 5f7679ce6995..681233151b8e 100644
--- a/media-plugins/gmpc-magnatune/Manifest
+++ b/media-plugins/gmpc-magnatune/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-magnatune-11.8.16.tar.gz 316305 BLAKE2B 9fd4765d5a3d592fd11e7001258188b189d7b9463f7a611835deceb6c758b1f0f302fa7c1feed675538e00a7dfb5dbec32240a847837e959234ed060dbe3b7f6 SHA512 eb258190357f7fc3d95dc8400330d37dcbb35be7d576a6c6d543c2ba693f31058f7b4e1aae1050caf7b7b64727f26d70c55352c859e2044f3b7e8fe327608d9a
-EBUILD gmpc-magnatune-11.8.16.ebuild 745 BLAKE2B 8e48a8653860575a7b6396f17ab10fcd87e0dc2b079aed28962e2612035358b59277217b353be913e40f4485f711453177417160d84589a1dd29604a38e785e2 SHA512 0882e84fd9939943c68e343146f1b737c7415dfb19243a8c481920d9b8eef34ad9f1b91f76742561bb585df94ad6ff17f9c12acb77eb2205fbc9ccbca8371df5
+EBUILD gmpc-magnatune-11.8.16.ebuild 758 BLAKE2B 6a03cca71a62a5952384450b24ac1c8add929e28deab8abe01ab1f75364158ae5c53d325dc862476b2c81f6e79b90bd2f7a4259a35375179f45e52d32ef6d9e1 SHA512 1fea83fb0da338b1f2cd9d5b2834122a54c5a48112f9a7d7d486361e7a001e24fd7404c6fa05d2b51e4c7c4765552ecf255def008ce25cc1a8cee58d64fee795
 MISC metadata.xml 661 BLAKE2B 313d2b6e312830f4d6e954a37bda139ea2d2fc0a950335ebe38a49492cc56f772d4921065918320e66b00b42173b61f15340a6001707781028c701cb8f4576e3 SHA512 65cd60c2bfd36a449bd959c526cbcff04e60943572756e14fedbec4b7aef7a3ba831c8236094eb936ec3394b79c4ff287a882fa497a01e9cfc0acb746e87f338
diff --git a/media-plugins/gmpc-magnatune/gmpc-magnatune-11.8.16.ebuild b/media-plugins/gmpc-magnatune/gmpc-magnatune-11.8.16.ebuild
index 1a5b81be461d..179215bf472e 100644
--- a/media-plugins/gmpc-magnatune/gmpc-magnatune-11.8.16.ebuild
+++ b/media-plugins/gmpc-magnatune/gmpc-magnatune-11.8.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="This plugin allows you to browse and preview available albums on magnatune.com"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MAGNATUNE"
@@ -12,15 +12,20 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND=">=media-sound/gmpc-${PV}
-	dev-libs/libxml2
+RDEPEND="
+	>=media-sound/gmpc-${PV}
+	dev-libs/libxml2:2
 	dev-db/sqlite:3
 	>=gnome-base/libglade-2
-	|| ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )"
-DEPEND="${RDEPEND}
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 src_configure() {
 	econf $(use_enable nls)
@@ -28,5 +33,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-mmkeys/Manifest b/media-plugins/gmpc-mmkeys/Manifest
index 6573307c737e..d3e2d91b6430 100644
--- a/media-plugins/gmpc-mmkeys/Manifest
+++ b/media-plugins/gmpc-mmkeys/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-mmkeys-11.8.16.tar.gz 306983 BLAKE2B 31f33c6a01a43e312c066be57979974e78f1ee889e8ca61cae52b72d1f0cdab2b197ad9ce1c473f0942eb78ace77888d2b70243e9667ec61e7f351208271592e SHA512 d7cc1f9ae8b4556e7573495cc4a08476aa6a8222a020f59549d3fb4b89f92c910f172c26aed72be9e8a463783e54348781537bf9dfe8b637bdf6b5a3787b033e
-EBUILD gmpc-mmkeys-11.8.16.ebuild 590 BLAKE2B 85eefd787c12e04deec1856d05780e7c23d93076dde4fc7e65fc263cfdd6cbcda15643b661ccb9a66999eb554ef9bf2e1bf00fb9e7743448a5e7d6a6e7aba12c SHA512 bbf23532bd836a23c797d646c2242af8c35ce6903931aa9b56ede3b2f03fadea1bf3f9a997e4bc5531cdc57a69c06cdb618f8da5221b06e2fb735092e1990d78
+EBUILD gmpc-mmkeys-11.8.16.ebuild 649 BLAKE2B c91e8c5ef75ef25f0c5f1a43f08f46958f95fd5c70a137508be97f19a2f5e75555de9bda05f86a2430ef2eb2f29dcacbaa91e2d44866d63a33d2d219e589fd52 SHA512 cea59344fc334bcf48793d1932c0d67af77ff146b7999b6228f7f585ecf52cdcd35a1d2957aefd3f55ba0896fa6e17d737b74d27c29212ee4ff4e16b96d9428e
 MISC metadata.xml 251 BLAKE2B 2dfd71705b87048051ac1b7d303539286ef25dbbba483975030d49f6da7209cd95ff14a945742127d5db25ca9190ff54252a0f0c573e03a8389b2cb632f90adf SHA512 62aceffd66c33efd4210c0d088e70390e489479a4085244e76e25f599bebbee78bdb994209bc5371e6d762f9f0bb94d164774e0a3182d58fb40de166710c0b75
diff --git a/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild b/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild
index 77e6924f6389..29fc1902510e 100644
--- a/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild
+++ b/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit vala
 
 DESCRIPTION="Bind multimedia keys via gnome settings daemon"
@@ -11,19 +12,27 @@ SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="dev-libs/dbus-glib
+RDEPEND="
+	dev-libs/dbus-glib
 	>=media-sound/gmpc-${PV}"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	$(vala_depend)
 	virtual/pkgconfig"
 
+src_prepare() {
+	default
+	vala_src_prepare
+}
+
 src_configure() {
 	econf --disable-static
 }
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-mserver/Manifest b/media-plugins/gmpc-mserver/Manifest
index cb61ed5a3937..61bf25de7835 100644
--- a/media-plugins/gmpc-mserver/Manifest
+++ b/media-plugins/gmpc-mserver/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-mserver-0.20.0.tar.gz 314343 BLAKE2B 21df3730f1ca253f278df1ea1733b944e30a330243cc57bf2c6ce28d678203b4e0210f8ae6ccc4957f4e4ed692ceb997ee7fad13deff3123d4670ed6b59438e6 SHA512 17899ca47251ce600260e668de2d3fbe874fa0b09c64dcef8dfd894d3a623e5348941e233140aaaec109b5df1f6aa6af55157f73ced1cdada1ebd1f503dd9bf8
-EBUILD gmpc-mserver-0.20.0.ebuild 577 BLAKE2B 0d922265598ddaeb2c7e9d38851a29207c957a907297a0b7167ab54aa8c64ef79936c30ef19e9323672c0fa05eaf0dd1f629e8eed2d4293613aa3f730abc59a2 SHA512 044f8946fbbe0ae9ff8e666a475b29b142890728908bdfefbe0325e224f25973fd10f445e4b2794ba089d0dc6c29d10b76fd7ace63d3453fb3b3527355ca4f10
+EBUILD gmpc-mserver-0.20.0.ebuild 599 BLAKE2B bc34b18f988a57c27fa3a60eb60b99c3609c646fc202d789ebd011750c119d3376fec2bbef9679a6aa6330bda145e5db8a79d2782860f811fcae667ecc6972de SHA512 40bd78a6dca9b9220f6eb6c560e1ac8c14f39de5173f88ba6787134b1bd02d7317a2cb48d22d8730abafd2ad01ec5648d3535c2a5c9bf2e108bbb1126547f74f
 MISC metadata.xml 330 BLAKE2B ae3e6e55e7242be59fb78c323c1cd469cb0aa389bcde7f8bca9b6f15ffb60bef085f46c0ec89a0f4c875a0497cf90ea6978975bc3a84f4cbae9d18f4516db64d SHA512 4057990697f90e26393a6703378247c2d0eaa5a3d459a72ed90c5cbd20ed1d74afecae9265fde640f8acb603d3f4f5dbedfb18a957606fe96b9a2c26ede51574
diff --git a/media-plugins/gmpc-mserver/gmpc-mserver-0.20.0.ebuild b/media-plugins/gmpc-mserver/gmpc-mserver-0.20.0.ebuild
index 43729642c28b..d82252e3d30b 100644
--- a/media-plugins/gmpc-mserver/gmpc-mserver-0.20.0.ebuild
+++ b/media-plugins/gmpc-mserver/gmpc-mserver-0.20.0.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-DESCRIPTION="This plugin allows you to play local files on a remote or local mpd
-server"
+DESCRIPTION="This plugin allows you to play local files on a remote or local mpd server"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MSERVER"
 SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=media-sound/gmpc-${PV}
-	dev-libs/libxml2
-	media-libs/taglib
-	net-libs/libmicrohttpd"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	>=media-sound/gmpc-${PV}
+	dev-libs/libxml2:2
+	media-libs/taglib:=
+	net-libs/libmicrohttpd:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -delete || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/gmpc-tagedit/Manifest b/media-plugins/gmpc-tagedit/Manifest
index 824af37b9cb3..d1538719d6e1 100644
--- a/media-plugins/gmpc-tagedit/Manifest
+++ b/media-plugins/gmpc-tagedit/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-tagedit-11.8.16.tar.gz 311089 BLAKE2B 6d2c9fb656c2a5dbf2a1f45f3867b95e2c584418edcbf7bee2db583928aef6794e60135edc2b0c02b53d552c73814acc1fa7123794a0c30526293ee0ccb0ff80 SHA512 9753651290391b55d0e267870fbcaba0744a3877a7f8e16ab358feac32b8005830e5957e4643480ad56809a9634b6cdaf50b7e9b62159b04ccbc2e074be92deb
-EBUILD gmpc-tagedit-11.8.16.ebuild 659 BLAKE2B 754f41b180ed3f5ad57ed029154a266446e39101956a1c68238d7f03ed555fe4a052d36ef4809848e6d9eddb96200423f81e42dabc85eb00c44eeaf3cb57fb9a SHA512 676b2686d75554e3706f891cd1c79c15e6ca7d628f49971271eb78f97fb47f216ca249f0748504f549b75b0012e7d3028782639284f46847c1b47b65fe4b867b
+EBUILD gmpc-tagedit-11.8.16.ebuild 626 BLAKE2B 96d85d59c8c595d2015d35db1c8ccf330d5a33cecc745272db8853ba3ef048e15860509fd9b67c21f51a50275a45f67d6c22f8511b146b0018156254213462b2 SHA512 f482e98d0a3370be03a6e38d295b3b4880cbc288a725b5f61b3e74fde8887f036402a86175f5d44804b689735768507a0365323c25b9567e6813469c2bbe55fb
 MISC metadata.xml 330 BLAKE2B ae3e6e55e7242be59fb78c323c1cd469cb0aa389bcde7f8bca9b6f15ffb60bef085f46c0ec89a0f4c875a0497cf90ea6978975bc3a84f4cbae9d18f4516db64d SHA512 4057990697f90e26393a6703378247c2d0eaa5a3d459a72ed90c5cbd20ed1d74afecae9265fde640f8acb603d3f4f5dbedfb18a957606fe96b9a2c26ede51574
diff --git a/media-plugins/gmpc-tagedit/gmpc-tagedit-11.8.16.ebuild b/media-plugins/gmpc-tagedit/gmpc-tagedit-11.8.16.ebuild
index df99ae37aa43..06944aa4ca6b 100644
--- a/media-plugins/gmpc-tagedit/gmpc-tagedit-11.8.16.ebuild
+++ b/media-plugins/gmpc-tagedit/gmpc-tagedit-11.8.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="This plugin allows you to edit tags in your library"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_TAGEDIT"
@@ -12,20 +12,22 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND=">=media-sound/gmpc-${PV}
-	media-libs/taglib
+RDEPEND="
+	>=media-sound/gmpc-${PV}
+	media-libs/taglib:=
 	dev-libs/libxml2:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gob
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_configure() {
-	econf --disable-dependency-tracking
-}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
+
+	# plugins only
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 0732ae991662..0f81a80650b5 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,6 +1,4 @@
 AUX 0.3.8-meson-goa.patch 2086 BLAKE2B 82bcd7de7d96caeed6f5448e36666acbb3870e4e8361c8890a73e031cb241261b98d8c97a3caf45187d2a7deebdf712a5447ccb29f96509a256eff8b5c257b6a SHA512 b5a6942092b32c91518e6142e7b0fbb46994eaa0f03eb83b0fbb561bf1ee27d435c1f0982cb036700fcff04bab27cf1080cb068bfdce44eeb6238f4f642c486d
-DIST grilo-plugins-0.3.8.tar.xz 1408952 BLAKE2B 3375275189a25289406b5d9fd6dd42b6c0ad92779b081ce2f480b464929302af7b52fc758f2f6277c94fad38a2b0bbfc8fe9fd668ff98fc0ac7fbeda69a5ac42 SHA512 c5a0a80fd7c871ce69a06bdcab2b3d8986708e4e6b9c9020d7e938d4450655f962db7f84da0b40ed38ba197f65fc2a561e06a92cdca593620d66c2b153eb4879
 DIST grilo-plugins-0.3.9.tar.xz 1418148 BLAKE2B 438aac490f2e099c40f5df15d8b3958dc29c4344e4846a3ff452561f60bf041fe2975b6c67b634f5f54721fd69e53f86c5008eadb3a402cbc8b479e805ab8221 SHA512 4700b08cab53afe0899edf7859a2e18608f6ed2016a9139694e8f1eb628c5b7318b04fe1633406fd1685a8dd54d1632b886352eac3192d52a1c1a1ac55896479
-EBUILD grilo-plugins-0.3.8.ebuild 3016 BLAKE2B 9c70d247d60177a0bd297de80bac559300f6ce10c3bebf78c2ee74fbc36a928f34bdecf8617eb25ad0d474439e3d463186b821e0bd038b43b9d19348e9a48ea9 SHA512 78faf59534f49b61f251a69b457c225b52700ccc3f400e43dcfd974ca265491f5aaad0e4da91575bf3903007911ef0199976184a40d82627a1e372c3818344ca
-EBUILD grilo-plugins-0.3.9.ebuild 3027 BLAKE2B d051b27ae0b9a1a7e232ccd1494632b963af5e1f9c57e36f441f39f38d388275ab7713f33696a328bafd80769d54d041d1927f925c5d152535475792460059e8 SHA512 5a2d9eb4f2fe3ce9da9b4d5c11f99508b0974c8069f3a9bb7485d6132731affcbab5c2409d8c7d4a4220a2e41bc4d6285b0b1b20a3d33961e5ed62281adcb722
+EBUILD grilo-plugins-0.3.9.ebuild 3023 BLAKE2B fbeea375f6b4267966b6fd5eb8d181bf42b7487fbc8a025c2a87b10eda57bdeb35135a064e1993ed89c76c455b1dab43f7ff94581e9b0f30c1059e9752dad328 SHA512 9c1fa1f6a7d6fa47daf2c95829cac07ee0218fd45da547d4fc150a825a092e0141f2c201e575a458a9fc8bf3c6299f57303ed53f3a27cf9b51c826e41705a68c
 MISC metadata.xml 920 BLAKE2B c6119dc73ede7e500e3113f03677f81d65d4a2a524e84847f010e6c9215b96feed5fcaf400166471c25075742268cbe7639e23cd11447e0e795146b29dec797e SHA512 322b01e064c5656e9d9c7e2343d7feb76f35bd9ea6e5174ce3702747e5c4dd5de9ab60e9c91d72db171ad62a90f84eedcc03b3547ef7bc8e231090c7eaef9ac7
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.8.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.8.ebuild
deleted file mode 100644
index 7f493b862a69..000000000000
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit gnome.org 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 )"
-
-# GOA is only optionally used by flickr and lua-factory plugins (checked at v0.3.8)
-# 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.6:${SLOT}=[network,playlist]
-	freebox? (
-		net-dns/avahi[dbus] )
-	>=dev-libs/gom-0.3.2-r1
-	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 )
-	dev-db/sqlite:3
-	>=dev-libs/totem-pl-parser-3.4.1
-	tracker? (
-		>=app-misc/tracker-0.10.5:= )
-	upnp-av? (
-		net-libs/dleyna-connector-dbus
-		net-misc/dleyna-server )
-	lua? (
-		>=dev-lang/lua-5.3
-		app-arch/libarchive
-		dev-libs/libxml2:2 )
-	thetvdb? (
-		app-arch/libarchive )
-	youtube? (
-		>=dev-libs/libgdata-0.9.1:= )
-
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
-"
-DEPEND="${RDEPEND}
-	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}"/${PV}-meson-goa.patch # Support controlling g-o-a dep via 'goa' meson_options
-)
-
-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
-}
-
-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-jamendo=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=$(usex tracker yes no)
-		-Denable-vimeo=yes
-		-Denable-youtube=$(usex youtube yes no)
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-	)
-	meson_src_configure
-}
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
index 8fb20461ad68..10527d60d629 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit gnome.org meson xdg
 
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index 903e948d8618..b1ea7a959737 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-assrender-1.14.3.ebuild 396 BLAKE2B 9a84e2e5466b3332dcedee9ef00458d2b26e04859aafb20d96e65f42e763d3f8900e9054568a9d92bb82dd31c46fecb7e39174dc4c53e4417ed34038f4a6bd8b SHA512 c1c746711f7e7ecf644731df2a044ee35776f4e5d3a2d55aab33a7142a5799fd942303bc4041159491d48f987bf19a06bba744605fba21c06b4ddc8f75bffab1
-EBUILD gst-plugins-assrender-1.14.5.ebuild 398 BLAKE2B 34feaf0ae26a61b5ef6b9a1b2beb9d5292842c3dc1a8b4fe0e168663fc9e544a2178f747bc1c766fc6c7c08512f081d433d2582799763c12c1243768203ef3b0 SHA512 2c0f657abf467b3049a6755c5a0d1c8b252d11c7c694a68c351244cb73ac8aa7d18a47e36f8a0828beb6caa0cff82570d87e435b257fa459dbb998b67ec50fd4
+EBUILD gst-plugins-assrender-1.14.5.ebuild 396 BLAKE2B 46f3e5f32b9945270f61e568b8b6199f659390ed66253bf28c9f5ed2f4e07144fc09d0502be86aa1c735964a528cd6c02c5a317188cae689927e6da931fadaa5 SHA512 9120f883a09308dc467c85beea1e9cd15036a764215e2b7633c355accf5143b0856f7a2be6b7bb293d69d97645f5d564cd3cc59fa48b590ed8bc708ce1fea300
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild
deleted file mode 100644
index e0c39f0308e9..000000000000
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.5.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.5.ebuild
index e1534d688c71..27a25f36cd4a 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-bluez/Manifest b/media-plugins/gst-plugins-bluez/Manifest
index 0a28f3ff4cb4..171d08ef0875 100644
--- a/media-plugins/gst-plugins-bluez/Manifest
+++ b/media-plugins/gst-plugins-bluez/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-bluez-1.14.3.ebuild 361 BLAKE2B 01dc807429ce2f5818ede7ad6f842ed8a2e18dd2b2edac4608e1b8f2841bea0bdea546082e0531ce02ab0b3f23ca1036a6fcebf06978e70fe3176a51335f7051 SHA512 e651a5ce9fe6b175f0bef8d38a2406c68ab4b4991d5a4e5aa8c1619ccb67c933a347328ed4de360fb73a259535dbb60a3921c4c5192c114ba00abf5c55a1a678
 EBUILD gst-plugins-bluez-1.14.5.ebuild 361 BLAKE2B 01dc807429ce2f5818ede7ad6f842ed8a2e18dd2b2edac4608e1b8f2841bea0bdea546082e0531ce02ab0b3f23ca1036a6fcebf06978e70fe3176a51335f7051 SHA512 e651a5ce9fe6b175f0bef8d38a2406c68ab4b4991d5a4e5aa8c1619ccb67c933a347328ed4de360fb73a259535dbb60a3921c4c5192c114ba00abf5c55a1a678
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.3.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.3.ebuild
deleted file mode 100644
index 6644da3b7d2a..000000000000
--- a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=net-wireless/bluez-5[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-"
diff --git a/media-plugins/gst-plugins-bs2b/Manifest b/media-plugins/gst-plugins-bs2b/Manifest
index 3f479e726724..fae7859fa361 100644
--- a/media-plugins/gst-plugins-bs2b/Manifest
+++ b/media-plugins/gst-plugins-bs2b/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-bs2b-1.14.3.ebuild 307 BLAKE2B 9ce161dc51a6581ebd198ec5595aa3fe36e706511166f33321370d51f4dc703d341ca859082f0d6f90a8d64fd44473db4986cce060166f487f14bc1546484c99 SHA512 0e2e4116b8e9c3906de2de4645765a7931fa0a323504f1871a40d14b5f9542ab9f35a7b2d92683ec40401597ea8c479b4dd9a0a79582f5be045bd660b77c569a
 EBUILD gst-plugins-bs2b-1.14.5.ebuild 307 BLAKE2B 9ce161dc51a6581ebd198ec5595aa3fe36e706511166f33321370d51f4dc703d341ca859082f0d6f90a8d64fd44473db4986cce060166f487f14bc1546484c99 SHA512 0e2e4116b8e9c3906de2de4645765a7931fa0a323504f1871a40d14b5f9542ab9f35a7b2d92683ec40401597ea8c479b4dd9a0a79582f5be045bd660b77c569a
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.3.ebuild b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.3.ebuild
deleted file mode 100644
index bf5cea5b896a..000000000000
--- a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="bs2b elements for Gstreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libbs2b[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cairo/Manifest b/media-plugins/gst-plugins-cairo/Manifest
index 011526212783..40a676345947 100644
--- a/media-plugins/gst-plugins-cairo/Manifest
+++ b/media-plugins/gst-plugins-cairo/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-cairo-1.14.4.ebuild 332 BLAKE2B 00608d0cb0131592e49a8ec528265b74238723a5d042c33b33081c0a426385ec7783329e66c15e399d74e5b9fad131d1a552aa1384411a0a6da250a55226d9ac SHA512 c6a35459b758c89c0ef27f1d096022fb212d665eacd8b8539317e3818a4940cd66c6884b8472a9bf560ece227530c024b7be24ba1a520b177ef4526d3f1498ea
 EBUILD gst-plugins-cairo-1.14.5.ebuild 331 BLAKE2B e56eb67274a2bd44fb1a5f75f9a4a57c2570f8e4c10e5bcf9f87a6e13dbbe9ce3ac85eebfe3d0f60a6a996d58120c366dc23740455170dbb0bd4ee13fc75b5b4 SHA512 3f3a88602f173e0282d299d605174053b9ef45c473e8b2faebfafb34ef5a3697be2bd116bba89622c9128c2348812970d516c597f8803f62e90780a2735d2c6c
 MISC metadata.xml 478 BLAKE2B e9563654e8e62fab3969a394c62a847c1e87617f8e1bbb0042850709ccb7f450f31283e2bb563aa51b14f0599f69147be29aaa2af2ac57f2b56f162b50f3bc62 SHA512 07528fb30c717b584e9fd9381ad9d71829de406a7f20994876703a7164b84529d21b35e8bdf0880216e6b308e96bb83294ab4ddf9f3ed05a4e20f8d5d2b35708
diff --git a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.4.ebuild b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.4.ebuild
deleted file mode 100644
index 9b5c0a8aa029..000000000000
--- a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Video overlay plugin based on cairo for GStreamer"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=x11-libs/cairo-1.10[glib,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 728e719bf17d..8c964d44725a 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
-EBUILD gst-plugins-cdparanoia-1.14.4.ebuild 473 BLAKE2B ff93502a8f090ac1a47b62bf1ddf608b1b176d7ebdac5f14f69cf39324d7bd5bcc5f1a03a3786194ee954ae2f8ecc084fe9aa4096648796b5c79a0b95c38e8d5 SHA512 bdb67ce87f3b3e53008006f4345537490fab616700b35dc61c7e3451a5cb4842f9398b6aa8dcbde231452923aab1a28b444e8b99c4a8801b21a3474dccc39f02
-EBUILD gst-plugins-cdparanoia-1.14.5.ebuild 475 BLAKE2B 71c94660a6dfce0b64957f869ec8a79e8b290c722fdf64533275cad15f846077fc44f4cf3e623d2be4e7c81abba1f4e12eda2b8b951ccc8477c8626abb8b32a7 SHA512 aa145b0c56468bca1e69ada6d20a2a36fb2dab9d884591bdb9ab2e5f7e3b1b86bc2af4679ff5797090bac0ebd3a7dd189ed24502a2bb4bc00daba9fc6a2ce363
+EBUILD gst-plugins-cdparanoia-1.14.5.ebuild 473 BLAKE2B 2d48f79d8dccac6126cbd4f92abc389f15fe84c0191b480c8a47d0480ed37b3478e96d900c484a7dd4b8cc75ef5013790529bbf0cda765bdb23842e353b5051b SHA512 7a30376ece70105d6114ad79ef839cebfdab6eaa5155498827b0c7be3890715c20f53ddd1e0f1b995fc05b49ca683d5b28ee1d1cb934589b2fa2102062d3547b
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild
deleted file mode 100644
index 957796a9546f..000000000000
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-base
-
-inherit gstreamer
-
-DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	gstreamer_system_link gst-libs/gst/audio:gstreamer-audio
-}
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.5.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.5.ebuild
index 1ac5f4d6149c..7d1d390bfe62 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index eda24cbeee0b..14913db85fa6 100644
--- a/media-plugins/gst-plugins-chromaprint/Manifest
+++ b/media-plugins/gst-plugins-chromaprint/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-chromaprint-1.14.3.ebuild 383 BLAKE2B 0466f0b61418310c66e7a034359d2c1462dcab8a1288cc28a904dacda47c0eee92ca9ab46aadb8cc1b2ae81c06f6a7e2a3811bc4776b0d1069322d485d3378e2 SHA512 ee14449f182a93fb3c4ecb00e3d028f4382a9d899d43fc61c1834fc37d752e3e5508429734a1ba9f62107219786045e840f7c2e94e4a5333c856acee3395a71b
 EBUILD gst-plugins-chromaprint-1.14.5.ebuild 383 BLAKE2B 0466f0b61418310c66e7a034359d2c1462dcab8a1288cc28a904dacda47c0eee92ca9ab46aadb8cc1b2ae81c06f6a7e2a3811bc4776b0d1069322d485d3378e2 SHA512 ee14449f182a93fb3c4ecb00e3d028f4382a9d899d43fc61c1834fc37d752e3e5508429734a1ba9f62107219786045e840f7c2e94e4a5333c856acee3395a71b
 MISC metadata.xml 493 BLAKE2B 2a86d0343178b353fec290f550a1442e2e1492e1e5bfb3bbbbc24a9f18cad04c12c582f5fb3deb5c845dd7633c2b6d0c30566ff86c68bd60635c49d0b46a8058 SHA512 2eba41dd2cd60d1101e79a68553188fd8d6a43711de3121e7ce230c1b09e598d3123aa2b1e65a415af80182848cc0ea17433a39b34d6d6cbeb8aa3f8644eee4c
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild
deleted file mode 100644
index 7b3362629eec..000000000000
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-colormanagement/Manifest b/media-plugins/gst-plugins-colormanagement/Manifest
index 8cabdbd9812c..6a005437bbe6 100644
--- a/media-plugins/gst-plugins-colormanagement/Manifest
+++ b/media-plugins/gst-plugins-colormanagement/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-colormanagement-1.14.3.ebuild 346 BLAKE2B e907a768964d48685a931a5085a19ee4cb853a30da0230051d6a1c081556f5a753327610888cab4396b69d8098054bb7a348288c8fa5c8bfcf44c3c9664c6c7a SHA512 1462da28d450aa93bdfc0ff19bc8b6b4dc91218a2adeb955278d21b0d9f3c1967cf28442f309cd06c42f22eb2a2d54fd8c8bc878cc41830c1fd197d6daf5e901
 EBUILD gst-plugins-colormanagement-1.14.5.ebuild 343 BLAKE2B 4bbb50acb250359fa7f6755f15a72d9ce38d9829f77a7a2afddeb16095d48835e87cc7895c11e9a5fb65712c6452f7377eeddbc50e3f8aa5ba0bb2cbf15529d2 SHA512 2d13b1a1715731ca32ade98f94ce3ccb06683b09b2644fb5243623f53a68cd01fb03efabdf75ca639a93cd8bb77730d699858406dd9afaca390981bae654322c
 MISC metadata.xml 456 BLAKE2B 85f88de4f97a4f6790b0f6ad7336dbddc1e494e00350454d647dd7acfdf97d1a4ac6265803ab162aff060dca2272ea581dd0cc45280d9f274dc6d45609119419 SHA512 0a37048c0f940a25d9de2e1dc46c2d825c362ef44f9a34be1c5d49c12ff55ab8ff60cccba7c6c7a95d307fe1407452e1b2638c474bac3d62324b23c263681c24
diff --git a/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.14.3.ebuild b/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.14.3.ebuild
deleted file mode 100644
index 787f3228a80f..000000000000
--- a/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.14.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="Color management correction GStreamer plugins"
-KEYWORDS="~amd64"
-
-RDEPEND=">=media-libs/lcms-2.7:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="lcms2"
diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest
index 0514c8ff8913..de2c879541b7 100644
--- a/media-plugins/gst-plugins-dash/Manifest
+++ b/media-plugins/gst-plugins-dash/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-dash-1.14.3.ebuild 1265 BLAKE2B e85c74465d9040f73bf987bc953b8780cc57841e09eb6f5c03939dd6c216450922b24268291ca7e911a0b822ff0b7a39f1b9d08b494674579638ae7f5685d511 SHA512 75606fb32c828c269d6f71fa33ef0236ff514cf74b4c26a990665a4ab655d1ca6c766c8dadbef93b6ffb093210abfcf610bd69490fcc4df01bc6349765b6bf8d
 EBUILD gst-plugins-dash-1.14.5.ebuild 1265 BLAKE2B e85c74465d9040f73bf987bc953b8780cc57841e09eb6f5c03939dd6c216450922b24268291ca7e911a0b822ff0b7a39f1b9d08b494674579638ae7f5685d511 SHA512 75606fb32c828c269d6f71fa33ef0236ff514cf74b4c26a990665a4ab655d1ca6c766c8dadbef93b6ffb093210abfcf610bd69490fcc4df01bc6349765b6bf8d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.3.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.3.ebuild
deleted file mode 100644
index 0fef32f2bee2..000000000000
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="MPEG-DASH plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# FIXME: gsturidownloader does not have a .pc
-	# gstreamer_system_link \
-	#	gst-libs/gst/uridownloader:gsturidownloader \
-	#	gst-libs/gst/adaptivedemux:gstadaptivedemux \
-	#	gst-libs/gst/isoff:gstisoff
-
-	local directory libs
-	directory="gst-libs/gst/uridownloader"
-	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgsturidownloader-1.0"
-	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
-		-i ext/dash/Makefile.{am,in} || die
-
-	directory="gst-libs/gst/adaptivedemux"
-	libs="-lgsturidownloader-1.0 -lgstapp-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstadaptivedemux-1.0"
-	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
-		-i ext/dash/Makefile.{am,in} || die
-
-	directory="gst-libs/gst/isoff"
-	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstisoff-1.0"
-	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
-		-i ext/dash/Makefile.{am,in} || die
-}
diff --git a/media-plugins/gst-plugins-dtls/Manifest b/media-plugins/gst-plugins-dtls/Manifest
index 939703640aa6..406a1b3f6c39 100644
--- a/media-plugins/gst-plugins-dtls/Manifest
+++ b/media-plugins/gst-plugins-dtls/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-dtls-1.14.3.ebuild 426 BLAKE2B 3978a7c398acbba159f5e2e0145b5c2c878ad47cb392f5e871acd953dc0d766c05228f052b70bc4a41f7eb5c1321ac2d884fb040e6cab1e5cb004f5715b5b7b8 SHA512 688e6aae0385bf212dde3102131678fb0638728d810da2e1f7127207ede3d38320ae805036cfa15c9e0b075c8a7980f78ddad7ab027e5643ab485c69ac487067
 EBUILD gst-plugins-dtls-1.14.5.ebuild 426 BLAKE2B 3978a7c398acbba159f5e2e0145b5c2c878ad47cb392f5e871acd953dc0d766c05228f052b70bc4a41f7eb5c1321ac2d884fb040e6cab1e5cb004f5715b5b7b8 SHA512 688e6aae0385bf212dde3102131678fb0638728d810da2e1f7127207ede3d38320ae805036cfa15c9e0b075c8a7980f78ddad7ab027e5643ab485c69ac487067
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.3.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.3.ebuild
deleted file mode 100644
index b48ccd5f5af2..000000000000
--- a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE="libressl"
-
-RDEPEND="
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	!libressl? ( >=dev-libs/openssl-1.0.1:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dts/Manifest b/media-plugins/gst-plugins-dts/Manifest
index 4ee757388d4e..c61b483722c7 100644
--- a/media-plugins/gst-plugins-dts/Manifest
+++ b/media-plugins/gst-plugins-dts/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-dts-1.14.3.ebuild 415 BLAKE2B 8e4b8940dc0e2e6bea7ab0ab545f5e661f3f67bb08a6881d7ebe266da599a21e3f439142d1a137dc991734197d10a001c0eca2464d45756cebb3082a971e39e6 SHA512 bae39fca79465968c81b16049f270967acb8b37ca64964add6e7fe332df7f5feaa9f0c0b30edcdb75848fad05d6a388cad40aeccc5dfb365f0475d94461b909c
 EBUILD gst-plugins-dts-1.14.5.ebuild 415 BLAKE2B 8e4b8940dc0e2e6bea7ab0ab545f5e661f3f67bb08a6881d7ebe266da599a21e3f439142d1a137dc991734197d10a001c0eca2464d45756cebb3082a971e39e6 SHA512 bae39fca79465968c81b16049f270967acb8b37ca64964add6e7fe332df7f5feaa9f0c0b30edcdb75848fad05d6a388cad40aeccc5dfb365f0475d94461b909c
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.3.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.3.ebuild
deleted file mode 100644
index 7f1a6a9f6fca..000000000000
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="DTS audio decoder plugin for Gstreamer"
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
-IUSE="+orc"
-
-RDEPEND="
-	>=media-libs/libdca-0.0.5-r3[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index f03286ff7a52..cd30bdacdb24 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-dv-1.14.4.ebuild 405 BLAKE2B 10ccb6a9dd5cd131a8460d9c130be1ba1bcedcc517b66e0d3847feccdcd98cab1a0f780d783decf05fa7bf0e5e82f4e38e0dc9b94ecadcc055549a0abae8cd63 SHA512 fa18d442144f453cd6c5aa3d83dfb1af89aab01e40e9a117d95e257cf1984f90b1cb296c66f99794aa066e447bba4634117d4612a1a49f6da84b8d47e5012e4f
-EBUILD gst-plugins-dv-1.14.5.ebuild 406 BLAKE2B ee0fee41ed8ebbdb7e87e24d6e5240623d411e0ff1a7df8427f680376732309e370abce6c5bd357f041688f36106eced5b1bcc01caeba72d94824dcc9a93881a SHA512 f24c3627f2c869463ef4c9144f19b408d16a0cd704ebc376ac4dfc49dc012ddb501102b7b4a1f4c8e0f800b81fc3811a8d87106949dac1a604b06fc82834cf16
+EBUILD gst-plugins-dv-1.14.5.ebuild 405 BLAKE2B 10ccb6a9dd5cd131a8460d9c130be1ba1bcedcc517b66e0d3847feccdcd98cab1a0f780d783decf05fa7bf0e5e82f4e38e0dc9b94ecadcc055549a0abae8cd63 SHA512 fa18d442144f453cd6c5aa3d83dfb1af89aab01e40e9a117d95e257cf1984f90b1cb296c66f99794aa066e447bba4634117d4612a1a49f6da84b8d47e5012e4f
 MISC metadata.xml 380 BLAKE2B e30d4f36d092c662f4b2caf33ae705dcee14cadb22174b125686c45a8724a880b291d4683fbf6b06a1e8003cf18be831a368d617d872904a58b1e3fe70ae7ca6 SHA512 bcbeccb0d35ae268383fd3cff3c5739301777233f6769556b5793b3b34a0c5c6e6bbcafcad392e22a8ee441698dc508d9638c1c53eaa17b692ecf5a40ee6f27c
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.4.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.4.ebuild
deleted file mode 100644
index e947960e2d2a..000000000000
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="libdv"
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.5.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.5.ebuild
index a95cb67d2056..e947960e2d2a 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index 4a4b9b309ba3..0ddd89296434 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-dvb-1.14.3.ebuild 410 BLAKE2B 0d3f17d0e7ef10d8e312010c90c92cd9aa9e570bffe7fe93f496e8f8fee444276f9bc23c37e23da3b36fd3222e00117a1f64a847c89460d6c114632e8071d9af SHA512 7006863c78c8139b58b15f351b132457413a0244c02cb7334f5e595ab855367afb6c2a278abb45a2164759dbc65f3d2b392471a5416b65c0f84c3328ec666ae9
-EBUILD gst-plugins-dvb-1.14.5.ebuild 412 BLAKE2B 6bbd2e4dab21f57403e4c0ff3397e57b5a5a1b97be69d434d73685ff918f3465e56ff2003652f7bd2faae08af7a30c83b13bcb8afc9a7ed4f1bfda652fa3d988 SHA512 e079278cc082ab73e02f8b43df1cfde0927171b990f673ac2f12716242a1224be4885a32cd65efcad1759ea2b9738d24422b6636f94ca3ee93adcaf336ddce51
+EBUILD gst-plugins-dvb-1.14.5.ebuild 410 BLAKE2B 6ab6b2bbb79d31884ea631e26d1645d5394db32649806a21ada69b168a4daf79fe0bae4041abe9b18027720c9b758c2a2ee117362400c091ca05e3a6949de829 SHA512 b50d1ebee1522d9baea7011bef4f22934c40d6796b14b0aafe4a1c1d84bd5b3ca120a356d15a9e2e3ff1532d4f9d08dbdc17e119e1e3e3ef30f74e8932b45d28
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.3.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.3.ebuild
deleted file mode 100644
index 0d21b61c7823..000000000000
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPION="DVB device capture plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~mips ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/os-headers"
-
-src_prepare() {
-	default
-	gstreamer_system_link \
-		gst-libs/gst/mpegts:gstreamer-mpegts
-}
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.5.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.5.ebuild
index 275812118f4c..b037e848a921 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPION="DVB device capture plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~mips ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index f8de9cac4f06..528d6a8a661a 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-faac-1.14.3.ebuild 356 BLAKE2B c996b11529180a9f598d908476ebe6d643af9b20303eb3a8bfd077776b9cfe0d08446c636945f314a396aa98b09624e95da56ac96248f608ca17d2f6e5f17a53 SHA512 ab2ec9b516cfd376565bb345206074f8e891c7c8cc0cac8564ca020f38d7322e157c087295764078e378838f7f1103428898680bbdee9f03b16e4c523bcd00b2
-EBUILD gst-plugins-faac-1.14.5.ebuild 357 BLAKE2B a48e9855fdff53fb60c8c320c43b5774e0df14572c2f15039ad14eb0c7feb428869c31cf6951f4ca56f3abecc724f19f8602fcb774d1d44b5183a848ae2bfdf3 SHA512 9b29bc3bb60092593af0e134f0b6ced7a4e4681bb01f6f6cb1b735f88b930f18160a0f4b0cbba0df9e7e7a1574534b9e567a33fa79720284f1e555fb8541bec6
+EBUILD gst-plugins-faac-1.14.5.ebuild 356 BLAKE2B c996b11529180a9f598d908476ebe6d643af9b20303eb3a8bfd077776b9cfe0d08446c636945f314a396aa98b09624e95da56ac96248f608ca17d2f6e5f17a53 SHA512 ab2ec9b516cfd376565bb345206074f8e891c7c8cc0cac8564ca020f38d7322e157c087295764078e378838f7f1103428898680bbdee9f03b16e4c523bcd00b2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.3.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.3.ebuild
deleted file mode 100644
index 01ff40772f59..000000000000
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="AAC audio encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.5.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.5.ebuild
index 12e8750d869a..01ff40772f59 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 543209f3dfc9..70f706ef0830 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-faad-1.14.3.ebuild 361 BLAKE2B 182d75c52757e0d6e3dcfa80307fb0e583109cb51603cb3f4975162416a18a2843817c65b61ddab83fc6f29b113b351ef5984ced316b9d361baa30d6d407fd94 SHA512 91a08dcd8a8fce6ec2b8218825b995c70e96d7c480d100f5735f15a0f3d8963a43cd0132f1ea023c506ca76078ed07af72e6bf4a2aaa5d739445f3210701b1c8
-EBUILD gst-plugins-faad-1.14.5.ebuild 362 BLAKE2B 3bb4b702d50dd48f6ff1c9600d11d4aca0933aa87db431497500c0493485928815c0d3e70d2b97dadaa67075dc3c7c4083bc3ee4622c59488b460224da7e633d SHA512 436a4b1c7155ec81d7d94d58fe66fb126680b132be8eb9ff667de9e89685ff43060442cb50c78e4a97f8192b6ee78f3dd14b154f90e5f27edb0590d8304956ef
+EBUILD gst-plugins-faad-1.14.5.ebuild 361 BLAKE2B 182d75c52757e0d6e3dcfa80307fb0e583109cb51603cb3f4975162416a18a2843817c65b61ddab83fc6f29b113b351ef5984ced316b9d361baa30d6d407fd94 SHA512 91a08dcd8a8fce6ec2b8218825b995c70e96d7c480d100f5735f15a0f3d8963a43cd0132f1ea023c506ca76078ed07af72e6bf4a2aaa5d739445f3210701b1c8
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.3.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.3.ebuild
deleted file mode 100644
index 9c2e11db28d1..000000000000
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="AAC audio decoder plugin."
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.5.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.5.ebuild
index 54cfc2938d7b..9c2e11db28d1 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio decoder plugin."
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index 5b90a1c7df2c..41fe641e8d84 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-flac-1.14.4.ebuild 388 BLAKE2B e8fba972241ed98383887b3185b3990ba81cb12d7c382a8a3affc694f6a2ba0cdc81a978814e278e3025374ebebc9ccfdc27250ddf66ee7e6bab9d8284d8d246 SHA512 63461c5b59bf2f63b67364d3b6853c1301e1273fa88af21222a9cbe17a1745fcb9047dcd259a02ae576694abc4ff221afbcc660b14a7a580d18fb6e90a114c1e
-EBUILD gst-plugins-flac-1.14.5.ebuild 390 BLAKE2B 3f0635d4eec1fdf577cc5b252abead00579dec795816417542e3a441b2d53112757aeee32521a45d7abce9542bb62140ab63254deb0541d640f2509a0026bfbe SHA512 cbc3f9ac5b03d86455b662b3c971c3de5448b0e2b2c157f6d39d5dd12868aff3ab7b11759dedceb07bd39530b4b2da8cf150fefc50380b0b101bbbbac235b650
+EBUILD gst-plugins-flac-1.14.5.ebuild 388 BLAKE2B fdcac4775df149e07c35af270c42a7898c35bac9a3cf63c0d95f4830381add49c1e44d2917e5a9e733194956b6236ac534344e963a337bc8905d561eb4c5c4df SHA512 46b4b3cb76d836eab2c3dd910fecbca164a97309fb0ee3d6a858f9031c3be79538b8bc1db94f1f92aca29f3b836b840074be15dd59381b945b631289085ca1b2
 MISC metadata.xml 555 BLAKE2B 0a6c97712429505d543caaa732d716a95e4f6f5256aeb202da38bd2399ceb335e1fc6079279c96848d479d3fa3e2b8bb1c92b37ba284204b1936078d0175caf3 SHA512 2ffe5f5f8ef59e30a7da2efe1b5e88858c5f27776b7f48a7748f9cd72a18d5c97ddb239609c7bab808de874f0a51bf886ec24e395641fac995c8d3f041271e7d
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild
deleted file mode 100644
index 92138e271421..000000000000
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild
index 5b9646033eee..2753c515fcdb 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index e007d8d24546..3f00dd8f3179 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-gdkpixbuf-1.14.4.ebuild 463 BLAKE2B db187d523cb905d80c0c055fadfa7aeafe27db80a146e2e2ca04589b5843353cb0909e731a4f8f5fae2f8f41ec0cf16218d1baa73cda149725a92a697ddf919d SHA512 ebbe4332c6b224335702270bc53011a2f3f187265474d2308cdba80f66767c0853daa56f6ce530c8bdabf2ddd54aa07e456c5e7f5787d61f81f04fd7c8a08786
-EBUILD gst-plugins-gdkpixbuf-1.14.5.ebuild 465 BLAKE2B 4b5afd975ba6713bb4eb9c068b1a4b369c1891846d4cf0ef0df317a8877e52710130fddc3e42bf03bbf98887b30e61b028a06e128aa7b6cdbc823edfaea5e23b SHA512 b99c5a807340d56f2057b60444cad7dc5d35f318642dc449e6229b0f8c446a6400f1b170470127d60cd25ce423a778fb483eb874852ab08f075fbd2b312af2a3
+EBUILD gst-plugins-gdkpixbuf-1.14.5.ebuild 463 BLAKE2B 560080829ffbb29340e48e2294b8f43620e56b9cc1ca1b3da573e9058ad1c27a93f522e076839aaf4d6086b86508334da324142bfc6b87d0033d154896272f76 SHA512 5cfc6c81036ae82578f1ce1a3e954f9bb8b361c1b654f0a9136d15777131445eb6b419bc8026a69139d615960c4db7cde331eca08f478b8b03af99c86ca3e922
 MISC metadata.xml 610 BLAKE2B e0597a0e835fd058d1d172bef6cb6616efbd83b3f97e9b9d644afa6a68956dc97b37385ba7b5996468911f9da16e54b2dec18d9657ad8b1b6a4dcd71cb229f7e SHA512 472dddb540087c89be5a85ab67733d345bf039a95fc1a7bd2ec6ce3b08b8556b2676af77b93ee903bc8ace178963935b21dfcfc6c1c0a6ecab5a7429d60e5cbd
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.4.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.4.ebuild
deleted file mode 100644
index 5c4f1d266aa2..000000000000
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="gdk_pixbuf"
-GST_PLUGINS_BUILD_DIR="gdk_pixbuf"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild
index b48fd1d215f4..1da650ca4690 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index 88fa8756e213..95c784d3b96d 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-gtk-1.14.4.ebuild 1176 BLAKE2B f074238fc9105b6a0557a7c732f8a2ad21f26dbe0914cf1f14f30a947cf73527ea4ba77d63cf545b5edc61bbdaebc389f96a30bdc701bd53be0659546b80450c SHA512 627cef73b725d8c5e10fe85692560fa39e88383a261f123d5641fe87cf8fb509aa34db9049a152f8c7c574666d7e71038efdb4c4d086afad253d3f20401a3187
-EBUILD gst-plugins-gtk-1.14.5.ebuild 1178 BLAKE2B 927107813653006b8713ada48f4cc0737597792ed1cb917aa4f75e22840044d097b59f83c36d77ce24db7c28b3a447fdfae7b48047f2bbfd4e8314c03d962b89 SHA512 41dcf428e39ab0851be29b6864d68f90895cd57a2680b9a519eb666736c0ac5c5f4b77051200435b2e1222d25bf92e7af9e860a74a7b82f02337361911d18759
+EBUILD gst-plugins-gtk-1.14.5.ebuild 1176 BLAKE2B 26123f5c13983a7ef104ea26958e1d4fa89fda0221c94e3beb63e81e249df041c976c07b3c7b72535d7f673dfea707eac01f054d571dec5dcf0b5e162d6f30fc SHA512 904eaec8c158ac2998a7f631bb1300563b0682756b0fea612f25eaac360afe7a98ec76cb4da9a7c4f6707528dd1111ce09970a828cb50cd83258aaafb22e7c35
 MISC metadata.xml 790 BLAKE2B 609210afdad563f5d63ea609ac6a65301907d447a137537aa9451ce6bf5774f9a15a8294a4e11b72697e123a4ffac44cefa5f6cf820a78bd998cd581e7ec720b SHA512 8ca80354a5c57ccbc941bc62cd7fc1b3bfbd2223901c24afac0ade01ab751e790cf9bafc4e0d4a3074606be99ac7aae10a45a9f7c65068342495f2995c956fa5
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
deleted file mode 100644
index 7748187d482e..000000000000
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
-# egl, wayland and X only matters if gst-plugins-bad is build with USE=opengl and/or USE=gles2
-# We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
-# we don't care about matching egl/wayland/X if both opengl and gles2 are disabled here and on
-# gst-plugins-base, but no way to express that.
-
-# We only need gtk+ matching backend flags when GL is enabled
-GL_DEPS="
-	>=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl=,gles2=,opengl=,wayland=,X=]
-	>=x11-libs/gtk+-3.15:3[${MULTILIB_USEDEP}]
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-
-	!<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="gtk3"
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild
index 16d6d9e120bd..5376bd8fa863 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-bad is build with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest
index eac4d71b47fd..4525b8e00ab7 100644
--- a/media-plugins/gst-plugins-hls/Manifest
+++ b/media-plugins/gst-plugins-hls/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-hls-1.14.3.ebuild 1120 BLAKE2B 2441b6b9f7e2b8d9aa2c08eea70d1a6fcdc2217ffad71027662ab1303e9b441f243da35844935785d09142e43c67778cc8347e62ea49ad12d455d4b38073f74d SHA512 c2bb1322a221b6e78f03dc7597f321db63a05fbcbee864f1c0f5bc5f3ff26dc1efc046210af1b710eff1b4a89f46633055156f3bd79703e830d084a35e30f8e5
 EBUILD gst-plugins-hls-1.14.5.ebuild 1120 BLAKE2B 2441b6b9f7e2b8d9aa2c08eea70d1a6fcdc2217ffad71027662ab1303e9b441f243da35844935785d09142e43c67778cc8347e62ea49ad12d455d4b38073f74d SHA512 c2bb1322a221b6e78f03dc7597f321db63a05fbcbee864f1c0f5bc5f3ff26dc1efc046210af1b710eff1b4a89f46633055156f3bd79703e830d084a35e30f8e5
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.3.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.3.ebuild
deleted file mode 100644
index 7c480bdbe1e7..000000000000
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="HTTP live streaming plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# FIXME: gsturidownloader does not have a .pc
-	# gstreamer_system_link \
-	#	gst-libs/gst/uridownloader:gsturidownloader \
-	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
-
-	local directory libs
-	directory="gst-libs/gst/uridownloader"
-	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
-	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
-		-i ext/hls/Makefile.{am,in} || die
-
-	directory="gst-libs/gst/adaptivedemux"
-	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
-	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
-		-i ext/hls/Makefile.{am,in} || die
-}
-
-multilib_src_configure() {
-	gstreamer_multilib_src_configure \
-		--with-hls-crypto=nettle
-}
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 2490c5e5cf60..4eec01bb6e9a 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-jack-1.14.4.ebuild 365 BLAKE2B 20670caa598df8b4e9713a1a062020bb6ab0ae0bbf54aaa6a8e0d4ec6fbbdcf1083b7408ebe0a813117468200776ee8da84b1167974e5a28191236a81a2698f2 SHA512 f82d6e280f0baaf95f11205c659ee47099c313155a2cc75efd964b04d15bb47f0ea5b0008066c9a2c142a8abc2845e316876cba4fa9d0dc342e317087836ea63
-EBUILD gst-plugins-jack-1.14.5.ebuild 367 BLAKE2B b659f63be27e362d57fe9c1d4040070473e53e42497535dea3d6972266257f2b7927f831469ae35b6a4881124da92e4cc0ac2ecad37a3860cb0e8411db8ab002 SHA512 1829a667f5b2073a19244010951d11a2721a2a0ac78d08b915c790b2d6536ce3ae8f4526fc5d8efbe519b97d913a4424764a626b576268296d3aeadc3db912dc
+EBUILD gst-plugins-jack-1.14.5.ebuild 365 BLAKE2B 3112b90f2ee26556cd592a46f81e918fb29f7a5507a1ae2112f954e127214e70aef032b90f3648ae89433dbe10137ddc52c135935abd77f3fef3ea722839c39c SHA512 69099743ebb67fd7e83fe7cb8582418f62ea0c4ab55244a3a9e36a3f1c80a026b1628d2cee56ad45447846beab0f3814bf8145e21eeceb885e9c02e258c9aedf
 MISC metadata.xml 487 BLAKE2B 182c55b79c188f12dcc000cecf9c507933183ab62a78c806b6f43918af528c1c7bf3adf435ad077f689a2b64706b7517b14393500dc4d1b7f2cc14b45dd6b764 SHA512 811374b3dabbff1084c5b1b6fb502197f58da02da195b922ce7556ca6e0f3668f266a14ba1a03ff352edb89a0cff9550e7d59f3f4e116ff63a22c6e8436ef6b8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild
deleted file mode 100644
index 16e138ee065c..000000000000
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild
index cefed3cace46..d5cca62adddf 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index 6814d33f5037..d82b4b275310 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-jpeg-1.14.4.ebuild 372 BLAKE2B 44998cbc3fb08920cddf20c4d088141ed84bdc611b0a3be2523e03c77246ed05a4ead0614aee16e7d983c1c5dbcc745f8b98e32944a329e3fac844ae291d4035 SHA512 eab6f9a1d2e3bd85a72148232e12b9c6a2f7c50191e16c7be152b33fe3d0d38c1f1585cdc8e238fd6828ce80479649055e5d652a77c5ea87002e2a935010ff49
-EBUILD gst-plugins-jpeg-1.14.5.ebuild 374 BLAKE2B 3545dc588d79a3b79e295bfb4c9c335dd45700e3882b2262b0f05f9f8a6d042ae84e6151a981ae03d540c6fc39d0ee6b98e0223590f93076e796925e79efc3b8 SHA512 f5e01aa79cbc158b18dfcf62fcb88f0ca38e339ab390e49ff78784fa31e0ec0738a36508503711cec391524011486be04864b9f1e60681fb14ab9834184a8ae7
+EBUILD gst-plugins-jpeg-1.14.5.ebuild 372 BLAKE2B 4c812cb3a894564e75cf7a79b48576b8b58ff2f90dbd872524bf7e08bc47e9017c302906a75001d5bcf12c4aa466dfa744280ca47f2efe7090df31425eee4142 SHA512 4159b10fe015a2208910fbc591daf50c60c2bf72e383c145ec3564a2a3e49e3d6caf47d323c6b482a39cf4e8e598278d33b422d26a99a485d41a6ba9715608ee
 MISC metadata.xml 659 BLAKE2B 8da81502aaf3eecb4ef62469b494598b329cb7e134511df9bd4269807882564e052ec76ddb50640203d96c08fa80deb3cb96d2b2c3c8dfae21fe296b87351ff5 SHA512 c4d076bdd3a4cf70540a9cc56c91a8e805f0a809065b629970158ca002f3cc03f3b7b91615121813030f510eb2e9a912aa4ca79504a20e023cc36f1fa3acf329
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.4.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.4.ebuild
deleted file mode 100644
index 64ea72464745..000000000000
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.5.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.5.ebuild
index 442929d9f32d..f49b1ce19d05 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-kate/Manifest b/media-plugins/gst-plugins-kate/Manifest
index 429180d011a0..6367c746c2ea 100644
--- a/media-plugins/gst-plugins-kate/Manifest
+++ b/media-plugins/gst-plugins-kate/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-kate-1.14.3.ebuild 390 BLAKE2B 8795d832c281c2a40864e3297a037f6f5942f0c25cb67fd01d4612dce9817a6bf961a6d0b93a7c403eb7f647a48f724eebfc727c797e2038de181d2996511738 SHA512 30b6266fb339b27d10267efc8b285fa42646eac68f976cdb730a56dbe7366c1687488b357f716a938b9328b3a7bcee2f33b164ef646a422370cce815a254277d
 EBUILD gst-plugins-kate-1.14.5.ebuild 387 BLAKE2B 338a156291cd670bd4ec0f3adfd0bdeaed80e2614dd4c67a8c1d3fac80e90d0d013b572bd4d92cdc0bed7280b2e0f3896265f704f3e0867de3ca9473e889a786 SHA512 ce64c73c0321e7928a6e184cb83f255b2e2f3550d1590d8c9f755be80a040e1eea31fb98d818907a80d43710d583d70c02099d4692ed282571e2497f93e340d5
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-kate/gst-plugins-kate-1.14.3.ebuild b/media-plugins/gst-plugins-kate/gst-plugins-kate-1.14.3.ebuild
deleted file mode 100644
index fc6da4008477..000000000000
--- a/media-plugins/gst-plugins-kate/gst-plugins-kate-1.14.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="Kate overlay codec suppport plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libkate-0.1.7[${MULTILIB_USEDEP}]
-	>=media-libs/libtiger-0.3.2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ladspa/Manifest b/media-plugins/gst-plugins-ladspa/Manifest
index be2ff96846d9..72d8232acadd 100644
--- a/media-plugins/gst-plugins-ladspa/Manifest
+++ b/media-plugins/gst-plugins-ladspa/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-ladspa-1.14.3.ebuild 319 BLAKE2B d8015bae153cabbb1fb5cb8d13f67143eed82669910a0305f5a020005d5025cd1431be16a2bd21bad3c15e5667d7f16918c75f96cf7aa92cd22491968453579a SHA512 e225f08586703a6f693149503c2b36340d7cbc6c195edb0c900e718406f5adb460f33bcf0a597b7836c4bb3ca74ff76b1b0868c8df9ae9cce69d7dad0fce6643
 EBUILD gst-plugins-ladspa-1.14.5.ebuild 319 BLAKE2B d8015bae153cabbb1fb5cb8d13f67143eed82669910a0305f5a020005d5025cd1431be16a2bd21bad3c15e5667d7f16918c75f96cf7aa92cd22491968453579a SHA512 e225f08586703a6f693149503c2b36340d7cbc6c195edb0c900e718406f5adb460f33bcf0a597b7836c4bb3ca74ff76b1b0868c8df9ae9cce69d7dad0fce6643
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.3.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.3.ebuild
deleted file mode 100644
index ce3aac318f0b..000000000000
--- a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="Ladspa elements for Gstreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index 7053f1da3fd8..c9634921c978 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-lame-1.14.4.ebuild 373 BLAKE2B 1253716dd99fe872ffd95da84070cb1bf6d3a6c95ae27a3c5c1cd8696af059b605a9a6b69f1ff16ca72a3e682a58c14e2e353345ea7c191e5c995eff37d4cdc8 SHA512 7255b3ba8edf83b2d8b8da195dac99b373f16325fa373fe24eb37eef91474f139e870f91bd2251b5ab16b5d3c485dea525579388fb4b4fab598894edd3c0e577
-EBUILD gst-plugins-lame-1.14.5.ebuild 374 BLAKE2B 6c405e6366dd6bfa43f91319bfa681ea91e8f361c8617001f92f09a35fdd6f4933cdc0fe8eb86a9abf3915921b1daa7aaa50e14eb7d81e9a0f9a44e710cf78a2 SHA512 ec17258de7fcddb7f88d0fab818356c32f6d2610df9a3e3ba2e621d5fcb1612b6c5e3836701d89d6a1f0982601c406eb5afa3fa795c158fa997aea177e6acda3
+EBUILD gst-plugins-lame-1.14.5.ebuild 373 BLAKE2B 1253716dd99fe872ffd95da84070cb1bf6d3a6c95ae27a3c5c1cd8696af059b605a9a6b69f1ff16ca72a3e682a58c14e2e353345ea7c191e5c995eff37d4cdc8 SHA512 7255b3ba8edf83b2d8b8da195dac99b373f16325fa373fe24eb37eef91474f139e870f91bd2251b5ab16b5d3c485dea525579388fb4b4fab598894edd3c0e577
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.4.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.4.ebuild
deleted file mode 100644
index 83dda6fe5263..000000000000
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.5.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.5.ebuild
index 1d8ab2f7757e..83dda6fe5263 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libde265/Manifest b/media-plugins/gst-plugins-libde265/Manifest
index cabf2ef257de..5efc08eea4ee 100644
--- a/media-plugins/gst-plugins-libde265/Manifest
+++ b/media-plugins/gst-plugins-libde265/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-libde265-1.14.3.ebuild 321 BLAKE2B 7ec911e89386954858c840e4f23d8eb50e1082a43c063b99e26b88621252433caa294498588d2d22f2dc37d9a707de3610ada82ab22992702582c20d4cf78d8b SHA512 7303f743823d9fdd4cda1391f7f119080e508bb2fd9165d7a3affd1d519fd4f70db5ef3e33bbe70a45487b35b0b022a12ca20f54132dd64aef55535753e46e81
 EBUILD gst-plugins-libde265-1.14.5.ebuild 321 BLAKE2B 7ec911e89386954858c840e4f23d8eb50e1082a43c063b99e26b88621252433caa294498588d2d22f2dc37d9a707de3610ada82ab22992702582c20d4cf78d8b SHA512 7303f743823d9fdd4cda1391f7f119080e508bb2fd9165d7a3affd1d519fd4f70db5ef3e33bbe70a45487b35b0b022a12ca20f54132dd64aef55535753e46e81
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.3.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.3.ebuild
deleted file mode 100644
index 4798ab1f8ae3..000000000000
--- a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="H.265 decoder plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libde265-0.9[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index 89fecf17d2bd..f0000b253897 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-libmms-1.14.3.ebuild 396 BLAKE2B 662b99c7c400df2597a72e8d18d643ec90187de4796fe2fe55e488afe2f932a2ce217c60750f05878368cbeb57fa308713fdde8d166fb8f560b9066de8e91eb6 SHA512 90b2e2cd1a30bfa8556f257fb361f78ed32478adff47366d8a37755eab81bdebc7bb1765de8fd50bb3092027305c802cea18ad9689f6491d1dae3167b8bbe02a
-EBUILD gst-plugins-libmms-1.14.5.ebuild 397 BLAKE2B 2d705bedd5bf64278472cfe781178a2e50aaaf3656e46fb2dc2e27b45dc3b92ff53f4653cef61a7922a5999376dee3c034ac7c7ed7a3312c35b8ca225d01ce3b SHA512 2e6c5841c9f6188b60993bfb47e8217f0ed01ba06ef87c4ba9e92774c50b8aa7a3e487ca785fdb2deb8fd4e0cf7746ce2163cdcb19dec36936cfacf097a755ed
+EBUILD gst-plugins-libmms-1.14.5.ebuild 396 BLAKE2B 662b99c7c400df2597a72e8d18d643ec90187de4796fe2fe55e488afe2f932a2ce217c60750f05878368cbeb57fa308713fdde8d166fb8f560b9066de8e91eb6 SHA512 90b2e2cd1a30bfa8556f257fb361f78ed32478adff47366d8a37755eab81bdebc7bb1765de8fd50bb3092027305c802cea18ad9689f6491d1dae3167b8bbe02a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.3.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.3.ebuild
deleted file mode 100644
index e44b2cf86f9f..000000000000
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.5.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.5.ebuild
index 1a3b5d48b252..e44b2cf86f9f 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index bc383a92bba5..38a3da1b8e13 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-libpng-1.14.4.ebuild 369 BLAKE2B 4e208156afc16ca1e64c073cceadd08acbfb7020021e7c739120787cbce779c87fac19c743b0544076cfc7d20b5a06e1702075404764bd376ada9c8b50c24eca SHA512 33b405b800e2cb18f2ae74532a52fc02b7a4d2d16be18609988121fbe1f106f74531b2e2e4e347a64208549e7cfe857139b43500352842cac29a47069725cef4
-EBUILD gst-plugins-libpng-1.14.5.ebuild 370 BLAKE2B 463372535f9e6b49d63786c494f005b3875db59a1012d6d3846dd8011ae569104eb54a928a1f028e620801969f298775f8864136ad1706a954b097555793de73 SHA512 063d2c72a2e36ffb84170e8e8daa6a6fc23e78289322f389aedea44dc503dada9ac4c6a78d45298f2fc30f64bfdf9463bcb08947dd99ae29cde63bcc69b3cd3b
+EBUILD gst-plugins-libpng-1.14.5.ebuild 369 BLAKE2B 4e208156afc16ca1e64c073cceadd08acbfb7020021e7c739120787cbce779c87fac19c743b0544076cfc7d20b5a06e1702075404764bd376ada9c8b50c24eca SHA512 33b405b800e2cb18f2ae74532a52fc02b7a4d2d16be18609988121fbe1f106f74531b2e2e4e347a64208549e7cfe857139b43500352842cac29a47069725cef4
 MISC metadata.xml 483 BLAKE2B 3c07bc4538ab8a6e0f2ca484f7b67a41d60f672714f17a1555eb2ebbcbbf14fe8e16f21360007789400352d3c1540c1644fd1402a12b639306a3068e5c9be822 SHA512 6d536bf8813f1f4d6b402487852ef1372172cb42c01d0a57af6b70166896deea5db36bed91f78ea18c1cdb8f809e5b5514f2b91a7668efeea170bee422d8a3a7
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.4.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.4.ebuild
deleted file mode 100644
index 22a1d7ef138f..000000000000
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm arm64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.5.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.5.ebuild
index b11e29780e9e..22a1d7ef138f 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 589df5608735..394d4cf11a95 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
-EBUILD gst-plugins-libvisual-1.14.4.ebuild 615 BLAKE2B 43fa0482c1888a2b0b6471d559b4dbd7ed749aa8e060e08e27f12c5a433e61c6188c2da76cbe9fd1ad982e06ff273db010ad32c019085ef42f01db5472877423 SHA512 3e3396343d87677832d8fede03289c27c6cb8b60f1bf9fa2e20eafedfd86dba81e506ab22a6ff66bba7b82d0807fe36adadea2ec834225f374dd3ac7fbcc0378
 EBUILD gst-plugins-libvisual-1.14.5.ebuild 615 BLAKE2B 43fa0482c1888a2b0b6471d559b4dbd7ed749aa8e060e08e27f12c5a433e61c6188c2da76cbe9fd1ad982e06ff273db010ad32c019085ef42f01db5472877423 SHA512 3e3396343d87677832d8fede03289c27c6cb8b60f1bf9fa2e20eafedfd86dba81e506ab22a6ff66bba7b82d0807fe36adadea2ec834225f374dd3ac7fbcc0378
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.4.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.4.ebuild
deleted file mode 100644
index 88aea38c884b..000000000000
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-base
-
-inherit gstreamer
-
-DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
-	>=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	gstreamer_system_link \
-		gst-libs/gst/audio:gstreamer-audio \
-		gst-libs/gst/video:gstreamer-video \
-		gst-libs/gst/pbutils:gstreamer-pbutils
-}
diff --git a/media-plugins/gst-plugins-lv2/Manifest b/media-plugins/gst-plugins-lv2/Manifest
index 963e5a331efd..eeb71dad43d7 100644
--- a/media-plugins/gst-plugins-lv2/Manifest
+++ b/media-plugins/gst-plugins-lv2/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-lv2-1.14.3.ebuild 363 BLAKE2B d01960509cb629f29b87e578b11b7bd1f6f23e89134f30494cfe4d900d10c4fd38ddf37d83e0ffc50e3691d3c1933a8fc109622da6912dc4970ca50d396ef749 SHA512 780c562eafdb72c3b32ced3f9f03834dd584f0a36d43a0d1287183596d7d721b51cfe7769371b063740dc3d34029a2ee75895ee15516c8acac2026b0677ecf4a
 EBUILD gst-plugins-lv2-1.14.5.ebuild 363 BLAKE2B d01960509cb629f29b87e578b11b7bd1f6f23e89134f30494cfe4d900d10c4fd38ddf37d83e0ffc50e3691d3c1933a8fc109622da6912dc4970ca50d396ef749 SHA512 780c562eafdb72c3b32ced3f9f03834dd584f0a36d43a0d1287183596d7d721b51cfe7769371b063740dc3d34029a2ee75895ee15516c8acac2026b0677ecf4a
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.3.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.3.ebuild
deleted file mode 100644
index 4ae97846aa76..000000000000
--- a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="Lv2 elements for Gstreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/lilv-0.24.2-r2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index a0a7237aebcb..9321a839f698 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-modplug-1.14.3.ebuild 366 BLAKE2B 347cbb40659f69dbb3df4ca316e91e1c7a6c5ee8521dcaae94df6e1d2cf8b61283ecd275c27acb3239758f58cee7d6812870818a678e3926a81417e5d26776bf SHA512 4f344b4963b0ee7f615079073722ba6c71eca2633924e457fe1c71b63763edc2c1739a920f89ce67b3a75895a44e55cc0d05ba4034115afd01f6ac34edc9a12e
 EBUILD gst-plugins-modplug-1.14.5.ebuild 366 BLAKE2B 347cbb40659f69dbb3df4ca316e91e1c7a6c5ee8521dcaae94df6e1d2cf8b61283ecd275c27acb3239758f58cee7d6812870818a678e3926a81417e5d26776bf SHA512 4f344b4963b0ee7f615079073722ba6c71eca2633924e457fe1c71b63763edc2c1739a920f89ce67b3a75895a44e55cc0d05ba4034115afd01f6ac34edc9a12e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild
deleted file mode 100644
index 8c9e4b846317..000000000000
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="MOD audio decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest
index 573e44db2730..8e986e105364 100644
--- a/media-plugins/gst-plugins-mpeg2enc/Manifest
+++ b/media-plugins/gst-plugins-mpeg2enc/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-mpeg2enc-1.14.3.ebuild 336 BLAKE2B 91af84a87c7b6e038b617ff47b5a89eeb7d38e6e6ed8071052ab1c5788809ffdeaed4761d0d28bb4b3dea81c364f646362473c9919a8e7eb4725f9223f317256 SHA512 41684e4cb9e05c6f7b207135e6e3abc900fcc5acc0d71f1f5b9d9d647d67d0100ecb1f2dfc98dcc449e8969d830b5fd83e96625e68d7743a54961d52a54cb39e
 EBUILD gst-plugins-mpeg2enc-1.14.5.ebuild 336 BLAKE2B 91af84a87c7b6e038b617ff47b5a89eeb7d38e6e6ed8071052ab1c5788809ffdeaed4761d0d28bb4b3dea81c364f646362473c9919a8e7eb4725f9223f317256 SHA512 41684e4cb9e05c6f7b207135e6e3abc900fcc5acc0d71f1f5b9d9d647d67d0100ecb1f2dfc98dcc449e8969d830b5fd83e96625e68d7743a54961d52a54cb39e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.3.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.3.ebuild
deleted file mode 100644
index 499e088b7c97..000000000000
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index fc1e5fd56114..e4c4950c13b1 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-mpg123-1.14.4.ebuild 370 BLAKE2B 8aead20832173cf15ad4ee274ff7fb2ea621d65b0b0d4da06bd5b886810345e3fae009be4b05a2062aeca02d8494af2ddadc65f035dc35d0dbe225097e33e091 SHA512 f9c1ffa3e5391abc757b161b06f9141fa5de8463e2ca0899486a4088fb876e2063cb83219cdecdab29bc4ec81ecc4e933bed62311cea91ed2929c1a60a05b1f6
-EBUILD gst-plugins-mpg123-1.14.5.ebuild 372 BLAKE2B b194c76ba0ccca1aa50c5f0d78143437cf56fc7701694833ee434f2f1877af91175f377b9c47e0bbe96572dcc5aa55847db09b7c144e1e0e01af38b78b1e2757 SHA512 874b42c71fdf8366942780e1f2e66756ac726faa5f459b7f4c855eeb06e5b3d8105e06a15bc2c8cf7937b15d09e06a9c946a3047e10bbe6e6defbb97cd0bf6ed
+EBUILD gst-plugins-mpg123-1.14.5.ebuild 370 BLAKE2B c29cd8b30868e4a0d8c1a7e58358ffc7fffff79ff4c4632c9f50ec3f00b9513b8179fa3e7374d751c1307cb5ee4b2a3e899d5bc207ac7d9c020083870ff693e2 SHA512 c635ba50c1bfdff3f21c57cd9affe6dbf11b2f183e9a17be1780f8c674e9204f7ff83aa956cbedd57b0fef6d3fd502938cd2978e6f4bf517d6bf432abcf5e3d0
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild
deleted file mode 100644
index 5fe045bdf3f5..000000000000
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=media-sound/mpg123-1.23[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.5.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.5.ebuild
index e75ac2f07063..c468cec5aba8 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-mplex/Manifest b/media-plugins/gst-plugins-mplex/Manifest
index c0e5b4c98930..b66c0b0611c2 100644
--- a/media-plugins/gst-plugins-mplex/Manifest
+++ b/media-plugins/gst-plugins-mplex/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-mplex-1.14.3.ebuild 405 BLAKE2B b990fc1866c5f08263b7d25721d44d865118cee58b5e39a6e28133c8dfc5ea4b08f1f3dd649501992fb5c42bb0f1f1896f042d1da207274703fa0a534d8e56be SHA512 0f67b50f30481140cfb101a9b48431d81a025fa8ecc2bf545f3bb62a1a86531cd9467921b3440ba76df59e3ffee28d4c65782d4c72aada9d525f2217f725fb0b
-EBUILD gst-plugins-mplex-1.14.5.ebuild 406 BLAKE2B 82fa69ac7189f1e47fb777e1a3decdc16dc9b901d792986b782dedc6120e82f1112c38d3cf5eca81e3eb48ea92df6ed42bae64885d89c02f2fba032e3129e852 SHA512 b71588c4d760013c94c5d9452117b868853710991a5390a4a8ff1a69993529a9aa5389579b1d016b75617c2c7b42b7e1cb51aca62475be0ccd0734c9377c3ebd
+EBUILD gst-plugins-mplex-1.14.5.ebuild 405 BLAKE2B b990fc1866c5f08263b7d25721d44d865118cee58b5e39a6e28133c8dfc5ea4b08f1f3dd649501992fb5c42bb0f1f1896f042d1da207274703fa0a534d8e56be SHA512 0f67b50f30481140cfb101a9b48431d81a025fa8ecc2bf545f3bb62a1a86531cd9467921b3440ba76df59e3ffee28d4c65782d4c72aada9d525f2217f725fb0b
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.3.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.3.ebuild
deleted file mode 100644
index 7b37dac66c57..000000000000
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.5.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.5.ebuild
index 53b5e0da887d..7b37dac66c57 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index bd042d8aa86e..a0cf68bb730b 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-neon-1.14.3.ebuild 336 BLAKE2B 1d3b7ac4b8be7cbdec72c3b1e3a1256850483287d33255796ac32272f5a1da802354377a793d027119ca88fcf8e69faa6bb17f9a4e7b8baebf5b7275f67d8440 SHA512 0d198455770058ed4a462c926278a293af665f88f7d8a41ed6367e4e54e1b7834e9e035368bec7e9a6eebdf0a9eb71c6e0bba2883b777c43f90afbffc881e6a3
-EBUILD gst-plugins-neon-1.14.5.ebuild 337 BLAKE2B 28ed9e26edf66d2ab6cf9f9129f3af5137b29202b35b997042ba6f9d4638ec539b78f4b043088bdfc8ba3959c6f453f1409b8a8bf9f18b232218885396d0b20e SHA512 48e0f0215a87dc13cd71a9ed2d93407d6404ecee53791fdeb91d900a9c216b7288836c3dcb88b01f4f6afbd20d010f7af845193c84b552f329eefc38c0611be0
+EBUILD gst-plugins-neon-1.14.5.ebuild 336 BLAKE2B 1d3b7ac4b8be7cbdec72c3b1e3a1256850483287d33255796ac32272f5a1da802354377a793d027119ca88fcf8e69faa6bb17f9a4e7b8baebf5b7275f67d8440 SHA512 0d198455770058ed4a462c926278a293af665f88f7d8a41ed6367e4e54e1b7834e9e035368bec7e9a6eebdf0a9eb71c6e0bba2883b777c43f90afbffc881e6a3
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.3.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.3.ebuild
deleted file mode 100644
index f8a4fe13c2fd..000000000000
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="HTTP client source plugin for GStreamer"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.5.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.5.ebuild
index c6c6e6166eb1..f8a4fe13c2fd 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP client source plugin for GStreamer"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ofa/Manifest b/media-plugins/gst-plugins-ofa/Manifest
index 33529c8efe2c..73a65f76a5a9 100644
--- a/media-plugins/gst-plugins-ofa/Manifest
+++ b/media-plugins/gst-plugins-ofa/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-ofa-1.14.3.ebuild 385 BLAKE2B b8830639822d7aebf1f15011e73f5264e46c33776bc1eba49481fc755fa2c2c555ff8f745f1f4e3820fc45f5dc6812814b34f9a0873b62c79202847481b3549b SHA512 c93f156cb16f5029391ff9ee81c4516340abf446bfb6be573102a8a9564c89a2f6681a7051be0d34d04e1c3efde2531ec735b18f91bdeda586073e2fce459f9e
 EBUILD gst-plugins-ofa-1.14.5.ebuild 385 BLAKE2B b8830639822d7aebf1f15011e73f5264e46c33776bc1eba49481fc755fa2c2c555ff8f745f1f4e3820fc45f5dc6812814b34f9a0873b62c79202847481b3549b SHA512 c93f156cb16f5029391ff9ee81c4516340abf446bfb6be573102a8a9564c89a2f6681a7051be0d34d04e1c3efde2531ec735b18f91bdeda586073e2fce459f9e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.3.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.3.ebuild
deleted file mode 100644
index 891a18c80a02..000000000000
--- a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="MusicIP audio fingerprinting plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index e1ddfa549312..2010a08e0be4 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-opencv-1.14.3.ebuild 656 BLAKE2B 46f4180df979524651d4fcb9f518b706e86380b4fea552556af0dabfd86c051d88bcb9afa9a20b8d5a622f64d17212c6141a06797883f31893fd5fc15d6561a5 SHA512 c7d027e0b5b69b54448fe7917f6332e8199c2ffb5269189cd09413d5050d77a83f7eaded9bad9a09cafc88e946cee94ab80ad32d23d58a01172ac4b0b0176df5
 EBUILD gst-plugins-opencv-1.14.5.ebuild 653 BLAKE2B 05ecce2928ca20f9219972e6fcdd021cb0bf2aaef253b908b1627abb6e48fdf245268ab55c660f32ffc63203d04bb7e28cf40475457f7a29c8d8220027102ca7 SHA512 94d76147f6be27b1e7ff6b321adfbc6a94cc1a9b99a8c9ea575b4ff6417eec2c00cf8e6a3b54370c5ab8801a237ff6180d6c969d8b4e909948b322ce22c6bb0e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.14.3.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.14.3.ebuild
deleted file mode 100644
index 69f293e139b8..000000000000
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.14.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="OpenCV elements for Gstreamer"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/opencv-2.3.0[contrib(+),${MULTILIB_USEDEP}]
-	<media-libs/opencv-3.5
-"
-DEPEND="${RDEPEND}"
-
-# Ships the opencv separate helper library as part of gst-plugins-opencv as it depends on OpenCV
-multilib_src_compile() {
-	emake -C gst-libs/gst/opencv
-	gstreamer_multilib_src_compile
-}
-
-multilib_src_install() {
-	emake -C gst-libs/gst/opencv DESTDIR="${D}" install
-	gstreamer_multilib_src_install
-}
diff --git a/media-plugins/gst-plugins-openh264/Manifest b/media-plugins/gst-plugins-openh264/Manifest
index 0a36bf4cadff..bc11b3dca174 100644
--- a/media-plugins/gst-plugins-openh264/Manifest
+++ b/media-plugins/gst-plugins-openh264/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-openh264-1.14.3.ebuild 330 BLAKE2B ca7a30601574cc92a178ff2d2c42c08675a886ee253fb023b64432ec67b9d5974484ab4be01310b17179ce1da8a3ea9e755884ace8bd2e08f000dc4ee673d674 SHA512 6f5f785ff6191cc09ee7c38caab00e2fc4e3ff3b44554539bf32ac042dbb9f1a93a9663c710395a8fcc87d49315ef5969cb51b4ae59a94b0724a94b43b0e7269
 EBUILD gst-plugins-openh264-1.14.5.ebuild 330 BLAKE2B ca7a30601574cc92a178ff2d2c42c08675a886ee253fb023b64432ec67b9d5974484ab4be01310b17179ce1da8a3ea9e755884ace8bd2e08f000dc4ee673d674 SHA512 6f5f785ff6191cc09ee7c38caab00e2fc4e3ff3b44554539bf32ac042dbb9f1a93a9663c710395a8fcc87d49315ef5969cb51b4ae59a94b0724a94b43b0e7269
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.3.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.3.ebuild
deleted file mode 100644
index ef238464e03b..000000000000
--- a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/openh264-1.3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index d48d9c07710f..149c0c429dfc 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,7 +1,4 @@
-DIST gst-plugins-bad-1.14.4.tar.xz 4678032 BLAKE2B 098d0b0600efb9f7926295fdc34d448bf9c9a719b9061d5be2282c6f5d09550b52f7ee78e90398577c21db2bf05510d74a5880d1d401a4931a0dea2b81509973 SHA512 a5bef1863110ae25ef4c75ad2cdbbde011e1d1a722754cc0372e8de9c81aee9159e2301d90d6f9b04b66a20887abe20de20d74dbe207d20102e8081130eaf839
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
-EBUILD gst-plugins-opus-1.14.4-r1.ebuild 1236 BLAKE2B fee63e169fdddbe065298d3ab8839456fadb5c1a76a755bd3cbff2fd1874ee30277002bcc79876eccf3e3bb4884cda43b5d21815c350620b90f42ec1b8350958 SHA512 e3579226b9015fe4457e0c3c71787f221ad2d52e5f3bfaf2194cb012fdc859cd772e871bc70428dabb3d16113a2b0ac0d32c5664bf51ea6f094ca96f6f7c36be
-EBUILD gst-plugins-opus-1.14.5.ebuild 1238 BLAKE2B 7678334fe618f690b9bb70c30d3b0d9ccfabb0ea9d7b560f65d0984530b1ca885528000012cea1e898761e09239bec8d26c381e1228eca8aa461e53a14f6c72b SHA512 cbd4ff236c3ad220da8f5c8d84e2643ebcdfbf82da3d2c6ca549afd1bfe546cb4733050472c217c1b5a7949e94affdfa16b1064ee3f33d185583e42af33cbed0
+EBUILD gst-plugins-opus-1.14.5.ebuild 1236 BLAKE2B 8eedb0d346bf9f881ca5b30c88d42e43d4ead1f627348ab9336004e7a92d261b12b845d1c85d7f7ba51b850e29b07613bedb225b1daf3330f530d8b6b58a9906 SHA512 595dbc3a61dbc84357041c2da12e06b12b578d6b86029aa9807164f6f7eb0323ac285e943ce5b1e6407688bbdac0bc85a800e95714b136c1457ec0106b09fdc9
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
deleted file mode 100644
index eb7ca1d661cf..000000000000
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-base
-
-inherit gstreamer
-
-DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
-"
-DEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-	gstreamer_system_link \
-		gst-libs/gst/tag:gstreamer-tag \
-		gst-libs/gst/pbutils:gstreamer-pbutils \
-		gst-libs/gst/audio:gstreamer-audio
-}
-
-# Everything below is for building opusparse from gst-plugins-bad. Once it moves into -base, all below can be removed
-SRC_URI+=" https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.${GST_TARBALL_SUFFIX}"
-
-src_configure() {
-	multilib-minimal_src_configure
-	S="${WORKDIR}/gst-plugins-bad-${PV}" multilib-minimal_src_configure
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-	S="${WORKDIR}/gst-plugins-bad-${PV}" multilib-minimal_src_compile
-}
-
-src_install() {
-	multilib-minimal_src_install
-	S="${WORKDIR}/gst-plugins-bad-${PV}" multilib-minimal_src_install
-}
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.5.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.5.ebuild
index d6ee6a57c4ed..8040e8b49538 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index fc303f5a5c01..882277c90181 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-oss-1.14.4.ebuild 354 BLAKE2B 691bfcd03851611c0ac2c20772ea6b6bb39eeed41b84f143636111266bc27fc6cdb734fa025d96412c3c04f6a7f4b2b27bc27a120e4c43a47d5c049fe3b7e37c SHA512 14970dcb5e6fe931fc0c0ce4fb899f369af2f2bc119056d52748d54aa1278f0db56c172a5e2ee25a6b0a07e917a65cedf3a7a65c6fee44a2e0688f987f8afb1c
-EBUILD gst-plugins-oss-1.14.5.ebuild 356 BLAKE2B c6e05d69817e2313f5aa1bf83d7a6f258a79008273838b3f61182fd1b66163ed3f7b5947b9b3909692c4fe48efd4659cecacb62b4c50794914676b01fc04b237 SHA512 fb26a4f3cd2099007a4bcae22dd52811f715ac4074d00a86b64b054625e6d12b940e91bc3c43a49be5b6f296b49bb49fe6ffd8201400a67e851ae1b6fcd9ad94
+EBUILD gst-plugins-oss-1.14.5.ebuild 354 BLAKE2B e2b610f7fc818d383bc645182b693e2802fc61d676e56295af903c499c78be5e9a793522a42ded5d21cbc4ba898aba9b1634794c0f42e0ad876ec2ff4c7a19f8 SHA512 8bd9f42325ba8041d27e7957cfad7e63af466faa01482c785391762e3227be03e0bbad9f7b61fce41769f987a764cfc57657a78da5d1fee1232e5fdf4ebc5f8f
 MISC metadata.xml 488 BLAKE2B 72817781f31070fbba548a5a0e724d3a3a419f55b2c1ba1155e88f66b0f779d34fc5705c39d60ecc5c40a9ba47ed568aa2458c0557de1795ddacadf54b39a436 SHA512 6ab36e28308e33d9b2e74a419ed558c913510f23bee1fd1a58ff87c6937dc2c3b4c8c683831e771460258424e89797a6b8c5ebed95cb87506ae7d67c11b2c243
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild
deleted file mode 100644
index 225a6663455a..000000000000
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild
index dde6cf389330..05f1378365a5 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index 5ab68f1b93fa..3f313a8b846f 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-pulse-1.14.4.ebuild 457 BLAKE2B 710029c2982bfdfe57f2af044e868234a7eb6dbe7a40b5fbc246d4627ed3109eb10d570755da7f1d20b4ba2280635cc0654fa0be8143894902e7a2d323ece4b2 SHA512 c17bc2ff852a4773a0e11183e545d4732f3ec69c46f8f7aa579f5ae13a5ba2521996836f3a735cf162f58f28c56df57cdad586ef64c4a183d407cb0e3f534943
-EBUILD gst-plugins-pulse-1.14.5.ebuild 459 BLAKE2B 4ed75979fdad6d73bd5aeb3b3581bd3809054c1a9874c0bbc86a36ae248bc9167f6c5f61398c96196bb8fffaacc6c81998deeffbd1d63f3ba8b217aae5979d1c SHA512 76467f7a3c93fbcd8f54c20fe1fbce16439279acda7afa3b42348f985a57cfbb71662212a4916025aa1127f63791f885c97eb28543e9cc223cceaa498ba33f9e
+EBUILD gst-plugins-pulse-1.14.5.ebuild 457 BLAKE2B 96bac4c03cb6ffb25a17797d11e2914d43a03f9c6531890ed7c4b301a622c6fcbc408ced9cbed6a4b74dc791916947107e8403138bdc3bbc9ab2ab5079813e6d SHA512 97b8773c8ba99446f8a976ac753af4c16c8090cbbc73414e32006f5b3725a094f130ba055dac3b7b2c2da6ede7532af55d353419527c77651b58f6931155e08e
 MISC metadata.xml 610 BLAKE2B c8d30b8baa2a2dc5dc43b2a0f5badcb212567f7ce4873f58b1662b3454c8232a4916f10470bb98c3dae745f818f0e02d7266542d44d3fd4b9eb7edf99bf2a419 SHA512 0f0fa4496446fbaa649c3d76538c4960ca0d7918b40e305aa0da8516e79ef25c10136b0097fd687cb968c37de636b57ae667be1bc3197a571f557400a9c0c478
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild
deleted file mode 100644
index 9674b80fd2bb..000000000000
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild
index 931e7b0d46e3..a53c0431edc1 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index d21b22f73bb8..de0c950ff037 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-raw1394-1.14.4.ebuild 514 BLAKE2B d499ca202c465c73bb7dd0713e6f73326cefa36d228db31ac47db5bb8e6b296fcabbb53895100902a24f0b26d3d73b2f224a43c6d4ea74268196e76dd3741f6a SHA512 77b2bbf8e74f73dfef7652c7b8085a80720fd0d44fe15bf8af80d8078b05e466614ddca19be0b542969f0b295cb170786fb1b4f3f83beef3afcfee660b10fc0d
 EBUILD gst-plugins-raw1394-1.14.5.ebuild 514 BLAKE2B d499ca202c465c73bb7dd0713e6f73326cefa36d228db31ac47db5bb8e6b296fcabbb53895100902a24f0b26d3d73b2f224a43c6d4ea74268196e76dd3741f6a SHA512 77b2bbf8e74f73dfef7652c7b8085a80720fd0d44fe15bf8af80d8078b05e466614ddca19be0b542969f0b295cb170786fb1b4f3f83beef3afcfee660b10fc0d
 MISC metadata.xml 548 BLAKE2B affa90bfebf1a2616bfe7262f0850227bdb4aac3580924c58fda8c1c9c89fb288252c921c73404149d02c8f1d38f61840301bdfdea01608a3db14e5e8b0b08a6 SHA512 ad3c3f4e095d868f0df4f869fe521f3c51ada956f578b995bd9e7161ef679c5c395434a76f4ddcfe1242dc37790e8f1ffe0167c8a50c686d434747563c151031
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.4.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.4.ebuild
deleted file mode 100644
index 01d2ffbba7df..000000000000
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="dv1394"
-GST_PLUGINS_BUILD_DIR="raw1394"
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index 5fe6e46fa01a..73fb8a8b98c0 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-resindvd-1.14.3.ebuild 440 BLAKE2B c33c189abb314be8564db03ac3e71a9a2654c30e051a6f7cd620c72be3034158852eefd31e3bb7a66c318ebdf4e1a51d4e9dfc4966f63cd1596b29beebbf1782 SHA512 f7698f851547a4d4ce621568a293c9b25e14e483d7ae25f820b2234602e1b04fb5e7017b2c3931fdb80b96ad12ee227d7b26b5583fdae80fc3d9951de0cc5576
-EBUILD gst-plugins-resindvd-1.14.5.ebuild 446 BLAKE2B 75a0241b7df506196d4eaa916e1c50d541917b1cd8d2a0f78bb6f0f7742f8e12bfda2785899734482d941b281ac5f0c0f7ec0d30f1eb834fd5a1194249ed19d0 SHA512 f406cb31d1e441f3f5f1fb58e4ecd222a5cffc1b00c7c1c704c831e7fd48d4bf00b2ea97570f2e52c6d51ea5a84959bb8a9d1adfe0d64e3922d7239590adc13e
+EBUILD gst-plugins-resindvd-1.14.5.ebuild 444 BLAKE2B 910f458c3b4d26ba5ec4ee56cbed7b1ed5eaf582d56fa635a75b28cecb30ade131114c11258fb79494dfe8f3718228466ff31d7c028c2247717e5c4d2270bba3 SHA512 a53853c543e9743dedfb143ec7f3d8c5a452b368766a9fc267932a92cb9057ffa0158dcb748fa67c3d623c017c3223968994fb11c9f3407aa14c45a709dc93e7
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.3.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.3.ebuild
deleted file mode 100644
index cd9f96b25596..000000000000
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="DVD playback support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libdvdnav-4.2.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.5.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.5.ebuild
index 4cf2dd165d01..b5f3525717be 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DVD playback support plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-rtmp/Manifest b/media-plugins/gst-plugins-rtmp/Manifest
index 86d361a6c9cd..213736e7f3cb 100644
--- a/media-plugins/gst-plugins-rtmp/Manifest
+++ b/media-plugins/gst-plugins-rtmp/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-rtmp-1.14.3.ebuild 332 BLAKE2B a06f090240d6d552c0d8b8cfec19a0b3dd8c3018677036619f27d04ffea008b074afb61b158a404abdafa773c948020cfec3c6ef9e362ba8d7bdfd8767ddaa80 SHA512 c08539c5e593a9aa6c95e84e537657a203b2b3a6e9830f66a94e9b6789141892411036dae076c6fb00ce978dc3a85b27cf24017b62698c79c3d9d36eef89ef45
 EBUILD gst-plugins-rtmp-1.14.5.ebuild 332 BLAKE2B a06f090240d6d552c0d8b8cfec19a0b3dd8c3018677036619f27d04ffea008b074afb61b158a404abdafa773c948020cfec3c6ef9e362ba8d7bdfd8767ddaa80 SHA512 c08539c5e593a9aa6c95e84e537657a203b2b3a6e9830f66a94e9b6789141892411036dae076c6fb00ce978dc3a85b27cf24017b62698c79c3d9d36eef89ef45
 MISC metadata.xml 419 BLAKE2B 8e461a2732df916b2d78bf38497df7061a3617920e155157f6cd62e5658187ea94d4ad328533c950a9554bbd9f3c427a1b616a7a882bfc977b349746ced681fb SHA512 c157a5142e10bd93420db567edc321580c57872558473b0181fed12b688164dcd928cb19c983b61602583edcbf333ac685dec141be5cfc5a207f8b849f64046d
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.3.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.3.ebuild
deleted file mode 100644
index 10d75e02d258..000000000000
--- a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="RTMP source/sink plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index a57a26c268c8..14c0863542a6 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-shout2-1.14.4.ebuild 346 BLAKE2B 43d9409aec1c930a7ab170f0469426de65e97f64d3580e3d8c8855b7281ab4b517b2607ecd58dc76ef4fe3de4f25279aee001f75f383d2b2143d6917f364cbfb SHA512 d2230cdd0ed2e995fbd1f0269a4cc22e6574f0d3b2d9a60aa77ae424b7209e84371c37887a0a0b2b81e3aba32c8c5f841d9fd573692cf2d797d547f4949c94f7
-EBUILD gst-plugins-shout2-1.14.5.ebuild 347 BLAKE2B cc650819eb32869fbbd8bb90a5676f390c098ac7275baed131f993a4ebb2a20bb9ed52a2d9b5f3b6b326b5f5ed917e9c965be873decf5e5db1ed31cf8995a664 SHA512 32f524a65cf1c084fd345181ffe5e8ee1f76db0576ce4a7926a4b8b2e9472b8c4a82c2d279c8515122e233a93d48fbe0b33ba583d15c7eb6956ae763ddee2f66
+EBUILD gst-plugins-shout2-1.14.5.ebuild 346 BLAKE2B 43d9409aec1c930a7ab170f0469426de65e97f64d3580e3d8c8855b7281ab4b517b2607ecd58dc76ef4fe3de4f25279aee001f75f383d2b2143d6917f364cbfb SHA512 d2230cdd0ed2e995fbd1f0269a4cc22e6574f0d3b2d9a60aa77ae424b7209e84371c37887a0a0b2b81e3aba32c8c5f841d9fd573692cf2d797d547f4949c94f7
 MISC metadata.xml 478 BLAKE2B 4c7e5bbe6d79d01544434b93b998847f6c5e3fa7bf2b979c9ff0238d75c0f1ac5693cb4224073926b6cf098a661fc5064f9ba2db3dd2b121093ee78cf905b1ea SHA512 a24a36ebfdfc159df5e23891118ea4e21855a4db31c1ddee9a081c55597be4f34014adbf0a46712d202f1557f2a63e776382c86ce5193465f35868c91114cc52
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.4.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.4.ebuild
deleted file mode 100644
index 7a277f8f44a8..000000000000
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.5.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.5.ebuild
index a53e39395fcb..7a277f8f44a8 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest
index d609d10f270c..95c68222f35c 100644
--- a/media-plugins/gst-plugins-smoothstreaming/Manifest
+++ b/media-plugins/gst-plugins-smoothstreaming/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-smoothstreaming-1.14.3.ebuild 1356 BLAKE2B 13243bf1f53db280eb0f8076e84ade16e91341404cef5343883afe4fd49d432cc7bc5bae11e6a9ba8920a91a8bd8eac9a5d0b4a411000c8de01859099e572621 SHA512 d470e7f1c6f1b10b90bb703c03e00f8e90a52f296d9a52a4680bab34972397a5ba643cee922d4d871a7caa09df7d05980905ea1315490889d51a437cd6d4b8c2
 EBUILD gst-plugins-smoothstreaming-1.14.5.ebuild 1356 BLAKE2B 13243bf1f53db280eb0f8076e84ade16e91341404cef5343883afe4fd49d432cc7bc5bae11e6a9ba8920a91a8bd8eac9a5d0b4a411000c8de01859099e572621 SHA512 d470e7f1c6f1b10b90bb703c03e00f8e90a52f296d9a52a4680bab34972397a5ba643cee922d4d871a7caa09df7d05980905ea1315490889d51a437cd6d4b8c2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.3.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.3.ebuild
deleted file mode 100644
index 2dad9f61e65e..000000000000
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="Smooth Streaming plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# FIXME: gsturidownloader does not have a .pc
-	#	gst-libs/gst/uridownloader:gsturidownloader \
-	#	gst-libs/gst/adaptativedemux:gstadaptivedemux \
-	#	gst-libs/gst/isoff:gstisoff
-	gstreamer_system_link \
-		gst-libs/gst/codecparsers:gstreamer-codecparsers
-
-	local directory libs
-	directory="gst-libs/gst/uridownloader"
-	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgsturidownloader-1.0"
-	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
-		-i ext/smoothstreaming/Makefile.{am,in} || die
-
-	directory="gst-libs/gst/adaptivedemux"
-	libs="-lgsturidownloader-1.0 -lgstapp-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstadaptivedemux-1.0"
-	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
-		-i ext/smoothstreaming/Makefile.{am,in} || die
-
-	directory="gst-libs/gst/isoff"
-	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstisoff-1.0"
-	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
-		-i ext/smoothstreaming/Makefile.{am,in} || die
-}
diff --git a/media-plugins/gst-plugins-soundtouch/Manifest b/media-plugins/gst-plugins-soundtouch/Manifest
index e28dcc0f3d3d..9d5149eb8b31 100644
--- a/media-plugins/gst-plugins-soundtouch/Manifest
+++ b/media-plugins/gst-plugins-soundtouch/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-soundtouch-1.14.3.ebuild 360 BLAKE2B 206ce13fa48219b2ff90a26e5981fae94b6a5735e999c88a634a515669934b217ef8f643a978e47bcde632179aacb14386b399ba66480c294ce44786be6a161f SHA512 c787f1aaf44156b972be8ba60ecb1424297c970c4662706cd40fc19d23a4fbe757ba2bc8d698ce56797d44d076bfc5c01b3ca2ea853498d00020fb64d42385e4
 EBUILD gst-plugins-soundtouch-1.14.5.ebuild 360 BLAKE2B 206ce13fa48219b2ff90a26e5981fae94b6a5735e999c88a634a515669934b217ef8f643a978e47bcde632179aacb14386b399ba66480c294ce44786be6a161f SHA512 c787f1aaf44156b972be8ba60ecb1424297c970c4662706cd40fc19d23a4fbe757ba2bc8d698ce56797d44d076bfc5c01b3ca2ea853498d00020fb64d42385e4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.3.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.3.ebuild
deleted file mode 100644
index 2f61531e63cf..000000000000
--- a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index 717d6bea3bab..3b142269af8d 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-soup-1.14.4.ebuild 392 BLAKE2B f9357f4e3cdfd19b269ae1521a8a946835af19e167da8e4168f67612147163fea4a65be6acf2a0f8b429c98db6bbbac8a92673c1f93e5bd3d6afa4d306139622 SHA512 1386366c338d7f2b2d1d763ffa92699abd03c471ac4bf493bf07c0a9e201ab0615756f747b9456f90edef9fe9634c808b46a5a8b77576a27f93527fb0fab2308
-EBUILD gst-plugins-soup-1.14.5.ebuild 394 BLAKE2B 4e33f9a3b134f8e321809fd1b8912cd4a13347deb05d5026163b71acb3fbcafcfa044a1e18db00bb0fa73b1677e00271ac8ad7ba318a3cd063bd42a6038cf606 SHA512 3c3e3a565887b7461d476edb56749408a8afedbfd2683551291cc0cce3633d59d81e360cc8a93f59a64e79296010eb411e3c586de1f3c29932a7aa0a8d6f3143
+EBUILD gst-plugins-soup-1.14.5.ebuild 392 BLAKE2B 116f4efc1d3aad022b6a217317f870af95e0172effe46de9505f2d66ae463acf4150a7a4c8efc4dfcdcdb3ce14b946545eece9e436af6d2197f0ff27c1e90454 SHA512 8a7babc62fb2194a6ad3e439da939bb44f46cf6dbc6d998f765cabaf2b4df0b2eff3eb288ca713078c8d9ebd2b94aea8b052dc60de56575eab0653650ef06a8f
 MISC metadata.xml 552 BLAKE2B d1dddafba0b921d7484d1c52567a8b9fbecc611b5234bc602cef79c7953a2a3a9bb423bc929055127ab894506409ddd8e8a71cb432169b1370e65b83b2e4341e SHA512 ce8b5a2a0d33e00ef141b82b3c6d192e31b681f016f431f1306d2066677d7fac66135129f57d25f9d13644c9d3976baf74fa6e6f65f5feebee045b82d04e2d8c
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild
deleted file mode 100644
index 1b424132bfee..000000000000
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x64-macos"
-IUSE=""
-
-RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.5.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.5.ebuild
index 820a3c21d149..dd0f865311b0 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index 3a2315f5761d..a307453f70c9 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-speex-1.14.4.ebuild 370 BLAKE2B 76c780601c78d1525106f9a53dab465a5fc7771614c51eb042036e1fcfbc96f71c0eb93001bc1e1a6f88c753558fdacc9d163eda7ae3d708f742084617597581 SHA512 e5f466ea3fa0d36792f53b0c88ab81c2a55aa63b75d21924a5706bfcf84bdac60d9a474be7811a704526cbde22d4a2365ac8bf854b17cd2e8bed9bde84056a23
-EBUILD gst-plugins-speex-1.14.5.ebuild 371 BLAKE2B 6d3646bc12165fe259135a8ccdb695a2d7c3c6c49f528fe8d095a9784b8196e50f9ec2c09d41379b4ab96257079056834bf7a93b4ada34ff2ccdd443e6de8713 SHA512 36659c7e07855bd5509d780a1def769671d4c6ec2d4be50750d08c3fa8c0a63ab825a64fde5a4428c2cbc26647b1047f0fc4a465109613a02f7473ed25e7d5a3
+EBUILD gst-plugins-speex-1.14.5.ebuild 370 BLAKE2B 76c780601c78d1525106f9a53dab465a5fc7771614c51eb042036e1fcfbc96f71c0eb93001bc1e1a6f88c753558fdacc9d163eda7ae3d708f742084617597581 SHA512 e5f466ea3fa0d36792f53b0c88ab81c2a55aa63b75d21924a5706bfcf84bdac60d9a474be7811a704526cbde22d4a2365ac8bf854b17cd2e8bed9bde84056a23
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.4.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.4.ebuild
deleted file mode 100644
index 0ecfd736f5c3..000000000000
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.5.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.5.ebuild
index 2cabfa71af88..0ecfd736f5c3 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index 5007352ef4b6..543b420e2044 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-srtp-1.14.3.ebuild 383 BLAKE2B a7b0328ce6ef8bede9a9f21759571b469a67e66399363ad58795a135956049bcf5f94d752fa77d49a2a56389053415e6dec1984fe2e029ef9d4577100426fde6 SHA512 125381a656a7d8e29b2aee9ff2bf72a6541ce65949afde23e15f7b7d7ce46b52f1cf28f5fa22df18d264807844d3a0bb3e5d57dd18017ef3c677e28ce8128456
-EBUILD gst-plugins-srtp-1.14.5.ebuild 385 BLAKE2B 94c134bf3760c77804675fd6329425d592dadaac64ff5d9632b65ed4736288a3cfc1e0058c62a8ad8486dc04914a8178f6fe44b48f6339525ae8183842a6c7de SHA512 5322adc2e89165175b95d59da24d8d14fadec76338b42f5a250ad031de30a8288ecf88b93a08b9a654cef87054a722eca3321a2ab1af2846ac1eddd912ad86bf
+EBUILD gst-plugins-srtp-1.14.5.ebuild 383 BLAKE2B b2602cb40875639b9b1fc80c721ee6a6db5c403b7ea6117a5c32f07783169349b4ce4d901864a6e75c7ce038a9c5acf4fd6c8e4e477fa3b411a8c4845fcfb922 SHA512 3bacaaab0975d401636a5ead4367f58aa5a0720f702bdb089363b431209d24467559e29e7da185f23ff4184f7f9d85f0eb2193afb3e32d2276e93be6b55eaf2e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
deleted file mode 100644
index cca4c95797d7..000000000000
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=net-libs/libsrtp-2.1.0:2=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils"
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild
index 4b212a532317..d621cc8e8541 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index 87db1821df9f..686d0ab75209 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-taglib-1.14.4.ebuild 375 BLAKE2B 349e0bd5c6cd1734fd5bc6d50203c0eff221c96206f66457fc30c8386b068231fefa7b391612f913f8db00a3c6d902cce014596e1a9573b3fc29e0900c21fbf6 SHA512 312b55f3edc6a6b3c7d46593160bf27d8c275ac69c4ddfaa791547f34f5cb07e442c5ae4cce07015bc7940325dbb708cfeb1b5f6338627900dcaee869180a9f8
-EBUILD gst-plugins-taglib-1.14.5.ebuild 377 BLAKE2B 06e30a1e8989c6023b688f7bf976891079249834ffa353bd3271a8e2bb2524f71b51c2bd7cdba66655825744fd63487eadfbf7d424406b5871622c4491b930a5 SHA512 0d085db2c5fdd3112e31cd8877e75d761709a9f5a94519713061eed12b04f39beff3a008f71fa3bcd5f503f52fa3e9d42aa72306e9b9cfe624c9d14cc1e33e96
+EBUILD gst-plugins-taglib-1.14.5.ebuild 375 BLAKE2B f98560156b0222c0e7bc84681282e899989540becef764f8994f444301f581a854018fe1b9e274dd213d0c3034aaa3965c0fa17482a45bb2db746c4b5fe8ac44 SHA512 755acda5835ec4d107ef8a6848388ac93ac9c9ad204b59f66d4db4461418aff337cf1673ec95b2ca08012dc364d4d0062e9e1c3c6fa47e6510257af489275621
 MISC metadata.xml 472 BLAKE2B 2ddad354e550883322f2276a979d7cace56275d6b0ebe9301c40a6204043c0a05b0efae27cea079bdf1c0c04b8f588ab39e080d8b0e4f405c0d0287a00c4c746 SHA512 8ddf53f0cf2e92dbc2adc5f4910b2a6fab0b0ac68eb9c9c33fd94809714d0f10d0d9d546df012a70c5d9a13adce7cccc232be4fc107b63c4649ba3ff0ff32444
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.4.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.4.ebuild
deleted file mode 100644
index 507b4b2b0430..000000000000
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.5.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.5.ebuild
index 10f37258716a..1e3445b5f5d9 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index 36a81c30db17..a621a314b9a9 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-twolame-1.14.4.ebuild 359 BLAKE2B b2c6acbc01e825bce562e533131297990c7741e9225bcd5b2c0ad24c3ee814ed6dd6d52cec0db3492a1b537acb42541a90bbe52dd356e8cbb8b07d7a175819fa SHA512 242ade188f67cc8b3f92914396943207ee40f15f2005593a937fe8e7affd833f84cf8066aeee72b2dc2adeea9ebb58bc18ca4582a70a91c5700a7aa493f658a1
-EBUILD gst-plugins-twolame-1.14.5.ebuild 360 BLAKE2B 9d10c200d2428071dacd2e82ed1d581af77e0c9f1ee361c707515e3bd6ad62dae2af482ada9dba9241d44e8740c2a291c35f63a66f07c06a23b65c9d73af8daf SHA512 b13023f0f33e4712e9f2869af90f0d5b3e6fd68d314f3abafadc8eed2e2293a8de91a80ed5c72403ca20ce29ae093ac7c6b1dad366f909f8e725159f55c4abbd
+EBUILD gst-plugins-twolame-1.14.5.ebuild 359 BLAKE2B b2c6acbc01e825bce562e533131297990c7741e9225bcd5b2c0ad24c3ee814ed6dd6d52cec0db3492a1b537acb42541a90bbe52dd356e8cbb8b07d7a175819fa SHA512 242ade188f67cc8b3f92914396943207ee40f15f2005593a937fe8e7affd833f84cf8066aeee72b2dc2adeea9ebb58bc18ca4582a70a91c5700a7aa493f658a1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.4.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.4.ebuild
deleted file mode 100644
index 4668cc328d71..000000000000
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.5.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.5.ebuild
index 0d3be0cd91bb..4668cc328d71 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-uvch264/Manifest b/media-plugins/gst-plugins-uvch264/Manifest
index 91caa49b64b7..01f6185bd052 100644
--- a/media-plugins/gst-plugins-uvch264/Manifest
+++ b/media-plugins/gst-plugins-uvch264/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-uvch264-1.14.3.ebuild 802 BLAKE2B 9f5c16dcec50df8e32e4c8ae9f8fc9a33a01161c0943444499ef6f69d54cd4f9281472f5f4df8e2134f70b7e2d13bc1bdad3866819d7f307229ea893826be84b SHA512 595dc752bcc6dad57a824b8f52d2a958beaa060d4b1c9c77370bc5fc889ed5c8c33994c84ce03ee01d1034f6f2713faa710400f1f163ebaafb4c56581f9742b6
 EBUILD gst-plugins-uvch264-1.14.5.ebuild 802 BLAKE2B 9f5c16dcec50df8e32e4c8ae9f8fc9a33a01161c0943444499ef6f69d54cd4f9281472f5f4df8e2134f70b7e2d13bc1bdad3866819d7f307229ea893826be84b SHA512 595dc752bcc6dad57a824b8f52d2a958beaa060d4b1c9c77370bc5fc889ed5c8c33994c84ce03ee01d1034f6f2713faa710400f1f163ebaafb4c56581f9742b6
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.3.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.3.ebuild
deleted file mode 100644
index 8e8eebdaefeb..000000000000
--- a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-	virtual/libusb:1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# FIXME: gstbasecamerabin does not have a .pc
-	# gstreamer_system_link \
-	#   gst-libs/gst/basecamerabinsrc:gstbasecamerabinsrc
-
-	local directory libs
-	directory="gst-libs/gst/basecamerabinsrc"
-	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgstbasecamerabinsrc-1.0"
-	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
-		-i sys/uvch264/Makefile.{am,in} || die
-}
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index c74b8d099f76..3601f59a0173 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -1,6 +1,4 @@
 AUX 1.14.5-glibc-2.30-compat.patch 1315 BLAKE2B e02cdb5b6ae1b2a8c94d577a0378a3c74394afbc62be71448715c2e5096d5156f4cbe625ad26c2950e14d691bb314b6ef53f9a997b3cd61851c4b20da3453066 SHA512 dfb48424e9ec6219962ff15a0939d1450474fc2a6fa42aa8dec77581f60cbb14ed5cde504dbe08f10d0b5a04b2010c205e3c5d33cf0fa5d94e7cb1e177493ffb
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-v4l2-1.14.4.ebuild 661 BLAKE2B 52bfecb172aea757f6638f7c09864c42cefce4916a6807cdde9ecb00c42e141d74638b709084008d7bba7684eb3f613bf92d82e2cda7b76bc840b2b19984cc16 SHA512 2cb3afd9c5365c9c6c53aca3f986d48d9e9921ea6e5394ea32e7b141695a940c2287b63b58f4937e7e0a0c38a68e376d9bd295bbdac3c38d51422025b6f21124
-EBUILD gst-plugins-v4l2-1.14.5.ebuild 729 BLAKE2B 100337dcf2bc11bb09fd13ef48fd55dfa1936310c29113c6828c8bf8286d9171cef32cafb070478dbda82a68dde24eef7d64483a3087d5884bd6725689af5ede SHA512 8988a7017e359b258ae9653bc61a08b6f0ef196d009e92d905163566b768d9536b43232fce62d64f9a040f70879cc86f0b822e5f806c053c901150a6b4cf981c
+EBUILD gst-plugins-v4l2-1.14.5.ebuild 727 BLAKE2B 09aa5188d10a243c6d496c2eae6c5702de57662574c3977068e5cf467747f9e27f016075210e440a6dd93dd511cbb56946a3eb9b647804be50ec653cb9235001 SHA512 87bb65fd01d5064d99928b47c5727fd49296c7a31a256b4650077598cb41395982eadfd3f0329e35fc9064dd9fe5ac626093213ae0623a12e6c0cce9735641aa
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild
deleted file mode 100644
index 4193f12eb5d9..000000000000
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="udev"
-
-RDEPEND="
-	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	udev? ( >=dev-libs/libgudev-208:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-
-GST_PLUGINS_BUILD="gst_v4l2"
-
-multilib_src_configure() {
-	gstreamer_multilib_src_configure \
-		--with-libv4l2 \
-		$(use_with udev gudev)
-}
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild
index a99af10fc92e..e6c8db6d2468 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index b346cc02c704..9648f20a41f5 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,8 +1,3 @@
-AUX 1.14.1-fix_no_GL.patch 968 BLAKE2B 31c0857fd971f574455d9fb74ae73590f868c50f60d145fb16a2370ed84a34d3069b68ec3d4b810e023f4fe76dc0608281a0d68f5169ec1e7fa17c0424b09eb1 SHA512 56bb4fcede23a85b52efdd4c008665caef1c78097c899261c8ea702bf04cb91a12175eedcf00b0b3f74de43b80d83dee2a043f1552e2f852f7d372e7b112f5e0
-DIST gstreamer-vaapi-1.14.1.tar.xz 1064992 BLAKE2B bae42e3cafc6d1e5799a8ef795f9e1f6a6ac60b6878aea1aed81550fd7e408c5104b5ea89d6e5f7535ac8d21fe5f14fccf061e15eb68a7c1c60c29ad4a4deabb SHA512 f1eecb61cb92439d93a47ac162a5cda8a456dbb205594f378e8adf98c45e4cd59553ccfd3bbcf1c6a568c6af5e7834bbfb0ea17610f0c7e7c9e268a4eeb5b020
-DIST gstreamer-vaapi-1.14.3.tar.xz 1070536 BLAKE2B 7e3458702072d96acc31c1ac5c4ec9f23f6d618ba922884fb141a0897a04959da7f34c7abff7765f086357d3f8f7532a1582508d117c199f76338ebd3723c6ae SHA512 b89acf63c2900b0cd588cce1a06d959a4f8bbe929c237fce985d3cfce7b94d43a3317f06a42fa77e3ff790fff8a81c8bbeeed7ac797794e4cc3342f18faa69e3
 DIST gstreamer-vaapi-1.14.5.tar.xz 1068344 BLAKE2B b98363981dc7f111fc8c15188d31dea394b7f6cf300050b95d564b75020931a0f8690d11410f2d3d18d6649ef2ee290c933c3731b4bc3ca43bffb57a4c1bf542 SHA512 287df56ad9bb3fd0754b9f307082eb180c8f0b622e2c9436c5dcf2272a5fb620cb18970726d231688837d52cb169a10e98e14160e51fd82198c34ea612c0d60b
-EBUILD gst-plugins-vaapi-1.14.1.ebuild 4370 BLAKE2B 8d60914ba1e5e0bd34b52b475e9983ef3b3a87a0ac6b7c0eb6371ecb117d0815d9b95ce3e77204d244fd89646f4a2192951a905e9344876dd0ec4e488e9baa50 SHA512 d06e03d685ec3ef91910528bd64bdefe62f57d01bddc1fda9c86a74db7c36a638e229dd6beaa76b52ed4c6889a79d5e2cfa761b72fcd864b06be202924dd6f9c
-EBUILD gst-plugins-vaapi-1.14.3.ebuild 4319 BLAKE2B 3ca09ab2034b20d6d7743bc4bb20a1fd5ffe3f70f67033ff8f368f902c0dff118bac399c1d5276ecb57cf33dd9edb6efb946554d36886c59023cdc09e36cde1f SHA512 c7099d59ec2f42addba8f79ccdeb6737fa9f509455d16be184960166281129922fa6c455d09af63cae90b53a7efd0ee350f7e2f474421208d1feb1380436cb99
 EBUILD gst-plugins-vaapi-1.14.5.ebuild 4319 BLAKE2B 3ca09ab2034b20d6d7743bc4bb20a1fd5ffe3f70f67033ff8f368f902c0dff118bac399c1d5276ecb57cf33dd9edb6efb946554d36886c59023cdc09e36cde1f SHA512 c7099d59ec2f42addba8f79ccdeb6737fa9f509455d16be184960166281129922fa6c455d09af63cae90b53a7efd0ee350f7e2f474421208d1feb1380436cb99
 MISC metadata.xml 433 BLAKE2B d46828441b89363cce84ff10747ad13f30329aea96cf2acd2fc7deb786c3f3ec0ec5a86011657d39ac905f9f33a3904b38860b16f53cfb150530cc4142f1beed SHA512 366bbe78a862a65a8b82ee43521508db5766cde3a72f4ad8e7f0b703dc23347589e07dcfdb3f3ec12e62ac91adb38b2a58cee5dff4732069ac2b8724524a405b
diff --git a/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch b/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch
deleted file mode 100644
index d0a34b5bd0c2..000000000000
--- a/media-plugins/gst-plugins-vaapi/files/1.14.1-fix_no_GL.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 45fb111850955d9192e43b9dbcb2ef8e3974e58d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
- <vjaquez@igalia.com>
-Date: Mon, 21 May 2018 13:27:14 +0200
-Subject: plugins: guard GstGL code
-
----
- gst/vaapi/gstvaapipluginutil.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c
-index fa25131..648c91b 100644
---- a/gst/vaapi/gstvaapipluginutil.c
-+++ b/gst/vaapi/gstvaapipluginutil.c
-@@ -246,6 +246,7 @@ gst_vaapi_create_display_from_gl_context (GstObject * gl_context_object)
- static void
- gst_vaapi_find_gl_context (GstElement * element)
- {
-+#if USE_GST_GL_HELPERS
-   GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (element);
- 
-   /* if the element is vaapisink or any vaapi encoder it doesn't need
-@@ -282,6 +283,7 @@ no_valid_gl_display:
-     gst_object_replace (&plugin->gl_other_context, NULL);
-     return;
-   }
-+#endif
- }
- 
- gboolean
--- 
-cgit v1.1
-
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild
deleted file mode 100644
index c3c7c035b245..000000000000
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune multilib-minimal
-
-MY_PN="gstreamer-vaapi"
-DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
-HOMEPAGE="https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
-
-# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
-# we design gst-vaapi ebuild in terms of GL API as main choice as well, meaning that USE opengl and/or gles2 is required to
-# enable opengl support at all and choices get chained from there.
-# One or multiple video output are required: drm, x11, glx, egl and/or wayland;
-# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled;
-# So "|| ( drm egl opengl wayland X )" would be wrong, because egl isn't built with USE="egl -opengl -gles2", ending up with no video outputs.
-# As we ensure at least one working GL output with other REQUIRED_USE, we can put gles2/opengl in REQUIRED_USE instead of egl, solving the issue.
-# gles2 API only supported windowing system (on linux) is EGL, so require it
-# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X")
-REQUIRED_USE="
-	|| ( drm gles2 opengl wayland X )
-	gles2? ( egl )
-	opengl? ( || ( egl X ) )
-"
-
-# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c
-# USE flag behavior:
-# 'drm' enables vaapi drm support
-# 'egl' enables EGL platform support (but only if also 'opengl||gles2')
-# - 'egl' is exposed as a USE flag mainly to get EGL support instead of or in addition to GLX support with desktop GL while keeping it optional for pure GLX cases;
-#   it's always required with USE=gles2, thus USE="gles2 opengl X" will require and build desktop GL EGL platform support as well on top of GLX, which doesn't add extra deps at that point.
-# 'gles2' enables GLESv2 or GLESv3 based GL API support
-# 'opengl' enables desktop OpenGL based GL API support
-# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2')
-# 'X' enables non-GL X support; GLX support when combined with 'opengl'
-# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16)
-GST_REQ="1.14.1"
-GL_DEPS="
-	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
-	media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
-	>=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,${MULTILIB_USEDEP}]
-	drm? (
-		>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	)
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PV}-fix_no_GL.patch )
-
-multilib_src_configure() {
-	local myconf=()
-	if use opengl || use gles2; then
-		myconf+=(
-			$(use_enable egl)
-			--with-glapi=$(usex opengl 'gl,' '')$(usex gles2 'gles2,gles3' '') # It's fine to have extra commas passed
-		)
-	else
-		myconf+=(
-			--disable-egl
-			--without-glapi
-		)
-	fi
-
-	if use opengl && use X; then
-		myconf+=( --enable-glx )
-	else
-		myconf+=( --disable-glx )
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-debug \
-		--disable-examples \
-		--enable-encoders \
-		$(use_enable drm) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		--without-gtk \
-		"${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
deleted file mode 100644
index 79f8f43c4790..000000000000
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-MY_PN="gstreamer-vaapi"
-DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
-HOMEPAGE="https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
-
-# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
-# we design gst-vaapi ebuild in terms of GL API as main choice as well, meaning that USE opengl and/or gles2 is required to
-# enable opengl support at all and choices get chained from there.
-# One or multiple video output are required: drm, x11, glx, egl and/or wayland;
-# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled;
-# So "|| ( drm egl opengl wayland X )" would be wrong, because egl isn't built with USE="egl -opengl -gles2", ending up with no video outputs.
-# As we ensure at least one working GL output with other REQUIRED_USE, we can put gles2/opengl in REQUIRED_USE instead of egl, solving the issue.
-# gles2 API only supported windowing system (on linux) is EGL, so require it
-# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X")
-REQUIRED_USE="
-	|| ( drm gles2 opengl wayland X )
-	gles2? ( egl )
-	opengl? ( || ( egl X ) )
-"
-
-# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c
-# USE flag behavior:
-# 'drm' enables vaapi drm support
-# 'egl' enables EGL platform support (but only if also 'opengl||gles2')
-# - 'egl' is exposed as a USE flag mainly to get EGL support instead of or in addition to GLX support with desktop GL while keeping it optional for pure GLX cases;
-#   it's always required with USE=gles2, thus USE="gles2 opengl X" will require and build desktop GL EGL platform support as well on top of GLX, which doesn't add extra deps at that point.
-# 'gles2' enables GLESv2 or GLESv3 based GL API support
-# 'opengl' enables desktop OpenGL based GL API support
-# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2')
-# 'X' enables non-GL X support; GLX support when combined with 'opengl'
-# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16)
-GST_REQ="${PV}"
-GL_DEPS="
-	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
-	media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
-	>=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,${MULTILIB_USEDEP}]
-	drm? (
-		>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	)
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-multilib_src_configure() {
-	local myconf=()
-	if use opengl || use gles2; then
-		myconf+=(
-			$(use_enable egl)
-			--with-glapi=$(usex opengl 'gl,' '')$(usex gles2 'gles2,gles3' '') # It's fine to have extra commas passed
-		)
-	else
-		myconf+=(
-			--disable-egl
-			--without-glapi
-		)
-	fi
-
-	if use opengl && use X; then
-		myconf+=( --enable-glx )
-	else
-		myconf+=( --disable-glx )
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-debug \
-		--disable-examples \
-		--enable-encoders \
-		$(use_enable drm) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		--without-gtk \
-		"${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest
index 3c476f1b8ed1..14d42eab4b39 100644
--- a/media-plugins/gst-plugins-voaacenc/Manifest
+++ b/media-plugins/gst-plugins-voaacenc/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-voaacenc-1.14.3.ebuild 319 BLAKE2B f88aacd8bfad7c6e95848c6f874784109629cfefe5564408d8d5a02cd65cb2a69a3a1b1df6f484ebcc31c62b78476aeaddc05af9fe08f6ee61667dce347d905d SHA512 8889792a4f5c405bf46f6af72ab1661923d30b56de4c03391325a3fd75c8f147b43c41623d7eb3afaad0a5a0af7db8f9b7bf21f4b71d212f47797c24da1d2f81
 EBUILD gst-plugins-voaacenc-1.14.5.ebuild 319 BLAKE2B f88aacd8bfad7c6e95848c6f874784109629cfefe5564408d8d5a02cd65cb2a69a3a1b1df6f484ebcc31c62b78476aeaddc05af9fe08f6ee61667dce347d905d SHA512 8889792a4f5c405bf46f6af72ab1661923d30b56de4c03391325a3fd75c8f147b43c41623d7eb3afaad0a5a0af7db8f9b7bf21f4b71d212f47797c24da1d2f81
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.3.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.3.ebuild
deleted file mode 100644
index 6964578602d0..000000000000
--- a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="AAC encoder plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voamrwbenc/Manifest b/media-plugins/gst-plugins-voamrwbenc/Manifest
index ef3300f20d8f..d45b78adf549 100644
--- a/media-plugins/gst-plugins-voamrwbenc/Manifest
+++ b/media-plugins/gst-plugins-voamrwbenc/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-voamrwbenc-1.14.3.ebuild 333 BLAKE2B 849e58b02cb05640c9a4dda1bc2691334811b202c375c7ff574efa1fd67bfa347f483cc23c72fb4b7bb02c231dfb57ac7b5ed91a25945d0211856dc193eef753 SHA512 12d3776153e1dbdeeac37b8ca9b7cff50109c201fb6ac3f5b288f8c859d7f67ac43fd74db0e3535528c003ec2f7214fb93b7e0ef11cd3487361caf6eda5c9322
 EBUILD gst-plugins-voamrwbenc-1.14.5.ebuild 333 BLAKE2B 849e58b02cb05640c9a4dda1bc2691334811b202c375c7ff574efa1fd67bfa347f483cc23c72fb4b7bb02c231dfb57ac7b5ed91a25945d0211856dc193eef753 SHA512 12d3776153e1dbdeeac37b8ca9b7cff50109c201fb6ac3f5b288f8c859d7f67ac43fd74db0e3535528c003ec2f7214fb93b7e0ef11cd3487361caf6eda5c9322
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.3.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.3.ebuild
deleted file mode 100644
index 16d3ee75955b..000000000000
--- a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index 399d2e45f70e..cef0c3ee0466 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,6 +1,3 @@
-AUX 1.14.4-libvpx-1.8-compat.patch 2149 BLAKE2B 870fc4b5eeaffa7f735f76b706f84ab2c69687df4c3fe788932278ba8d3870c0b385976471c6e95e3cc081ce50b11324505079f7d966890527627d35169b2bc9 SHA512 bd35100ed2659daca956d6775d58c068852fa2a4f38e53746a5e1abd5fc156ca2d876638e4b39d8d62df520b73ea2aac8b5582363a182263d0cbb4184f900825
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-vpx-1.14.4.ebuild 490 BLAKE2B c5f0daeceea733b586199d2800c243d09e3d5c7371dd22da50c5b857f66dfec6e6b8c5ed6d93b18dfece13bc348ef0252ce38f2942cd7d90fa9cef5098f980b1 SHA512 daaf9840b1e628f9b6f0580998facdb121d1e17ec374f8f810a46b681d3dfa67720e642e1f479a25494ef6a46031c1c486cd05df80e0ffd4f679c2480654bd8d
-EBUILD gst-plugins-vpx-1.14.5.ebuild 393 BLAKE2B ef05080d8cb1d4ade6aeb6f98503fd59a309826988b099870bf58b962f21a6da6358f45191b35ce2d843a1ac006974910c9654c2c879f9758d230a7a03a2d8d8 SHA512 9fdd765d1bb2eae6da34d8f011b62436fd0cce12a06331978f9b9bb05a3865d77d6a6011af1685718eda1c648239806a9fce31055faae85992ee36da59256a6d
+EBUILD gst-plugins-vpx-1.14.5.ebuild 392 BLAKE2B 949cc0ade8b59a516aaacb6dca3c70b05b15be31371e2043f1088e2e4d5f1dff74a7e463aa9b0783b67760c44aff66fad9682a4b5dafa80b7c755e19beeb0af5 SHA512 9ad9c2b792338612ae85cbec9071967102d49583074a433861251edfc32f169c69dfce66a2dc3d5e29404c351c1ca7bdcd0e96b45eee18fb9159324c12adf9d8
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-vpx/files/1.14.4-libvpx-1.8-compat.patch b/media-plugins/gst-plugins-vpx/files/1.14.4-libvpx-1.8-compat.patch
deleted file mode 100644
index ad9dadb3dfda..000000000000
--- a/media-plugins/gst-plugins-vpx/files/1.14.4-libvpx-1.8-compat.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b6e6f1ae73375ef66a5748069843aaed1a83e6a6 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 5 Feb 2019 22:14:18 +0100
-Subject: [PATCH] vpx: Fix build against libvpx 1.8
-
-The deprecated debug visualizer was removed.
----
- configure.ac        | 4 ++++
- ext/vpx/gstvpxdec.c | 2 ++
- ext/vpx/meson.build | 4 ++++
- 3 files changed, 10 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 5e4cff126..8c20e5081 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1054,6 +1054,10 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [
-       AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger])
-     ], [true])
- 
-+    PKG_CHECK_MODULES(VPX_180, vpx >= 1.8.0, [
-+      AC_DEFINE(HAVE_VPX_1_8, 1, [Defined if the VPX library version is 1.8 or bigger])
-+    ], [true])
-+
-     LIBS="$OLD_LIBS"
-     CFLAGS="$OLD_CFLAGS"
-   fi
-diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c
-index c3f0f625f..da4322513 100644
---- a/ext/vpx/gstvpxdec.c
-+++ b/ext/vpx/gstvpxdec.c
-@@ -62,6 +62,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
-     {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"},
-     {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"},
-     {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"},
-+#ifndef HAVE_VPX_1_8
-     {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO),
-           "Print frame information",
-         "visualize-frame-info"},
-@@ -74,6 +75,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
-     {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO),
-           "Print video rate info",
-         "visualize-rate-info"},
-+#endif
-     {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
-     {0, NULL, NULL}
-   };
-diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build
-index 6ed440728..0d2340b32 100644
---- a/ext/vpx/meson.build
-+++ b/ext/vpx/meson.build
-@@ -48,6 +48,10 @@ if vpx_dep.found()
-     vpx_args += '-DHAVE_VPX_1_4'
-   endif
- 
-+  if dependency('vpx', version : '>=1.8.0', required : false).found()
-+    vpx_args += '-DHAVE_VPX_1_8'
-+  endif
-+
-   gstvpx = library('gstvpx',
-     vpx_sources,
-     c_args : gst_plugins_good_args + vpx_args,
--- 
-2.17.0
-
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild
deleted file mode 100644
index 5f5cdefd5009..000000000000
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit autotools gstreamer
-
-DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PV}-libvpx-1.8-compat.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild
index 22bf319d3574..c6cf29b246bf 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit autotools gstreamer
 
 DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index e9692b841b47..3d923f47d296 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-wavpack-1.14.4.ebuild 389 BLAKE2B 8c5bae6db56341dd896fbc27cfc787d659f49b422be48c6f202468a516a4115b4e433597adb32779bc7b074468ae2cc03ef64cc23906a61e684e684c50a5f6ad SHA512 8410d37aa5b0bfc667949df7f23e7bdd0f404824753fdb16ad9a4e1f42a3a36dc34d21b354ed22da06c0d0066a4b432b4095c8a1c3969b7d0c7c1a7f63010dff
-EBUILD gst-plugins-wavpack-1.14.5.ebuild 390 BLAKE2B 9db594a9b474c5daf8db7bccaf0a8d6609cde2e3f2c0b254642ff09a0072d022ae643f6b86eb5fd0b67f3cf204fec836c411bc2dde025cd444431eeecaf34a2d SHA512 dd2a0babf0460d1c7f889deb943347cb82701e7950e62dde06f89aa1b0cc7ca611d707540ede2d6681dbcc8f91ed446ef91a6c7170a0e60253c4ea645a37590e
+EBUILD gst-plugins-wavpack-1.14.5.ebuild 389 BLAKE2B 8c5bae6db56341dd896fbc27cfc787d659f49b422be48c6f202468a516a4115b4e433597adb32779bc7b074468ae2cc03ef64cc23906a61e684e684c50a5f6ad SHA512 8410d37aa5b0bfc667949df7f23e7bdd0f404824753fdb16ad9a4e1f42a3a36dc34d21b354ed22da06c0d0066a4b432b4095c8a1c3969b7d0c7c1a7f63010dff
 MISC metadata.xml 529 BLAKE2B 137cd943fda3cba7c57ece2b4eff3c1beb0c694dd564f11a82249171fc2bf17448a18aabd2ebf4eb21dfefef07c9a0a8a749df48e79e7709b56634d4ad8a8250 SHA512 31c1c1b8f7e462a53d6bd6cc68c310f5236c6ba52f3fac37775a30dcc0448b2fba900c1b2ef16f31566f03a3b823aa6de02ccaf033f6ec587d64a175aa57ade4
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.4.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.4.ebuild
deleted file mode 100644
index 148de0fbbe83..000000000000
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.5.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.5.ebuild
index a7e0042dba18..148de0fbbe83 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x265/Manifest b/media-plugins/gst-plugins-x265/Manifest
index 0bcc50a0c0bd..f315b8ffd99c 100644
--- a/media-plugins/gst-plugins-x265/Manifest
+++ b/media-plugins/gst-plugins-x265/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-x265-1.14.3.ebuild 315 BLAKE2B 7cb878e6f3b8b087bf7c8d0ac47bdae273e1435772a3aab655a568046b2ff34f0625b2b11e94da0c970de3e0af00b68c3f448662f5b8b6bdb339f9db4581394c SHA512 16495d7f764218030a9500c07afc138c5eaec9c55a34970b1f37c8c9f37118888f96aba8d1093f402f64243b3665361dbf9550e148dfbc3d5bee997c62e8a3b1
 EBUILD gst-plugins-x265-1.14.5.ebuild 315 BLAKE2B 7cb878e6f3b8b087bf7c8d0ac47bdae273e1435772a3aab655a568046b2ff34f0625b2b11e94da0c970de3e0af00b68c3f448662f5b8b6bdb339f9db4581394c SHA512 16495d7f764218030a9500c07afc138c5eaec9c55a34970b1f37c8c9f37118888f96aba8d1093f402f64243b3665361dbf9550e148dfbc3d5bee997c62e8a3b1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.3.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.3.ebuild
deleted file mode 100644
index b496e36e784e..000000000000
--- a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit gstreamer
-
-DESCRIPTION="H.265 encoder plugin for GStreamer"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/x265:=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index e69fe5def900..bdcebb149025 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-ximagesrc-1.14.4.ebuild 682 BLAKE2B 6acddf4e35c62bcb10de90e4c1658026dae67f41863a5a7c2f907963309d9140b93f846b37b84090865f212d33d76a65845ee1c20c72ce0ce3671d4b754204a0 SHA512 c719b4485e3237c2a4b428d39f5514bd82ee52417bec84bbbea39d59d8744d9cda454c8c833c7c04df6f37bb2029a422d66482b63d5e8811a1c3504557a2b8e7
 EBUILD gst-plugins-ximagesrc-1.14.5.ebuild 682 BLAKE2B 6acddf4e35c62bcb10de90e4c1658026dae67f41863a5a7c2f907963309d9140b93f846b37b84090865f212d33d76a65845ee1c20c72ce0ce3671d4b754204a0 SHA512 c719b4485e3237c2a4b428d39f5514bd82ee52417bec84bbbea39d59d8744d9cda454c8c833c7c04df6f37bb2029a422d66482b63d5e8811a1c3504557a2b8e7
 MISC metadata.xml 457 BLAKE2B 6af6de3816b28b279400abcc8e9fce070ce8ac5ce2f4ccbecff7d16ba0081bb277db520bd4efaeb07e48b220cf35baf09e0c68e7d99fab59eefc57c0881af49b SHA512 52d8e5e5f48b1e6a0f0e5742307348d66ec3302ffa32dc1dde2f98078621c242d431bf2354902f5ca17b277910cb733336219bc8c1598a1b4ea2c149fcbcf559
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.4.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.4.ebuild
deleted file mode 100644
index 80b33b4e1d97..000000000000
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-# xshm is a compile time option of ximage
-GST_PLUGINS_BUILD="x xshm"
-GST_PLUGINS_BUILD_DIR="ximage"
diff --git a/media-plugins/gst-plugins-zbar/Manifest b/media-plugins/gst-plugins-zbar/Manifest
index a06f7c0ebd77..4d330987e923 100644
--- a/media-plugins/gst-plugins-zbar/Manifest
+++ b/media-plugins/gst-plugins-zbar/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-zbar-1.14.3.ebuild 343 BLAKE2B 6c271e87a5cb16ec20cadf1781378bb78b763122413c13f6660cbae764c268c612a02e563d862953d8d0677f6afad035cfa5562fc2fb2adff6452d8d1e9244a3 SHA512 81ba6f608b3a02b81be984f5f834fe8a13515b4cd9cfa51ed8c640ff926682b22629c68a74c63b884f2ad1f4c895953b62206c1a2ec03caffdce988d0f01453b
 EBUILD gst-plugins-zbar-1.14.5.ebuild 340 BLAKE2B cbf2f8b7c76d6981415a00a18c8f52dfa387da6bc6d4adecce3f76bd9dddd8233ba838c2a345d76f2a7db0e0d529b59c5d6df2b734c716a42e1723eabb45d823 SHA512 41be0ddf118b5242aa144dcf0083a4137bad74ff900c1527cf7bda997d5e7e58087a21eb02fc37ce7c150841bed0017fed726c26f891bbf1239fff6cf3cc369a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.14.3.ebuild b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.14.3.ebuild
deleted file mode 100644
index 38852a678134..000000000000
--- a/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.14.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer
-
-DESCRIPTION="Bar codes detection in video streams for GStreamer"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=media-gfx/zbar-0.10_p20121015-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-transcoder/Manifest b/media-plugins/gst-transcoder/Manifest
index d8225af373e5..a6e479134c6c 100644
--- a/media-plugins/gst-transcoder/Manifest
+++ b/media-plugins/gst-transcoder/Manifest
@@ -1,3 +1,3 @@
 DIST gst-transcoder-1.8.2.tar.gz 29884 BLAKE2B 1004f038f50db87c98cf7c6a9645a25b0e532daf3b80188444990a672f595f9a64b002e479c73448c03dbb1bebd70929d4d560cf172021535aa26f5d33a5ecc7 SHA512 cabb3b0eacf018248a176fcc5b077fd8b0f9caab3d7853810809f5e2954b1c1fe62c9511453dc8a87fa930066c7c71e0d01ef86900c982eb5fc8a2769ada8494
-EBUILD gst-transcoder-1.8.2-r1.ebuild 1023 BLAKE2B 7be0aa0ab00b88c83fb818af0a09137e8504dea9604f591edddbf7581ff4a83ac680b030c0411919756b53ce0c911bb62f4809b2f5c3f1d0b536aa6ed0d631f9 SHA512 1f7503c6cd891664d7a985e79e110ed802a7e6d877b9760951ef8f981b6d2d33a0a3bf59b57e6e53fac46d126d616246e4d55fdbcf38d1144cafde31f3ec0c82
+EBUILD gst-transcoder-1.8.2-r1.ebuild 1014 BLAKE2B 99193209efa7a128362f445d5963e4889f7f31f4fbceeb23bbbc2f62e80fad5d6591eb0104b9239ae048af1ac544b98c8ef303d33eb41588bc48dfb149992528 SHA512 7700d1f1df5579c4f8013380a3fd32f3d7b20827054e1fa3541c9d56cdb32c2b426b811e1643f2689750dc8550eb6adf380b722ceb11033a499c224fc7ebc1f3
 MISC metadata.xml 352 BLAKE2B 392190d6cb4c329367131948f5a2edb6af72f843f48557e5a1199a07fa2f381289653a17838033b71448068ee9323e1a7799b06aadc7e7b94bec18863bd01483 SHA512 09f7d341340adc8de8cc9beff4aad3a1439c77be168d34e8b49ede249180c72bc8ea99c9d9b9b4b22ed4accaa78094e1436f603f0acf7ce2e5fd8a8ac4c49fd1
diff --git a/media-plugins/gst-transcoder/gst-transcoder-1.8.2-r1.ebuild b/media-plugins/gst-transcoder/gst-transcoder-1.8.2-r1.ebuild
index 701fa0392f6f..12d36ffb3fc7 100644
--- a/media-plugins/gst-transcoder/gst-transcoder-1.8.2-r1.ebuild
+++ b/media-plugins/gst-transcoder/gst-transcoder-1.8.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-any-r1 xdg
 
diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index fdf23950302f..c599ec2d87f6 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,5 +1,5 @@
 DIST imlib2_loaders-1.5.1.tar.gz 378169 BLAKE2B a65dabb8fb537489fe77fdc7c197ce4fa91dc13a86d1a5bf5aae4fbc9ac65a4194b57de8d49bb0dc2d906b20b7c79aa458d0ba668aa947a847414f377fd3b540 SHA512 a94996091a7f9f1271c19d24e6edebeb34977a4e67b8300897de0e5afd06bb9b209e404dd86ab3f397c6dec64f4985a515986b6b048d2c13416265eb2058a8a6
 DIST imlib2_loaders-1.6.0.tar.gz 375642 BLAKE2B cf1e8ad887d7b56ab828018e85d5fc635509eadd283ebc051671d8b9129adfded12449a5e8d7d52f4a8bd8e877a0585d62562e169be6176d93ded3dec0569e5d SHA512 948e85260ad9379f71d35ed8f98355f25878acef3bffc9add0419b6c3d3f7eec0dd504701d0bd2ad75a1aacba02e08965a5f0327f7a2832369af34b5d23d9179
 EBUILD imlib2_loaders-1.5.1.ebuild 807 BLAKE2B a2efdf32043ac6fa4e9158e05ceb3716861ea2ede0b9593f4c292f84e55bfd98678b5a56ce6aaf352a8f1773f983d45369307eafb3d352ed40a091a20ec7179f SHA512 997492faf9ad956235729970081a36dae05b45f24c88926634afeaeff6cce42e7d21dc4192cb4ba3ad828c2c0ec670f0ca7692738ef48466c6197f26f1f5fe72
-EBUILD imlib2_loaders-1.6.0.ebuild 878 BLAKE2B f2b57af3da5279620d0291e22e1b08b990ed4bebd302ca6e900bd52b75990f796deb12435328c5b7bc4ad456f230784a75a21fb1e1cbda9f16370bbae12b475b SHA512 7d60fcb61668d1656f09989ab6c5b9bbcb228f93284097989255a66a216b594f867c03e19d9d51ee1eea351f4a8afb1705472a1420645c78ac06d5676bc100c2
+EBUILD imlib2_loaders-1.6.0.ebuild 876 BLAKE2B 6726b5bfd2d05818f9feca50319b95678e3f9119765821ea620c330f4734ea6ec470298b5de5fee0dc68af90bd01eebf818c6d84b3f277d993ddc74eb75ff909 SHA512 83097dd6c5838f648836bf3badb49602556368113712a39dc27e721f282e8a560131a38678567ccb14f9cbeb770b648f53a5156b4531aae47e024585d181f378
 MISC metadata.xml 828 BLAKE2B bb417b5233966162b782c8b9371fbc5b5d6fb3e36cb9d2ce3f3481b82dae184b1f754ad44d9b6275c24d4ff27f48278690eea38174f2ed2dde287fb5778c49fd SHA512 349cb0bbc1ac72e5de17a40b9e913c9fc2288692797255bbb1d48d5017daab8721c646aec489aca777d26a6f1fc5f641a2b30d1aaa2b6f6724678373d98f3e21
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
index c6228802d6cb..0b2ef19787d0 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="eet xcf"
 
 RDEPEND=">=media-libs/imlib2-${PV}
diff --git a/media-plugins/ir_lv2/Manifest b/media-plugins/ir_lv2/Manifest
index 407566218a12..15fadb5fb5bb 100644
--- a/media-plugins/ir_lv2/Manifest
+++ b/media-plugins/ir_lv2/Manifest
@@ -1,3 +1,6 @@
-DIST ir.lv2-1.3.2.tar.gz 48698 BLAKE2B 2587fb8cae6d71c8a2e3586eaddba43f27282db2469a64f2441832c52f9f27ff9d0852acfce248b890ed4845281f4ef676581128321102e0fc655d0a91bb1266 SHA512 06443aeab05eaa0b1ff5c12fd479c3f1c874976a6d1f5874f6d150aa97c96a8a0b2c3abbc7d6db4882f5674aad8e53ab32bbe7da3873746d5a1e581d010bbae2
-EBUILD ir_lv2-1.3.2.ebuild 1025 BLAKE2B 2923c8bc17980855b39cc697b6798fb075ca9a04341ada61c367b943782a1cc6f20d58b6353d9a3e481fbf15a6ac674407a6b115534804d133255c6f86b883f1 SHA512 fe21c0a90dc294af89c3e26cb4916cb010f718bbe3287734620780f5c7e258dcc8554a973f19f533cea74d3e2e9f6c1d28142d8bc683aaede44de9af630c9f35
-MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
+AUX ir_lv2-1.3.4-respect-flags.patch 1139 BLAKE2B f5e7d891e443c32c21b5db7360479b9d4ac80013805a10a6bd714ab6db5d64cc5d673571894b103db3bea12e5baa2d9f7c4a1053e6d6df517058935d7f799f06 SHA512 a9021b12c6663bf6bb20e87db01981f21afd9ceeeaaedce584389f69abd87c713c937250eea87f12a03610885cd02ab3cea6e756503b1987d1b678acd9e55b14
+DIST ir_lv2-1.2.4.tar.gz 126123 BLAKE2B fab75bf18b642ad59bcb53041462a0d37c84554f0cf6e78c5cdff69ee42a21812a5176083e325018454f6a0a990ce309abed1eea71eb6022ec5981186bf6f29c SHA512 28aac050352380719512efe3346ffddeddb75972e749dc9433cea92973e1ae838c65c6d7196646199218ff3362b24fa9a5e1a3578e74a0b9e268d21083874977
+DIST ir_lv2-1.3.4.tar.gz 126552 BLAKE2B 52f5b236c4680a759c0621ed0f9a394e6e82bdb9aaf4110b325902ae382d2f640a079c53d89c662a192a97d0e79349082cf100636c1a7d6c00738602ca652962 SHA512 6a9c8f906a07c6ed0daa53d8dc3693d535ec4cf63f07b5fcc62ab6638c66992ff7951918b0ce2ef8c65289b19988363be49bba9bb75a20b0463fa972b07ff58c
+EBUILD ir_lv2-1.2.4.ebuild 954 BLAKE2B ee73b1e5fd1edf5430fff325cd91010bd2884e728b217dab858f228084bf70992dd240f806d61ebf3cc9b011f430f9d453feb5c4a7ab1a830ec07192aa89e844 SHA512 e8691ea49d2e8fc94d6e90d8b5eb496a840812eac7a4b627bdb23bd5d5792cc80ff58b4a68f92821dcaf2c3e73c9504f8a2ccdf605f88b11808937072c5e4d09
+EBUILD ir_lv2-1.3.4.ebuild 1381 BLAKE2B 4db1d9acfc6077c24783281d559ecb096a2b3f1732e5aefcb6e1ed269ed230f9e5065042516d810095f1be913f4261e1e078d88d32f3c78c14891033681c9a84 SHA512 721b773e8051a772919092f1162422cd7a2f305d0661740aed164759d2aa8e2eef16ececab691f400a3cf6a64e8fe16f56557edf34e0dc212f510c68bcef52a4
+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
new file mode 100644
index 000000000000..cd664a6728a2
--- /dev/null
+++ b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
@@ -0,0 +1,21 @@
+diff -urpN ir.lv2-1.3.4.orig/Makefile ir.lv2-1.3.4/Makefile
+--- ir.lv2-1.3.4.orig/Makefile	2018-06-21 11:14:03.000000000 +0300
++++ ir.lv2-1.3.4/Makefile	2019-12-24 16:26:06.102495896 +0300
+@@ -20,7 +20,7 @@ CC ?= gcc
+ CXX ?= g++
+ 
+ # 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
+ 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)
+@@ -31,7 +31,7 @@ ifeq ($(shell pkg-config --atleast-versi
+    CPPFLAGS += -D_HAVE_GTK_ATLEAST_2_20
+ 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
+ C4LIBS = -lsndfile `pkg-config --libs gthread-2.0`
+ 
+ all: ir.so ir_gui.so
diff --git a/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
new file mode 100644
index 000000000000..8fadc5cead93
--- /dev/null
+++ b/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+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}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="tools"
+
+RDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/lv2
+	>=media-libs/zita-convolver-3:=
+	>=x11-libs/gtk+-2.16:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-respect-flags.patch
+)
+
+DOCS=( README.md sshot.png ChangeLog )
+
+src_compile() {
+	tc-export CC CXX
+	emake
+	use tools && emake convert4chan
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr/$(get_libdir)/lv2" install
+	use tools && newbin convert4chan ir_convert4chan
+	einstalldocs
+}
diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild
deleted file mode 100644
index 56c7f8b6a29f..000000000000
--- a/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic multilib
-
-MY_P="${P/_/.}"
-DESCRIPTION="LV2 convolver plugin especially for creating reverb effects"
-HOMEPAGE="http://factorial.hu/plugins/lv2/ir"
-SRC_URI="http://factorial.hu/system/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=media-libs/zita-convolver-3
-	>=x11-libs/gtk+-2.16:2
-	media-libs/lv2
-	media-libs/libsndfile
-	media-libs/libsamplerate"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN/_/.}-${PV}
-
-src_prepare() {
-	sed -i -e 's/g++/$(CXX)/' -e 's/gcc/$(CC)/' Makefile || die #respect CC/CXX
-	sed -i -e 's/\(^C4CFLAGS =.*\) -O2.*/\1 $(CFLAGS)/' Makefile || die #respect CFLAGS
-	sed -i -e 's/\(^CPPFLAGS +=.*\) -O2.*/\1 $(CXXFLAGS)/' Makefile || die #respect CXXFLAGS
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake
-}
-
-src_install() {
-	emake INSTDIR="${D}/usr/$(get_libdir)/lv2/ir.lv2" install
-	dodoc README ChangeLog
-}
diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
new file mode 100644
index 000000000000..84fbbef3f1c6
--- /dev/null
+++ b/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+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}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="tools"
+
+RDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/lv2
+	>=media-libs/zita-convolver-3:=
+	>=x11-libs/gtk+-2.16:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-respect-flags.patch
+)
+
+DOCS=( README.md sshot.png ChangeLog )
+
+src_compile() {
+	tc-export CC CXX
+	emake
+	use tools && emake convert4chan
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr/$(get_libdir)/lv2" install
+	use tools && newbin convert4chan ir_convert4chan
+	einstalldocs
+}
+
+pkg_postinst() {
+	local latency_warn=0
+	local ver
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		latency_warn=1
+	else
+		for ver in ${REPLACING_VERSIONS}; do
+			if ver_test ${ver} -lt 1.3.0; then
+				latency_warn=1
+				break
+			fi
+		done
+	fi
+
+	if [[ ${latency_warn} -eq 1 ]]; then
+		elog "This version works with automation at the expense of introducing extra buffering."
+		elog "For zero latency use 1.2* version instead."
+	fi
+}
diff --git a/media-plugins/ir_lv2/metadata.xml b/media-plugins/ir_lv2/metadata.xml
index f79bb67acbd9..8632ae7d47f4 100644
--- a/media-plugins/ir_lv2/metadata.xml
+++ b/media-plugins/ir_lv2/metadata.xml
@@ -5,4 +5,7 @@
 	<email>proaudio@gentoo.org</email>
 	<name>Gentoo ProAudio Project</name>
 </maintainer>
+<use>
+	<flag name="tools">Build convert4chan tool</flag>
+</use>
 </pkgmetadata>
diff --git a/media-plugins/kodi-audiodecoder-modplug/Manifest b/media-plugins/kodi-audiodecoder-modplug/Manifest
index 9dd194d8c6d3..9f0449e37df2 100644
--- a/media-plugins/kodi-audiodecoder-modplug/Manifest
+++ b/media-plugins/kodi-audiodecoder-modplug/Manifest
@@ -3,6 +3,6 @@ DIST kodi-audiodecoder-modplug-2.0.1.tar.gz 29996 BLAKE2B cf0f4e5f0ca74b3014ebdf
 DIST kodi-audiodecoder-modplug-2.0.2.tar.gz 76719 BLAKE2B 20e36b95a5ba89a86b41db1c142b4e0c4b36961790ad2331e83a3274ebf0bba2b96eb3ee6d826e1f3fdba1a21fa12dd9ce98bfe5b7b887540120b2ef7a690dee SHA512 c05ccade7f3b3d99b02ca988dd0a0869e6815e0466ee713c7d1239d813d8845f1ff255ebea4be505b08424c630a33de8c032a1b5c37d5f1a1dc3c86f96b3b50a
 EBUILD kodi-audiodecoder-modplug-2.0.0.ebuild 746 BLAKE2B 6100bfca367bfb618d12a59bedfcb19d3930d574dbb502815b7ea04ae1413532369a8cf510020f318f911d16d17b073c6439c2f991b70c1a4d3c2fa6a17eb4eb SHA512 cd60e7b2c102078b7f49b851a221ebc3602fb41c8876947b88efd75e2931369d92163802c62e40a7e768753c53b089ed5a29e86908796384914b236fdb28792c
 EBUILD kodi-audiodecoder-modplug-2.0.1.ebuild 715 BLAKE2B b90fffd3454f4bb47b10a751283fc640ba22049fa7217a486dfabcb7eac2b1cb6ac79c1fb8b20ee6bebb1e461568f488a11e6aeba91757747e941638604d63b8 SHA512 8edf72c5b5902e96549f7570bbbf846daff3984d030afd0a7eb131f9da0e26d8b0896197e11c0ea954f9cedd4020d4967ac03b5cb403646e7058f45e0247b0d1
-EBUILD kodi-audiodecoder-modplug-2.0.2.ebuild 725 BLAKE2B d6d4fb99364aab15fed596b92e5f73613d51033ae8afde09c674ae1ca425aa802040c6176214a4c8bdcc41a51e9970dacde3a3cf17fa0b32eaabac223e1a5b35 SHA512 dc79e5f9ef7d659caa56bccfeb1c9211a62136bb070b9f532332b0b448946a2f880904042a990fb9b800fc292314d1c5404101ae0724f5a1dc3d1fc158c6d428
-EBUILD kodi-audiodecoder-modplug-9999.ebuild 726 BLAKE2B 155252a2b1e2c23c1d74613eb39be7e2e0887df9545b756e742f0da608939dad26c55c3842c88b13a2bc6262babfc8432751467a707e503c74e8432b3af6adde SHA512 315810a1db5d99c06ac402d22b6b0253998a2966ceb3a81b29e6edf6caad705a55655d85c119ff9d138b78451d2cd769ff867c7afdadd2d858d5de88ce13e1ff
+EBUILD kodi-audiodecoder-modplug-2.0.2.ebuild 719 BLAKE2B 152aabc380269d94ae6654403b1077c931970cabcf38b63f6664d3652f86fbec5612a27b48ab34ada2558958c1b9f17089dc7f6ef528012fd3a67136fba2a612 SHA512 3d2dc5969cf2d6c1334de69b29d513e697e4568594fe9c86d556d9797650927adf5263b3489e147e83a66c219873cc70cfc124443003ba297044e7beb5a299aa
+EBUILD kodi-audiodecoder-modplug-9999.ebuild 720 BLAKE2B 66492e3c4cb4455fe45a1b63e3d37ecdccb439491fe8d41f70b3985e56d470c6096cecdd78ac7d73c74e2a505cce9fc9f38cf230793254419c7dc739cbb33b67 SHA512 51b98ffb5e244b4f613f73286347889349d7853e5665f30915fad0c7fe20f16c61bbfc8e1ec84b58208541f8d98b2a0aa9aec3269161d553bbf170e1ed6c558a
 MISC metadata.xml 442 BLAKE2B 7ac417393f7d1a671942b34984b98caf86a36c6b58ef5ad5eb49806e47ba2e5efad0f208c81343fc63c1949831fb9f8e5b83a16138d7a607ca900a0dce649709 SHA512 5b54a7fba19f53f9b07621207d7c71a95ee934e453bebd00a8a9c4f44831ac51f4055c033872ae937b9df9a9aba6d708bc067bb89f68284fff730dc349c2949b
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild
index 02ccb581ef65..19032c25f16b 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Modplug decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
index 37aa417f2778..9e3db34f088a 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Modplug decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
diff --git a/media-plugins/kodi-audiodecoder-nosefart/Manifest b/media-plugins/kodi-audiodecoder-nosefart/Manifest
index 6d85cdd921f5..03d7b1f8efc9 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/Manifest
+++ b/media-plugins/kodi-audiodecoder-nosefart/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-audiodecoder-nosefart-2.0.0.tar.gz 61006 BLAKE2B 8c3499b8820eb124f6532f722fae39c10880b31d58dce81a1170ae18005047b2ecdb7f9963e1a957de61beaf4a89d682580ea62e739bdc3045e0cd6402685394 SHA512 8dfcae6e81553bccb093dac2aefdbea6e405ebcf3c3505b4647a4970f46ec8aa2f45690a0fd73ff356d074c86c670ab0a60ff5a049dd1e54de3100457fbae935
 DIST kodi-audiodecoder-nosefart-2.0.1.tar.gz 92746 BLAKE2B 0af1578e0f09c4dfbbbddec834522c433922deccbc7f55c4faa4b5b5a7b4fb5563daea77faf745f5f8c61f4d49f168b1e5dee37a2e7d19f2f7d4aa9d685d69ef SHA512 78abac0d6ff2458e5bd3c976d432d5029c07d738dc03f861e068407b60d5ef2f94d7870d803436e8eacd87fdbd47b274e0bdc3367201772cd05084c1ebc8a67c
 EBUILD kodi-audiodecoder-nosefart-2.0.0.ebuild 723 BLAKE2B 710cb2781dd91060752684b0ff799c13bfabb5ae90c6b420008d929257291a6900af663935c4194d4d0a5e6e396a84e05748febb0bc393864bb44da55186c5f3 SHA512 b929e8f7c3b793755b3a43452b3023215c891500f0455678218601aba2e67af4666ccfbc1ac6ce2e380a3c8d39130318e4269acc384d5dc8a44cc4d8fdf6f92d
-EBUILD kodi-audiodecoder-nosefart-2.0.1.ebuild 692 BLAKE2B f8f308932c94b005da6897b350de4b4f69f02877eae333ad4282a01683149136bedd85bf342bdb8a807d5e7a0b5654bc2c9da3b44edb21d3193604938ed04f2f SHA512 21f738b36815157793ae8fe000b81ccaa45893618b21285b16aac20d7d39579ebbcb0b08435689519a8d542ad1c5dde770409da226707f5e06f59edc62d02922
-EBUILD kodi-audiodecoder-nosefart-9999.ebuild 693 BLAKE2B 298c7461f8fedf5a054ce93216d905f7eccab6668add69ece3cfca6fa2d151dafd4ad0caa5ef723458a7d21cf9c95416ca25fef6e944c674926105fb9622562c SHA512 864679a9caaad69fcd03473e5b210819bd032be9f228c37d632aa8b4512c1f19e96d163172693db8f7e984287f1c6969bf2901c43d3544baed9f4108689967eb
+EBUILD kodi-audiodecoder-nosefart-2.0.1.ebuild 686 BLAKE2B 94831af2fb67f2a2590ecfb81942c5808e4e4ff04f34a3148faa69de84d9c659b2103f3bdb0a3ba69234b9be8a08b7a6d4bb2300d894011d3853033b25c50fe6 SHA512 a7cb7897600bd638aec857f86660916afa2b971b27d32786cfab6d51f2b23bc389b95885eb3bc019cfd987758d70693ed9fc6de3490dde33151f3913d33a427a
+EBUILD kodi-audiodecoder-nosefart-9999.ebuild 687 BLAKE2B ecfa9ef682b4c21b8889e6ae1e51023c63c5770cc5d9fb26b0da422ca494fea6153c243aae64746e4f13a3e367c5e0a2bb5f1917cef3d8d9083f85300def93e1 SHA512 b978ffb4651e5e96ab4c6c2569d7fb33ddfefa41b688be7071eceac0668c812970d3ce59236d3198453113b86621b45a21ce7076d3105cab450d84a099a696ad
 MISC metadata.xml 444 BLAKE2B f2946063cbdf62c0e0eddbb32b3a9f42a7e03c52975934a191a19e0bd59c97bf8bc70b55eeaf45ad3cad54a7081d238cfbbe1e235cc23855d8a7404cac2d436d SHA512 9a6295c8af39d75437b1f56b8a91e234ac1578110e1e64b52ee5ade240bd43764a52ec843735e7e3814fea6a662937315db4ae5e0988c9c016c1f72ab12fe91a
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.1.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.1.ebuild
index abec4e0e09aa..bd2a0a87bfe6 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.1.ebuild
+++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Nosefart decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.nosefart"
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
index b9bf148c43e8..70ed76a8f638 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Nosefart decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.nosefart"
diff --git a/media-plugins/kodi-audiodecoder-sidplay/Manifest b/media-plugins/kodi-audiodecoder-sidplay/Manifest
index dbd314002f63..1374da315d48 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/Manifest
+++ b/media-plugins/kodi-audiodecoder-sidplay/Manifest
@@ -2,7 +2,7 @@ DIST kodi-audiodecoder-sidplay-1.1.3.tar.gz 10362 BLAKE2B e34853b875b8e328d06d67
 DIST kodi-audiodecoder-sidplay-1.2.0.tar.gz 25655 BLAKE2B c34ca8a4e411875ef83a87443b52d57d48ae1897b15415f982e2f9f3af654bf3f412704d3e58994e64ada1bf2d63c64508afa7682048ed9e81cb2dfd92f9c552 SHA512 28124b04c6fcbcc8df341c8c5b3da6ec57a106a806e70bf9278ed15c471063db4e04190d8886770f9f430d024f273cad16779caeff7de02eb7ef7db1d07dba2d
 DIST kodi-audiodecoder-sidplay-1.2.1.tar.gz 25665 BLAKE2B 7b804fbe379361eb9a0f47e567655a19b0628b211b9c42e7dffc732807739104fd1af6fa4d1ec7f56ae4d52f34aa6097e43c90604be3a3dd696490dbd992200a SHA512 1ab7c39305e37cd7c6509342a6e1dae5b67b33905b4c76a175ab7505affdc9afd20b7c0ceecbd5f5e1a8efbfa03dfd067f8835a190cf201af7ae35d9448453cb
 EBUILD kodi-audiodecoder-sidplay-1.1.3.ebuild 748 BLAKE2B 81a7a05ea5322372334887f5487246d69d98b473fe974114575b2bbdd982f1610e60a5f5fb33a2bf3e47f3f8af9dcf3f84525c949cb3ade5278e058b633d55db SHA512 a303cc4bd142ea7214d8dd60510e2c55ee77b999eb85404b71b00589c7fa5dda1322df48ed593a0e2fab5aeac7c221dfdc047ef7ec901d3e55061241d1912957
-EBUILD kodi-audiodecoder-sidplay-1.2.0.ebuild 799 BLAKE2B 50ff8cd52bc5b67d851282bd9e6ef23364f7e4c323f56ea19d5fac034788ccb274d881f6ca8ea747d38f0b2d5db280077d4ce62faf2deb5c88d97f91e24b6d4a SHA512 649e0337de8685920833747b95296a86ca626b47119c0ca18290efb4cde5479db1673b376354566393ab1b64e3d4dead546d9647ec3c74be3873a015d75458dd
-EBUILD kodi-audiodecoder-sidplay-1.2.1.ebuild 799 BLAKE2B 50ff8cd52bc5b67d851282bd9e6ef23364f7e4c323f56ea19d5fac034788ccb274d881f6ca8ea747d38f0b2d5db280077d4ce62faf2deb5c88d97f91e24b6d4a SHA512 649e0337de8685920833747b95296a86ca626b47119c0ca18290efb4cde5479db1673b376354566393ab1b64e3d4dead546d9647ec3c74be3873a015d75458dd
-EBUILD kodi-audiodecoder-sidplay-9999.ebuild 800 BLAKE2B a269363f31c322b648af38b1c4241bc0999597eafd79082386b35eec7ebd6e62471c1f86afdbd010ef2a64529f0c2a208363c1e91a06d77b67430ae2456e418b SHA512 32c4e98e006b0c3d17acfd190ebf1e18b633ff9491caa6b4a8c703bf73b9dce0d5ab2473742d2b129abd516de8c3769f86b8b5ecc45dba84a15bc3330231a0e4
+EBUILD kodi-audiodecoder-sidplay-1.2.0.ebuild 787 BLAKE2B 2596024abe066875c915e55802c5199e4da8468fe55c6e030ff2d2ff8e586fc50ef8ba21c7295cb2117c50236a5e29f542add5ccde0af1d5e08c897dcbce9e8e SHA512 bf31fd4b762be242b5eca332f25dd085c74db807734528d6c359612c5b35adc8e7a01da88ff8eda8bf1ff5cb630ac6a9c1cf99d602eaa8268a4c296a7fa3d2bb
+EBUILD kodi-audiodecoder-sidplay-1.2.1.ebuild 787 BLAKE2B 2596024abe066875c915e55802c5199e4da8468fe55c6e030ff2d2ff8e586fc50ef8ba21c7295cb2117c50236a5e29f542add5ccde0af1d5e08c897dcbce9e8e SHA512 bf31fd4b762be242b5eca332f25dd085c74db807734528d6c359612c5b35adc8e7a01da88ff8eda8bf1ff5cb630ac6a9c1cf99d602eaa8268a4c296a7fa3d2bb
+EBUILD kodi-audiodecoder-sidplay-9999.ebuild 788 BLAKE2B 8dc99b84ea3075c5f0f02143a1bd795b842eef683f1794f0d7e2e85d85550286fb5b796d45002f4996942ae2d4f5b7ca2008c80ccb3da0db140bbc3bd3e2cf23 SHA512 6b27618864c8bde3c077bbf0b90f6d66c96bca7361793cd6eaa23c66ca1d5a082dcf8864fedd731873352240b0052bb5cb11ce6e2620334b826f6b89156340c0
 MISC metadata.xml 442 BLAKE2B afc3ae3f9157185ec41cbd144cce22ddd50be0f1409ccb2c764a88a0e448d6504904522d0a18bcf089ca85bbc4a8b05f51e795ec30fb9f7614479835b1ec1185 SHA512 4046b1455fe5c4cb63127751d2fbcc21b3b124609fbe0798c9675e50a837cabf1ef8d7d48103162633a6b47b36394feb1f15d45fc92f6266760de36ea614d6ea
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild
index e81e5bf4b20e..c84cba0c3321 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="SidPlay decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
@@ -37,5 +37,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild
index e81e5bf4b20e..c84cba0c3321 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="SidPlay decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
@@ -37,5 +37,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
index ba6f78a64c2c..5a8094d6f09f 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="SidPlay decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
@@ -37,5 +37,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audiodecoder-snesapu/Manifest b/media-plugins/kodi-audiodecoder-snesapu/Manifest
index 79d3d4458609..1f46d3b54ba4 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/Manifest
+++ b/media-plugins/kodi-audiodecoder-snesapu/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-audiodecoder-snesapu-2.0.0.tar.gz 39499 BLAKE2B 5185eaa4e658a443aad400403be827289807b804ba574907a14b0bf5ee3cb5877cd360a0f100f75b309c9214047236723a079b0172d916ca9c4ebea740a5628e SHA512 d1b164a063ae983c49e24a48ed7fdba10f39343e1ed5aad60e0e141f20c8f3bd8115359ccc97bf4583fac7bc1fd9b1dedc800e34cb3d9ee8749c345396696724
 DIST kodi-audiodecoder-snesapu-2.0.1.tar.gz 70042 BLAKE2B cfc0f887a19b7d9fcf579888898820692d388b914709bf551ccbe372b3cb2889a1a9044487b72d270f946ea8f1ffc13f11b59fa0ef424a80f320db74525aa108 SHA512 4dedcee8a894b138637876f630135148d7ada5212913ec5b0eb208ae4a3bf51560ae633d434a91929810c6a75b2b6c5d2144703b04f86f74fcb4770b1c2f814a
 EBUILD kodi-audiodecoder-snesapu-2.0.0.ebuild 718 BLAKE2B 7b5b99a2d25eabd68267d06716a5aa6713b8901c5ab018fc269c563c0978ef2956754f90e677f820a3b50665e359467584d83a4e8dfb29b543fd6828c74674f0 SHA512 6a31ee44c729433ac50a202d97f3865c7e0f92e0df66e6452bb6f6ba783900c453df7fae77c9cffbbda8fe08f04eab984c767d1a1e35139afde15fe873ea2fdf
-EBUILD kodi-audiodecoder-snesapu-2.0.1.ebuild 687 BLAKE2B 2a50abcf1748ed8b409eb3c96b58a8d2303eb493b2b2b33830ad71056f279975e474254a11c8b9fa3c0e1a17aaee835dedeae541eddc5c93272ecfbbbb450ab7 SHA512 af1698282d1cb25d70dbf2808d31c8af965a03ea5adaa446e663d93332b030ecb5b61b2c6989b0881ff302a115e6d2aadd8e8976947569513e692afe7ca33149
-EBUILD kodi-audiodecoder-snesapu-9999.ebuild 688 BLAKE2B 74307a3c0a92471f14780ba127269ee0f5e8fa428c8869ee9e2dd77dc8d8d3dd25a690091f15a157e799d53f6b55a7a4fef3b5769c498f9a2b96fc463d1be158 SHA512 31c15892cd1bae69e4113e22cf52b37e8035b56f5236e7ad89b7203c37010cc14e809e5084958e191d5fbb9d9153f8edab0fee11de2540f45e5fca4d41f34bd2
+EBUILD kodi-audiodecoder-snesapu-2.0.1.ebuild 681 BLAKE2B 4fa055c566d4434162012c3ed0a6f9470cff69791eec4fe643e2aca779960486de2c0c50c031cb3a3d2badb0603e914d718c6de3d715a70646a4b178a1ad44f6 SHA512 c81d0b1c8e1083dcbbd459646979872097baf6cdff2a4b705bd97990bab3ef783fa76893fd48705712dea38669afc627b0b02c850924e20246b5703eb09801a7
+EBUILD kodi-audiodecoder-snesapu-9999.ebuild 682 BLAKE2B 422e69a8b54d67cffe396ea823f8c2d47d389b8b5a502667243b6fbdbb8cdb7c5fb50225e74d89fe86911338a446f12fe71421ad8332ab830a9aee99504f6998 SHA512 deaa7fc53dfec72e2e79a4d97f21a147109f127ef039f12e8dc7a65ab9fdd66fed64764147eb621b59b33602c67dabc63ab83149bf8d34606d69f61e95e13f18
 MISC metadata.xml 438 BLAKE2B 0b8c0545fe3ec7e6ead7eea42baa9255946bf7d27762d392899356ed45e1e7182d7087c25a56b34d114e6de8b95c8a5311fe90b0d52a9e7d007851ec22ab970e SHA512 9561349a81107c52fe83cada11fb8ab55c176fa4e410556741f5259503b7d43732bcf7debfa30a7c98fc7d1e5336abef914a7c31b9663556cd10fc7daf3dab14
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild
index 24aa470973c3..7ff598911be6 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="SPC decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.snesapu"
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
index 7ac620590bb2..21ae6a860b12 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="SPC decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.snesapu"
diff --git a/media-plugins/kodi-audiodecoder-stsound/Manifest b/media-plugins/kodi-audiodecoder-stsound/Manifest
index 475e186a9ba9..adecdf4413a5 100644
--- a/media-plugins/kodi-audiodecoder-stsound/Manifest
+++ b/media-plugins/kodi-audiodecoder-stsound/Manifest
@@ -2,5 +2,5 @@ DIST kodi-audiodecoder-stsound-2.0.0.tar.gz 63097 BLAKE2B c797c7fad5811aaa12217c
 DIST kodi-audiodecoder-stsound-2.0.1.tar.gz 89746 BLAKE2B 4429890376ed67e10e5abe76d450731a0d05a5892cd8a5f66d49fdbd8f0743547fa7752c87bad11f2b2e49e1519a0fbdf457da91eb16a42554d5a60f2bafecad SHA512 133eee1892817b69ec34d7897316ab6e967e67968b72ad7d73199d36fe86f119ee015f703022fb850c2c8bef11d990bba3c0a5df5f24776d4861cbbcb6b466db
 EBUILD kodi-audiodecoder-stsound-2.0.0.ebuild 718 BLAKE2B 71873f38dc0906481f5f18d83fa6af3ec610f746bace3ba211957efddd902ecbb4a8d4a20f870e81bba94fce0e85e667836828d5a5f06f8136000221df056cf6 SHA512 15e356df7a512f9ed1036bb67b3e86defff69c0f077c751444ea66c847352ea9ca25aac3c61a39cd8c96b4023ae308ef7e418fb234e76fc8bd17dcf15eda393a
 EBUILD kodi-audiodecoder-stsound-2.0.1.ebuild 687 BLAKE2B 9a5740921431f986d7c7a8904fa4164a3fb1d70feb0a5a768b20b91e3b2d99c720da709678678f838af8167fce3c68c23b5526f64a2f892603e2ae156b84b93e SHA512 cad61dac4b12a322d6b9abc95161d3e88df451a145ce0582ebdf050b5ea6afc3186c050f16fcc90fb85a6bd5f6897a2e08fcb45f6063279e6a64f2d7468881fe
-EBUILD kodi-audiodecoder-stsound-9999.ebuild 688 BLAKE2B d03551509507fb3d44490d45be9fccf362f27e701552fc35e1ee300d75a5beb5efb6a0a621b2912fe8de5933474f1b884762945bcba0a670ccdc1085aa2b0bb4 SHA512 9e42c9a51d1c0bb76d0d412f06d6ab8ad70c5757796772fb0d27b35b06620e5585902ed186a5cbe4159b227eb0ad70bfb640367146e91956e1a22a2ab8fce9f8
+EBUILD kodi-audiodecoder-stsound-9999.ebuild 682 BLAKE2B 5c53aff99e3ba409cbc52f74a43b9486b848293658f9e8d64485b4534d312c656aa2cc9955cae1a6b35145f0407a409cde0ed92a165b6631f774269ea60ada25 SHA512 67bf683a063a3a4c442ef8f844dbd2cf9200070a59ea825c61c258cce1ecd16f71858b9469ee2f67e9ecfb2a0486b53f9c0b67a1f11be9a11dc2fbc854ee06cf
 MISC metadata.xml 437 BLAKE2B 36e61faf2f1098a85827d6f81536b35d874e325a7094d535b742c71b30afaf671ed77cf9d84993ebe5e2407ee316d72453a3e18b3cfe55c0d5ccd9691f3cf12f SHA512 a985c629c36655238f0125134c4f64ffae47add726888adf934b8b66aeb9622a12ac256703206b98ed39f29ecd0a0f9ad9043af80160a8d545a982c9fe659504
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
index 76e4f54dcc19..935394c682e9 100644
--- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="SPC decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.stsound"
diff --git a/media-plugins/kodi-audiodecoder-timidity/Manifest b/media-plugins/kodi-audiodecoder-timidity/Manifest
index a0dd9f172b5f..aafe2653a165 100644
--- a/media-plugins/kodi-audiodecoder-timidity/Manifest
+++ b/media-plugins/kodi-audiodecoder-timidity/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-audiodecoder-timidity-2.0.3-Leia.tar.gz 1816069 BLAKE2B d09d51a4f838f0639aeeb3429864923453e50591dcf2ce15227dd08e8c83358ad77ec454b87f67b9f9bfe59cd07099987146e0038c757a9fdc07305f3c167c78 SHA512 8928f493120231ee21dc8e19a5aba7219e3b8fdcfdb648a15ea13577d082e89e6ccef789c4cd0547d31625a090af4a590bb96c8b72f5dc3793a5720bf96f2dc0
 EBUILD kodi-audiodecoder-timidity-2.0.3.ebuild 708 BLAKE2B d575fd18b8342f5e5ff6dc04140b178f7be935b9acf9e64577afa335e108ea10cf909be5498147e1494ccc85c27faee33b13ef50c310294dfb4e68e8d53f67c5 SHA512 65e82f5bb21296ecbb5303ddb01155f63b33cd9f11ea941e2c25bb78c64ed99b98e1a2b9da10747c4d6cd0e508e4595be5b3c63995711a73bbe83b0bb5af406d
-EBUILD kodi-audiodecoder-timidity-9999.ebuild 709 BLAKE2B ca88e9562be916185acc90021d9ead8dd01c79c72d352e8dd6c9ef5f6c48ffb551a8b2b265277362fd7d335480e9cfef96ed96aecfa94d257ee112ebb50f600b SHA512 cb98895fa7afb75cca64565db5601acdda69069f4f989e20ee6be5c5937c38cc2359a00a731c891f2aa745419689fccf23395791e471ba400a279b9bc4c3b795
+EBUILD kodi-audiodecoder-timidity-9999.ebuild 703 BLAKE2B 884aba7ac1e673547d698508977174ee2a82db0afe0d0e5a27f30ada90aee28276c96f09911806489309ac0c5690a4614d82b96f0cb644517257812213f5dd91 SHA512 c7cc8c84203d3c7e9f381083aafacb44229895b25d9e627db5503ec2e5805721e04a4c13b8bde0842700a6a7f21be4cda120d29d758859e2e07d773460591d2a
 MISC metadata.xml 444 BLAKE2B a8bc29439b6fada05640522f57d0c97d905ce14abee08f1cff2ab2e1fc36c20ca4491e836b9092ca4d0c7a2b9e66e66d6882b1c5c77b4973d038b294e7d82503 SHA512 924f94fe1923314c5ab70873705dd30874bdf52c5f2f1d13282c140b0080a71a483206c7554dacf0c4dbfcec9f4f4ac340e024b32fd9286f8ce69d52caa8aaa2
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
index 59bf5e8d03d4..5e3d9e6ad467 100644
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Timidity decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.timidity"
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/Manifest b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
index 85a6178ee25e..b551d46966fd 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/Manifest
+++ b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-audiodecoder-vgmstream-1.1.3.tar.gz 236276 BLAKE2B 4323a96ab7d899f40b0cc3243ed9047ca32b2669a845213e7a5703e79e3a4c10d1a37039b0d627d9b636dc1128b49da28e6ba798b44584411b9bb8bd84cc043a SHA512 7f855019e04156b5601a7be0f71a833b241c52bc2dd63f44f2c0c5f3a28b70e14ee9677e5e381ee283d332f167d1dc6e27f1f6cfc5212acb9854cfd93f2b4005
 DIST kodi-audiodecoder-vgmstream-1.1.4.tar.gz 275249 BLAKE2B baa3cc5cf1b744700eb026a03872b694a1c9f293da5e82747b8dc1d84e2dfc487a364d94d2e8f344ca556cd5031a2be6a2af330472863bd68c59cc9a9b158f51 SHA512 002009f9022d38b772e02e920a34562a98b71149db3d551fd913bfcdae50d51fc6caee3a2dbb20e7c5e4371968fc450e9aa50c15815a3ef8425f1cccb6ea4b86
 EBUILD kodi-audiodecoder-vgmstream-1.1.3.ebuild 728 BLAKE2B 6af6cca76ee3aeb860bfcaa606edd22385991eb920396ea860a44d34a701a4915d2f3326f14a3e82d9f2fefa885f40649644fef6cd45d3678f23ab6cdb7ed7b7 SHA512 3518755dba1f5db9f6d571c7e3d52e83bb1c790c9b1df844c5152ea0d1a0a370bc4d5bc1efec35b3be642fa64764e962f3ccaa8a5c4c6ef591d449739a1f4fac
-EBUILD kodi-audiodecoder-vgmstream-1.1.4.ebuild 697 BLAKE2B 98d4498eb0e38072436bdd548fe74b3dc910d1cc61f0584df6d2876a4c4884535239b7776cddbe78ceb0b865d711387bf311a8668fe50f0e5957e6bd7e8d3708 SHA512 2ed7259c6fb33c99cfbbbcb991430718cdc2cd8006f42fa8608dd463c2e31a96a27b04d298d4a7f30b93f97f051dc9c95a77633a848fe6d9e7183d60daa8a4d0
-EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 698 BLAKE2B edc1b7ebd24b341fa9a445ef5a64eb01c5a6fd3f82adf58c23e981f112f01d97a66c1d43f9be299fb08e351fd59415937878d18052c7eb062c821515b57d383a SHA512 4da10bfeaab8a8d557aeab1da86582d706ca2720e2c36ac5f8fcd69684319f09a953da7f263bf62a7afa8e98f252efe86cdfe6f134dfd4064c166c73b1e663c8
+EBUILD kodi-audiodecoder-vgmstream-1.1.4.ebuild 691 BLAKE2B 731c0daf8be6f9c7c069274038171d87b3a124ae67cbba9b7856b762c724dc8ec596043f9b0c66c32e364b9ac0b23ad2733736a42a762633411ec3f99d00c818 SHA512 4cad89536326c1718a6048b509c5bf4077c7a3f6f294715b57f0ce2919e4416908e216f4e0ee1120e4f64b98f13ccb3ebbbc683caa35eeb226305b64ca2ed348
+EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 692 BLAKE2B 405fdbc80942f3dfc224a0128ed0bd62cf67e2ac85165c2101ebd939757676bafe368c841f63f763cb550b2c70540fed98dbf72b9b9a6219bbccee6c80215dcf SHA512 eb585cf2225a28254eda62bd40f63221863c0764ab95e3e3298a08de00808db3f1775dabeb76d4c6360d444032a83f2fc5d3effad9d6929ef96e96439a300570
 MISC metadata.xml 440 BLAKE2B 534e3b04fc69fd47da8b492744fc924ab8e3ffca3b8bb4ab06853dfd5e707f3131630ff06272548c3b05227a9d1cb110441a6b39315203918aca4dfc9fd1c52e SHA512 280074c2c911f1df1c0fbfaead6f51f49992accac7cff643e3d03a0b52f6b64cce156937430d950bc1c875c48c15632d703e5eb69a6c270bdbb25ea7faf7f03d
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.4.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.4.ebuild
index 21fad2e624df..0e5e571ab285 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.4.ebuild
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="vgmstream decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.vgmstream"
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
index 495eeea2756c..e3cee9203034 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="vgmstream decoder addon for Kodi"
 HOMEPAGE="https://github.com/notspiff/audiodecoder.vgmstream"
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index 13d48357afc0..324ac5c7ee30 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -4,9 +4,9 @@ DIST kodi-audioencoder-flac-2.0.3.tar.gz 20974 BLAKE2B 3a328e7168bd3ae16faa0a7fc
 DIST kodi-audioencoder-flac-2.0.4.tar.gz 21010 BLAKE2B f7b59432b2054c6cde1c46728af77194a922d845b166efd90f20c033da234dcbf7e79f6b1e26e6c0ea59d92ede9b99849d59497bd09120bcca22b1c40139e41b SHA512 d58913acc84b892049919c15fd5d82e46f4451eaf6f7993e36e66e1e390f14c86bf0633dfdf60f6751ea23b43b7e0b7a8d2fc7a1c28a87212c614fc16cf33056
 DIST kodi-audioencoder-flac-2.0.5.tar.gz 21077 BLAKE2B 52df110e0c60abe3c309abafcd46c3407690132af95b251188fd701112ed17ca15b9dddaca882183b2f64357717ddc934cae4f072c70d10d049002ccad24f90f SHA512 4c6940be8c84f509a399ed22a38281259327371c7819cde4266ffd3712484664561a9bd3a5ecc8b51c0e45305f90114164f3aa2bc624c0d0d588b212bf28c750
 EBUILD kodi-audioencoder-flac-2.0.1.ebuild 660 BLAKE2B 18fb51dc940f5ef49f33a29304e0b4f4ced49a6337c9a46eeac530474d4dc84a8cfd43513ed14b6ee446e4d7b2efa584dd2e924ac8f396ddbb6ce7325b471785 SHA512 954d4337b5ddc2cb0e20c8ca658b9b8b520638f7a613dcc3265a884cca2f2c28042e9dad96a875fab1cac00e952e8dca17575af2bb3b8b76ed065ca91b95bd79
-EBUILD kodi-audioencoder-flac-2.0.2.ebuild 792 BLAKE2B bff8ecbccb9531135769b8ef9825e2e097ff51578513d90f0897a686f251bf74ef8e596c8b72ea9df0a61aac9f2c5d7691b24d9df48745c3e6f7d5bbbbde6a7d SHA512 74dcef1cd5650e8ff8642c420a7735c58e61a8e298668ddd910bb11069936cba9ea6e671c83c9c3b0eaca9c346ace7dfd8138806684f9fe9c7ced19d0c137df5
-EBUILD kodi-audioencoder-flac-2.0.3.ebuild 792 BLAKE2B bff8ecbccb9531135769b8ef9825e2e097ff51578513d90f0897a686f251bf74ef8e596c8b72ea9df0a61aac9f2c5d7691b24d9df48745c3e6f7d5bbbbde6a7d SHA512 74dcef1cd5650e8ff8642c420a7735c58e61a8e298668ddd910bb11069936cba9ea6e671c83c9c3b0eaca9c346ace7dfd8138806684f9fe9c7ced19d0c137df5
-EBUILD kodi-audioencoder-flac-2.0.4.ebuild 792 BLAKE2B bff8ecbccb9531135769b8ef9825e2e097ff51578513d90f0897a686f251bf74ef8e596c8b72ea9df0a61aac9f2c5d7691b24d9df48745c3e6f7d5bbbbde6a7d SHA512 74dcef1cd5650e8ff8642c420a7735c58e61a8e298668ddd910bb11069936cba9ea6e671c83c9c3b0eaca9c346ace7dfd8138806684f9fe9c7ced19d0c137df5
-EBUILD kodi-audioencoder-flac-2.0.5.ebuild 792 BLAKE2B bff8ecbccb9531135769b8ef9825e2e097ff51578513d90f0897a686f251bf74ef8e596c8b72ea9df0a61aac9f2c5d7691b24d9df48745c3e6f7d5bbbbde6a7d SHA512 74dcef1cd5650e8ff8642c420a7735c58e61a8e298668ddd910bb11069936cba9ea6e671c83c9c3b0eaca9c346ace7dfd8138806684f9fe9c7ced19d0c137df5
-EBUILD kodi-audioencoder-flac-9999.ebuild 793 BLAKE2B ae083ec1ceb0dc9d0e73161962c837f9f5da8ac0fd38c02a3abf3d2b116cda2006d2e5416914d4126d7ad45f9082cf76e2b352a197520dd9d264fa362ed00c5a SHA512 c456b25ef268fb2f0409ea678f5793754dbbb97eee8708b5a1d82798181c730b7b8177a33b78fc7e9d14bb9b388ce1e0d27c07d3278913ad6f71e65454569fa8
+EBUILD kodi-audioencoder-flac-2.0.2.ebuild 780 BLAKE2B 3f1dcd1979436652e42309a92c61d05245c9430a777204dbfddc23074f0661729b4c5d09b244b5d78029e0404208040705526b1fef8d03f0780a3765660bfc22 SHA512 070266d21a3b08de67e7e7edf03841fc8c0f654ffb9800fb15da78a48f0438b5aa9caebcb7e7445f90b42a4cf18a2e72b3acb3d708bab073e35bf1e0e4122044
+EBUILD kodi-audioencoder-flac-2.0.3.ebuild 780 BLAKE2B 3f1dcd1979436652e42309a92c61d05245c9430a777204dbfddc23074f0661729b4c5d09b244b5d78029e0404208040705526b1fef8d03f0780a3765660bfc22 SHA512 070266d21a3b08de67e7e7edf03841fc8c0f654ffb9800fb15da78a48f0438b5aa9caebcb7e7445f90b42a4cf18a2e72b3acb3d708bab073e35bf1e0e4122044
+EBUILD kodi-audioencoder-flac-2.0.4.ebuild 780 BLAKE2B 3f1dcd1979436652e42309a92c61d05245c9430a777204dbfddc23074f0661729b4c5d09b244b5d78029e0404208040705526b1fef8d03f0780a3765660bfc22 SHA512 070266d21a3b08de67e7e7edf03841fc8c0f654ffb9800fb15da78a48f0438b5aa9caebcb7e7445f90b42a4cf18a2e72b3acb3d708bab073e35bf1e0e4122044
+EBUILD kodi-audioencoder-flac-2.0.5.ebuild 780 BLAKE2B 3f1dcd1979436652e42309a92c61d05245c9430a777204dbfddc23074f0661729b4c5d09b244b5d78029e0404208040705526b1fef8d03f0780a3765660bfc22 SHA512 070266d21a3b08de67e7e7edf03841fc8c0f654ffb9800fb15da78a48f0438b5aa9caebcb7e7445f90b42a4cf18a2e72b3acb3d708bab073e35bf1e0e4122044
+EBUILD kodi-audioencoder-flac-9999.ebuild 781 BLAKE2B 3bf0eb9b89337a2fc30af286b68f35dcd352ad228ed343453dc331b822b810128824392a08a89f839435f28577bc519fedfcd95a63d29dc172c1bb6ec2cd0423 SHA512 e8b422dfb9c97807c215eaa5ff286f17c1844880c8ef9bcc8427a366db4a5cf3769754c7f78f9794ebf5abc9940623dc94d524f48ca4fdc23cdcb31b12be3178
 MISC metadata.xml 432 BLAKE2B 08bd867e97f6d3b7a103a557f95103159b2df2be3ef336f02d1f2551acc722d59331f981d4069451e33439730f0e9648cabb6c2f8559e214b421467759202c3b SHA512 2ef0c92e158ae0677b431163a8ca974a90c9d8acdf9fc95c563b152f1250657fcc0d64a212ff20ddd46585284ffd2e732088426b1e033b07862bfa889b7a4058
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild
index 56ae7911e975..15673bd09c98 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Flac encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
@@ -38,5 +38,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild
index 56ae7911e975..15673bd09c98 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Flac encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
@@ -38,5 +38,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild
index 56ae7911e975..15673bd09c98 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Flac encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
@@ -38,5 +38,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild
index 56ae7911e975..15673bd09c98 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Flac encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
@@ -38,5 +38,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
index e57669742afb..31525bbc5677 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Flac encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
@@ -38,5 +38,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audioencoder-lame/Manifest b/media-plugins/kodi-audioencoder-lame/Manifest
index f3f74dd2911c..37a11d27fb37 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-audioencoder-lame-2.0.1.tar.gz 23505 BLAKE2B 706cefee19bfdc19caa7c65101d61a3032f70033b4c8adf40c90009aed81c8b69c30e0a8982cf633267c26ea568b19adbefaf6c035617573fa09ae486a6d8e80 SHA512 eb780f31e96a0c745cb2598212aab39a065cc85b186b579ba2ace4732640588dabf9a6ef2e6ee57ddd793a2790cab0b8c2a1068714b80ecbfa4ae4a6eaf2f4b1
 DIST kodi-audioencoder-lame-2.0.2.tar.gz 20286 BLAKE2B 56ebf807a40d2d77469c454db0011a4c70000bc90cb3cbd41839719e376a56b9d07733a583f551fc74eff6de42b25d6c84027e678f7d5f34bdee9fa576b0ac33 SHA512 e4a73dadba4fafc8e60c1730404f9390a191bec58823202c3193f7f0571e914151c74b6d18e7d48551ae2f493b9ef11a84ddb27976a5f766e1ba512f1a0e141b
 EBUILD kodi-audioencoder-lame-2.0.1.ebuild 647 BLAKE2B de177cc8b6520999c840a786a31e56d715cce0f815ddccfadba9f6f15e21c5c4931720c4bff995d2dff1a45179018f3d363c585b9ad054a658114d1ae2c4085f SHA512 3f17ff30706653b26f130e6323f0ec22d1bb0933667efde7280d7e97c22a908c651d193f5242115bb4b4af294da7285171104d6b62356d690c0906de1564a422
-EBUILD kodi-audioencoder-lame-2.0.2.ebuild 779 BLAKE2B 1b6aeb9c30b42e60a488a86c6647a5dadacae660c209222e7fbd5ba2e47267277191cd3ecc29598ce0a9f1d945289a08d76fe611a61e7fcd86f1e358351db4a2 SHA512 7cd4e06b7f2bce874d02a663ef3c7e92d58d4ce9e47aeeafa181cdd08cbfab2eb109bf1708018eee89a11de38725aa9c2ac6c75f40f8309d8a376f066ed504dc
-EBUILD kodi-audioencoder-lame-9999.ebuild 780 BLAKE2B 815afdb445bf1e6d2ec01d9296f061f36cd109770a239dbd9b3e6da4c388791a2bc97aa91215943f5c4a3870af40089062da78fd301b1ff3bcc60b98184149a8 SHA512 465c3871b5a9396fca37e3856d42100d9da4eaf2115d72f02ad381dc25b7de88db7e37875c20dce6b00e5910f9c2d8325484a898e64c8aa97d6a2fec0e879d7b
+EBUILD kodi-audioencoder-lame-2.0.2.ebuild 767 BLAKE2B 293786c3014462b0fafcf270a3b5d3ad04d2e92bc9d1e85b6bcfac729402e87e22d89e102cbeba370bea2273a16b30522c5c4d71d3e962375265a72dc14ae806 SHA512 7ee24e7ac71208e119693ee11d0a91e842d8a21e6e9372ecfb71c1bffb7bf1e26c2251abe7ae082d82db9d00283729bc20bf648e9b086a6faa96079ba1c6d589
+EBUILD kodi-audioencoder-lame-9999.ebuild 768 BLAKE2B faacea6283d1b66dc3216c9f96ea10db35afb5b09f242533b807e9696058f0fdf7e6231519f2ce1c84c802b1c73ec702f95b0163f668fa88967b9d947cfb2a28 SHA512 7f2388b83cfa37440ebe9fd3b8192c164dde125a0ae9e6d96066f4cf1e08c66c4c06620ccf7af3a62221d5c9555f7de0e964b6a617a89825da7d57547a0ee883
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.2.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.2.ebuild
index 633bde6e6833..a2ee4573d724 100644
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.2.ebuild
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Lame MP3 encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
@@ -38,5 +38,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
index 54032ba673ed..35bd36d901d7 100644
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Lame MP3 encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
@@ -38,5 +38,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index c6d3c917b908..a63aff275679 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -3,6 +3,6 @@ DIST kodi-audioencoder-vorbis-2.0.2.tar.gz 15881 BLAKE2B 78181ec315abbbc7a3594f1
 DIST kodi-audioencoder-vorbis-2.0.3.tar.gz 15181 BLAKE2B 1ac7fc05d91680cd7de460d6af31ce9c4cd57574636a97e45040286f06dd08e9b2c7a87a967b971e43034dcd6bd9098fc328eaa87e41d3c1fe6ad2b4de48f76a SHA512 9c68cb84ce2cc207b81b98306615425f85054f9e8ad731512a9844521145e1cdda936ede4a6302e0d0a76094aeacb4d60732b375ae1c85705d5528804d42eecc
 EBUILD kodi-audioencoder-vorbis-2.0.1.ebuild 676 BLAKE2B a88b02c3d1675debe95a216a9f798fdd9d5a30963807d89869590fedaf4ef2fa6d2e69b52c540519a9bb18abdd4bf783d3b0afd0f185a74ee90fb02f6126664c SHA512 1d4172c6815c00d4ae4cb27a3f0616b39911defe8f0bc3ca2bfbbc14e28e6aad8d807759f220ae77424d80585cec21451a8229758eed08ecec710ffc1d2f345c
 EBUILD kodi-audioencoder-vorbis-2.0.2.ebuild 801 BLAKE2B bc2db3d68cb7259d7b0e680fd556e0fb76b693b87514fe7b3f916840998b4cc733d9fa597f8e2f2adc377f62ba38bac0c22ca3c0f6c5d50bba48ba10b0f86379 SHA512 1608c55ec61d7c917e45dfc52da9a3ccd536554edb0b7eb552ee7319716e7deb020437e616476a716c097de03ed3fabc783029302a62aa956f3b993b39deef7c
-EBUILD kodi-audioencoder-vorbis-2.0.3.ebuild 816 BLAKE2B 0e809996cf41f4f0ea6b8602140a40d21b1a5a0b37bc9cde11165d9c1cdef05e50b6882baf52bb53320d83d36f372d007dbbc95d0522b2b11d93ef8f44de0ca4 SHA512 c6d56889590d52f1568ab65d31688c47b744dfba8c1db7347c81d5e287f07951af258594db33d2edff94ecfe87d50ace8cdf3d1740fac58f26508085eef583a8
-EBUILD kodi-audioencoder-vorbis-9999.ebuild 818 BLAKE2B a402dd90fb3d9a52b0d00ce4d2429fbd3aef921173b8279a8174d979fd6904384b0a05df5bb64c752d41620dc6641157ea7f8f661f1249ec0732f221c66e2912 SHA512 46cbd229a94bcdc94e7135e538b59a73234454e5648afa9255085fa8a37bb6d4b25da5532d28d9b2a13d9befef11263c32060524958b064aecb4052364272df9
+EBUILD kodi-audioencoder-vorbis-2.0.3.ebuild 804 BLAKE2B 62a0407faf3178fd5aaae91d7258072024b13fbaecf94688a84b33c2116973e8f48bd375226ac77c94531e686944aebb005db1e91bdc504a2b880ed20124b406 SHA512 65f7c65fe5a291fee0977316c05e37675feb0594d9b2dbd2323df4921f3af2521b38ee75ffcd504aa3d59e1c1533d8d7bcf796a3bfdcd7968ed4c0b177e74b77
+EBUILD kodi-audioencoder-vorbis-9999.ebuild 806 BLAKE2B 0a68b3f0ad056f2a639e0d20d17b3c0cc10d24ec0a51bd8a02fc9b7fcb22ce9f04c79d001655aeace2fa78832e3ee3bd711718763b0ac9993682a4e27c73d930 SHA512 7e03f237301eca68a65e0f074b16eaec10470c25992895811866278bb2288b53476ad0b1eadba56124fb45eb3fc3e7af2c7055d4ed7ca3978a13408385a2eeb5
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild
index c672bd85ce80..8f789873e0d6 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Vorbis encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
index 9fd58dd114a8..82b41c319b1f 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Vorbis encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-audioencoder-wav/Manifest b/media-plugins/kodi-audioencoder-wav/Manifest
index 80ef627f86e4..00e1f0b15d5a 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-audioencoder-wav-2.0.1.tar.gz 9850 BLAKE2B 08275b37e033eea178054c2f8e6eab1b1af3073d7c88f8406de54bcc8a57791f55126b8d595d543520e214fc41dec7e2c8d45e64263071a98b01e7ea72ef8d01 SHA512 27746034397fe87bcfb81a429350e234be5fe793ef37f1c4f58ab87c91ef11fec8c808874183e59b325228289d519f948dddd5c9587911f3ffca36ca53641f8d
 DIST kodi-audioencoder-wav-2.0.2.tar.gz 9856 BLAKE2B 105e475e996e74a70712bdcef27cbc261beeb695fe3b0dddcc0d24d7e58a1fb0543cd7e954522e27e91a8bdd2c532190865847aab917d2775742f35c5c1527e4 SHA512 8e4de58bf6b7cc79c4bb24ed9f0906632f34a20c0a17010b4a5e32934d03414840b6a9d0db5b88975b5da2dd675cd743acb64288e2a3e338090f52df9fb228c9
 EBUILD kodi-audioencoder-wav-2.0.1.ebuild 619 BLAKE2B 85236318958ef404e09e37f37880a9ae4f1fc875e197dd10b4ac9651eca03975b6015d774d006f4eba8bb7b057c924ea9381c8788bd45d507ca8f705a563c440 SHA512 457ee9c98394779b65e4697d84773313778ef65881ab508352312027af420821a3cdef2d2172bf1143b8a5ecf618736fb6b7e6c85bded6be884d11c6eef0a3e2
-EBUILD kodi-audioencoder-wav-2.0.2.ebuild 659 BLAKE2B 98432782d7d2573a81fd61358f63b740ff41189717c79cadfdfb664a732eca8c88af19fa54f8c19928bbbfa8bca81c51b78f6d166833af487633259437e9ea69 SHA512 9ac6744d5d29e223b884f209ebbedfccf0a55d69a98c28d58ac65d73716f7e6b75142bf9fce0e3495b120cabb3991ee62969ff0a6cba2c7e213b02bc81a9a2b4
-EBUILD kodi-audioencoder-wav-9999.ebuild 660 BLAKE2B bbcf7d2f723e3548bede364cac150b38627c5b88ac7b74dad19a699ce9d95586a7d3f8035c3a0d831d5576fc70041b039e765520901e66de7fc6d4ca5f29c0b0 SHA512 0d5605a4f40477555ca3cf987545d10d6474e60315dfafaaab789a711c31bbff93e35d69a7d8f66936d187f6b8cdd96dc98c01f1499296b6472b34cca84fe702
+EBUILD kodi-audioencoder-wav-2.0.2.ebuild 653 BLAKE2B d759a331f9e5c4a35c776acdb064548c655e01d0a0bdcc40f53402af3cb4ea2b19bda3a86c4dace4fab0ed1e9720aa1394a433d8455acef021c3b4a69feca717 SHA512 7f20d935cb21fe5a7a77d35702054a68fbba1c02b0f75c04e0f051e52c42309200cae0314eb5ca136b11ca1ad933bb43b58dd47bb54e0d29be7e5603f2bcc983
+EBUILD kodi-audioencoder-wav-9999.ebuild 654 BLAKE2B 399949e9a46918912ff01988300311fa9c855229f8d60341687b1a01eabc34f179d56e1e629d45f1ed973b1dc7059d6474685bdedf717ea241cd06b5799949be SHA512 6279e486ed0852ce4619feb37c2081fa771353b09875e31d74f0d3ddbb5c06413d6d3980d5adb8eae7cfc72034bc953092e43edb3136fc6e542e64d824200fea
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.2.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.2.ebuild
index 2a4af278b06d..9f7362baae94 100644
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.2.ebuild
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="WAV encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
index f778e3efffd0..52d09f7de933 100644
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="WAV encoder addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
diff --git a/media-plugins/kodi-game-libretro-bnes/Manifest b/media-plugins/kodi-game-libretro-bnes/Manifest
index 68b0366f84e1..888fbd51acfc 100644
--- a/media-plugins/kodi-game-libretro-bnes/Manifest
+++ b/media-plugins/kodi-game-libretro-bnes/Manifest
@@ -6,5 +6,5 @@ EBUILD kodi-game-libretro-bnes-0.83.0.3.ebuild 918 BLAKE2B c9c761aedbe59015af7a6
 EBUILD kodi-game-libretro-bnes-0.83.0.4.ebuild 918 BLAKE2B c9c761aedbe59015af7a6fc15402c3c34a3a3e3c423267acb12d757a97050a96301c21c664aebe72d984e6a2b5e63595d789bc9cc034ae64cac93c19f6a300ca SHA512 8b1171895be885275766865df440a6308bf83af6b2a6ee491b18e0d64541be9094bba8f0bf1ac53d641b537462bfdaa9844ebf76953b07c11ada393160264963
 EBUILD kodi-game-libretro-bnes-0.83.0.5.ebuild 918 BLAKE2B c9c761aedbe59015af7a6fc15402c3c34a3a3e3c423267acb12d757a97050a96301c21c664aebe72d984e6a2b5e63595d789bc9cc034ae64cac93c19f6a300ca SHA512 8b1171895be885275766865df440a6308bf83af6b2a6ee491b18e0d64541be9094bba8f0bf1ac53d641b537462bfdaa9844ebf76953b07c11ada393160264963
 EBUILD kodi-game-libretro-bnes-0.83.0.6.ebuild 918 BLAKE2B c9c761aedbe59015af7a6fc15402c3c34a3a3e3c423267acb12d757a97050a96301c21c664aebe72d984e6a2b5e63595d789bc9cc034ae64cac93c19f6a300ca SHA512 8b1171895be885275766865df440a6308bf83af6b2a6ee491b18e0d64541be9094bba8f0bf1ac53d641b537462bfdaa9844ebf76953b07c11ada393160264963
-EBUILD kodi-game-libretro-bnes-9999.ebuild 935 BLAKE2B 83a8e87c7a6e4e9fe02a7fb941c9363ed81dd8b961387816909f28108eb52eb02ee34ac7544281f7831e62632921860b107499d3e097dda4fff394db2fd5c57a SHA512 89305fd524ed2d6d692659841495913cf02de54e62e01f7fff2167cbd38184311eba4ae7e8ec2ca2c6d7282339132682b425127f378827b7ffd288255e6a2512
+EBUILD kodi-game-libretro-bnes-9999.ebuild 923 BLAKE2B baeaa42b2eff6c977355f0a68d128aa7c535ca82e4b83b2d62aadb0df68f971e0440cfd586385986bd78cb4fced05d36869f1094a5097e2d4f4438de4d0b1100 SHA512 86806e9f714109a131ed198e8ca251706d6a5c553465bfba3bc8af620d0a6ffda29cedcd2ddc17c77c6c19622e2f304d391262d7e5e7b1cbab1f6a2da156d886
 MISC metadata.xml 435 BLAKE2B 95279e9ee10da6bbfb0230876ffa825de81092b99616b91914710f9cb8f91b2db8ecac3c05f142f5b20d127775261fd474f504d57f6eec01d71e2a30c3617100 SHA512 90fd8905a33a079be3b487801b241b7e6c8ab7cb40c76136ab6ecd1edff19f60665ef74ed8d321db4c92b3fb8f821ec7a124b6882b10ba11bb78f5217b0d4c5b
diff --git a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
index c4ec85a581c1..9a4667bbfb4b 100644
--- a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="bNES GameClient for Kodi"
 HOMEPAGE="https://github.com/kodi-game/game.libretro.bnes"
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(BNES_LIB NAMES bnes_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-bnes.cmake" || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-dosbox/Manifest b/media-plugins/kodi-game-libretro-dosbox/Manifest
index db012951c1fe..8cdcb0336a7e 100644
--- a/media-plugins/kodi-game-libretro-dosbox/Manifest
+++ b/media-plugins/kodi-game-libretro-dosbox/Manifest
@@ -4,5 +4,5 @@ DIST kodi-game-libretro-dosbox-0.74.0.5.tar.gz 54672 BLAKE2B cfdab6075817c2abeda
 EBUILD kodi-game-libretro-dosbox-0.74.0.3.ebuild 936 BLAKE2B 1c14d09fdc0826fe59374b74ecbfe34d0bea34c7bc68311643aa0392de6a880b49ae01c2b0301f3fd71eff2cda3044250ab478635afa842e93b49c6d81d7d848 SHA512 c009b2dcc6c8e97cc41ff6b2c16757984d280e43813e1080cf535e75686c07d4fa3b73600795a954a1150de4c625813eb15a17fdf4d58afe99e401bd719986b7
 EBUILD kodi-game-libretro-dosbox-0.74.0.4.ebuild 936 BLAKE2B 1c14d09fdc0826fe59374b74ecbfe34d0bea34c7bc68311643aa0392de6a880b49ae01c2b0301f3fd71eff2cda3044250ab478635afa842e93b49c6d81d7d848 SHA512 c009b2dcc6c8e97cc41ff6b2c16757984d280e43813e1080cf535e75686c07d4fa3b73600795a954a1150de4c625813eb15a17fdf4d58afe99e401bd719986b7
 EBUILD kodi-game-libretro-dosbox-0.74.0.5.ebuild 936 BLAKE2B 1c14d09fdc0826fe59374b74ecbfe34d0bea34c7bc68311643aa0392de6a880b49ae01c2b0301f3fd71eff2cda3044250ab478635afa842e93b49c6d81d7d848 SHA512 c009b2dcc6c8e97cc41ff6b2c16757984d280e43813e1080cf535e75686c07d4fa3b73600795a954a1150de4c625813eb15a17fdf4d58afe99e401bd719986b7
-EBUILD kodi-game-libretro-dosbox-9999.ebuild 953 BLAKE2B 8254d5fa5c587479fd56c93d1db04a3b84fff450fedd59e1998452956e6ea026f9abea68835c180332d7aef0a90d744cd6fa8beed53e0d1349bddce4e9ca3d89 SHA512 e096b1bb90b90bdd2b8fe1cf62c47583eefff38f356b1555f84feb5fce333dd4c995f943735360fb27ff9b3d9043f5422240c23feb8f84eb6eac822c78352ac2
+EBUILD kodi-game-libretro-dosbox-9999.ebuild 941 BLAKE2B 4c841407312a1cc74d50f65453a022f1ee1d0b936c5bd690d06d58138ed3b5ce4fc66d09843368ac0f39e388d8f7d724cc18c9ecfa4ef17caf0daca60935e97f SHA512 f8ccfb4524a276463bd8bfaaa37bac563971622f135844ef3a49f0373d815e7463903d8d8189fe87da4b685aa256bd83e0801d358f8022cae246d58ab5199fa1
 MISC metadata.xml 439 BLAKE2B 26e660170befb49f4f8cecc4e47a11a4edce7447eecfe8318dc00d5ce6aa4b1a54e6484a50ddf2004caefdaa8c56869e377c2607f2213e73cbcc95d67ae90fee SHA512 fc9f630ac1c8cb229608ac0ee16398a529e1698a254abaa79f786c9ffb543558577ae06c02f2142bd9f3d405457c73a0b8be0f46bf656af1d24c645704d2f560
diff --git a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
index 5023eb5cc6e6..6d5d2d0848d9 100644
--- a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="DOSBox GameClient for Kodi"
 HOMEPAGE="https://github.com/kodi-game/game.libretro.dosbox"
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(DOSBOX_LIB NAMES dosbox_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-dosbox.cmake" || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-fceumm/Manifest b/media-plugins/kodi-game-libretro-fceumm/Manifest
index dba05cb362a5..b266a0bb9a50 100644
--- a/media-plugins/kodi-game-libretro-fceumm/Manifest
+++ b/media-plugins/kodi-game-libretro-fceumm/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-game-libretro-fceumm-0.0.1.9.tar.gz 778156 BLAKE2B a7a03d2df6cc4fbf89aa0a8b4320deb7ced5d452c045d3583fdd17dcdc2dbcf59a99ea323bc0b15355889522e2f3bf572d4b0c260dc381c2630bf58c8c7cd2ec SHA512 772b69afff01e26d04fcc33d06e35da0329a1315f0e3ef01b51cc8459d145af782b6dd72b5b460de8dd7a59e308bf4922b2d77b62be1c5561b9debf3bbe36b60
 EBUILD kodi-game-libretro-fceumm-0.0.1.9.ebuild 939 BLAKE2B 48ab5737ea23f7669568b95628117efa263cd71978374638d09909acd254b555baa3ea59e00c55f7877e358d9272177ef6a4ee18a9aa71fbf5ccaf59f9ecf3c5 SHA512 cb953d2002b8de35a222bc6e581899d560a615e9895edcf33d5f1c5e5d19d022447818d75bc58b9505b98ed4e5efb0e4dd0a9eabaed593c1ff615f60ae2a3756
-EBUILD kodi-game-libretro-fceumm-9999.ebuild 956 BLAKE2B 62043d9d5b2f043f9e106a6c7c6b5606ff28460f7d5d17f9dc9cdc9ebe487ad16d9738d7e299df33b22322e616e022e3e3a7960ca1151e4f0a81ed4510c4e6ed SHA512 e2313d5ff32efd5ee12ae96b9a57b63415bf70aa10539b7e4596915c5b9ab2260076cf539120fe8642d5826f3be2a17292983fea8bf7705b6b41e561b471d264
+EBUILD kodi-game-libretro-fceumm-9999.ebuild 944 BLAKE2B 30262612625e26bd67eb572fadac769d29daf56e3312ff47a4fc9e0ba9beeb1c6d3efd956ba117d22b53cba05c3354df70c15dc3a63176b4a6f28f6996098260 SHA512 f912b660c822f8437b7ee11b25e9ebe6eb577179d1d54865294087997a1c6397b1d2451ef01292530d3ee9490c43f92990f84627a79efec48cbfec8863dcbbc6
 MISC metadata.xml 442 BLAKE2B 4667a846f933ec1e23c3ec051912d1ba46d1ee1ca41d082928efa5fe9cf89e9e1d50ccdb589e63426c2103f2580c782e4cbe0a59ca9396099c7a669838645dc5 SHA512 92e19b68682d05f6b51ba04e0478419d7f940ed29b28595f0698cbb2fef0c89c7aa44f30acaf90fa21121f8ebf018012391766e33563eea3bee606ca0532a76e
diff --git a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
index dd15a631b6bb..12f7918d7437 100644
--- a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="FCEU-Next GameClient for Kodi"
 HOMEPAGE="https://github.com/kodi-game/game.libretro.fceumm"
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(FCEUMM_LIB NAMES fceumm_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-fceumm.cmake" || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-nestopia/Manifest b/media-plugins/kodi-game-libretro-nestopia/Manifest
index 9c91e0dd8b5b..66f136091c74 100644
--- a/media-plugins/kodi-game-libretro-nestopia/Manifest
+++ b/media-plugins/kodi-game-libretro-nestopia/Manifest
@@ -8,5 +8,5 @@ EBUILD kodi-game-libretro-nestopia-1.50.0.4.ebuild 954 BLAKE2B b7551d165e179efe0
 EBUILD kodi-game-libretro-nestopia-1.50.0.5.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
 EBUILD kodi-game-libretro-nestopia-1.50.0.6.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
 EBUILD kodi-game-libretro-nestopia-1.50.0.7.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
-EBUILD kodi-game-libretro-nestopia-9999.ebuild 971 BLAKE2B b1dcdef31d772cf2a95f9e4fd514ac44c32840deb8948be9de84770ab97471cc2fef205d84bce8a4d29e242adf52e2fc2fbd1edef2df8b9ebf9e4881e422524e SHA512 bbb4f9a461c1753506cafaede37c16bfa04e2e06b7cfca841c8be082de5324c509b8820bd00322fda8cf517ea53a709adf35558b3ee27827ca64b9e8e548fd96
+EBUILD kodi-game-libretro-nestopia-9999.ebuild 959 BLAKE2B 1cf6767aaff55623f40427bf890d7d5548fb6b0c22948bc162ad771aa3c6b48c15694fadee6075d927947815d0541e9b361bf7631b5fb729b8cb87fa4dc90c53 SHA512 5122341600f3ad7f416d7a4be1d04bff301a03bbf13e5ab151bff2d0e743e1e0b4b694a17f69df9d56f3f1492df66698ee8f25103b43c3435e52d3f01ba3f319
 MISC metadata.xml 443 BLAKE2B f63ddf38e72790cb7ca64c570672adf8d71bbd68d747c15f5c09b353af76eb4aa65c5eb3f3ce18f6bf93cec3657c9b01bae2958e03dcd658053fc314f97bc10b SHA512 c77d6255db65c02a2b74208198f1807982529ee6c7f2d4ba6538e5d35ccf0683757730c0e7b9a713712172ad059540eb6d4b614f9ff16293f1eaaa1631500d1a
diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
index d08d797471c4..45c7c19d6210 100644
--- a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Nestopia GameClient for Kodi"
 HOMEPAGE="https://github.com/kodi-game/game.libretro.nestopia"
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(NESTOPIA_LIB NAMES nestopia_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-nestopia.cmake" || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-snes9x/Manifest b/media-plugins/kodi-game-libretro-snes9x/Manifest
index 938af96b495f..a41919d8fbd3 100644
--- a/media-plugins/kodi-game-libretro-snes9x/Manifest
+++ b/media-plugins/kodi-game-libretro-snes9x/Manifest
@@ -6,5 +6,5 @@ EBUILD kodi-game-libretro-snes9x-1.58.0.6.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1
 EBUILD kodi-game-libretro-snes9x-1.60.0.7.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1bfe6454b158affbcf427bb6956e84917e03c2dbc2dd9d82a1ab12bc845d77b273d23997047c8701b3555539997913d9a164a7379bcd68 SHA512 4506b2c017c187e1acd3b6768bfa7118a3b68200e414db52f396cc9ef9988ecaae3e0302284ae9afda2060316b5facee44d2ee9f502a146f8bc46dc23c84aab0
 EBUILD kodi-game-libretro-snes9x-1.60.0.8.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1bfe6454b158affbcf427bb6956e84917e03c2dbc2dd9d82a1ab12bc845d77b273d23997047c8701b3555539997913d9a164a7379bcd68 SHA512 4506b2c017c187e1acd3b6768bfa7118a3b68200e414db52f396cc9ef9988ecaae3e0302284ae9afda2060316b5facee44d2ee9f502a146f8bc46dc23c84aab0
 EBUILD kodi-game-libretro-snes9x-1.60.0.9.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1bfe6454b158affbcf427bb6956e84917e03c2dbc2dd9d82a1ab12bc845d77b273d23997047c8701b3555539997913d9a164a7379bcd68 SHA512 4506b2c017c187e1acd3b6768bfa7118a3b68200e414db52f396cc9ef9988ecaae3e0302284ae9afda2060316b5facee44d2ee9f502a146f8bc46dc23c84aab0
-EBUILD kodi-game-libretro-snes9x-9999.ebuild 953 BLAKE2B 9eee743aed38fcb6da06ab1a38523f8edcfe55e9e6f5b555a00a4d76219cbe8fa9745c00579fe1f1d0476100da85041fe17913d17748ddd5023eee347fd7e931 SHA512 d8b2098aa85d814193824b5667b79a79c4d1dbbba54673a380b6a5b78208595cd42f1a08564566d02ef77f018a148afe5f40ae5e12f4e98babd7a988664f37c1
+EBUILD kodi-game-libretro-snes9x-9999.ebuild 941 BLAKE2B 744917e8326f43fe7045c184a89cbf7b53008d77d4284adcd7912a9e4c34de4932aa232212f0ffc8dfbad67a4bbc92953051200071233d3decc3099818eff119 SHA512 fe6f120375cd0a4ef2a7670284a78cf00edb78d7a7ce76f069d285f313b7fe27dd21f8a77245dc0744b016fcfc969aaac300b58cb90d7b00427a9e9af5964e26
 MISC metadata.xml 439 BLAKE2B 6cec6faa75fdb35edf1f33f2a47d370318b8ab96f2c712571b33d22bc30130826cade398c3f7b4aee986e78baf9c3161b342215457b38d09994a1793b8704fdc SHA512 e3c0f999e2123aa2b23b0b29d1d6d24da0d804e435351c5971a2c60390c33bc3bf001571025cfe4ea7a76680a45be27f18169b201d16c8d8dcad9dbb55e9ebcb
diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
index 4b6e38acdc5c..539bc5a73292 100644
--- a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Snes9x GameClient for Kodi"
 HOMEPAGE="https://github.com/kodi-game/game.libretro.snes9x"
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(SNES9X_LIB NAMES snes9x_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-snes9x.cmake" || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
index 1dfcb591b6b1..1cf850492cdb 100644
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
@@ -6,5 +6,5 @@ EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.106.ebuild 920 BLAKE2B 3835705d
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.107.ebuild 920 BLAKE2B 3835705d8c3b3ce2f4c5d55a148a3b6fa675f7abd41541c1fdff6db29dca6fb646831c28ec12b5949dbe7d1624661e2cbd2ee0d2619442951d1ac0cc1d130240 SHA512 e7c20cb44039fd2eeebbfe89f84fa29690eb6239f2ecf17dde8b3831c2f71cb493a3ee62ac29e767715e2722c2ed930b3e8546c76faf050d4d57e907c8a5afc8
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.108.ebuild 920 BLAKE2B 3835705d8c3b3ce2f4c5d55a148a3b6fa675f7abd41541c1fdff6db29dca6fb646831c28ec12b5949dbe7d1624661e2cbd2ee0d2619442951d1ac0cc1d130240 SHA512 e7c20cb44039fd2eeebbfe89f84fa29690eb6239f2ecf17dde8b3831c2f71cb493a3ee62ac29e767715e2722c2ed930b3e8546c76faf050d4d57e907c8a5afc8
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.109.ebuild 920 BLAKE2B 3835705d8c3b3ce2f4c5d55a148a3b6fa675f7abd41541c1fdff6db29dca6fb646831c28ec12b5949dbe7d1624661e2cbd2ee0d2619442951d1ac0cc1d130240 SHA512 e7c20cb44039fd2eeebbfe89f84fa29690eb6239f2ecf17dde8b3831c2f71cb493a3ee62ac29e767715e2722c2ed930b3e8546c76faf050d4d57e907c8a5afc8
-EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 937 BLAKE2B eb61dba3fedf6ba5810e8dd5071dc810a545e26d45cc756384eec2296cd3b8cc8f5adae9d285cb3a443694f6b139105e37d328624af3c49fcf31b26e1afe778f SHA512 949ec0841266d1584068fc0a086878d6b85afdd239187847ab32da627c8b905fb28101cb3dceef7d1b8ca552930979ef58c53f1bf28dec485a21fdc63759d87d
+EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 925 BLAKE2B 3c7ca9c3dd58d3c5215178911eb08a83caae53228d64892535fc6ffbbf948a1a2d07acc0093a8dda634c68f60b78b6d43381ff72e245ee104a536d56f018b15f SHA512 9f693e1bdbd1b3b5ba1c7b5dd5fda76921fcb893190fcbfabe904ce0921abbc55e389c789737e24f08717b70c577fbe97ff593cc1ddbc3b3216ffce5c4edc65f
 MISC metadata.xml 424 BLAKE2B ebec5842d30789985a87b437a5684959fbd41f0d93389726be3bf30b07e49fb851c095f0b1e2edcd6245241f83bf37668ce6494ebcbb90b7e9d6421cbd15ce03 SHA512 3b407c1fad96600c9f9ce0c1f8cf0f3695a5cb41d66762e79b0e0428ad36af0eca33a0ee421d364fb979b661fbe62a047f48ed10f71fbd963e64c205d0174b5e
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
index 852f780f1e27..4693fbee0179 100644
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="2048 for Kodi"
 HOMEPAGE="https://github.com/kodi-game/game.libretro.2048"
@@ -35,5 +35,5 @@ RDEPEND="
 
 src_prepare() {
 	echo 'find_library(2048_LIB NAMES 2048_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-2048.cmake" || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro/Manifest b/media-plugins/kodi-game-libretro/Manifest
index 625937cdfb00..6108f6b0a244 100644
--- a/media-plugins/kodi-game-libretro/Manifest
+++ b/media-plugins/kodi-game-libretro/Manifest
@@ -2,5 +2,5 @@ DIST kodi-game-libretro-1.1.0.tar.gz 101454 BLAKE2B 8fcd65c8221b0ec4d24a41361eeb
 DIST kodi-game-libretro-1.1.1.tar.gz 102246 BLAKE2B a158a0148845dcdaf563b84739b73fc72f29f5795e66c748aae6a761da7765fdd3f70f2cdf572c4c987cfda6ef7ec50bedb7b0a1c20e72e9f3157b333cf5c832 SHA512 f26776eba765a010a86994a02658045ca0c1e887481a31d90ae388765620fb1a0cbd4da79285ae161e99feb311ca9ddccd25193a73a22e7c5f19a78ff1164920
 EBUILD kodi-game-libretro-1.1.0.ebuild 743 BLAKE2B bb123ac3ef9eddaa24ee8fe6f0bd1670705778107e1f72c7cfa951d0605b17b022810f92ac9beb943aa7ebf4f60558a5dea5ca7b5906e5e34a6488a25e5ff600 SHA512 fad956837ce81f71ea4329c9ef5df34e92ad1dc380ebe23329b537652180931bb4cb7d5ddb8653bbdd03cfbeb983eec6a3ca37ac22e6aaa85a1e4b5b2381aa8a
 EBUILD kodi-game-libretro-1.1.1.ebuild 743 BLAKE2B bb123ac3ef9eddaa24ee8fe6f0bd1670705778107e1f72c7cfa951d0605b17b022810f92ac9beb943aa7ebf4f60558a5dea5ca7b5906e5e34a6488a25e5ff600 SHA512 fad956837ce81f71ea4329c9ef5df34e92ad1dc380ebe23329b537652180931bb4cb7d5ddb8653bbdd03cfbeb983eec6a3ca37ac22e6aaa85a1e4b5b2381aa8a
-EBUILD kodi-game-libretro-9999.ebuild 745 BLAKE2B 53d49e0c582be13b34fa688409533dcaa8afe910f9c7464029129e12a49401843b507a800014ff3a3d580bc50b34c8e042a259e825ebb2219783d789c493d1f7 SHA512 6f58f179d5424becae61c19e3c8c677df41834032fcb7c5ef1d90e248e8570e5897cffa0a58a02cfb223211ab91942aa77b054dfacad14f489025a1e13bf5dc7
+EBUILD kodi-game-libretro-9999.ebuild 739 BLAKE2B 17773c5c826473d340eb0450762da0d186a26f17b83c11aaca4f443ecfda4501eacb29a41656916020ed91d78e8b7cd9f2b4ad40ab653a3fb1d171e6911e4326 SHA512 8249d347f385c8b21867ab9ca97d906aa8b1933d2493936fb5ae0590d60f419408ed7dceac739af74baedeb5ab38000997eb9e73e8c61d70dd32f4916af1fd59
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
index 7a362f9d0276..1c072bc4353f 100644
--- a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
+++ b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
 HOMEPAGE="https://github.com/kodi-game/game.libretro"
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 8b6ca21d3eba..f180c70d54d3 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-inputstream-adaptive-2.4.2.tar.gz 711951 BLAKE2B 17f29ffb9f6e0f0e109af85afba16e92fe8f0cef2d660b6e4abcda0265e8096fca83ad947de213a83eaea8b94cebf94da4f3266f32fce28776dbabc05477ef3c SHA512 218be820b4e7f05d9a3ffd330db785997afe225a994ed4187a1aaa13b28189453d4a82e3553210613aa644f9f98b30bfc7bc048a1ad9674521053ef21e2e26e0
 EBUILD kodi-inputstream-adaptive-2.4.2.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
-EBUILD kodi-inputstream-adaptive-9999.ebuild 825 BLAKE2B 2a7eb0a26485c9eb5209c1f8ab8cb9ed332a61d7a0fc3f9b6d679558169a8f4a72fdbc6be25ee3df56a1b722ea310e85f6b45ff91c3bbeec0bdfd1374c25bc26 SHA512 03610785d2f6cca04d7862ebf5a3f79b20d536d33ff48d557fa612946eac5d25abfd6e01cc538528e5499c98ba5264fcef53d3431a421f474b587af4f93cfb67
+EBUILD kodi-inputstream-adaptive-9999.ebuild 835 BLAKE2B c18abebff13707e49b22eb9e52c2aa7fa74608b10a9b9f5ac121205a2c98a4ba2910cb14692e9f124e8bcfb51e342b84cbe4d9f44e0521c4db472c1bfed7ca29 SHA512 d9228432af073456e1e8b38cbec612f46ae39ce67f8fdcf69dc39e20cabbbd063bd9d8bfaf4c3c9b2c55e23f5cb535ba173caf46b3c92e6286c3eea5b5836dd7
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
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 8c3da94fa9c1..40578ef03e1d 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's Adaptive inputstream addon"
 HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
@@ -13,6 +13,7 @@ case ${PV} in
 9999)
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	EGIT_BRANCH="Matrix"
 	inherit git-r3
 	;;
 *)
@@ -38,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index 6a5e9b2836ec..7edb2c320a72 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -3,6 +3,6 @@ DIST kodi-inputstream-rtmp-2.0.5.tar.gz 18280 BLAKE2B ce906740bebaa33ffa813a94f8
 DIST kodi-inputstream-rtmp-2.0.6.tar.gz 18489 BLAKE2B 36a760ee57109d38c55b375531392e10040dbe89a6797299eae69c02c0b9fe828f9b1745488e61ea256d1b0216acea03906e7d4676f93126577be25a7c81ca9f SHA512 38bc0813427d6ae201b305a208b91eee5087ee8226c8f26e7df4e82d5dc87ac3c0a0809abee3ff99fa995659bb8eba1d1ba2aeb7ee1059ef85aa45d9a0abfd3b
 EBUILD kodi-inputstream-rtmp-2.0.4.ebuild 684 BLAKE2B f8f25f5846d5576b656555155f213c817a18de0c20cb0a4c55952d694dc2e21420c5b8e21813c2744dfe23877ea408c3876efe66fbbc2e54642d6eefd5686c5a SHA512 39147f7f41ab05b76de6c4aa800b3ea292a6b4dfa6fde6d322f30822ba8319f0f08e9a090c4b45cc5d3bf59ab0fb0b5c9a621fc831f12d972e61d8057f73e2d6
 EBUILD kodi-inputstream-rtmp-2.0.5.ebuild 684 BLAKE2B 8e409021b820b4754f8e94ce3437bbab0716905d04d83a771d5a829fcf65741b4faf76c2d95c44eea74c3300cf7577059c072911c79b1ae426bf90e3f8c76d88 SHA512 e5665cee8ce8cb69436f18b0dfc891bfa780f4c770c3c074bc8bbf76ad54f3dee69cbd5eb345b503b475c4f6e67ac79546ad42cc7b1c70927867370aadb321b6
-EBUILD kodi-inputstream-rtmp-2.0.6.ebuild 768 BLAKE2B 60df1cc296c554a734a8488deeb7649bf2dde0b577e30c367f2f3d82ffca1c3d28808cef852a21fd1b598bf6b66439c8e2c29e69ad424282266871e6882cec8a SHA512 34df267074afea25db994be37ad22dc8c37a93d33396e542547d0f4fa9b1b1ffb34517a30dda95cb834395f22252f6cdb3900554ef7676a20f6024415922ebea
-EBUILD kodi-inputstream-rtmp-9999.ebuild 769 BLAKE2B 1591e603c05450d20d5e6bca7c4d3b44cb3fc9e861be2828108797d92ea6e5fc6d780b5d345f6be96dfcf1d6a74e2d212873e3ac3a54d4dbc15251e3df00b451 SHA512 72469083d67cbdd6f61f3d0e83198e522322d530397fae0d980f812dbccbbb51864d73e096f672cf68768f082ed512928f7d4c8843ad3f54fc250eb48fc59adc
+EBUILD kodi-inputstream-rtmp-2.0.6.ebuild 756 BLAKE2B 6d819f2e59273f8430dcfec75cf3938317286aa4bd141509d1250834e7a35792accf971d6967be8ecb66e4fc7390b62a29210d74eeefc0e21f892cbdaad13ff0 SHA512 b2fd1319deefcc825d7f8dd6a232cc08779e9ed982d959452d247b4e897cfb2fc5e1a3e64aa809e8c1b29603b918afc4936463bb142816dd346229fed005e648
+EBUILD kodi-inputstream-rtmp-9999.ebuild 757 BLAKE2B f8a947d8f7fc8568729b6941b843f240d7371310e85ce7b6e2bd77dc34e963b4d58dde3904d1ed914ebbd55ea7e89ba3e3cbc6a656bbdd405eeef9d6ac24d6ad SHA512 940909eec14c71127c349bd9359d1100d188aa10bc521872af00b6b51c39939f73e4e2753ce48838bb82c182977bb30ea6a5ea1a20bc608ae6927faceaa8c5c7
 MISC metadata.xml 433 BLAKE2B 5b159068b2431fb4b669662f4e36d8768afbda1e076e866678c193590945ff0ba4d6c03228475dda7bb7ca5d204d09e0e5d5804baacbfa653563f199045a1c80 SHA512 0cb47e468304977fd3624c4ec07d254271406897eb4601eac57a68167463a8379e3d8cf4d4e0e4988ae78d832ae39da9a457ba30a7c0fbbe8a32fab4e5e94f53
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild
index 3adffa9da5e4..4766db65de42 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's RTMP inputstream addon"
 HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
@@ -37,5 +37,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
index 75e15b5c141c..e38c1e39aac8 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's RTMP inputstream addon"
 HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
@@ -37,5 +37,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-peripheral-joystick/Manifest b/media-plugins/kodi-peripheral-joystick/Manifest
index 6e8e833ad27e..c672e9019b94 100644
--- a/media-plugins/kodi-peripheral-joystick/Manifest
+++ b/media-plugins/kodi-peripheral-joystick/Manifest
@@ -4,5 +4,5 @@ DIST kodi-peripheral-joystick-1.4.8.tar.gz 90965 BLAKE2B b9bb3aa6e1a5531c304f2f3
 EBUILD kodi-peripheral-joystick-1.4.6.ebuild 730 BLAKE2B 76309930faf2294995b1df7eef268c6ee8fea244a129bdc2c2a65e30018cd6fa4e9afb32398eb5e17c8a8956cec8439d321a01eb4015058f54e52ad06be52b69 SHA512 6fabf1aae054025f89177e8bf00672ef62679e31238c048bf7598e92391d82b43fc5815356bc083f3986c0256762c40f85c6849bb00ff5ed4442f0ed4d39ce95
 EBUILD kodi-peripheral-joystick-1.4.7.ebuild 730 BLAKE2B 475b3113d4f0edf85c7221641e8253a20d5c571a890a7e88f6e5e0df7d4ce73bbc5863e6938b921191f721d7d88e293ea3040bff8027f8340a47c08992849106 SHA512 2d4b90e94341f6b0435589c62505a02369081557e6fd71c30b90602c1991da05e2c36c8bde04cdd1eb0f0376beced8e9217421d9c0991cbfa34f9e04d83d02c5
 EBUILD kodi-peripheral-joystick-1.4.8.ebuild 770 BLAKE2B 1abec17a88f9daa0bf27aac34a59e7be3aa4bfe9e46b58c1f8eb8f280a882723459945444da1e6291a8769f5582f9a95b4d21a710e8657efd6376033256b8d51 SHA512 4d76e61711b1523c3817c694d34fba20fde4b6a838c43849f9e8dd20120f25a6720ad1695e72ad3c97da2e735e17b594b7469db7ffa9e943ef97f8ef7a4ed7dd
-EBUILD kodi-peripheral-joystick-9999.ebuild 746 BLAKE2B 8587f64e5d25b69e37dca398f428cf136e61e44db423dc46592acd3980479dbd7d35d4f3b1ffd417aa47f1a53d6de9a3f52fc3461e6d11885e9fa68cd83daf90 SHA512 d55628f1f733d9b88d6958f889e8f40dfb159c116d4d75c9a5d250571915286e2f9c006006891d44b65c68f48580af6f38fe8af472f3a99be85be6af6ebf8edb
+EBUILD kodi-peripheral-joystick-9999.ebuild 740 BLAKE2B 9dbdb6e1377c383304df76b398b7c54770616fbd19cf654ec92d9629c504c321e8694ba3ee01be4894e8792042a42219864898996991437192344720b3d71300 SHA512 daf7e9fc0c4ba9ed7d669b6beb70c9d3e4eb262174ba5cc4de8d974f852d1e3c7e4f53c3d90e49e30181e665fda288e64c15a361a046481109496799278a051a
 MISC metadata.xml 439 BLAKE2B 4713d97899dd9cb12cf064f17d88b197f872a38952d435445b0097c9cacd297dface9c9efbe034eafe595c7cccc3a37773fbf025c0fc45fe3283ea406785c47d SHA512 1489ac3199dbc3033892af4d492e843fff379a18a93059e4c0e164e9140411f8f7756d275b70214c375f4ee649d48786255aa6500c2b6b218f843295ebd6c29e
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
index fd7b1226a274..9b0ab5cbd9ba 100644
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
 HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
diff --git a/media-plugins/kodi-peripheral-steamcontroller/Manifest b/media-plugins/kodi-peripheral-steamcontroller/Manifest
index 6d350d953369..f1a29929e53c 100644
--- a/media-plugins/kodi-peripheral-steamcontroller/Manifest
+++ b/media-plugins/kodi-peripheral-steamcontroller/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-peripheral-steamcontroller-9999.ebuild 757 BLAKE2B 7f8c7c591c6b7f450b60b37765d6b51c0b7ae38b1c416f47e31db8de66fd9fa2ed2f28bebe4210e7c17b69edaa69177bb056a88625d2ccdceec194c59b70df66 SHA512 6952c9ec0c5cfebdd33b5e1881634fe18e36637817e976598bc3b64d69c922b61ea1759f0adaf43ffc5360c23631bbcefe5e5eb7c96d7621c6c5726759f66865
+EBUILD kodi-peripheral-steamcontroller-9999.ebuild 751 BLAKE2B 8d048df2f7fb00661450126837ca1911d29738d05c29d1253038686b810281b32a250fae0be9a84ea0025fb362d60565a9a69425b5755c8bec449a445a10d224 SHA512 ffc29daba259ce33472222840af051bbacee8471d20345d3a079954ad0bbaa17ab1d7b26404740a44dfa61beaa7e63da8085581f70b6b4bba12363cc6d1acd87
 MISC metadata.xml 451 BLAKE2B 693a4209127aafd693b5d826563ea913406cdd3445ac138426c18f3c1e8de2d3fd76ff590d51e9df1986f6f0bad0529e56faa32799cceb9fda3ef94d9022d92e SHA512 2e596edc4ed91a27b5fcee8b99a7defbe08a2ee6a4579635484631dbf64b539854418921b393e63e68f045415e998d0a3facb70a786b87c5a4dc40409d2fa807
diff --git a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
index a2853221614c..4daed9983f68 100644
--- a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
+++ b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Steam controller driver for Kodi"
 HOMEPAGE="https://github.com/kodi-game/peripheral.steamcontroller"
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index a37f6ebb3d18..feb5c5fca36b 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-pvr-argustv-3.5.4.tar.gz 149660 BLAKE2B 0afd36f8e7c153bb5d00235664ab40e7fa165d658b0491a271f9cc04c7ccf2f3bf9666c949b43c03b86ab8d6479863c7df9e05d75b8e18676526bb1d30f8b62e SHA512 37ae3fa9d3e0f49ce87429de56f16e875bcbb289f94e019822c9e8661f54cd62d11d6cebe195f29871d7c24241d859e88fde988fc6ed6dd2a3f64cd7e8efe1d3
 EBUILD kodi-pvr-argustv-3.5.4.ebuild 703 BLAKE2B 88426f2bd633dba02be419e2067a5860fba8ac022d16961ed2216eb34a1e7a8feae2520da95a1fa0bcd118c951a0ddbf36dcfccb016404eebba946849a4eb418 SHA512 b12ce181413e81ed518c09d8820985b1dd54a5aa64e64413f993a426c6bda743f52c6203e8769b198d446ed5f8a2248acdecbf95d8f9891cc2afdb9b17e8e4f0
-EBUILD kodi-pvr-argustv-9999.ebuild 705 BLAKE2B c9ec6b97b136d764164dbb6a33c5483aaf5dbbf4865e614b20a1b6408f5662a2523dc6ec04e1121bf3ae435e8f13ec41e529bf2ef23f1b3109f0a6434462006a SHA512 6b4c30f999371ef02e182974d8938f807cf935363a25ac005206209a0044a9391b4d7458039cefea5852975d67e190245d4709fad97302eb611d808276766c70
+EBUILD kodi-pvr-argustv-9999.ebuild 699 BLAKE2B dc9741ba064095615b195083b307391930668a6cf97cc18d8617a222c3ed7d7e950e8f1ead5f2cda6b22d33811e81006ffe39ee56c07a6f178f6e55761678664 SHA512 2de8bbb1130a8a444095ca36e1e14afbc28f56f917845579d4c63681fc0955be0db9cc870a2de3e84bfc18958e3595013ee663a558b90f9cc10dc118011a48a6
 MISC metadata.xml 431 BLAKE2B 7cf6fe3e6a6c6cec6b72acbe12ed6b95b8204c33f9f8473f6ed48831e189063b9b5584b579365bd5551cf9ba109bcf85b6ee1dc77eeb18871f049fa5490215f3 SHA512 ee08e760ff80ed37cbc40ea35ef0daebd9b8b7dd7a532123787a022fea25c9441912103dfb154491b81aab1f79675408c4fe4022c4937b03433df826bdfa90bb
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
index 64d10d3212cb..ac13610cbe26 100644
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's ARGUS TV client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
diff --git a/media-plugins/kodi-pvr-demo/Manifest b/media-plugins/kodi-pvr-demo/Manifest
index 1ef537114acd..fd6a963992d0 100644
--- a/media-plugins/kodi-pvr-demo/Manifest
+++ b/media-plugins/kodi-pvr-demo/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-pvr-demo-3.6.1.tar.gz 35070 BLAKE2B f916f89dd701c5fa9b6f9ad4950115433382c94ec5cc73afb0c753b80c1850947ba4776e494842e9181595b5a8bdb0e38f3a6b0baeaa6b19dfe2fe104b2ac06b SHA512 ddcc0c91b9173920ab5a9e05622312e7363b85be74254e451cff7d415d09fe9b60f59acb75c66359eabc3e737921116c2232042a76dcabcf9e2d52d4d3e31a09
-EBUILD kodi-pvr-demo-3.6.1.ebuild 680 BLAKE2B 87d12755a3a90adfc581a0a25e01a0be13e52551fe3114fb0cb8f5329adfe5011480df5c9bf54ca4aa449c0f13157b7adc1b2c23b8e2bba212249c5dc105a16e SHA512 b9507d10a7ae7f5dbbff1970e7c88edb3e76d3a84b6ccf3927eaf2f457d9ed651c773735b996ebd84803176e4362e8b943990cff810fd1b95b7c9ff71a653b33
-EBUILD kodi-pvr-demo-9999.ebuild 682 BLAKE2B 6a571d5a90500dadd816e3221e77f73511026a1009958beebd03b93a89c3800652aa9da82c6e5be7beb50918116e1ce9701fb983a95e12c34c185f004b2d8895 SHA512 44e997dff56aeaa6a77d27a5b57693a5f5b9542b0c9294677b2f3375f816049be26691268a1a7ba95888174d4d307af74e2e20acf915110d498dfea206d92f6d
+EBUILD kodi-pvr-demo-3.6.1.ebuild 674 BLAKE2B fe9c05522667c1c604aaae07f3c5a3f80ac97c20240d3f6c10e3b8d200752e922bba9a9338c5a7cc33a1bd71009f88c3237d8f154d6514b04241942f56f74839 SHA512 1105f6ff6e6e6f2248b2387aa10217166c8b70b4397e51f0646b612785cc5239138ea3bf5f6cb4e5279b098d242480d8284d8429a46c375a75ddca6aff72dbcc
+EBUILD kodi-pvr-demo-9999.ebuild 676 BLAKE2B 17fa572e2797e75501cdfa15cd6fee78733ba423a3b755ea82513b858e2c592c827a2558901cef0e37b6dc5ad90b61ef23a3e78d54947f8b90da9ed22402cbc6 SHA512 d2fdeed619fd9eb365b38cfd1177863a880bfc53fbcd6bc7f5e980e73a4212427a10f254108490d440977c2eeffd51a129994fc405605ff5135677fa13c0975c
 MISC metadata.xml 436 BLAKE2B 657769c7828eb3034e2d71aba8377aa2f7d9e4d314904e24e17f08659c2e58ade1c24d1903b9b30c5f96322c4c9ab85c92fceb41c468afda496d52bc9f4c5a7e SHA512 a60cfa34672d7940ea934fbc3dc6c2b0e11c0ff59cecd7d41dae08d040172c65e70117748ced3a74c5a772af9ebd00259e91db26cb73d635502d85ed48ff4538
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
index 5a8fd9899663..4ac4ff311b32 100644
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
+++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Demo PVR for Kodi"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
index 6d694e9aa2d2..d6bd3b529c1d 100644
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
+++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Demo PVR for Kodi"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
diff --git a/media-plugins/kodi-pvr-dvblink/Manifest b/media-plugins/kodi-pvr-dvblink/Manifest
index 85bccbc8aefe..db68b9990d06 100644
--- a/media-plugins/kodi-pvr-dvblink/Manifest
+++ b/media-plugins/kodi-pvr-dvblink/Manifest
@@ -2,5 +2,5 @@ DIST kodi-pvr-dvblink-4.7.1.tar.gz 181247 BLAKE2B a9368ed515f942a7144a50e02c5ada
 DIST kodi-pvr-dvblink-4.7.2.tar.gz 180347 BLAKE2B 83ca3cf04de7cfda420da8f068022062ee08920d5313cf2e740c1512bc5c1ec3dc8cd1613f5aa1f30049193d777773d5e73ae66e616dc3e5ea4064cac72b4f01 SHA512 9057a066fa228a271e4b21935bf1b823bd7184d3cea62bdb358932d3a8018c86a1129548c5e54414bf068bcdaad7726a8355d5bc5c61f64130396fef8e089be5
 EBUILD kodi-pvr-dvblink-4.7.1.ebuild 703 BLAKE2B ce4cd6664c4c53521badd438ecd5c5ed74280957fd63ddc8de33bf6e32292d96061bf82cd10ec45727ddc93c00239ca64d67eb3209a0d6e85e7b0456111f3192 SHA512 36295772140306413f42eae3fe3f8984d5a5948704ac8aa14567783eb7688e4d132059a768ebbfadde615f7ddf8fef4acfbee072b04d23993329788796f2fa30
 EBUILD kodi-pvr-dvblink-4.7.2.ebuild 703 BLAKE2B ce4cd6664c4c53521badd438ecd5c5ed74280957fd63ddc8de33bf6e32292d96061bf82cd10ec45727ddc93c00239ca64d67eb3209a0d6e85e7b0456111f3192 SHA512 36295772140306413f42eae3fe3f8984d5a5948704ac8aa14567783eb7688e4d132059a768ebbfadde615f7ddf8fef4acfbee072b04d23993329788796f2fa30
-EBUILD kodi-pvr-dvblink-9999.ebuild 708 BLAKE2B a04b56d6f3793730ef5d90237125f7548c358e920f1934123047a6658271975d7c5a53573281fa919fe5f99690afbffd69a5ce91988d08be1e79fa96756432a3 SHA512 c1ce8332e924dbad56db9e7d25b572ec61e36ff5d8306829db642fdfe039eda0f524676e31ac66925b898c7e9a7df1e1167cf022fd9d675c3080011eea94e639
+EBUILD kodi-pvr-dvblink-9999.ebuild 702 BLAKE2B c40b5435689b5f38eaed686181ef5145b130bde6e03f2d5ba5548373bfb5a17d604f02dd39cfc37b4498de91f913364c9f066d2c64ff068b42f14982554a9f9e SHA512 adc843074e1c34f466e2feccc933cdd9a01db496705dc8bfa6fd01008a99e909642dcc27b76065df5d68e63a4b58595debf34b8135e527a6ab280ddd53289c29
 MISC metadata.xml 430 BLAKE2B 3e8e91274af301f44e000e54762c98b68a732dcb24bab5f8114df0bfa2b82485cace8c2dec1258efc202b227f946820aa0833dfd7c4647968756b84feea3311f SHA512 f5087df98e004c6319dbb7bf9b4428e5e52636e129cd34f3450d23b7b21b6dc36e7d935c3921e08796831082d4bd101d4c4b185a70236eb1a4b8c6b8522691b7
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
index dc3768c88ed1..c0a254a79c5e 100644
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's DVBLink client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
diff --git a/media-plugins/kodi-pvr-dvbviewer/Manifest b/media-plugins/kodi-pvr-dvbviewer/Manifest
index 34d54ce40be7..f6b40ca0e3b7 100644
--- a/media-plugins/kodi-pvr-dvbviewer/Manifest
+++ b/media-plugins/kodi-pvr-dvbviewer/Manifest
@@ -4,5 +4,5 @@ DIST kodi-pvr-dvbviewer-3.7.8-Leia.tar.gz 127666 BLAKE2B a1f73598ec8b3c6db067b6c
 EBUILD kodi-pvr-dvbviewer-3.7.11.ebuild 724 BLAKE2B a47e2cefca993930953e681d990454e3ed7523033a12eafa3d7b1666ccaa02ce4ec463a855ab6efcaf3a0b8aa11e21fceebd0e5479e2533a2e9779221746ea57 SHA512 cd00eb63545a5786958b0c88e0f7cc95d59b1356b1a9de780a81402aa69ac9f4b4a5691d3844c7b27fc832b54d68ba0d1e7a4b13f997a12aea53770d654e8cd1
 EBUILD kodi-pvr-dvbviewer-3.7.5.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
 EBUILD kodi-pvr-dvbviewer-3.7.8.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
-EBUILD kodi-pvr-dvbviewer-9999.ebuild 726 BLAKE2B 32ab0af08b1579412f50e22f2e4509693bd143bbc23308ee753a6c0817a7c7f3cc8e9ab1531cdeae4a4d82c05d9750a9ae0a48a3bd3d20a1286079b17511e6af SHA512 7faf4553275cf0576517a3f81da6b5cfa32c30ba8c3821b2b0e0d42dd00d0ab9842c7e300a3b4520f1a3f21a2ce9255f1f10deb65aa8e91c7e70166e4da7f073
+EBUILD kodi-pvr-dvbviewer-9999.ebuild 720 BLAKE2B 0dfd0b9f1121153f3b805228df2663c8ff805b537b30d4e24d714c803e3e5172995f790f3c83f51b557075d2c448ae45c65c433b55d9eb9e1ffd11c279a04935 SHA512 088e75cc0dfc7e6f401f9017ee8706a09f582e631422af698baef33da35a699b441424e1bcb6bcf5c37453d01bcdf2bb290f40e894623d008142d556686751ee
 MISC metadata.xml 434 BLAKE2B 8c6842bc4a5a0dc248402680bb06f034883ec52717aff60b0d8a55a27619f288719caf002056bb6c36f09506e8ecf0b45a173f7cfe85699db9477b30fdd380cd SHA512 9e817d4a01a0c99faf30fcbee42cf386310ee8e2a74799d5384bca834ee88c534740bd304b5febae834536c6283e6570199d6692b7091e5c2b9ebe35c1d717c4
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
index 0c4eb9081cdf..581b837cc49d 100644
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's DVBViewer client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
diff --git a/media-plugins/kodi-pvr-filmon/Manifest b/media-plugins/kodi-pvr-filmon/Manifest
index 31dd41e5ccca..c31d850d7864 100644
--- a/media-plugins/kodi-pvr-filmon/Manifest
+++ b/media-plugins/kodi-pvr-filmon/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-pvr-filmon-2.4.4.tar.gz 104862 BLAKE2B 8333be55812ec5cb18535aa696c07e16cc02712522b540bef346bd030fdbd572daae47d81bed78be243014fb920911309d5f924079d323104c60090d0ca2c72b SHA512 f6d7c90842ca59ebb3b254860b47d7c1b7e6e5bd70f06744341eaf30a4bc2847027818a2bb097e56398354315753cfea7878cf2b82c3fc69b0aeed106b8d8e80
 EBUILD kodi-pvr-filmon-2.4.4.ebuild 697 BLAKE2B 40d100012cb3c7583684aebf7741c4629291a227af15627c4d9dac9a2b47ae2bbbf322ab34b70f03dab4c026ebb70e7bbcf6688468d81df840e151dcb9700760 SHA512 162b3053e55f4ca20f5586592b96538a4640dc32c5ed682262899880699b2097b013533eda33c3cf74d35b7a8aa6ce595188c16dea1054811e0cd8cfd2c0614e
-EBUILD kodi-pvr-filmon-9999.ebuild 699 BLAKE2B 3e6a1930f857d4a9361f3438f81c94cf346972f077d734882a9b88d5bfcabb2b1baf5d1cafe852af0ba066b9609fc63a81b29520e57bfc41a6d2b9ac2babae43 SHA512 c07dace498aaa0412428b76e3b2af92f1cb62f9c8707687a1a66f5a915eb534bbff5b9c2b9baa0c59da91a427228593edc008082e1d074da77489db0d1867d63
+EBUILD kodi-pvr-filmon-9999.ebuild 693 BLAKE2B 8949d31227f05956a8595bba4c8cb1c5c32958568f96f2cf1a078051b4c77b42bc36749c2048ca753f37a23c587ebf7f67e708d00fb2e06d297408e4203b76a4 SHA512 890787aad8b924739a30fa516d39734926c744b8a602df18f90d11c2818d74d28bf58e792679f65ba7f36d473dfcb507c58edabf32b83163551e0b9f6c7afc4c
 MISC metadata.xml 429 BLAKE2B 5432fd7942694c454c239f39e4835bb6430f8e5dbc14b4bb11d32f6aa618822be12b1fa6a6b39422f4fb5c0d7a1b8203ce7fc3f2090a7d2a7253ee65fca11439 SHA512 dea6258c8509740209e941e13d258d165e72fee1902dba1d5364ce3c453e53de4698df34cff64f591f192336a46e69278ae7409c187788df6ef1a0bb4cf10ee4
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
index c8a6715f02e4..814652629675 100644
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
+++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's Filmon client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 1637e1b2084b..5a568086a231 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -12,5 +12,5 @@ EBUILD kodi-pvr-hts-4.4.16.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf
 EBUILD kodi-pvr-hts-4.4.17.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.18.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.20.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
-EBUILD kodi-pvr-hts-9999.ebuild 723 BLAKE2B f51359291a40dada764e447982851b60e6433f3a8ffbbdcc307e2dd4ae2d9c69e98819406a85bd2e4d1614a748c98e679a6b72364f2b1212ec86efadcb48961d SHA512 65d6b27730ee77d64919fb8885c175e2cd4ee2ee416b44e8d501f4d8d39e3d149a9774687538559e92c65cbfd53c3f8f79e62fa58ccfb206a6875d2752fc6ca4
+EBUILD kodi-pvr-hts-9999.ebuild 717 BLAKE2B 608c5b0c36f6e11aa795750917c09d173da71eaedd4c832aa9f9f774f88ff359d6f65cb325fb551586c55e00ec7da3b33b40bb331e9ca95a351993cc5cfe0308 SHA512 e09a7f80ee71f394dc59b2dfb69607465a21ace4a0e906d1f84914481661cb46fb998575205859cda8bb28f99775fea53d58d3dd9d7ea27d45497e37e602a72a
 MISC metadata.xml 529 BLAKE2B 75957634fa1689db9429bec1f25738c6700813d2714a4c80a4381fa9dec88a126144ef661cbdf1ba7ceb94cddde73bcdc376714abd08f9c205fdc8156e3fed55 SHA512 e6eab8498b684a786e899769dca6949b3252e7534fed233cf7b59f9eef8de4180b676445f455d1736713738c4ebbbbc3e761e8b2af86e386b93e20cfd04f0439
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
index 2e9cd82c3232..b4b0f32502bc 100644
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 645aff50332d..0426d65d621a 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -7,12 +7,12 @@ DIST kodi-pvr-iptvsimple-3.8.6.tar.gz 125160 BLAKE2B ad20bd14863ad9f06e6ebd90fcb
 DIST kodi-pvr-iptvsimple-3.8.7.tar.gz 125188 BLAKE2B a679f45653c88aa113cafbff074d8ea064682baefa32eb5b802921c0c72f8b30a3947a02b782859f838cddeb382c8c80d39a581380c6de4b30eaab0e6ecc0b94 SHA512 76e7627789475979d3a7534082cbf60b00323d1b0c8bf02c9d74a4f224d00d4cad5324fa8d3c3a72b107ffeb3b7e68528d2b851cbd13d220f2cac0c10e4f47f1
 DIST kodi-pvr-iptvsimple-3.8.8.tar.gz 125231 BLAKE2B 9e887261295f75c96095c9566e5c1a555bb62a2ad97d7527efa9d294c4e392058f99f5205b32a7b4eda949ed0f9f49a288df656777dfba87c243528e74ac5277 SHA512 32c95c2e314eba3c4871c50fdc024be276874b790339c5b558425bb960080784533dcbadbab64c7b76b598c08bfca384fb3b1fa618447eaf30870e296d4c5e46
 EBUILD kodi-pvr-iptvsimple-3.8.0.ebuild 759 BLAKE2B d093efa3739157820d9a53f361be71540be969b1ca00a5ef798c61b54d5573095710888c16f2b940e1168e684319fb84607bbb47af7ed703c1fed047960b376d SHA512 e2ff98d231306be33cefd09631d4f512452e62fb46be55e246ba671feeddba96e5b67375f8f7bfade6c12be189d6a50eff35ab0e065165c5130a42ee2f00be49
-EBUILD kodi-pvr-iptvsimple-3.8.1.ebuild 759 BLAKE2B 6b88bf7741fef30da54284619e67040fbed0ed6483d5bbf07bb0c15b85c58b72ed589b2ea0d0174c939e292ee7eaa23be13ccb3dbb88584b3afa6d3511dabc56 SHA512 6d29a87b883af2fb52dc661ac03aa5479c581f250c3662c221dda66e4746b9af1aa8e645e0c62492077e83b11e5c496f1ed30cff41e32d92d17b2f071e84d819
-EBUILD kodi-pvr-iptvsimple-3.8.3.ebuild 759 BLAKE2B 6b88bf7741fef30da54284619e67040fbed0ed6483d5bbf07bb0c15b85c58b72ed589b2ea0d0174c939e292ee7eaa23be13ccb3dbb88584b3afa6d3511dabc56 SHA512 6d29a87b883af2fb52dc661ac03aa5479c581f250c3662c221dda66e4746b9af1aa8e645e0c62492077e83b11e5c496f1ed30cff41e32d92d17b2f071e84d819
-EBUILD kodi-pvr-iptvsimple-3.8.4.ebuild 759 BLAKE2B 6b88bf7741fef30da54284619e67040fbed0ed6483d5bbf07bb0c15b85c58b72ed589b2ea0d0174c939e292ee7eaa23be13ccb3dbb88584b3afa6d3511dabc56 SHA512 6d29a87b883af2fb52dc661ac03aa5479c581f250c3662c221dda66e4746b9af1aa8e645e0c62492077e83b11e5c496f1ed30cff41e32d92d17b2f071e84d819
-EBUILD kodi-pvr-iptvsimple-3.8.5.ebuild 843 BLAKE2B d5683527d29536b957b7ec679ab35e8c394b77a8c97d3ea9da9b81e3682f2ad48264a52f203b18010c890637f80bd5c91dcd1c48e945855fd691dce143feb92a SHA512 6d3ef8a95565159baa21e58e133006a3e23a72f26e4998d0711a518c9ea5798db9f3cc0f2634ecc4ee14b74180fb1432b36ee1f9d89e56e2ef25f0eabda2583d
-EBUILD kodi-pvr-iptvsimple-3.8.6.ebuild 843 BLAKE2B d5683527d29536b957b7ec679ab35e8c394b77a8c97d3ea9da9b81e3682f2ad48264a52f203b18010c890637f80bd5c91dcd1c48e945855fd691dce143feb92a SHA512 6d3ef8a95565159baa21e58e133006a3e23a72f26e4998d0711a518c9ea5798db9f3cc0f2634ecc4ee14b74180fb1432b36ee1f9d89e56e2ef25f0eabda2583d
-EBUILD kodi-pvr-iptvsimple-3.8.7.ebuild 843 BLAKE2B d5683527d29536b957b7ec679ab35e8c394b77a8c97d3ea9da9b81e3682f2ad48264a52f203b18010c890637f80bd5c91dcd1c48e945855fd691dce143feb92a SHA512 6d3ef8a95565159baa21e58e133006a3e23a72f26e4998d0711a518c9ea5798db9f3cc0f2634ecc4ee14b74180fb1432b36ee1f9d89e56e2ef25f0eabda2583d
-EBUILD kodi-pvr-iptvsimple-3.8.8.ebuild 843 BLAKE2B d5683527d29536b957b7ec679ab35e8c394b77a8c97d3ea9da9b81e3682f2ad48264a52f203b18010c890637f80bd5c91dcd1c48e945855fd691dce143feb92a SHA512 6d3ef8a95565159baa21e58e133006a3e23a72f26e4998d0711a518c9ea5798db9f3cc0f2634ecc4ee14b74180fb1432b36ee1f9d89e56e2ef25f0eabda2583d
-EBUILD kodi-pvr-iptvsimple-9999.ebuild 845 BLAKE2B c3ac5157d0f6d9e875ea00773a7be14ff7d9ee123333eb2b24941ee624dbecebad2304a2d629769df1e83ca9a0f569b637664095d8f71aaf4ac519cbd341df47 SHA512 831939d45d2b0e12b0ccf1dc4deaacd6ea8202885f6e6bbcaadce766d5e008ea6b787c219659a5a21a970336ffea7e4b74f3268d34745fe2051f17707d51a8c5
+EBUILD kodi-pvr-iptvsimple-3.8.1.ebuild 753 BLAKE2B dffc0ff83d15eaa20a81964ae5c11ec21aa6959f9bb3b49dc1820c3fea0e637091c5d59be02e4c69d91659d685876b6ede35008fbd7fe5fb47ec9a4f136acdfc SHA512 1565c45a9baa4f2f82dc87113be5bbc3296905ea20e19b00914b5b3bbf5784661c169b96fea484917e443317608153c6817894fd598a5f614f26ec49acc7ceee
+EBUILD kodi-pvr-iptvsimple-3.8.3.ebuild 753 BLAKE2B dffc0ff83d15eaa20a81964ae5c11ec21aa6959f9bb3b49dc1820c3fea0e637091c5d59be02e4c69d91659d685876b6ede35008fbd7fe5fb47ec9a4f136acdfc SHA512 1565c45a9baa4f2f82dc87113be5bbc3296905ea20e19b00914b5b3bbf5784661c169b96fea484917e443317608153c6817894fd598a5f614f26ec49acc7ceee
+EBUILD kodi-pvr-iptvsimple-3.8.4.ebuild 753 BLAKE2B dffc0ff83d15eaa20a81964ae5c11ec21aa6959f9bb3b49dc1820c3fea0e637091c5d59be02e4c69d91659d685876b6ede35008fbd7fe5fb47ec9a4f136acdfc SHA512 1565c45a9baa4f2f82dc87113be5bbc3296905ea20e19b00914b5b3bbf5784661c169b96fea484917e443317608153c6817894fd598a5f614f26ec49acc7ceee
+EBUILD kodi-pvr-iptvsimple-3.8.5.ebuild 831 BLAKE2B 4bdbf60ebae826feed6e31e7ef5e4cd22615f475bcc4faafb70043e8eab525887887a04b91cde299e797babbc6227eff13e1666773aadced2c432fe87612a66c SHA512 607d608960650978c0eaf5292940b7ec3b54936930658236ee650594b55c3f05d146f08b39b73b0aa9aee4993c33ac24e5e2bf5b7d7be717b3ef55febc66f8b4
+EBUILD kodi-pvr-iptvsimple-3.8.6.ebuild 831 BLAKE2B 4bdbf60ebae826feed6e31e7ef5e4cd22615f475bcc4faafb70043e8eab525887887a04b91cde299e797babbc6227eff13e1666773aadced2c432fe87612a66c SHA512 607d608960650978c0eaf5292940b7ec3b54936930658236ee650594b55c3f05d146f08b39b73b0aa9aee4993c33ac24e5e2bf5b7d7be717b3ef55febc66f8b4
+EBUILD kodi-pvr-iptvsimple-3.8.7.ebuild 831 BLAKE2B 4bdbf60ebae826feed6e31e7ef5e4cd22615f475bcc4faafb70043e8eab525887887a04b91cde299e797babbc6227eff13e1666773aadced2c432fe87612a66c SHA512 607d608960650978c0eaf5292940b7ec3b54936930658236ee650594b55c3f05d146f08b39b73b0aa9aee4993c33ac24e5e2bf5b7d7be717b3ef55febc66f8b4
+EBUILD kodi-pvr-iptvsimple-3.8.8.ebuild 831 BLAKE2B 4bdbf60ebae826feed6e31e7ef5e4cd22615f475bcc4faafb70043e8eab525887887a04b91cde299e797babbc6227eff13e1666773aadced2c432fe87612a66c SHA512 607d608960650978c0eaf5292940b7ec3b54936930658236ee650594b55c3f05d146f08b39b73b0aa9aee4993c33ac24e5e2bf5b7d7be717b3ef55febc66f8b4
+EBUILD kodi-pvr-iptvsimple-9999.ebuild 833 BLAKE2B e02316499d45458d211c2891a37e242d1872575a2cedac372b8f7161575440b3a1befae60a680d9fcab2afbb150478deed2701e5d0f7aea12336e65646c60d60 SHA512 17c5a3697fce856b0c288f13c879c161c8abccbc7c50d79017457fad1cd30c6a53274fe42710969040a326a69fd5573cadeb185ede74c13227ec61cf848c0461
 MISC metadata.xml 436 BLAKE2B 657769c7828eb3034e2d71aba8377aa2f7d9e4d314904e24e17f08659c2e58ade1c24d1903b9b30c5f96322c4c9ab85c92fceb41c468afda496d52bc9f4c5a7e SHA512 a60cfa34672d7940ea934fbc3dc6c2b0e11c0ff59cecd7d41dae08d040172c65e70117748ced3a74c5a772af9ebd00259e91db26cb73d635502d85ed48ff4538
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.1.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.1.ebuild
index 939caa2844b9..a049d98849ab 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.1.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's IPTVSimple client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.3.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.3.ebuild
index 939caa2844b9..a049d98849ab 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.3.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's IPTVSimple client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.4.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.4.ebuild
index 939caa2844b9..a049d98849ab 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.4.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's IPTVSimple client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.5.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.5.ebuild
index 2fe768383e51..3a7648ae6ff8 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.5.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's IPTVSimple client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
@@ -41,5 +41,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.6.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.6.ebuild
index 2fe768383e51..3a7648ae6ff8 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.6.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's IPTVSimple client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
@@ -41,5 +41,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.7.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.7.ebuild
index 2fe768383e51..3a7648ae6ff8 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.7.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's IPTVSimple client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
@@ -41,5 +41,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.8.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.8.ebuild
index 2fe768383e51..3a7648ae6ff8 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.8.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's IPTVSimple client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
@@ -41,5 +41,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
index 50ce43f2a41c..ca417deb565b 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's IPTVSimple client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
@@ -41,5 +41,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
index 7a057bda4e03..953e455ee985 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
@@ -2,5 +2,5 @@ DIST kodi-pvr-mediaportal-tvserver-3.5.16.tar.gz 398113 BLAKE2B e944a49bd5d996d2
 DIST kodi-pvr-mediaportal-tvserver-3.5.17.tar.gz 398338 BLAKE2B 52ed303aa236fb77bb5f79709f322b980aa29ca4e5077efc20894b610eaf81bd0d6f2a23de72bd3bf768ca0d819d57b920573515e0b134465b4f5399db966f35 SHA512 916d3a2f5ef8802a49c70f62bfb94145c3aa8f140ff3674ed3fef21c4d644a85a0cfb1088f1fc893b677635263f47455c0ffbe6554ca484659a1b7c8ebd47207
 EBUILD kodi-pvr-mediaportal-tvserver-3.5.16.ebuild 767 BLAKE2B f8939465576f2c6c1fe7e4af9ddfba7a7c3f44740067fd9553ac716b2594a3d2898397efef7bfcccc815eed426a337ff74e627a9d76f0b0ef31f8f5e70515192 SHA512 7dc343fd3968611ee08aaab6dd5ce70cec1bd5f0b36bbd5be354323fcf287a3e7004119ae7a3be48953505d7c2b8ad6bf196e360275e39b0c258eaa86696b23b
 EBUILD kodi-pvr-mediaportal-tvserver-3.5.17.ebuild 767 BLAKE2B f8939465576f2c6c1fe7e4af9ddfba7a7c3f44740067fd9553ac716b2594a3d2898397efef7bfcccc815eed426a337ff74e627a9d76f0b0ef31f8f5e70515192 SHA512 7dc343fd3968611ee08aaab6dd5ce70cec1bd5f0b36bbd5be354323fcf287a3e7004119ae7a3be48953505d7c2b8ad6bf196e360275e39b0c258eaa86696b23b
-EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 769 BLAKE2B d509027a696d3a3073631217861bff99c08c088b1c734bb30b81c66573274239984399e1183f831bedf6ce5da9c36ff82be5fcc066aafd035dfab0a5f247a7f1 SHA512 3d84ad37d4eda7a45db8c8c6334dc09379f1684232ed4da488c5259796b51a6bae151cb964a9682db87a4d3246b0afe205cb6d153ae6cd73cfe6638ba185f1c8
+EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 763 BLAKE2B 440545c71264ee5f15ccc91997f2f0c9025e65664d894cfbe1afe9dbea9086ba820431a716585a175aebbf21bab47548aa654e9d20f8f126e81d84961e88575f SHA512 37cffeb50881850329ada74cecc2a54a1da6a61c2aae3c02ae33a98acfdfe96d67f5634cdc0f1f6391fd9138add86125232aa3c89d1dd4d0270d71d1e9a42cb5
 MISC metadata.xml 456 BLAKE2B 79a150e9808ea82b402897e6b22c8da560055cae8a82dd38f2564895f417edb195720ddf7c9823eb9a001a8b9fae1626cc9704032b571c4f2e60906767b501b5 SHA512 dc787d33279a0b9f0fb8290f722f25f7cee998781de3d4d7bc16bf24ed0165ba0f967eee97a6e03865b5b3822952b545debd8ebec9f7dc0c18e1bf06b2486121
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
index 7a797bda8176..be92d13bcecf 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's MediaPortal TVServer client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
diff --git a/media-plugins/kodi-pvr-mythtv/Manifest b/media-plugins/kodi-pvr-mythtv/Manifest
index c070401b5218..16c446661dfc 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1,12 +1,4 @@
-DIST kodi-pvr-mythtv-5.10.11.tar.gz 702648 BLAKE2B 7653811eeba607d642340349a9b3d59f14e3f9da764af542e8e5daf0c742abcda312692881918c69dc26d27642af44feed6e7569bd763472254921403e8fd376 SHA512 792943ea1e4e4bd8ea8e484d055cc5a3850ab5c873f1494b187fa9ecd944801b4c74d575754e687ff45fb6c1936b4064c0eabb8edeeb146c6ae617cd14dde555
-DIST kodi-pvr-mythtv-5.10.12.tar.gz 702668 BLAKE2B 3fa8e208e65e1c3242e936df5eaa143fcbd78aafe98df0989a1065de821b6865c309889b7a128c53f8a3a713a1abd704afdaf7b97fc182f6a18eecbd34b3bdce SHA512 ec4e489f7a926ada36f76ccc65b30e4f1b13299fd5a30ce86b276a4bd40938f1e10e4a093c3c1cc3dee7d929d24ec933625b2c679a3b8d3ae6631db2936eb0a5
-DIST kodi-pvr-mythtv-5.10.13.tar.gz 702741 BLAKE2B 3de267c4fbdaf9382abc7f64120ec219fe4fc20f98480020280c0ac4a9a1afc6dcafb6fbb41a552ae42b18f8f0f47a34baa4374a55a621013f9bb3c68d682a68 SHA512 8d277d4be61a8041c96f45a6cddcba32da9ebc57b5d07e747a41e2d740c2d1f781dcb438a3e2dbe3d729cacc5144ca0afac2164b68917d337282093371449f54
-DIST kodi-pvr-mythtv-5.10.14.tar.gz 702729 BLAKE2B 5ba7397a55403f865e276da42e6bcf5c8be754def2ef624468b72ff9be9fd1d8074f5af99447cdc936fe6d4e07215db5b9187fd14a30efe385c929bedfb41391 SHA512 2432eaefd0be0ef1268cee1c177c283d4df40f9776b8d45dd2f4f2fab4427068e6397cfd737ccd02fb2106582bbbcbc2347855ebe3788acf1d41cacbb21ae955
-DIST kodi-pvr-mythtv-5.10.9.tar.gz 702493 BLAKE2B 457be0137a95d1abe0ad4a5634bcf21bad8d2f9261879468e2c5ba598a41b7eb71ed1bbf9992f45db8ad82d4da25bf87067199c57e71b64c9255608350874a2c SHA512 b497f79de6ca42638af0ac3c76c18343236db26af2901b60f49ddc71f9c0f4c68c293a50dc57a80e0ecf81df2629ad7695a842e63e1e8ebc2b22de082a5e39c6
-EBUILD kodi-pvr-mythtv-5.10.11.ebuild 680 BLAKE2B 66b37356d675cb42969d92ab77bf2f0583d671d7002ccc180c721556458cb3b325bc8ec4f4d23ed9089754d2c6e07b09ae98c6b0318479c954979bae1d6af64d SHA512 497511d5ebcaacfbe8e406de0e660f97014e411dba76c45b33c19725264c1b2a912c29aba0f8ec4403634f91b0769db96132dff8dd230b8b7a1ec4ffcdd4b22c
-EBUILD kodi-pvr-mythtv-5.10.12.ebuild 680 BLAKE2B 66b37356d675cb42969d92ab77bf2f0583d671d7002ccc180c721556458cb3b325bc8ec4f4d23ed9089754d2c6e07b09ae98c6b0318479c954979bae1d6af64d SHA512 497511d5ebcaacfbe8e406de0e660f97014e411dba76c45b33c19725264c1b2a912c29aba0f8ec4403634f91b0769db96132dff8dd230b8b7a1ec4ffcdd4b22c
-EBUILD kodi-pvr-mythtv-5.10.13.ebuild 680 BLAKE2B 66b37356d675cb42969d92ab77bf2f0583d671d7002ccc180c721556458cb3b325bc8ec4f4d23ed9089754d2c6e07b09ae98c6b0318479c954979bae1d6af64d SHA512 497511d5ebcaacfbe8e406de0e660f97014e411dba76c45b33c19725264c1b2a912c29aba0f8ec4403634f91b0769db96132dff8dd230b8b7a1ec4ffcdd4b22c
-EBUILD kodi-pvr-mythtv-5.10.14.ebuild 680 BLAKE2B 66b37356d675cb42969d92ab77bf2f0583d671d7002ccc180c721556458cb3b325bc8ec4f4d23ed9089754d2c6e07b09ae98c6b0318479c954979bae1d6af64d SHA512 497511d5ebcaacfbe8e406de0e660f97014e411dba76c45b33c19725264c1b2a912c29aba0f8ec4403634f91b0769db96132dff8dd230b8b7a1ec4ffcdd4b22c
-EBUILD kodi-pvr-mythtv-5.10.9.ebuild 680 BLAKE2B 66b37356d675cb42969d92ab77bf2f0583d671d7002ccc180c721556458cb3b325bc8ec4f4d23ed9089754d2c6e07b09ae98c6b0318479c954979bae1d6af64d SHA512 497511d5ebcaacfbe8e406de0e660f97014e411dba76c45b33c19725264c1b2a912c29aba0f8ec4403634f91b0769db96132dff8dd230b8b7a1ec4ffcdd4b22c
-EBUILD kodi-pvr-mythtv-9999.ebuild 682 BLAKE2B 47852fae69c4351fc4d5a25d34f7f4fb327bd1093b28476985b0b99d7e73de016a84cc76f48ee6912ed28002eef83c8855d8556d84f09ab3adb650a5429713f4 SHA512 4803880b777e613c728e542265078e41ea076bc101c4c5af3bfb78902ac4b0bae0a6aafcc0e744a4e2e1157828e961c03adc780c116d8811904c2c0fb1625039
+DIST kodi-pvr-mythtv-5.10.15.tar.gz 702682 BLAKE2B 54ba8e4883dbdae88071b1b69a4d489d384c95911bf1113e944b9a4528f8349ff044a1440afd05b3657c8131c4738264f366a7a63bf8606ce6f796c143743f37 SHA512 bf7e4d6fc1436fc01596a4587b4334e495b72e4fdc9638393c94bd289c9f58065ad5d61c87ce109d727a0d656873100da050b8d395e28aac5efe567da70839e8
+EBUILD kodi-pvr-mythtv-5.10.15.ebuild 674 BLAKE2B 8cbe86d07d447b078076dcb69cd4dcdf1338c01c7924277446ff07253d4ab10496fce89acebb55b0f9377261f22ecace20f82ab7a3be79bbd08d9c87072184f6 SHA512 6b6929052c87b85c8950ae075ce8077436a2a6715719ece104d43f4ef890a1433eaa4167d8ffbf10ad39b3c1cc31befb56a0fba162bc3e5c0c63cb926b98b5df
+EBUILD kodi-pvr-mythtv-9999.ebuild 676 BLAKE2B 6cb47d73388183aaad78f252b72ecc6f457fab57eac5abcf6184cf08c21fd75c7a33cd128dad3b071b780f209c85cf14ab52fb359043be553686ca5fe749b805 SHA512 38c703fc7044944b2f527122912fc8aa6ba75386eef912ffb6df143f1db481951761ee5746d074d44dfbe253e7969e8b6ab574b63e0fd8eefd3058603c86d655
 MISC metadata.xml 419 BLAKE2B 71f7f4424dbf1c992fab169ce530ce61ff39399842089905618bfc800011ed7960c92428cb9e6e89b084872fa61d08da8df0c4179c483ec6dc2ab745d684f15e SHA512 5b6c21c0e780ed90e92fb080f0a15cf62fee13e8b8597081f7b5480eb21f3f013495aafb389a302a227e6e22b757cc6b83d3dd56d7cd74ed16587edb09ef871e
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.11.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.11.ebuild
deleted file mode 100644
index 4ff772b69275..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.12.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.12.ebuild
deleted file mode 100644
index 4ff772b69275..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.13.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.13.ebuild
deleted file mode 100644
index 4ff772b69275..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.14.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.15.ebuild
index 4ff772b69275..2211824cdbf2 100644
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.14.ebuild
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="MythTV PVR for Kodi"
 HOMEPAGE="https://github.com/janbar/pvr.mythtv"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild
deleted file mode 100644
index 4ff772b69275..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
index f829825e052b..7d7c00bce618 100644
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="MythTV PVR for Kodi"
 HOMEPAGE="https://github.com/janbar/pvr.mythtv"
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index 60f0a0776689..d3cebe269edf 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,14 +1,6 @@
-DIST kodi-pvr-nextpvr-3.3.11.tar.gz 119455 BLAKE2B 1a1eaedaada67267ac63776e0ff4c668a6f2484c73e37ce94cc825ac07507fec3a4d4970b556bff1ab8a0a74231b38525773492b91cd4ed4bba98b213a15b9ea SHA512 145c71c0eeb7b9cea03b1fa1c4c18f6b69e6d775519e1565160efd32a38642eb351b608fb54f285281a36ee4841e8242e1ff7c2aa384dbee17dabfe8ba13bd65
-DIST kodi-pvr-nextpvr-3.3.12.tar.gz 119592 BLAKE2B 6522790e6bb6dabecd010d34fdd1ee9590b541e8fd5a539f586cb81635f5f3729f813514355306042180e7482d0e1c350639d285ce591fc1c35d560e50f903e2 SHA512 bda38c256a9d49f72ec6c8ac9942670942edd8ac095c5f6eee120f52189a9d5466c28f2a7dcb525987da5df05d5ebc4e3b2d93778807370c8d16ac936c616293
-DIST kodi-pvr-nextpvr-3.3.13.tar.gz 127574 BLAKE2B c2460352ce24099553a2610002bfb499555bde180d557dd19fcfd905bd4a38ddf7c6f9cc4e53636287197690b778eaf74afafb78c44fab1cb24a20df709e6648 SHA512 b75bd7d127e3e3f4e103dc9dfd3f681706c298c1d216904c0c0088cf8a02301b3dcaee0d0dd976568c14be59c78e8d98a60d0806465b08f130452c52cdb836cc
-DIST kodi-pvr-nextpvr-3.3.14.tar.gz 127995 BLAKE2B bacf139b2d7338db08016cc81e66cad1716c686d3f45b71612a591a00653457a47964e6e08727da0fe39da09dcaf643f9da529288a9c6e42db3343842e9a7050 SHA512 6da83088f652710363d7bd37f38328ec364e5313168a6a2c624b34c3276eaf99223d28eb8a2bd90a4e68fa0669aa974fccf979e5bf7a6e61a8b8262c954896c4
-DIST kodi-pvr-nextpvr-3.3.15.tar.gz 128304 BLAKE2B 7df4b212afb4c8a16bba2a31787c88296990055d02a7e249003eaedf8c737d54bff2f5d2ce1b00f0357bfc8cf5ad28f060f22ace192d8e0d1eb9ff69a4cd415f SHA512 27a4e5198adbb4d4465d25086ebe76209b2f311dee422480271f85ae420dbdbaeff54b64330b1e71f1276f1b441d74598d5ee9b94d3652b9013bb855719aff77
-DIST kodi-pvr-nextpvr-3.3.8.tar.gz 118717 BLAKE2B ea72f205121b050355fcd194fc8c28a2bce62504187372128b7397841f03a411d9ae1419aa1cee36acf391e098fed04b58f3312a74cf3dadf48726cd72da59bb SHA512 3cf8de69091946c9678c73f0254be9d49b51ecffe8153f675e62198aa97fa952bc5c1b5a4ccabbf7de5c05e8ca9e0c01d1ee5fd5988504430acec37a5b2edf3e
-EBUILD kodi-pvr-nextpvr-3.3.11.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
-EBUILD kodi-pvr-nextpvr-3.3.12.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
-EBUILD kodi-pvr-nextpvr-3.3.13.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
-EBUILD kodi-pvr-nextpvr-3.3.14.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
-EBUILD kodi-pvr-nextpvr-3.3.15.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
-EBUILD kodi-pvr-nextpvr-3.3.8.ebuild 702 BLAKE2B 6d087756fb0b2e5bef01e78f2e986fddfb4f02c2dfbd8803410d3fb0d1b0e260a2370bc8034737d31ae1e2df2ffcd119fd5d02127b383e1518f674a8b9b87943 SHA512 d5d8320f1fa4f1e3baf3a7cda383d6453a44ca4e1816926212818469d01161f3348ca634ad5a7c95c148fc491fec9ce3e4f2b507b2cf4d07b4cf99960cda4e18
-EBUILD kodi-pvr-nextpvr-9999.ebuild 704 BLAKE2B b5f583dc1c8d853cbf51e5dcb15866aed8d024464ca9417605d3b15936d0db40cda8bb278c940d1dd443e2d57f1e65030e34120653bd60f9c94c66cd73f26824 SHA512 d3b742d8f4f7cfccdce8cdb019dc9ce9711fb75a137ca93d1118b041df93f1c40fd89f165a4fdf4e818ff700b2590c5f44722daa1e4b06dba4f5084ebfcae3cd
+DIST kodi-pvr-nextpvr-3.3.17.tar.gz 129989 BLAKE2B 07a67e38f70e2364ec2ca5f0829a99dac72e0424fa2e2da5f7f0c3f8a6dcbb0fc651d8cafbc4cdbb651c05894741db442e731faa0fbe0a37d72f3716523c2b3a SHA512 1781d76bc5b521752f6d57b6f2f3e3c40e3c1954bfb3168ed3625252392cf99d3f995d755f8db7826c72c535b6e89a540da6004e60e7b5e7875069222dd12bdf
+DIST kodi-pvr-nextpvr-3.3.18.tar.gz 129996 BLAKE2B afc8a582793cd2f618f39f6f48dac37c4d2007b66d5daad5af0fbb0a213c26e9fa1a58ee2b0ab77e8a7cbb005da28af17df22f65df2e093d2250c7f0a04f9609 SHA512 907f355c306534d7d7886be6fd0a62b88fcfbd7672710a31cff3ab9f0329f15ee9b880d58d59ebc98e781409ca8cf8512906ec8827f8a149a1bfd4d72d0b310f
+EBUILD kodi-pvr-nextpvr-3.3.17.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
+EBUILD kodi-pvr-nextpvr-3.3.18.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
+EBUILD kodi-pvr-nextpvr-9999.ebuild 698 BLAKE2B 3e3bf2de1eca0a8be61cb83b000d511e0036349afd0e69eb78e4d3a672fc4284cec464b7d895ca7a9968a7ba5a5c96fb258525ee3ca61009a9fd81f207abf967 SHA512 35aae0b725066aecffd4e2cd6c265f1eeca74432b7eb3fcb5beb67ead05c59486519781f1f5ace64c65181a05da2e6347d839d96b4d064cf4e621e35ad013127
 MISC metadata.xml 430 BLAKE2B 60ef7af47e0cd7d264fd19275a356b83cd9fd4e5ed4e237658c47152315d4abcf807377bd8c94d88ec3088530a5fd9ab2d9482336328eeb9ff380963364644a9 SHA512 b0bd41b39d6e1379e1b3c36124432716cb222205ed587246523a8a48c42e2d9922b1b24c87ef601bf5f7452cfb874710c1ec7b558b9224c95c921b80967e02e3
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.13.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.13.ebuild
deleted file mode 100644
index be53994bd0ff..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.13.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.14.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.14.ebuild
deleted file mode 100644
index be53994bd0ff..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.14.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.15.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.15.ebuild
deleted file mode 100644
index be53994bd0ff..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.15.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.11.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.17.ebuild
index be53994bd0ff..be53994bd0ff 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.11.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.17.ebuild
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.12.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.18.ebuild
index be53994bd0ff..4d0ea1ef9733 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.12.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.8.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.8.ebuild
deleted file mode 100644
index ddb345ee8d03..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
index 3055e0e70599..2754d05ee249 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's NextPVR client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
diff --git a/media-plugins/kodi-pvr-njoy/Manifest b/media-plugins/kodi-pvr-njoy/Manifest
index f5d7636cf234..8e664b2b3e62 100644
--- a/media-plugins/kodi-pvr-njoy/Manifest
+++ b/media-plugins/kodi-pvr-njoy/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-pvr-njoy-3.4.2.tar.gz 47637 BLAKE2B 258dc10c06b68b6812b320aab5236a2ddb3f565ce616efb9ec6cc7710f60b58c24b827b61109af89e41430d4ef33a1daf6cb526ad8d449b954589c82783f5035 SHA512 5f30afb07c8c683920cce9acc2aa182273943e1381304e4e17f396fb42f1c464884e9134f507d7e787d9f271d24193eeb20c72870d2c7012a07aef94e1a686c4
-EBUILD kodi-pvr-njoy-3.4.2.ebuild 690 BLAKE2B 6cef3885570f60230d5207fb4feae064f6eec1285c045d8592ceb46f85d8ff71f5421d74340af6d732279ceb8e0b5e96956f086711b574ca41c108913fb0de9b SHA512 ebf3c386ff7094c317fa221dd64f7a98b9335c0ad4d994885f3e04b5f9357091b163afc8705eb6f0405729a52896f05798d589fbf493eea2626ca9462b902dfe
-EBUILD kodi-pvr-njoy-9999.ebuild 695 BLAKE2B c769f1c1a51d29d507b56a6d9a930a9ee433d1852ef351c5418dc82d7f2c3687c0d91bd20037efb37339eee47faf37a86a777192dcae3fd28a2c5babd08d6d5b SHA512 98cd6dc241e0a6782b761975b7d0c718b96ce72022612d17a32a17da4e58e7a4cb76e33231481e5ba4b800ea245889bef39317ba5ee05d89f83238d56805d277
+EBUILD kodi-pvr-njoy-3.4.2.ebuild 684 BLAKE2B 5358de20dd7e07ca02d9b3f4c1cda60db118657e081c132c4ddf5af59e0ef8a54152b4c6a9585d6d9b0e5e5d0c1dd8f248f2589aababe7643afb1e35d7ff2ff0 SHA512 f611f2098ab9987c7b84091618de8436e6701c675d5870be8064bac1a9509bbbf080bcc2f5549c4e410915fa04687265dc25ce2171b580e7d461005fa5650f92
+EBUILD kodi-pvr-njoy-9999.ebuild 689 BLAKE2B 1f9d650001ad47470317c499a4ca83a4633361887ef15afc6852e7093b82861dad411b234d3bfc318500455c14c1e33499e3769f216cd770627d444931a30108 SHA512 9c85c67434f1167cb21c4c56b29bfff2ae166287d46a2617d343b804b4aaf08bdd12de5218c272ef0daf647608a7bdbfaaed87d5452a5ef88a65bedec140b91d
 MISC metadata.xml 427 BLAKE2B 8fbaad407c2e34375e6dcb350d39071fe3b022e4d2799fbe97746d2afb7f80fe70f4ec51161bd3751097c4de98da76b07a79dd1cefaf9bb5c449beb4faaa5817 SHA512 4e03412ca3ca3e739de135eafb479c6479f0260f2bab7a69cff6913556bf6d101f306388fbcfa0e61b3c8037ae39f08d246106fcad3d0f8281b3259f6d2a1c36
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
index 7554c5d1acae..0b92ad8f0f34 100644
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
+++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's Njoy N7 client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
index 959e619083ec..615c455a8b63 100644
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
+++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's Njoy N7 client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
diff --git a/media-plugins/kodi-pvr-pctv/Manifest b/media-plugins/kodi-pvr-pctv/Manifest
index 3383069fb2a3..17c447415b28 100644
--- a/media-plugins/kodi-pvr-pctv/Manifest
+++ b/media-plugins/kodi-pvr-pctv/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-pvr-pctv-2.4.5.tar.gz 67169 BLAKE2B 99861fadf9fba102fb45b9d095cf8ccaa58ca53b5182f714f8666dddecc43f98ce57583b3e7b3d156aaece9f63acc7fb653d2b3763104c280d9ef30dfff6d664 SHA512 288446a04b9dca623ab12759500123d3bc548b131a3cf6757431e99571611834408da2918085d52c29380e5d5f856a6c4dede7a9793ac427123291346a28ed62
 EBUILD kodi-pvr-pctv-2.4.5.ebuild 687 BLAKE2B f794a38cd128e6693c201becfc7c50743c47b28bac56724800490c8a707f72c39975ab26a16198d26a71a41c7a3e1860a9d3d95ebab1c28b255aa1e807d59e91 SHA512 2d853652a23ba3be606befad46257b9173c63b5ab1852f5df5fd4545eb41653ebb38fd48726c4e55bc4cdf01b98d8dbddc76b796bd3d775cddeb5b59a0c88ca6
-EBUILD kodi-pvr-pctv-9999.ebuild 689 BLAKE2B b3ea9f0a6c214cb886770a7b55df9c7f2cc73cd2a8c2794fadcec78ae58d2635ce6c954cd72251c383d018a3b706093e308fa27082a1612c38a59e6f3d4dadc1 SHA512 9c832096efb7287e2ec488f8aedcecd3082df32c65dcd52d3b854e48111dfb1bb66eaabc53288ae3b1bed3d4460059bf3becc1b4106068bddf5c7456c1ccdd8c
+EBUILD kodi-pvr-pctv-9999.ebuild 683 BLAKE2B 313330cd552eb4ab735e9119a374571e8d5ce1064e8dfcda19f5ba0f741c976b30a073720331a3b9eeb00cc217d0b994f89a006ec65c598412fc0b4946611a77 SHA512 b2fae57837d7e866f81112e24f7d8deacf6b342ec012cc291c434d44ab12feff4b37c434a1a150a9f4d51fde90c2b08499f316c1cac726e7dad0c1ffb74c160d
 MISC metadata.xml 424 BLAKE2B 0637f01f1175e2d607d0e590535ef8d262173f71d42c265b5225d396bfe9783d03b6a231de1f75a9f548487769db28f9b9988ed27aadb5838ad5b37734405959 SHA512 91f472cc7c5eb36bfd24c3565a0679af173643011140133c98f6782fc6a14aef3ac30f30e86429bbe0b361c696998fca96ea968f97963eb08a64d14655f1b344
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
index c1d659d31e3b..35866d578b8b 100644
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
+++ b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's PCTV client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index 33e10ee7dab3..25318fa4d0d2 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -1,8 +1,8 @@
 DIST kodi-pvr-stalker-3.4.10.tar.gz 115715 BLAKE2B f1d0f5a756c17df7a84b24637a55717995abfa6c9e5cccfe660cf9c8ea6d53e5a7766fd44a1eb6778c1c536ca014a8a43806e9af95e0b88688e92d146f67c890 SHA512 fa7912899dd1bbefdbbc31ad936b863ae9ddf33aee0ea2cd4f1708be8424d9d7893a45f2f7a3fe6714f3a59890bdb9b3984a802fddfe43cff746303ee1121d0a
 DIST kodi-pvr-stalker-3.4.8.tar.gz 115254 BLAKE2B 865ac0123b54369bbe73e67855d915efbd3af82d9cac5669099895efec8410eee7acf8d20f6904a0b939bdbba0feab8ec7aa3e953d816914407673c2bebd3c05 SHA512 f4fd2965199a0a5a31b37c2afa60e3cd6746c25dcfa80d8ddbedb2236b92f3c243dddfdff92fd9e6ffafd434c53124b89b8bd2c636856c62cb78b84e446a3292
 DIST kodi-pvr-stalker-3.4.9.tar.gz 115275 BLAKE2B bd9df715d3f5e630d4a47fe24f24515085f8a6a151545c27d5bc6b3bf4e4876672cddbd7c2d6fbd6a999b285afc6a48a29030ac72b4ed32cf10e8448235ef0b1 SHA512 16107f60529b4ef3730f7a3deb5a7cd9ee645678647248d2fff01dbc94dc7a53029a67a3709955a9be8483a13e13048dadf73a32489725b60b5c07c3a0b6a979
-EBUILD kodi-pvr-stalker-3.4.10.ebuild 804 BLAKE2B 59a3302d9c903ee9d74996fbc0d2e3d9afe98225f7cff810db458183ef0ae5262b5078fc431fbe292c910803331fd04d7d183d9e1637f9c7090de84d29d4fc62 SHA512 4f90c7ae9c4615952e1988ae7f4e6c581fa8774f67c183231a0ef9b951b77cad05eca09b4f5169df0c1a37e4153992fcddce74fefc0d8d3963f8912b35eaac69
+EBUILD kodi-pvr-stalker-3.4.10.ebuild 792 BLAKE2B 50a31c034a4e015c4d05d1383f17ccec5d9185203315fb933a0ae6542cef1959814b502e2b0967788bec8fa7e60c078698ab93af5b6fd02d92b1a05d1e9799a2 SHA512 48630f49f2ac4a85afa8250dd114d4cbbb778fac436ef6fc7b0c77c908a8f652bba709331211f37792a92abd3cf01dbcb017fec704acf026bb2c9cf9e788c6d9
 EBUILD kodi-pvr-stalker-3.4.8.ebuild 720 BLAKE2B b343088cf996082adfdf0fe0eabdaf2306a1574f47174896aad8da4a0ec8005315d3d764681ef8db07d12b31510c010123f915e9a55b1c4bff57fc6f28066f1a SHA512 d343af5481e62426bd4dac77c778296be9c09561c7ca0789145607b55f47333ad20a79c6dcc5ade746b925eafb9a55afca3c4f0e55dd92a586c35f67ddf8af0f
 EBUILD kodi-pvr-stalker-3.4.9.ebuild 720 BLAKE2B 43b023fbde024a5d62b884936eaff910983d90a3d391226b71a4f7f24903fb554fb7cea228ada1137292779c49a8a55699d96d956ab8c1bac05e9de10778d05d SHA512 327f30ae993028aa4c18c14525999ec9bb8da0bafe8567a6ad1a88b821989d84e8dffe59e8c43c239ab0e67167e3d4b0122e5cc5e033be4e4dfb1c8acca5ccbe
-EBUILD kodi-pvr-stalker-9999.ebuild 806 BLAKE2B 07e9a088318100f921d3f82292332213c8cf2d7a9d9fe58671829e03a1969c3da85906b3b98b9fe2a9d9367ee864bfdaabadb4de5103aea769ea83cf406edc7a SHA512 2c776f108db67fe21610440ea2582869b4575036bddac297a5aa0158ed7b98b6f1a9e172ecb2b5ea442874c006edc5934b8ee49a9180a94a80b155273c73c77f
+EBUILD kodi-pvr-stalker-9999.ebuild 794 BLAKE2B bc8b6bbd25a70a0ce4117ea101c7ac0cae512d3a2c619fd8ab1f44f4e8207d8223859ab724c8ad59f4e82e860550f38ff36be0dd60b8f6c8f524123d8acef756 SHA512 c1825c7db25edc8f4f649ebdf9a388b5b8c336d3fa81625bce800163936347028d4567b9a03b3b9851017979d43f8f1a6359852ebe723474ab47b0939d8bbcd6
 MISC metadata.xml 430 BLAKE2B 65eb48c9c9d6e307c0ce5950a5e79b705cf5cdb3e1032f97805dd5dec7ed9c302acedac823b4cc9d263156936576257a3097f7535d017f3c4cfb9bfc08b200df SHA512 b461665fc6954e9377b3afd38861852becea318284dd6ff089153679b4fd93dd92523d633299942314e439624d7516c466f57029025a7d4618f1e51919b09263
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.10.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.10.ebuild
index 9ae7e55f3856..18a52f9739ae 100644
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.10.ebuild
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's Stalker client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
index ade1c39778f6..1d87dde51fa0 100644
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's Stalker client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index ce0cdaac2e37..fa84911b2f31 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -7,8 +7,8 @@ DIST kodi-pvr-vbox-4.7.0.tar.gz 159117 BLAKE2B 626ad92be749bc19531d7cf156e426c00
 EBUILD kodi-pvr-vbox-4.4.6.ebuild 708 BLAKE2B becb6df88da03e58ceba1bacf22755e9e61f164fc59304fc9f7202683024d18a79ba1f1d443711950d347ff61c46adb8ed9b358f8074670305e6721c4f7f65cc SHA512 e324b196bd485d805988aa23c2a4895e83da9ea03e7b357b0151201a10046220a1821b67e70ead7ada4cc3c4ff7e53ff6f173a78f1b5ccab2e999b0558ffe7ce
 EBUILD kodi-pvr-vbox-4.4.7.ebuild 708 BLAKE2B becb6df88da03e58ceba1bacf22755e9e61f164fc59304fc9f7202683024d18a79ba1f1d443711950d347ff61c46adb8ed9b358f8074670305e6721c4f7f65cc SHA512 e324b196bd485d805988aa23c2a4895e83da9ea03e7b357b0151201a10046220a1821b67e70ead7ada4cc3c4ff7e53ff6f173a78f1b5ccab2e999b0558ffe7ce
 EBUILD kodi-pvr-vbox-4.4.8.ebuild 708 BLAKE2B 82da36b12438ffe48516af25339aaca3ec0c6c83ff99abc1cfc167ae407c1d559009a2f0be7f348e6997c76caf98ca789b02dfa25b2a0fe4f56cd33b60e8d781 SHA512 59818b2236c903f2bec98ffd83dbf0c97d370f208adf40154440377f4dabf1286acbb3aacf968915e14c4dad53b6f38e88e8f8e034342366553ec03a93dcbc10
-EBUILD kodi-pvr-vbox-4.5.0.ebuild 708 BLAKE2B 12cf5aeb7e20fd6eb079ebb53be081d503a8a1d2171a8051159e4589c6bd534e969c9f4fe2b044fd4faf90fcf6e823343c7993f17bfd1f7755b10fbe1024a143 SHA512 ccc71dbdd428b7480dd364d35c6726eec25c9d8c8c1b4138aeffcb546c0c6cf8a0fec0386f3b6ad7411d1cafe5c8d33e36c61d80c5ceb664ced67728bd4dbfea
-EBUILD kodi-pvr-vbox-4.6.0.ebuild 708 BLAKE2B 12cf5aeb7e20fd6eb079ebb53be081d503a8a1d2171a8051159e4589c6bd534e969c9f4fe2b044fd4faf90fcf6e823343c7993f17bfd1f7755b10fbe1024a143 SHA512 ccc71dbdd428b7480dd364d35c6726eec25c9d8c8c1b4138aeffcb546c0c6cf8a0fec0386f3b6ad7411d1cafe5c8d33e36c61d80c5ceb664ced67728bd4dbfea
-EBUILD kodi-pvr-vbox-4.7.0.ebuild 708 BLAKE2B 12cf5aeb7e20fd6eb079ebb53be081d503a8a1d2171a8051159e4589c6bd534e969c9f4fe2b044fd4faf90fcf6e823343c7993f17bfd1f7755b10fbe1024a143 SHA512 ccc71dbdd428b7480dd364d35c6726eec25c9d8c8c1b4138aeffcb546c0c6cf8a0fec0386f3b6ad7411d1cafe5c8d33e36c61d80c5ceb664ced67728bd4dbfea
-EBUILD kodi-pvr-vbox-9999.ebuild 710 BLAKE2B a56773cc1ea387b4c8a305e0994790d43c40e36f47e16b41ab415112cc2a443ad744e6a6f1d7287ac253c9e59192c1c4b6c2139d298c27fc274f5c671d5ea31e SHA512 d6c7d9adcbbf071f8ee95210f0f18c9b2500d497fb67b59b1c5532eda77b800e68a023558a3233c223c42cdafee07e44463c0981010cd4893d4258d94cdbeb3d
+EBUILD kodi-pvr-vbox-4.5.0.ebuild 702 BLAKE2B f766474463931cd6b136e2e29aac1914055fc8c46084bce8b929690065ce890024773ae4ef906635a8f4ff3ea0df1885e63090aa0300a1d0e5f52c6c72332a95 SHA512 8e0ceaecdd8cb776fe3faf97702c65acb92081871dea230ddfc4889477ccb06f3db0b49c7a864c98454c1c73c0084c7bc7692a3f5daa221f64d8224a90f353dc
+EBUILD kodi-pvr-vbox-4.6.0.ebuild 702 BLAKE2B f766474463931cd6b136e2e29aac1914055fc8c46084bce8b929690065ce890024773ae4ef906635a8f4ff3ea0df1885e63090aa0300a1d0e5f52c6c72332a95 SHA512 8e0ceaecdd8cb776fe3faf97702c65acb92081871dea230ddfc4889477ccb06f3db0b49c7a864c98454c1c73c0084c7bc7692a3f5daa221f64d8224a90f353dc
+EBUILD kodi-pvr-vbox-4.7.0.ebuild 702 BLAKE2B f766474463931cd6b136e2e29aac1914055fc8c46084bce8b929690065ce890024773ae4ef906635a8f4ff3ea0df1885e63090aa0300a1d0e5f52c6c72332a95 SHA512 8e0ceaecdd8cb776fe3faf97702c65acb92081871dea230ddfc4889477ccb06f3db0b49c7a864c98454c1c73c0084c7bc7692a3f5daa221f64d8224a90f353dc
+EBUILD kodi-pvr-vbox-9999.ebuild 704 BLAKE2B 7c9b977aa857c9cc633b79139ed94a949348822d28480ac9d47802dc29fbc0cd2f8f2171c0cfaa6937987021b1c16da9d7f6b926bb1831e57e723dc60f851571 SHA512 73b9289917324ed5d52d05812f1d1b86eabf09b08bbcdea6422c8c5914fef744214792efb8c84a8cfa34e4ff93bd92b96f5a7ca6bcec3e96e5302e4d019f198f
 MISC metadata.xml 444 BLAKE2B c614b42e40b284fb6433935458137624ec0bdb22db86221922d82ad2fdde06eaaef60f430ad871998fc54792a03decb577167a3e1c9e9ea048e0c1fd7faf33ac SHA512 9c7992961c43a1e7bbc60018b282f41796dd8d0ba1127d6cafe0945127c2e65653fad5e47b2f283bf04ef9d3436d8693b6aee31513ae17fc98c245f97c9e3dbc
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.5.0.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.5.0.ebuild
index 6ba25eea26cf..35a66ba98ea5 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.5.0.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.6.0.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.6.0.ebuild
index 6ba25eea26cf..35a66ba98ea5 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.6.0.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.7.0.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.7.0.ebuild
index 6ba25eea26cf..35a66ba98ea5 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.7.0.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
index f5b74f9b320d..221c3cea94c8 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/Manifest b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
index d2f0c8aff04b..c4d6f810179d 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/Manifest
+++ b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
@@ -2,7 +2,7 @@ AUX kodi-pvr-vdr-vnsi-3.6.3-remove-kodi-platform.patch 1916 BLAKE2B 70b5129fedae
 DIST kodi-pvr-vdr-vnsi-3.6.2.tar.gz 145275 BLAKE2B 40f1f21b80411c772b093a4a117522b31d93d3bc87d876154f46cfa58781e56e10d92e0dc67ca40be07a8e3e2b7c1c0a9716bd7a9b81ff21601b921b5a21f343 SHA512 ed76ba60188f513a6c43b21985522cb5e8eb8da3ffdf35ee88e95cec94c078cfc322c2e267a8837626c60242082bd61214c9ec26bff844967ce9f28f1cf885f8
 DIST kodi-pvr-vdr-vnsi-3.6.3.tar.gz 146568 BLAKE2B 375cacf90a8a7fa430f7b06a12397293df3d5aff07ce5c5fc254440bbb2a2b6f3f4e0b49687dd81a069a76801fc6ede3adcca9de11a126bb6ddae9ed7c35f4f4 SHA512 8f060373c43493ccde0e3d199470fcbf9c6e33f0457f31eb64bab4dde06e6cdbce5de0cefc9018aa7d35d8608d74fdf0f2f6e5e2b8d0a741683fa2091b4fe954
 EBUILD kodi-pvr-vdr-vnsi-3.6.2.ebuild 665 BLAKE2B 549c00829a828235bac2455a2f62aada5733940bf13a5cbc02c373cc61c9a4998e13849744b81b1f880a627d528c0d04f5eaabce8b9946043fd560ed92c66df5 SHA512 fb1cb4333073c7b9fee9e7919e975f85f75206e80877c76e6793310283be36ab591cf1054c1f20ecb0d184ef99b860263c749e1e29aeaebe64a3e62ec1e74b5a
-EBUILD kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild 751 BLAKE2B 0a5e074ff4f1494286b71d206c2c8b73de7b0f5691563b10fc80ab4b76d8fcad2e6eae022013c1c300845d14645f52b17352461386c48e40bbfe9c88a283babd SHA512 3f9e0bb8408b01e65921cb4c4e7bb5cc36131edaa15a38cae98cd8c0597199237f46e802151fcf5fd8342487370ca5ac566b7ce8f4637aa191c5689c64bada20
+EBUILD kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild 745 BLAKE2B 42b7c785c83a916d8de762733defe7e6d9a682173b47834e0aa4adc142148e71342a45a600f5b7f04a29ed7d2c626f5fde4691e5f6897c321168c9ddfc62a014 SHA512 e4f6f8ea2b8d7b8583ac8fb72b34de6511ec4953a32b70e1180c3921650eaaa877e16a44d07376a512759cbca3959240f83fd4ca115acc31ac5e66e3dadb44e9
 EBUILD kodi-pvr-vdr-vnsi-3.6.3.ebuild 696 BLAKE2B 616070d579738d34d9f4349642e14792433904b0cf3ab7f826b6c5fda9e29b7007eb4dcbd1854973988afe84cf49dbccd77041600d6686889f1ccb0757c68ca6 SHA512 bdb1549c09488af7b71a8af6e116603eba7c6169ae010d6a505df8451be70cfb4876b0af41ec150084c612b6b200080622b7b923c86e8e22da3fe50cd2d3fa4b
-EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 692 BLAKE2B add62c1fc30da7b3d266462b182d784bfa71f8689ac8c7db95213fbeb46901086c72671581d2e0d69257df1b0a953c9ab3fd494d77a86c357d0af2f1b665b53a SHA512 74a5d74f8019176e854626c1bc8fb677282bf9cd9b1764b3b6dc21ed87156cb6d80deaae74bd80af0844bc1c2a54f329fb5b6b53869b5825c838e7cdf39b25c4
+EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 686 BLAKE2B 9417f5f5f2e1aec92b4a77d657c86ebf28bce5653884ee57acdbde8390d59c2ed546891ac9f7b8b7b0799ed46bf201cc385f4690bffda55c3f8ad064018dd25e SHA512 c79eee50d1d1cd78f5465e0a9aaf8410ebc77b8a934368e311a98e1ce760c2eca9ca35ff1ae317f660f391b33ad9a8e131eaead2f4ef10c7817802f25b6d44a7
 MISC metadata.xml 423 BLAKE2B ff5a21d61f4516f52b4a139f695048b1483aca09426e249c3165ecfbdef8770a47bd98d4bbea582e06e21c8d508884f67389d69ad126a3c7d46de1bce2b48207 SHA512 e81e80ae101dbd4b405ff3b8056c8cc901d5fcf2ff2d1eb595e26f5f59954d6931c5acce9fadb94bfbb533865017f17fb579bf382ce6c226ca32a2dc10f1e0a8
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild
index ec16e30ef479..09464f4ac0af 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi PVR addon VNSI"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
index 1109235bfe77..716f391406a7 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi PVR addon VNSI"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index fc71e2320fc2..a2e47f54a555 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -7,14 +7,14 @@ DIST kodi-pvr-vuplus-3.28.6.tar.gz 191715 BLAKE2B cfcb0c47fc0960d2383ab11f1e6a5b
 DIST kodi-pvr-vuplus-3.28.7.tar.gz 191502 BLAKE2B 9f24e8ff3e15b7acfe7c395ca048bdde6f9406b382fabe047f8959407a3be0ad46d7f0755fbd19ddcd45e3220d1c7a502c415604671c63b86393272f177d7c86 SHA512 e8b5de5d23691c44b85167b2817b8fba450063b780b26969b9465bf41875a6debff2945d47e84be4adf7b76dc6d0f16a5995a77164ed7ee34bdb7db2466421bd
 DIST kodi-pvr-vuplus-3.28.8.tar.gz 191564 BLAKE2B 101fcad2195127674ac04a24191b13b39c448e8a10277ffb8de92b9d9bb9c571957eb14b8af273f228972061c677f21afbf1fb73da6e405d0596bfc15f98e517 SHA512 53e3d0fcebb8227e0d436011eddb326a3ab80a3a913c3841423cf835cab4d2e7f155d61547d1ec4e6913715a986bee6883b7443e6a3a1a56dd750a08f4b317d8
 DIST kodi-pvr-vuplus-3.28.9.tar.gz 191836 BLAKE2B 1b35fd8e639bc28b0e8be6863bd7ef79ce7c058e7cf531a00b4373ce43cbbc2d66e9e23048514055eb2bc08838ce4d3c919111eb5872dc4a4c9b253c2b301862 SHA512 de5a6cdb4552ef7c86cc250a14ec24ec4729c6a41a99bf72d43ed7762a66b87d061b6c94875bf7dde51ea50213c99313fecd4b42327fdce94d3549214d9dcb9e
-EBUILD kodi-pvr-vuplus-3.28.0.ebuild 720 BLAKE2B acc156276fbc71877cc113effc6fa68e7d43e792d96c96758ffcadc5b5a134d13c57ae82896e8b436f6f61391a51cc363d354f38f5fda00bda91498270589803 SHA512 7e1fd87798d3fda0c050890b949206dcdc9da303e7b6e100cade41c1ec5cff0e49f9861912aa91a6865b0507ce15c3053982e2aa430201a7fa6fbc922957e8ef
-EBUILD kodi-pvr-vuplus-3.28.1.ebuild 804 BLAKE2B 9ff35602a730b285863cab87e42a77422f4665dfbae18cbe40d4333be3fa1a893b62fb1822cea6059cf02a0bf8515780e32a9cf10dafd2665f8dda29621c8de8 SHA512 9eebbffe67a7366a5c3df3136ca8a733633d34bd89fa3109238a0e3d67d4492268e2f1fe40b4c151a16f5a04e8510236e894f47e60b559fe2119e80085615ff7
-EBUILD kodi-pvr-vuplus-3.28.2.ebuild 804 BLAKE2B 9ff35602a730b285863cab87e42a77422f4665dfbae18cbe40d4333be3fa1a893b62fb1822cea6059cf02a0bf8515780e32a9cf10dafd2665f8dda29621c8de8 SHA512 9eebbffe67a7366a5c3df3136ca8a733633d34bd89fa3109238a0e3d67d4492268e2f1fe40b4c151a16f5a04e8510236e894f47e60b559fe2119e80085615ff7
-EBUILD kodi-pvr-vuplus-3.28.4.ebuild 804 BLAKE2B 9ff35602a730b285863cab87e42a77422f4665dfbae18cbe40d4333be3fa1a893b62fb1822cea6059cf02a0bf8515780e32a9cf10dafd2665f8dda29621c8de8 SHA512 9eebbffe67a7366a5c3df3136ca8a733633d34bd89fa3109238a0e3d67d4492268e2f1fe40b4c151a16f5a04e8510236e894f47e60b559fe2119e80085615ff7
-EBUILD kodi-pvr-vuplus-3.28.5.ebuild 804 BLAKE2B 9ff35602a730b285863cab87e42a77422f4665dfbae18cbe40d4333be3fa1a893b62fb1822cea6059cf02a0bf8515780e32a9cf10dafd2665f8dda29621c8de8 SHA512 9eebbffe67a7366a5c3df3136ca8a733633d34bd89fa3109238a0e3d67d4492268e2f1fe40b4c151a16f5a04e8510236e894f47e60b559fe2119e80085615ff7
-EBUILD kodi-pvr-vuplus-3.28.6.ebuild 804 BLAKE2B 9ff35602a730b285863cab87e42a77422f4665dfbae18cbe40d4333be3fa1a893b62fb1822cea6059cf02a0bf8515780e32a9cf10dafd2665f8dda29621c8de8 SHA512 9eebbffe67a7366a5c3df3136ca8a733633d34bd89fa3109238a0e3d67d4492268e2f1fe40b4c151a16f5a04e8510236e894f47e60b559fe2119e80085615ff7
-EBUILD kodi-pvr-vuplus-3.28.7.ebuild 804 BLAKE2B 9ff35602a730b285863cab87e42a77422f4665dfbae18cbe40d4333be3fa1a893b62fb1822cea6059cf02a0bf8515780e32a9cf10dafd2665f8dda29621c8de8 SHA512 9eebbffe67a7366a5c3df3136ca8a733633d34bd89fa3109238a0e3d67d4492268e2f1fe40b4c151a16f5a04e8510236e894f47e60b559fe2119e80085615ff7
-EBUILD kodi-pvr-vuplus-3.28.8.ebuild 804 BLAKE2B 9ff35602a730b285863cab87e42a77422f4665dfbae18cbe40d4333be3fa1a893b62fb1822cea6059cf02a0bf8515780e32a9cf10dafd2665f8dda29621c8de8 SHA512 9eebbffe67a7366a5c3df3136ca8a733633d34bd89fa3109238a0e3d67d4492268e2f1fe40b4c151a16f5a04e8510236e894f47e60b559fe2119e80085615ff7
-EBUILD kodi-pvr-vuplus-3.28.9.ebuild 804 BLAKE2B 9ff35602a730b285863cab87e42a77422f4665dfbae18cbe40d4333be3fa1a893b62fb1822cea6059cf02a0bf8515780e32a9cf10dafd2665f8dda29621c8de8 SHA512 9eebbffe67a7366a5c3df3136ca8a733633d34bd89fa3109238a0e3d67d4492268e2f1fe40b4c151a16f5a04e8510236e894f47e60b559fe2119e80085615ff7
-EBUILD kodi-pvr-vuplus-9999.ebuild 806 BLAKE2B 8e9611f04a833e1dcb175e44f9fdf1e674209eca5f6a0ae152ce8a563276619df7c7d98553a738543bf12385b8f30c1177873663b5eb372a56c4a4ba9ccb290d SHA512 5cc75a3f0502c573ccaa58d7ca707926c0323ef5720d62dd096a5b619f6164a79be948f76d943825785fc888fef418ab5e7ab0d1ee11d5e3d456aa6a0bb9d020
+EBUILD kodi-pvr-vuplus-3.28.0.ebuild 714 BLAKE2B 359bd18d33a12dc4cd973af46879ff35e36d58b89cf49aa8fb145a64dceeacfe805007229769172ad752ae766c7e0694e9d25e58208a7802f697748019dad5a6 SHA512 944b18e5bf534135b74bb7572ccc6890c35da32fa59be35c480adaefc5296aa3a3ec5c25fa6ec449f066616dc7058aadbf2f860cc9242b4db4378d089a40f624
+EBUILD kodi-pvr-vuplus-3.28.1.ebuild 792 BLAKE2B 951efa910b33b9d0e844642572bc9e65b8d3175fb23037fe4f979ca0caa43c9d4b9c137ae1b37345f404a0c06f12afae52faacb76ae84f87250ee0c190e5b189 SHA512 4594198274a975f85a97590e4a273e198495ab1ebdf964bddf792dcf12fcb6f79ccd80ec0e621273360c1d1bb66d71a03d9c39d464ea02e287f737b6e5db0344
+EBUILD kodi-pvr-vuplus-3.28.2.ebuild 792 BLAKE2B 951efa910b33b9d0e844642572bc9e65b8d3175fb23037fe4f979ca0caa43c9d4b9c137ae1b37345f404a0c06f12afae52faacb76ae84f87250ee0c190e5b189 SHA512 4594198274a975f85a97590e4a273e198495ab1ebdf964bddf792dcf12fcb6f79ccd80ec0e621273360c1d1bb66d71a03d9c39d464ea02e287f737b6e5db0344
+EBUILD kodi-pvr-vuplus-3.28.4.ebuild 792 BLAKE2B 951efa910b33b9d0e844642572bc9e65b8d3175fb23037fe4f979ca0caa43c9d4b9c137ae1b37345f404a0c06f12afae52faacb76ae84f87250ee0c190e5b189 SHA512 4594198274a975f85a97590e4a273e198495ab1ebdf964bddf792dcf12fcb6f79ccd80ec0e621273360c1d1bb66d71a03d9c39d464ea02e287f737b6e5db0344
+EBUILD kodi-pvr-vuplus-3.28.5.ebuild 792 BLAKE2B 951efa910b33b9d0e844642572bc9e65b8d3175fb23037fe4f979ca0caa43c9d4b9c137ae1b37345f404a0c06f12afae52faacb76ae84f87250ee0c190e5b189 SHA512 4594198274a975f85a97590e4a273e198495ab1ebdf964bddf792dcf12fcb6f79ccd80ec0e621273360c1d1bb66d71a03d9c39d464ea02e287f737b6e5db0344
+EBUILD kodi-pvr-vuplus-3.28.6.ebuild 792 BLAKE2B 951efa910b33b9d0e844642572bc9e65b8d3175fb23037fe4f979ca0caa43c9d4b9c137ae1b37345f404a0c06f12afae52faacb76ae84f87250ee0c190e5b189 SHA512 4594198274a975f85a97590e4a273e198495ab1ebdf964bddf792dcf12fcb6f79ccd80ec0e621273360c1d1bb66d71a03d9c39d464ea02e287f737b6e5db0344
+EBUILD kodi-pvr-vuplus-3.28.7.ebuild 792 BLAKE2B 951efa910b33b9d0e844642572bc9e65b8d3175fb23037fe4f979ca0caa43c9d4b9c137ae1b37345f404a0c06f12afae52faacb76ae84f87250ee0c190e5b189 SHA512 4594198274a975f85a97590e4a273e198495ab1ebdf964bddf792dcf12fcb6f79ccd80ec0e621273360c1d1bb66d71a03d9c39d464ea02e287f737b6e5db0344
+EBUILD kodi-pvr-vuplus-3.28.8.ebuild 792 BLAKE2B 951efa910b33b9d0e844642572bc9e65b8d3175fb23037fe4f979ca0caa43c9d4b9c137ae1b37345f404a0c06f12afae52faacb76ae84f87250ee0c190e5b189 SHA512 4594198274a975f85a97590e4a273e198495ab1ebdf964bddf792dcf12fcb6f79ccd80ec0e621273360c1d1bb66d71a03d9c39d464ea02e287f737b6e5db0344
+EBUILD kodi-pvr-vuplus-3.28.9.ebuild 792 BLAKE2B 951efa910b33b9d0e844642572bc9e65b8d3175fb23037fe4f979ca0caa43c9d4b9c137ae1b37345f404a0c06f12afae52faacb76ae84f87250ee0c190e5b189 SHA512 4594198274a975f85a97590e4a273e198495ab1ebdf964bddf792dcf12fcb6f79ccd80ec0e621273360c1d1bb66d71a03d9c39d464ea02e287f737b6e5db0344
+EBUILD kodi-pvr-vuplus-9999.ebuild 794 BLAKE2B 57e086376e4436835345bfe6f76147f8554f7085d95cd75f6272cf0cf454f6e89599099d890a136688efe624397dce1a2a83f29fcd3a0c9e431f834432bd073c SHA512 ad07b20ae4089a452fa6099065564843cd2dbd19113ad128fdfb9c036bda958363c01aee78e9bcad56cde94dfb382c2e6b80bd8cc13ad3608d607be79d6fc04b
 MISC metadata.xml 428 BLAKE2B ac264c6bbfc925ff772eda61b1b4069b52ed5bf12836af8d8e86a72fe42bd852be1d00f74056c1d6b925fa2a026ea7df57ee57e7434a797884741b70762ff173 SHA512 573f803447cb7a7d0095eb21caa9f55c41fa4fb68c0f40aabad63df2ee262ce168fc75f28f3a3ae6aa7bf41f258be771c6a6dd06d1f2e2486b3d557d89f28f4f
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild
index 1ff57c482268..46319247cfa7 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VuPlus client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.1.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.1.ebuild
index 801998d4dade..be8a5457a7d3 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.1.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VuPlus client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.2.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.2.ebuild
index 801998d4dade..be8a5457a7d3 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.2.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VuPlus client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.4.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.4.ebuild
index 801998d4dade..be8a5457a7d3 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.4.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VuPlus client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.5.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.5.ebuild
index 801998d4dade..be8a5457a7d3 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.5.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VuPlus client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.6.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.6.ebuild
index 801998d4dade..be8a5457a7d3 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.6.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VuPlus client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.7.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.7.ebuild
index 801998d4dade..be8a5457a7d3 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.7.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VuPlus client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.8.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.8.ebuild
index 801998d4dade..be8a5457a7d3 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.8.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VuPlus client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.9.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.9.ebuild
index 801998d4dade..be8a5457a7d3 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.9.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VuPlus client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
index 95ea1713a67c..8eaf874d45ab 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's VuPlus client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-pvr-wmc/Manifest b/media-plugins/kodi-pvr-wmc/Manifest
index 83438c73ca83..3630f746fbb5 100644
--- a/media-plugins/kodi-pvr-wmc/Manifest
+++ b/media-plugins/kodi-pvr-wmc/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-pvr-wmc-2.4.4.tar.gz 178508 BLAKE2B e1d80860ade2a639dd65a9dd541657ee29032facf95c427fd38038f5df28f5cc93622f00809228ae7968786b0d5499606c38eb79adc7ed9200b4e94e2de26206 SHA512 9932d3c44dd91ff371ef34cd9fbbbe1485629116b102c31dc7292e32f82869727423195ae9c78969d96e3a03dd22d481cc0708212921acba0524759a4acaad8d
 DIST kodi-pvr-wmc-2.4.5.tar.gz 179019 BLAKE2B ba116c687bcfbde69600a9fe9ebb22dec334768f6210b568be4d5b4b75c964d9d50764ad841f000af4c7656ad5e5b77721f9a806f3d63de5ec742d74d2dd3bb2 SHA512 d3c7abdd99190bfe5dda191d2811db8879ad916d6083042f9c84f30c8a0ad2a2694141df33ad1c7624387e4488c7aa2853c0fd84dce4f3c75b1897c256ca6154
 EBUILD kodi-pvr-wmc-2.4.4.ebuild 680 BLAKE2B 7e2ceda9bcb53bc2c284d9876226abf5f87455e3e69eb1fb8cd3dc151f2a09b7312adae0ea0272ae2945d3df85bb3bb2464f7cf3b80483836ff6419037928aab SHA512 50105fb1457f40160a5f08546baccc73042e842738ea81b96904a68a5d60e9a87ad056d4db292ff391ca7c6ad2326682fb3ca6a84186d96beaf86d0526c85dce
-EBUILD kodi-pvr-wmc-2.4.5.ebuild 680 BLAKE2B ade25af53c63146ae9f26c0852e67afd834bfb48f6a7526b4144b48b8726605f9b5ab317fb76d58e35dd58db0d268aa087b9d781ffc6e50d7ad5629b002f3db4 SHA512 4b781ac639ff569a33aae53621e21880ea88bf96f4c51c22dfb49113712f0a6917ba3e41b55fbf59fe9d080b42cb8824260aa23938cd2950b093fec2957023f1
-EBUILD kodi-pvr-wmc-9999.ebuild 682 BLAKE2B 11fac4b803c51bb1464601a5dbef9b21e5bb0f8d2069f049163ab9c86ab9085fb1a67b2c137aeba1d98c0d5a5bedccb709b88e38e8df686a68d87e1a643f7f10 SHA512 24d91a68e9597556600aad597248d320f00f70d12ce94bade439c22385fe2aea922c78049cc3fb57110e950b2eda38f1448c2bd19aa434a5c81f6b29aef33b22
+EBUILD kodi-pvr-wmc-2.4.5.ebuild 674 BLAKE2B de09166ba9257979e6b9eaaa0bb7318c0cd5575549785033fa2058e2f4e598db69319d26790567c2862e24ae57a14a5883c14fceb6e32cc9aecd62688a316756 SHA512 56a45cdd33084b08e94fc375a97c59ed2a1e2dc60411e73755f1ac51af238b433500f36ac4f34a39d3a6169b4af40d6f625cc6aeb193c38703cf190a2af70d52
+EBUILD kodi-pvr-wmc-9999.ebuild 676 BLAKE2B db13edbce71074a350b9aeedb07220ddee8531b13d664aa0bc872e1f763587361a1db73d6b16fdacadae5dff09338e5eccbca59595410b14251e67431fa720f3 SHA512 03f31406b92e0f930ef2c64c734367c66831aebbe3b9becb1b727f7a0ae4e701dc872a94e16c288f7b6ccd2b66985f47e9cb0a11dfe0129fb5329f093dc4b74c
 MISC metadata.xml 439 BLAKE2B e9d6404796d298720abff6d7afd2db18b95007cb65ee3ff471b83ee7e7e864eb648a37e3d9d8405842c6b8fe3c409096abad8c8b6c3b1eb2e7df15d4865bfcae SHA512 d85d185c415264b312fc1cccf1155b4f49d1091795989e617c68a4a910f0c85e19b8e34764b4a4a31bc825c927f5a939a7bd7b2f4d1412263aff6d0e50b3fdf6
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.5.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.5.ebuild
index 353ea5eb850b..2108dfb0e136 100644
--- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.5.ebuild
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's Windows Media Center client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
index 60b21dc3a53d..a27ba1b20846 100644
--- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's Windows Media Center client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
diff --git a/media-plugins/kodi-screensaver-asteroids/Manifest b/media-plugins/kodi-screensaver-asteroids/Manifest
index 6d894191b2fa..c9c58042cf91 100644
--- a/media-plugins/kodi-screensaver-asteroids/Manifest
+++ b/media-plugins/kodi-screensaver-asteroids/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-screensaver-asteroids-2.1.0.tar.gz 18838 BLAKE2B 26504e8a10afed55a780fc18e127df7029adabff913baf4da89e76ebc1ee1bea46431e4a578f8273335a40a30b0bf8e678c86624e75fd3419696c3cb9d494a69 SHA512 61d848aa136ab3a9896446d92c5bc8d02867bcdc67b8eed58cff0b9c3573c52a19b4d16de5494dc45c0f69946075749d73e8681858d534f8cbbe31d005a9a5c3
 EBUILD kodi-screensaver-asteroids-2.1.0.ebuild 659 BLAKE2B b7b187fc3f12ebcafa40a29f58707a472761e8e3a0bd36fa4c38b2d700493696816c928a5e7e79dbf080e9a7de57c721ed31c937885aa3b88526b2aaa1196cb6 SHA512 3511ec63d44bb7f1123c4a564fee3e21ce121b6f01d167b9a552de6c0d2a7522305c314f5a0bd2cd1b11460b339839ef62661eac701487d13265d8492e4c7eeb
-EBUILD kodi-screensaver-asteroids-9999.ebuild 660 BLAKE2B 6c7e0b2750ff98c43c9e8a4fa3812426d8788ab9669c0cd3e373a5f085b67f2a9b6a9a254adf5b8ab5208284552710e9582bae20b4c3d5e511b39aed6e362dad SHA512 dc6d6c7c8e6a335202aea8aa127cc03d485de3185f75f32f2cd276edf735e503deb9fbb93b0d59a15181958245d2f9dbad1fed13ef2d5bf0cbcd6ba034cc2f5b
+EBUILD kodi-screensaver-asteroids-9999.ebuild 654 BLAKE2B 54651d4c2fa42440ef9892f5b837f0c61a3aecbad7c46c20cf1e1ace020c73fcc5c1263c375f122b0ec65329fd86deba01d3f2ad67ccf1d57030a4a5df719168 SHA512 3a0451b49e61f918733d1609452bec47b7ae2d56ef8c5a5d19249af5ecdd922dda2bcbe940453cbd89e1c62029cf84a6c97427feba113f6ed8078239af680beb
 MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
index e3614ec88ae0..048241cae25e 100644
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Asteroids screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.asteroids"
diff --git a/media-plugins/kodi-screensaver-biogenesis/Manifest b/media-plugins/kodi-screensaver-biogenesis/Manifest
index 884e6c1d4bef..ffbd395cd921 100644
--- a/media-plugins/kodi-screensaver-biogenesis/Manifest
+++ b/media-plugins/kodi-screensaver-biogenesis/Manifest
@@ -2,5 +2,5 @@ DIST kodi-screensaver-biogenesis-1.1.0.tar.gz 8792 BLAKE2B 7e6d64cd5e4e53fc3c53a
 DIST kodi-screensaver-biogenesis-2.0.0.tar.gz 10579 BLAKE2B f6dbd9f99b453f33b3cd2650d901c4fa39b98ce77382362fa93b1d2e31a54a23394677006b3be97b8bd1626c97564ae812f3452bd17f9cb165914d8793e2e00a SHA512 3aa4668f009561b3615d68d7a61d47a86970e32ff97012f1a9a7ad8dab367008267949d736c47a913f878aced1daae8768c2531d3af6239419470baa2e9f835c
 EBUILD kodi-screensaver-biogenesis-1.1.0.ebuild 634 BLAKE2B 4b4dcef78e103d861517ee394c647d7acec70d748e39fedc2fd1537d7e5f1d7195e62038646ccebd397af177a7c3b8b6e6ad1bc946eccb22637bfd3418f23b6f SHA512 75f7f8e6ac7560e2fce53cd347a7141ff0ad81ede49d84907b30378d60c1700968ba47478db3ac4a2aa453d3d112d43ee685db9b39aac9c0bbc2130b4022448f
 EBUILD kodi-screensaver-biogenesis-2.0.0.ebuild 664 BLAKE2B a8f0fb5e6a227876991f24f7f7fa24f7d24bbafa311aa2b3ee75d7a2ddd916c34162ec5e24f0b9a2b1dcbfa6c92c69a8d1075748e8053713f2a2d68c4b8ffa56 SHA512 9ff72d54ece2a4e4f224d6b641aa601f351358eee14908f15bd86cf9991ef1b3afb1f073b5b0bb87c88ee8bb5c04ccd9fa4e4f3d4dc4bb4233c31260459766df
-EBUILD kodi-screensaver-biogenesis-9999.ebuild 665 BLAKE2B f0f356fa771feb50e421c4a2407ad7b07846a2b8c4c068da76c811cd2c0b7d28ce7db6cf7b69ee567379534588e633365cc6f6002d371a5f25f8f68615592347 SHA512 a62b659b80d1385ceab66ba87546ce053b527349a5143046f762eda553d02df40b7f06a5bb9281f39c1865f87c3d512db0fd784ccf6620709013fba56fffd24d
+EBUILD kodi-screensaver-biogenesis-9999.ebuild 659 BLAKE2B 769cc192fee8fd4ef24f8717a05a92a142b37a2f75f392d88b925d325bc6b60a344e7a6db2295a9c369af7340dbe2c015e7d48030aa6dfd6b9fe24666533282c SHA512 b79d3cf64eb6d75544bc731f5455fea446483476f07a5e2fdcecf6cc48cfcda8dc5053a6659b04efcd75348fb01d736528af5356a37e58eef71b4b3bc529c4f9
 MISC metadata.xml 441 BLAKE2B f5c19cf70bcc5dddc98d5d1f01403fe32e05e859fd18cd972e8df08b76e4356bce05910535a336dff4f11554f9e8cd7a69addb00b0c5efc2bc021d68a8198624 SHA512 ed6d1fe10c992d7f28c115e86eb2565b6dd2a753d670dae7815ecaa717b208d762a62504aa67a2bc1853a203fdb49d1763ac03e00effddf4db81567f20100791
diff --git a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
index 01b0cdea74f6..995c894beca8 100644
--- a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
+++ b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Biogenesis screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.biogenesis"
diff --git a/media-plugins/kodi-screensaver-crystalmorph/Manifest b/media-plugins/kodi-screensaver-crystalmorph/Manifest
index 0252a957aa48..376920021be6 100644
--- a/media-plugins/kodi-screensaver-crystalmorph/Manifest
+++ b/media-plugins/kodi-screensaver-crystalmorph/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-screensaver-crystalmorph-9999.ebuild 647 BLAKE2B c605e3b72e3a46538fef6fc7e5e49a954f54d2ef89487f58ee5bbcb10e95bdf7ae1666b02a5f20a28021a8c557cef6792940489114cf765bde119c1339abc64a SHA512 92c667d811bba26b3cd051e6f78b8fe6cd7e80b43f6e82ecfc4e36617f088d6f1b964bea993c8284b57270db10c463690351fc370c0a76ad2017cc5ce1bcccf0
+EBUILD kodi-screensaver-crystalmorph-9999.ebuild 641 BLAKE2B c30c1e42cf857f8172d5d6fbf868e35b15d17073e39ba65c9f5a04d6fdcadce8c1894ce24050a8a174b112d84fc302a05262a7d89df389b59e899a3e8a28fcfb SHA512 f8271787579d8a216256913dcec1c86cb1227f61012cf0e722fa28fdda89e91fe4cfba9c289502206855b71ebb17493685a6425c49cb7fe7134c72b5eabf2103
 MISC metadata.xml 449 BLAKE2B 15af0e3dc5f50626dfd4f43e02160639c2bae863302674f6455c707e44d39dacddd0d7fa06e0cde6a42f00d8ff658e0a043fe7384d105fa69bbdc5232f14823c SHA512 e91fe6087a08df65eb9bb92906561fee28b7273dd55d87b0efabb16e9df665c49e0d37cf6e8a4f6734007b788a47290bc772bca4daca8ccef38b7a5012ba9a3c
diff --git a/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild b/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
index 67b977f36cab..0fb40f3eaffc 100644
--- a/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
+++ b/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Crystalmorph screensaver for Kodi"
 HOMEPAGE="https://github.com/notspiff/screensaver.crystalmorph"
diff --git a/media-plugins/kodi-screensaver-greynetic/Manifest b/media-plugins/kodi-screensaver-greynetic/Manifest
index 5542c00037f7..d310b61e44a9 100644
--- a/media-plugins/kodi-screensaver-greynetic/Manifest
+++ b/media-plugins/kodi-screensaver-greynetic/Manifest
@@ -2,5 +2,5 @@ DIST kodi-screensaver-greynetic-1.1.0.tar.gz 5115 BLAKE2B 357a4d51b2271c4181a335
 DIST kodi-screensaver-greynetic-2.0.0.tar.gz 6608 BLAKE2B bb48adc922d3949670d3685ca4adba7d608a42e9f9c0c659ca91a26e9181568f4a6d1f1f9aa707eedb395a9eb54c4aa40a83b36b6594bef5f9159ead5585381a SHA512 15a577bb9e10f81d86582eb43c20b4e2dcf430f478c76b3c18c1800532e38d9dc87754b7e0df669ca8df4e1d4d589224c561688a4fd14528c70dc6728c7be16f
 EBUILD kodi-screensaver-greynetic-1.1.0.ebuild 629 BLAKE2B d903f527a0c14316a872b1741cd44ddf02339a73a58b888482b40135d2b46ab35c4d388905475d3ba6262fb68050a7d56adf0786fd99f9c51749b52ad3761c8d SHA512 0afdf7c85059546e955d443a9a3b54c805712c8882d1e61a3e93025b1108aceb335ac06a6f6ee322daa760a7196404881054024431d5d765dba5fcadc076837e
 EBUILD kodi-screensaver-greynetic-2.0.0.ebuild 659 BLAKE2B 8175e6f35ff1710cca777c1f3450404f1e91c722239090bae403964432c9c15abbcb7085dcc4283c4e3f6c9186d184e2d4b591dc102afb939dde526a56751a05 SHA512 3cd27f42ffda2a43db0362e01ce7ecab2c092702412cc3995f17baedb91a51b6eaa13c4a5da3363eaa8f24da4be735e083d8fe28b042a63b60c8e42b2bc85570
-EBUILD kodi-screensaver-greynetic-9999.ebuild 660 BLAKE2B 4c4587857bb9c8324449e0e54a0368c220b8b8b5f4ecefc4f114649e1ce42bf71fe8bdcdec00bf9bea7839674636e1bc1f26a91ae98ec5f025ae90ac9a7908bf SHA512 208060e2634c8bdfcd130b9b1aecbfa0ecdd791cb1f3a7af43b9483f3abbc92b884775dd1ae6e3c4a086c8b433f75d963c043b642cc1787a4cfc4a7748c31435
+EBUILD kodi-screensaver-greynetic-9999.ebuild 654 BLAKE2B 4c52aceda9d3cef2de19bcee1652674329a074d5657bbdd1ebe389fcbaa46ab89e6f0271a4bf261b8f3239ea3df0c2c4d4de42c68d77a6852a2c7ba48e8a98b4 SHA512 1e28bedf8ad34b6a805979e879bec68a55014fc3407632df510e8d706eaedb50670d0be724cd9df8a14fc9f6dd84e50b7623eb78c22602f842344dbd85696d6e
 MISC metadata.xml 439 BLAKE2B 61919ac2fc5a3efc8278e1dd40f196fcd000ac12cdbe633b4f53bd0653978f4030fd3dcaeecb6f17a86c4e8fbabdb8e9d6e11e7ec245693c54baf57ac1042445 SHA512 56833abb5a30439a7c4736e4f695f555e79bcdd0cad2d53a87897c35d4c3efedb65a4bc5818572c5fbb7768eedc635659299186339d3557d98d86de7a54885c4
diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
index f312ca7ebc25..11b4b17da59a 100644
--- a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Greynetic screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.greynetic"
diff --git a/media-plugins/kodi-screensaver-pingpong/Manifest b/media-plugins/kodi-screensaver-pingpong/Manifest
index 84f3f1adb366..5de19c7d14d4 100644
--- a/media-plugins/kodi-screensaver-pingpong/Manifest
+++ b/media-plugins/kodi-screensaver-pingpong/Manifest
@@ -2,5 +2,5 @@ DIST kodi-screensaver-pingpong-1.1.0.tar.gz 14476 BLAKE2B ce9a13968394ff607beff2
 DIST kodi-screensaver-pingpong-2.0.0.tar.gz 16768 BLAKE2B 1b4864ae3b88245733dec758cd815ff7a9f4673e1ab249275239c4ac1cdf04fbd256001d5ee984bd509730094b91cfe1d2e683169624f87192dbebcd4dc98f74 SHA512 c754b38a549589488e524e6b61088b3d9afe8f2f76bd65aa72901c7004880087cc7cb614f4b1cde49b0200a11f2f57181be913523a8b339abb6c26589a6a3d39
 EBUILD kodi-screensaver-pingpong-1.1.0.ebuild 625 BLAKE2B 9de8a58bac01aaa057c80d232bd4f0546be2855c76608da93a52d15f054c8adb7f2dffb1a31708a3a88a7766dc439f47ef8118b061946787144bba8be6d3f4b3 SHA512 13986351400280f6b9224110789dca0b5ac6930ee7214bbcf80d8f25a961c0c1a57bce5fa43fefef333ae2bd4c6129410a7eb55245ed8a05d0b5816b817b3fcd
 EBUILD kodi-screensaver-pingpong-2.0.0.ebuild 655 BLAKE2B 609c646adb52ee425e66f4dcef2a3e1512e0631e2833c6331351b9db4e43fe1c51160a994287d5047e591919de71f552b1ac8cfd63792b5944a1ef227ec7c009 SHA512 c76cb1d6db4bb84d464735d6bbce7cac16e70329479a0a47d966d1ac78dad8850a28d6c7b45b553bfe7dfd0e999042837dd33c00b7a39715ea48d96be29baee8
-EBUILD kodi-screensaver-pingpong-9999.ebuild 656 BLAKE2B 84a55f0a2e3a8672da97490bee171b36b1899f9b9a18c0ad908158a0e43d1aa1e43e9a98d6778f887710d27ad495314028839a7ad1b2619c3f5e7c2d6b3a6bf3 SHA512 347b8bb8a92144778673970ef274fc3b17dbe6b703827c5cfd5777747e3b2406685cd1cc1a679f991afdece9ebbcff041f8ca8e5aabd684130bcb7ffbf88e700
+EBUILD kodi-screensaver-pingpong-9999.ebuild 650 BLAKE2B 1aa58c60655251fdb84cc17bbe4ee033fa7f37cde18b9a3c483dc6048e4af5447ff503699aa301016697e54440b81a85628e7743579a132294a6145b4c7cd93d SHA512 6fb492db882e3383401564a942269dce030219577cd0335cd85974d591aceb8d4d4c06a6a003f8791dd02aa1c9761b6c2f7cf274cc8820775cd54be93072f46f
 MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
index 41a80f39ef05..db29d19e9558 100644
--- a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Ping-pong screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.pingpong"
diff --git a/media-plugins/kodi-screensaver-pyro/Manifest b/media-plugins/kodi-screensaver-pyro/Manifest
index 53a9b11cb4aa..6625c47eadfb 100644
--- a/media-plugins/kodi-screensaver-pyro/Manifest
+++ b/media-plugins/kodi-screensaver-pyro/Manifest
@@ -2,5 +2,5 @@ DIST kodi-screensaver-pyro-2.0.0.tar.gz 6502 BLAKE2B a0ccc3346f6482db303d4d12104
 DIST kodi-screensaver-pyro-3.0.0.tar.gz 81858 BLAKE2B 4d48cfeee5d51c45e0caa99e742226ed6f6b0704391d657be8863ffe76acfeb2e3f3740903cec89e0dcaa2dcbff6109fb91e582c5855598b9fd75549880ab87a SHA512 92335e156950f7da5800dc9c9fd57262a2d608d63cb2015e3f5711686b657930f05651a35e043480ed64f40cb34a3228c44b6c641b63a8d0438e0944abc09515
 EBUILD kodi-screensaver-pyro-2.0.0.ebuild 634 BLAKE2B 4f29003cdfb6c264d5f9f3b40eb802775eae4671846f1b4013c59465d1658548d2dac77f82c0e374a00d120095b6804e129a9b9a3ec92287af7e0233e3dd3672 SHA512 791bf456b3a17cea6dd22dcb5c100002240e2de81176fa7f0b020f0c1216df208e400c17b721726691f8a75d806195502eb1fd0bb96cf537cb0bde2714dc5274
 EBUILD kodi-screensaver-pyro-3.0.0.ebuild 634 BLAKE2B 0803976a5267983685007edda398af6fa33ec76c5ce63cf48c724fbb2056298cb0bef6e76ae682c78716f5be2afee7742d2ce25ef54c677f093c07b79b948a0d SHA512 fc89e6b3af290ca3ae3a7b5bbf6f83e875cdd560ffc1f80dcd53b890b83cdddfa4a7e10a22de4a21ec332dff090a007d95d590e9ae07f8d048b4cbdea132cdfc
-EBUILD kodi-screensaver-pyro-9999.ebuild 635 BLAKE2B 70cd088be5230883b967030d23a6a734c7323008803f91dc98153337ddd92273f5314263af525394bc3c862a8e4299da94522656417c0a19999f203e5bedb1aa SHA512 4c57f4ac7d956e8ea07f5dbd217d77c32b529b3f1f758cc66fffa7f774dc15d2c7d0357190406e9ccd4a4f052fce163cee6f7d9caedb86f5439dd4d7ac46a0bc
+EBUILD kodi-screensaver-pyro-9999.ebuild 629 BLAKE2B 897fb94b3d4258fb71d083615ae3f4a4c6520e2e62cc3b94aee60276862251bea2d4b221d43df0a36d51b98eabb91a4fdb556a79c4e48b028aec569da3c29882 SHA512 bff73dca9ef853bc75088ad749164815f5460bed54021adce438995a2bce312b1e91cfabeba0d058cb0b13fa9115261c381cf84400025506b2b93406ef6322aa
 MISC metadata.xml 429 BLAKE2B 75a3ac26d3c3383485d3aa0b9a674f6bc249d95f13b637d9d07fb64f7ab46226301f8abf8a4194b3a30ea8dd6815d6565382a0e1e342bccf880ea0ca6a3d11f1 SHA512 df4dd73cbdb3c1d9a32ee398273356b506391363fee7d5e799a1bfed2765a1cea5c40ddc60716aebd272c4ee91d4d72d148a0644d3e47a84d3b31d03fa739f3d
diff --git a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
index 7caf62b15621..1797ba86d6fc 100644
--- a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Pyro screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.pyro"
diff --git a/media-plugins/kodi-screensaver-rsxs/Manifest b/media-plugins/kodi-screensaver-rsxs/Manifest
index 36088c365264..9fc49506d820 100644
--- a/media-plugins/kodi-screensaver-rsxs/Manifest
+++ b/media-plugins/kodi-screensaver-rsxs/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-screensaver-rsxs-9999.ebuild 761 BLAKE2B 2a81721cd5fdd48cce06b1b4d8db31648c79995e6763b13c185c67e5cd28ae76e951acce46cb502604e08ffa1f9bf6cf6209340c6ba77e5db96a05d4429b3174 SHA512 537bc0b40cac9661394414f6b59171130aee4b06e5c2cd922eb27a3b0c99ed30219ac0ff64e27e50bdb21063b2b30c16b52f1129cdcde6bd01a2ab0ca9cd2323
+EBUILD kodi-screensaver-rsxs-9999.ebuild 755 BLAKE2B e6d098ec3df1ccce84bc238ecb2a396b0a8794713dd88598feb244cf9c1bd100a8d27c223739edc18aa2f32a9771579efa0917314a59521e8d1cc23e144b2c6a SHA512 00dbab6832cbb30cf1c67571e3b85b872703717b2001a9566462f85031b179d836e4f9e01ba04db1257062337a3ef80551e0e8014ae5b46044ebbb3c0d152aea
 MISC metadata.xml 433 BLAKE2B eb81b1aba0ed7b5e827682e7db8752b045c0db57c5323b676ac117020a3c7f4b5cfd26801f6a3b9b6ad9c43f525790c646b9cb8bff3a65c2cea23e7560192d5a SHA512 24139a96ed95abd60bea9b882f8aee0166953652a3f187045c9fb691e295b97bc55f00b7911b2bc60c41cf3926c3900654e1ab1e0cc59f0705cea5d75bb0b2c7
diff --git a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
index 4ffc1f4f3c89..38382a4ce4fa 100644
--- a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
+++ b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="RSXS screensaver for Kodi"
 HOMEPAGE="https://github.com/notspiff/screensavers.rsxs"
diff --git a/media-plugins/kodi-vfs-libarchive/Manifest b/media-plugins/kodi-vfs-libarchive/Manifest
index e74ae096d50e..fb6715d0951c 100644
--- a/media-plugins/kodi-vfs-libarchive/Manifest
+++ b/media-plugins/kodi-vfs-libarchive/Manifest
@@ -2,5 +2,5 @@ DIST kodi-vfs-libarchive-1.0.2.tar.gz 21985 BLAKE2B 0d3b8d7405cc7ea1a766a138b432
 DIST kodi-vfs-libarchive-1.0.5.tar.gz 32808 BLAKE2B f822cfb188d5d6ff2f5237fc3d242b7e9095d967314d9701a1a1635ff7865b9fd4d836686af5dd6afc90fd52c097952937d0ed7c02eb56c4c51b335d8f9b328c SHA512 3d9c5d1b8cba0545ca2b30a3a72d2ed930324329968f17a1fe3c145b54632d8d60dee45efdc1d7e74f7872503ce893101c71b6d9063b372de912a60980c762c7
 EBUILD kodi-vfs-libarchive-1.0.2.ebuild 877 BLAKE2B ab0ef79088afd96837f796f1b9ac8bac696aab214fd234b370ad3bbfee4998441e3140622ae683370a1e0086d6db784272e5fb63a4f057d5218d07c73235728e SHA512 e349e72aec6646445782a6b49b8588eaca41d2f9683408835a49e89b17e7f0618126ccf650bdd7a935db2367025e569465f0243e8bf45a31f1040f7d2c076ce1
 EBUILD kodi-vfs-libarchive-1.0.5.ebuild 877 BLAKE2B 7c842ae4877d93da9551f87c3be125adbf91f3266f1da136dd5a96f7f3e58532a0d9599b2438857a6222a4c1d0ef0e5cba2f4c576682946d12a5dc334b454e3b SHA512 ac4dc317c7d5d1957cd1e9009d9c2bc1616f5c9c74ae51be371ad381c9569670373ecb46b705bde78c04b39b32a00e69e2b1d905a4d21bcfbee87e6fae8a0980
-EBUILD kodi-vfs-libarchive-9999.ebuild 878 BLAKE2B 94110ec751196bac8ad6c921862c5ee4301b0aa9c70cd110ab3225f6160e46903a261f33747aa5b69f5b14238dff5cb4f2e1ed3ee4542da544d24d69493ca4b0 SHA512 840bdab3320c54e0f8dda6197ea5be0385ba8a4c768a0a766ab0ef99772b466b7328fe5c39b4efde6f69efb8188866031cf6d0a72a388f9b2068165d2041f092
+EBUILD kodi-vfs-libarchive-9999.ebuild 914 BLAKE2B 0d0a6e5a3d44f3216744b4001cc540d2c2cd18c70e1a9896599283f77f3132f6a7016908b3c0d01a49e3cf301fc4c74d5a034affc554bc49cc2d9ab83d617281 SHA512 066b871746ee9869e25f9fd6c922a02738b8858a4658338e16d0f4b486f95b40069747e64046739ddac3d907dba28a9c274b08070739e7457c2ffb754ddfc053
 MISC metadata.xml 432 BLAKE2B 3006fcd638bfffcaa3100d40c3b1ffad2afa58ac1141edc5baa79640a1835db8104753cb64161530396f1d9549726044653ecbef6d4096769751f00dcba8b6c1 SHA512 553da085bf4fcc70c1b4ab666004ce9d0e68ad95b185d78713381392e6c0590f5aa8a23cd8f022e3a12b77cc96ef06ccc54e262233326921ad45a921a32af135
diff --git a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
index d38dfe7343fc..ec2ee28f5f58 100644
--- a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
+++ b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Libarchive VFS add-on for Kodi"
 HOMEPAGE="https://github.com/xbmc/vfs.libarchive"
@@ -13,6 +13,7 @@ case ${PV} in
 9999)
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/vfs.libarchive.git"
+	EGIT_BRANCH="Matrix"
 	inherit git-r3
 	;;
 *)
@@ -41,3 +42,4 @@ DEPEND="
 	)
 	~media-tv/kodi-9999
 	"
+RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-vfs-rar/Manifest b/media-plugins/kodi-vfs-rar/Manifest
index 43c522575087..2b8c2ab92e94 100644
--- a/media-plugins/kodi-vfs-rar/Manifest
+++ b/media-plugins/kodi-vfs-rar/Manifest
@@ -1,8 +1,10 @@
 DIST kodi-vfs-rar-2.0.5.tar.gz 132264 BLAKE2B 1c092fcc45a9b540ab43da9d93028bf3ecca5342fbe99e0380ccf1945be2bbe931e0c93454b69c8091c5919ea52347ab24ee27a72e96e202e6c38775640c016b SHA512 46c17952b1933a5958082ecc6d904b3300acfc6982ef42fd63a15c68ce60c79528a52369fb7e5d0a912cd4346c7701b1aa07dedd882bec618d9e7343ffcbef73
 DIST kodi-vfs-rar-2.0.6.tar.gz 132265 BLAKE2B 686e9e47680f701f68c44c597035ddc1051b16b2048f81060b656217497ebc368428462f7edbcebdcccf7275e6bde57ab8889644e265ebcd5aabba4f2cf364b9 SHA512 73112865d4c66653b565f7f52d557b68548b2077264088a03d8b2a49c9b84b366f5424bcc88bfc91d484f77424944a7191d4275f00255511b0c91ebdb3a30350
 DIST kodi-vfs-rar-2.0.7.tar.gz 132225 BLAKE2B 62f75acba3b06a7eb179eedf31fffa2397f614dab64c0004058db4908e51a2e70cd0dd177e64eff12e54ad1eb57d315abde646604305dbd83e7f4fd897ad6b6a SHA512 40245b9869bb37b1df0822337b7028c4583d0de08338c8bbca2732d71413fa76490250eae50aa805ebbe654798cf8c232794e561e9650f16e9866714d6bce5b3
+DIST kodi-vfs-rar-2.0.8.tar.gz 333280 BLAKE2B ae6f382a1b8bf0f80b4c32bba9144597319b32a691872c3c4012f2d7450178d7a4103c64fc837bcd0c173a5f6149f732d5b932c98c19807bd6aa910f1573548f SHA512 702bfb0fbd6c4165bdb396565154a3979d611e91d306917dd54c6dff315108f51a23cfb270bd161ea169e59dae3b7d445fb612b222c84a8d3b70c25966f697b0
 EBUILD kodi-vfs-rar-2.0.5.ebuild 652 BLAKE2B b36b05c304dd57e616c1f8d30024a34f6eacb9bbebf4f40ff9c8a92f7bffa8f9252e289a1e4d32536ed13c7836be14c14fcae036e469337393b0f6f02edc826c SHA512 923b6dcae197faa632bef703cce6959f10c5480a76bddd3e188667859b4ee265ad3f1fee57ca91b6caeacc08315cb5f1fcf53598d792de46e5d5539d1844c5fa
 EBUILD kodi-vfs-rar-2.0.6.ebuild 652 BLAKE2B a3c9536ae1c17c721ff0a69fb3c54e4f7626122dfae57a633ee10ac33de556578c3a53a614c0500a96050bae184bc07bc66cc853cdd6bc91adc6cee3b0847b4d SHA512 deafe614fc3c89790f3d3b5c52c888f4a41969ac98afacbb0f616aacd7bd3f8ceea573d7b59ef5d8ef7a268e8926f00e34046e007f98eb00e058393bd0454dd3
 EBUILD kodi-vfs-rar-2.0.7.ebuild 652 BLAKE2B a3c9536ae1c17c721ff0a69fb3c54e4f7626122dfae57a633ee10ac33de556578c3a53a614c0500a96050bae184bc07bc66cc853cdd6bc91adc6cee3b0847b4d SHA512 deafe614fc3c89790f3d3b5c52c888f4a41969ac98afacbb0f616aacd7bd3f8ceea573d7b59ef5d8ef7a268e8926f00e34046e007f98eb00e058393bd0454dd3
-EBUILD kodi-vfs-rar-9999.ebuild 654 BLAKE2B 15ae6eb5ef52ddd3a99cbbf7f5b1c945914cb4e843c469fd03a7a93498399cd6c0d3792a66c3de7554c7bf4fbafbdf0833940d6f13fb00814669a603c0321989 SHA512 adffd338796c88e1bc09da234c2330eebb41e6667b0aeba49c041dc23b037dc4ab32b931246a4575ced70546e9c99c4f9f9abd459e92ac94e320ca9d60aca75f
+EBUILD kodi-vfs-rar-2.0.8.ebuild 652 BLAKE2B 012ef8381ac0e688359ef347a107a1db38526a6b173d51198fa9dbf56cf473c17eebec13d44cd71fbcf6ca40bfd11ef34ecbf47a789482ec50b00864292533b7 SHA512 aa00d4a4b24edaa4445e420921f1e11c39693433a14a559ee5a38f3b364ec7197a3d841ff5b451bbed4f0c84c2b0e4cf214684c066eaf014c94f818dd98aaef4
+EBUILD kodi-vfs-rar-9999.ebuild 683 BLAKE2B 6f3cdb65b799733e7724d35b9e7b87b464b0f48f625f2437419e8f08464ffdc4e9501b4eca49df5c054b7f11efea47aa7477e494a7189aa7916e3b3a0590868d SHA512 9006ab23cb68be4636ec4e9cd1f21c7bcc8d6b8602fbeceed20df7de737d88ab6f24e698d0c49aceeda61f3ab90a0be7d6ec85aa857b615b76d54a92026a803d
 MISC metadata.xml 417 BLAKE2B 848739e38b8064c10732cc179fd55c24c49fa32bd9067706443b0efec47f697a66d330a52733033271638d3b0ba7ef1661f372052bb6dc1a25f5e0dd745f83ed SHA512 70d2ec7f4f00ef2c208db31180e4520f26bd059cd12084e7764297542f75798d2bbe55a3558971fde8709b403968da29011f271bc6f3c4b4a63ae2589c0ae76f
diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.0.8.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.0.8.ebuild
new file mode 100644
index 000000000000..97a5af025d0f
--- /dev/null
+++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.0.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="RAR VFS addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/vfs.rar"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/vfs.rar.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/vfs.rar/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.rar-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	=media-libs/kodi-platform-18*
+	=media-tv/kodi-18*
+	"
diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
index 0e1a57116e68..a3a654fefd45 100644
--- a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
+++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="RAR VFS addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/vfs.rar"
@@ -13,6 +13,7 @@ case ${PV} in
 9999)
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/vfs.rar.git"
+	EGIT_BRANCH="Matrix"
 	inherit git-r3
 	;;
 *)
@@ -27,8 +28,9 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	=dev-libs/libplatform-2*
+RDEPEND="
+	dev-libs/tinyxml
 	~media-libs/kodi-platform-9999
 	~media-tv/kodi-9999
 	"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/kodi-vfs-sacd/Manifest b/media-plugins/kodi-vfs-sacd/Manifest
index 127d14aef6b6..4990207cc48c 100644
--- a/media-plugins/kodi-vfs-sacd/Manifest
+++ b/media-plugins/kodi-vfs-sacd/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-vfs-sacd-9999.ebuild 619 BLAKE2B 67a2ff8f85e17c25cee8dc8100ae8348944c6322fac2a60a5c379a467932237e5473a00d724977eb7f4ea7b760f5830f9cac9f737442c2e8b4a2680d2ed86a1b SHA512 54061667f3371b3324cc378e6cf9909c6d9cab5a6bd149be251ff284c3b5c6c7dfe7995e08760295490870cde536c3ffda8111a8b8fa6388e9e80e30395a69d0
+EBUILD kodi-vfs-sacd-9999.ebuild 655 BLAKE2B cd5502a4711e935ff7aff2214c6805fa552968d2c91857874d2953343dfcb7f52c1df6c076f00c2960c0908ff3eef598a07ffc1991e31b1d7a7b4d3af2e588c1 SHA512 eef594e74e016a9e44e8d6683084486fd5355f7e28086e432c349586e275257103fa8c94150a88feca0cddc1149567f226e9d8ed247feb508b281e924e9a4ee3
 MISC metadata.xml 419 BLAKE2B 18019581cc35ab24aed35e146674d26ab57c18ad0d0468954f8dff16c2bff757d9a7acf718e5655fa96e02be9fd1a05d8f87f3c46b83fe09692b6f71677d89d4 SHA512 931961ed7c4a909bd1f15c7e02a3a37e7815b9ff293708aab813eaecca25ab38b8fc98872295b8dc6d46029d570dd238d68259f57504cba67601099f3f30dd55
diff --git a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
index a5726083a310..813a460bf5f8 100644
--- a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
+++ b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="SACD VFS addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/vfs.sacd"
@@ -13,6 +13,7 @@ case ${PV} in
 9999)
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/vfs.sacd.git"
+	EGIT_BRANCH="Matrix"
 	inherit git-r3
 	;;
 *)
@@ -31,3 +32,4 @@ DEPEND="
 	~media-libs/kodi-platform-9999
 	~media-tv/kodi-9999
 	"
+RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-vfs-sftp/Manifest b/media-plugins/kodi-vfs-sftp/Manifest
index 38d46e54d488..a8a6c00dc961 100644
--- a/media-plugins/kodi-vfs-sftp/Manifest
+++ b/media-plugins/kodi-vfs-sftp/Manifest
@@ -1,6 +1,10 @@
 DIST kodi-vfs-sftp-1.0.1.tar.gz 20059 BLAKE2B 3ff2178738dbb85de731d5268d80cad079f684234ff39ca1141337c384377ca75dd5ad51026471af4e8a1229c6739fa9212b6fd6253cad9be6d9b19a7dc7081a SHA512 e51aeae2bf6e611e679b38401add778fc5605ededb8b8b9d2f6732eda4b87fdee5ea352d2c491cf1ff671c0299395de1cc689404e2924266ffef84c4e7cc71c3
 DIST kodi-vfs-sftp-1.0.3.tar.gz 20923 BLAKE2B 3f2856fa97453739d6a712b5ce63d97771d4f763e182ba28c311a1d5add1f9aae14d069cbcccebeec116a0c138bfbb545aadb1657bb712559d8c73406d61dc4e SHA512 2d0b1f21e3815780124013456abfc4ba07f6a26a3406ba65db76e197254a068a6bfbbe5deb6fb264cbaabe83ac8301a6a7f5f668790934dc7c727745472a3764
+DIST kodi-vfs-sftp-1.0.4.tar.gz 28366 BLAKE2B fce63dcfffdaa03bcfae7ef4c4406ee2096720b4749ed6b732e0264838e26ee7357f592a491c1e8ff8e26158e31713d53f11abe3c733096374ce2deb7835407c SHA512 fd3e843c2241ab198e332e6758982fe54cee0a6e9594d6dd738e813f9916ccb2c8258f160a630487123c2817b771f0e26e0f57dc5ddec16cdc26c754ec40c56b
+DIST kodi-vfs-sftp-1.0.5.tar.gz 30777 BLAKE2B ff0fd5a56a5e68cafddd7267c9881079b7439ddc8f15638a1ea9f8d05be505646f08f1332b85e0e3fa8e0959194ee009b125222e86e78e02876f6b373b5e9b47 SHA512 999b7c136294b7691457ffea4fa929211dce8cdabcb3b1efcb37c2e062ca10b36f2f036cd1bbaa2e25a9c1647b983b48acd6a279df4ceb1741cb5131d379e381
 EBUILD kodi-vfs-sftp-1.0.1.ebuild 678 BLAKE2B 629a085af07b523d098035fc5344b6956e8876f271a2b33e58b7d7bb5e4bfafbcd94d8932cc4ae4a11440189dd92c52bad52e2a956e609fa3559721fd120e2c9 SHA512 c6d4b2b2d7226736e98b155a5c8e1875aa9bff8fe3daf3a1749d795d4a0cb4e404ddb5640aaf772ad84da745bfefd312464d42fc50a72679a5b86aee60e0774b
-EBUILD kodi-vfs-sftp-1.0.3.ebuild 762 BLAKE2B 485aa47213fa2e6d7d539c8f548087c394b450adedfd9464e5c70a3bf99674f233f0dd25ccdce58c0c61552b3aa8909c7a8eea691cc92b01b2863c068e8ae8a0 SHA512 59c2eda17aa577bea82e54d2a2779789c8de20dc3312f62dcc7c12f3ea700f64fa631c2b2b3759c69895f7e26c314395eb8cebe8bd2f49845867b5bcf22b9a88
-EBUILD kodi-vfs-sftp-9999.ebuild 766 BLAKE2B 48c7ea932888c86c4695ba4d456ff9f3c61ba21f7fedb85788eaedc86fcdbe7e8b3bd3b861cbef8b0621fde2f64f8f7dffd8f18bac2b3f0fc755593fe9c8eaea SHA512 0614d6bf9f970e1fdc90be8a94c68b1830f99d02d644d7411676eafa99bded025ef2607d22a52deccb99a5bc74cdceed418397ef59a76519e67efc5eeb59df76
+EBUILD kodi-vfs-sftp-1.0.3.ebuild 750 BLAKE2B 54bc7020dc27b7e1c12a8802bee5922289c02c396ee33fc57fd27b91d4c3d6f47d87e14fb77b659d46351920e879983b080ca19d11e119f0232719145be4a9fc SHA512 2be70d7f8cb6b9947f64ffce4ca616d3c867fe30ce1f46ca5153d375156a073036bd689d5e401bf22b85a69137adba4d36fb685437e703235b8abb3eb0c0920a
+EBUILD kodi-vfs-sftp-1.0.4.ebuild 744 BLAKE2B f0a4c75ec4920732f6a1304ce81889ced2dd3d1c04af4ecd2f6f4c6e4238ffbc737649b7d2627ba7ef6887c03922b675840a6aef89f06b009331ea0b8e5f3058 SHA512 399e082af90dce522881a933efb1bdcc181b6b3324ad7095bd7eb00f0f994ebbbd9c16c9ae8e309c24333f938262791d26c314492cf924f83213e2b9c605b6ed
+EBUILD kodi-vfs-sftp-1.0.5.ebuild 744 BLAKE2B f0a4c75ec4920732f6a1304ce81889ced2dd3d1c04af4ecd2f6f4c6e4238ffbc737649b7d2627ba7ef6887c03922b675840a6aef89f06b009331ea0b8e5f3058 SHA512 399e082af90dce522881a933efb1bdcc181b6b3324ad7095bd7eb00f0f994ebbbd9c16c9ae8e309c24333f938262791d26c314492cf924f83213e2b9c605b6ed
+EBUILD kodi-vfs-sftp-9999.ebuild 770 BLAKE2B 9ec6aae0c37bce7e47f719d20887b89702524ab316114674a3729db65eb4ad50390eaae915abc73b520368bc41438a6196b89ef94bc28d6faec138c60753f7a3 SHA512 e9714aecdb153fd847cdf559289d45bd947537911d12fafcaa407db980f50f62776901c1f996d138ac57be2128ae173ba876bdff13e7675fc214f9f13030a505
 MISC metadata.xml 419 BLAKE2B 7167e481bfec9e94de9e9bdb25f4a5d3d77596a73e3cabeafa265322f0da3043de844f2db94c8767e3b5657c37ba1e77643acac9970f509fe956399ccadb1e36 SHA512 31d530be90d385a7d6756296909e5dd5454a2efc2a83d83c47cff14fc2260c1bc772bc23b95fd6bcb91511c0be21d9297074367aa445642ae477623f8f545a21
diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.3.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.3.ebuild
index 0c002b5c684f..c4f365ebbf12 100644
--- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.3.ebuild
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="SFTP VFS addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/vfs.sftp"
@@ -36,5 +36,5 @@ DEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.4.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.4.ebuild
new file mode 100644
index 000000000000..4c3c025386a7
--- /dev/null
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SFTP VFS addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/vfs.sftp"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/xbmc/vfs.sftp.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/vfs.sftp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.sftp-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	net-libs/libssh[sftp]
+	=media-libs/kodi-platform-18*
+	=media-tv/kodi-18*
+	"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.5.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.5.ebuild
new file mode 100644
index 000000000000..4c3c025386a7
--- /dev/null
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SFTP VFS addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/vfs.sftp"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/xbmc/vfs.sftp.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/vfs.sftp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.sftp-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	net-libs/libssh[sftp]
+	=media-libs/kodi-platform-18*
+	=media-tv/kodi-18*
+	"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
index 3b97cecb2fba..e8e59841bcd8 100644
--- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="SFTP VFS addon for Kodi"
 HOMEPAGE="https://github.com/xbmc/vfs.sftp"
@@ -13,6 +13,7 @@ case ${PV} in
 9999)
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/vfs.sftp.git"
+	EGIT_BRANCH="Matrix"
 	inherit git-r3
 	;;
 *)
@@ -28,13 +29,13 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=dev-libs/libplatform-2*
 	net-libs/libssh[sftp]
 	~media-libs/kodi-platform-9999
 	~media-tv/kodi-9999
 	"
+RDEPEND="${DEPEND}"
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-fishbmc/Manifest b/media-plugins/kodi-visualization-fishbmc/Manifest
index 086cbd07cfaa..3534a816d789 100644
--- a/media-plugins/kodi-visualization-fishbmc/Manifest
+++ b/media-plugins/kodi-visualization-fishbmc/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-visualization-fishbmc-5.1.1.tar.gz 357412 BLAKE2B d3f658d021f2ff47f31ddb2c285c1a4040555503eb9740020b60ca475ac87a0e478984fe78197752a2f67dba166a0c0b3ed854377c3a1c3c229ebb5ebfe78f72 SHA512 53652435612bfdc05918c76f4963fb6b5a7fce8efb9a3acf0e6f41aa25a528df692acb3dfe64a027e1548c5f84f4fb1b15092adf4412d6c4cfb1c4220f90aa30
 DIST kodi-visualization-fishbmc-5.1.2.tar.gz 357467 BLAKE2B 7ecf14e7953bb61cf5c66d3a7388937d12170cca079305e1deb445cedbb8af43056ead33f287bff28b6f2bae306193c58fe52b80f7136cfc86c12c43e4d7dfe9 SHA512 0f1149d362e268367236be42d6202938410cb2d9330dd1cb980f49ceb3720b84efd73f9708fa7f1d17f15150b796a95daff68b8fa3b19ae75b52523f61cd3e71
-EBUILD kodi-visualization-fishbmc-5.1.1.ebuild 808 BLAKE2B e504009d044aa86b680e8be974a49897a6923852eb748df8f354ad78a3a98db2fb9c284ed9e5eb84c0ebeb12d1b73da154975b307825c0c9cba63d203eecd7e4 SHA512 603233971e5682879205eb16ccb975679e2c43826d514587f170aa1fa602d4f17c9d279dbfae9c0b7a86fa22ad611ae279acfb2d3653e6ef15851db3a2af45ee
-EBUILD kodi-visualization-fishbmc-5.1.2.ebuild 808 BLAKE2B e504009d044aa86b680e8be974a49897a6923852eb748df8f354ad78a3a98db2fb9c284ed9e5eb84c0ebeb12d1b73da154975b307825c0c9cba63d203eecd7e4 SHA512 603233971e5682879205eb16ccb975679e2c43826d514587f170aa1fa602d4f17c9d279dbfae9c0b7a86fa22ad611ae279acfb2d3653e6ef15851db3a2af45ee
-EBUILD kodi-visualization-fishbmc-9999.ebuild 809 BLAKE2B acb6682a74c1d15c8585e5e904de1ac7d601a0e0fc712f8878c364d856be7c2f838e4c9b9a2e21e2909e0ca8c75f8f5d5ac3c44965ed6f748cd036161d173f6d SHA512 7f36714dad63ef4b08acc420fc8aa5555bb6f27da29744eaf249c02da67030d9287920a942c7a1bde99ce4cff3f0496949270e3d2f736ae94b59484d586d5559
+EBUILD kodi-visualization-fishbmc-5.1.1.ebuild 796 BLAKE2B 10050740288b7f981a6a99292d685114fd1fdc25d47b4ed1cebeac3e57db7fd80144bdd1024386f35637dd6a6517629915ecbb193ce8e37a8e192a26ac55da1b SHA512 26fe940c5767daa784789f4e35a4e6374400f0c74ea1cf58a042cfcacaef39c2510f954d72f472b6566dc6dcb0f6172d7983298a5cdc7947425e1eb43a7d653a
+EBUILD kodi-visualization-fishbmc-5.1.2.ebuild 796 BLAKE2B 10050740288b7f981a6a99292d685114fd1fdc25d47b4ed1cebeac3e57db7fd80144bdd1024386f35637dd6a6517629915ecbb193ce8e37a8e192a26ac55da1b SHA512 26fe940c5767daa784789f4e35a4e6374400f0c74ea1cf58a042cfcacaef39c2510f954d72f472b6566dc6dcb0f6172d7983298a5cdc7947425e1eb43a7d653a
+EBUILD kodi-visualization-fishbmc-9999.ebuild 797 BLAKE2B 0bc40fa68a6d183a4283514e71264a937ce548ce9e460ef58014ff3e2e7cf50e02f107cc77924e87fafb24aadd6c320bbf3404412521997ab6e3759978f868e3 SHA512 5100a6e4b1f9d57b6d17d12174db72c762d01de0b215577df1625229222108924a2bfc33a024c4f62893d97079154b2a3b81eb49b587a5de8e86f0e8867481d6
 MISC metadata.xml 439 BLAKE2B 538bd3c4a9323c884584cefda4f84d01e1ac2d677ac8c0f4b57a8b81dae2ac3cf6632769ffb50d46a5e162cb3571034fee417ece1878102dcaa8838e839495ac SHA512 0bdb34edf345e638dc3bd557a77adf3745d9332bd0858c40bc003511df26d87597932d2d2987e2245345c44b95d0d03696b61443c1eafaf95b0e151ddcc921d5
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.1.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.1.ebuild
index 017ed11f6635..18d2746f752b 100644
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.1.ebuild
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Fische visualizer for Kodi"
 HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild
index 017ed11f6635..18d2746f752b 100644
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Fische visualizer for Kodi"
 HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
index b59240f9c3e1..30288178ef8b 100644
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Fische visualizer for Kodi"
 HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-goom/Manifest b/media-plugins/kodi-visualization-goom/Manifest
index 1a0170d95cf5..25a324d53509 100644
--- a/media-plugins/kodi-visualization-goom/Manifest
+++ b/media-plugins/kodi-visualization-goom/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-visualization-goom-9999.ebuild 655 BLAKE2B 9d8c43fe1484c1b9e9240baa487fe78658cc18b6be3b1503b213170eb2cbf98d6c9adc3a0af5315086c7a74416a6adceb0ccebf0fdb6363cf3e907704e1fe2ff SHA512 25ab09204e6054e1f79fe92eedd0be138ee46ad26741d276ec0cf364d853506089761eb0ae78b95ba20e1edbaac25058d095ece1d3aed8e0e45471cd789f8f03
+DIST kodi-visualization-goom-2.1.0.tar.gz 8119409 BLAKE2B 4162201e4415df9b8dc4e22f40d6e9eb71e85804cfb6898d472e2d612a090e81041ed2bf3c1c7423012aff53cc239d25400948fad20e0ccf93fe59270491818e SHA512 5e2b4b2133938224506d94cf55cefb4aa77212e16b570900da33b84ea5de94bd4dcb3d161cc7d0d632353a9c9dd9a5925ce25b9c016cd13818944122c0806054
+EBUILD kodi-visualization-goom-2.1.0.ebuild 688 BLAKE2B 009031cb22d9ba0f562de0799cb3740fe8ee22149bfe16c7d20016e27370d40ed455283e4010a5a0c9c43ae67d1c8ea90677c021582311994509653683a0659e SHA512 d29773aedc4a7d43df72d767276bcf41e2ae88e501d1da1fa5fb949c1a4d100f3368c9df0372deea37222abb970cb93db4420073a2078d4d301ff63a1d50bb88
+EBUILD kodi-visualization-goom-9999.ebuild 689 BLAKE2B 2afb3bf6ff8d349a9cfc733af376c41780053ea00b8732f0d2c61a16c925aec138b89f2d5c68d6725b397c3a1ca939933837e914531c06b21b5ae092ac20ef40 SHA512 df482cc0311f40881551f4afaef2d1f2dc038d7d47a6b4f4add38e8dca165ac13c66513ee9390d528bb6ca7bda532b86998a594414c07b23d10257d266a660fe
 MISC metadata.xml 434 BLAKE2B 14ffadbe7c568eb11922b64df1f82c0404092fc971b8e8181955fc21989c70d3c2198a4beb7ab426cf6cf2356d2bd89d71e3ed7155ba35fb647303b231d45a26 SHA512 614347e4b283abd727a963d2b276fc6e0e1477ba1e5571957b123670be073a50e14e4c0460aba90b5f01380fd40f8f1e334b2b6a9409e038b3c9dd79ee2fc15c
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.1.0.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.1.0.ebuild
new file mode 100644
index 000000000000..bf3ef6feb069
--- /dev/null
+++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Goom visualizer for Kodi"
+HOMEPAGE="https://github.com/notspiff/visualization.goom"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/visualization.goom.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/notspiff/visualization.goom/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.goom-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
index fd87d5665eb3..29b891796cc9 100644
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
+++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Goom visualizer for Kodi"
 HOMEPAGE="https://github.com/notspiff/visualization.goom"
@@ -17,8 +17,9 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.goom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.goom-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/notspiff/visualization.goom/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.goom-${PV}-${CODENAME}"
 	;;
 esac
 
diff --git a/media-plugins/kodi-visualization-nastyfft/Manifest b/media-plugins/kodi-visualization-nastyfft/Manifest
index 4152580c77a8..4afceb24f437 100644
--- a/media-plugins/kodi-visualization-nastyfft/Manifest
+++ b/media-plugins/kodi-visualization-nastyfft/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-visualization-nastyfft-9999.ebuild 675 BLAKE2B 9619e0bb01fe6d9f8b36521adcd7a81eee2b9dfaa98756e06e4c102fed430ffe69cc9b96f7e5e96d8c69438e411ab3f8b070aa1cd893532b2ea1072cbc167544 SHA512 cde967e3d227cea4a41d50251a105a60745cdb89f1f925ef1eb8dd5d76c93aa4faa4d22c7a3bd45b9c7223c2e8442a777963a0717a1eb47385a9a153ebf6c6d5
+EBUILD kodi-visualization-nastyfft-9999.ebuild 669 BLAKE2B c9f7d0325a9683d93ba584a46ee58395236ac001968ea3bdbf59fd3005d96121174cb13cae20afb151904478d4af8c3df7262c3e3f794c64fb4bcef01cad0e88 SHA512 03a8a06e5b1cc29eac3dec3ab8d655198e1f487c74c61b560dc4e81a21358f80f3990e6943939967b476f85ef2d1c16db59b3a593c5aca8903f9585e8f5e7c7b
 MISC metadata.xml 442 BLAKE2B 9574b720a624b850e3aad20a4b3c03108b5b208d8a823d023408b415091ce2120eb135ce3a5369d7d554a17e89b2bb57fe7d20c3354b1612aeef4dcb1750ab20 SHA512 16f85f34283637601a3d32d268ff21a97ebe697e3830f082d39f4c1a401f123ce449c4943e1f8942aa9922404a7a4b86f36561e65db43a4788b9bdb8d700851b
diff --git a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
index 23fd5802f066..d2a90ef0f7b1 100644
--- a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
+++ b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="NastyFFT visualizer for Kodi"
 HOMEPAGE="https://github.com/notspiff/visualization.nastyfft"
diff --git a/media-plugins/kodi-visualization-projectm/Manifest b/media-plugins/kodi-visualization-projectm/Manifest
index 7f7e9f3877dd..2f309bf611e6 100644
--- a/media-plugins/kodi-visualization-projectm/Manifest
+++ b/media-plugins/kodi-visualization-projectm/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-visualization-projectm-2.3.4.tar.gz 2479533 BLAKE2B 2ee531cc131c0c27ca1c5aa616ab67d3636aae290caaffacfb07c8ccc085ce87829b36b2754698f100840e16c65e94a5950a81b70939da9acfdbefe951f5630b SHA512 e6dc9b250b12319e5fa616f618731c5d1d07a053f4a6a71755e7587a5955201642bc0302470759e91b8808283ea33ba95e5d28e2c24fd14aea5134b20805215c
-EBUILD kodi-visualization-projectm-2.3.4.ebuild 881 BLAKE2B db39d6b8eafad8d369be14e450e4f6622a87e996040c6d3b43fa9e6ebefc5c0dbaeee79deefc6a2106ea8fc8394a7939ec247d207239040724810ec8f8783475 SHA512 f422469120a27bab2316e48c987df8c04c9e35ca43c3e66192b298f9cf4309f61c2e9ea464ec0dfa86f92d56603edd733310eb15ec3e961730a4f924ba0771e2
-EBUILD kodi-visualization-projectm-9999.ebuild 883 BLAKE2B d4727383c07ab2ebd0815e19098043567bff00503569473f503ade761b655d70fc8bda9c497caa678aa4c6a72e61995c666476894fa5e0960183b0c97deffa65 SHA512 e390ef49458133150d5662ffeb3ba1ca7e8739c2f11b9700f8d4daebd925f00087eb9dbd110c056bff44f6110cbb7c27a15b188dc2998244ff6226024fc88196
+EBUILD kodi-visualization-projectm-2.3.4.ebuild 869 BLAKE2B 87bcd9ee4b65f413432a8e667a7fea0cf17877da6909e2d1ecc02a84cbce1f4836fee2ad426d94332195b2b33f5766825396895ba807fe143ca8fc55da0242dd SHA512 4ecbb199f36a9e8be90f88b5c3ec9bc3e5d6731f9502fe962cd49684e8476df3373b56d5afeb2d085104db28e5176792dcc3bc6f29f8852bb19d337548e175a6
+EBUILD kodi-visualization-projectm-9999.ebuild 871 BLAKE2B 76c738044f8bdaa38b6054759d9c3ba59d6f421314cfdc4531598bc2d2e88073ad4e27e876f5b813a2efee3b9e60733fea6986851c1cbfd49d26fef31ba4f119 SHA512 a0587ad45cd3131dda1d1a1bd80025e7c2c6d458086ccf882928324c946859d51d7486350682d5b8a6949883af54b8e7017d6bc0c2b9ac3f1a2c8d246c28cb61
 MISC metadata.xml 438 BLAKE2B 7869da7be1eac18bc4e35672134270f92ae7dc4178edc4b62399dac713fe14eb83fecbb14d8712677d802742eed9d34df1f0eda581117dc0649a929a903ba823 SHA512 2e7259aa9e981c4a6a72e3f055e1475bb140e07785976fa586d8ebef2fe6013fb373cacee9500320cdf0a4cae56486555612ed2d9109415cf9016359b9cdba0a
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.4.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.4.ebuild
index 42a3197de6ee..8fa58b99e3cb 100644
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.4.ebuild
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="ProjectM visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.projectm"
@@ -41,5 +41,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
index adfc10b6a656..82731cd5a9b3 100644
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="ProjectM visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.projectm"
@@ -41,5 +41,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-shadertoy/Manifest b/media-plugins/kodi-visualization-shadertoy/Manifest
index 2d4a1b8439a4..c6f5c31ede9c 100644
--- a/media-plugins/kodi-visualization-shadertoy/Manifest
+++ b/media-plugins/kodi-visualization-shadertoy/Manifest
@@ -9,8 +9,8 @@ EBUILD kodi-visualization-shadertoy-1.1.10.ebuild 733 BLAKE2B b70e59671f5d3a92be
 EBUILD kodi-visualization-shadertoy-1.1.5.ebuild 703 BLAKE2B 8db9e065d98d01ea38a745e032590053081479d13fe8f2031403ec2576326ecf6fe11dc182b157a8b87939ad2cf754a9d97132081f7e3ba3a61d663b02f05e78 SHA512 e6616a30af82973f51dbdaa0ef2897a8983a572d3a7456a2eb1da6f6f126a88579aa9bfe703c07e100515f5635b6ae1fc7de09fbd25057e128cd8a75280d7cce
 EBUILD kodi-visualization-shadertoy-1.1.8.ebuild 733 BLAKE2B c29892cccfc9bbbfb6169ec53187408ae0885a7ffa1236e784885098ff931987ef3aec40855831b69e657507bcdcc4b374b6af415482b33034318e2b6ba9cfca SHA512 4b1ea57c7a6fe31fbbb3e7da47d2469e3c8e9d521119d8eee4384d49fdd57dc242ce180a012a1d4ebdcac551c1bb6015b9fc41a6a71eebe07c712cc1ad5cfa9d
 EBUILD kodi-visualization-shadertoy-1.1.9.ebuild 733 BLAKE2B b70e59671f5d3a92bed86531b1053a4a2e19b9f02d6bf7bc90ae2d7d3686f03f04f03eed97e07c451fff12343ecb753a2146582055d3449567c8e36eee0eab3b SHA512 8050a8c641107b37b4940e3d09a783d2f2b8f911d3a9e6c5613bc22b992ed4173e385c3513cdcfe5ab24cb4a86d4ce86b02a7229f606b643b325b5bef61c51aa
-EBUILD kodi-visualization-shadertoy-1.2.1.ebuild 833 BLAKE2B 7632a913257b535ef512522d4c4663b572d4685102220f7879746eefcd2eadf83f9fa664029ca56364cec6b5fc6180af6a0a83e1ef391dd09213a5373930fa27 SHA512 a27ef1fb9aa21120184c9dc2cb09cdb855a1a342f1b2c643c32e3db8f710f1fcbba28a2f1e50acc2fe6deae4d3557b6e449aa64a5e1312ff0bb0e64a8f84b3e4
-EBUILD kodi-visualization-shadertoy-1.2.2.ebuild 833 BLAKE2B 7632a913257b535ef512522d4c4663b572d4685102220f7879746eefcd2eadf83f9fa664029ca56364cec6b5fc6180af6a0a83e1ef391dd09213a5373930fa27 SHA512 a27ef1fb9aa21120184c9dc2cb09cdb855a1a342f1b2c643c32e3db8f710f1fcbba28a2f1e50acc2fe6deae4d3557b6e449aa64a5e1312ff0bb0e64a8f84b3e4
-EBUILD kodi-visualization-shadertoy-1.2.3.ebuild 843 BLAKE2B 67f5176494ca7a4a46d985b9384e9dfd6268d85806717643fc62f263d8de71039697f36d080545d04a5c21478d029d8e28f798495f26d928ec7eeda8d4f00597 SHA512 d1b5f08089f595c69676992b5666974c49b3f1951c22bad839aa33819bb346e43b7997c83305f093a59c31709dd98410a3cdb683f7972e2fe1158458e9c1648c
-EBUILD kodi-visualization-shadertoy-9999.ebuild 844 BLAKE2B 9a60f9048da9b8693c17c320f6dbbc2327b7d5e280d2ef76a6472c19981ab4dd459b9df9e645d1a583e659511050a872429ad9743a83c6012864c7d21ac9c3a9 SHA512 b921a8034c5e1b071a3894311a343ef403f0814560c5ef7e0130239eca570e8279cef1155c22d7a99d8539f6b7594bc66e6ca097f79c68c1034b1b8f3c699b89
+EBUILD kodi-visualization-shadertoy-1.2.1.ebuild 821 BLAKE2B f134d83e3d00bda1bedc888a5e6e353255fad3a5ce62c2b067ccc4cb40d4268a25ecc2ccb4f9b5f4aa92e8ee3762e3cd29654288bd7688df997a60eb26845deb SHA512 ad3e9bc70f0675f5dd95246a63e4d6142cd7e986519d9249ad9406d1a11d275758b8837db30a9df0741ff3be0cd2cd38170fbb203953d084ffe323a01c79f11f
+EBUILD kodi-visualization-shadertoy-1.2.2.ebuild 821 BLAKE2B f134d83e3d00bda1bedc888a5e6e353255fad3a5ce62c2b067ccc4cb40d4268a25ecc2ccb4f9b5f4aa92e8ee3762e3cd29654288bd7688df997a60eb26845deb SHA512 ad3e9bc70f0675f5dd95246a63e4d6142cd7e986519d9249ad9406d1a11d275758b8837db30a9df0741ff3be0cd2cd38170fbb203953d084ffe323a01c79f11f
+EBUILD kodi-visualization-shadertoy-1.2.3.ebuild 831 BLAKE2B da57f1770689a446cd96c84b45a1825acb300e26d199c38dc4fe8f54d16d7795cd43c31e20a08661e240d3c0a37bb7fe3174a770726886eb190f95f4bf6699a6 SHA512 790851a23443cf130b7a4e33e6b591a49481f475c2b4d443d2485c274780a1e86559f727f4da65a0d6c90fab189b94f391458989b17da9271a99d26f614e7092
+EBUILD kodi-visualization-shadertoy-9999.ebuild 832 BLAKE2B f90397aca70a15a2bd9e44abf35030edc775edc34f3cdb94c7b3b5daf3646ae50f7bf8e5670a9aa0bae5728a6b80299cd5afcdc809b1af0099ce4f108e23c1bd SHA512 34617e3d3ed6b4844d0ea861f85a547b3d9e4ec52bb4cf8386c062dea716c3d3e335e05c9433ef9415f97ee70c6bf54281849e2164462828e10ae60a7b1a54b1
 MISC metadata.xml 440 BLAKE2B 8ca7ad0546c9c0590eff12d403b863109b99964ac6d5a9f73d05253ed65719f53ff8a043f1ef1a2f3ce4fb7a06d0e2ad3a5586c49308f22ab7e9690979d88050 SHA512 76e524e7318f8137a70002b265388a1cd107c8e970688ad5616b8895d38108760a06fa3a4e00abe46463ce7d346ef19756237eadb677c4ace52b44bff8a81f17
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.1.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.1.ebuild
index f6d47540675b..282d8e5f62cf 100644
--- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.1.ebuild
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Shadertoy visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.2.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.2.ebuild
index f6d47540675b..282d8e5f62cf 100644
--- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.2.ebuild
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Shadertoy visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.3.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.3.ebuild
index 9638fe3c34c2..d0055d3d7d63 100644
--- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.3.ebuild
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Shadertoy visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
index ee3175563ed9..4fe84742983c 100644
--- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Shadertoy visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
@@ -40,5 +40,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-spectrum/Manifest b/media-plugins/kodi-visualization-spectrum/Manifest
index d52ca2ac4457..2ea95d54160d 100644
--- a/media-plugins/kodi-visualization-spectrum/Manifest
+++ b/media-plugins/kodi-visualization-spectrum/Manifest
@@ -7,8 +7,8 @@ DIST kodi-visualization-spectrum-3.0.2.tar.gz 324584 BLAKE2B d81f9ce7d293dd0ce60
 EBUILD kodi-visualization-spectrum-1.1.1.ebuild 672 BLAKE2B 81047ebd915b86eb518afa2459cc2f1203e94e4df524bae8adf1033698e14cc893db3b4d2bb3fa4aebec20268b128844ce475595a12b98c73a897fbfdeaacd8b SHA512 adc631d17f89638df6548fe27cbef9acbe1e1753bed353bc1cbcdbe2a376688260bfa9bdc80c9fab1e991304a2fc9e2ee54bb70f4c36fff122ec605822f83562
 EBUILD kodi-visualization-spectrum-2.0.3.ebuild 662 BLAKE2B 87d284e6e59f235cda37e1b339dc8d1332f32d4e597ef4c9a540bf27e2b65110c6224660fe5e3908d3c9852932544ddcf661fe4c23d668ad6fd28a1eead91a1e SHA512 6b4eed836e15512d719153450f5b4fd73c31b2cedcba9e4d1377ee122abb7d5d273d289dc4565c28eb341610b6d49910e4ab20ac667f359cf8bd818ae3810211
 EBUILD kodi-visualization-spectrum-2.0.4.ebuild 703 BLAKE2B e187602ba9703a33d69a076489a5b7bb00d98615b0c08d63229242593e0dff58e443b8676dda3658cfeb6af8b18a86c6d0bb304b88b7b1b6f554daf9e4754a28 SHA512 99e3037b0591dcf123f2f43ea543f4f996ffafc24ba210f6c781dc81bb56055bc155b16fec94f4a644f34d63c069d9a77c2966063b21cd7a963dbe59c929f386
-EBUILD kodi-visualization-spectrum-3.0.0.ebuild 802 BLAKE2B 58cf33a72041a09119b4627ab285dfa2eb9ba3d9da2aa9021361a426b2d5368ad52661b9325931507cb21790ee9009cc736284c08820533a00c0601bb02e383c SHA512 70ced33f41ad0f743bb7c14552999f264d0c5a162e198dc42a73f919839ddac698ebed3a19f9d02f4e9b4f9318447a4d8579387157f5bb9386331ea4bdc5cfbb
-EBUILD kodi-visualization-spectrum-3.0.1.ebuild 802 BLAKE2B 58cf33a72041a09119b4627ab285dfa2eb9ba3d9da2aa9021361a426b2d5368ad52661b9325931507cb21790ee9009cc736284c08820533a00c0601bb02e383c SHA512 70ced33f41ad0f743bb7c14552999f264d0c5a162e198dc42a73f919839ddac698ebed3a19f9d02f4e9b4f9318447a4d8579387157f5bb9386331ea4bdc5cfbb
-EBUILD kodi-visualization-spectrum-3.0.2.ebuild 802 BLAKE2B 58cf33a72041a09119b4627ab285dfa2eb9ba3d9da2aa9021361a426b2d5368ad52661b9325931507cb21790ee9009cc736284c08820533a00c0601bb02e383c SHA512 70ced33f41ad0f743bb7c14552999f264d0c5a162e198dc42a73f919839ddac698ebed3a19f9d02f4e9b4f9318447a4d8579387157f5bb9386331ea4bdc5cfbb
-EBUILD kodi-visualization-spectrum-9999.ebuild 803 BLAKE2B 4681c5dbf096af90f28d55154b28958fdd45dd2984c1d4692ca36fa67823569a6f5b26449a42d7d85fc9c1cd0f354a7bdeb746123f36a215c143e1eeeb558633 SHA512 3f6c6d5246ef6b4521f5a6cceed88053eb3a5509bb12ddf7b7d9a8681a3eb0faf561dd698033bcfe40565340e41e88f1d80eb4cf1ead8fc4b201447896ef6254
+EBUILD kodi-visualization-spectrum-3.0.0.ebuild 790 BLAKE2B 36976024b405d97d8f1c5b0528a2f311b00060c6f0c68963635b67e849f10c0000c90cb077249a21995e30f4af01c59b1dd78f6c257938fc496a0085d0142638 SHA512 7aa1f2c2ece6e55253f4bc5f4edfea056b38a5217af419ca8304e3a166bf5285408a98c74bc79e6efb6b7221b14b9236c06fa5601bfdc8a7b9294931b098e468
+EBUILD kodi-visualization-spectrum-3.0.1.ebuild 790 BLAKE2B 36976024b405d97d8f1c5b0528a2f311b00060c6f0c68963635b67e849f10c0000c90cb077249a21995e30f4af01c59b1dd78f6c257938fc496a0085d0142638 SHA512 7aa1f2c2ece6e55253f4bc5f4edfea056b38a5217af419ca8304e3a166bf5285408a98c74bc79e6efb6b7221b14b9236c06fa5601bfdc8a7b9294931b098e468
+EBUILD kodi-visualization-spectrum-3.0.2.ebuild 790 BLAKE2B 36976024b405d97d8f1c5b0528a2f311b00060c6f0c68963635b67e849f10c0000c90cb077249a21995e30f4af01c59b1dd78f6c257938fc496a0085d0142638 SHA512 7aa1f2c2ece6e55253f4bc5f4edfea056b38a5217af419ca8304e3a166bf5285408a98c74bc79e6efb6b7221b14b9236c06fa5601bfdc8a7b9294931b098e468
+EBUILD kodi-visualization-spectrum-9999.ebuild 791 BLAKE2B dbe3b3e3e6dd44e133ddf9e657cea59ccf0a9a9c903dbb9e0355d51ee4fb450f91fccbf75d370031f330215888f5e1f7599a44905941fd7791cd8c79b74b6101 SHA512 f9c981bc82a744745cbc72c0907208f93e4ab5eb16b142373f6c4e55f4bb0ac5c3f75556b524228896f598927eb537f525a974eedd17168ec9d96a5da5682251
 MISC metadata.xml 438 BLAKE2B 8662b3f30cdc08223e10e8fc8515a3afb59e199f33e645f1dd011465f2d0b02201f2b64e5aa0c269cde77f20e3ca091d4e72afd817985198da5e3bd8c0f054da SHA512 8d683f5aa11f95edbf8a91e43c85c1882e19400dc55a79116ce9527f9f89ea552da28ccf65ea9aec8a5b166d18638c01def152dcee57fb054575cc636c0f0a0a
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.0.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.0.ebuild
index 98ac664f5bc3..a4662f53e1f7 100644
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.0.ebuild
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Spectrum visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.1.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.1.ebuild
index 98ac664f5bc3..a4662f53e1f7 100644
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.1.ebuild
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Spectrum visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.2.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.2.ebuild
index 98ac664f5bc3..a4662f53e1f7 100644
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.2.ebuild
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Spectrum visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
index 122892d00318..9af6e1f7f117 100644
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Spectrum visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-starburst/Manifest b/media-plugins/kodi-visualization-starburst/Manifest
index 563741a9e3d3..3777fa34e0eb 100644
--- a/media-plugins/kodi-visualization-starburst/Manifest
+++ b/media-plugins/kodi-visualization-starburst/Manifest
@@ -1,8 +1,8 @@
 DIST kodi-visualization-starburst-2.0.0.tar.gz 149618 BLAKE2B 8afaba6236b8d2f70532e7fedcdccd7271dfcd7149b1d6e4a0f8a3c3591b984f51f0e4846ca9763968579a67277eb8547e16e8729656b32247ccbaf2a307803f SHA512 7671288a9b24ca9ea2c7aae3d0bd31dd9d3ae47785d4ef2cd11a063270fd30b89115c4736ed34aea885bea011adf3aa3b0f19abf9c24a813bdeb55cc956e6610
 DIST kodi-visualization-starburst-2.0.1.tar.gz 128625 BLAKE2B d49a85c149f908d480b8cad244f4128dae077d991b24f78f214bfa43645a12ff2d635b79682e5638b4f958b11365493f1c810418b55d60f47369de88ffc5ca22 SHA512 0af874f2265fb9ce2983f08f27e60f8a0a11ae0046b7d09dea112d9fc961169153b536495ccdb1db2ca8666e1ddd595b134d75915485b8c78a752e3db87dcd87
 DIST kodi-visualization-starburst-2.0.2.tar.gz 128638 BLAKE2B e373ee9488d9ddeda698794df20cae391b60c284f1bcb25d5dba8d969061e9658fd2ae425b174169eb07b144d2ea358919d0538faf4fc7732bea749f24786d15 SHA512 87fb353cf5ca64cb5418abd2ff5827f780cde07deac19efe54430afa3fd01ff6ff3b28211066133de3f7a410b7c3bbfae5e180cab67f7cd7afb6ecf1fa5e81fc
-EBUILD kodi-visualization-starburst-2.0.0.ebuild 735 BLAKE2B 99a488c0421ee171c926423a7ceeafa4192869917924df619a63158007ec78f4ec461102714c56e80e8b6d59644f6b768d7f874c16ed6da186d218ade4770f8c SHA512 d05f91d9b4013543679399de8040788852fbd87d7156404a9960551416e3a5fc45e8ec7bd303bbc29397c067a5d42d231370032024eead415246b11d555f674f
-EBUILD kodi-visualization-starburst-2.0.1.ebuild 819 BLAKE2B d571f36553dfbe2e273ad396d54d7d18ec82f8a18e1c6227c29fa3cc78967add70a6295a673b74f1d590b03ed15fd831a3ab6882b9efabe2a99da38f3dfb63ab SHA512 6a1dae454cd053f95a077a592ba697fa401814b39de170838a35588c1cacf19f48f0bcd8b581b15162382a185ccbaebfe9039ab3f48ecaeb61fdaaaec6832d9e
-EBUILD kodi-visualization-starburst-2.0.2.ebuild 819 BLAKE2B d571f36553dfbe2e273ad396d54d7d18ec82f8a18e1c6227c29fa3cc78967add70a6295a673b74f1d590b03ed15fd831a3ab6882b9efabe2a99da38f3dfb63ab SHA512 6a1dae454cd053f95a077a592ba697fa401814b39de170838a35588c1cacf19f48f0bcd8b581b15162382a185ccbaebfe9039ab3f48ecaeb61fdaaaec6832d9e
-EBUILD kodi-visualization-starburst-9999.ebuild 820 BLAKE2B b08e73c1f4202b2b603a75cbc9a3d43a188d5203e7c3f0e3cac012c7de49ace9a9156edb63f26436366dcd60b7eb341638a73a100c448ee132ae5343f4d3092b SHA512 3b65b64916f6ed0097bdf2f7be0a95c2595867160faeaac804866025c6bb6dcc1f2a9bbde4a0b0fc04e0d4f1ccadd0fc33367a1b135d574a9fafd7c61b68870c
+EBUILD kodi-visualization-starburst-2.0.0.ebuild 729 BLAKE2B d512f385fda500a9fb2d04b0c619342db8514152f468c7bae0c59cce8f8d390a6e20fc42ac485c72dbd2a1e36cfe7386aa667e612c3bc280279902c10b9ecee7 SHA512 b1703075225288259bb830dcefc9ffc0814c3134759a0177e95bf5087a283b9fb13f0202abc456b06572ac709750ba6e1e26bc7ee40b04b7ab1a4a5a2b734bd7
+EBUILD kodi-visualization-starburst-2.0.1.ebuild 807 BLAKE2B 517faee89a9949f548cf86f4ebe328d170fc7466fd0fc4dd5c8d082d2e4e189d6c9ee7f0dff0291929fd9311a336dc18e0374dae7a04991de17ce34fe8f0af2e SHA512 0f1ff62b751248b7f61724308d2bff35afbf60e10e155c5ac443a7a42a307904e2a0e2fb46a4b62a6df3d77400cce205ded4154b72f9793515044e5bcf795822
+EBUILD kodi-visualization-starburst-2.0.2.ebuild 807 BLAKE2B 517faee89a9949f548cf86f4ebe328d170fc7466fd0fc4dd5c8d082d2e4e189d6c9ee7f0dff0291929fd9311a336dc18e0374dae7a04991de17ce34fe8f0af2e SHA512 0f1ff62b751248b7f61724308d2bff35afbf60e10e155c5ac443a7a42a307904e2a0e2fb46a4b62a6df3d77400cce205ded4154b72f9793515044e5bcf795822
+EBUILD kodi-visualization-starburst-9999.ebuild 808 BLAKE2B ac65e9d7fc8445b2b28a98e5c51b6b2e8fc2a5d399c6dff0882cd9906a551fad2a563549c3ea8ba7e9ad33a8fc8e87c88c44c40924eeba35d2fbfdce2126bbd1 SHA512 c619f3deeb9006b5f09eb0a664828cd4d632d61480d3b8d462be0340e03d9eda6ff6bce1cb516800f71a4215858bb9e471c210cc69afe8d30eb25f995a795587
 MISC metadata.xml 444 BLAKE2B 5f3221e98532824daa5b94268b4b1891206428444a4d0a82f6d388d05ed28d264171b34b0d13d58099dd0075879f9d0e85f52c80a1311adf75c879358722898a SHA512 c263072074bffb4a1665ebc90aba169c61f836e51d7778c3192b7ba6a370d4eb17691aaa1e3efbc869a4f64e367aea8795e93439e9d82515be443c1f66a77464
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.0.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.0.ebuild
index 6752d8e6f651..90b24db6491b 100644
--- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.0.ebuild
+++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="StarBurst visualizer for Kodi"
 HOMEPAGE="https://github.com/notspiff/visualization.starburst"
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.1.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.1.ebuild
index df8814dad806..75eff173409c 100644
--- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.1.ebuild
+++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="StarBurst visualizer for Kodi"
 HOMEPAGE="https://github.com/notspiff/visualization.starburst"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.2.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.2.ebuild
index df8814dad806..75eff173409c 100644
--- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.2.ebuild
+++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="StarBurst visualizer for Kodi"
 HOMEPAGE="https://github.com/notspiff/visualization.starburst"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
index 12d4d8512619..bb33f5a4c038 100644
--- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
+++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="StarBurst visualizer for Kodi"
 HOMEPAGE="https://github.com/notspiff/visualization.starburst"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-waveform/Manifest b/media-plugins/kodi-visualization-waveform/Manifest
index 4317d947fe00..863c408f9e78 100644
--- a/media-plugins/kodi-visualization-waveform/Manifest
+++ b/media-plugins/kodi-visualization-waveform/Manifest
@@ -3,8 +3,8 @@ DIST kodi-visualization-waveform-3.0.2.tar.gz 546352 BLAKE2B 98d35bbbbda2a44c35d
 DIST kodi-visualization-waveform-3.1.0.tar.gz 548379 BLAKE2B 855423b77e12e371640ede7c34fc4419f4643c5376fe2a11f83570c9178657d2b7283f85487a06783d03002263e2cd81640b0fe7dff3710198998d9a3d48f5d1 SHA512 a1204ed4d17e021508e969a522c2631a020b469cf24e6a2fcf5e586f8fbc2369b5499df8153cf984a15b570045e0f03fffefbb21d5a112a1ab3788bc35024d63
 DIST kodi-visualization-waveform-3.1.1.tar.gz 548907 BLAKE2B da38a0d9a7a50bac502a48b8e50aceb8d5d94fa7c9c00fdee29a91d8d30432bac96b5008e4659c93cf22905a05456f6311d4bdd8e214fc33ebe869b826303802 SHA512 0ed887c892b20fc4e162e9d7317d20ceb1cfce2db2cfcfa948995349ae8c97c33520202052d80c01d1122c50fac0772f18245aa40b4b7b7b55917fa533b65cd9
 EBUILD kodi-visualization-waveform-2.0.1.ebuild 702 BLAKE2B f6fc517ed61febf3197a735e36d0e31b27de4b9ebdde134c59350ef35b71bf7d6dc5d419dcfa597562ccb084f81c8ffe5c1da14fabddb478bed780f2d122dd09 SHA512 9789f3388ecb56378b1a8ce097b06d30c2bca2bb5aff926b127e3935b5c9fd52283a658a4b87213ce57958fa4f4df43ce0b1004418539441f5f206f12cdf5ddd
-EBUILD kodi-visualization-waveform-3.0.2.ebuild 802 BLAKE2B 3f525b2c7a779d9b3c457eca8b99ab3b3b13e07df5a05fcdb1a98c12bfe3e8a038b2afce75a60335e4cf84f0aa901c57fc08b75ebc1522900c2f1851626e4ef5 SHA512 ed53a557d41f91b59aee17e7b572e4d9338866c4a0fe0f3205521f0419b13ee1df05836e4e10a7a1afadf8ab826b01d2270cd7ac78cf8d93fbc39f85818720f1
-EBUILD kodi-visualization-waveform-3.1.0.ebuild 802 BLAKE2B 3f525b2c7a779d9b3c457eca8b99ab3b3b13e07df5a05fcdb1a98c12bfe3e8a038b2afce75a60335e4cf84f0aa901c57fc08b75ebc1522900c2f1851626e4ef5 SHA512 ed53a557d41f91b59aee17e7b572e4d9338866c4a0fe0f3205521f0419b13ee1df05836e4e10a7a1afadf8ab826b01d2270cd7ac78cf8d93fbc39f85818720f1
-EBUILD kodi-visualization-waveform-3.1.1.ebuild 802 BLAKE2B 3f525b2c7a779d9b3c457eca8b99ab3b3b13e07df5a05fcdb1a98c12bfe3e8a038b2afce75a60335e4cf84f0aa901c57fc08b75ebc1522900c2f1851626e4ef5 SHA512 ed53a557d41f91b59aee17e7b572e4d9338866c4a0fe0f3205521f0419b13ee1df05836e4e10a7a1afadf8ab826b01d2270cd7ac78cf8d93fbc39f85818720f1
-EBUILD kodi-visualization-waveform-9999.ebuild 803 BLAKE2B 092fb209cd1624f533241bc7b65b9bb552e4d0d8c59275cb7bc5f9f1e0e1b79e4d0dbea04c87f208f365c0c6d0c0d2280189f9a84e011d65f86a951c8288c97f SHA512 3e853054425f4d7663db80866d58c507693786b9ab185cda04678501f35b1e599edf6ea1df0968038b71a97fd95240cd225a5259e7526224fced6d23c94d6eda
+EBUILD kodi-visualization-waveform-3.0.2.ebuild 790 BLAKE2B 8fefba97527dd676eb9082e0ae2a6d668570d6e5d3f3d4939a6e3bbe9f0bd570a754d9f3c096a170a58ff93d542e61bc4df7fda2f4fbe10b0d9fd1917d9a34f5 SHA512 6c607d14537c01cb442e7bd2a1fe26e63887d5aa7f5a0c04b22a46555b19b00a571057466d18e297e2ed09b6c1c1b39cb7b454dff458d4962214273f80a58072
+EBUILD kodi-visualization-waveform-3.1.0.ebuild 790 BLAKE2B 8fefba97527dd676eb9082e0ae2a6d668570d6e5d3f3d4939a6e3bbe9f0bd570a754d9f3c096a170a58ff93d542e61bc4df7fda2f4fbe10b0d9fd1917d9a34f5 SHA512 6c607d14537c01cb442e7bd2a1fe26e63887d5aa7f5a0c04b22a46555b19b00a571057466d18e297e2ed09b6c1c1b39cb7b454dff458d4962214273f80a58072
+EBUILD kodi-visualization-waveform-3.1.1.ebuild 790 BLAKE2B 8fefba97527dd676eb9082e0ae2a6d668570d6e5d3f3d4939a6e3bbe9f0bd570a754d9f3c096a170a58ff93d542e61bc4df7fda2f4fbe10b0d9fd1917d9a34f5 SHA512 6c607d14537c01cb442e7bd2a1fe26e63887d5aa7f5a0c04b22a46555b19b00a571057466d18e297e2ed09b6c1c1b39cb7b454dff458d4962214273f80a58072
+EBUILD kodi-visualization-waveform-9999.ebuild 791 BLAKE2B 5773c6415c9a1844b8633d7b3d7a9d5c76b69fa7094f9e942bcc6fdbfdac1eb50fd201d942172f0f8351d6eccfa1f1c5b5323c0ab46a1dacb134034fdbaf125a SHA512 1e8d48e7a890abc34150f021f21760a1c428920116cd2e7651964271e841d0e9ae2209a40580fa13c1b358a61a36fe37a63177a4eeb371deacd1e3a89ca47cd8
 MISC metadata.xml 438 BLAKE2B 223c9bc0d06814774f32141ee66b19a512091bbcd1658eacb1a1ecdeaeb2c450ddaaa301f2e6914abaa98d34dfbb456c5bf5a94ac9fadfbf84e75421d6233b45 SHA512 7bb4e6ec9690bfe2742cfe205f1e88db4f51f67bc05ee918ca9e181fb707fae8e75887bea9128a3b2d1e8c6cdf5613599b912816bd9b5093877d311bfec8f851
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.0.2.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.0.2.ebuild
index 76374bb700d7..7e98a09050c1 100644
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.0.2.ebuild
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Waveform visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.waveform"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.0.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.0.ebuild
index 76374bb700d7..7e98a09050c1 100644
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.0.ebuild
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Waveform visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.waveform"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild
index 76374bb700d7..7e98a09050c1 100644
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Waveform visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.waveform"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
index 233dd1c45317..a5b8bc69ff3e 100644
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Waveform visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.waveform"
@@ -39,5 +39,5 @@ RDEPEND="
 
 src_prepare(){
 	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/media-plugins/mcp-plugins/Manifest b/media-plugins/mcp-plugins/Manifest
index 145f08be73df..87aa97b53393 100644
--- a/media-plugins/mcp-plugins/Manifest
+++ b/media-plugins/mcp-plugins/Manifest
@@ -1,4 +1,4 @@
+AUX mcp-plugins-0.4.0-makefile.patch 1406 BLAKE2B 605a1324a2882642236313ef256993881cb6dee0c4bdb1ad9054018ab93a23cc5a6394d341a5b19284ca3018d0dce1739aaf931fa424e4638ecbe94855b9bdc6 SHA512 11214d6861ec74ede6846d0af52f1ab4a999de5ef237597f870b9f3c4d790a13045cf74a44c34e2793b8bea85d6fac4a3847b605e8065d83f54e32e1f863fc93
 DIST MCP-plugins-0.4.0.tar.bz2 23637 BLAKE2B 5f68fe60e5368b0753657bfae4fe1605f1600bb15136e3e7ed6c0e612acc9463d22bc387e537eaede3aac4f0808ecb73b7afea288a2a25bd7854e748f49b06cb SHA512 8a5e431ea539a46ce3d3f554fae21fc09028d898e24c316ab1b0d3d6540650107a1d10ce9a4cb6d1f0d2fd8868e2b43cf439f47ed6d90fb066375bbf3883d344
-EBUILD mcp-plugins-0.4.0-r1.ebuild 746 BLAKE2B 95cb0ae8cce92de8b83bce50c8d1868fdc818b5112f37ce5cfeb54127e4b921261a386d05314aff21e12852d188c09c860a1c83c0d2184aeb9f1d8e44975cdd2 SHA512 4bbaaadf7411668c983f13060a6df5bb101748bd6cd57d8ecf4985f5476408e4b516ed92a3c19520afd63af1eb1d0da74ecfac251f1c60518ba930eb56033111
-EBUILD mcp-plugins-0.4.0.ebuild 730 BLAKE2B 981a804523e205c017217633c83c0483389f2e6a276b4076df7028c8a9ccef3cb59039fbd24d7b9d9e5ad3fbdfff648ee37249ee0f15226546680e6f9406e0db SHA512 315b548d7fefbed0b8de522db7a01e0a59414f7973fead296ea624b71614e9f7df99d9f7a24975c43811479cb3c2ebcca28c4368def18786106b0dc7459b972a
+EBUILD mcp-plugins-0.4.0-r1.ebuild 668 BLAKE2B 5e97475e41795dd81b5c3dc16afc1494393835da8fffc259694e9dcc6bf63532d50dab9238349539b9aa1edab90a8e1ea5747fcee27bde366796aa67fb53c187 SHA512 fc6269b897b002219e4f1157922c5d15d55439b32ce602894944f9793ac555fb89ee6d3b28746d94dcab00500eee2ac0f9cf95cceb921f11a39f0873bb5f974a
 MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600
diff --git a/media-plugins/mcp-plugins/files/mcp-plugins-0.4.0-makefile.patch b/media-plugins/mcp-plugins/files/mcp-plugins-0.4.0-makefile.patch
new file mode 100644
index 000000000000..7d733014aa9b
--- /dev/null
+++ b/media-plugins/mcp-plugins/files/mcp-plugins-0.4.0-makefile.patch
@@ -0,0 +1,44 @@
+--- a/Makefile
++++ b/Makefile
+@@ -15,35 +15,36 @@
+ #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+ 
+-CPPFLAGS += -I. -fPIC -D_REENTRANT -Wall -O3
++CXXFLAGS += -fPIC -Wall
++CPPFLAGS += -I. -D_REENTRANT
+ 
+ 
+ all:	mvclpf24.so mvchpf24.so cs_phaser.so cs_chorus.so
+ 
+ 
+ mvclpf24.so:	mvclpf24.o mvclpf24_if.o exp2ap.o
+-	g++ -shared  mvclpf24.o mvclpf24_if.o exp2ap.o -o mvclpf24.so
++	$(CXX) $(LDFLAGS) -shared mvclpf24.o mvclpf24_if.o exp2ap.o -o mvclpf24.so
+ 
+ mvclpf24.o:	ladspaplugin.h mvclpf24.h
+ mvclpf24_if.o:	ladspaplugin.h mvclpf24.h
+ 
+ 
+ mvchpf24.so:	mvchpf24.o mvchpf24_if.o exp2ap.o
+-	g++ -shared  mvchpf24.o mvchpf24_if.o exp2ap.o -o mvchpf24.so
++	$(CXX) $(LDFLAGS) -shared mvchpf24.o mvchpf24_if.o exp2ap.o -o mvchpf24.so
+ 
+ mvchpf24.o:	ladspaplugin.h mvchpf24.h
+ mvchpf24_if.o:	ladspaplugin.h mvchpf24.h
+ 
+ 
+ cs_phaser.so:	cs_phaser.o cs_phaser_if.o exp2ap.o
+-	g++ -shared cs_phaser.o cs_phaser_if.o exp2ap.o -o cs_phaser.so
++	$(CXX) $(LDFLAGS) -shared cs_phaser.o cs_phaser_if.o exp2ap.o -o cs_phaser.so
+ 
+ cs_phaser.o:	ladspaplugin.h cs_phaser.h
+ cs_phaser_if.o:	ladspaplugin.h cs_phaser.h
+ 
+ 
+ cs_chorus.so:	cs_chorus.o cs_chorus_if.o exp2ap.o
+-	g++ -shared  cs_chorus.o cs_chorus_if.o exp2ap.o -o cs_chorus.so
++	$(CXX) $(LDFLAGS) -shared cs_chorus.o cs_chorus_if.o exp2ap.o -o cs_chorus.so
+ 
+ cs_chorus.o:	ladspaplugin.h cs_chorus.h
+ cs_chorus_if.o:	ladspaplugin.h cs_chorus.h
diff --git a/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild b/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
index 252f4d2ca534..6953b27216b7 100644
--- a/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
+++ b/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit multilib toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_P=${P/mcp/MCP}
 
@@ -12,23 +13,22 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="media-libs/ladspa-sdk"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
+PATCHES=( "${FILESDIR}"/${PN}-0.4.0-makefile.patch )
+
+src_configure() {
 	tc-export CXX
-	sed -i -e "s/-O3//" \
-		-e "s/g++/$(tc-getCXX) ${LDFLAGS}/" Makefile || die "sed failed"
 }
 
 src_install() {
-	dodoc AUTHORS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
+	einstalldocs
+
+	exeinto /usr/$(get_libdir)/ladspa
+	doexe *.so
 }
diff --git a/media-plugins/mcp-plugins/mcp-plugins-0.4.0.ebuild b/media-plugins/mcp-plugins/mcp-plugins-0.4.0.ebuild
deleted file mode 100644
index 9170b0e43095..000000000000
--- a/media-plugins/mcp-plugins/mcp-plugins-0.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib toolchain-funcs
-
-MY_P=${P/mcp/MCP}
-
-DESCRIPTION="MCP ladspa plugins package. Includes moogvcf, phaser & chorus"
-HOMEPAGE="http://www.kokkinizita.net/linuxaudio/"
-SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	tc-export CXX
-	sed -i -e "s/-O3//" \
-		-e "s/g++/$(tc-getCXX) ${LDFLAGS}/" Makefile || die "sed failed"
-}
-
-src_install() {
-	dodoc AUTHORS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}
diff --git a/media-plugins/mda-lv2/Manifest b/media-plugins/mda-lv2/Manifest
index a14f14aa8cc7..a57324aa8f8f 100644
--- a/media-plugins/mda-lv2/Manifest
+++ b/media-plugins/mda-lv2/Manifest
@@ -1,3 +1,5 @@
 DIST mda-lv2-1.2.2.tar.bz2 2160906 BLAKE2B 2b0660395b3508247558305a1ec80c27c8e23ae4db3fb6eb30a06df54bca822256f712961dbaf9e318966be8f4c90824ea4246499fa2343a59376ef80f862eb5 SHA512 da9960462a896f8412cc1918e3a7c0bf9d33d5431a1264035705ca21295d52de1e6b5360369b9da519376a78f72b0c750d133d89b04240f3e35a210e4551854a
-EBUILD mda-lv2-1.2.2.ebuild 484 BLAKE2B ef2fed311a7acfce149cb03f0abb23c98299456338c27e3f4a719627cc879d86df703dd6f85c4ff0f290c1085dd0686ec07a08dfc4e368ed6c6052ce63204062 SHA512 18b501e89c3726d02a84e55790a1fc22228ba7ca513c3022c50558b3495d42de8b8dcdb98e9f04f67fc288fd5710b3f59978357ca5b012cc1e48f30f5575fd10
+DIST mda-lv2-1.2.4.tar.bz2 2362219 BLAKE2B 2b943ab585ee55f909161ed562e4cd9a8b57cf1c61e5199ebc6917b5ca6108fd9e8cb4c48517f01c823b9ab7ce96461f6f5ff1c103897aaa8bfd182a5debd2bf SHA512 d2ae0a7531de36ed30d0fa6e377d42d44d8dc67e4893e075b1d850e92c3a2d92f6f80e292e642c71ad1493532a0e06734011028cfec91348cfda02eec62dfe04
+EBUILD mda-lv2-1.2.2.ebuild 480 BLAKE2B 483af10da3a15eecbb1a1d19b86f6a78bf403675ed57882f24a416f8cc7ac04801548b3862bfb98f8fbe0bbeb14587065b2853682f33478399435139c8d53f8b SHA512 0db216bc5789f0a950389db5fe0df840450fcf524442a43223378037347bc7a44e28b61a055233f8705dd0a191cb5eb003e7d3c83d7c940d8b082a5ee5d7d49e
+EBUILD mda-lv2-1.2.4.ebuild 488 BLAKE2B 90c90e348cd49860c77c5f2876423be48badd30c4c0d5d116d0ce736037550a582f538923f1d784a2849c5e59639cd8b2f86c01c2f24e648c5e0e1acdde948c4 SHA512 67e774464ae061ddc47b66ad9dc130c680bcf5281ddba0b2e06c2199442ec0d8af80bde76010a584a1f8ecb565447fa32ae25c70594db2f8e30707a0ba7b1acf
 MISC metadata.xml 1639 BLAKE2B a4ef48117da13a3372fc3edd7a2f5c5a720e710f192193647842d5f1435d1a6976e6d229845c22e372f30313d6fb47cb1915855c529241e1b7a9bcfbc448d600 SHA512 aab04b98a5b005f186f2f81444f24899a2204a79971deb638b7fb8f4907a622c538fc01d5a606d4471a7650539993ee2b668324834f11dde9479d140d7edee19
diff --git a/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild b/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
index 3665803535cc..2386d194918f 100644
--- a/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
+++ b/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils
diff --git a/media-plugins/mda-lv2/mda-lv2-1.2.4.ebuild b/media-plugins/mda-lv2/mda-lv2-1.2.4.ebuild
new file mode 100644
index 000000000000..d01a13cb397b
--- /dev/null
+++ b/media-plugins/mda-lv2/mda-lv2-1.2.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="LV2 port of the MDA plugins by Paul Kellett"
+HOMEPAGE="http://drobilla.net/software/mda-lv2/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/lv2"
+DEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
diff --git a/media-plugins/mediastreamer-amr/Manifest b/media-plugins/mediastreamer-amr/Manifest
deleted file mode 100644
index aa9b65780ef5..000000000000
--- a/media-plugins/mediastreamer-amr/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mediastreamer-amr-0.0.1-include.patch 382 BLAKE2B 7748299337976275a93666236a6751208e8f3c2d2826245d53daba48b9316223bc4daca9332020b198f5cc21d62b37fcd4dcb3a7b9bf76a82231fd26a9da61e3 SHA512 5361ca845c3792da8d1135125e3ba2b470bd12e6f445ebcceac645ba707f065b3f33be33f8b44c1841a4668ee3cb89b0726e364b7e4c098c11478464e12c106c
-DIST msamr-0.0.1.tar.gz 293324 BLAKE2B f5cb8c5f4767e01b4971ba28120ef9735824e96d873b9b52c494dc486344771c910a2153550d366489190f8220236064f7d601cddb7d0e082e33d4ba5d135a61 SHA512 c25d25503eb23e93970d5be3a1317863cb20b0077b2ebf711dbd130e25d83debc4ea7e54eb236342c7073c54fa5002328fba5aafcbc2d495ac7588d639d6b1ab
-EBUILD mediastreamer-amr-0.0.1.ebuild 671 BLAKE2B 6fd36eab801b9e0cd1dd1400256eab542f66b237c89a1dc7daabbdb1d37f94197f2e9a84fba083c45c4e3fe46a52deba72758c23400437cfa9dfe39d5b9cf21e SHA512 d0bb7e595b671a82c1cae15d9c2b212cc7998bfd6f6b518ec9d52a26b8ef63ffa362a3901e63e2319de05bbc330c15410b812d845006e04f852a1169d1615a15
-MISC metadata.xml 250 BLAKE2B 2ea879960a826fa9be35ec3a0988634da4268c54a8f4a484936356f1fac9e100b779dd43d7a3a684f121e5de5bae7195991e4d378d36b18f97155208fae728d0 SHA512 a5334e41fb3acb7a8cce473ca9616ecea8fe484e870173f0a26042cd8aca0bc7fa4fe52e9cf10b7495c44608e15f1c71564b3f92a44611ba830b08785666b2ac
diff --git a/media-plugins/mediastreamer-amr/files/mediastreamer-amr-0.0.1-include.patch b/media-plugins/mediastreamer-amr/files/mediastreamer-amr-0.0.1-include.patch
deleted file mode 100644
index c0f8483ea2b3..000000000000
--- a/media-plugins/mediastreamer-amr/files/mediastreamer-amr-0.0.1-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- msamr-0.0.1/src/msamr.c.orig	2012-06-01 21:12:47.000000000 +0400
-+++ msamr-0.0.1/src/msamr.c	2012-06-01 21:12:59.884661902 +0400
-@@ -21,8 +21,8 @@
- 
- #include <mediastreamer2/msfilter.h>
- 
--#include <interf_dec.h>
--#include <interf_enc.h>
-+#include <opencore-amrnb/interf_dec.h>
-+#include <opencore-amrnb/interf_enc.h>
- 
- /*
-                              Class A   total speech
diff --git a/media-plugins/mediastreamer-amr/mediastreamer-amr-0.0.1.ebuild b/media-plugins/mediastreamer-amr/mediastreamer-amr-0.0.1.ebuild
deleted file mode 100644
index 55acc9c2da4b..000000000000
--- a/media-plugins/mediastreamer-amr/mediastreamer-amr-0.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-MY_P="msamr-${PV}"
-
-DESCRIPTION="mediastreamer plugin: add AMR Narrow Band support"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/plugins/sources/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/mediastreamer-2.0.0:=
-	>=media-libs/opencore-amr-0.1.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-include.patch"
-}
-
-src_configure() {
-	# strict: don't want -Werror
-	econf \
-		--disable-strict
-}
diff --git a/media-plugins/mediastreamer-amr/metadata.xml b/media-plugins/mediastreamer-amr/metadata.xml
deleted file mode 100644
index 4343afde9aa5..000000000000
--- a/media-plugins/mediastreamer-amr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/mediastreamer-bcg729/Manifest b/media-plugins/mediastreamer-bcg729/Manifest
deleted file mode 100644
index ca97e6cf0665..000000000000
--- a/media-plugins/mediastreamer-bcg729/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bcg729-1.0.0.tar.gz 416311 BLAKE2B 5fed416318f60804401b73c389cb13081ae61141e14e56f431b2ac5b2ce6c4582942dae3a4f14ef21f78e5857113e29a5664a7644a6814ef86a53771cef07b2f SHA512 68a6ee07ad830d58ff3b6638a6c9218640ca78c4ea78d5038d9bf94a25d9a2f7c7844f11a3196bba72f9f640666fed13c96f8c0e496a79c7ee78b3cf0f8c9c85
-EBUILD mediastreamer-bcg729-1.0.0-r1.ebuild 572 BLAKE2B 273415f9b79631bd1a42f72ca2c89dce115874556b5a85bb892f6d8ace3dd2bc60511cfe43ccf412af472dc02dbd084fed2a2aa92578aa2ee568b56ace59702c SHA512 79af4f606f3a4cb4974fa2be60f0d753899a4a74e84a8737209a6c291717c00cf1901edce4e11d4c77e60322fc8dc5b53c074277ea237bf66d17eb2052e231d3
-EBUILD mediastreamer-bcg729-1.0.0.ebuild 585 BLAKE2B fcb6e1f564ef4acf2029f4f6f58f18000deaebceffcf338c471f63d097d7f8057ccb1ab6685413822484fa8d217e6da2acb1938b084a523c8824a2ad563b2865 SHA512 5caa1f39f96963e7fe4a48538a2ba7ab2ecef7507a17fdc67b582dddc8b0a70118d71e650e6bc4b67bd2181bed7ac2d6cd08da22ec714879063cd30673d54162
-MISC metadata.xml 250 BLAKE2B 2ea879960a826fa9be35ec3a0988634da4268c54a8f4a484936356f1fac9e100b779dd43d7a3a684f121e5de5bae7195991e4d378d36b18f97155208fae728d0 SHA512 a5334e41fb3acb7a8cce473ca9616ecea8fe484e870173f0a26042cd8aca0bc7fa4fe52e9cf10b7495c44608e15f1c71564b3f92a44611ba830b08785666b2ac
diff --git a/media-plugins/mediastreamer-bcg729/mediastreamer-bcg729-1.0.0-r1.ebuild b/media-plugins/mediastreamer-bcg729/mediastreamer-bcg729-1.0.0-r1.ebuild
deleted file mode 100644
index c731f272a13f..000000000000
--- a/media-plugins/mediastreamer-bcg729/mediastreamer-bcg729-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="bcg729-${PV}"
-
-DESCRIPTION="Backported G729 implementation for Linphone"
-HOMEPAGE="http://www.linphone.org"
-SRC_URI="mirror://nongnu/linphone/plugins/sources/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/mediastreamer-2.8.2:=[ortp]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure(){
-	# strict = -Werror
-	econf \
-		--disable-static \
-		--disable-strict
-}
diff --git a/media-plugins/mediastreamer-bcg729/mediastreamer-bcg729-1.0.0.ebuild b/media-plugins/mediastreamer-bcg729/mediastreamer-bcg729-1.0.0.ebuild
deleted file mode 100644
index e578ac3169b1..000000000000
--- a/media-plugins/mediastreamer-bcg729/mediastreamer-bcg729-1.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="bcg729-${PV}"
-
-DESCRIPTION="Backported G729 implementation for Linphone"
-HOMEPAGE="http://www.linphone.org"
-SRC_URI="mirror://nongnu/linphone/plugins/sources/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/mediastreamer-2.8.2:=
-	>=net-libs/ortp-0.16.0:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure(){
-	# strict = -Werror
-	econf \
-		--disable-static \
-		--disable-strict
-}
diff --git a/media-plugins/mediastreamer-bcg729/metadata.xml b/media-plugins/mediastreamer-bcg729/metadata.xml
deleted file mode 100644
index 4343afde9aa5..000000000000
--- a/media-plugins/mediastreamer-bcg729/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/mediastreamer-ilbc/Manifest b/media-plugins/mediastreamer-ilbc/Manifest
deleted file mode 100644
index 540e79db8696..000000000000
--- a/media-plugins/mediastreamer-ilbc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST msilbc-2.0.3.tar.gz 287297 BLAKE2B 44c79f18c387389e17681de75591ef57543b654f1db7973f5dfdc958f86e3cf23d3620f1705166784fb806c8039cd8e564d0c8bf0f480f853c39001ba8e7f3b9 SHA512 ad2d37f272a413b401b8f2e38df75ac1e43bb70d7a03686f475a8c354a3d039293476e219fc5c629f30fe85bf717c7dd4251f508aa3f5871c6c5f22adeb6d1e9
-EBUILD mediastreamer-ilbc-2.0.3.ebuild 827 BLAKE2B d4860871f470302e80c63d8e0c92af3006434655449cec0760acbe6d912ee4115bd33705945b11506f287c212f4ecb20de902365687a680188a3bef4f0e5052f SHA512 3bcb68f8a4256ef8b19f7cff377e950efa8487eef16fc71b2fbc6f39246a364c1b709a00e304eda319f9c92189a44728dc4f386e103feaad7fd457889f5caeba
-MISC metadata.xml 451 BLAKE2B b969d1a23da12790ac6aca55357f5938b53affb7c1aa335d7e188b891109338d61a60e410bf2ed027fa6d91ea32f903cc4124af6ba371b4cae9cda524f2f7909 SHA512 9ad55c6b96445e0bbd753958b6e35dcc6b626bf73e3b65d7c697760166eb7abf87af596099630e4a808d0e41a6ec200a683eaee2f29fc74ec910691f773cbaa6
diff --git a/media-plugins/mediastreamer-ilbc/mediastreamer-ilbc-2.0.3.ebuild b/media-plugins/mediastreamer-ilbc/mediastreamer-ilbc-2.0.3.ebuild
deleted file mode 100644
index 29f45b8b887b..000000000000
--- a/media-plugins/mediastreamer-ilbc/mediastreamer-ilbc-2.0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-MY_P="msilbc-${PV}"
-
-DESCRIPTION="mediastreamer plugin: add iLBC support"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/plugins/sources/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86"
-IUSE="20ms-frames"
-
-RDEPEND="dev-libs/ilbc-rfc3951
-	>=media-libs/mediastreamer-2.0.0:="
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# dev-libs/ilbc-rfc3951 does not ship pkgconfig .pc file,
-	# so these variables should be set here to satisfy configure
-	ILBC_CFLAGS="/usr/include" ILBC_LIBS="/usr/include -lilbc" \
-	econf \
-		$(use_enable 20ms-frames)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-plugins/mediastreamer-ilbc/metadata.xml b/media-plugins/mediastreamer-ilbc/metadata.xml
deleted file mode 100644
index 24a9310ba3bb..000000000000
--- a/media-plugins/mediastreamer-ilbc/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-	<use>
-		<flag name="20ms-frames">enable 20ms frame size (default is 30ms). Some
-		VOIP providers such as Gizmo5 (aka Sipphone) require the codec to be
-		compiled with the 30ms setting.</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-plugins/mediastreamer-x264/Manifest b/media-plugins/mediastreamer-x264/Manifest
deleted file mode 100644
index 21349c064b77..000000000000
--- a/media-plugins/mediastreamer-x264/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST msx264-1.4.1.tar.gz 291662 BLAKE2B 48e0450730381b23cc555c791a1f43ed9acf5f47248f8d97a3a783aa9d85deb8a91772804df2627c65d3452994374cf1ec3de8fc9f2df66a5a2fc879fb8d429a SHA512 3d73fcea259af5d8c4cb9637538bdc40e0ea197a36eada5184390bda9277b43dfec8b2412edc44bbac2500664d7c007182b0b06f4a702bb22aecc54484fc115f
-DIST msx264-1.4.2.tar.gz 298631 BLAKE2B c56324a3245b1336af53881b10595aa263030adfe810a3dae0735f48af28ad106d810af575938526ca06559763823c7ea78cbbba19ed8468d3f70cb24844f245 SHA512 06416957dcfd5e33418d19c941005a0deb1c18b47cfa8354b0b89f8434d47d649ca3d629bac3e2094ff5b6adc7118f5adc9d32411dd6ec12a8f3a6e96c2e356c
-EBUILD mediastreamer-x264-1.4.1.ebuild 676 BLAKE2B 37a303ed2585a6a1203f4b6412045ab9043edbfbed7c5762c5eb4b43a0fff5913b5456d9ec010acbb31a571c268a7b853ddc772ee70276f21755888f05d79a0d SHA512 14290cad6a06c0bba292f91bedf95166ebff366743bd1432ee5b1bdc16dacb72bd6e7e3331407d56e3f223cf7618b754c1cb2f232808f5f9d5c33e6be2a03cf6
-EBUILD mediastreamer-x264-1.4.2-r1.ebuild 669 BLAKE2B 7b2d82af526e5955705d20fb53353478f523c66dcb0de05096137d20ec2d9466ae05dfdeb7cb723e8753e0a1e0a07b4832e8d7c2915351505de9b52cf508ff43 SHA512 294e3fa3d031ca4409a782cade4bd44bd040fa0d832da27a46613f196947fedbf8959e27a85df2c8ebe340bd8237ddeb2acec697399a6d81cb81051daaa2fa0f
-EBUILD mediastreamer-x264-1.4.2.ebuild 604 BLAKE2B 44c492fa0e00e563ab15160b3e0308a52a97da68d9ca8d69134e52ee2b092a813a0a2f928fb6ebdc974fc6078998675393cc2abf5315d04f468df9fe69836180 SHA512 c265e7cdf7810978e7659e3ba6d478593b517e9bc65dc4b185fcb11e1c53d1085cab224b9b6f36d76d189e097a860188c89756ffd34b3ca545bc74c5aea2d876
-MISC metadata.xml 250 BLAKE2B 2ea879960a826fa9be35ec3a0988634da4268c54a8f4a484936356f1fac9e100b779dd43d7a3a684f121e5de5bae7195991e4d378d36b18f97155208fae728d0 SHA512 a5334e41fb3acb7a8cce473ca9616ecea8fe484e870173f0a26042cd8aca0bc7fa4fe52e9cf10b7495c44608e15f1c71564b3f92a44611ba830b08785666b2ac
diff --git a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.1.ebuild b/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.1.ebuild
deleted file mode 100644
index 01a910b813f3..000000000000
--- a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit multilib
-
-MY_P="msx264-${PV}"
-
-DESCRIPTION="mediastreamer plugin: add H264 support"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/plugins/sources/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/mediastreamer-2.7.0[video]
-	>=media-libs/x264-0.0.20100118
-	virtual/ffmpeg"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS NEWS README"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# strict: don't want -Werror
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--disable-strict
-}
diff --git a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.2-r1.ebuild b/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.2-r1.ebuild
deleted file mode 100644
index 1278d0e07728..000000000000
--- a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="msx264-${PV}"
-
-DESCRIPTION="mediastreamer plugin: add H264 support"
-HOMEPAGE="https://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/plugins/sources/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~x86"
-IUSE="libav"
-
-RDEPEND="
-	>=media-libs/mediastreamer-2.7.0:=[video]
-	>=media-libs/x264-0.0.20100118:=
-	libav? ( media-video/libav:0= )
-	!libav? ( media-video/ffmpeg:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	# strict: don't want -Werror
-	econf \
-		--disable-strict
-}
diff --git a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.2.ebuild b/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.2.ebuild
deleted file mode 100644
index 208125a2de3f..000000000000
--- a/media-plugins/mediastreamer-x264/mediastreamer-x264-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="msx264-${PV}"
-
-DESCRIPTION="mediastreamer plugin: add H264 support"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/plugins/sources/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/mediastreamer-2.7.0:=[video]
-	>=media-libs/x264-0.0.20100118:=
-	virtual/ffmpeg"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# strict: don't want -Werror
-	econf \
-		--disable-strict
-}
diff --git a/media-plugins/mediastreamer-x264/metadata.xml b/media-plugins/mediastreamer-x264/metadata.xml
deleted file mode 100644
index 4343afde9aa5..000000000000
--- a/media-plugins/mediastreamer-x264/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index fa3f5e1c0a02..6531d42c42e1 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,3 +1,3 @@
 DIST qmmp-plugin-pack-1.3.0.tar.bz2 230625 BLAKE2B a26926c81dee6e47c4a97cd40328329722fa3ccc9c244fddb962ef268337b6a9ea7db6b9568af83f469f88cbf4c60c2154b968276209b118f3124871a6764057 SHA512 5d320938cc5cdd540149f131e41c87c0eb5b4db79fa6f6706dcf30177ce988733c291d95c731e14df13a2d1f9af13916de060d8eaf38910bfcef42aac68bc900
-EBUILD qmmp-plugin-pack-1.3.0.ebuild 552 BLAKE2B 44da88b3282066df70eaa9a06cc4268008fbc2953e65c63b943d2d2b8677e4f943449f81d274bdcdc604eb4c033e016f9f60205871223d6f0fba9315cf23b36e SHA512 786524ae52bb0213252826daf396efcaa3aa8d37582fcce5cf58525f5ad772263fdc11670d1916a4d5535fe6c494189de43a6b2df8cd51a45d485c701cf0bf6e
+EBUILD qmmp-plugin-pack-1.3.0.ebuild 546 BLAKE2B 8b17bb09315075a2a48d556bccfd5006244390adcbb9073f3dbdc6263754fdaad25b5dcdafa87f7f791a7e7d52d96d2fb3c797d03bfa0d8f6c08ccf2d0a1b1ad SHA512 e644ae113cad2a31633da41f64d5821067f286f43332ef5149af17b6322f97854dab3ff132a28c4341175a97ff80b9ac708f2507477353284aea3ffaa3ad1f34
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
index 3dce469db1a4..1cbdb39bcfb4 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A set of extra plugins for Qmmp"
 HOMEPAGE="http://qmmp.ylsoftware.com/"
diff --git a/media-plugins/tap-plugins/Manifest b/media-plugins/tap-plugins/Manifest
index c4de7e54afc7..b76259b47948 100644
--- a/media-plugins/tap-plugins/Manifest
+++ b/media-plugins/tap-plugins/Manifest
@@ -1,4 +1,4 @@
 AUX tap-plugins-0.7.3-cflags-ldflags.patch 901 BLAKE2B fac21c62373310ec7a9a1ab067cbeaa8d202f4cc54c84c11757122786f24a2a811a3a032b6d7eb37d43261946160f74ab33c58d50d777a45a152dfe9535f9803 SHA512 f345e823400b7ea3dcdc8a880cc16d476dc4f55662eb041d2ec40de6763c52c05019990a762fd623c257c870874940c974b628e7ce315d6e4cc4babc70e28a90
 DIST tap-plugins-0.7.3.tar.gz 70495 BLAKE2B 6e0974be78fa9a8092555282d1d8a3cb5d11731e78119bd0f71e843f6a7557aebd48cc2c8f3cdcc4f90e52eaea357926c0ad2fc9bd9c95bb361ecb7d181f098e SHA512 c4e9c93b9fd8afb82067cf3a48ae665843da775c3af6124147ff1f8651d96734a4b961c4c5ea48877b32770e6d0b5a793af32a5cbb6e3b9afd5b59c8b3cc2621
-EBUILD tap-plugins-0.7.3.ebuild 755 BLAKE2B 4d3ef2ecd86d55e8011976ba053631f5557a45dcfbc368dd827359a7697a444518f5bec7e2b9ec0ea4158feabc1be119f58c66b5e1c5a367fb0362d8da81ee17 SHA512 e1d3f77ea092490cea8c64f14031253f73e67db7d378e76794fdcc8384a4ddad75aa19459600052c19eb47bedbeb9326b20ac76aee1e02fa49686a9b8cdeedca
+EBUILD tap-plugins-0.7.3.ebuild 675 BLAKE2B c84accc1815f5c1e6bc6752b260236568b382cb6d0d38157452bf8936d86eb64766df99415b5d040b35f109cd22de5b247ffc65dcf9a1ef62e07d117952ce507 SHA512 983f48fa26c940ac111e741e9be49d5e1effcd98122a0dcbbe3a988a3464aaace46f22144e1757cfd15e8cb6e75df04b2e4af1bcf7f6b2875a3f18becb015833
 MISC metadata.xml 1616 BLAKE2B 55ad5ec5fb9218329bd3454b553115c4139d71d6d31a182e0e35750e99963b8b83de92b9c82df3928f7a570395b9bfdf8d5a171a1ff33c7c8443875dca7af9e7 SHA512 876598a8cda8a0331c5fd97d04984a222b2e6a9c0aeffe780f5e970dc1914c75c7e56701fcfa42ef318b0aa88183149f498346a23c5990d6bd7383199c875e01
diff --git a/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild b/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild
index 70f61a49299c..83292e0c71c5 100644
--- a/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild
+++ b/media-plugins/tap-plugins/tap-plugins-0.7.3.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit multilib toolchain-funcs eutils
-
-IUSE=""
+inherit toolchain-funcs
 
 DESCRIPTION="A bunch of LADSPA plugins for audio processing"
 HOMEPAGE="http://tap-plugins.sourceforge.net"
@@ -18,20 +16,18 @@ KEYWORDS="amd64 ~ppc x86"
 DEPEND="media-libs/ladspa-sdk"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.7.3-cflags-ldflags.patch"
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.7.3-cflags-ldflags.patch )
 
 src_compile() {
 	emake CC=$(tc-getCC) OPT_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	dodoc README CREDITS
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
+	einstalldocs
+
+	exeinto /usr/$(get_libdir)/ladspa
+	doexe *.so
+
 	insinto /usr/share/ladspa/rdf
-	insopts -m0644
 	doins *.rdf
 }
diff --git a/media-plugins/vdr-actuator/Manifest b/media-plugins/vdr-actuator/Manifest
index f487adb00bfe..acfdbc5627bd 100644
--- a/media-plugins/vdr-actuator/Manifest
+++ b/media-plugins/vdr-actuator/Manifest
@@ -1,3 +1,5 @@
 DIST vdr-actuator-1.2.1.tgz 91343 BLAKE2B 93c29c026a7e5178e0ec71c7276f01de8afb2bf3360a654029aed6f32dc769a6fb0100900e3dd33ce7386dd09e2bf3952db66b21387346a043b8b096e0a64602 SHA512 faed02e0dfd1027e412418023caba7c257d6f7c46ebca89139436bf2769c3b928f103ab2e1d90bd0836db32356e3fa238d5fbef6c5548415cefee0f09c96fd66
-EBUILD vdr-actuator-1.2.1.ebuild 576 BLAKE2B 35f0cc61d8dd706e1254bedceebdbb35bb86ed460a730e0e6b767ab5641120e8cc0d0b026830511859b17c611b7fb778358486dddd3ba9cd8c807cf0b538dd05 SHA512 4a49c95ab4395aca9749f17d1930bb9b6e16ba7a98443b53151730e1de36ce2a2d9943e4ac9f17c56f80525cd196c99c7eca0dab7478e1ca64399588749756cc
+DIST vdr-actuator-2.4.1_pre20181025.tar.gz 122233 BLAKE2B f49cfe08f9201fa0d2795e12acbb2c981fbf7e91a9609930deb70d8d642ef5aec3d740af3d0613ec1f9332a5e08135ab05fd2eb4a6d1ab0da18b1b1a9378b5a8 SHA512 f2a79534d3bbb1320b75be7a870e7cce95bbd814f82bbfa61ab30bafeb333dcf3220a4f9c470f4390b691aa2cf745f565e45d776e4ae170ff940132e1dcecaac
+EBUILD vdr-actuator-1.2.1.ebuild 545 BLAKE2B ab32426ea8a0ef046d1c243d5685607f62f2f086d8b62e3088fff5b80e37a16dc317a29ea4b526cedb861a2301f5f842407e436131e35ea6c5615802f3af5cab SHA512 40b02c715bc3a70feb78f1fd9048b9dd5cee56215791b8b638bd1f41fa2b9ec6582274cfe59056b5a721ede1e260f6f1ba695f14bc09cab486e19fe4c05a19d0
+EBUILD vdr-actuator-2.4.1_pre20181025.ebuild 685 BLAKE2B d93d0187068696eafb108535057a70d89aa8c8f33c3f41959e417def38d1d0c456a7e218d097f83a28a3ce18af59f1fdc02b5d198f4de95b443765aaf124c625 SHA512 5a7e7062aca1e4a3857e644d7a9f316d499dba4a58d91f10d7966968ac428f46e651c0cbacdbabd5ec7ac28f657f96f1830514a7ab9ad7ca8abcbf6f36ef32ad
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-actuator/vdr-actuator-1.2.1.ebuild b/media-plugins/vdr-actuator/vdr-actuator-1.2.1.ebuild
index 5211357b3053..858a5bac4523 100644
--- a/media-plugins/vdr-actuator/vdr-actuator-1.2.1.ebuild
+++ b/media-plugins/vdr-actuator/vdr-actuator-1.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
@@ -12,10 +12,8 @@ SRC_URI="http://ventoso.org/luca/vdr/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND=">=media-video/vdr-1.7.23"
-RDEPEND="${DEPEND}"
 
 src_prepare() {
 	vdr-plugin-2_src_prepare
diff --git a/media-plugins/vdr-actuator/vdr-actuator-2.4.1_pre20181025.ebuild b/media-plugins/vdr-actuator/vdr-actuator-2.4.1_pre20181025.ebuild
new file mode 100644
index 000000000000..f07e61092cf5
--- /dev/null
+++ b/media-plugins/vdr-actuator/vdr-actuator-2.4.1_pre20181025.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_VERSION="c810abffbf6dc6f1f354b0c545abe65311203fd8"
+
+DESCRIPTION="VDR plugin: control an hor. or ver. actuator attached trough the parallel port"
+HOMEPAGE="http://ventoso.org/luca/vdr/"
+SRC_URI="https://github.com/olivluca/vdr-actuator-plugin/archive/${GIT_VERSION}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-video/vdr-2.4"
+
+S="${WORKDIR}/${PN}-plugin-${GIT_VERSION}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include "${S}/scanfilter.h"
+	fix_vdr_libsi_include "${S}/scanfilter.c"
+}
diff --git a/media-plugins/vdr-avards/Manifest b/media-plugins/vdr-avards/Manifest
index 8eed2ad4bea4..08f79861de01 100644
--- a/media-plugins/vdr-avards/Manifest
+++ b/media-plugins/vdr-avards/Manifest
@@ -1,3 +1,5 @@
 DIST vdr-avards-0.2.4.tar.bz2 24865 BLAKE2B 13d14a923869054145e7cc30515271ff5676dcdc14d6a7237934deec17d9b2ae52b34df5d32b00f415c744d16311dc2af9e7c28bb9842244e6b024b89d9bba5a SHA512 d878016d83317ff4d8a6fc121344615d508f1dc1c8b1d555a9e94cb02725353fe8c9f274cbeca45b5ee46e384379128a8c1d1ec8833aa10454d7bef1be02fc83
-EBUILD vdr-avards-0.2.4.ebuild 836 BLAKE2B 5aac47d4557b31b35ec768fa78b3a8393b1298fd68a8ee23954b1abcc53ac52065920b5134eedc7756cdaab95ab8dc05f6a3480725b9d006069b4cf192876004 SHA512 ef78e7d679dd8f2d239a685b38f985d436ac9bc2313322853ce56496bf3698b6dae19f966976fd3da8e903b4b242de71e93f5ad541bf5c4e74f6166b8086226f
+DIST vdr-avards-0.2.6.tar.bz2 26190 BLAKE2B 56bd73baeea816dfdb0c1c67b9699236a62f29333f97ee9a962ecf215f153e427ff738e24af2faa531c272075a0e7eb4fea6dc8f627bf3023caeb8d132b1d3c1 SHA512 945182b77d4dd5fc927d0fb28635183a29dcf45addc3ce8fee50e00bf5f12823fa20e707736f87b43c53c821c149365c8b4e47390ca70ad0a63f01b544ccc024
+EBUILD vdr-avards-0.2.4.ebuild 834 BLAKE2B a7eb4c13e94155b58b0cb14ada352bcee53c53d671a8984946873aece6740d1972981e3bb3fcb5e147e8573c563f53bf569755d4200ac4694f9b32902dcc9ffb SHA512 ae0adb8dfeb1195562317ee0fcfae3147834bb762eeea2391f9b210d0e7db7fc21e2beee2941af039da75573c462b27ce66004ae9fd90da7480638b6a8258231
+EBUILD vdr-avards-0.2.6.ebuild 583 BLAKE2B 33df7761f2fc528f2801cbf40b72ffde42f678d30493963dfee9b96db2e3e3cc9fb33d2a3ae67f4f5c7bde0f280f16dcc66df15b668a3734463a22bad17cea44 SHA512 b6437610641e81fdce3db3709c0dfc2c593a8590f41638d467e158bfecbe88881da185a1cc85e3e94f3db869b6d818377d2bd2205cccc8958e5d56cd0fe10135
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild b/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild
index 6df2555f3514..d00e7f4ea89f 100644
--- a/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild
+++ b/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="VDR Plugin:  Automatic Video Aspect Ratio Detection and Signaling"
 HOMEPAGE="http://firefly.vdr-developer.org/avards/"
 SRC_URI="http://firefly.vdr-developer.org/avards/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/media-plugins/vdr-avards/vdr-avards-0.2.6.ebuild b/media-plugins/vdr-avards/vdr-avards-0.2.6.ebuild
new file mode 100644
index 000000000000..2b5ba1064f50
--- /dev/null
+++ b/media-plugins/vdr-avards/vdr-avards-0.2.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin:  Automatic Video Aspect Ratio Detection and Signaling"
+HOMEPAGE="http://firefly.vdr-developer.org/avards/"
+SRC_URI="http://firefly.vdr-developer.org/avards/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-video/vdr"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# revert wrong implementation of vdr-2.4. feature
+	sed -i Makefile \
+		-e "s:\$(INCLUDES) -o \$@ \$<:\$(INCLUDES) -o \$<:" || die
+}
diff --git a/media-plugins/vdr-burn-templates/Manifest b/media-plugins/vdr-burn-templates/Manifest
index d8484a0f3945..5522543b9d49 100644
--- a/media-plugins/vdr-burn-templates/Manifest
+++ b/media-plugins/vdr-burn-templates/Manifest
@@ -1,3 +1,3 @@
-DIST vdr-burn-templates-0.0.2.tar.gz 27585592 BLAKE2B ec1207fc9614e376fd882579fa46ec52d978757ecb9c3dcd21ee83b3f2bc6405460dc0fd014607ca77a79753eb7ca55ce6f8fa374c126fc0dcca9e2e9a273868 SHA512 b76c38a6933f3dc0872f07f905e3a41dcae66e211d38c1792fb3adcf9db6d7f46eb839d6a7ea923ea1226f6ac4e838ff473a60abc828389d6e61e2e7c16908ac
-EBUILD vdr-burn-templates-0.0.2.ebuild 532 BLAKE2B f1c4fcc3ec6082c3933cb197acfc744e953698f182548228cdc62f0e40cb776c2e98982129b7c9c6c9d3fbc4c98b0d9b20574cd57775408c1c3f53139f4c04bc SHA512 962a0d0d50eccdc09226a95d5353821b6f34856f750706250a13a7ed63bd4d801a6e3bf76070341dc9000fa5c279efe1d3ef3e2c17bcbf63f26515a8eb42eeab
-MISC metadata.xml 324 BLAKE2B a4dd896da8e5cecd387ea115e878cffe1d01980be114e52796a1e2c46320db6ad7c559f78f53ae3f9a57ce457f5bc729c5a40bc47c2a2cb10828d6cbdcfc763f SHA512 f7e090070e7538c1610d8e053dddfd16dc70fd3d4c150539d5eda74c3ba5daa590763e378aae2afcf5d1bb762f5ae618ef00ab7ae0232151b5a1145aa8af8924
+DIST vdr-burn-templates-0.0.3.tar.gz 27331854 BLAKE2B ed6bc29f6884b78200608d0baf6f6f66538dd552bb0ad8b4c67f3881db889f0a5d685c3c76ef7110b0580a7d4290ad2a4e98d0f3161fda9975b7be9267e5f427 SHA512 c4719227f20cbe4cfe352ae954816e8463f8fc9448f68761b4609fc903b0d3440e532065acade9792e11fdb404b3da11bf05f49d282dd9174dd7fd979b4cfa46
+EBUILD vdr-burn-templates-0.0.3.ebuild 539 BLAKE2B 4176fc697921093e14bbfcf451c0aa84af9910fe74cda819081363dc6ea117f31dfbc7c61726ce37ca60731b5e328065f7c22fa87488b424a0c3566f060e33bb SHA512 163c5d5592666adcd9342a7442128617fa146310627f78661ebc9e2451a6559e474c9588052411d0f9fc417f74615958c821bb70d077612e0a8c930be7a2753b
+MISC metadata.xml 437 BLAKE2B 036c7bbefcdaf9177bd5815cc9ece4330647255c26fe6d047fade4725c1c2cf0439d69a71fd68859faa0511778709ae775dd55a1059a0420eff7cd4d8f546ebe SHA512 54f643aacd0e9d21e6f80ab748ab4f31130923931158248443d4c43264ea29bd8bc776a99dbcacf06e76183d2c9eb44d20589c710ba91b63544d52cdf28622f6
diff --git a/media-plugins/vdr-burn-templates/metadata.xml b/media-plugins/vdr-burn-templates/metadata.xml
index 3b87101de979..a15834650d4b 100644
--- a/media-plugins/vdr-burn-templates/metadata.xml
+++ b/media-plugins/vdr-burn-templates/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>hd_brummy@gentoo.org</email>
+		<name>Joerg Bornkessel</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-plugins/vdr-burn-templates/vdr-burn-templates-0.0.2.ebuild b/media-plugins/vdr-burn-templates/vdr-burn-templates-0.0.3.ebuild
index 92eaf5c9ac8a..a37bb9f70ba9 100644
--- a/media-plugins/vdr-burn-templates/vdr-burn-templates-0.0.2.ebuild
+++ b/media-plugins/vdr-burn-templates/vdr-burn-templates-0.0.3.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="DVD-themes (background and menu) for vdr-burn"
 HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Vorlagen_(burn-plugin)"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.2" # only
 SLOT="0"
@@ -22,5 +20,5 @@ src_install() {
 
 	insinto /usr/share/vdr/burn
 	insopts -m0644 -ovdr -gvdr
-	doins "${S}"/*
+	doins "${S}"/*.png
 }
diff --git a/media-plugins/vdr-burn/Manifest b/media-plugins/vdr-burn/Manifest
index 15aaa089b44f..96c411739d54 100644
--- a/media-plugins/vdr-burn/Manifest
+++ b/media-plugins/vdr-burn/Manifest
@@ -4,6 +4,11 @@ AUX vdr-burn-0.2.2-missing-include-for-function-setpriority.patch 257 BLAKE2B fe
 AUX vdr-burn-0.2.2-r1_gentoo-path.diff 1785 BLAKE2B bf3d30e237ffdbfc646c1164f29c1502929ba239abe3e68f4f65b59bfcf35ad722060974f28b2b2dc5d85af16f9648dd04c3975b812ab84b55e172453b39a113 SHA512 dc0de52eaca3cb2cca328ed5e43347ccdfee4ee7e788d1da5f9bd3c0b2b4eed2945bd270dccd726a6d3170e019c91faaa6b80cda55e9a56dc6bad438fadaf41b
 AUX vdr-burn-0.2.2_makefile.diff 563 BLAKE2B f10f9a5b1fd1033c142d0e805fadde5e9819989749380ef51deadf2e42231c5423e8c8d72fbab2148d6af6f3f07654d990abac48451bfe8565b0021a0fa7f41c SHA512 50afaabe343ef97625776b8bfcaef8c85a11af9fb285e997c6b4c297dc0ec0079454c9d05b1e904b858704e0738aaee7e5a70b406600861fc8c1ce9887b7dd95
 AUX vdr-burn-0.2.2_setdefaults.diff 1899 BLAKE2B f0635ba1234acea63cdd70737b1310fcf09b824671cbc1451a357b44e90e000366313ef49ec5748cde5601d20ebab4e3c29c2379e732bcb4a308a6eab65289a2 SHA512 29107da7b0dd0a1b149ff326dd4e593a59a9203aabcee7ac5f0bfa204d35e863ba6d296f4f804baab8f68cc42f09649e90814e65c90578b712c38e624ae819a7
+AUX vdr-burn-0.3.0_dmh-archive.patch 526 BLAKE2B d65d2a905c546c1ada1d831331fca1f67b5412450de12cedf6da035b89f7ed6339a53196747f0a140cdbdd9585994162ef95710f093548a04779a7b6d3d5b462 SHA512 e21d7446c629e7f5870a0d50c4cadb28f4b1a4b2fa97c681422d5dcfdca32fce376678bfe67abed044db85982a0c661b2428ceba0d43b518ad55cce0901dc37b
+AUX vdr-burn-0.3.0_gentoo-path.patch 1634 BLAKE2B a84b8d41d3b79aa92c1873390069ad4c11adb57ed6c92405a672695c382a754da0a7e2114c9cef67c93dbdb1cfca16db19dd053e21506a1ed6e1e7eadcf427e8 SHA512 42480240defbb3df63ec0a4fae64d4e5b153aa36fe05d2afa5436f013ac3d5404981d9d22aded02b788c49778f0d776b5e98cefd6a9de256bc518938ac307ebd
+AUX vdr-burn-0.3.0_setdefaults.patch 1904 BLAKE2B 382d146c2d642f0c97f259983f24367619d8d14b44ab495478b8fe7ad2b14aadb06314e6fa54dd8d20cab8da96b526c2f858dc9bc884ca248b2a3a2643b77d72 SHA512 b35f067c28129e592fda788e458831ea1e7f4bf43ffacb111f75da7163ae1f74014aa320acc3c56b1f0ef320c092266603e677c98947db3432913e9c5f05409c
 DIST vdr-burn-0.2.2.tgz 253570 BLAKE2B ac31f5d056e5fc92a43f12d506b7d91fc2063cd32f4dc591dd3c71003a98d1dd117c1869c954ac32ff85efea56429473f11429738d4d475f52c46bab1788c05a SHA512 06e490ff238f35122c2bcb7b2d98500a183409c8e855748609fa43dab661cd4ef5bf492cd17ccf5c7b9b26373cb994b3e35dd20edafccfa8bf186318c8fcc346
+DIST vdr-burn-0.3.0.tgz 469211 BLAKE2B e4448f40a058e6e51834966c8a8e6f407f8a2badaa1a5517a761a65d0087ef910445f8f35225c65335ac8407c1948fb7f35ed25c0fcf098addcfccfc9bf2b8df SHA512 a2ffe264c4fb33807bcc37f69e969a61c6af5de320a4564595f1520593dddb90f62d380ab1266ca07f7f2cda8b10b45f3cff545e185dbe1b204e813d2f06ccda
 EBUILD vdr-burn-0.2.2-r1.ebuild 2951 BLAKE2B 62e3b33b145b9b5b6bd42002a7c98382f20de42b8ac5aef9adf79c49e6a70515d06effcbdf06d1470e5cefe09bdfc21365e938965224eccecb5eb7450456cee9 SHA512 ca0c9322166a8b335cd6e4d72cfb2568c3dbd23a805d17ee7f0a5746739659b26cdc0080e39ea9b07f5263e90794ad0a031ad92b1a23a86ca911c88e932a8403
+EBUILD vdr-burn-0.3.0.ebuild 2609 BLAKE2B 274d95cc616c0f98835a565dbf94e9c7b37d0e45fdb6ed2325dc76ad4485a5b1a0d8022b061a5014f21e1ebf77d72c7e5173d213edd3be8629803d4d52e82f44 SHA512 846b2f1669010068662c685c9ceaeb7d73b4e2bf5ac6bb745ebb8a85dcc8f9fc5f52762e5b697e9f40b9d32e5a3c89740e3251b6286f2658377843ec07a17d7a
 MISC metadata.xml 400 BLAKE2B 0683406aa4dc53b7f5eb0f98f0d93ac693776fcbdad8082b651f47e2a67b15b740918c26a62bb20648124573352b3d1ad1b04e381b40e981099b6579bfda5d02 SHA512 8f042c060eb2358756e19aa592dadfb351b26f9db2f4cb8c4538f0d60a84794b74d2ef1d4bf982e1bf035f4d33fac48df71db72a8a33adcaf39d89d1beb77e05
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.3.0_dmh-archive.patch b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_dmh-archive.patch
new file mode 100644
index 000000000000..bd5f47853e1c
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_dmh-archive.patch
@@ -0,0 +1,14 @@
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (27 Dev 2019)
+diff -Naur burn-0.3.0.orig/Makefile burn-0.3.0/Makefile
+--- burn-0.3.0.orig/Makefile	2019-12-27 17:55:11.518492713 +0100
++++ burn-0.3.0/Makefile	2019-12-27 17:55:53.903492713 +0100
+@@ -12,6 +12,9 @@
+ 
+ PLUGIN = burn
+ 
++# Enable DMH Archive
++#ENABLE_DMH_ARCHIVE = 1
++
+ ### The version number of this plugin (taken from the main source file):
+ 
+ VERSION = $(shell grep 'const char\* plugin::VERSION *=' $(PLUGIN).c | awk '{ print $$5 }' | sed -e 's/[";]//g')
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.3.0_gentoo-path.patch b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_gentoo-path.patch
new file mode 100644
index 000000000000..6c16cdab9888
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_gentoo-path.patch
@@ -0,0 +1,45 @@
+fixed some path for gentoo
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (27 Dec 2019)
+diff -Naur burn-0.3.0.orig/burn.c burn-0.3.0/burn.c
+--- burn-0.3.0.orig/burn.c	2019-12-27 17:35:29.724492713 +0100
++++ burn-0.3.0/burn.c	2019-12-27 17:40:46.640492713 +0100
+@@ -90,12 +90,12 @@
+ 
+ 	bool plugin::Start()
+ 	{
+-        m_configPath = ConfigDirectory(PLUGIN_NAME);
++        m_configPath = "/usr/share/vdr/burn";
+         m_resourcePath = ResourceDirectory(PLUGIN_NAME);
+ 
+ 		manager::start();
+ 		logger_vdr::start();
+-		gdwrapper::setup::set_font_path( get_resource_path() + "/fonts" );
++		gdwrapper::setup::set_font_path( "/usr/share/fonts/corefonts" );
+ 		if ( !skin_list::get().load( get_resource_path() ) )
+ 			return false;
+ 
+diff -Naur burn-0.3.0.orig/scripts/vdrburn-dvd.sh burn-0.3.0/scripts/vdrburn-dvd.sh
+--- burn-0.3.0.orig/scripts/vdrburn-dvd.sh	2019-12-27 17:35:29.726492713 +0100
++++ burn-0.3.0/scripts/vdrburn-dvd.sh	2019-12-27 17:44:42.407492713 +0100
+@@ -78,7 +78,7 @@
+ 	;;
+ 
+ 	demux)
+-		[ -r $CONFIG_PATH/vdrburn-dvd.conf ] && . $CONFIG_PATH/vdrburn-dvd.conf
++		PROJECTX_JAR="/usr/share/projectx/lib/projectx.jar"
+ 		[ -z "$JAVA_EXE" ] && JAVA_EXE=$(which java)
+ 
+ 		[ ! -x "$JAVA_EXE" ] && echo "ERROR: java executable \"$JAVA_EXE\" not found" && exit 1
+@@ -92,9 +92,8 @@
+ 			CUT="-cut $MPEG_DATA_PATH/px.cut"
+ 		fi
+ 
+-		$IO_NICE $JAVA_EXE -Djava.awt.headless=true \
+-				-jar $PROJECTX_JAR \
+-				-ini $CONFIG_PATH/ProjectX.ini \
++				/usr/bin/projectx_cli \
++				-ini /usr/share/vdr/burn/projectx-vdr.ini \
+ 				$TTXT_OPTS \
+ 				$CUT -id $USED_TRACKS \
+ 				-demux -out "$MPEG_DATA_PATH" -name vdrsync \
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.3.0_setdefaults.patch b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_setdefaults.patch
new file mode 100644
index 000000000000..ce8b968e5bc0
--- /dev/null
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.3.0_setdefaults.patch
@@ -0,0 +1,32 @@
+set default settings
+unset gentoo unsupported packages (m2vrequantizer)
+disable unneeded menuentrys
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (27 Dec 2019)
+diff -Naur burn-0.3.0.orig/setup.c burn-0.3.0/setup.c
+--- burn-0.3.0.orig/setup.c	2019-12-27 17:47:45.556492713 +0100
++++ burn-0.3.0/setup.c	2019-12-27 17:50:10.063492713 +0100
+@@ -85,10 +85,10 @@
+ 	//!--- plugin_setup -----------------------------------------------------------
+ 
+ 	plugin_setup::plugin_setup():
+-			PROCTOOLS_INIT_PROPERTY( RemovePath,          false ),
++			PROCTOOLS_INIT_PROPERTY( RemovePath,          true ),
+ 			PROCTOOLS_INIT_PROPERTY( CustomDiskSize,      200 ),
+ 			PROCTOOLS_INIT_PROPERTY( BurnSpeed,           0 ),
+-			PROCTOOLS_INIT_PROPERTY( RequantType,         requanttype_m2vrequantiser ),
++			PROCTOOLS_INIT_PROPERTY( RequantType,         requanttype_transcode ),
+ 			PROCTOOLS_INIT_PROPERTY( PreserveLogFiles,    false ),
+ 			PROCTOOLS_INIT_PROPERTY( DefaultLanguage,     0 ),
+ 			PROCTOOLS_INIT_PROPERTY( MainMenuStatus,      true ),
+@@ -228,8 +228,8 @@
+ 		m_defaults = job_defaults();
+ 
+ 		Add( new menu::text_item( tr("--- Common settings --------------------------------------------------") ) );
+-		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
+-		Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
++//		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
++//		Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
+ 		Add( new menu::number_edit_item( tr("Burn speed"), m_setup.BurnSpeed, 0, 32, tr("unlimited") ) );
+ 		Add( new menu::bool_edit_item( tr("Preserve logfiles"), m_setup.PreserveLogFiles ) );
+ 		Add( new menu::list_edit_item( tr("Spare language code"), m_setup.DefaultLanguage, track_info::get_language_codes(), false ) );
diff --git a/media-plugins/vdr-burn/vdr-burn-0.3.0.ebuild b/media-plugins/vdr-burn/vdr-burn-0.3.0.ebuild
new file mode 100644
index 000000000000..dc8e31f4c6a3
--- /dev/null
+++ b/media-plugins/vdr-burn/vdr-burn-0.3.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+VERSION="2028" # every bump, new version!
+
+DESCRIPTION="VDR Plugin: burn records on DVD"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-burn"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="dvdarchive"
+
+DEPEND="media-libs/gd[png,truetype,jpeg]
+	media-video/vdr"
+RDEPEND="${DEPEND}
+	app-cdr/dvd+rw-tools
+	dev-libs/libcdio
+	media-fonts/corefonts
+	media-video/dvdauthor
+	media-video/mjpegtools[png]
+	media-video/projectx
+	media-video/transcode
+	virtual/eject"
+
+# depends that are not rdepend
+DEPEND="${DEPEND}
+		dev-libs/boost"
+
+S="${WORKDIR}/${P#vdr-}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	eapply \
+		"${FILESDIR}"/${P}_gentoo-path.patch \
+		"${FILESDIR}"/${P}_setdefaults.patch \
+		"${FILESDIR}"/${P}_dmh-archive.patch
+
+	use dvdarchive && sed -i Makefile \
+		-e "s:#ENABLE_DMH_ARCHIVE:ENABLE_DMH_ARCHIVE:" || die
+
+	sed -i Makefile \
+		-e 's:^ISODIR=.*$:ISODIR=/var/vdr/video/dvd-images:' || die
+
+	sed -i Makefile -e 's:DEFINES += -DTTXT_SUBTITLES:#DEFINES += -DTTXT_SUBTITLES:' || die
+
+	# do not install deprecated fonts, do not install in /etc/vdr/plugin config dir
+	sed -i Makefile \
+		-e "s:install-res install-conf::" || die
+
+	# ttf-bitstream-vera deprecated, bug #335782
+	sed -e "s:Vera:arial:" -i skins.c || die
+
+	# fix deprecated warnings pkg-config
+	sed -i Makefile \
+		-e "s:gdlib-config:pkg-config gdlib:" || die
+
+	fix_vdr_libsi_include scanner.c
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /usr/share/vdr/burn
+	doins "${S}"/resource/menu-silence.mp2
+	newins "${S}"/resource/menu-button.png menu-button-default.png
+	newins "${S}"/resource/menu-bg.png menu-bg-default.png
+
+	newins "${S}"/config/ProjectX.ini projectx-vdr.ini
+
+	dosym "${EPREFIX}"menu-bg-default.png "${EPREFIX}"/usr/share/vdr/burn/menu-bg.png
+	dosym "${EPREFIX}"menu-button-default.png "${EPREFIX}"/usr/share/vdr/burn/menu-button.png
+
+	insinto /usr/share/vdr/burn/counters/
+	doins "${S}/config/counters/standard"
+
+	fowners -R vdr:vdr /usr/share/vdr/burn
+}
+
+pkg_preinst() {
+	if [[ -d ${EROOT}/etc/vdr/plugins/burn && ( ! -L ${EROOT}/etc/vdr/plugins/burn ) ]]; then
+		einfo "Moving /etc/vdr/plugins/burn away"
+		mv "${EROOT}"/etc/vdr/plugins/burn "${EROOT}"/etc/vdr/plugins/burn_old
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	if [[ -e ${EROOT}/etc/vdr/reccmds/reccmds.burn.conf ]]; then
+		eerror "\nPlease remove the following unneeded file:"
+		eerror "\t/etc/vdr/reccmds/reccmds.burn.conf\n"
+	fi
+}
diff --git a/media-plugins/vdr-calc/Manifest b/media-plugins/vdr-calc/Manifest
index 32b1ac37331d..377b319db77b 100644
--- a/media-plugins/vdr-calc/Manifest
+++ b/media-plugins/vdr-calc/Manifest
@@ -1,4 +1,4 @@
 AUX vdr-calc-0.0.1_rc5-gcc4.diff 632 BLAKE2B e70f7ae35293d6b5b41ee7b52ff8fe6a8ef83f62ae086c41f8afcf0ec6d1efb0cee55ac0908a1fc3060d1401adbed842bff72125e500580e4ff77318278e4329 SHA512 5de3ef520fe51d281ce78b4c02a091d91ac612588672ae04757c107bd9ae9e79410a390e807782be2f757f563003fbd385cbb29ab24a6afd6b51bf2d6498963c
 DIST vdr-calc-0[1].0.1-rc5.tgz 12460 BLAKE2B c60ee2f6f8d8e0070ee0d96409d069fdc599d737fedb79c14a0bfb1c8d1ccdfca84d54fd516ec6dc1b81f282be5e9f5908668358c88b1c3aaa91fb39adc727ab SHA512 7b8550246ec9b37c7deedafc91cb337c7d02466959d6b8f96e7b6cbce88e2dec7d42d5add4311c0a876cabb87288394f9a1b3711ee11b3ee6f838974c65a0814
-EBUILD vdr-calc-0.0.1_rc5.ebuild 500 BLAKE2B 764be362d7d4193dd21e539340d878f17a54f0d11e8f7a1bfb2b14c0a596a7aa5f11bc8248522cc411f702459144cfe10ce737606ae8ca618a6294a3f56a92f6 SHA512 1389d9a604b59174e2fc8dafb329b942f44de88312386c4c0825b4308a0ea67ffaa6f8065f7be37295dd6527baa9c3a164782f4ba159165f56369641bdcacfc8
+EBUILD vdr-calc-0.0.1_rc5.ebuild 488 BLAKE2B e1aa14bb24aaa7e5b65f9c85e0ef0748fd72eb2ef74f87c67c1f7c78a1ec4cc2433f1ac50693fe0fe65563c8617d3f56cbd30055ad3d8f8265fbd457b5d13ca1 SHA512 c108c2e40b68499384cdad8147e47789e53cbe94e252ebda85bab7aed88379ff118ea17515fddae155c7734584f2419f7ae60316a9cd4dbcd39d1e9d95f5302c
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-calc/vdr-calc-0.0.1_rc5.ebuild b/media-plugins/vdr-calc/vdr-calc-0.0.1_rc5.ebuild
index 36e6dc34c389..4b8c51e500ad 100644
--- a/media-plugins/vdr-calc/vdr-calc-0.0.1_rc5.ebuild
+++ b/media-plugins/vdr-calc/vdr-calc-0.0.1_rc5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: OSD Calculator"
-HOMEPAGE="http://www.vdrcalc.bmschneider.de/index2.html"
-SRC_URI="http://www.vdrcalc.bmschneider.de/dateien/${PN}-0[1].0.1-rc5.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${PN}-0[1].0.1-rc5.tgz"
 
 KEYWORDS="~amd64 x86"
 SLOT="0"
diff --git a/media-plugins/vdr-coverviewer/Manifest b/media-plugins/vdr-coverviewer/Manifest
deleted file mode 100644
index 6a3c0a2cb525..000000000000
--- a/media-plugins/vdr-coverviewer/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX vdr-coverviewer-0.0.2-vdr-1.5.x.diff 770 BLAKE2B f6a26e96b2f53caf005d017f59be5f8f04f611e91d8b1c962287bdb76b4aedb43ddbc276b7f11904fa231fb745705d8668ef01ecd5dcbce96eb0a10aadbc741f SHA512 ce1347dc7dc9b1806e72f093010c331487172f428dc8f6b7f2d7724b1bebe3432175e761e933547001c81ec32e53668df5b894c127822c26fcae83fa6124d2b0
-DIST vdr-coverviewer-0.0.2.tar.gz 66187 BLAKE2B 4cecad1d4805725a4864d1d481492d8a1ff26437dee7ec9eb6a032989a86a1f699c70fa04e513d71275d5d3cf6de2eae5a583701f7ac6d3667fd4b3d97c63cad SHA512 17bac6c700eb39278f3cbbe7833cebab78a1998a8ec6e86bd61cc1c532cf02cc091ecb0174b785f4b7ebb87cd107e9bee0852a85a2b53c276689fe3326e218d3
-EBUILD vdr-coverviewer-0.0.2.ebuild 636 BLAKE2B aa9a30552219b809a6bb2766caed7364de47b77ec35260fd204f45407888a1381b8d3475b912540adb9492d3c02cef12bf1b5ae9fdee5ab55606670bab20c70a SHA512 6fefd2c5415b22d1341ad81d07a31557dfba0c2a2687debd14936d87302dabe1fb3b116d3ff4d51dddba8e85be3476d4e5a5c4ddeb06fe839e6da556a2e03dbb
-MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-coverviewer/files/vdr-coverviewer-0.0.2-vdr-1.5.x.diff b/media-plugins/vdr-coverviewer/files/vdr-coverviewer-0.0.2-vdr-1.5.x.diff
deleted file mode 100644
index d70d006ed1fd..000000000000
--- a/media-plugins/vdr-coverviewer/files/vdr-coverviewer-0.0.2-vdr-1.5.x.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- control-image.c~	2007-05-18 14:08:11.000000000 +0200
-+++ control-image.c	2007-06-09 16:40:18.000000000 +0200
-@@ -251,7 +251,11 @@
- 
- void cImageControl::FadeIn(void)
- {
-+#if VDRVERSNUM >= 10500
-+  SetNeedsFastResponse(true);
-+#else
-   needsFastResponse = true;
-+#endif
- 
-   int i;
-   int alpha = 0;
-@@ -279,13 +283,21 @@
-     fd--;
-   }
- 
-+#if VDRVERSNUM >= 10500
-+  SetNeedsFastResponse(false);
-+#else
-   needsFastResponse = false;
-+#endif
- }
- 
- 
- void cImageControl::FadeOut(void)
- {
-+#if VDRVERSNUM >= 10500
-+  SetNeedsFastResponse(true);
-+#else
-   needsFastResponse = true;
-+#endif
- 
-   int i;
-   int alpha = 255;
-@@ -312,7 +324,11 @@
-     fd--;
-   }
- 
-+#if VDRVERSNUM >= 10500
-+  SetNeedsFastResponse(false);
-+#else
-   needsFastResponse = false;
-+#endif
- }
- 
- 
diff --git a/media-plugins/vdr-coverviewer/metadata.xml b/media-plugins/vdr-coverviewer/metadata.xml
deleted file mode 100644
index 27f419c289c3..000000000000
--- a/media-plugins/vdr-coverviewer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/vdr-coverviewer/vdr-coverviewer-0.0.2.ebuild b/media-plugins/vdr-coverviewer/vdr-coverviewer-0.0.2.ebuild
deleted file mode 100644
index b383e8f30e40..000000000000
--- a/media-plugins/vdr-coverviewer/vdr-coverviewer-0.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: coverviewer for vdr-music"
-HOMEPAGE="http://www.vdr.glaserei-franz.de/"
-SRC_URI="http://www.kost.sh/vdr/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="imagemagick"
-
-PATCHES=( "${FILESDIR}/${P}-vdr-1.5.x.diff" )
-
-DEPEND="imagemagick? ( media-gfx/imagemagick )
-		!imagemagick? ( media-libs/imlib2 )"
-
-RDEPEND="media-plugins/vdr-music"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	use imagemagick && sed -i Makefile -e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:"
-}
diff --git a/media-plugins/vdr-dummydevice/Manifest b/media-plugins/vdr-dummydevice/Manifest
index 82acda9ed505..ca3141b70987 100644
--- a/media-plugins/vdr-dummydevice/Manifest
+++ b/media-plugins/vdr-dummydevice/Manifest
@@ -1,3 +1,3 @@
 DIST vdr-dummydevice-2.0.0.tgz 10556 BLAKE2B c8670c8180c1b3581490ed63b70a2d4f42a4cef8dad3bb9cac5075fc0e937b1f93e317b54209f6cecec915d5b6b7727bc2325c2f998ad698b9cc70613962f1bf SHA512 a554bfaa85d518fcfbe49070aeab371843849f119b00312a7764487a2899834e21702f8fb620204b9134327941c86f8e3582fe91f8acefc8f0e3644399dd5158
-EBUILD vdr-dummydevice-2.0.0.ebuild 423 BLAKE2B e5c0e855fa94b04c91081da79c6e4132ba4c8ca19721899241e07b3bd589e407503bef48c817fed3aa4ae3b02279078efc134c9bdcce2a16027fa960e0dc418e SHA512 7c92bb32ba878579935b92bf32f5ec217871e6b01e276c64ecc7a1fb90807fc9fdcd11038da14ffac0a5f4e8b4ef6aa588e9f3cd2c4cdb2325d4d85189274fc4
+EBUILD vdr-dummydevice-2.0.0.ebuild 430 BLAKE2B 0661a713369542c7e8c03640687e682265bd46333ad36ab2c24b412511183ba7d75d8ff167fab98cdadf1125df6b6ea2059ac2cdf50a780270c0b6e51751a81d SHA512 ed67fe5b5918ab30ffdb1365cee03f2cbdf37aeb5304452370799206b62617da4f563cc26af3d485c64d4c29a982a3d3be864b4926a1498ed691e67f90a622e1
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-dummydevice/vdr-dummydevice-2.0.0.ebuild b/media-plugins/vdr-dummydevice/vdr-dummydevice-2.0.0.ebuild
index 3cd6d1cd1dde..6b9389b99631 100644
--- a/media-plugins/vdr-dummydevice/vdr-dummydevice-2.0.0.ebuild
+++ b/media-plugins/vdr-dummydevice/vdr-dummydevice-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: dummy output device ,for recording server without any output devices"
-HOMEPAGE="http://phivdr.dyndns.org/vdr/${PN}/"
+HOMEPAGE="http://phivdr.dyndns.org/vdr/vdr-dummydevice/"
 SRC_URI="http://phivdr.dyndns.org/vdr/${PN}/${P}.tgz"
 
 KEYWORDS="amd64 x86"
diff --git a/media-plugins/vdr-duplicates/Manifest b/media-plugins/vdr-duplicates/Manifest
index 4fec85c613b6..5874df947866 100644
--- a/media-plugins/vdr-duplicates/Manifest
+++ b/media-plugins/vdr-duplicates/Manifest
@@ -1,7 +1,9 @@
 AUX duplicates-0.0.5_Makefile-new.diff 7408 BLAKE2B 3a995937b45e8363c31231e375888aa1fc2f8e12514a0d0ca154bd6e5ef06964cf31727d279856057b152ff2ed30f67d8c537f769e40e60cad707cd9e4996eff SHA512 114e25f66cd0eeaa7438ae5af0b7579324b001d9b2b1a25ba39a69454a233976be311f30e7d2a8b53362d324499ee69f174acce8bcf5ec96e8ed9d5e24ef0e88
 DIST vdr-duplicates-0.0.5.tgz 14745 BLAKE2B 61f153dcf01c91e0b3ef54367daa9d7108fef8b3acbfba4f5c91b7a1c2ee8681ca9d20ef3dd11c42db7b05d46d1c055ab3e02b2400c00f1fff6e2ecaa5f910a5 SHA512 9e8ec30cbf9b1447aa00152be48237a8688dcfd746b06774b3f5d87d7100037ee8f890507c06d203a81bc05b4b476e326a3c1f0fe84e222a876a7de534b2495d
 DIST vdr-duplicates-0.1.0.tgz 16696 BLAKE2B 47b0a9501d12578980d3665f0549ffddf655f645a65c01f8ece6fb0fe76d42ed9cfa11f433115df99cbe36320bbd5ab127a830a9ccba728c50830be9857047bd SHA512 1ada8262ed349af98ba3ea62bb732b69febff29d74a7dd225f3ee3216e3ea7d5a20fea71ad4f7dd2f87da5a27b7f6de0dcd56554e6f819f3a002e51633c50500
+DIST vdr-duplicates-1.0.1.tar.gz 17836 BLAKE2B e48b8fae13ef0ff8e310045dfd40eef2722dd3cc797e49c3601ab4df2d92ec7a8d490e135a57808806f42db86e295d602183b879ebc87922e6dc4218e7cea230 SHA512 ba1476c3705a4f9a982887833ecba7d22be84c391908f4d9e0d938337615d46b11b9c7cb97f6f80edc5348321afcd1a5535eebe0f71fb67615ae8d75ccf53507
 EBUILD vdr-duplicates-0.0.5-r1.ebuild 452 BLAKE2B 58d430e31b753d1b838273f69536b95f70584f2f03dd02a130574c169bac00d8572e0826cc866746ace9228e8722bb13f954d5b27e9af6c7353192301efa30d1 SHA512 2889da1b8a2f7e318565667b071e6dafa84dbf3f238fc97d204354581c6abe212bf6f5b02fde268e3f6c579d752093a378e518681cf13f39b0594cd35e50e9fb
 EBUILD vdr-duplicates-0.0.5.ebuild 390 BLAKE2B 818d664947213bfcafb42c3345718d1b5950e86ebc1192ac9315029bac514f4388b214d88316f0c21bb5d54c7d5a46f75e718e23a3aaf69f77ebc0c48e365b04 SHA512 e5de3cc0e2217d75df4b0cedfaa2ddbb381b1d19593492198480fd03a147f4e4bd9820da5185576214537dbc140144c002cfbb2c551c789292b292574eb9d943
 EBUILD vdr-duplicates-0.1.0.ebuild 392 BLAKE2B f9bfb5c37128084edbf3652fa8b868fa0577b4ecc4e0eba401fe631693a60e663411853e43e0d695b03ffabaa3620ccab3b43e435ea606f21e27dd068080fae9 SHA512 5a9b874faf3a5291271530c6cb9967a2bc8977bbca3edc0f25f5e0a86128a37218034dc794d07f34dde713e216d8d6323755053656f34b5536cf5700eee54e87
+EBUILD vdr-duplicates-1.0.1.ebuild 609 BLAKE2B 1013ef73dcf5688e86f5d48737649a07cb988e78a1a2ec4b6b83565bf72a12cfabf4de6dc5e8c27d7b2d5983361056152780800219103d080a190d26e443771c SHA512 99e30ab3dbc127a13b2baf84868fda4879c8a8ccf4c8111fba5ba7726f52909c89c618641c6ddf1aea8953a94f36370005d98533b1fd9fee0684d83efb599721
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-duplicates/vdr-duplicates-1.0.1.ebuild b/media-plugins/vdr-duplicates/vdr-duplicates-1.0.1.ebuild
new file mode 100644
index 000000000000..7356943a4a10
--- /dev/null
+++ b/media-plugins/vdr-duplicates/vdr-duplicates-1.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_VERSION="68739fd72beb9745b3e47b9e466311ef23a8ca97"
+
+DESCRIPTION="VDR Plugin: show duplicated records"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-duplicates/repository"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-duplicates.git/snapshot/vdr-plugin-duplicates-${GIT_VERSION}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-2.4.0"
+
+S="${WORKDIR}/vdr-plugin-duplicates-${GIT_VERSION}"
diff --git a/media-plugins/vdr-dvbapi/Manifest b/media-plugins/vdr-dvbapi/Manifest
index 24c5d614e71e..7f3e7f87f026 100644
--- a/media-plugins/vdr-dvbapi/Manifest
+++ b/media-plugins/vdr-dvbapi/Manifest
@@ -1,8 +1,6 @@
 AUX kernel-4.14-fix.diff 398 BLAKE2B b431d027c62f709ed4cd7ed663c10fb42a91390fe5b3bdcc4600f1e8593b2c5031912981aec0333ec2c87c3c924aa624e7ffef7ca216d340f04ea5ee13581e16 SHA512 c8f2662cb82dcd1686d3809b75ad0f3dfe67fe6e781dacb3a907d65b68061e993d7fba075319a3ad97b56454bdc12e713030181a1a43b692052de2383bcf3c77
-DIST vdr-dvbapi-2.1.1.tar.gz 82813 BLAKE2B 2dd2b4aa11a645b4168ebbae962371f94a6e70ff905b06230048a69921f31521468506f2959ce5d5327b4cf61edc620686210520239e751e142e524751640e0d SHA512 fb632e66c9e477663eb1edf5e630a20b2165495c89d5bd6294d74d6a28c8386021d90914c9c6b958ea3c5c1d0958cc69efa5c65ef72c510c224d676f1eca39ae
-DIST vdr-dvbapi-2.2.2.tar.gz 83995 BLAKE2B 6ddd9cc4e3edbd504505b7bbb9c40e203d53faab43b3d1afe9b9834cf3d751ba469536b5f27c24cfb04afeba1378ee3ac8dc0885db8a4576ce7a275233c88ca6 SHA512 01d3a6368e0233a7b96b6ea57b28884a004a130d63da2b2958b1616a1108e83389b68cbe32ec7fc6be65d6741912c4f46621b659fb13dba56e594a1a18af2c63
 DIST vdr-plugin-dvbapi-2.2.4.tar.gz 94419 BLAKE2B 326346b418ece22674aa0d84efd798a9eb8e958586d24385b4e468c11478f63ed89e94c742c57c5b1e955dc598db29a39e3730d71c93005aa6dcda262545e4e2 SHA512 d1313e927978fcf150ae14e570c16059caeeec07992066b03282295147872da3bdb191209408539c2a70c2ada868f731e9e5504a8dd737143f86e33a85fdf0c7
-EBUILD vdr-dvbapi-2.1.1.ebuild 2530 BLAKE2B c89a4b7a4c2c87fcf92b0e110bc6af3e9b4419a198d3f93b57aa269d3c85908e96a2f199126d49a0d1047096a071304bb158964771fdda275192eb2bffc4ee5e SHA512 7016fab9b4d196415afb2b3fe3351e968a85e7a1a45c0b32616933e21938f56567b8254cc8eda89c25e551c55ff4b8f3b6b6dbef034753b3cb8b7e7303699c44
-EBUILD vdr-dvbapi-2.2.2.ebuild 2574 BLAKE2B 9e31c575bbf54c7c2372e7f94a449e903cad6d444e49332339b627e1587e61f7bf8e6a7c70a6c5b7d9540246b584d8d9b53480af512b4a301aa177ad7de35d5b SHA512 f709f31b511f7ab778b311b6cffd43d79c80897d830fbbab3dfde52ef6bc54800b3245a4bc3e17d10b1ded000ef45ea3ce9c8f7f08600d4c11972de6dce60e39
+DIST vdr-plugin-dvbapi-2.2.5.tar.gz 95270 BLAKE2B dbab07bc7df8fdc7ec009b82723631a5e61cb1d4a9afdad16e32282a3e71d6bc87e7c78ec8cea73690606bda504c19bdd9123d1ca7a4e712b15ca884c77dabaa SHA512 7036705ddf706192774f511cab813c64d092a1db1c635003e28d6960d3d46ef484f44b86c15fae782d29ada728eae1861d009d91cb71ad77cb0a1b2ad316069b
 EBUILD vdr-dvbapi-2.2.4.ebuild 2949 BLAKE2B 395a2c3121e979d66c8a3660ac6d48eaf06dc4de971eb3a9a36633d0fca99c710d6c036303eb12b8103ffae7772ee6392e5bca87d32e285d4f16ddaea33f9bd1 SHA512 97ea158101db128c72f5a338cf3c9d2ec5d36322754c8d4672bb8abcfbcf8d2e0222f28f4d54ddffa05c5afcbc9f9f09f8d1cf4c4796728a784777f239327975
+EBUILD vdr-dvbapi-2.2.5.ebuild 3053 BLAKE2B b4a535ce3d5ac0af98538afc8ae33fea8dd23a3dfccce012aab947f78a208483c9753ed2f550be713ce1e641ea221ab1b7697cfab51277c7f02d6abebb345a30 SHA512 789f03b8e09aec037216a8557a4604619d432df312054b16853e4cbc274242523e785199b854cde78a1b8c9851767df2b4277ee3c8b1eb85a97f1b1c27d109ee
 MISC metadata.xml 594 BLAKE2B 2a02df5ff3859e36c760f72ba49f97b3d827677e0c789c88ced7cb4e3ae91ad0501060d20db3e4cc33d2226a5c986203f03ae25ed29a4a831e7c218b54b2235d SHA512 0e0578c9e7fd629759210d01c1442c17ad107f681d53c1be7b067a961335dfd74a0d681af56d85dfbbbf948aa7c687e15325929350cb9d475ca6a1424ccbb46a
diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild
deleted file mode 100644
index 78e776034747..000000000000
--- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: allows connect VDR to OScam"
-HOMEPAGE="https://github.com/manio/vdr-plugin-dvbapi"
-SRC_URI="https://github.com/manio/vdr-plugin-dvbapi/archive/v${PV}.tar.gz -> vdr-dvbapi-${PV}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2"
-
-DEPEND=">=media-video/vdr-2.1.4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/vdr-plugin-dvbapi-${PV}"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	# respect the system CXXFLAGS
-	sed -e "s:FLAGS:CXXFLAGS:" -i FFdecsa/Makefile
-
-	# Prepare flags for FFdeCSA
-	if [ -n "${VDR_DVBAPI_PARALLEL}" ]; then
-		PARALLEL="${VDR_DVBAPI_PARALLEL}"
-	else
-		# [32/64] Core2 (SSSE3) achieves best results with SSE2 & SSE
-		# [64] Athlon64 (SSE2) does much better with 64_LONG
-		# [32] Athlon64 (SSE2) does best with MMX
-		# [32] Pentium4 & Atom (SSE2) work best with SSE2 & SSE
-		# [32] AthlonXP (SSE) has MMX faster
-
-		# To avoid parsing -march=, we use ugly assumption that Intels don't
-		# have 3dnow and AMDs do. SSE achieves good results only on Intel CPUs,
-		# and LONG is best on 64-bit AMD CPUs.
-
-		if ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse2; then
-			PARALLEL=PARALLEL_128_SSE2
-		elif ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse; then
-			PARALLEL=PARALLEL_128_SSE
-		elif use amd64; then
-			PARALLEL=PARALLEL_64_LONG
-		elif use cpu_flags_x86_mmx; then
-			PARALLEL=PARALLEL_64_MMX
-		else
-		# fallback values:
-		# PARALLEL_32_INT fails with gcc4.4 on x86&amd64
-		# PARALLEL_64_2INT fails with gcc4.4 on x86
-		# PARALLEL_128_4INT seems to be the fastest non-failing fallback
-			PARALLEL=PARALLEL_128_4INT
-		fi
-
-		ewarn "VDR_DVBAPI_PARALLEL in your system make.conf is not set, guessing value from USEflags (${PARALLEL})."
-		ewarn "This setting may be suboptimal, so you'll probably want to tweak it yourself."
-		ewarn "\n\tRun the script ${WORKDIR}/extra/FFdecsa-benchmark.sh"
-		ewarn "\tand add the output parameter from  PARALLEL= to your system make.conf"
-		ewarn "\tVDR_DVBAPI_PARALLEL= your parameter"
-	fi
-
-	export PARALLEL
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "This software might be illegal in some countries or violate"
-	elog "rules of your DVB provider"
-	elog "Please respect these rules.\n"
-
-	elog "We do not offer support of any kind"
-	elog "Asking for keys or for installation help will be ignored by gentoo developers!\n"
-}
diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild
deleted file mode 100644
index 58a6b05bf7c3..000000000000
--- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: allows connect VDR to OScam"
-HOMEPAGE="https://github.com/manio/vdr-plugin-dvbapi"
-SRC_URI="https://github.com/manio/vdr-plugin-dvbapi/archive/v${PV}.tar.gz -> vdr-dvbapi-${PV}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2"
-
-DEPEND=">=media-video/vdr-2.1.4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/vdr-plugin-dvbapi-${PV}"
-
-DOCS="HISTORY INSTALL README FFdecsa/docs"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	# respect the system CXXFLAGS
-	sed -e "s:FLAGS:CXXFLAGS:" -i FFdecsa/Makefile
-
-	# Prepare flags for FFdeCSA
-	if [ -n "${VDR_DVBAPI_PARALLEL}" ]; then
-		PARALLEL="${VDR_DVBAPI_PARALLEL}"
-	else
-		# [32/64] Core2 (SSSE3) achieves best results with SSE2 & SSE
-		# [64] Athlon64 (SSE2) does much better with 64_LONG
-		# [32] Athlon64 (SSE2) does best with MMX
-		# [32] Pentium4 & Atom (SSE2) work best with SSE2 & SSE
-		# [32] AthlonXP (SSE) has MMX faster
-
-		# To avoid parsing -march=, we use ugly assumption that Intels don't
-		# have 3dnow and AMDs do. SSE achieves good results only on Intel CPUs,
-		# and LONG is best on 64-bit AMD CPUs.
-
-		if ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse2; then
-			PARALLEL=PARALLEL_128_SSE2
-		elif ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse; then
-			PARALLEL=PARALLEL_128_SSE
-		elif use amd64; then
-			PARALLEL=PARALLEL_64_LONG
-		elif use cpu_flags_x86_mmx; then
-			PARALLEL=PARALLEL_64_MMX
-		else
-		# fallback values:
-		# PARALLEL_32_INT fails with gcc4.4 on x86&amd64
-		# PARALLEL_64_2INT fails with gcc4.4 on x86
-		# PARALLEL_128_4INT seems to be the fastest non-failing fallback
-			PARALLEL=PARALLEL_128_4INT
-		fi
-
-		ewarn "VDR_DVBAPI_PARALLEL in your system make.conf is not set, guessing value from USEflags (${PARALLEL})."
-		ewarn "This setting may be suboptimal, so you'll probably want to tweak it yourself."
-		ewarn "\n\tRun the script ${WORKDIR}/extra/FFdecsa-benchmark.sh"
-		ewarn "\tand add the output parameter from  PARALLEL= to your system make.conf"
-		ewarn "\tVDR_DVBAPI_PARALLEL= your parameter"
-	fi
-
-	export PARALLEL
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "This software might be illegal in some countries or violate"
-	elog "rules of your DVB provider"
-	elog "Please respect these rules.\n"
-
-	elog "We do not offer support of any kind"
-	elog "Asking for keys or for installation help will be ignored by gentoo developers!\n"
-}
diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild
new file mode 100644
index 000000000000..226f7268108c
--- /dev/null
+++ b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+MY_P="vdr-plugin-dvbapi-${PV}"
+
+DESCRIPTION="VDR Plugin: allows connect VDR to OScam"
+HOMEPAGE="https://github.com/manio/vdr-plugin-dvbapi"
+SRC_URI="https://github.com/manio/vdr-plugin-dvbapi/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dvbcsa"
+
+DEPEND=">=media-video/vdr-2.4.1
+	dvbcsa? ( media-libs/libdvbcsa )"
+RDEPEND="${DEPEND}"
+
+DOCS=( "FAQ" "HISTORY" "INSTALL" "README" "FFdecsa/docs" )
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-dvbapi.*
+	usr/lib64/vdr/plugins/libvdr-dvbapi.*"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# respect the system CXXFLAGS
+	sed -e "s:FLAGS:CXXFLAGS:" -i FFdecsa/Makefile || die "modifying FFdecsa/Makefile"
+
+	if use dvbcsa; then
+		sed -e "s:PLUGIN = dvbapi:PLUGIN = dvbapi\nLIBDVBCSA = 1:" -i Makefile || die "modifying Makefile"
+	else
+		# Prepare flags for FFdeCSA
+		if [[ -n "${VDR_DVBAPI_PARALLEL}" ]]; then
+			PARALLEL="${VDR_DVBAPI_PARALLEL}"
+		else
+			# [32/64] Core2 (SSSE3) achieves best results with SSE2 & SSE
+			# [64] Athlon64 (SSE2) does much better with 64_LONG
+			# [32] Athlon64 (SSE2) does best with MMX
+			# [32] Pentium4 & Atom (SSE2) work best with SSE2 & SSE
+			# [32] AthlonXP (SSE) has MMX faster
+
+			# To avoid parsing -march=, we use ugly assumption that Intels don't
+			# have 3dnow and AMDs do. SSE achieves good results only on Intel CPUs,
+			# and LONG is best on 64-bit AMD CPUs.
+
+			if ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse2; then
+				PARALLEL=PARALLEL_128_SSE2
+			elif ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse; then
+				PARALLEL=PARALLEL_128_SSE
+			elif use amd64; then
+				PARALLEL=PARALLEL_64_LONG
+			elif use cpu_flags_x86_mmx; then
+				PARALLEL=PARALLEL_64_MMX
+			else
+				# fallback values:
+				# PARALLEL_32_INT fails with gcc4.4 on x86&amd64
+				# PARALLEL_64_2INT fails with gcc4.4 on x86
+				# PARALLEL_128_4INT seems to be the fastest non-failing fallback
+				PARALLEL=PARALLEL_128_4INT
+			fi
+
+			ewarn "VDR_DVBAPI_PARALLEL in your system make.conf is not set, guessing"
+			ewarn "value from CPU_FLAGS_X86 USEflags, result: ${PARALLEL}"
+			ewarn "This setting may be suboptimal, so you'll probably want to tweak"
+			ewarn "it yourself."
+			ewarn
+			ewarn "To do this, unpack the source and run the script in"
+			ewarn "\t<unpackdir>/${MY_P}/extra/FFdecsa-benchmark.sh"
+			ewarn "and add the output value from  PARALLEL_MODE= to your system make.conf as"
+			ewarn "\tVDR_DVBAPI_PARALLEL=<your parameter>"
+			ewarn
+		fi
+		export PARALLEL
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	elog "This software might be illegal in some countries or violate"
+	elog "rules of your DVB provideri. Please respect these rules."
+	elog
+	elog "We do not offer support of any kind."
+	elog "Asking for keys or for installation help will be ignored by gentoo developers!"
+	elog
+}
diff --git a/media-plugins/vdr-dvdswitch/Manifest b/media-plugins/vdr-dvdswitch/Manifest
index 622e8640004e..041954d49463 100644
--- a/media-plugins/vdr-dvdswitch/Manifest
+++ b/media-plugins/vdr-dvdswitch/Manifest
@@ -1,5 +1,7 @@
 AUX 0.1.3/confd-r2 442 BLAKE2B 8a2aeaced6dd39881dea514730e3ad1bd96670894704876e62da9228992b5ef598faaa45572efd7a6e4f0a688937b1794ffed4c2b1e9472bc009acfdf8b27c0a SHA512 1fac756d1322e725a1fe54722be3066bda937867d3c13370a24e20218ec5f7c1b82e8e18c4e3e7b7a633facb2d008ed0159113260b59c6a0909bd7b9b1c69520
 AUX rc-addon.sh 313 BLAKE2B 50098e5fe29f09a5841a253965ecfeae132b5991874768baa6358b5a83ad1bdd313650389309071bd0151a5ab241a7d9279400a86a3b37d12a7529982f9b1c22 SHA512 b886ace30d15a3b61f03caf3c34928ad39c05a00fdaec1f46619297c79a8f00b4be5f08a0e16e129208801de8c45a87dbdf99d0ea9ecb390348919ea12c85c07
 DIST vdr-dvdswitch-0.2.2.tgz 50332 BLAKE2B c84fe0c1525a037bb3509d240f6d2fcdf41560a705d064167f5a21316e33ce7dc0b072367a393ddf245e0a8a3c3a5dbb795bb2e61c0ef6d80507dbf069b082d8 SHA512 37a89f33a2280823a885fdb8aa4919c7bc438c26ba6273ec25a7c980d7dac6c57df125f560b6f2f04d46a1db623c129a6e598d61cde66f5944e5b349d65ffeb8
+DIST vdr-dvdswitch-0.2.3.tgz 48515 BLAKE2B 5a342a518be0729be114500fe50d47330aa319fc84ef90e3fc1384be91b8e79748bf6c4301e549d7a7ce9d6d3b466ce89dfbba3f979be0e6927e7d8a4dcb6c06 SHA512 2c27b28a9b68f4880396c7297358eecb13d76341c98902c02eca86ef366709f38cba414b3e94445c52b56816e37e742340c93145816f5bae1b7ffca0bcd48df7
 EBUILD vdr-dvdswitch-0.2.2.ebuild 679 BLAKE2B 71674fcf19f0d25d6d179a566b2ee752564612d22b9e049f843432f39df7e683562c22b8c9c7296168171e92a68e414f091c854cdc0e38e37402a443c859e8ab SHA512 b4833e10ca2e86c0f35aeebf8752cfbee8d5c9ca8d4022737c8aa5bd7f106353cf5d28436c7be11a1e36b39ae329bcb6625b415e30f42f7231193349401e2402
+EBUILD vdr-dvdswitch-0.2.3.ebuild 674 BLAKE2B a4c830b0a46c4f40085e8932262f28c9fd5a41a48537b84bc27f986bd73cc84ff5c07b32e00ec69dc687529c83a2a84e532eadf10d7c75883633c0d0b47d18a9 SHA512 3b4d98578ca5ae20b70d939ce6068a0f9964a8a26c2614d2372848bbb6da03582cc5cfd3dfce2f45caac07c7b26237d74f8667924953f5877b0c41a04482e31c
 MISC metadata.xml 333 BLAKE2B 2e4ce83b7268d7933ded7d171cbba653ead05b20162ab2a810d1fb7d703bbb88049c0e148dc819f5feb84d70ad58f9a380991321eb7228c43f4e6aebf4cf91e0 SHA512 11cfe6c1fa5c563134c99320e3d6ab161262f7d8f359f02624364fcbef3e1eaf6e732f127be9b657b0af3c4f38a15ad2dfd4397135104d729267b2b4ad34c665
diff --git a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.2.3.ebuild b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.2.3.ebuild
new file mode 100644
index 000000000000..e20d6e3795c6
--- /dev/null
+++ b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+VERSION="2084" # every bump, new version
+
+DESCRIPTION="VDR Plugin: to play dvds and dvd file structures"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-dvdswitch"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-video/vdr"
+RDEPEND="media-plugins/vdr-dvd"
+
+DEFAULT_IMAGE_DIR="/var/vdr/video/dvd-images"
+
+VDR_CONFD_FILE="${FILESDIR}/0.1.3/confd-r2"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	sed -e "s:/video/dvd:${DEFAULT_IMAGE_DIR}:" -i setup.c
+}
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 9f28b564e5cf..37630a14dec4 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,7 +1,14 @@
 AUX fix-manpage-generation.diff 1264 BLAKE2B 8b31a038bc0b7c3c77d4852a170981f5eba4bf690cd922d7a883d16a0ebd7a2be9df6e3b0716a78ecf6b7008d56bc3554564757ee84ec5bc56754773a6475f8d SHA512 c2d402b3830f16307ed44cd85e0d7c05b204b9b7556a754a84a13af1c7d794d976d7dc36a45d187d84be764c14f9193ca4d90b2771bcfdf715368ba32f176010
 AUX vdr-epgsearch-1.x.makefile.patch 1136 BLAKE2B 3b82bfc71e75d02739f02071afb9cdc7d6fc0c0f0d7169b8f02a360c2b493d829f141dd586ce7d7f9a854f4b76423191e3f1b7a8df29b0c42beb037ff9cf9729 SHA512 79114081c2cb17402c0e0a431204d7afbc161a90d911d0c389a90f047280ee17b8112b3f2e9d32295c1dd15ef86695935a54354211c9b28669ad925df8173b92
+AUX vdr-epgsearch-2.4.0_docsrc2man-no-gzip.patch 419 BLAKE2B 6958af0bf911d01b15c3b7e47593af4c8d692574996a20a7e90736eafe008582e2d66253a57948ba686a2d48858793b23d1d1721686d715831d2ba82f5154a58 SHA512 43fa2e191badcb80542454ecb4ce3c15fd28c77685839b33327d5e22f43bc641cfc3ee2b9fd1c49dcca4e95b6d9df35b42c84b8481a4b8fa53df105cc37e4618
+AUX vdr-epgsearch-2.4.0_fix-docs.patch 3108 BLAKE2B c1af335c69b746a31cb0b76ff6fbebe357ddf4e8605e5f664b48a2fde7714cfa8d81036b3d3bb804588d8cf0bb620bab512955a799b5f0c3985368d7de71b99c SHA512 0f163d1513ae3f9414affdfc502e1780b9b7ccafe889df543ef6f7e07370c098457560635551a3bded9ffc2a6cccfe6a3f5096a80a75888f72b8eb471a42f117
+AUX vdr-epgsearch-2.4.0_makefile.patch 1524 BLAKE2B 48ccd25c22e242d9c2f42c40afe621a15032a990c2da5fe7893554502249ee90ca2462338b153a0ef647831b83cd8be35c53655958ee67a23b68e4b0fb7869ae SHA512 2c67a764ffa98135495374905f771cbb3e20d2829a11abc1f8a061c6cc414a7bd9b1e2de05efcf01c47e2b09a2ccf8d42868555af603b3c146b7033c383645b5
 DIST vdr-epgsearch-1.0.1_p20141227.tar.gz 472802 BLAKE2B 9ffc067c2aff29e3d79b620edf88ff7aca64ad5d1de3aa32b19fbc1889673e2439a6d65b46e2f3ff5fd3d416ff24cbafd6d41f562b3775210f0234c6990f03ab SHA512 952d58f6f03d2804f97be14779faf37c3788b42d78a6460102e2f1c74f6a58d7d68639e7e95e40f27417ce3658c0d5bf856399b6e8e8c214ea143d2865507562
 DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4
-EBUILD vdr-epgsearch-1.0.1_p20141227-r1.ebuild 2797 BLAKE2B d87687c1fb2bae15014a0e9ceff86a4e54266f512e7cd3672babf6b70d4fd095a808335e0c3abf8ab9eb8fedcf1f08f356a282784e00112a3f49248e0cb20fdc SHA512 bebb49a6fee3e85d5d58222618e9e4b3550058b0e370bccb6ed2a8ad90dccfbe849a9ed3cabae64e99b1b36eb60dda194372653103ab6ee910af24c816d1df83
-EBUILD vdr-epgsearch-2.2.0.ebuild 2244 BLAKE2B 215e3df5b53899c3d852d1330aa370e64b7306005446fd15cc4a42f079621c9a4aa8817c8cc18960d99b7096d7e88f9563da2491a701003bd593b989ee62746c SHA512 8d3b8b9970828de5dc835ac410c2be5c51121377f71bb88f07d910b38601035a341246347ba66d7a278417bc9608ec1d7644d0c997689d2d0af2b179212b7e4b
+DIST vdr-epgsearch-2.4.0.tgz 479041 BLAKE2B 1d0b87bca573c90d13fb07d39c2945be1451ac405739ba788482488994832d3fc053dd076d474cc4e78e9a6b3078952fac7e799945120ff220d58b7f2fc2f181 SHA512 4fec779edeee0b326624b6904b5e6b5f0c8243208938389787433638355436fe82899864d33f512c3a9e0feadde1f770d4ca562f06212f83f8d753a9a34700e4
+DIST vdr-epgsearch-2.4.0_p20191202.tar.gz 480101 BLAKE2B 800fcaab72dba1f4977dc3040ddfa856d3ad0051b04658c84891ce4836d30593be740cc6712a853093c0e02a9f3fe915cb6079b7dc2ba47509060e2fb5046474 SHA512 494562cd9b2c1cdc94a3a93ea5fcfd3f0e034156ab40d7ee332a2dfd5994cb6528744ae2391e3437860804604dca0b6fc1a387487b6fda12e19a8f79caac451c
+EBUILD vdr-epgsearch-1.0.1_p20141227-r1.ebuild 2798 BLAKE2B fd96f4eb16f7da3a850bf3fa942f830888c638931003d13e029584fdd061ebbf869bbf280cd83953349a2fb440b0920697438af0a799bbaca0301dc097c2114e SHA512 1e6c7a84c3d88e63e39c338c66d606175837930b94dfabe950619467c0af71863399c836ecc969d7ef3f0b3854e559f81314a99f6980627c4c5f749f25a4fa9c
+EBUILD vdr-epgsearch-2.2.0.ebuild 2301 BLAKE2B e6c05a1aba1a21dbc9da765a4636b1460d013c441c486909c5479220c2d60448d0a8548133dc56941607dece8ba79baabbec686f3ce15a0265f13a647e86f7c6 SHA512 88aec901cf1841c6aa244b6208e88cd1c2d07985ac2b74e72ee0d64dbd306ba9af3a600832670ea4c6970aa62f97affcfc592ccb7e3fc2695e5287ee8a446872
+EBUILD vdr-epgsearch-2.4.0.ebuild 2072 BLAKE2B e86eb9b0d6bcfe682570cc7f7ce68173750eeeb012c94236c6c4bba0bd4afdc8dee17bb5a433aaedf508a8943ee4590426a3b67f0e5ca6434eba24350ae90877 SHA512 29aa8705ca325baf4e37bc545c819da27c5a6324cbbeff37d89e2fec5e93926d8347e241e7625ca4b04bb18ac84f98f88311aaf84ebf0174940dd5c989174004
+EBUILD vdr-epgsearch-2.4.0_p20191202.ebuild 2457 BLAKE2B 0dc80b5509abfb08f8f5e9d6f11212f052b760623a6d14085f1a3541dc37b7663ee89fda3e4415c34fc37363da09aae6c1219cd2e6c12532ba475feedd85c1f2 SHA512 bcf992509c8f812dd45a513f098ff6a4299d8f7b73fbd6782be15f77cba9169e86e1c420fb8aee3fcdb4473e89c2b08d5ab89e04e0d48ba52a7fbe2729e7238b
 MISC metadata.xml 816 BLAKE2B 2a7a4b5223b30aaffd7e0300ceba04f69d411e1b4615e0fb8d1ff6afa65850f4558c065a1e3ca6a12c2526d2bf736cbc7b6aba8a9fc66b3dcef09dfa4b7ec3bc SHA512 ea3e5fac06c7e1a53b127d2ce10bbccbf97a80cadcd172100f39512772b0120f59ef9f538b779ebc6a8df6431000f1e4112a18a0300841a8e2c5065f4016b3cd
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_docsrc2man-no-gzip.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_docsrc2man-no-gzip.patch
new file mode 100644
index 000000000000..591323f7860b
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_docsrc2man-no-gzip.patch
@@ -0,0 +1,12 @@
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net> ( 2020 Jan 03 )
+--- vdr-plugin-epgsearch-2.4.0/docsrc2man.sh.orig	2018-04-16 21:49:48.000000000 +0200
++++ vdr-plugin-epgsearch-2.4.0/docsrc2man.sh	2019-03-14 12:46:58.515844269 +0100
+@@ -55,7 +55,7 @@
+ function man_gz () {
+ 	if [ $PRINT_DEPS -eq 0 ]; then
+ 		rm "$DOCSRC"/$1/*~ 2>/dev/null
+-		gzip -f man/$1/*.[0-9]
++# do nothing // gzip -f man/$1/*.[0-9]
+ 	fi
+ }
+ 
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch
new file mode 100644
index 000000000000..ae6c6dc517e9
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch
@@ -0,0 +1,124 @@
+https://projects.vdr-developer.org/issues/2581
+Manpages with encoding will not created correct
+
+Reviewed-by: Martin Dummer <martin.dummer@gmx.net> (2020 Jan 03)
+--- a/doc-src/de/epgsearch.1.txt
++++ b/doc-src/de/epgsearch.1.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearch> - Suchtimer und Ersatz für VDR's Standard-Programm-Menü
+--- a/doc-src/de/epgsearch.conf.5.txt
++++ b/doc-src/de/epgsearch.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearch.conf> - Die gespeicherten Suchtimer
+--- a/doc-src/de/epgsearchblacklists.conf.5.txt
++++ b/doc-src/de/epgsearchblacklists.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchblacklists.conf> - Die gespeicherten Auschlusslisten-Suchtimer
+--- a/doc-src/de/epgsearchcats.conf.5.txt
++++ b/doc-src/de/epgsearchcats.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchcats.conf> - Die Kategorien des erweiterten EPGs, sofern vorhanden.
+--- a/doc-src/de/epgsearchchangrps.conf.5.txt
++++ b/doc-src/de/epgsearchchangrps.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchchangrps.conf> - Liste der Kanalgruppen
+--- a/doc-src/de/epgsearchcmds.conf.5.txt
++++ b/doc-src/de/epgsearchcmds.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchcmds.conf> - EPG-Befehle
+--- a/doc-src/de/epgsearchdirs.conf.5.txt
++++ b/doc-src/de/epgsearchdirs.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchdirs.conf> - Liste von Aufnahmepfaden zur einfachen Auswahl
+--- a/doc-src/de/epgsearchmenu.conf.5.txt
++++ b/doc-src/de/epgsearchmenu.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchmenu.conf> - Konfiguration der Menüdarstellung
+--- a/doc-src/de/epgsearchswitchtimers.conf.5.txt
++++ b/doc-src/de/epgsearchswitchtimers.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchswitchtimer.conf> - Die gespeicherten Umschalttimer
+--- a/doc-src/de/epgsearchtemplates.conf.5.txt
++++ b/doc-src/de/epgsearchtemplates.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchtemplates.conf> - Die gespeicherten Suchtimer-Vorlagen
+--- a/doc-src/de/epgsearchuservars.conf.5.txt
++++ b/doc-src/de/epgsearchuservars.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchuservars.conf> - Die Uservariablen
+--- a/doc-src/de/noannounce.conf.5.txt
++++ b/doc-src/de/noannounce.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<noannounce.conf> - Liste von Sendungen, die nicht mehr per OSD angekündigt
+--- a/doc-src/de/timersdone.conf.5.txt
++++ b/doc-src/de/timersdone.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<timersdone.conf> - Liste von anstehenden Timern, die von Suchtimern erzeugt
+--- a/doc-src/en/epgsearch.conf.5.txt
++++ b/doc-src/en/epgsearch.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearch.conf> - The searchtimers
+--- a/doc-src/en/epgsearchcats.conf.5.txt
++++ b/doc-src/en/epgsearchcats.conf.5.txt
+@@ -1,4 +1,5 @@
+ =encoding utf8
++
+ =head1 NAME
+ 
+ F<epgsearchcats.conf> - Configuration of the additional EPG information
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_makefile.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_makefile.patch
new file mode 100644
index 000000000000..5ec9c69af412
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_makefile.patch
@@ -0,0 +1,42 @@
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 25 Dec 2019 )
+diff -Naur vdr-plugin-epgsearch-2.4.0.orig/Makefile vdr-plugin-epgsearch-2.4.0/Makefile
+--- vdr-plugin-epgsearch-2.4.0.orig/Makefile	2019-12-25 18:48:32.748492713 +0100
++++ vdr-plugin-epgsearch-2.4.0/Makefile	2019-12-25 18:49:35.110492713 +0100
+@@ -281,9 +281,9 @@
+ $(DEPFILE_stmp):
+ 	./docsrc2man.sh
+ 	./docsrc2html.sh
+-	ln -sf ./doc/en/epgsearch.4.txt MANUAL
+-	ln -sf ./doc/en/epgsearch.1.txt README
+-	ln -sf ./doc/de/epgsearch.1.txt README.DE
++#	ln -sf ./doc/en/epgsearch.4.txt MANUAL
++#	ln -sf ./doc/en/epgsearch.1.txt README
++#	ln -sf ./doc/de/epgsearch.1.txt README.DE
+ 	@rm -f $(DEPFILE_stmp)
+ 	@date > $(DEPFILE_stmp)
+ 
+@@ -306,7 +306,7 @@
+ 	$(Q)install -D libvdr-$(PLUGIN4).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN4).so.$(APIVERSION)
+ 
+ install-conf:
+-	mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)/conf.d
++	mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)
+ 	cp -n conf/* $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)
+ 
+ install-doc:
+@@ -325,7 +325,7 @@
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	cp createcats $(DESTDIR)$(BINDIR)
+ 
+-install: install-lib install-i18n install-conf install-doc install-bin
++install: install-lib install-i18n install-conf install-bin
+ 
+ install-lib: install-$(PLUGIN) install-$(PLUGIN2) install-$(PLUGIN3) install-$(PLUGIN4)
+ 
+@@ -358,3 +358,6 @@
+ 	@-rm -rf doc html man
+ 	@-rm -f MANUAL README README.DE
+ 	@-rm -f $(DEPFILE_stmp) $(DEPFILE_DOC)
++
++# make detection in vdr-plugin-2.eclass for new Makefile handling happy
++# SOFILE
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
index c79abd511d1d..0917f4f8da50 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ case ${P#*_} in
 		;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+conflictcheckonly +epgsearchonly l10n_de pcre +quicksearch tre"
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
index 036df79eeb1e..0a8a30e973a4 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="VDR plugin: create timers from epg content based on saved search ex
 HOMEPAGE="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git"
 SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+conflictcheckonly +epgsearchonly pcre +quicksearch tre"
@@ -29,23 +29,23 @@ src_prepare() {
 	echo "# SOFILE" >> Makefile
 
 	# remove untranslated .po files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die
 
 	eapply "${FILESDIR}/vdr-epgsearch-1.x.makefile.patch"
 
-	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile
-	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile
-	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile
+	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die
+	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die
+	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die
 
 	vdr-plugin-2_src_prepare
 
 	fix_vdr_libsi_include conflictcheck.c
 
 	# install conf-file disabled
-	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf
+	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die
 
 	# Get rid of the broken symlinks
-	rm -f README{,.DE} MANUAL
+	rm -f README{,.DE} MANUAL || die
 }
 
 src_compile() {
@@ -76,9 +76,9 @@ src_install() {
 
 	nonfatal dodoc conf/*.templ HISTORY*
 
-	gunzip -f man/en/*.gz
+	gunzip -f man/en/*.gz || die
 	doman man/en/*.[0-9]
 
-	gunzip -f man/de/*.gz
+	gunzip -f man/de/*.gz || die
 	doman -i18n=de man/de/*.[0-9]
 }
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
new file mode 100644
index 000000000000..f3656d228f5a
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions"
+HOMEPAGE="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"
+
+DEPEND=">=media-video/vdr-2.4
+	pcre? ( dev-libs/libpcre )
+	tre? ( dev-libs/tre )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="?? ( pcre tre )"
+
+S="${WORKDIR}/vdr-plugin-${VDRPLUGIN}-${PV}"
+
+src_prepare() {
+	# remove untranslated .po files
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die
+
+	eapply "${FILESDIR}/vdr-epgsearch-2.4.0_makefile.patch"
+
+	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die
+	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die
+	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die
+
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include conflictcheck.c
+
+	# install conf-file disabled
+	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die
+
+	# Get rid of the broken symlinks
+	rm -f README{,.DE} || die
+}
+
+src_compile() {
+	BUILD_PARAMS="SENDMAIL=/usr/sbin/sendmail AUTOCONFIG=0"
+
+	if use pcre; then
+		BUILD_PARAMS+=" REGEXLIB=pcre"
+		einfo "Using pcre for regexp searches"
+	fi
+
+	if use tre; then
+		BUILD_PARAMS+=" REGEXLIB=tre"
+		einfo "Using tre for unlimited fuzzy searches"
+	fi
+
+	vdr-plugin-2_src_compile
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	diropts "-m755 -o vdr -g vdr"
+	insinto /etc/vdr/plugins/epgsearch
+	doins conf/epgsearchmenu.conf
+	doins conf/epgsearchconflmail.templ conf/epgsearchupdmail.templ
+
+	local DOCS=( conf/*.templ HISTORY* )
+	einstalldocs
+
+	gunzip -f man/en/*.gz || die
+	doman man/en/*.[0-9]
+
+	gunzip -f man/de/*.gz || die
+	doman -i18n=de man/de/*.[0-9]
+}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
new file mode 100644
index 000000000000..c2fc3ce4361f
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20191202.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions"
+HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html"
+GIT_COMMIT_ID="602d66c55964998ce25c6c57b302949a9517f149"
+SRC_URI="http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"
+REQUIRED_USE="?? ( pcre tre )"
+
+DEPEND="
+	>=media-video/vdr-2.4
+	pcre? ( dev-libs/libpcre )
+	tre? ( dev-libs/tre )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/groff
+	dev-lang/perl"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-.*
+	usr/lib64/vdr/plugins/libvdr-.*
+	usr/bin/createcats"
+S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0_makefile.patch"
+	"${FILESDIR}/${PN}-2.4.0_docsrc2man-no-gzip.patch"
+	"${FILESDIR}/${PN}-2.4.0_fix-docs.patch"
+	)
+
+src_prepare() {
+	# remove untranslated .po files
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po \
+		|| die "cannot remove untranslated .po files"
+
+	use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile"
+	use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile"
+	use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile"
+
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include conflictcheck.c
+
+	# install conf-file disabled
+	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die "cannot modify epgsearchmenu.conf"
+
+	# Get rid of the broken symlink
+	rm README || die "cannot remove broken symlink"
+}
+
+src_compile() {
+	BUILD_PARAMS="SENDMAIL=/usr/bin/sendmail AUTOCONFIG=0"
+
+	if use pcre; then
+		BUILD_PARAMS+=" REGEXLIB=pcre"
+		einfo "Using pcre for regexp searches"
+	fi
+
+	if use tre; then
+		BUILD_PARAMS+=" REGEXLIB=tre"
+		einfo "Using tre for unlimited fuzzy searches"
+	fi
+
+	vdr-plugin-2_src_compile
+}
+
+src_install() {
+	local DOCS=( conf/*.templ HISTORY* README.Translators )
+	vdr-plugin-2_src_install
+
+	diropts -m 755 -o vdr -g vdr
+	insopts -m 644 -o vdr -g vdr
+	keepdir /etc/vdr/plugins/epgsearch
+	insinto /etc/vdr/plugins/epgsearch
+	doins conf/*
+
+	doman man/en/*
+	doman -i18n=de man/de/*
+}
diff --git a/media-plugins/vdr-epgsync/Manifest b/media-plugins/vdr-epgsync/Manifest
index 05c1e86ebd22..9f051cf70e84 100644
--- a/media-plugins/vdr-epgsync/Manifest
+++ b/media-plugins/vdr-epgsync/Manifest
@@ -1,3 +1,5 @@
+AUX vdr-epgsync-1.0.1_vdr-2.4.patch 2244 BLAKE2B 76f1a631d4bdc0c86121b96ac23d08c3b691c0152a6238e392a9308b0220e9cf7acd04ffa23fcb7d509191f0d9ab31ddc6e64acf603ca491ae459ad1f6ce34f6 SHA512 0e8558222090dc2248c7c96798523a69988738a4e28d0aed24f93a4b8eb197d220227896fa364ccf5c029666164a4a2a51876794d53c0a6e8c4bee9f89d3f4f5
 DIST vdr-epgsync-1.0.1.tgz 18198 BLAKE2B 0c2d782253d9c48a59e2dcf8cb58295b92d5c8b9384d947659b760c1f6b68c9b63c10ca4bccf5ae767d7499ea934f321edd4cc9c600f8da746781bc3a050b84d SHA512 1c9d1220460031a7dd22f8a8131c291bf9c66847be33c2a57464c29d7ed4b2297d6bda04c3ea0a24e3f00d5afe040d9236c5f9ef9f4389878906abc54466de18
-EBUILD vdr-epgsync-1.0.1.ebuild 416 BLAKE2B f168af37c07c0abcdff76aa97f4f9ff5a17e24824af43527c4ea62da5ad254d3b2c0469423c1d061dfea6509d483531ca99b87bd643c368cae8a9dcc7c0b0b58 SHA512 37437f487f6b02ae6665306d493c590ada2e7e35960602126162e4a3b3f3bb4f270a457ccbada7cc8e52df067d4e2ea59a4a2d1404ca2a4d72d38715bedc12c6
+EBUILD vdr-epgsync-1.0.1-r1.ebuild 431 BLAKE2B 4a79ae59d5149bbc7f057dc8256319ff0ba1ff92439f33b515441bf9ec4148fd63cb961106dd0134864a39f8a9c72ac25f0f0bf997b1bf931a47a0814f7cfb49 SHA512 2d21526ee05b65a9e0ef749ef0b15350919e82956ff3356e2b6f8d7523864cba6e765c4bb125767cf73a3a3ea58513b47c0fcf5d6e69cb86da6286941cdd66ff
+EBUILD vdr-epgsync-1.0.1.ebuild 413 BLAKE2B b60b73e5fac81790e228cf3139c17517d0e3b32ffabb30fe4466682a6921afb8d0f0879687977fa1031071d26efec645ad639d88e134f7b3fd9a1866693e4761 SHA512 c5fd54121d0cb0c4f8246a920ab6fa4cbe3ca804f03bc4b6c601702f589b7f9282d376657284b0e9bf9f5e5ee0ab5179e027223508bee5d31e7b8de2c7a55fad
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-epgsync/files/vdr-epgsync-1.0.1_vdr-2.4.patch b/media-plugins/vdr-epgsync/files/vdr-epgsync-1.0.1_vdr-2.4.patch
new file mode 100644
index 000000000000..9b3df4097fd4
--- /dev/null
+++ b/media-plugins/vdr-epgsync/files/vdr-epgsync-1.0.1_vdr-2.4.patch
@@ -0,0 +1,56 @@
+compilefix for media-video/vdr-2.4.1
+Suggested-by: MatthiasK @ vdr-portal.de
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 27 Dec 2019 )
+diff -Naur epgsync-1.0.1.orig/thread.c epgsync-1.0.1/thread.c
+--- epgsync-1.0.1.orig/thread.c	2019-12-26 00:12:49.124492713 +0100
++++ epgsync-1.0.1/thread.c	2019-12-26 00:17:55.129492713 +0100
+@@ -42,9 +42,10 @@
+ 	}
+ }
+ 
+-cChannel *GetChannelByName(const char* Name, const cChannel *IgnoreChannel = NULL, eChannelTypes Type = ctAll)
++const cChannel *GetChannelByName(const char* Name, const cChannel *IgnoreChannel = NULL, eChannelTypes Type = ctAll)
+ {
+-	for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
++	LOCK_CHANNELS_READ;
++	for (const cChannel *channel = Channels->First(); channel; channel = Channels->Next(channel)) {
+ 		if (strcasecmp(Name, channel->Name()) == 0 || strcasecmp(Name, channel->ShortName()) == 0) {
+ 			if (IsType(channel, Type) && channel != IgnoreChannel)
+ 				return channel;
+@@ -95,20 +96,17 @@
+ 		if (EpgSyncSetup.redirectChannels == rcmId) {
+ 			// Direct import, no mapping:
+ 			// loop through local channels, get channels by ID
+-			cSchedulesLock *lock = NULL;
+-			for (cChannel *channel = Channels.First(); channel && Running();
+-					channel = Channels.Next(channel)) {
+-				if (!lock)
+-					lock = new cSchedulesLock();
+-				if (cSchedules::Schedules(*lock)->GetSchedule(channel)) {
+-					DELETENULL(lock);
++			LOCK_CHANNELS_READ;
++			for (const cChannel *channel = Channels->First(); channel && Running();
++					channel = Channels->Next(channel)) {
++			LOCK_SCHEDULES_READ;
++				if (Schedules->GetSchedule(channel)) {
+ 					if (CmdLSTE(f, *channel->GetChannelID().ToString())) {
+ 						AddSchedule(f);
+ 					}
+ 					cCondWait::SleepMs(EPGSYNC_SLEEPMS);
+ 				}
+ 			}
+-			DELETENULL(lock);
+ 		}
+ 		else {
+ 			// Map channels by name:
+@@ -182,7 +180,8 @@
+ 			targetChannel = NULL;
+ 
+ 			const char* p = skipspace(s + 1);
+-			cChannel *c = Channels.GetByChannelID(tChannelID::FromString(p));
++			LOCK_CHANNELS_READ;
++			const cChannel *c = Channels->GetByChannelID(tChannelID::FromString(p));
+ 			bool cOk = IsType(c, (eChannelTypes) EpgSyncSetup.channelTypes);
+ 
+ 			if (cOk && EpgSyncSetup.redirectChannels != rcmNameId) {
diff --git a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..12631b5c4ecd
--- /dev/null
+++ b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: Import the EPG of another VDR via vdr-svdrpservice"
+HOMEPAGE="http://vdr.schmirler.de/"
+SRC_URI="http://vdr.schmirler.de/epgsync/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND=">=media-video/vdr-2.4"
+
+PATCHES=( "${FILESDIR}/${P}_vdr-2.4.patch" )
diff --git a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild
index 1adc76071695..f473895f04ab 100644
--- a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild
+++ b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
diff --git a/media-plugins/vdr-exec/Manifest b/media-plugins/vdr-exec/Manifest
index 0a075c56d845..7cfaaac21216 100644
--- a/media-plugins/vdr-exec/Manifest
+++ b/media-plugins/vdr-exec/Manifest
@@ -1,4 +1,4 @@
 AUX vdr-exec-0.0.3_compile-warnings.diff 8483 BLAKE2B bcb2171369f6c2183154a8e9bff4394a6478ce10e96fb6205a848233f17f075751bcd3221d940e8b96e3fecd619be5930dcb8625172ca01155274768e404b39a SHA512 708058c10972be4da33de6565c405b9bfa9ad285082b1522ca8b0338f0a702ee7bc1e2dc743fd7794d5b15cc1aebbca6711cf03e4fbe1e043a951345e7195e7e
 DIST vdr-exec-0.0.3.tgz 34537 BLAKE2B 80af77ce7cb1c686c2ef9fccb3221633755a7cf4d242020f4a88c49b4fc73aa3257a7350e5a177f296f8d5bd5b730ea2b5e6cfaaefbd5f464e0ab536b82bdc99 SHA512 c08b89908f8ea33a0ae95f8981dc4d2117926468bc4772124cec61daa274cd5ce05421853c8c75bce9647d08ac4eb81b1958313b0550ff0328be6a812aabd29a
-EBUILD vdr-exec-0.0.3.ebuild 477 BLAKE2B b63f26a442fb47cdc1f8f1f2044cb2e56d9096cd0c1dc4f8e68b8d3f90df9eecb736523b041bf7b1cf9eae4402828dc64a82b2f8667d97f3904cef0f8cc9c10d SHA512 e6d9d61805b57ee63b17640422364a49737bc40850a9b17e637f591fe70ab7960e4faed02d3b1e92a58b62170a919eb9fe2dd101e1882a8f9b3b36591712f6ac
+EBUILD vdr-exec-0.0.3.ebuild 478 BLAKE2B 95acc264a516bbba815abab8373830da146cde15ff997c418c6596eef0b5a61b40d10fe64ea2e4132090cbb8af3590b0b2690c0a5fa694b117432c98e0a2cc91 SHA512 462cd789d59118e01390cdd1b16306a0df32a854700f680cfc2be554d333a0fa1188275782d6aae6a710996b8b847c56b62d7815090fc8d1e08a1cc37938ce36
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-exec/vdr-exec-0.0.3.ebuild b/media-plugins/vdr-exec/vdr-exec-0.0.3.ebuild
index ebce0f6d3604..ebe187a77240 100644
--- a/media-plugins/vdr-exec/vdr-exec-0.0.3.ebuild
+++ b/media-plugins/vdr-exec/vdr-exec-0.0.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: Exec commands like timers at defined times"
-HOMEPAGE="http://wirbel.htpc-forum.de/exec/index2.html"
-SRC_URI="http://wirbel.htpc-forum.de/exec/${P}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/vdr-extb/Manifest b/media-plugins/vdr-extb/Manifest
index 10400c521504..225296213a58 100644
--- a/media-plugins/vdr-extb/Manifest
+++ b/media-plugins/vdr-extb/Manifest
@@ -3,5 +3,5 @@ AUX vdr-extb-0.3.1_vdr-1.7.13.diff 873 BLAKE2B dd1bdd48a005c3caf4536f85e72e0ebab
 DIST extb.tar.gz 45417 BLAKE2B 70c264b9d988e64ea5c21e76f5b02c23bf89a90d846f41f785a2491f138e182483046b8457cb46615430a42f7ae8ec337bd5c999998457470866c2c020eebd07 SHA512 2fd539425b773419aaca27ee6c00879a420b8bc47fc3033082eef03275f5e8cdeba0c6562fe160cbdf1146f5cb4a45ad4e723f7e63d627e1937a847615456381
 DIST extb_firmware_1.08_lircd.conf.zip 8197 BLAKE2B 7635ab601e10170e6b063fec3cc8486550a75083beb5e9071e6779859bfe57764a9210472925df0375e997db6618460d27bf68a42c2571d82ef0de0f2a062f5e SHA512 bee864bdf876a117f4235ab415feb04dfc31f59118ed9c601a46ee90b0df010d890e61bf12f9351fe9b3977815d3c3b9985e069a1ad9e72ceb177691bbd70609
 DIST vdr-extb-0.3.1.tar.gz 53136 BLAKE2B ccb3bb5a4a251e2928be1b7d836e98ab756730ecc7f6976c9520f3c9a13dcfb6ee513630fc42bca306134f04d2f3b92e22ca9ee7c25f4fc00e0544c136dd3397 SHA512 cbef33eef77e22266adc10fe305be2ae50c69c312dce44711d3e889387638daf9e6a0d71e8342a63f6655eb82f51c15f274b3a9815f876d17fbc4079da2ee391
-EBUILD vdr-extb-0.3.1.ebuild 1744 BLAKE2B 81d5315c8e6efe50a23936182015f82d0d3eeb77655c4c6039109ed97eb3e3c1442d481207f275d70fb107cc9fdc0ee61668327b9b9aa0745500ca776bf6776e SHA512 4b496955eb52e9370e98a03052aa32dc136f0b62797589aff4682864f0589c3a7d2b6d3253d4782a5183555d167970c57903b233cedef343aa6fd82b8c7bb001
+EBUILD vdr-extb-0.3.1.ebuild 1753 BLAKE2B 7bc94c3ff685992792ed874b166bc954f70567e91cff74ad116c3f9e6f5f9c9ff1448c42ad6df27370b48f84239881fb10332a228f8ffbed2b4cae7ccd982b0f SHA512 eb6fc059e17c28773abab2113087608a030c2430e640797a81f903306e0687378c385470f0dc17fe71e05cffdf557d13ccbac09b1f4c1ab9409474071f71b9a0
 MISC metadata.xml 321 BLAKE2B 8db922a52a70940c07786766b9ae2e76d51c13fb68dd79ab9fe84f841a71592757c2a7d72a1943cee54d54b4e9bcd11f5ebc10b6ff21c2c22338591279b8369f SHA512 1bfa4279dd2502d0aa29b160da234cea71acb09d6b4775c65c11b83f38e56f69b71d96076f516a54ce4ac7b84790f0a2b5822d0d54fd65e9afd7c905a2f7f7ce
diff --git a/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild b/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild
index ad6f148be980..b3996bbe5dc9 100644
--- a/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild
+++ b/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild
@@ -19,6 +19,7 @@ IUSE=""
 DEPEND="app-misc/lirc
 		media-video/vdr"
 RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
 	vdr-plugin-2_src_prepare
@@ -40,7 +41,6 @@ src_install() {
 	vdr-plugin-2_src_install
 
 	dodoc README.de "${WORKDIR}/lircd.conf.extb_FW1.08"
-	docinto wakeup
 	dodoc "${S}/wakeup/README.de"
 
 	dobin "${WORKDIR}/extb/src/LinPIC/picdl"
diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest
index 26f1ee7e5f74..bd2d83dd5f99 100644
--- a/media-plugins/vdr-extrecmenu/Manifest
+++ b/media-plugins/vdr-extrecmenu/Manifest
@@ -1,10 +1,9 @@
 AUX dvdarchive-2.3-beta-configfile.patch 302 BLAKE2B c3466202e7199d7cc7c4e090efd8ec329e3871729a0f53ede82393e44b58bffff3c6857dd3f71a82f01ba2fbd31f2aa28ad9ba857229e8716049607d07712e44 SHA512 59c113d672580c34b08a1a314b4104bb6400e18fa2855f02a70583975c5fd675de672006d057e1f207919aab488cf42505072fa57a61f931a58d4c1f84756ea5
 AUX dvdarchive.conf 633 BLAKE2B 1b70f19dcc9f94d1d3124773d4338c799cfabad2c0cbb0665d1e7f9cb07c914eb7a87cee4a11d77fb49d3d05cff2f7f641d210c5120c27a57c63eababcc35989 SHA512 1b4f7c68f83617d861277a491dbddfdd76b92fbf342d1cfda7cbb958cc77ce19291b8223d65774aafcd22cfcb273913c1122821eb0be97e7423b4842e9237fd0
 AUX extrecmenu.mk 3323 BLAKE2B e9446a2dc3b29bf69e314455b1b033932c6f14bdee4b4e2ec07b2bb8ab98d5d4ee795a9acdcd6906653dc6319ceb4f2979204b89e537529d5189330b9b1c5b9f SHA512 b16dad6d7be92e9a5483fa7aad8ac2a25bd26bf2d14d50bb3e2fefdd4eef8c837277747030f1403e5248d1c6c0a18530bb55521976656e8a5c2ac26f2d1827d9
-AUX vdr-extrecmenu-1.2.2_vdr-2.1.2.diff 5354 BLAKE2B b6e664cb6deb4c9fd443311efdf6238b889adddc0bf991848b5a3b758a95bee4e4650ebd2ddd71db9780d780e19e85abe0c4e7ae9d786034abe1c1ff2ce17a9a SHA512 ac98098a48890651c5c98aa9659f7ba495facdbd647be9d735fcfe4e7e20ca12c2f32ef25c723a4684144e98ae0446c7c1a4a61c2c4a7c96ad354347f819fa13
 DIST dvdarchive-2.3-beta.sh.gz 3412 BLAKE2B aca97b4c7abcc907f1242482f0f0550cb38fcd357acb9ec6ebc4c978a8f50e9c63fe6fcc2932e426c5d7301f0eaccc5e2f8726e72abafe504e5503528ce782e9 SHA512 18262b1e6749961bae37894649f518f88ad2ca100b83965eb48ce7344bbf4f7bfac9d36c9b9d91744281c00c4b89fa49209cc98ca5d848b46225facf4ef7a48f
-DIST vdr-extrecmenu-1.2.2.tgz 734012 BLAKE2B 0598447cbcd8337f08722503743f8cfb38d8ea9533d0e4b4ea281ca6cc0cf6e9fbfc439ab1243b749007838b0640398a895715124382ca73abf8965c81762c8e SHA512 071fd3c1d44afe17081ff2cdd747555d4218cffa2fd101ffa9c77b81376114af829bf58ce2f70f74eb7eb1090699b6a85a8e7105e3bf748ee7e8cb39ebee4f3c
+DIST vdr-extrecmenu-1.2.4-r1.tar.gz 729966 BLAKE2B 2ec2790cc57db3a9f1d12cdc43eea3e70076ef14d9f0392eb9ab4cda4bf30999a163526416276e661430bf9b684f7d313f5f7193997118e061bf5352c5bbe39a SHA512 d3103e5bc65f968bc4f512195eaa25b04fb5261281d79c7c486fe2532656b8ee7ddc00648d46e92c468b33f95e77c6ce3b2ca67a2debcc0c7021a4b525ac0aa4
 DIST vdr-extrecmenu-1.2.4.tgz 731823 BLAKE2B a226aadb843480b62798e2c4226af8bbb5bba41946f14222616ec43eec94a1b45150661ceb9ecb85e714673f408ab01849b6d55b6572da8028e6b47f9991916d SHA512 a750c6ad244e2afd3f04cafe634ec3c58baf4a38a809121a7c9045c327b4f10cb28b7aab4b7bd0e86d0b7febf85cc7fbc258bdd83386a60ddfe748347192f592
-EBUILD vdr-extrecmenu-1.2.2-r2.ebuild 1366 BLAKE2B 316940a462d525ee60d81ab76905b2bc736840c0a70321a82df49b930eb7e02cab231f1ff22ede2dda7272250577aca0b707aca5c9ddf756ab31df9c1362a3a8 SHA512 62e3b589eeda57554c0a03e0cd92dbf85e464fc72109eb75b43ea72b0e280a028f84193fe37620164b990740546f24199221cff34b455fd102aa89dc026bec63
+EBUILD vdr-extrecmenu-1.2.4-r1.ebuild 1063 BLAKE2B 7764fb26b2589c394dfb276c0c546c3adccd577acf196058ecda39db9f5e4136c9811070480376eb32c8d1fb736ebac56b7fd34ebdf0757bb1899ee7663cb4d7 SHA512 13a1bd0103cadfae6f8965796c4d74c15d24582a6b14d8a407a97d26046a1f0ba9fc6d89f49de9d02d550c9d1ca480e1dc7cab70a8f4371bcec38127145907a5
 EBUILD vdr-extrecmenu-1.2.4.ebuild 971 BLAKE2B dc21e6f6257e60c5908639dcffbd2a030262decba1bebfabc9bc31dbbfcc2da33ae19274db5ff04a18fd2ef31c2b62d110ee8ff72ecc3dc98ecbb18954abfd40 SHA512 3a77be9edbb717937019724446722a8cfc30fd88b67699c8cae6b2854411381662abe97152b35078b3dbb107dc5ee916bbf5335c4a0015d3f8305248e7438b29
 MISC metadata.xml 321 BLAKE2B 8db922a52a70940c07786766b9ae2e76d51c13fb68dd79ab9fe84f841a71592757c2a7d72a1943cee54d54b4e9bcd11f5ebc10b6ff21c2c22338591279b8369f SHA512 1bfa4279dd2502d0aa29b160da234cea71acb09d6b4775c65c11b83f38e56f69b71d96076f516a54ce4ac7b84790f0a2b5822d0d54fd65e9afd7c905a2f7f7ce
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff
deleted file mode 100644
index b1f4d391a44a..000000000000
--- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff
+++ /dev/null
@@ -1,167 +0,0 @@
-diff -Naur extrecmenu-1.2.2.orig/mymenueditrecording.c extrecmenu-1.2.2/mymenueditrecording.c
---- extrecmenu-1.2.2.orig/mymenueditrecording.c	2013-10-23 13:14:38.010071212 +0200
-+++ extrecmenu-1.2.2/mymenueditrecording.c	2013-10-23 13:21:12.560096164 +0200
-@@ -76,7 +76,11 @@
- 
-       if(isdir)
-       {
-+#if APIVERSNUM > 20101
-+        if(-1==asprintf(&oldname,"%s%s%s/%s",cVideoDirectory::Name(),tmppath?"/":"",dirbase?dirbase:"",dirname))
-+#else
-         if(-1==asprintf(&oldname,"%s%s%s/%s",VideoDirectory,tmppath?"/":"",dirbase?dirbase:"",dirname))
-+#endif
-           oldname=NULL;
-       }
-       else
-@@ -84,7 +88,11 @@
- 
-       if(oldname)
-       {
-+#if APIVERSNUM > 20101
-+        if(-1==asprintf(&newname,"%s%s%s/%s%s",cVideoDirectory::Name(),tmppath?"/":"",tmppath?tmppath:"",tmpname,isdir?"":strrchr(recording->FileName(),'/')))
-+#else
-         if(-1==asprintf(&newname,"%s%s%s/%s%s",VideoDirectory,tmppath?"/":"",tmppath?tmppath:"",tmpname,isdir?"":strrchr(recording->FileName(),'/')))
-+#endif
-           newname=NULL;
- 
-         if(newname)
-@@ -305,7 +313,11 @@
- 
-   if(dirname)
-   {
-+#if APIVERSNUM > 20101
-+    if(-1==asprintf(&oldname,"%s%s%s/%s",cVideoDirectory::Name(),dirbase?"/":"",tmpdirbase?tmpdirbase:"",tmpdirname))
-+#else
-     if(-1==asprintf(&oldname,"%s%s%s/%s",VideoDirectory,dirbase?"/":"",tmpdirbase?tmpdirbase:"",tmpdirname))
-+#endif
-       oldname=NULL;
-   }
-   else
-@@ -357,7 +369,11 @@
-     if(dir)
-       dir=ExchangeChars(dir,true);
- 
-+#if APIVERSNUM > 20101
-+    if(-1==asprintf(&_newname,"%s%s%s%s",cVideoDirectory::Name(),dir?"/":"",dir?dir:"",strrchr(dirname?oldname:recording->FileName(),'/')))
-+#else
-     if(-1==asprintf(&_newname,"%s%s%s%s",VideoDirectory,dir?"/":"",dir?dir:"",strrchr(dirname?oldname:recording->FileName(),'/')))
-+#endif
-       _newname=NULL;
- 
-     if(_newname)
-@@ -424,7 +440,11 @@
-                 {
-                   if(!strncmp(oldname,rec->FileName(),strlen(oldname)))
-                   {
-+#if APIVERSNUM > 20101
-+                    char *_buf=ExchangeChars(strdup(oldname+strlen(cVideoDirectory::Name())+1),false);
-+#else
-                     char *_buf=ExchangeChars(strdup(oldname+strlen(VideoDirectory)+1),false);
-+#endif
- 
-                     if(strcmp(rec->Name(),_buf))
-                     {
-diff -Naur extrecmenu-1.2.2.orig/mymenurecordings.c extrecmenu-1.2.2/mymenurecordings.c
---- extrecmenu-1.2.2.orig/mymenurecordings.c	2013-10-23 13:14:38.010071212 +0200
-+++ extrecmenu-1.2.2/mymenurecordings.c	2013-10-23 13:27:17.916785937 +0200
-@@ -590,7 +590,11 @@
- {
-   if(mysetup.FileSystemFreeMB)
-   {
-+#if APIVERSNUM > 20101
-+    string path=cVideoDirectory::Name();
-+#else
-     string path=VideoDirectory;
-+#endif
-     path+="/";
-     char *tmpbase=base?ExchangeChars(strdup(base),true):NULL;
-     if(base)
-@@ -634,7 +638,11 @@
-   else
-   {
-     int freemb;
-+#if APIVERSNUM > 20101
-+    cVideoDirectory::VideoDiskSpace(&freemb);
-+#else
-     VideoDiskSpace(&freemb);
-+#endif
-     return freemb;
-   }
- 
-@@ -747,7 +755,11 @@
-   for(cRecording *recording=Recordings.First();recording;recording=Recordings.Next(recording))
-     list->Add(new myRecListItem(recording));
-   // sort my recordings list
-+#if APIVERSNUM > 20101
-+  string path=cVideoDirectory::Name();
-+#else
-   string path=VideoDirectory;
-+#endif
-   path+="/";
-   if(base)
-     path+=base;
-@@ -1211,7 +1223,11 @@
-       {
-         char *strBase=base?ExchangeChars(strdup(base), true):NULL;
-         char *strName=ExchangeChars(strdup(item->Name()), true);
-+#if APIVERSNUM > 20101
-+        if(-1==asprintf(&parameter,"\"%s/%s/%s\"",cVideoDirectory::Name(),strBase?strBase:"", strName))
-+#else
-         if(-1==asprintf(&parameter,"\"%s/%s/%s\"",VideoDirectory,strBase?strBase:"", strName))
-+#endif
-           parameter=NULL;
-         free(strBase);
-         free(strName);
-@@ -1235,7 +1251,11 @@
- // change sorting
- eOSState myMenuRecordings::ChangeSorting()
- {
-+#if APIVERSNUM > 20101
-+  string path=cVideoDirectory::Name();
-+#else
-   string path=VideoDirectory;
-+#endif
-   path+="/";
-   if(base)
-     path+=base;
-diff -Naur extrecmenu-1.2.2.orig/tools.c extrecmenu-1.2.2/tools.c
---- extrecmenu-1.2.2.orig/tools.c	2013-10-23 13:14:38.010071212 +0200
-+++ extrecmenu-1.2.2/tools.c	2013-10-23 13:36:56.026822499 +0200
-@@ -152,7 +152,11 @@
-     {
-       if(!strncmp(OldName,item->recording->FileName(),strlen(OldName)))
-       {
-+#if APIVERSNUM > 20101
-+        buf=strdup(OldName+strlen(cVideoDirectory::Name())+1);
-+#else
-         buf=strdup(OldName+strlen(VideoDirectory)+1);
-+#endif
-         if(buf)
-         {
-           buf=ExchangeChars(buf,false);
-@@ -240,8 +244,13 @@
- {
-   myRecListItem *item=(myRecListItem*)&ListObject;
- 
-+#if APIVERSNUM > 20101
-+ char *s1=StripEpisodeName(strdup(filename+strlen(cVideoDirectory::Name())));
-+ char *s2=StripEpisodeName(strdup(item->filename+strlen(cVideoDirectory::Name())));
-+#else
-   char *s1=StripEpisodeName(strdup(filename+strlen(VideoDirectory)));
-   char *s2=StripEpisodeName(strdup(item->filename+strlen(VideoDirectory)));
-+#endif
- 
-   int compare;
-   if(mysetup.DescendSorting)
-@@ -699,7 +708,11 @@
- 
-                   isyslog("[extrecmenu] moving canceled");
- 
-+#if APIVERSNUM > 20101
-+                  cVideoDirectory::RemoveVideoFile(To.c_str());
-+#else
-                   RemoveVideoFile(To.c_str());
-+#endif
- 
-                   return true;
-                 }
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild
deleted file mode 100644
index 68be40df19ff..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-VERSION="936" #every bump, new version
-
-DVDARCHIVE="dvdarchive-2.3-beta.sh"
-
-DESCRIPTION="VDR Plugin: Extended recordings menu"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-extrecmenu"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
-	mirror://gentoo/${DVDARCHIVE}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
-
-	cd "${S}"
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		einfo "Enabling parentalrating option"
-		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
-	fi
-
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-1.7.28"; then
-		sed -i "s:SetRecording(recording->FileName(),recording->Title:SetRecording(recording->FileName:" mymenurecordings.c
-	fi
-
-	if has_version ">=media-video/vdr-1.7.32"; then
-		export EXTRECMENU_USE_VDR_CUTTER=1
-		einfo "disabled plugin cutter"
-		einfo "plugin use now the vdr included cutter"
-	fi
-
-	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	cd "${WORKDIR}"
-	newbin ${DVDARCHIVE} dvdarchive.sh
-
-	insinto /etc/vdr
-	doins "${FILESDIR}"/dvdarchive.conf
-}
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..5139180dea0a
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_VERSION="77d10faec3c7b0abe25ba3b161dc3b4e2cad042b"
+
+DVDARCHIVE="dvdarchive-2.3-beta.sh"
+
+DESCRIPTION="VDR Plugin: Extended recordings menu"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-extrecmenu"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapshot/vdr-plugin-extrecmenu-${GIT_VERSION}.tar.gz -> ${PF}.tar.gz
+	mirror://gentoo/${DVDARCHIVE}.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="media-video/vdr"
+
+S="${WORKDIR}/vdr-plugin-extrecmenu-${GIT_VERSION}"
+
+src_prepare() {
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die
+
+	cd "${WORKDIR}" || die
+	eapply -p0 "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
+
+	vdr-plugin-2_src_prepare
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	cd "${WORKDIR}"
+	newbin ${DVDARCHIVE} dvdarchive.sh
+
+	insinto /etc/vdr
+	doins "${FILESDIR}"/dvdarchive.conf
+}
diff --git a/media-plugins/vdr-femon/Manifest b/media-plugins/vdr-femon/Manifest
index 30b75ea3c8ee..a6273fe1a865 100644
--- a/media-plugins/vdr-femon/Manifest
+++ b/media-plugins/vdr-femon/Manifest
@@ -2,8 +2,10 @@ DIST vdr-femon-2.0.4.tgz 83985 BLAKE2B c83d5d6f173d5f98ee8ba874c2ed1743a659a19ba
 DIST vdr-femon-2.1.1.tgz 84165 BLAKE2B 15f7d54b74a0d1c0ab6fd270909811be4e617f66739344cde900eb040b8ae5d68ea026c027b7039336a442b7f4ee046fbbc13fb23d0ddf8220ff5c97d0a091e5 SHA512 a0893619b2e55d537b7362dc33a125abdf19ccbcf5d4b7633a2ed4741fd9a9b12496b5e83259491cc02f542071922b547d605ed1b41ac237e03c5f770c07b956
 DIST vdr-femon-2.2.0.tgz 84268 BLAKE2B 49e0c87ebcd03d8ac2cea3138a90f2afb7e07fa598f88243bf6ebcc3befc00c2115b531f0d3c0d901515fed46851a28da2bf8c16709151c1aa7a7170c1dd26c1 SHA512 0ab32fc1021efe21d3190d76f75956b5ffb2f94fdae1373cc08899ff0b035d1ee008a87c6a4af415e366c0188b16a9d49852bec527ac616c06ec27fed4d98861
 DIST vdr-femon-2.2.1.tgz 75338 BLAKE2B f3777f3ad2361a38c0eac1adc61f035d4ba21d97b6902e0254b17ecf2ccdb6450b6ddd7d3890fbca0be2c6c046cff235fe65e7068cb9f29893f9e7cbc82e5140 SHA512 fe5b61b116f8a37cfc6055884c896552d9ef6858c588ec0b81a95e54f537a31649c4f71cbfca1ec34edd305d72ec8d3e4db4dddad7dbb9904b8bab08317619ab
+DIST vdr-femon-2.4.0.tgz 83536 BLAKE2B c98bfd88ee0db8612a93d77ee4eae5b8334b94c6d6b49e779f9d77dbce2798191c9f6beba902d49c9c41bc68be0d4f6595897756acae1a45d68f71cfee9f3cd6 SHA512 930aa3b083935c4b7c2b281b19cddb971892d283ebb3550d2f861ac92b69a8595d0b3af434647677b99a06d7657b12600cbb5bfccbbd7ce5d2ed6120798c172d
 EBUILD vdr-femon-2.0.4.ebuild 451 BLAKE2B 55c34305354512ae731f51a58d22214c45fb90dec58e3b53a5d9b38a78ed80da9c828cdf7f26e35612d1cc17467d7bea8116502499cf935410a8ff227714d7e0 SHA512 26ea26b9e0b09aefce138657145c3d865463c4576a10d115507a7ab7ebc7f1d5829fea666c6fa14b6d57bd94ba022ea59d070071de2af60225b72508f78994a9
 EBUILD vdr-femon-2.1.1.ebuild 453 BLAKE2B ac140bcd0ff3bf33fdb60e0d04eed33b7d817445e3d7ce99792e8603ce9102f42f5770befb2b1799168e2281610a799e2de348125b68df7f09131f99ca128ad3 SHA512 dbd9639f172c033b6ac3656f77e3707843f157235a70abe1bc67edea9f12f6c7ea495934fd3b16bb8d36b910ef2b7c44adbcacce45b826c663d95a4645416e56
 EBUILD vdr-femon-2.2.0.ebuild 453 BLAKE2B 1d77caeae5943e69d63c3dedcc0ea6e802523763df257c392fe98e67bc596050ca826f6f8b84ad27ee02ec7ee3e9daa34c153911e59cd4015ae32650d31a5399 SHA512 e3396cb39da8ad64b2d3698ce9615cd306948fcf22338a15d95a481314aceb35c9987241bec1cd36b406ca53dac8622bcdaf665ca82f675f4d31f650ef7ef9a3
 EBUILD vdr-femon-2.2.1.ebuild 458 BLAKE2B 91c525b4b79dd3112ad98672299627d8b4dc983e9cdad29d8a74dc7bc1206965534eb997fac5f9736cbc3314ec145f4d45e8f4b434ee768f505b4d56e9c172c9 SHA512 9387ecf16d247402ae18994cd5c5d574e5ed43f38a4a0379b7989626a3b8562f2bb4c05577e698427559bc44dc6f276d1964b216d2a42df0c19f61a843b5ad1f
+EBUILD vdr-femon-2.4.0.ebuild 529 BLAKE2B dda05dc381262f9d66ab86d6c0c35aa29bd2741759e1b672ca7670fa9456d06f111de2576f4857f436afdfb6c28dfc307d31263da446a57baaba9c33613a3ade SHA512 d1c9459b3b0213e5cd84d8f4e250b385680c1227481de8a4f3d544d7963c826a594b118fa33219c1bddf354e9ed04eb0554ce779b11576ba4cc101914b6f4cda
 MISC metadata.xml 348 BLAKE2B 2ef44a74028eb13a9ed4afeec4d789ca959da89076b89ee46abb6796f43ab7d23535b4347db809954bddeee9c41cfe4d6fa2186a0bdccb8a109f06b529313527 SHA512 3a1a0c59d94f22138865987fabbded1bbb6f377724a56a8a2adab74918de62098fc534729cd5979d0964eeee78466bf79c2694c075f3d66b06b7a9af5dc47565
diff --git a/media-plugins/vdr-femon/vdr-femon-2.4.0.ebuild b/media-plugins/vdr-femon/vdr-femon-2.4.0.ebuild
new file mode 100644
index 000000000000..bb71b2d3af31
--- /dev/null
+++ b/media-plugins/vdr-femon/vdr-femon-2.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: DVB Frontend Status Monitor (signal strength/noise)"
+HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/femon/"
+SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND=">=media-video/vdr-2.4.0"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-.*
+	usr/lib64/vdr/plugins/libvdr-.*"
diff --git a/media-plugins/vdr-freecell/Manifest b/media-plugins/vdr-freecell/Manifest
index 37e25b3815ec..75b432b7c48a 100644
--- a/media-plugins/vdr-freecell/Manifest
+++ b/media-plugins/vdr-freecell/Manifest
@@ -4,6 +4,6 @@ AUX vdr-freecell-0.0.2_compilefix.patch 493 BLAKE2B 31c90f41d8c0416cd8f3a52c8e17
 AUX vdr-freecell-0.0.2_vdr-1.5.4-compile.diff 570 BLAKE2B deb8adbbef3519e1ce8d0cec669be59be25d3813fbc84ac2fcacbc2f26a07ead854df1db98e1489129b21cc742e5eee384aeb8dd510451fbb858d307642df915 SHA512 63add756e5f7ec84728f48545301792f8ea1dcc9851b6d9e3c92b84b90bb9f73acfd01b32512e204018540c6ce91f1b7a5c156688b9f41f6da2b1cf8286dd37c
 AUX vdr-freecell-time_ms.diff 332 BLAKE2B 7e7c3f7b2039dcfc1482eadc18d1ed99078cd4ccec519527d290fd532c06f3d33943cabc491ef24128d50989f084392aa6e3efbcbe18d99c01a172671205360f SHA512 8a00f7d82fc48adc29ebff3802c971387306735b0be562c2cc25813c70a68f386708f8e10b10ec3bde7d634a6d68b829558c97bd12705091c7237dfc279ea542
 DIST vdr-freecell-0.0.2.tgz 44019 BLAKE2B 56dd49906bb9cccebed3d51a3dbc0fc589f536bdb9d9bc4b3b9d0c5a5f582b706747d45865be057d8d3be5664292c01144a933eee6e36dc4a2610556b3fcd4cb SHA512 78288f10e56baffdd42a0448c118ccd619bdb3f94123a89661918976fc818052f45db0e3a6e0e45794dbe9f3db00b9ccfc140426e0f26d647c863c666827feb8
-EBUILD vdr-freecell-0.0.2-r3.ebuild 784 BLAKE2B 3745a823733955ec7f03905854a1a9a5c463e815365fd0d6b54c088101435e590b3acefc55d7253ce61864434fba19136ad3f136a4635f5274e21dc06aef8418 SHA512 476755900aadac691ef91d789f1275af001739fee3d389e1a776b2931f0a018c08ba9b74e59e8bc183ecdeb6ea7cc274a53bd3fe1356a57b45b22f1dd9d398fc
-EBUILD vdr-freecell-0.0.2-r4.ebuild 805 BLAKE2B ef2bb4862b7b92fcb57151aa6b4a47f0898c06af0a42ae7b8cc4d195676a6a3fc70d4cad132834aa752a98cd24f7646988b29ff667e454c74bbe9e22eca728c0 SHA512 2ce48c1a34a1346f96624814a694624dc2acd971705d900ffb9243a1d555fa457a6f6fd803461c0a14f7028ecc095286b2ee1cb013ed198366b850a6bdf94939
+EBUILD vdr-freecell-0.0.2-r3.ebuild 791 BLAKE2B 609a02219f8177692863be375e90317a45e0ad6dc57b7c6f7296dac383f72fb65d37baff6eef321707017787b0debceb2c3811584eb155f88d4302495fe0770e SHA512 b4ce18c6361ab4e59fdf695211a59f08b3e7af3cea4de0956df9606cdbe5874ee81b205f3c6f6a3f1d8b570693223d4d856c0de7d08c55aa77239ec7eeee0f56
+EBUILD vdr-freecell-0.0.2-r4.ebuild 812 BLAKE2B 07aae313bd3e3122d4d7401cbf8769fd38df88a5a28ea467a93f64170cfbd4b16c92a3bc908e133af0de975a5e8cd9daa35b430c55af59001ce8c882145ebe95 SHA512 ca4bd240bb9ac7aa3d2039d4422a090ceb27dd8d0585cdf67b3482018cbfdd6d6f459fee4f8873b83aac2865d5863fac5d8ddbef01ff3f0e7da36029b6ed4073
 MISC metadata.xml 252 BLAKE2B d1f37eaf7710a1eecf1cb5507974353424cfff01c8bf3521100e2c974c107e7f960401fa132c22ab3d4725f43b2472e146219e16b9903e4b9d239f17a4f03bbc SHA512 a212f4d0fb9a7a79e6c203fe2722bdc136618f0058b01c53df37f5a507f1113ca007cabbff7abdd4041d20a901e7ba0ea62c95f22ba79b1e801a2662c00b3fdb
diff --git a/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r3.ebuild b/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r3.ebuild
index 368c71bbddcb..a1eb15a3f387 100644
--- a/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r3.ebuild
+++ b/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ PATCHES=("${FILESDIR}/${PN}-time_ms.diff"
 src_prepare() {
 	vdr-plugin-2_src_prepare
 
-	sed -e "s:RegisterI18n://RegisterI18n:" -i freecell.c
+	sed -e "s:RegisterI18n://RegisterI18n:" -i freecell.c || die
 }
 
 src_install() {
diff --git a/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild b/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild
index a8442bf991d2..f7f610e71233 100644
--- a/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild
+++ b/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ DEPEND="media-video/vdr"
 src_prepare() {
 	vdr-plugin-2_src_prepare
 
-	sed -e "s:RegisterI18n://RegisterI18n:" -i freecell.c
+	sed -e "s:RegisterI18n://RegisterI18n:" -i freecell.c || die
 
 	eapply -p2 "${FILESDIR}/gcc-3.4.patch"
 	eapply "${FILESDIR}/${P}-gentoo.diff"
diff --git a/media-plugins/vdr-fritzbox/Manifest b/media-plugins/vdr-fritzbox/Manifest
index 908c334ef312..27ea029084f2 100644
--- a/media-plugins/vdr-fritzbox/Manifest
+++ b/media-plugins/vdr-fritzbox/Manifest
@@ -1,4 +1,4 @@
 AUX vdr-fritzbox-1.5.3-boost-1.67.patch 597 BLAKE2B 8efc4aa1ff4418bf9d627032a89d3975d264446266f92a823ccf467dfa8a593ff3c99768e9ae3a8421fb9bfc72145ec5b114997c4f653f5fc786cff45375d13c SHA512 97ab8e2e572be18dea596a6b66eae5d1929c7178bc5027abd6035240fab0fa76afe26170007e7c84776f11d4c452fa39fc8140a21adcba5eb78912984809098a
 DIST vdr-fritzbox-1.5.3.tgz 132207 BLAKE2B c9a93e922eeb2126279409e3948c44cb1fc3348d44fbcc2c1116038d66fc77a707d3885a6d587c8996138fcaff134bb78db4dab2d122caf0293d2d8d8770e985 SHA512 d396bb1386ffc4b53867c735d4ffc710c4266067e011e17f2d4aa597ecceeb502d2c6e23a1df69f929503b2cd5d07f4d57869c890040b1ae9af1742c044541be
-EBUILD vdr-fritzbox-1.5.3-r1.ebuild 1003 BLAKE2B f92a48063e1c4ee3460f6b1519bc425ffcfa3171a0c6325b449104cd2e0cc1ddea2bd6e64ec6892455dd48b71e5ed5b205c185a14166543c5dd80efa8161ec94 SHA512 a0a4f5a44a82fe8999ac744f2faa1dab9a4086be09191fbb549a380a18476c37b4f0899b8813251be399f51518d21f077e2c2b3b87793b41ac51da5013e3b439
+EBUILD vdr-fritzbox-1.5.3-r1.ebuild 1003 BLAKE2B 9deec31f2456624d46756f804d2dcbeb2ea70393d91e0ca5bb1dfe5000cb349401702c8fc168d3cf9a5a1503c64f56b1c70d6b0f91a8ca5dfdba4da11bfabdd1 SHA512 4c92b5d74cbd5cb732bc5769d13adf5e22ae8e156c6e3e7912fea6175d793f5b773a7bb2a0efa6c4574cc03538a3092f5e107451c31aa08c51a34fe3f8b04266
 MISC metadata.xml 330 BLAKE2B 6f2fc336e9406fcc2413210e07d2396d1fe4faff1e8be1ae7d16428e5df9c46f7c00b2f183fb9e6e973014e6ce46379d12774e3597f3caf901f812f5c90b5360 SHA512 b0521cb557fc56b09d61f9dded16f511d306151642b7a45cb243132d216531459d519a5abd9b38c23c7799b03bbaea8f8e2122a9b28ae200940fdc8a194cf0f5
diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild
index 9722986e6a33..792c195f12ff 100644
--- a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild
+++ b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: Inform about incoming phone-calls and use the fritz!box phonebook"
 HOMEPAGE="https://github.com/jowi24/vdr-fritz"
-SRC_URI="https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/${P}.tgz"
+SRC_URI="https://github.com/jowi24/vdr-fritz/releases/download/${PV}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/vdr-graphlcd/Manifest b/media-plugins/vdr-graphlcd/Manifest
index 1ddc9e082030..2c4ef9cce018 100644
--- a/media-plugins/vdr-graphlcd/Manifest
+++ b/media-plugins/vdr-graphlcd/Manifest
@@ -1,5 +1,8 @@
 AUX confd 565 BLAKE2B caf5867788b96423ba701ea645e212442f7881bb0d16b3c13924b64ff049a8e5dc48ead17f6b197ec4354525d53c168975e78c5650e34ab3a020ceffee0d0c15 SHA512 9b44466d924f5e7ea3ab23ade147a5c18b599714058c51fe8403cb7a0d2cd2be05fcc85a385a064c8b3110a6c88faa857444f6e4dee6c1843348209491e9ea99
 AUX rc-addon.sh 247 BLAKE2B f02545696c534397a2667e55e60d1c05067f4f11504ca724a4da71e71d8feb727a13d19601fbf7a08f15fa984139074da73cdd3dcf0ac9f3024af094ec87b149 SHA512 46d27b5feab6881721f480d6cc26e1a9796c9b46f083cf6e2f97523f8b54d2b93d373130e562235ec2a57d95cc37ac956e290467251572f5387db58a32ad1544
+AUX vdr-graphlcd-1.0.1_no-font.patch 1080 BLAKE2B 1ddf114f5d495970fb7662ca622448ecd7bce4a766dd21cd3c2a774f7167c02abe0585307ef3d42899d23f7f03f90184064aab5208dbcd3c7aaa42929f603475 SHA512 56d1631430dafb94e25861cabfc719ea5e8c843802938c0715ee342be4870f9216010a8de214f8f16f58ec640deb3d8df7f4657a48f6f80a76e36c8e0c2864b6
 DIST vdr-plugin-graphlcd-1.0.0.tar.bz2 888495 BLAKE2B 0557e0750cfa6baf16b2ca5d6e5b69b206d493717e9337fb84403b171b1a4a558fbbc77e32e2f00c1cc0aaadb1390f807e3cd578725aa2ad6786d037c4bb3251 SHA512 05994707b8e8a5640db3c9d4ea991d81b92d6d3e88de98ffc8a4bdac3b885fed2780958babbfec0967209aa15043a3799f08de0d3005ec6eeabf130de7879822
+DIST vdr-plugin-graphlcd-1.0.1.tar.bz2 888594 BLAKE2B 852b39a9c38583f9927718966d8f2b7d86da105450f7ab383a50bafd2d2c9a0e8acb000f7ac03603e6f81c9b12c22af27c3713e3a14409743c61cb696968b304 SHA512 2d7ec1018013b54dd17bf894cc7dc4ecfbbc549d18b6cf64460891204ca8b5cc84b0d756a2ab866011b11d4525e0c1fe93bf90f447a195044717b8f63a878566
 EBUILD vdr-graphlcd-1.0.0.ebuild 2621 BLAKE2B 231fce4e41eced133aeca5f492d8708320d2a0a4aa267349cdc5c8c68d8e5ceedac20ae52d7af109dc336a913c9089802059c5e3ce749ac56a9f2919786b6483 SHA512 a0012f54b3aa46657fd219395c5f39e08a1d019b9f64a3e6668df4d20bca5d05aa76644f89d636b9d6e7110ab09a9ca44417b4808a716af942096fe7021d0175
+EBUILD vdr-graphlcd-1.0.1.ebuild 2791 BLAKE2B 3c0c1f591f1614be2608cda3b0f63d192a679657032b4785f71ee65214b9c334ffb12185879119783bd92b7d1e95ec1a90929ca2951f4d0d1955143729223392 SHA512 59c98ca83c724d2335356d4eaf6b715d731c2feb5c5fcec3190844cc64c057a5912cb29d22ee5d57bdcc99b24b88b8da5f97759485ab98e6e8387d8f2c550279
 MISC metadata.xml 386 BLAKE2B 01915199322435f52711438e316c24feea4ab2852007d26deac46e5f5615c0e3cc5f8b4013a2391acbe4d666d3cc8681b000899434ed9df5ab4f00289f6b3333 SHA512 505462c67b43399c55d08deedd022a88e9a25659a6f9b150800d344bfe7e14cc1e8e73b6789401b7acd519bdfcae170743c898c4c4a354f13a9b1542f273e951
diff --git a/media-plugins/vdr-graphlcd/files/vdr-graphlcd-1.0.1_no-font.patch b/media-plugins/vdr-graphlcd/files/vdr-graphlcd-1.0.1_no-font.patch
new file mode 100644
index 000000000000..371d65f6138c
--- /dev/null
+++ b/media-plugins/vdr-graphlcd/files/vdr-graphlcd-1.0.1_no-font.patch
@@ -0,0 +1,26 @@
+do not install any fonts, as they are not included in
+License GPL v2
+
+Signed-Off-By: Joerg Bornkessel <hd_brummy@gentoo.org> (17 Dec 2019)
+diff -Naur vdr-plugin-graphlcd-1.0.0.orgi/Makefile vdr-plugin-graphlcd-1.0.0/Makefile
+--- vdr-plugin-graphlcd-1.0.0.orgi/Makefile	2019-12-17 22:41:46.000000000 +0100
++++ vdr-plugin-graphlcd-1.0.0/Makefile	2019-12-17 22:42:09.000000000 +0100
+@@ -271,15 +271,15 @@
+ 	@install -m 644 HISTORY $(DESTDIR)$(INSTALLDOCDIR)
+ 
+ ttf-fonts:
+-	@install -d $(DESTDIR)$(RESDIR)/fonts
+-	@install -m 644 $(PLUGIN)/fonts/*.ttf $(DESTDIR)$(RESDIR)/fonts
++#	@install -d $(DESTDIR)$(RESDIR)/fonts
++#	@install -m 644 $(PLUGIN)/fonts/*.ttf $(DESTDIR)$(RESDIR)/fonts
+ 
+ resources:
+ 	@install -d $(DESTDIR)$(RESDIR)/fonts
+ 	@install -m 644 $(PLUGIN)/channels.alias $(DESTDIR)$(RESDIR)
+ 	@cp -a $(PLUGIN)/logos $(DESTDIR)$(RESDIR)
+ 	@cp -a $(PLUGIN)/skins $(DESTDIR)$(RESDIR)
+-	@install -m 644 $(PLUGIN)/fonts/*.fnt $(DESTDIR)$(RESDIR)/fonts
++#	@install -m 644 $(PLUGIN)/fonts/*.fnt $(DESTDIR)$(RESDIR)/fonts
+ 
+ dist: $(I18Npo) clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1.ebuild
new file mode 100644
index 000000000000..ee0b2a5045de
--- /dev/null
+++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="vdr-plugin-graphlcd"
+MY_P="${MY_PN}-${PV}"
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: support output on Graphical LCD"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-graphlcd"
+SRC_URI="https://projects.vdr-developer.org/git/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=app-misc/graphlcd-base-${PV}
+	media-fonts/corefonts
+	media-video/vdr"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	vdr-plugin-2_pkg_setup
+
+	if ! getent group lp | grep -q vdr; then
+		einfo
+		einfo "Add user 'vdr' to group 'lp' for full user access to parport device"
+		elog
+		elog "User vdr added to group lp"
+		gpasswd -a vdr lp || die
+	fi
+	if ! getent group usb | grep -q vdr; then
+		einfo
+		einfo "Add user 'vdr' to group 'usb' for full user access to usb device"
+		elog
+		elog "User vdr added to group usb"
+		gpasswd -a vdr usb || die
+	fi
+}
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	sed -i "s:/usr/local:/usr:" Makefile || die
+	sed -i "s:i18n.c:i18n.h:g" Makefile || die
+	sed -i "s:include \$(VDRDIR)/Make.global:-include \$(VDRDIR)/Make.global:" Makefile || die
+
+	sed -i "s:SKIP_INSTALL_DOC ?= 0:SKIP_INSTALL_DOC ?= 1:" Makefile || die
+
+	eapply "${FILESDIR}/${P}_no-font.patch"
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insopts -m0644 -ovdr -gvdr
+
+	insinto /usr/share/vdr/${VDRPLUGIN}/logos
+	doins -r ${VDRPLUGIN}/logos/*
+
+	insinto /etc/vdr/plugins/${VDRPLUGIN}
+	doins ${VDRPLUGIN}/channels.alias
+
+	# do we need this sym link? need testing..
+	dosym "${EPREFIX}/usr/share/fonts/corefonts" "${EPREFIX}/usr/share/vdr/graphlcd/fonts"
+
+	dosym "${EPREFIX}/usr/share/fonts/corefonts" "${EPREFIX}/etc/vdr/plugins/${VDRPLUGIN}/fonts"
+	dosym "${EPREFIX}/usr/share/vdr/${VDRPLUGIN}/logos" "${EPREFIX}/etc/vdr/plugins/${VDRPLUGIN}/logos"
+	dosym "${EPREFIX}/etc/graphlcd.conf" "${EPREFIX}/etc/vdr/plugins/${VDRPLUGIN}/graphlcd.conf"
+
+	# do we need this sym link? need testing..
+#	dosym "${EPREFIX}/etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.3" "${EPREFIX}/etc/vdr/plugins/${VDRPLUGIN}/logonames.alias"
+}
+
+pkg_preinst() {
+	if [[ -e /etc/vdr/plugins/graphlcd/fonts ]] && [[ ! -L /etc/vdr/plugins/graphlcd/fonts ]] \
+	|| [[ -e /etc/vdr/plugins/graphlcd/logos ]] && [[ ! -L /etc/vdr/plugins/graphlcd/logos ]] ; then
+		elog "Remove wrong DIR in /etc/vdr/plugins/graphlcd from prior install"
+		rm -R /etc/vdrplugins/graphlcd/{fonts,logos} || die
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	einfo "Add additional options in /etc/conf.d/vdr.graphlcd\n"
+
+	einfo "Please copy or link one of the supplied fonts.conf.*"
+	einfo "files in /etc/vdr/plugins/graphlcd/ to"
+	einfo "/etc/vdr/plugins/graphlcd/fonts.conf"
+}
diff --git a/media-plugins/vdr-iptv/Manifest b/media-plugins/vdr-iptv/Manifest
index a15b8ba7a6cf..b2b8cbc143c2 100644
--- a/media-plugins/vdr-iptv/Manifest
+++ b/media-plugins/vdr-iptv/Manifest
@@ -1,4 +1,6 @@
 AUX vdr-iptv-2.2.1_c++11.patch 1382 BLAKE2B b494c982c9147e972d5330a3892dad18291928bcbddd9fca599c3fea7539d149fd7f3bbbde37e38a20a770a608594a654db5c60b1524d4847e0534b879eed464 SHA512 a3f805b5c0ce8813f8461b5a83043bdf21d78dc32361ab08700e9d9db280b4f1055a061bf7462ed4117437cb7726397a7a18f210aa9621cf77590b56a1e3b77e
 DIST vdr-iptv-2.2.1.tgz 59409 BLAKE2B 8a3e1a79afdb1273b011f5ae9eae84c456462116d075c57165436c25c7f16602b4ef5e80d5dbff77f1a027515c49fce385e2d3f89c66ae8c39980d229ef38a6b SHA512 bd74ef6d36ea390bbd0174e747af4ee2ec5615af0f0b2af87b0e4037237fdb47e86f5a7a558c1685722cdab045fa5f9657916d46c2a0ca9bf58c05396e7785fd
+DIST vdr-iptv-2.4.0.tgz 61385 BLAKE2B d2ba20fe3ef1885b2e122de81699a284cc5f8d951e137786d8fff47dce2366ab1f00e97c4ab7a07056cc11f547c198fea422a60bd464c12e3bf71701d428bf1c SHA512 f429f7b7952b357a941b30aa3509d06839ed2945979957db4ba142acc500a976e3ea4a976dec4fe755605dbdd8cbbdc25beb19bb984bb5147ac22a68078d49d9
 EBUILD vdr-iptv-2.2.1-r1.ebuild 585 BLAKE2B db9e42ebf8bca862f5538b71f6c722e46be6b928426aa8954a017838a9dc9bb5296db4907a46ad4ff117d4ccc32fb0752dbf42f85ff218027ffcbcb15c1f8f93 SHA512 eb3bbd1ec1daabd501dd3a2ad377d379c4077ae8f356283f27025b22378f411eb2cf7de98b65e9f6f9b0d5faf2600cdab23c13a8c5e19c454ad3038074b0b160
+EBUILD vdr-iptv-2.4.0.ebuild 622 BLAKE2B a0483d300ce2f8d65410ab69d2f0cdbbe0ea76258fafa6ee2121a9501c37291fd05b582670645c3a0e88a1b2f7a9d3c3f94915bcc6f6305439c6d64adfad8744 SHA512 84543a9bc9dee3723b286e665492e863300d59e89897b92218d5316e8815a052397ce8a2350b5ea59a3e032bc2fe3d127eeb4e703ee9381add1decc46cb3608c
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-iptv/vdr-iptv-2.4.0.ebuild b/media-plugins/vdr-iptv/vdr-iptv-2.4.0.ebuild
new file mode 100644
index 000000000000..3d09716fdc67
--- /dev/null
+++ b/media-plugins/vdr-iptv/vdr-iptv-2.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: Add a logical device capable of receiving IPTV"
+HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"
+SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-video/vdr-2.4.0"
+RDEPEND="${DEPEND}
+	net-misc/curl"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-iptv.*
+	usr/lib64/vdr/plugins/libvdr-iptv.*"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include sidscanner.c
+}
diff --git a/media-plugins/vdr-joystick/Manifest b/media-plugins/vdr-joystick/Manifest
index d3345ce73378..67bcf6867df9 100644
--- a/media-plugins/vdr-joystick/Manifest
+++ b/media-plugins/vdr-joystick/Manifest
@@ -2,5 +2,5 @@ AUX confd 103 BLAKE2B e481645f01651e4c755900e53699a9ad8fc7273bddf640bce397dd7011
 AUX mapping.conf 775 BLAKE2B de685a10432f90d06d96f86ec368c968e87537d126c79b0f37ce0923708860e9f9d82200e706bb37d2fd150e2c81d8d1692363c27889cd9abcc31f97c23d8511 SHA512 c8018f036a75d7feb0bd83f106625341785d53e20a50292a591cd4dc40a741834e79f2b740cde8ccb8f517ff67a8e397e577924c3a3cfed674c99a7000088768
 AUX rc-addon.sh 171 BLAKE2B 50dc2c30d2906e1ba736ce3cd5678d436dc183524322fabcfdf453258006f26c5d1044ff9c46161610c99651e63b2384481b5380722b3f099eca0e0ecdfa94fd SHA512 1776ffaa11c3d9c34ae9e20609b849bf2995d1bc85064dccb517179339bd1a0396ff75b474af0ad85a6c80a39578884577d410639a34bce065ecccac74118e76
 DIST vdr-joystick-0.0.3.tgz 12246 BLAKE2B da48db3b843e56592f7bd89859519afb7266d7fba55c4f165e07dbaa8a064fdd30872101e887205864f412f03afb0a90c80af6d16d6d87b96db31d79add6cd36 SHA512 d51b56bee64e0b871898d10ad55c0fb48fb29a5f26f342d835575fa226f6be0d8670251363f9a49988d5e0adc118afeb0f69a283dfde818044d23501c2a45ca0
-EBUILD vdr-joystick-0.0.3.ebuild 819 BLAKE2B c62c3749c060a3e16dd331e5f5cdf74e4729fd82bbed120a6d02edf0b7328e32ac5a8e9f5f1a6cab270977f274baa261ca66bd7c509426ccd5c1bd3048c17982 SHA512 b47d5d4fd53fa1cea8ff93b97678a00e76d427cd36de341097fbd6306c5edcd4f7efdb063460e956c52dec4fa31911bac3e7b913cb43384ab35624fbba564179
+EBUILD vdr-joystick-0.0.3.ebuild 799 BLAKE2B fea2f32cccbdfcaaef6e4fedb0706bbed2f0bbe51c7f16e736bcfdba051b0eb3c1062af26721a437d40f9ff3ac9aa49c997444f9d871591f7ac779912e2a2f6a SHA512 39ab29591e843f15c951355f986890e93c8774f700599821bcd13ecc1a2c2db57fa83b3b179d3ed2227a51d5ff83d09611e9b66ff1db61fcb5d16a74d87a2a48
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-joystick/vdr-joystick-0.0.3.ebuild b/media-plugins/vdr-joystick/vdr-joystick-0.0.3.ebuild
index cf1cb9847878..6438dc52b0d4 100644
--- a/media-plugins/vdr-joystick/vdr-joystick-0.0.3.ebuild
+++ b/media-plugins/vdr-joystick/vdr-joystick-0.0.3.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: allows using a joystick as a remote control for VDR"
-HOMEPAGE="http://www.powarman.de/vdr_plugins.htm"
-SRC_URI="http://home.arcor.de/andreas.regel/files/joystick/${P}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.4.6"
+DEPEND="media-video/vdr"
 RDEPEND="${DEPEND}"
 
 src_install() {
@@ -27,9 +27,8 @@ src_install() {
 pkg_postinst() {
 	vdr-plugin-2_pkg_postinst
 
-	echo
-	elog "To use the plugin your joystick has to be connected to your game port and its kernel module has to be loaded."
+	elog "To use the plugin your joystick has to be connected to your"
+	elog "game port and its kernel module has to be loaded."
 	elog "Check configuration file:"
-	elog "/etc/vdr/plugins/joystick/mapping.conf"
-	echo
+	elog "/etc/vdr/plugins/joystick/mapping.conf\n"
 }
diff --git a/media-plugins/vdr-lcdproc/Manifest b/media-plugins/vdr-lcdproc/Manifest
index f8b55cfdaf5f..0d8d63e76ded 100644
--- a/media-plugins/vdr-lcdproc/Manifest
+++ b/media-plugins/vdr-lcdproc/Manifest
@@ -1,3 +1,5 @@
+AUX vdr-2.4_lcdproc-0.0.10.9.patch 1823 BLAKE2B cde7165abd6caafaaecb575246a16c00e556eb1f6c4b947b2474b4e3bd42bb99076e5fa946bc805e102b5e092ca3887ab69e7bfef45118cf6215d2b772e2fcd9 SHA512 17d6325aad342065f7af15154a8ff1ffbb121e728dfb6e91e98d9ae05dd159408e80e57b73a6d41d0d21732876a2a3f02d678d28160a7bdb60bb12c81be13883
 DIST vdr-lcdproc-0.0.10.9.tgz 40465 BLAKE2B c812c9efe57f5015450ebc7c91ba6ff107486b566fd46ccf60fe3251eac483d119d8c1caa41868536a6051d5f094a7b89f985609f60c13bb4fcbb31bdc8d631c SHA512 237726e6c7a3436e416596e2b85411edb5945a3feef809d2e86c3952673b2531077ab70f9bddbfc1bc12fa0b2f416f153bf1a12f91288ecbdee23553474e044a
-EBUILD vdr-lcdproc-0.0.10.9.ebuild 609 BLAKE2B 5adff9076ce955334d084f9f5b538f5fa14cbab87e499ae6262ded70027e4c29fdf1f90d3e49301eeef09de537d7fe128ab521c0b9cc7686a22f9c129a2edbc1 SHA512 0f6222df2d49795f6265ea0ac24d764ad7b013a8e27bbc5c6c979ce515e03cf737a402c6679924485d9dd4c7f061de97d67b19d700a77532dd57c4731db62ef6
+EBUILD vdr-lcdproc-0.0.10.9-r1.ebuild 604 BLAKE2B f89cbab5f6775fbd89d1926efa1a78ec6af3ee8c467306b312c8cbe388a8ad7aa9523eb8cf1aa3d73b4984b1db41d6e38b651603b60b8330e667555ce644d266 SHA512 3eb8759dfb571da02e563e77a89f30b1cb03ae157cfbecec4c7252e5f033c51cc584c1fd320602cc833d5145d6fb46ee17a56be6479a3986c53f02b4bce4048b
+EBUILD vdr-lcdproc-0.0.10.9.ebuild 575 BLAKE2B 7aa8d6ff4b9746f2bae40266c2ef8b4aec6a3b2efac4ec653f099b21eec43f6ba5a78c956cd7ec0184b0f3f57f5069e0df4aba16c6a2b56f2119449ef6ffea9b SHA512 ae2cd54b20c3fb46aa0087f9e17b6b57431d57430cd23944ecab82566fbc822496d7879dfa2d2ece72dae9d3f47e37088032c868efdbe131b10172e2e36ede5c
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-lcdproc/files/vdr-2.4_lcdproc-0.0.10.9.patch b/media-plugins/vdr-lcdproc/files/vdr-2.4_lcdproc-0.0.10.9.patch
new file mode 100644
index 000000000000..0d2bbe4bb69b
--- /dev/null
+++ b/media-plugins/vdr-lcdproc/files/vdr-2.4_lcdproc-0.0.10.9.patch
@@ -0,0 +1,45 @@
+compilefix for vdr-2.4
+Suggested-by: MatthiasK @ vdr-portal.de
+
+fixed invalid suffix on literal; C++11 space issues
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 25 Dec 2019 )
+diff -Naur lcdproc-0.0.10-jw9.orig/lcd.c lcdproc-0.0.10-jw9/lcd.c
+--- lcdproc-0.0.10-jw9.orig/lcd.c	2019-12-25 22:53:55.187492713 +0100
++++ lcdproc-0.0.10-jw9/lcd.c	2019-12-25 22:54:33.075492713 +0100
+@@ -808,7 +808,7 @@
+ 	  cLcd::Write(LcdSetup.ShowTime?1:4," Welcome  to  V D R\0");
+ 	  cLcd::Write(LcdSetup.ShowTime?2:3,"--------------------\0");
+ 	  cLcd::Write(LcdSetup.ShowTime?3:1,"Video Disk Recorder\0");
+-	  cLcd::Write(LcdSetup.ShowTime?4:2,"Version: "VDRVERSION"\0");
++	  cLcd::Write(LcdSetup.ShowTime?4:2,"Version: " VDRVERSION "\0");
+ 
+ 	  // Output init
+ 	  if (LcdSetup.OutputNumber > 0){
+@@ -850,11 +850,15 @@
+ 		  }
+ 
+ 		  if ( time(NULL) > nextLcdUpdate ) {
+-			  cChannel *channel = Channels.GetByNumber(primaryDvbApi->CurrentChannel());
++//			  cChannel *channel = Channels.GetByNumber(primaryDvbApi->CurrentChannel());
++			  LOCK_CHANNELS_READ;
++			  const cChannel *channel = Channels->GetByNumber(primaryDvbApi->CurrentChannel());
+ 			  const cEvent *Present = NULL;
+-			  cSchedulesLock schedulesLock;
++/*			  cSchedulesLock schedulesLock;
+ 			  const cSchedules *Schedules = cSchedules::Schedules(schedulesLock);
+ 			  if (Schedules) {
++				  const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID()); */
++				  LOCK_SCHEDULES_READ;
+ 				  const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
+ 				  if (Schedule) {
+ 					  const char *PresentTitle, *PresentSubtitle;
+@@ -873,7 +877,7 @@
+ 						  rtcycle = 10; // RT
+ 						  lcrCycle = 10; // LCR
+ 				  }
+-			  }
++//			  }
+ 			  if ( nextLcdUpdate <= time(NULL) )
+ 				  nextLcdUpdate=(time(NULL)/60)*60+60;
+ 		  }
diff --git a/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9-r1.ebuild b/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9-r1.ebuild
new file mode 100644
index 000000000000..fa5d74a98f8d
--- /dev/null
+++ b/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+VERSION="932" # every bump, new version
+
+MY_P=${PN}-$(ver_rs 3 -jw ${PV})
+
+DESCRIPTION="VDR plugin: use LCD device for additional output"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-lcdproc"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${MY_P}.tgz -> ${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=app-misc/lcdproc-0.4.3
+		>=media-video/vdr-2.4"
+
+PATCHES=( "${FILESDIR}/vdr-2.4_lcdproc-0.0.10.9.patch" )
+
+S=${WORKDIR}/${MY_P#vdr-}
diff --git a/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild b/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild
index 207b8e2c1334..966c08c4fec9 100644
--- a/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild
+++ b/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit vdr-plugin-2 versionator
+inherit vdr-plugin-2
 
 VERSION="932" # every bump, new version
 
-MY_P=${PN}-$(replace_version_separator 3 -jw ${PV})
+MY_P=${PN}-$(ver_rs 3 -jw ${PV})
 
 DESCRIPTION="VDR plugin: use LCD device for additional output"
 HOMEPAGE="https://projects.vdr-developer.org/projects/plg-lcdproc"
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 2dff00eb71de..13834b35f9de 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -1,16 +1,12 @@
 AUX confd 125 BLAKE2B 798765df74a0f41989d1d937600239760383470b52a0498c81f583c488de58d27c8ab2e0b1cbb3dfc346b86a4a3efccf9f73c0eb416c23454fa0c7c147758f9f SHA512 c69a6b1a99f86e9271b925439bb08acf7ab65ebc75b354197eb2668996af966d047a99b1c712efac6efbc031fd9b61d2c90f45331aed74a9093f24982c307505
 AUX confd-0.2 467 BLAKE2B e827ae5ec7cdeb9211574f4402885aa487ba969e6ecf74f4c6e807b1eae78aa85fea236e682a83e9643c2154ed827ace4e9651dfa8332f918ae0f4eacd0d4854 SHA512 bea6f86cb590199def38df9ff4f462c6e0462d0623c5fdb6b416cffb49b9966ccbd7f364a52bfe702e1c638f3a97873e0ac019d246d3c84b88c58060ab004c51
-AUX confd-0.3 594 BLAKE2B e4e342ce5e7379d0a84ce67644a4011c2978140488f9f1a71c135bb769c8547d6362481526d7f51509e00250a10bb9e4d4a03fee64fa97db1819c5b45243a9db SHA512 d2fa96fdbe1a00fa9f1181b36fa43f2fd2f28a1d270671b8f6c422fc8309b625dc64b8425551d9ef9db2b0929d748555bfdca16349126f78f439c4fe366969e0
 AUX confd-2.3 594 BLAKE2B e4e342ce5e7379d0a84ce67644a4011c2978140488f9f1a71c135bb769c8547d6362481526d7f51509e00250a10bb9e4d4a03fee64fa97db1819c5b45243a9db SHA512 d2fa96fdbe1a00fa9f1181b36fa43f2fd2f28a1d270671b8f6c422fc8309b625dc64b8425551d9ef9db2b0929d748555bfdca16349126f78f439c4fe366969e0
 AUX rc-addon-0.2.sh 489 BLAKE2B 770e03cb0dd21a66589a1838f19785d22378ea5fa6c9206c6ad0d0ec9a5bb86089d6b157758fa7d3d43532e2ffbe81853bdc62f0ecd51ec68940d1486d7b707b SHA512 f42c6e6e03ba33e15c02fc3b42faa15b822d78944c4e29432c230fbc75e636cac6ce64efbed0521965a4fc4054a1a9c9ced0e25a5e8b44fd16332dc5c5269ff2
-AUX rc-addon-0.3.sh 619 BLAKE2B a6d994ef6476f17ba558a778ce13a4a72d6c513d10cd2ce43dee8a7ea598682bbd83e27759f1e53644b7f4046274559cf5cc9614775c5d1b05934819b6262604 SHA512 c07a13a91f6f0d2f5ad990545875adac161a61d944053c19cf43e1252c18e9e98127cafc704d5a729dcbc887576f83ce78413deac8c35fad5962f1e769c36b93
 AUX rc-addon-2.3.sh 619 BLAKE2B a6d994ef6476f17ba558a778ce13a4a72d6c513d10cd2ce43dee8a7ea598682bbd83e27759f1e53644b7f4046274559cf5cc9614775c5d1b05934819b6262604 SHA512 c07a13a91f6f0d2f5ad990545875adac161a61d944053c19cf43e1252c18e9e98127cafc704d5a729dcbc887576f83ce78413deac8c35fad5962f1e769c36b93
 AUX rc-addon.sh 180 BLAKE2B b8df7fdcd9377997d7ac4906b365de30f6ed7642dd6b48d5e3410f87fcb3cc3121888e61d42fbaed483f38f4d73449b2f4eaecafe9e5f045cb061d2edd76c301 SHA512 2bdf0e809148bbeb33ede687d40332b26dfaa2dc8be2e743f7c56cb19f572ff30e88ceac8c80602b8a39e0dc1657cd79f7afa1b8993b37714a400f7b1384f622
-AUX vdr-live-0.3.0_p20130504-c++11.patch 5995 BLAKE2B 98d91c9d579c5b7e2843bb92bb73ce602af72608182f307d2ff6853ba10405d3410245a856c94b8ee8e4b2bad708e2ff2d184836cc5fafea9b106f88ef3234c1 SHA512 88e66be9541a8c26821187c9732afba70df725b3b6e4ae52c3a343211ff1e3fcc78a577028d62d31f5f96f4ff542ab87ad252c2d794563b62c177c686e5b5adc
 AUX vdr-live-0.3.0_p20130504_vdr-2.1.2.diff 2722 BLAKE2B 021d4470ec84e7912b57b79a706c977ddb1b5ce67880dbdcf0b4bbc5cce7ad3646d05e89d2b31791f91a4af137e8a3e5995ff79580a8db7d5347b7c5a69ceaf1 SHA512 813e17202fb9dd921e38492127ad8518fc4aa2f6240ce9284990bf3e0a40c04b3b56efcaf667ce5f4aedf9b6e76422e2bb73c3218d124f3d8452b3b7979ba0b2
 DIST release_2-3-1.tar.bz2 703327 BLAKE2B 70724894a4abf2f94d682602d722b3d015cefefa7c9daf2dae35fc84bff1d950539c916d6d97e39565e87e8e7d841277ad14e137238026b25f73b1b288fa18f5 SHA512 f943c2aa477ca943b2015eb0b49a650e5c9e5cc124549b68d36b56a0ae6344a8d32ac3c4f213ab3cb91794ae569d3ed14a84168f45bf395e90536992078bce41
 DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 BLAKE2B 64567a037dd283d005727b993053609e7c46784de67bcbd9afb4f68edd03cec494e6eca6c497ac578928de92c1d21b2519867c014cfd11ace79e957fc5d487d1 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1
 EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2472 BLAKE2B 2eb1baaeee70bee4e9eeff77fbfe1e9c72239ba3fe8cee61dfefce5a10947df8cf071b7360b8e12b771f9685b0fb4fb5c7724753793b36a5b096683ff147fd76 SHA512 eb9d16b2b2dbf5d76f289ccc6ee33cfab4c92543bb27771590e84d34a51a38c5887c414811135f8550bc0f18b5343534a7a142d11153318946a0ed3e5777240e
-EBUILD vdr-live-0.3.0_p20130504-r2.ebuild 2490 BLAKE2B a49886074991f1d19576c673616c012f2ecc17e32c54e5677e60777fd819d29eac12d813d12dc82ef631a7080e86831fd59f49210aaa59a192b35a023d2cbc02 SHA512 1f4d096edb81c10d40ef20078698205ff135508dc67c0e69bc09f6e66b2eda90762b49e2dcb7415769e7186484a08326bb61b97de219e543c2a81636ba7a5690
 EBUILD vdr-live-2.3.1.ebuild 2345 BLAKE2B 9adbf74f2696f1952f1d519930d9277ab3e031c87089d75de38834cbebe7fc026011917cc2abe025796e60aa9d0ba13deff5bed4dd2f0603bdd8f681750de15e SHA512 9e41e251e2c43737c9ae74b1018f21db5b3e5bd33823ab4f58a30d6b85df5834e6f76c3609300a5fb0cc699214be4f95f645cf202cab5abfc06d2738f29d0994
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-live/files/confd-0.3 b/media-plugins/vdr-live/files/confd-0.3
deleted file mode 100644
index cb1dce04dfb5..000000000000
--- a/media-plugins/vdr-live/files/confd-0.3
+++ /dev/null
@@ -1,29 +0,0 @@
-# configuration of media-plugins/vdr-live
-
-# for people who want more secure
-# with ssl access.
-#	on usage, you have to install vdr-live
-#	with USE="ssl"
-#
-#	SSL ADDRESS -->  https://<your-ip>:8443/
-#
-#	allowed values: yes no
-#	default: no
-#LIVE_USE_SSL="yes"
-
-# default given portnumber
-# only changes needed on problems
-#
-#LIVE_PORT="8008"
-#LIVE_SSL_PORT="8443"
-
-# bind to these IP addresses
-# default, your IP will automaticly detected
-#
-LIVE_BIND_IPS="127.0.0.1"
-
-# for people who have epgimges
-# default: /var/cache/vdr/epgimges
-#
-# set this to your own path, if needed
-#EPGIMAGES_DIR=" "
diff --git a/media-plugins/vdr-live/files/rc-addon-0.3.sh b/media-plugins/vdr-live/files/rc-addon-0.3.sh
deleted file mode 100644
index 1372e09d56f0..000000000000
--- a/media-plugins/vdr-live/files/rc-addon-0.3.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# zzam@g.o
-# hd_brummy@g.o
-
-EPGIMAGES_DIR="/var/cache/vdr/epgimages"
-
-plugin_pre_vdr_start() {
-	if [ "${LIVE_USE_SSL:=no}" = "yes" ]; then
-		if [ -n "${LIVE_SSL_PORT}" ]; then
-			add_plugin_param "-s ${LIVE_SSL_PORT}"
-		fi
-
-		add_plugin_param "--cert=/etc/vdr/plugins/live/live.pem"
-		add_plugin_param "--key=/etc/vdr/plugins/live/live-key.pem"
-
-	else
-		if [ -n "${LIVE_PORT}" ]; then
-			add_plugin_param "-p ${LIVE_PORT}"
-		fi
-	fi
-
-	if [ -d ${EPGIMAGES_DIR} ]; then
-		add_plugin_param "--epgimages=${EPGIMAGES_DIR}"
-	fi
-
-	local ip
-	for ip in ${LIVE_BIND_IPS:=`hostname -i`}; do
-		add_plugin_param "-i ${ip}"
-	done
-}
diff --git a/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504-c++11.patch b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504-c++11.patch
deleted file mode 100644
index e2bf96dec4a1..000000000000
--- a/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504-c++11.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Bug: https://bugs.gentoo.org/599752
-
---- a/recman.cpp
-+++ b/recman.cpp
-@@ -22,10 +22,10 @@
- 	/**
- 	 *  Implementation of class RecordingsManager:
- 	 */
--	weak_ptr< RecordingsManager > RecordingsManager::m_recMan;
--	shared_ptr< RecordingsTree > RecordingsManager::m_recTree;
--	shared_ptr< RecordingsList > RecordingsManager::m_recList;
--	shared_ptr< DirectoryList > RecordingsManager::m_recDirs;
-+	std::tr1::weak_ptr< RecordingsManager > RecordingsManager::m_recMan;
-+	std::tr1::shared_ptr< RecordingsTree > RecordingsManager::m_recTree;
-+	std::tr1::shared_ptr< RecordingsList > RecordingsManager::m_recList;
-+	std::tr1::shared_ptr< DirectoryList > RecordingsManager::m_recDirs;
- 	int RecordingsManager::m_recordingsState = 0;
- 
- 	// The RecordingsManager holds a VDR lock on the
-@@ -53,7 +53,7 @@
- 	{
- 		RecordingsManagerPtr recMan = EnsureValidData();
- 		if (! recMan) {
--			return RecordingsTreePtr(recMan, shared_ptr< RecordingsTree >());
-+			return RecordingsTreePtr(recMan, std::tr1::shared_ptr< RecordingsTree >());
- 		}
- 		return RecordingsTreePtr(recMan, m_recTree);
- 	}
-@@ -62,25 +62,25 @@
- 	{
- 		RecordingsManagerPtr recMan = EnsureValidData();
- 		if (! recMan) {
--			return RecordingsListPtr(recMan, shared_ptr< RecordingsList >());
-+			return RecordingsListPtr(recMan, std::tr1::shared_ptr< RecordingsList >());
- 		}
--		return RecordingsListPtr(recMan, shared_ptr< RecordingsList >(new RecordingsList(m_recList, ascending)));
-+		return RecordingsListPtr(recMan, std::tr1::shared_ptr< RecordingsList >(new RecordingsList(m_recList, ascending)));
- 	}
- 
- 	RecordingsListPtr RecordingsManager::GetRecordingsList(time_t begin, time_t end, bool ascending) const
- 	{
- 		RecordingsManagerPtr recMan = EnsureValidData();
- 		if (! recMan) {
--			return RecordingsListPtr(recMan, shared_ptr< RecordingsList >());
-+			return RecordingsListPtr(recMan, std::tr1::shared_ptr< RecordingsList >());
- 		}
--		return RecordingsListPtr(recMan, shared_ptr< RecordingsList >(new RecordingsList(m_recList, ascending)));
-+		return RecordingsListPtr(recMan, std::tr1::shared_ptr< RecordingsList >(new RecordingsList(m_recList, ascending)));
- 	}
- 
- 	DirectoryListPtr RecordingsManager::GetDirectoryList() const
- 	{
- 		RecordingsManagerPtr recMan = EnsureValidData();
- 		if (!recMan) {
--			return DirectoryListPtr(recMan, shared_ptr< DirectoryList >());
-+			return DirectoryListPtr(recMan, std::tr1::shared_ptr< DirectoryList >());
- 		}
- 		return DirectoryListPtr(recMan, m_recDirs);
- 	}
-@@ -260,21 +264,21 @@
- 				m_recDirs.reset();
- 			}
- 			if (stateChanged || !m_recTree) {
--				m_recTree = shared_ptr< RecordingsTree >(new RecordingsTree(recMan));
-+				m_recTree = std::tr1::shared_ptr< RecordingsTree >(new RecordingsTree(recMan));
- 			}
- 			if (!m_recTree) {
- 				esyslog("[LIVE]: creation of recordings tree failed!");
- 				return RecordingsManagerPtr();
- 			}
- 			if (stateChanged || !m_recList) {
--				m_recList = shared_ptr< RecordingsList >(new RecordingsList(RecordingsTreePtr(recMan, m_recTree)));
-+				m_recList = std::tr1::shared_ptr< RecordingsList >(new RecordingsList(RecordingsTreePtr(recMan, m_recTree)));
- 			}
- 			if (!m_recList) {
- 				esyslog("[LIVE]: creation of recordings list failed!");
- 				return RecordingsManagerPtr();
- 			}
- 			if (stateChanged || !m_recDirs) {
--				m_recDirs = shared_ptr< DirectoryList >(new DirectoryList(recMan));
-+				m_recDirs = std::tr1::shared_ptr< DirectoryList >(new DirectoryList(recMan));
- 			}
- 			if (!m_recDirs) {
- 				esyslog("[LIVE]: creation of directory list failed!");
-@@ -543,13 +547,13 @@
- 	 *  Implementation of class RecordingsTreePtr:
- 	 */
- 	RecordingsTreePtr::RecordingsTreePtr() :
--		shared_ptr<RecordingsTree>(),
-+		std::tr1::shared_ptr<RecordingsTree>(),
- 		m_recManPtr()
- 	{
- 	}
- 
- 	RecordingsTreePtr::RecordingsTreePtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< RecordingsTree > recTree) :
--		shared_ptr<RecordingsTree>(recTree),
-+		std::tr1::shared_ptr<RecordingsTree>(recTree),
- 		m_recManPtr(recManPtr)
- 	{
- 	}
-@@ -587,7 +591,7 @@
- 		}
- 	}
- 
--	RecordingsList::RecordingsList(shared_ptr< RecordingsList > recList, bool ascending) :
-+	RecordingsList::RecordingsList(std::tr1::shared_ptr< RecordingsList > recList, bool ascending) :
- 		m_pRecVec(new RecVecType(recList->size()))
- 	{
- 		if (!m_pRecVec) {
-@@ -601,7 +605,7 @@
- 		}
- 	}
- 
--	RecordingsList::RecordingsList(shared_ptr< RecordingsList > recList, time_t begin, time_t end, bool ascending) :
-+	RecordingsList::RecordingsList(std::tr1::shared_ptr< RecordingsList > recList, time_t begin, time_t end, bool ascending) :
- 		m_pRecVec(new RecVecType())
- 	{
- 		if (end > begin) {
-@@ -643,8 +647,8 @@
- 	/**
- 	 *  Implementation of class RecordingsList:
- 	 */
--	RecordingsListPtr::RecordingsListPtr(RecordingsManagerPtr recManPtr, shared_ptr< RecordingsList > recList) :
--		shared_ptr< RecordingsList >(recList),
-+	RecordingsListPtr::RecordingsListPtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< RecordingsList > recList) :
-+		std::tr1::shared_ptr< RecordingsList >(recList),
- 		m_recManPtr(recManPtr)
- 	{
- 	}
-@@ -712,8 +716,8 @@
- 	/**
- 	 *  Implementation of class DirectoryListPtr:
- 	 */
--	DirectoryListPtr::DirectoryListPtr(RecordingsManagerPtr recManPtr, shared_ptr< DirectoryList > recDirs) :
--		shared_ptr< DirectoryList >(recDirs),
-+	DirectoryListPtr::DirectoryListPtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< DirectoryList > recDirs) :
-+		std::tr1::shared_ptr< DirectoryList >(recDirs),
- 		m_recManPtr(recManPtr)
- 	{
- 	}
---- a/tasks.cpp
-+++ b/tasks.cpp
-@@ -253,8 +253,8 @@
- 		current->Action();
- 		m_taskQueue.pop_front();
- 	}*/
--	for_each( m_taskQueue.begin(), m_taskQueue.end(), bind( &Task::Action, _1 ) );
--	for_each( m_stickyTasks.begin(), m_stickyTasks.end(), bind( &Task::Action, _1 ) );
-+	for_each( m_taskQueue.begin(), m_taskQueue.end(), std::tr1::bind( &Task::Action, _1 ) );
-+	for_each( m_stickyTasks.begin(), m_stickyTasks.end(), std::tr1::bind( &Task::Action, _1 ) );
- 	m_taskQueue.clear();
- 	m_scheduleWait.Broadcast();
- }
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
deleted file mode 100644
index 9ecf777aa274..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vdr-plugin-2 ssl-cert
-
-DESCRIPTION="VDR Plugin: Web Access To Settings"
-HOMEPAGE="http://live.vdr-developer.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pcre ssl"
-
-DEPEND="media-video/vdr
-	>=dev-libs/tntnet-2.2.1[ssl=]
-	>=dev-libs/cxxtools-2.2.1
-	pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-0.3"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.sh"
-
-KEEP_I18NOBJECT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_vdr-2.1.2.diff
-	"${FILESDIR}"/${P}-c++11.patch
-)
-
-make_live_cert() {
-	# TODO: still true?
-	# ssl-cert eclass creates a "invalid" cert, create our own one
-	local base=$(get_base 1)
-	local keydir="/etc/vdr/plugins/live"
-
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
-	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
-
-	echo
-	gen_cnf || return 1
-	echo
-	gen_key 1 || return 1
-	gen_csr 1 || return 1
-	gen_crt 1 || return 1
-	echo
-
-	install -d "${ROOT}${keydir}"
-	install -m0400 "${base}.key" "${ROOT}${keydir}/live-key.pem"
-	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.pem"
-	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
-}
-
-src_prepare() {
-	default
-
-	# new Makefile handling ToDp
-#	cp "${FILESDIR}/live.mk" "${S}/Makefile"
-
-	# remove untranslated language files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
-
-	vdr-plugin-2_src_prepare
-
-	if ! use pcre; then
-		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /usr/share/vdr/plugins/live
-	doins -r live/*
-
-	fowners -R vdr:vdr /usr/share/vdr/plugins/live
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "To be able to use all functions of vdr-live"
-	elog "you should emerge and enable"
-	elog "media-plugins/vdr-epgsearch to search the EPG,"
-	elog "media-plugins/vdr-streamdev for Live-TV streaming"
-
-	elog "The default username/password is:"
-	elog "\tadmin:live"
-
-	if use ssl ; then
-		if [[ -f ${ROOT}/etc/vdr/plugins/live/live.pem ]]; then
-			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
-			einfo "emerge --config ${PN}"
-		else
-			einfo "No SSL cert found, creating a default one now"
-			make_live_cert
-		fi
-	fi
-}
-
-pkg_config() {
-	make_live_cert
-}
diff --git a/media-plugins/vdr-mlist/Manifest b/media-plugins/vdr-mlist/Manifest
index d1b21a3e05d5..2054fc0c8b8d 100644
--- a/media-plugins/vdr-mlist/Manifest
+++ b/media-plugins/vdr-mlist/Manifest
@@ -1,3 +1,3 @@
-DIST vdr-mlist-1.0.2.tgz 12895 BLAKE2B 2a91aae9d8b2028e2a62cac59409d7130f1415eeff64f622259165a79ae47036257f3bf47492d1fa7dabd766627ba64ba4e85a92b544140251c2555ce4b50c3f SHA512 29e03f4ef4f4085e6e04e4ff4741003f2470bac81992749c1eb5c83ef8e179c9a701e0e2b766cc24458f17d64bccf4484bd7f9be14f3661dbb09979d0812982e
-EBUILD vdr-mlist-1.0.2.ebuild 419 BLAKE2B 41629303b2538255df6060f5a23bc9eebc819b5864e3b431ca09c355f462e057b784dbffeef11d6422cf0c13af1b6f1c85a7d9de12f053289f9003eabc1f0bc2 SHA512 303759d9b0c38a68583adceb28662c2b4425022c5219d867895da8e9ac6fdda48ff3645fd6bf1f0dbbff3b7728d48d0fd56f4c65a4f397cb3e35742d6f2e1cc2
+DIST vdr-mlist-1.0.2.tar.gz 14710 BLAKE2B b93a3ff4c9e1296ec9e23fb2f7889d846d57935d3299f8482eadd3815cad42ace9c71de6418ecbdf431fa114baf08c5f24279243ae8fc61eb7546c0d59c182be SHA512 d773e77ffea5a9868dfa6827fac0d6d736e20a53159ee244c59053a7ab163f4bc03710128dad9d4bba67ce221378d1de10b1e94533d9702558915cabdf913f0b
+EBUILD vdr-mlist-1.0.2.ebuild 453 BLAKE2B 257c462b3ffbf5616ed34eb54ab4eab41d44be6e119e3356043b12d49de98f81637188075a908db14747d299426f5401250ec213200abc6ae98d144aaec2d0a0 SHA512 3585bf9828791a751247e05eed800a67e3a37e8b4ef65f5f96bd1cc8ac6109eb04f653499b8712735b48c474080523090f72643d314b9ae1dad3624f73b57295
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-mlist/vdr-mlist-1.0.2.ebuild b/media-plugins/vdr-mlist/vdr-mlist-1.0.2.ebuild
index e0cff7728fa5..c7348b5082b8 100644
--- a/media-plugins/vdr-mlist/vdr-mlist-1.0.2.ebuild
+++ b/media-plugins/vdr-mlist/vdr-mlist-1.0.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: Show a history of the last OSD message"
-HOMEPAGE="http://www.joachim-wilke.de/?alias=vdr-mlist"
-SRC_URI="http://joachim-wilke.de/vdr-mlist/${P}.tgz"
+HOMEPAGE="https://github.com/jowi24/vdr-mlist"
+SRC_URI="https://github.com/jowi24/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS="amd64 x86"
 SLOT="0"
@@ -16,3 +16,5 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-2.0"
 RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}"
diff --git a/media-plugins/vdr-mount/Manifest b/media-plugins/vdr-mount/Manifest
index a2a2bafc067f..5167df36d0e6 100644
--- a/media-plugins/vdr-mount/Manifest
+++ b/media-plugins/vdr-mount/Manifest
@@ -1,4 +1,4 @@
 AUX vdr-mount-0.0.2-makefile-fix.diff 1577 BLAKE2B 9c9d28f40d2d96333eb20d4c0c6621584c4fc05d1b9befdbce378e4ae1339f1e511e6e799548ce5d09f2ccdd63bbd73acb29a7936fc7bafe1ab2cfab0639b4bc SHA512 249f1a055e624f9a4150de98916f4152ae19c2bc328df5da83d492d17d1e931a9495bd4af5fa1ccb1a703069330db139644771253d120557767bed53506c9679
 DIST vdr-mount-0.0.2.tgz 13127 BLAKE2B 4ef214a4e545169c7e28270fe60fa32f3c901d7d638cd15dce8070ee1c5635e47547f7c7bc98a623c26361bc2fab5fa60b1d9ba4813b3df7c24d96600fa4951d SHA512 1a16c192ef66fb1e4f41c304e4191b2fe759994e02b8965b314ef79cc5d8bb9dcf39d982902b5b651078e201c3dc77d5a2d7e28a38942d399da0692ff47cf116
-EBUILD vdr-mount-0.0.2.ebuild 645 BLAKE2B 4b63fc6634ad6b150341e6e135ca80daf9623ba601154b8ae6d6c88f6e0ebe205664a6cd1e882ec51d0318b30bc955cd03124b0a75c6fb7ce73fabfc4899c076 SHA512 23e97906888de62b58833bdd223006300a76846f9d76b78a698bba3d5d65760b9ccf431691f9232d0ee4b992b5fc4618e8773d888a2b20a0f1b7de4e1a01e6b0
+EBUILD vdr-mount-0.0.2.ebuild 619 BLAKE2B e16c973a0456d2f752036b5a44f43c86ed35123e41103314b38bf5ce574f32f228728256e45efa3503fea9cb9b7b1ca5a50e6c0a522ff6a7b67d7af9856bfe5f SHA512 077c1f2debb70ca3b0c42f2750cf29ef26f19d3c7ed82f91c34c55e33cbccea65ebe578fec302f945c30440fd16a3b3590d754d9d0005f6490cd351440579e0a
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-mount/vdr-mount-0.0.2.ebuild b/media-plugins/vdr-mount/vdr-mount-0.0.2.ebuild
index 69807aec7c67..28fce1fb6fb7 100644
--- a/media-plugins/vdr-mount/vdr-mount-0.0.2.ebuild
+++ b/media-plugins/vdr-mount/vdr-mount-0.0.2.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: (Un)Mount removable media via osd"
 HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Mount-plugin"
-SRC_URI="http://homepages.physik.uni-muenchen.de/~Felix.Rauscher/${P}.tgz"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.2.6"
+DEPEND="media-video/vdr"
 
 PATCHES=("${FILESDIR}/${P}-makefile-fix.diff")
 
diff --git a/media-plugins/vdr-mp3ng/Manifest b/media-plugins/vdr-mp3ng/Manifest
index 792a98c82ab2..bb96b0c71ebc 100644
--- a/media-plugins/vdr-mp3ng/Manifest
+++ b/media-plugins/vdr-mp3ng/Manifest
@@ -6,8 +6,10 @@ AUX vdr-mp3ng-0.0.1_pre4-gcc4.diff 806 BLAKE2B 59a25312b52283f7c5fedd89b5c77d989
 AUX vdr-mp3ng-0.0.1_pre4-gentoo.diff 1313 BLAKE2B 0e94b8114df7dd5a90d880cc55dee5be7b9a13d72421527c22e49d37c3579cedb9193f9eaac29e618f4a28a9144465aac680b5814cc0f0e786eae815574a42ba SHA512 1d3009dbf3874c44bcbd0a70ac0708351cd337f366e737abb8092e96cb9f2899678ef6a6560773980acb52a42732af3b314c3cc0777f687433033115555e6670
 AUX vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch 3319 BLAKE2B dc63234fd73f31a2f140d09252690fe3cf990dfdda2b6f7d4be4bc1428421e03a3d69f6c4bb9548bb9a62b8c3854cb9818e2af072e471cf7131f4bb68d8d5931 SHA512 358f33aa8afc87d071cc02e2a4eebba9651e032cf11ec56178175c539a2f72406307c02a888ba5653b95a6f6e29230f6ea568e262518c713c255ef724385b548
 AUX vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff 1768 BLAKE2B 1feadeb440d2d616237b4bf9f6563705e6abba0a5c083428c270c390c9f9f1c7418bb25ec0e102972d37d0149963043d530b2304f396297a0ef75aaa83e7a37c SHA512 8922dc3c7a6d2f033573f0932bc4dcb050a65c7c852d8ca1112976f46f9625f178d4bfad531f91d1a2a7b7a2415b4c7e0a7d91a117c11570ec3a2f9a0bb276b6
+AUX vdr-mp3ng-0.0.1_pre5_gcc-9.patch 781 BLAKE2B b0086d4491a87616c1784a1376f598869fd5dd988fc466a81969ca7195e5a74e0b1fb86b1e343743327fb5c2349a572ce521f4f048ade126c5824b3a7f70cfde SHA512 4282ad0c7c0916bfbfff86cf41d168a185339c87d4acd50c0d9ee77833968ef8ac794098c0c4359cae90659de110ec413b93bb8fd1421ef89947568008628909
 DIST vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz 6726 BLAKE2B e7fc0d039a97070cde24b13360862062bd7f65522ed4bf39eac039918e58b7389d84787492e5282115d62d6bd5a6654c73fc821e94438c762de94326378174f0 SHA512 537b876cf5ecdfe34969a79ec556196e48b4de1a411d7b1a50ad95c5534d5027b0d1548fb42c02cccf922f0ef961b99b1d23863b2048f12e79e0beafcd7e571f
 DIST vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz 128289 BLAKE2B 11fa1d6e41704c45b2ea8effeb6800df84e86ac24150e0d4da91f398ec2711947c71bb60ada4a3c697520fb0c35282bccee5908466e294b7564ace7863f2a1bc SHA512 56bd73ab66276ff49670e3e7195a50b1f6560a53e88662e45d24e3bd1ffb6a7493dca3eade6ccecb887302dd4da2eb8ccc6b231ba45fbb315ace7ca3232fff99
 DIST vdr-mp3ng-pictures-0.0.1.tar.gz 170089 BLAKE2B ec1afec76ccc3401ce0f6c49a44a64e4f729fbc801e2cfc33acbad01e366accc20ea75cc7d96727a78c6aa9128dec91aa0d1c0a1a30bb4b8e297507aed283c29 SHA512 f9b2e683db67f1a72b92e3a73b0f1e72132907568ec196f37f9484e076ca90bec6bd58b79438b70a3fb630badcd79b8ae1401fc911c60e5256131355c783392e
-EBUILD vdr-mp3ng-0.0.1_pre5-r2.ebuild 2002 BLAKE2B 75543eb9c14008cbef8358bee3f2b126143a3cf25bee0e899acbac74a046932939510648492f05a33fcc9e60ed425a0222b2e1a01d7ea005f58100a51b144a6f SHA512 cd0edcd7feda99617a4ed82336a2963eddf37c8ddd5f6dc50feb6e7a60c8619c2080ed050f96b68d8d19c00363bcc75a7bc5a5dbd25071921a1006de02278b6e
+EBUILD vdr-mp3ng-0.0.1_pre5-r2.ebuild 2030 BLAKE2B a6f2c82dc78d842d19b62c5342918773e77c53e604d288e0ede65d2fdea9f3befb45b195237197f8e7a0c9cda3d354252e9b971fdc91a04384c2fb8b1bcca38b SHA512 a2e808ae917a05fe038211e9f949370694d8e9c3dda8ae0d7d74c4d4b9ed72a79f945fadc8f6fe1504e55147e0863e738c8a483c9b749f329afee17ac5586bc7
+EBUILD vdr-mp3ng-0.0.1_pre5-r3.ebuild 2066 BLAKE2B 84aa6ae4ab8c18fb8e87f6d3dec7604a9b9bc70a04c3ef607f6ec2c9c48adcf4a5d2e76b8c2bfad74dbe65ce8a0251211a26fd870db8cad55ff46ad7d5ab6d4d SHA512 dfe038a754627c2da1858ada483a0247013e2293c00a56efbc2265c1e4d65b16706812c268ff03acb7015666e48acc3a63e72502b10182611022b4cd5c73a0f0
 MISC metadata.xml 500 BLAKE2B 049f10f9ae0dd1befdc0cfefe08a2b60e7bc489a360aac42d0109a66dfe955cdfc1ba061dc8d7634467d67eab76ece31be03b4bbd8de7a2592bccb3fbb95f671 SHA512 44e2c20557a743c548ff93782e55d96f10a56643cf8e60173ed182aba496506f53ccd007d234d06d99b5d266515135df4e0a25ad9c40b75adff0a489954926d4
diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre5_gcc-9.patch b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre5_gcc-9.patch
new file mode 100644
index 000000000000..e5edc26f044e
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre5_gcc-9.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/705372
+
+if you use use-flag oss,
+this will fix on gcc-9.x
+error: call of overloaded abs(unsigned int) is ambiguous
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 14 Jan 2020 )
+diff -Naur mp3ng-0.9.13-MKIV-pre3.orig/player-mp3.c mp3ng-0.9.13-MKIV-pre3/player-mp3.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/player-mp3.c	2020-01-14 22:33:44.687155745 +0100
++++ mp3ng-0.9.13-MKIV-pre3/player-mp3.c	2020-01-14 22:35:25.490155745 +0100
+@@ -1435,7 +1435,7 @@
+         int real=sr;
+         CHECK(ioctl(fd,SNDCTL_DSP_SPEED,&real));
+         d(printf("oss: DSP samplerate now %d\n",real))
+-        if(abs(real-sr)<sr/50) {
++        if(std::abs( int(real-sr) )<sr/50) {
+           outSr=sr;
+           d(printf("mp3-oss: DSP reset done\n"))
+           return true;
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
index c64dcd95e6b9..e3887df119ec 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,16 +43,16 @@ src_prepare() {
 	eapply "${FILESDIR}/${PN}-0.0.1_pre4-vdr-1.5.1.diff"
 	eapply "${FILESDIR}/${PN}-0.0.1_pre4-glibc-2.10.patch"
 
-	use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile
-	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile
+	use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile || die
+	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile || die
 
 	has_version ">=media-video/vdr-1.3.37" && eapply "${FILESDIR}/${PN}-0.0.1_pre4-1.3.37.diff"
 	has_version ">=media-gfx/imagemagick-6.4" && eapply "${FILESDIR}/imagemagick-6.4.x.diff"
 
-	sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:"
+	sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:" || die
 
 	if has_version ">=media-video/vdr-2.1.2"; then
-		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c
+		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c || die
 	fi
 }
 
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild
new file mode 100644
index 000000000000..83b20cf1dcee
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2 flag-o-matic
+
+MY_PV=0.9.13-MKIV-pre3
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="VDR Plugin: play mp3 and ogg on VDR"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${PN}-0.9.13-MKIV-pre3.tar.gz
+		mirror://gentoo/${PN}-pictures-0.0.1.tar.gz
+		mirror://gentoo/${PN}-0.0.1_pre4-span-0.0.3.diff.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="oss vorbis"
+
+DEPEND="media-libs/imlib2
+	media-libs/libmad
+	media-libs/libid3tag
+	media-libs/libsndfile
+	media-video/vdr
+	sys-libs/zlib
+	vorbis? ( media-libs/libvorbis )"
+
+DOCS=(HISTORY MANUAL README README-MORONIMO examples/network.sh.example)
+
+S=${WORKDIR}/mp3ng-0.9.13-MKIV-pre3
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# wrt bug 595248
+	append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03
+
+	eapply -p0 "${FILESDIR}/${PN}-0.0.1_pre4-gentoo.diff"
+	eapply "${FILESDIR}/${PN}-0.0.1_pre4-gcc4.diff"
+	eapply "${WORKDIR}/${PN}-0.0.1_pre4-span.diff"
+	eapply "${FILESDIR}/${PN}-0.0.1_pre4-vdr-1.5.1.diff"
+	eapply "${FILESDIR}/${PN}-0.0.1_pre4-glibc-2.10.patch"
+
+	use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile
+	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile
+
+	has_version ">=media-video/vdr-1.3.37" && eapply "${FILESDIR}/${PN}-0.0.1_pre4-1.3.37.diff"
+	has_version ">=media-gfx/imagemagick-6.4" && eapply "${FILESDIR}/imagemagick-6.4.x.diff"
+
+	sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:" || die
+
+	if has_version ">=media-video/vdr-2.1.2"; then
+		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c
+	fi
+
+	#wrt bug 705372
+	eapply "${FILESDIR}/${P}_gcc-9.patch"
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /etc/vdr/plugins/mp3ng
+	doins	"${FILESDIR}/mp3ngsources"
+
+	insinto /usr/share/vdr/mp3ng
+	doins "${WORKDIR}/${PN}-pictures-0.0.1"/*.jpg
+	doins "${S}/images/mp3MKIV-spectrum-analyzer-bg.png"
+
+	newbin examples/mount.sh.example mount-mp3ng.sh
+}
diff --git a/media-plugins/vdr-music/Manifest b/media-plugins/vdr-music/Manifest
deleted file mode 100644
index 20fb92c66cf4..000000000000
--- a/media-plugins/vdr-music/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX music.mk 4798 BLAKE2B 2b592f92df9be9340a0d6893ed68000b01c602f6676d565bd295ef8f73adae2c62da26a5c5b8522d9587bad69ab413f8c42a8e24b1bbf7901cf8d6e554e1e483 SHA512 c50cd6d9aea30b69f2e1a22f10fe23c855f18028e6be7de9268e53fa666ab126fa8fac5b2652f3b1b99c238d1d6be47d5052979d82456274eaeb79217f7c4198
-DIST vdr-music-0.9.9-dev2.tgz 2189767 BLAKE2B a4ece0904304d7b9cc13532e5ce6833508cf69137dbec7d2e28cac7dc77128344f23183a40d863bba9476f19490d4b26baa9dbfab298161c4e89619544768d1a SHA512 65d9d6b1c76144dfcdb67d884c6cb44066c2bb15ccad0da1e011941b54695f47e4ae104397db1d77d6108ec7cdd81b785901a05fa1c6e07e42df71d021ab1fa7
-EBUILD vdr-music-0.9.9.ebuild 1536 BLAKE2B ee674bcb52fc20833a0ed612ee441a10812f4b8657a4d0b40a5e0bcb4e80ec317bfbb3d12dc6c653da3b16e6cdf8bdc33b520b3380f4b193d73d383ae10dc308 SHA512 21643d10602acb8db2c64cc66eb15ec96f38049f917959a5a50f1e553d83059db8facbb73c15517a4fc1a73ebf0c26457a5d36326d37eac0b779428602cc6b5e
-MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-music/files/music.mk b/media-plugins/vdr-music/files/music.mk
deleted file mode 100644
index 0ff1d5893e1e..000000000000
--- a/media-plugins/vdr-music/files/music.mk
+++ /dev/null
@@ -1,198 +0,0 @@
-#
-# Makefile for a Video Disk Recorder plugin
-#
-
-# The official name of this plugin.
-# This name will be used in the '-P...' option of VDR to load the plugin.
-# By default the main source file also carries this name.
-
-PLUGIN = music
-
-### The version number of this plugin (taken from the main source file):
-
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-
-### The directory environment:
-
-# Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(call PKGCFG,libdir)
-LOCDIR = $(call PKGCFG,locdir)
-PLGCFG = $(call PKGCFG,plgcfg)
-#
-TMPDIR ?= /tmp
-
-### The compiler options:
-
-export CFLAGS   = $(call PKGCFG,cflags)
-export CXXFLAGS = $(call PKGCFG,cxxflags)
-
-### The version number of VDR's plugin API:
-
-APIVERSION = $(call PKGCFG,apiversion)
-
-### Allow user defined options to overwrite defaults:
-
--include $(PLGCFG)
-
-### The name of the distribution archive:
-
-ARCHIVE = $(PLUGIN)-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### The name of the shared object file:
-
-SOFILE = libvdr-$(PLUGIN).so
-
-### Includes and Defines (add further entries here):
-
-# (Default) DO NOT UNCOMMENT IT IN DEVELOPER-VERSIONS
-HAVE_IMAGEMAGICK=1
-# Uncomment the following line, if you don't have libsndfile installed
-#WITHOUT_LIBSNDFILE=1
-
-# Uncomment the following line, if you don't have libvorbisfile installed
-#WITHOUT_LIBVORBISFILE=1
-
-#BROKEN_PCM=1
-# Uncomment if you want debug output on stdout
-##DEBUG=1
-
-# internal use
-# BUGHUNT
-#BUGHUNT=1
-
-# internal use
-# DEBUG_COVER
-#DEBUG_COVER=1
-
-###INCLUDES +=
-
-###DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-INCLUDES += -I$(VDRINCDIR)
-
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-
-ifdef BROKEN_PCM
-	DEFINES += -DBROKEN_PCM
-endif
-
-ifeq ($(shell test -f $(VDRDIR)/fontsym.h ; echo $$?),0)
-	DEFINES += -DHAVE_BEAUTYPATCH
-endif
-
-ifdef DBG
-	CXXFLAGS += -g
-endif
-
-ifdef DEBUG
-	DEFINES += -DDEBUG
-else
-	DEFINES += -DNO_DEBUG
-endif
-
-ifdef BUGHUNT
-	DEFINES += -DBUGHUNT
-endif
-
-ifdef DEBUG_COVER
-	DEFINES += -DDEBUG_COVER
-endif
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o config.o vars.o bitmap.o \
-		commands.o options.o lyrics.o funct.o cover.o skin.o visual.o tracklist.o \
-		search.o mp3id3.o mp3id3tag.o rating.o menubrowse.o mp3control.o \
-		icons.o data.o menu.o \
-		data-mp3.o setup-mp3.o player-mp3.o stream.o network.o \
-		decoder.o decoder-mp3.o decoder-mp3-stream.o decoder-snd.o \
-		decoder-ogg.o
-
-LIBS	+= -lasound -lmad -lid3tag
-
-ifdef HAVE_IMAGEMAGICK
-	INCLUDES += $(shell pkg-config --cflags MagickCore)
-	LIBS += $(shell pkg-config --libs Magick++)
-	DEFINES += -DHAVE_IMAGEMAGICK
-else
-	INCLUDES += -I$(IMLIB)/src
-	LIBS += $(shell imlib2-config --libs)
-	DEFINES += -DHAVE_IMLIB2
-endif
-
-ifndef WITHOUT_LIBSNDFILE
-	LIBS    += -lsndfile
-	DEFINES += -DHAVE_SNDFILE
-endif
-
-ifndef WITHOUT_LIBVORBISFILE
-	LIBS    += -lvorbisfile -lvorbis
-	DEFINES += -DHAVE_VORBISFILE
-endif
-
-### The main target:
-
-all: $(SOFILE) i18n
-
-### Implicit rules:
-
-%.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-
-### Dependencies:
-
-MAKEDEP = $(CXX) -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
-	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-
--include $(DEPFILE)
-
-### Internationalization (I18N):
-
-PODIR     = po
-I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-I18Npot   = $(PODIR)/$(PLUGIN).pot
-
-%.mo: %.po
-	msgfmt -c -o $@ $<
-
-$(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
-
-%.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
-	@touch $@
-
-$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	install -D -m644 $< $@
-
-.PHONY: i18n
-i18n: $(I18Nmo) $(I18Npot)
-
-install-i18n: $(I18Nmsgs)
-
-### Targets:
-
-$(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-
-install-lib: $(SOFILE)
-	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
-
-install: install-lib install-i18n
-
-dist: $(I18Npo) clean
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@mkdir $(TMPDIR)/$(ARCHIVE)
-	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution package created as $(PACKAGE).tgz
-
-clean:
-	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/media-plugins/vdr-music/metadata.xml b/media-plugins/vdr-music/metadata.xml
deleted file mode 100644
index 27f419c289c3..000000000000
--- a/media-plugins/vdr-music/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/vdr-music/vdr-music-0.9.9.ebuild b/media-plugins/vdr-music/vdr-music-0.9.9.ebuild
deleted file mode 100644
index a9a7a268fc82..000000000000
--- a/media-plugins/vdr-music/vdr-music-0.9.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-MY_P="${P}-dev2"
-S="${WORKDIR}/music-${PV}-dev2"
-
-DESCRIPTION="VDR plugin: music"
-HOMEPAGE="http://www.vdr.glaserei-franz.de/vdrplugins.htm"
-SRC_URI="http://www.glaserei-franz.de/VDR/Moronimo/files/${MY_P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+imagemagick debug sndfile vorbis"
-
-DEPEND=">=media-video/vdr-1.6.0
-		media-libs/libmad
-		media-libs/libid3tag
-		imagemagick? ( media-gfx/imagemagick[png] )
-		sndfile? ( media-libs/libsndfile )
-		vorbis? ( media-libs/libvorbis )
-		!imagemagick? ( media-libs/imlib2[png] )"
-
-RDEPEND="sys-process/at
-		media-sound/id3v2"
-
-src_prepare() {
-#	# prepare sources with new Makefile handling
-#	cp "${FILESDIR}/music.mk" "${S}"/Makefile
-
-	# clean up from untranslated .po files
-	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,es_ES,et_EE,fi_FI,fr_FR,hr_HR,hu_HU,it_IT,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
-
-	vdr-plugin-2_src_prepare
-
-	use !vorbis && sed -i Makefile -e "s:#WITHOUT_LIBVORBISFILE=1:WITHOUT_LIBVORBISFILE=1:"
-	use !sndfile && sed -i Makefile -e "s:#WITHOUT_LIBSNDFILE=1:WITHOUT_LIBSNDFILE=1:"
-	use !debug && sed -i Makefile -e "s:DEBUG=1:#DEBUG=1:"
-	use imagemagick && sed -i Makefile \
-		-e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:" \
-		-e "s:#MAGICKDIR=:MAGICKDIR=:"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/plugins/music
-	doins -r moronsuite/music/*
-	chown -R vdr:vdr "${D}"/etc/vdr/plugins/music
-}
diff --git a/media-plugins/vdr-newsticker/Manifest b/media-plugins/vdr-newsticker/Manifest
index afb888ca6d46..ac60183af872 100644
--- a/media-plugins/vdr-newsticker/Manifest
+++ b/media-plugins/vdr-newsticker/Manifest
@@ -1,5 +1,5 @@
 AUX rc-addon.sh 121 BLAKE2B 0b58d843a7d45181c0beb9f9fb152cf1b74b4bb204e00aee2a66217b3366e87636d293d230b36b6f86b8994f7104229b9be72e099c05e8b24b8e43ac9021d324 SHA512 f916ad72ac12d17f6a91679a6f825777faca82b1b1110a8f06ca6570af65b2ab27db196c2350f654d65f301fdd3ba2e5d5799bcabc72a3806e0f511164970a87
 AUX vdr-newsticker-0.0.4-gcc4.diff 1757 BLAKE2B 4d158f433de57da76085bfeaa4f84a8d4088d6611266a48de72040b584cbf1f31415c85092492c0930afd9e45f95acf84e677156987f71855e0ce57d8d3b2df7 SHA512 931f18eab783b4510e516370a6a56ae8233b43b3934d82ae4f4ad9d966bba4cfbec337c06141996b335dfb8b7b5f6f3fd456f972968549473a1b22d7fd6a85d5
 DIST vdr-newsticker-0.0.4.tar.gz 15480 BLAKE2B de291810ecab536c22d33c82d3323dd85d8c0fa7e0be22c5002ede726c0d015a642b1ebe85ced2a8fddf8eb21aa5a86fc3a8fb46bbed26c3498d1987239c7dcf SHA512 8bcd0199547951f7c17077280af58cad99801f5a38b2d6b64860a1b3731987b5012e68041ca3fe0589f28f9ce1eaca9ee7d2d1e6aa542c6217b04c42b45c51a9
-EBUILD vdr-newsticker-0.0.4.ebuild 554 BLAKE2B 5a0a8a92f83258877a82deb5e69be1beaaf9aebe1188bbe0a969bf7d87ccde19a0b407c3c9f3502f3b79e826d888c09ae583ee0858e18be50e13ad0669f33726 SHA512 97a9ebaf6671d5ce1e91f6e5adc0cd5a28de9c8dc6195cc199398793aa601398e58ed26e9f3d598c5df8af9ef2fe7b48f55e00ae589085b6cf16ddead7598532
+EBUILD vdr-newsticker-0.0.4.ebuild 562 BLAKE2B 18695dfc902d4dbfb3c3d28b040dd4c84f5e03fa3ed0f9270bd98b502909aa5a7f64d19f7e40123a44618d9115dbb24f74e4725b42a71557509c7cbef1ca5588 SHA512 183e59ade8fd1e522a5aa818db0eea6536184c1c06c8ad90f98be685d05dcb2313046c63111515c65dde441cfc1563228102de5c5e1682216553bdab0857d966
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild b/media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild
index 8ed634c71c5b..8771780e314a 100644
--- a/media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild
+++ b/media-plugins/vdr-newsticker/vdr-newsticker-0.0.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: Show rdf Newsticker on TV"
-HOMEPAGE="http://www.wontorra.net"
-SRC_URI="http://www.wontorra.net/filemgmt_data/files/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 x86"
 SLOT="0"
diff --git a/media-plugins/vdr-noepg/Manifest b/media-plugins/vdr-noepg/Manifest
index 90a08375fdeb..6cad7e946b1b 100644
--- a/media-plugins/vdr-noepg/Manifest
+++ b/media-plugins/vdr-noepg/Manifest
@@ -1,3 +1,5 @@
 DIST vdr-noepg-0.0.4.tar.gz 13929 BLAKE2B a48c86680b425a86c9b147d5eb473d196f06dda6164145274bc4cf4a3922a853aacb60a0c40327797e1b76bf9bf416bbdf6056663f3dc58e2c2ead859416ca30 SHA512 9c7f064ce46fc57e2c2d18951162dfcab0992bdc4b803ab602332ff9c2b477a9580b31db1b1f7ecaf6b703bed30242b26f7e6edc4e16ef459fd39fa40b330124
+DIST vdr-noepg-0.0.5.tar.gz 14003 BLAKE2B 3bc2dca43f8075b9d5e62124fb2cd129ff086977065323e8c719ea250b19c26399a8955e40c64799628795199730693eaa9573ed11a6119befde0cdaef077c49 SHA512 a655a664d7e5222f27e18a694998f4ff7529a3b2e49339eac9de1c53128fdbeca4bf4dd8282672ee330a98d601dd95f95d60ef1466ddc98b6b2ec10ff971a3cf
 EBUILD vdr-noepg-0.0.4.ebuild 529 BLAKE2B fbf5b41d1a8c9586d3a4188777d00241e0c034c0527d8119c967c353e8fed31be2a8fb7dd39f115cdafab59de1919210411fa0f1b514a3c19d597f8e41233f64 SHA512 a6e61569df5e797a63ab2ee1e9bc2fa5806bf90e0a1cab73dfbad201955ef042201add9e0e84443f7364946e6d179de16a19b34fab042b232e929c14caa41bbb
+EBUILD vdr-noepg-0.0.5.ebuild 490 BLAKE2B be7a3cec7ee23f1d7163711948e4700c168bed9fb54c17d5b52be998480a565f42e1f1215618c182f42f38c616915eff7c69cd2c82ef8e04146a524946f46dff SHA512 1c6f3d6d2fbae0e77ba088ffa82418fadd0c1de498bc9db00a04536a11b4d97a5de146bf25afc4575555c351f7b48b17e75efdc37999697b673d34ff94387b3a
 MISC metadata.xml 352 BLAKE2B b9d3a7f286ea36f7f4bbcf37de06bb8f5e34c156ae113d64cbc46eded1a15d0fc13fdcce3bab44627b6d268d786596dd8975c6d96e58af62098356a070a70a37 SHA512 4ee4acc1d225acd2f8b73b363599753a4b27ae03251fcf8b1b71b16c057f543da2ad3015590537bfba394648009b29d232c3845cbfe1a78fc9c292a7eb604859
diff --git a/media-plugins/vdr-noepg/vdr-noepg-0.0.5.ebuild b/media-plugins/vdr-noepg/vdr-noepg-0.0.5.ebuild
new file mode 100644
index 000000000000..d175683e864f
--- /dev/null
+++ b/media-plugins/vdr-noepg/vdr-noepg-0.0.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: will replace the noepg-patch with the new cEpgHandler"
+HOMEPAGE="https://github.com/flensrocker/vdr-plugin-noepg"
+SRC_URI="https://github.com/flensrocker/vdr-plugin-noepg/archive/v${PV}.tar.gz
+-> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="media-video/vdr"
+
+S="${WORKDIR}/vdr-plugin-${VDRPLUGIN}-${PV}"
diff --git a/media-plugins/vdr-nordlichtsepg/Manifest b/media-plugins/vdr-nordlichtsepg/Manifest
index 81f7bf83eaab..599ebbbdf26d 100644
--- a/media-plugins/vdr-nordlichtsepg/Manifest
+++ b/media-plugins/vdr-nordlichtsepg/Manifest
@@ -1,3 +1,3 @@
 DIST vdr-nordlichtsepg-0.9-test1.tgz 557951 BLAKE2B a20d60937343041c53228a93996bb13fa3334ea2414fbeb625d2652599bee53edb2aefeb13d5a229142365e806cffa8f90fb4e342a4d835286eec16a3055493e SHA512 d6e4804f7b78d2e7f1861af862fe3da73aaee518dbd570b1d6bb05141535306fc7345b5ef672e22728aa8978eaa7315122c18b14a8907a9d67fa3c98848cb734
-EBUILD vdr-nordlichtsepg-0.9_pre1.ebuild 471 BLAKE2B 805460a694d03508c3f0bd02bf07edff0c7b52c147bcf3643a6628fedd4ad77874a2786ae634561249936eda3eefc2d7621e909549fe83332ce36fb1dbcb1f41 SHA512 1939bc3a4e9e40a14e50941cc43e45bab3a508f68ae3431ed13f842723be5af80ba842174ff391007039de96ec8a01a5a5335411bd2cef22a30255a78e457d64
+EBUILD vdr-nordlichtsepg-0.9_pre1.ebuild 459 BLAKE2B 9a3a39becd1b79d69670f640a1710533e9327df886c5bb7a001baf453491d8ba3a8f95e49a0852bb32d44aac70e08f0fdf48243637a50d5ad20d7186b8b45c10 SHA512 633830554cd6833789a3cd669b308c563f43a5d17c50dc9061816c31498c0604ba34295de9e224af7ec976d780da77cfbf908b9be8978e9b60eab198766a07f3
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-nordlichtsepg/vdr-nordlichtsepg-0.9_pre1.ebuild b/media-plugins/vdr-nordlichtsepg/vdr-nordlichtsepg-0.9_pre1.ebuild
index 8cdc23037e4a..1a24b0f84516 100644
--- a/media-plugins/vdr-nordlichtsepg/vdr-nordlichtsepg-0.9_pre1.ebuild
+++ b/media-plugins/vdr-nordlichtsepg/vdr-nordlichtsepg-0.9_pre1.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
-IUSE=""
-SLOT="0"
-
 MY_P="${PN}-${PV/_pre/-test}"
 
 DESCRIPTION="vdr Plugin: Better EPG view than default vdr"
-HOMEPAGE="http://martins-kabuff.de/nordlichtsepg.html"
-SRC_URI="http://martins-kabuff.de/download/${MY_P}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${MY_P}.tgz"
 LICENSE="GPL-2"
 
 KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="0"
 
-DEPEND=">=media-video/vdr-1.3.31"
+DEPEND="media-video/vdr"
 
 S="${WORKDIR}/${PN#vdr-}-${PV%_pre*}"
diff --git a/media-plugins/vdr-osdteletext/Manifest b/media-plugins/vdr-osdteletext/Manifest
index 8974fa7fba50..b3ec97ec1d1a 100644
--- a/media-plugins/vdr-osdteletext/Manifest
+++ b/media-plugins/vdr-osdteletext/Manifest
@@ -6,5 +6,5 @@ DIST vdr-osdteletext-0.9.5.tgz 62692 BLAKE2B fcccb186c4db1485217ac427c79903e76e0
 DIST vdr-osdteletext-0.9.7.tgz 101400 BLAKE2B 52cabda446701ce4898705487e47e5ca5146e58b42b47814f3835326c72118c62212ab81cad036f147e23b0c330b08bd2b2ba82bb7cc41f1bfcbd2525dbfe179 SHA512 d7ebd74ba5411bc8c7596b4f5f30eba7bc71e09d137a10650e78761c58045a96f804468f87fbf0c27e8fa161b64b06035878e5fac9940f75ea728646e92e6c76
 EBUILD vdr-osdteletext-0.9.4-r1.ebuild 718 BLAKE2B 7ec414ce45253c966913d6d856552060407063301a20ee72d753179bbcf4fe7772f22f818357cdb45edaaef36d0973b0b433c67f9ba657dd0286df1ee2693c63 SHA512 4f58c7ab45030f0b244e5b14f74c311182ebb1b74ef1360b045d9938f229e10f563cf33e86deabdc6ed2f2c932346c38248ff49c5bbc3cd3914b3c6c5322f5b1
 EBUILD vdr-osdteletext-0.9.5.ebuild 720 BLAKE2B e88eced847299352cc425fff8b4f2e9d7d9871cd63eaf66d3f4af2c761bb1c5cca5b6deeb2679c118c5fc3bec1f2f6c4db6f786fa671e5527b2e576ca321edc4 SHA512 6a9c1f7b3eb8fc72f748f92e05b32b3ee981f1a10f358bd4a08fc77ab9a5bc8bc8e172bce1813c7b1e74b474d26978ecbf4faf5270f32d667fc89dc18800849b
-EBUILD vdr-osdteletext-0.9.7.ebuild 1155 BLAKE2B 459e227fdd77cb7b78033afa822dbc7293a434973610ced3ebbe3285703501987fe5168bdf2244da90c7cc35aff62e4d6ac135a3c06919853947fa7a08c6521a SHA512 9a286bd590990377d66a89f9e9ef57ce66d43d690b3246958ea87fc9b5f0678856fb42bb70c3511a4b957493b4decb3dc4348d52575c4932634fe71715016e09
+EBUILD vdr-osdteletext-0.9.7.ebuild 1203 BLAKE2B 1b652d077a79407c671f94ee7e268eaa10f3c5fab393430f2b12b9131af290e27790dcbf29b93676e0aaef7486c7b9b0dad1a748d71fc8d9f00f528ab1f7d50f SHA512 f65251ff8eb5137beea4d5192739360785280414c96d7b7a77437ecde9b61690fc19e6d9624b550cc237add08098311f4fdcf979bbd5fcca80fa1bc42cf47b5e
 MISC metadata.xml 554 BLAKE2B dba498cc837cb8963291f83248b6bab593f7f3b18b0451053618e441f2c4dc52a8a43966cde517a21539976875ce8eb442adc1d670618a779e0eb3b5a40edf79 SHA512 2a48702fd723d1d6ca3c100abf227ce54aa53a74bed16a6a6949165633006aa08a565b553ef3ed4d821f8908b8ea568eaeae109a0b4a39401f259f29661d29ac
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.7.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.7.ebuild
index 8e3fb41150ac..0e74ef131f8b 100644
--- a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.7.ebuild
+++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.7.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="VDR Plugin: Osd-Teletext displays the teletext on the OSD"
 HOMEPAGE="https://projects.vdr-developer.org/projects/plg-osdteletext"
 SRC_URI="https://projects.vdr-developer.org/attachments/download/${VERSION}/${P}.tgz"
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ public-domain" #teletext2.ttf, not copyrightable
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/media-plugins/vdr-peer/Manifest b/media-plugins/vdr-peer/Manifest
index c20a53cc9e6a..a1d1e7ab2998 100644
--- a/media-plugins/vdr-peer/Manifest
+++ b/media-plugins/vdr-peer/Manifest
@@ -1,3 +1,3 @@
 DIST vdr-peer-0.0.1.tgz 21948 BLAKE2B 3e029ea4b437a348a9459f45626be639430fce7a83b7f49e93ef40b75cc915856e2d983252c2bc0cab3d6331e040e8923785e4279ae8aeb742ac425393c961fc SHA512 4605f971cb2eefbcafa665274a1087303a0d820035aef5642d46855b923d2432f12909f5ae7711016b6628249a06197c9e2ebddc3072d5a67f0b8fb0eb18f35d
-EBUILD vdr-peer-0.0.1.ebuild 390 BLAKE2B 03d745b5211035a0ed2a8b9336301f1e16ba65bebb67becb3258a5a97f73739210bb4fdc16a66b34184e3b4d112ce213465a3e9a3132f3c702dffea233f54d1d SHA512 3fd5b7403bcec231fec63c31caf99d600315f2919894a41b64ce603afa62573bea833dee8693c949895fb0f1e0815c8ffb97b6d663b9e73d3f2332dfc299e65a
+EBUILD vdr-peer-0.0.1.ebuild 362 BLAKE2B 79c7167f17f082cd470014340238d6127019f86b1c4c45db1ca620444b0a595fadf97a89a5060b96de0d54d735424b426e5a56ed6875252838f4fcf4f25bfc95 SHA512 5d517ab76b99e5cfff55af7fb0e8e19a54bf7aff6e25462cebff8506a6f8dd4e595de846ce2684b22f5f69c0f4c46ad51841202bb52330c50eb828e4cf01c561
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-peer/vdr-peer-0.0.1.ebuild b/media-plugins/vdr-peer/vdr-peer-0.0.1.ebuild
index 942815724620..e753fca3ccad 100644
--- a/media-plugins/vdr-peer/vdr-peer-0.0.1.ebuild
+++ b/media-plugins/vdr-peer/vdr-peer-0.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
@@ -12,7 +12,5 @@ SRC_URI="http://vdr.schmirler.de/peer/${P}.tgz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=">=media-video/vdr-2"
-RDEPEND="${DEPEND}"
+DEPEND="~media-video/vdr-2.2.0"
diff --git a/media-plugins/vdr-pilotskin/Manifest b/media-plugins/vdr-pilotskin/Manifest
index ba5f364dbcf8..cc270c8886fc 100644
--- a/media-plugins/vdr-pilotskin/Manifest
+++ b/media-plugins/vdr-pilotskin/Manifest
@@ -1,4 +1,4 @@
 AUX vdr-pilotskin-0.0.2-vdr-1.5.diff 388 BLAKE2B d9f0452dfc5cee9b11837dcc5edc0cc033e178c35ddf59da78ea8b532c9c4b5143fdd60e026fe89f43f31362b77b9d0cc5e3b93eb4216e7a0742b928e1221d0b SHA512 e436542735791a9866caca263d91fb8da7da90aa7da34f64ac93959f75a4a1b10015e4133ccfeb880b103ce01f25b0a3bd2830fedfb4725ef4bb9d226f1c15dd
 DIST vdr-pilotskin-0.0.2.tgz 15871 BLAKE2B 94a5f12ccc257234e58b1ee786fb755e6f1eb5a01896c3ef8f037fee4d8b7bef25a2be031c191e9d217db138e41602a167ebfef13e5392f0ca32a4ae0f2c4ee5 SHA512 2a15525900147a541968df6f49a206ee410c0e3e5079adcb2ebbc932f96a1539c62b1fa110d211a6b7215c1312ccfcf0b0a4c1a998c2f3fd65c0b9735d02cf87
-EBUILD vdr-pilotskin-0.0.2-r1.ebuild 617 BLAKE2B b1db3a6c69627dd4717289548571cd52859460c139377cb7a5432a358d9e71a7d4ff7f412e79daa159a6c7bc440ef7145d9fd16b3ac5c1b7ec4fd5e77767638a SHA512 b1ae02f4cb3374fcbf47e5a6c8de7d48dfff14cd973fc730cc80985c8c996ce433fb44d29c4d1fb150d81bacbf132694808e326cdbc74a913f308007cf51c179
+EBUILD vdr-pilotskin-0.0.2-r1.ebuild 612 BLAKE2B 482da721b49ccc22f20be4bf3a233d53244ab6d4e3faa17c77ea8156006117cd1f26cfab62de82be45518a1071157aba9119db6d3e314ac9d79a4aeca1628437 SHA512 80c38d4e74f97b1ccfdf6c32fd7ce33ab0550f45150c22a2923badcaf3380520dc30f937b4375579abb7a2b47b725b7dd71fac5db3b8873a417a0bff3373e694
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-pilotskin/vdr-pilotskin-0.0.2-r1.ebuild b/media-plugins/vdr-pilotskin/vdr-pilotskin-0.0.2-r1.ebuild
index accc070fe6ce..44239a58197e 100644
--- a/media-plugins/vdr-pilotskin/vdr-pilotskin-0.0.2-r1.ebuild
+++ b/media-plugins/vdr-pilotskin/vdr-pilotskin-0.0.2-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: fork of vdr-pilot - navigate through channels with skinnable design"
-HOMEPAGE="http://vdrwiki.free.fr/vdr/pilotskin/"
-SRC_URI="http://vdrwiki.free.fr/vdr/pilotskin/files/${P}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
diff --git a/media-plugins/vdr-proxy/Manifest b/media-plugins/vdr-proxy/Manifest
index 529703e4b312..54dd014ae4a4 100644
--- a/media-plugins/vdr-proxy/Manifest
+++ b/media-plugins/vdr-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST vdr-proxy-0.1.4.tgz 20391 BLAKE2B 6b1438446f4cbb4c2edff4fbce09c16b5df38897009e05f87a238f8abf890032691a1915609c7017e2ac59df257194c371cf6cdc8cd7a3736760973043c92f71 SHA512 d77191c55891e1a762562e2b968e3990f77918a1b9366b928c381680337ec0a81927f2239cabfc0bd62db9e4fe26ab6eee1fa9e9a8c247db1d49619023d721a5
-EBUILD vdr-proxy-0.1.4-r1.ebuild 424 BLAKE2B ee872a261812dccac59a8c0bacc2e1d3f0320e97d2b19c7d6916a369cfd819cd919787e1caa7670366c827eebf133f416553cdc57e2ae84ad570b61ceef066be SHA512 b79032e90421aa77d206d038ddda6b640fa7233f3e27a53c90267ec567e50f53b2c411e201a4203d5441c86de6c94fba9d4de04b401808f2aa940e0ad925a38f
+EBUILD vdr-proxy-0.1.4-r1.ebuild 406 BLAKE2B d444564701524787cbd0be91fd6d58e5a8b28c4651ae00135b3a605abdf6248ef308725a855e3372f0be0128c5e7d6303e6dcfc9c64f6ad97a866846a7fd75e6 SHA512 4b8e872b5de9a7d24f2018faa64cf9ad786999a8d85e9a1fb536837a78311c2a003a8a0e883f09384afe8cef94eca320841f48e4ad3af2de5281ea1ba99ae23e
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-proxy/vdr-proxy-0.1.4-r1.ebuild b/media-plugins/vdr-proxy/vdr-proxy-0.1.4-r1.ebuild
index c7a945de01ef..107471259664 100644
--- a/media-plugins/vdr-proxy/vdr-proxy-0.1.4-r1.ebuild
+++ b/media-plugins/vdr-proxy/vdr-proxy-0.1.4-r1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit vdr-plugin-2
 
-IUSE=""
-SLOT="0"
-
 DESCRIPTION="VDR Plugin: enable grouping of menu entries, online load/unload"
-HOMEPAGE="http://urichter.cjb.net/vdr/?h=proxy"
-SRC_URI="http://www.mathematik.uni-kassel.de/~urichter/vdr/files/${P}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 
 KEYWORDS="x86"
+IUSE=""
+SLOT="0"
 
 DEPEND=">=media-video/vdr-1.3.23"
diff --git a/media-plugins/vdr-pvrinput/Manifest b/media-plugins/vdr-pvrinput/Manifest
index 309b50b26cd1..52246ae6f4e5 100644
--- a/media-plugins/vdr-pvrinput/Manifest
+++ b/media-plugins/vdr-pvrinput/Manifest
@@ -1,4 +1,4 @@
 AUX missing-include.diff 384 BLAKE2B f224a0740ff6965089d0a8ef5859edaa7bbafb5967a4545e91bbac288eb2e45fb7f605eed7cb43469c3f342b6c6dc821753c51ecd6c552737da87ead1bc127ae SHA512 58ed12b310e70474996a5e2c87d586037bf8dc9ec017aecd05dc990dee426c00f7bf0f4cdcf4f4a3a04fd2bc49ab0e36feb6e8e0b3bd251ef4b9db2e59f21ad9
 DIST vdr-pvrinput-2011.09.17.tgz 70255 BLAKE2B c88cac705cf54887b43f54e69c7b055549f7e1f9a0676f4bb85d5ef0ee8cdd6f37ded34bfe5ba5f1e0bb102b82c73cfdc1fc3962906ffc6e5e55c497cb34241c SHA512 890ffbc1254b6c70f022dca6dbf0c09ba5689809fb95c1e40817f130f62f92383572dee61dcaaa44c515f05d9991a3031d4451e6be6fd1ae0640404f6a3a0e5e
-EBUILD vdr-pvrinput-2011.09.17.ebuild 933 BLAKE2B bbb54aa38dfb847ba6183f1a622e38e8430d0bdff1881ddf1e1eb835e3e06c9f9068e084f2dd1e4e1159cc2fced4f571d273e5a2fbf8a16e42d2a4828c3284de SHA512 46ef3eff55c0b1888ef22b9f275792a4c0d5b579ae39a12759671ef7fe840ba620fe248ef87621e26135c351b8576cd8b27efb0f80193778f15a7237c9d1466e
+EBUILD vdr-pvrinput-2011.09.17.ebuild 920 BLAKE2B 9909d2204965cc7c4e1cb5db12474aa0646661713b30ca59e334a640ee413f08a7abe715fad8d396b23bd754aefd8c59f911dcac3cbdd80d3cdb3fecb9b2fa19 SHA512 b740b0671127eeea047b1e66daacec9b821eb87b228a718c2f1d07eec7702cf2aec3cfbae7d952740eb3b376f30da78206d171faf896b3f55d237f30104458e2
 MISC metadata.xml 354 BLAKE2B 6be76f27352c41d25ad56ba78a83a0ae4e3912602397e0930ae473a139561dc9aa5bb91e3c8b7b4e0ca67b3a9898df10b8ea58a56c8ba542eae1bc8d3c8306d4 SHA512 ee0224402f9e435c763f17f57e1d78eed1117b6b483bfafd6c74f17e930dc82b6e6c45c3ae255da5e79593ee0ef6bde24ee1e39d5aeb5a6f1be76e8315033256
diff --git a/media-plugins/vdr-pvrinput/vdr-pvrinput-2011.09.17.ebuild b/media-plugins/vdr-pvrinput/vdr-pvrinput-2011.09.17.ebuild
index bebc08091b5e..69043e7b4450 100644
--- a/media-plugins/vdr-pvrinput/vdr-pvrinput-2011.09.17.ebuild
+++ b/media-plugins/vdr-pvrinput/vdr-pvrinput-2011.09.17.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: Use a PVR* card as input device"
 HOMEPAGE="https://projects.vdr-developer.org/projects/plg-pvrinput"
-SRC_URI="mirror://gentoo/vdr-pvrinput-2011.09.17.tgz"
+SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,11 +27,11 @@ src_prepare() {
 
 	fix_vdr_libsi_include reader.c
 
-	epatch "${FILESDIR}/missing-include.diff"
+	eapply "${FILESDIR}/missing-include.diff"
 }
 
 src_install() {
 	vdr-plugin-2_src_install
 
-	dodoc TODO FAQ example/channels.conf_*
+	local DOCS=( TODO FAQ example/channels.conf_* )
 }
diff --git a/media-plugins/vdr-radio/Manifest b/media-plugins/vdr-radio/Manifest
index 416c8fd654e1..8d0a277b4dca 100644
--- a/media-plugins/vdr-radio/Manifest
+++ b/media-plugins/vdr-radio/Manifest
@@ -1,4 +1,6 @@
 AUX rc-addon.sh 568 BLAKE2B f68a7df410ff0cd59053b16883b93f17ba232f71c56226f7df1a76e076f949f01afb80a134ba8fe5815996c7e14695018610913566305011c10cc3dfe680a65f SHA512 ef7e4b36803f17af17fa9864321bbfb1fd5c96803fef9e4b64b91c5b009634194dfb6312228e4ba178811de23ad2a5221967a5b60b8b7406d25d36650b9ef41b
+DIST vdr-plugin-radio-1.1.0.tar.gz 710385 BLAKE2B fa9c692d528d718ace371359fea915eaf972b8ec759c28f86f52b9564c4f6e405da87639522af9a2c24138808351ee421d112dfacf3954d9779da9307a1f0a94 SHA512 d6c5ea7c457b5611b689bd5bc051c185feb108be6d82ea45ae9e9847a86cd06df38b38a1851bcdcf49808111cd1e9aea1f08decca66973c8020592d3a261aae6
 DIST vdr-radio-0.9.1.tgz 353414 BLAKE2B ff0d735188e6972e029256599b2832d4eea9bed377721966f2b956b5a750f47a34b474492addba0bb3f8964188611f2f10a3a47db3aa60101c851e1db43955f0 SHA512 81ab0d92ee390eecbbce73bc035714dda6157dc1f0781b6f8765603f65707e1711af64a48168923e2a78b77e0d869471fa313656d517cba27a3104e483085f43
 EBUILD vdr-radio-0.9.1.ebuild 819 BLAKE2B e063b404a939f577237c2fd3371be2492badc0a967409735354ab49404db58bb6c8cbe014c38d7289179001582af313a17f7adcefe0b46e5c69a384f6b515097 SHA512 2d7ce1e315991eabde04fd342cbdccdd39fff52635c188bef9cd61d105ec84a478c9220e56265022b235d638e3c04515b5a4b8334ffaf4fc557c73dba8e05968
+EBUILD vdr-radio-1.1.0.ebuild 874 BLAKE2B 2398bbb21c70d8e766fc77112f7b8d658af272da48b79ad1f8155cb02ce596b15c4e071e16a4c32d64720e02c7670d15b62c984433776921c860c006d7f31fda SHA512 026606337735e3e496ce79a0da3b8f9c541030af57105e02db7a8469d17ac8095c1c704a4be8c3264aaf49f27e10099dcb0bbe115fc2bb247ec91c22ee2e1f72
 MISC metadata.xml 415 BLAKE2B 0c1083061fdddb9e0d38a06575afb157ecb194ae86dadd7c0ad10ebda224d368a2a4a35ce135548040369003dfd7cf00b5eed08846139627ea5fcae8f0167b7b SHA512 9e138f70ce66f65cdb94cc1a10e44692238fd4dae0a14a1af71e64a8defa054d95c14ee790a1adf9ea555a040d1022789ba1f56c026fe051e2661b78b728e652
diff --git a/media-plugins/vdr-radio/vdr-radio-1.1.0.ebuild b/media-plugins/vdr-radio/vdr-radio-1.1.0.ebuild
new file mode 100644
index 000000000000..c99c2cec7b6c
--- /dev/null
+++ b/media-plugins/vdr-radio/vdr-radio-1.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: show background image for radio and decode RDS Text"
+HOMEPAGE="https://projects.vdr-developer.org/projects/vdr-plugin-radio"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-radio.git/snapshot/vdr-plugin-radio-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="media-video/vdr"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/vdr-plugin-radio-${PV}"
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	cd "${S}"/config || die "Can't enter source folder"
+
+	insinto /usr/share/vdr/radio
+	doins mpegstill/rtext*
+	dosym rtextOben-kleo2-live.mpg /usr/share/vdr/radio/radio.mpg
+	dosym rtextOben-kleo2-replay.mpg /usr/share/vdr/radio/replay.mpg
+
+	exeinto /usr/share/vdr/radio
+	doexe scripts/radioinfo*
+}
diff --git a/media-plugins/vdr-recsearch/Manifest b/media-plugins/vdr-recsearch/Manifest
index f35ce9636a90..3b0880c1b5c6 100644
--- a/media-plugins/vdr-recsearch/Manifest
+++ b/media-plugins/vdr-recsearch/Manifest
@@ -1,3 +1,3 @@
-DIST vdr-recsearch-0.3.5.tar.gz 23920 BLAKE2B b1523f5beca295c9261e769897a04cd9e67b12a1bcbd05c8f78461f286dbb2af0332bcaaf3c95fa3be9b027e29d6d8e6dc54ea1b1d67ce47e5d65c284c040687 SHA512 97cac7ffd231b732ae91b2e86c74bf307c5901b718d23bbb9f2fec4da25cd80e23a41c9e35a88caf8c9bd190c07662fa64057b20fd760bbed9c2b94687f730b6
-EBUILD vdr-recsearch-0.3.5.ebuild 733 BLAKE2B 18ae51d1252d38606c498a5729a0f0ea93aa1769d072da6ba2e5b57ffa58528615b57c9173305cd5ef4dd046781bd5c0504a59a87ccae456932e35412bece6dc SHA512 d2974e80b681215c577eacacd6ae40a6ed9fe63c647a653648f9b0123f63f7ebfbb3cc16a808c85cebb3d7bda8b335593000f2f6b9169fa66b24e7a3fc532c12
+DIST vdr-recsearch-0.3.7.tgz 24643 BLAKE2B 4f3a6b64be9d72df0cf755a65e5e0e7c2e9f3be21d70e12ae67e2802658173a33da1e59fc26617db852198b9f8feb1981a72cb9778441bafbc01f28e87b4df5b SHA512 20a43320f202c6524b3c1d4726cbb9c2519f622504dd34df8444dab389255c298796b8cb9187acf89125825dbb8d0007c804beae4505914bc0d41245727db5e1
+EBUILD vdr-recsearch-0.3.7.ebuild 677 BLAKE2B 90333b9a589fdd3d9ff9ff7d4fed12b5b04cf09f116f0d9c676e8dce1c90225da967e13bec85fd1b7574244e5b2421dd2733f576e753d08b749214c788122883 SHA512 f338327604f7dbf42feba51f047ece4fa44b712e6fa90966e7115f19b11bebcc1cd6e58c15475f755c4bb2792e1863e2a5c0d465f5a5f534da237d6c561d17ec
 MISC metadata.xml 346 BLAKE2B b1f157b8cf603c813377f971c643c10581fcbee3f3409f06889d645bc6c1b85e032ba25d111fbe224b8255edb10f1565d83a3956eddf4b741baa9f3a7a6b89bd SHA512 236c10b8963ba2fe7ba604d9dd49e3f760abd96465bca28373a07d38cdc4b2239a864fc0f8088756492dfa75f4fb48775622a32c96c9eb741033dfabf65e628c
diff --git a/media-plugins/vdr-recsearch/vdr-recsearch-0.3.5.ebuild b/media-plugins/vdr-recsearch/vdr-recsearch-0.3.7.ebuild
index 68a330c5358b..f465fc010aa8 100644
--- a/media-plugins/vdr-recsearch/vdr-recsearch-0.3.5.ebuild
+++ b/media-plugins/vdr-recsearch/vdr-recsearch-0.3.7.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
-DESCRIPTION="VDR Plugin: Search through your recordings and find the one you are looking for..."
+DESCRIPTION="VDR Plugin: Search through your recordings and find the one you are looking for"
 HOMEPAGE="https://github.com/flensrocker/vdr-plugin-recsearch"
-SRC_URI="https://github.com/flensrocker/vdr-plugin-recsearch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/flensrocker/vdr-plugin-recsearch/releases/download/v${PV}/${P}.tgz"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
 
-DEPEND=">=media-video/vdr-2.0.4"
-RDEPEND="${DEPEND}"
+DEPEND="media-video/vdr"
 
-S="${WORKDIR}/vdr-plugin-recsearch-${PV}"
+S="${WORKDIR}/recsearch-${PV}"
 
 src_install() {
 	vdr-plugin-2_src_install
diff --git a/media-plugins/vdr-recstatus/Manifest b/media-plugins/vdr-recstatus/Manifest
index b0fa36804dbb..4f20cff05eb7 100644
--- a/media-plugins/vdr-recstatus/Manifest
+++ b/media-plugins/vdr-recstatus/Manifest
@@ -1,3 +1,3 @@
 DIST vdr-recstatus-0.0.8.tgz 17586 BLAKE2B 681578e4e8c9a0699e4b4a6e1ecd22a768c6c1d7f3671e3dc8fc5a4b3ac69274e9cfc15dd7ffb451a442f286763f22a9cb5cd51081736ffeca7d0da57faf5431 SHA512 2a99b244ffe427a1b70a2d4b99458dc9ce0d382f2a34f8aa79ed7ae4852910c83aa5b38efd9311c61c4187602c7c8c9bc0cfa04a0080f75961239cbc4f0ec2a0
-EBUILD vdr-recstatus-0.0.8.ebuild 619 BLAKE2B b854c22bc1f28e4d68a4ad9e8409b73805bf105dbbde1028b6ba3436a2bd4de2da329756ec6bd45daea5dbc8f6865d4f12f6877e76507ed842b61c84188192b2 SHA512 b051f409e5db8b88257154b8ffb8aa82f858c0ce5797c9a93b0ee5b1be87efcc59c9387fa6498550541b10ccf298ef11393db71c6f294f809c0d96d816c81098
+EBUILD vdr-recstatus-0.0.8.ebuild 610 BLAKE2B e0815699cf7e2d4a055b1322e5b0519b074917e3301b89c866831016f068d3ba98d0a6c4842e0e3caa753cbffeb2254c427f232195d06b0662e0e4f2d0cb9474 SHA512 cb154bb66e5eb0cbd9b61f8bd05b1374ff82c84e7c4e78604ac15b294f5b4135b754ba14b3341dfe371a53dfcb20c4520f945ca7f848fc8f5b06d551f8a32173
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-recstatus/vdr-recstatus-0.0.8.ebuild b/media-plugins/vdr-recstatus/vdr-recstatus-0.0.8.ebuild
index 541445f07ae8..fab40310d727 100644
--- a/media-plugins/vdr-recstatus/vdr-recstatus-0.0.8.ebuild
+++ b/media-plugins/vdr-recstatus/vdr-recstatus-0.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: displays the recording status of the available devices"
-HOMEPAGE="http://www.constabel.net/projects/recstatus/wiki"
-SRC_URI="https://www.constabel.net/files/vdr/${P}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/media-plugins/vdr-remoteosd/Manifest b/media-plugins/vdr-remoteosd/Manifest
index 20f6b2f87632..7f4ceba56b31 100644
--- a/media-plugins/vdr-remoteosd/Manifest
+++ b/media-plugins/vdr-remoteosd/Manifest
@@ -1,3 +1,5 @@
+AUX vdr-2.4_remoteosd-1.0.0.patch 1293 BLAKE2B 4728cd6d81600d22b00bda303fe6c9ebe08b17d29c7b3e3f8f26219463f681d6653c9f173c6b96f080dce63eccc9a6f5e4289f2eaec651c427571f0998ea4908 SHA512 33ba02f42d23880344414d19994bdcfcd2734aef8f81401d2ad9124e73e5ce6b538640c6da805a90b551058f7049a8cb1c1e7a7bd276a2202dd8aa4f30d43fbd
 DIST vdr-remoteosd-1.0.0.tgz 20154 BLAKE2B e507b2ecdf74b69f946df23cd312a1bbc9370809ce6dc38bc1ea1a84c0ec08c4d93d06f7f6e6e7be7a67058165991b706173011d6ceeac41d5a0527187f7af1b SHA512 c5af72ac82e41af7d753f20230cf511cb95abad07906be96b14f26aacce3c461ef3b552a1f28dceecfa5b50023268bbf9bf41b71e66326af610ba113295e9056
-EBUILD vdr-remoteosd-1.0.0.ebuild 391 BLAKE2B c3ce7eccf831713281e2e5253708872264354c0d78bd3ba569b546b86cd236d457abaf0e9592a31b0f5bd04d896c1f86722d7a48ca891ccd7827188252827073 SHA512 77aa756162bad7ffa83e84ca677f1b3be51e182c1713df3e4efec3299abe5852aed9049f69754fa1f1112fb6e8bedb7a571ada724eb892d33d635d372f04edf8
+EBUILD vdr-remoteosd-1.0.0-r1.ebuild 417 BLAKE2B 89f391a71ea574d9683435ca9e3bacc68e941ac25e058d4bb8f61ad9f8b591e3b38b253cdfeecb904c5c85b0bc86afacfda0700010d1cd2615f107067c29ce3e SHA512 843bdaaf68cbc97fc819d4895300749d759dc6d2e81c3df60c733c9b8db82d6e04b42eeaaa78b13c42fb238ab2dd0164ceb419b7c64ed18a14d525063d68b0e7
+EBUILD vdr-remoteosd-1.0.0.ebuild 360 BLAKE2B c6834d53d8d4f1b6ab5c95f7bbb6dd8a7ac0e4d168e53fb904903b75d94a7428529bbbc982dbdb9fd91f05c5bb71a91f724063015781c962259703934c23bf24 SHA512 68ca8511edcfaf7354fe0ad2e1d71b1297120648ad0332928a61fddcc6d6b70ca609cf09f2d6dadcca21e5fb03570416d33cc9dc8b4b5c2394c8202b0a11f744
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-remoteosd/files/vdr-2.4_remoteosd-1.0.0.patch b/media-plugins/vdr-remoteosd/files/vdr-2.4_remoteosd-1.0.0.patch
new file mode 100644
index 000000000000..af6515bbe01b
--- /dev/null
+++ b/media-plugins/vdr-remoteosd/files/vdr-2.4_remoteosd-1.0.0.patch
@@ -0,0 +1,38 @@
+compile fix for >=vdr-2.3.1 
+suggested by MatthiasK on vdr-portal.de
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 25 Dec 2019 )
+diff -Naur remoteosd-1.0.0.orig/menu.c remoteosd-1.0.0/menu.c
+--- remoteosd-1.0.0.orig/menu.c	2019-12-25 21:59:10.907492713 +0100
++++ remoteosd-1.0.0/menu.c	2019-12-25 22:01:09.717492713 +0100
+@@ -69,7 +69,8 @@
+ 	}
+ 
+ 	if (RemoteOsdSetup.tuneServer) {
+-		cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
++		LOCK_CHANNELS_READ;
++		const cChannel *channel = Channels->GetByNumber(cDevice::CurrentChannel());
+ 		CmdCHAN(channel);
+ 	}
+ 
+@@ -98,7 +99,7 @@
+ 	return cmd.responseCode;
+ }
+ 
+-bool cRemoteOsdMenu::CmdCHAN(cChannel *Channel) {
++bool cRemoteOsdMenu::CmdCHAN(const cChannel *Channel) {
+ 	SvdrpCommand_v1_0 cmd;
+ 	cmd.command = cString::sprintf("CHAN %s\r\n", *Channel->GetChannelID().ToString());
+ 	cmd.handle = svdrp.handle;
+diff -Naur remoteosd-1.0.0.orig/menu.h remoteosd-1.0.0/menu.h
+--- remoteosd-1.0.0.orig/menu.h	2019-12-25 21:59:10.906492713 +0100
++++ remoteosd-1.0.0/menu.h	2019-12-25 22:01:37.733492713 +0100
+@@ -27,7 +27,7 @@
+ 		bool			isEmpty;
+ 		bool			plugOsd;
+ 
+-		bool CmdCHAN(cChannel *Channel);
++		bool CmdCHAN(const cChannel *Channel);
+ 		bool CmdHITK(const char *Key);
+ 		bool CmdLSTO();
+ 		bool CmdOSDT();
diff --git a/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0-r1.ebuild b/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..01bd87ca4f14
--- /dev/null
+++ b/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: server/client remoteosd"
+HOMEPAGE="http://vdr.schmirler.de/"
+SRC_URI="http://vdr.schmirler.de/remoteosd/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND=">=media-video/vdr-2.4"
+
+PATCHES=( "${FILESDIR}/vdr-2.4_remoteosd-${PV}.patch" )
diff --git a/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0.ebuild b/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0.ebuild
index d0e3f6eb5e49..ce925191888a 100644
--- a/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0.ebuild
+++ b/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
@@ -12,7 +12,5 @@ SRC_URI="http://vdr.schmirler.de/remoteosd/${P}.tgz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~arm x86"
-IUSE=""
 
 DEPEND=">=media-video/vdr-2.0.0"
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-remotetimers/Manifest b/media-plugins/vdr-remotetimers/Manifest
index 007e29b8a8ca..26c7b9abcead 100644
--- a/media-plugins/vdr-remotetimers/Manifest
+++ b/media-plugins/vdr-remotetimers/Manifest
@@ -1,3 +1,4 @@
 DIST vdr-remotetimers-1.0.2.tgz 62750 BLAKE2B 9c741c45d78c195e112cc936fdee76a36be1443468d027b8672d6641bd3ab8e897864f169d9956373944f788388a22746b4597fbd567f03b0f911b4d4f029c2a SHA512 37a93600e11c21b0ab5d18b0e0631b527db96b4a19967b34fb7f912607f803ca8872efdbd642dfcde0953129b7a1a8fe971459deab6d8c78449f94505d8674de
-EBUILD vdr-remotetimers-1.0.2.ebuild 404 BLAKE2B 69b15a4e9c60debf8a9795cd184cf476f9df8cc0f27253e1b7f8abaad16a1c4aeab54ede528ce6df793438a1adea7f675716606a5a6dc4dbd63ddd071a0737a8 SHA512 7f6be1cfc3f143b5cc8983e935fc589d40a2bf1d8a592357d85a62641142f7de7f30c64f9b2aa935dc52115ff2a0b2d095fc417cc550666a3d785b04a67011b0
+EBUILD vdr-remotetimers-1.0.2-r1.ebuild 374 BLAKE2B eecd665ac114f58c0a12401b087cf9efcb00f88ec1db2ff8a7bbc4d9f7dc4e4c26d4ce204d9381328f9310f9010413df10b1406ed5964d08a319ce6b4b475eef SHA512 924e4d4291611887f8142f011c038c4c840675ad85260630fed4591c36bb40e063f6a726d331e3bb352cc738b747a27e47504d9351b668cc8f69c47f94628291
+EBUILD vdr-remotetimers-1.0.2.ebuild 401 BLAKE2B c2c395a2f54b23987748a15a2fe6e79241cc48e9dc080388933803a506f13e39586e6f7aa208c5648e28ae8cd972d52613e538739abee3de345d68a9f57d8856 SHA512 c981c9d683f0c5c66bcdc8c332911ff3a8c3f853e57e37edaca132459fdb8b0a32dec7ee656e6bf7eef86bb374fd9fee178be735452956380e4172f4da90d0cf
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2-r1.ebuild b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..da790dcac4cf
--- /dev/null
+++ b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: edit timers on remote vdr instances"
+HOMEPAGE="http://vdr.schmirler.de/"
+SRC_URI="http://vdr.schmirler.de/${PN#vdr-}/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="~media-video/vdr-2.2.0"
diff --git a/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2.ebuild b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2.ebuild
index caca8c3ab953..e7c35b8220f9 100644
--- a/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2.ebuild
+++ b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
diff --git a/media-plugins/vdr-rpihddevice/Manifest b/media-plugins/vdr-rpihddevice/Manifest
index df78cafd2777..397a879eab4f 100644
--- a/media-plugins/vdr-rpihddevice/Manifest
+++ b/media-plugins/vdr-rpihddevice/Manifest
@@ -1,9 +1,5 @@
-DIST vdr-rpihddevice-0.0.10.tgz 70150 BLAKE2B 7ef080f55d6ee42b61d4fe11c4bfe6487dc7870f1887ceef23b28882ec0d1adaaf1276d308b6a3f3637207a87e289f03e7cebb131dd75cf9f5107b26e3e0abd7 SHA512 7265d00044f9a9a5c27076009e0cda47fdca480d01302997c7759df9d39595f8a3cab9e3eb86dfefd373967b8c8f9800644e01f0a418b6326957cbbc40f27432
-DIST vdr-rpihddevice-0.0.11.tgz 77778 BLAKE2B 9f9a3a029e9ddb1d2583bbffdd04ad7e7abefa7e0619d814958c146b5e4c2391cba3d4e57ddd10e4bc41fa52234517a9533684f2a973477c391c0ed1af5266a7 SHA512 2930baa25805fff0f238fda5a4fafb5803f9551d8caa79d5368c0ecb0e38a401184b8976e8ef07c8e3fbdba3ffa45f84b636a137f4d9a21accb7a1676c418644
-DIST vdr-rpihddevice-1.0.0.tgz 86760 BLAKE2B bfc535d02d5a9701691fd1341e24b62a28f65f663d6a91767924d0c565fb816cad3a9767e26547f53ed80bf1ff6e715c7a9ed7049d7244a875f798f638064f3a SHA512 1013da0593f9c5d99648d458a34906b2d5bb521824fb124b8e8efaa5017d94895b47c03657a5ae7463f9e5ad5bf415012f7b55bc0442ce12f8478768af14010e
 DIST vdr-rpihddevice-1.0.3.tgz 89445 BLAKE2B e459ca823e36ebf16c71bdc7db08311bfb31fabe3233ec62a076d69bf3428e2a6fc4cdc9a2cf906ba801942be559d98d68c28b7219fa3fbdba517eb80880be8c SHA512 9f5a9e06f382a11354d31531ad8a6277a49ce0b29c1ce2d96f952cdf1670779e5e3cd6e07eadcdd8eab151bd2467b53eeeb01d48f74f8e4f5232019110196c5e
-EBUILD vdr-rpihddevice-0.0.10.ebuild 530 BLAKE2B 613fc6a6e0a19f9fd0fb614ee1d7fa18109c0f19ca4f5cd46b9b1e35b2ba65d54f04a33d1e47a7cc1e7dc204598c56edd79f15dddb382f6fb91506af5fc66011 SHA512 daee87014e56de584e6779366aa30cf690b81cd46093cb5b9227aaac719e19933fc64c170cc02ee16a934b52fc8109d0c74cc4013d7dce87d3f53dc9b7e198fc
-EBUILD vdr-rpihddevice-0.0.11.ebuild 530 BLAKE2B 5335dd53ddc70b0046998b7539c03755cf51823ca98bb948216258558af07df1c3eb2daba977966241becbdc7a38e61fd25a0402bd6e3c3bb7557a39617d4f75 SHA512 9959e84847a7c11383eee74865449101ff583374bf4ac0c4e1eea7501708e4e27fc059e2e54fe43cfcf2ee8c456d1d92ed39902401555b7363c5cc8b00df29fa
-EBUILD vdr-rpihddevice-1.0.0.ebuild 530 BLAKE2B 13f5b81e6877a98b56fa78f045c31a1d17bb374df005b5e2747e0dddf3c3f45894d6387ef4d687777e2e838ac7dcc808b99bec72fb441bf02bbdcbee364bb1ab SHA512 962c20bfddf64361bcb170fafbaae4037bd247afd571ee804c8a68db5a1facaed13c61c7ad1df01c6655d15305bf1a11d1c163da1002cd4e46e6be97cd04acc1
-EBUILD vdr-rpihddevice-1.0.3.ebuild 668 BLAKE2B 0b58ad2c91b6bffb43c7419544b922b7b0771e80fdbeb6b8588d120a43f28ad3fbb1d6ef989e3e71d21439210a6abe217b0cde7d2ee6dea9aa064754b267a557 SHA512 97fafeb7a4768f7663d22acfeef3829f62905df0c4e607682dcc679c0117b31abb26b0eb645ed81e9fe0a02aecb7364cc080fe35d28b1f31aed85e5cb127c914
+DIST vdr-rpihddevice-1.0.5.tgz 93199 BLAKE2B 32afd2ef30bfbfa3893f0be98cb4316c9a090fa3d99c3fb2632f818c590aebf0a095768c7bef64b22ece42eac979f7f80565a5a9587761546473682a25904286 SHA512 3a122a3b96851653cb626090307034a19d6968f923c300899c8c661c4a68ed86bd3212454098622c8813a4cad80bacd491469083661e50852509e99479784ab1
+EBUILD vdr-rpihddevice-1.0.3.ebuild 617 BLAKE2B d9e9144cb58bd062329ad835e4969598ee432fb07ba4855dbe8cd5509cf37de1a61520d54a0e1c8265acedce5585d1922d23f848acad50492117088100b7bf92 SHA512 6897cccbe185baea91ae9dfaacad27e0063a459ab49720493db0c6515dca1457c79c5a7d3b8f7199144b8bac8419a0b97f939302a87b6e59e23c6ebc938fc6e2
+EBUILD vdr-rpihddevice-1.0.5.ebuild 780 BLAKE2B 170eafb41b07af6c50a44bde6ab15c23838471ead6382787c8263dd3802996aa4c0fc03ffea2ae1e10b8168768859a40e13bb523b4fa1b79adb81cc08f5dabed SHA512 b26ec5bf2ba3afd647961f59aafe0ce2558e4c0aa8d7103f964e6835e9aa50625cdf1175028e50839882e9ee3508729ab6a55c7ef1b51f0050f8ebcdc61d6526
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-0.0.10.ebuild b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-0.0.10.ebuild
deleted file mode 100644
index f176a8d4ba8b..000000000000
--- a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-0.0.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-VERSION="1817" #every bump, new version
-
-DESCRIPTION="VDR Plugin: Output Device for Raspberry Pi"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-rpihddevice"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-KEYWORDS="~arm"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2
-		>=media-libs/raspberrypi-userland-0_pre20140117
-		virtual/ffmpeg"
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-0.0.11.ebuild b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-0.0.11.ebuild
deleted file mode 100644
index f5677cadb319..000000000000
--- a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-0.0.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-VERSION="1861" #every bump, new version
-
-DESCRIPTION="VDR Plugin: Output Device for Raspberry Pi"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-rpihddevice"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-KEYWORDS="~arm"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2
-		>=media-libs/raspberrypi-userland-0_pre20140117
-		virtual/ffmpeg"
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.0.ebuild b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.0.ebuild
deleted file mode 100644
index bf3e1a6323c6..000000000000
--- a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-VERSION="1966" #every bump, new version
-
-DESCRIPTION="VDR Plugin: Output Device for Raspberry Pi"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-rpihddevice"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-KEYWORDS="~arm"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2
-		>=media-libs/raspberrypi-userland-0_pre20140117
-		virtual/ffmpeg"
-RDEPEND="${DEPEND}"
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 40fe4c478d08..4e227c3020e8 100644
--- a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.3.ebuild
+++ b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
@@ -14,12 +14,10 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 KEYWORDS="~arm"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
 
-DEPEND=">=media-video/vdr-2
-		>=media-libs/raspberrypi-userland-0_pre20140117
+DEPEND="media-libs/raspberrypi-userland
+		media-video/vdr
 		virtual/ffmpeg"
-RDEPEND="${DEPEND}"
 
 src_prepare()
 {
diff --git a/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.5.ebuild b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.5.ebuild
new file mode 100644
index 000000000000..1a096aa34358
--- /dev/null
+++ b/media-plugins/vdr-rpihddevice/vdr-rpihddevice-1.0.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+VERSION="2193" #every bump, new version
+
+DESCRIPTION="VDR Plugin: Output Device for Raspberry Pi"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-rpihddevice"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="~arm"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="media-libs/raspberrypi-userland
+		media-video/vdr
+		virtual/ffmpeg"
+
+src_prepare() {
+	sed -i "${S}"/Makefile -e '/LDFLAGS.*VCLIBDIR/s/$/ -Wl,--no-as-needed/' || die "sed failed"
+
+	# media-libs/raspberrypi-userland to old on gentoo...
+	sed -e "s:-lbrcmGLESv2:-lGLESv2:" \
+		-e "s:-lbrcmEGL:-lEGL:" \
+		-i "${S}"/Makefile || die "sed failed"
+
+	vdr-plugin-2_src_prepare
+}
diff --git a/media-plugins/vdr-satip/Manifest b/media-plugins/vdr-satip/Manifest
index 8ac28919200a..cca1addc7d52 100644
--- a/media-plugins/vdr-satip/Manifest
+++ b/media-plugins/vdr-satip/Manifest
@@ -3,6 +3,8 @@ AUX vdr-satip-2.2.3_c++11.patch 1337 BLAKE2B 30f61831ebf10a040433e231f902c1559c1
 AUX vdr-satip-2.2.3_missinginclude.patch 472 BLAKE2B fd2a608deb3edb3dbbfd0cdee01261586b16bf8f7683dcce85e7f019bde6dd1bbb60e5b7dee821a04528fe07f0d62265a4899928cbcb53cb31bb7b339b3ffb79 SHA512 a2e3e56557a91d6a2efe0d236ddde821236a0c94981764eb101545db67da0e437851fee4fe9715b4eec1c49aef082bfd7f3933d1eef1a738bf621b27841e2e20
 DIST vdr-satip-2.2.3.tgz 62722 BLAKE2B 408fe520b4210fa24667d4244560d5132260ce08067d482a50b12446c42c0c34fd922b3429d00c4e3550a7b1dc1d21bfac534cae9de478594751b9cf0f558d52 SHA512 451606b52831c009aaec894f0547c59a9447279d7f96a4b2291614eab09a3539849abcb6974b7c2c4b34e7b43a2f9c782ab1ea6bfd4e35f9747349065fb6a5e7
 DIST vdr-satip-2.2.5.tgz 74669 BLAKE2B e586297f0f0c1ca776d4c9f83b46da7f7afe82b80ac7e79ec2da7107c793f5c8a5092590ad23030a435e2d034b084373b9b069bac6ef81822723d33ff6c7fab2 SHA512 3f8ab1d9e84843e71bc6fc8f712d178fa3d304d0959ec977de1b11829e27b575feb78735c6770b15d4dfb8f4fce933aed7df07a6d9ba0b20e937aacd3c643a21
+DIST vdr-satip-2.4.0_p20191027.tar.gz 74205 BLAKE2B 06d847bdec0aa996b5a12df8effcbed1f6cb508664aceda67f6ca415b84646e2f116e329068abd735403c145971146335a004d43e38ede133db03e37ba5b3117 SHA512 087b767583393608995141bf15f02793fb48ee448fe5c3becad34e2e84a4dc8391feb00c1b68fd37377837bd4468f766a8a389e720be375bd2cb6847277e887c
 EBUILD vdr-satip-2.2.3-r2.ebuild 815 BLAKE2B 3eb5ac32d26a1d9fea1d93305c1a696b76f664931ed4db1f62ee754e082c9339a49cbfa2b1db724a2f35f000c10194666f32bda88ded9d421b3c76b784f21ef2 SHA512 96d5d97b75d831c1a33e2e893a7807370aaab66ab6c70bff6d354b8fbaaa64db7f9468d2f132c5b6fdeb1fd68bb4aa3cfe7f3646c79dfbf65a41f416e055b327
 EBUILD vdr-satip-2.2.5.ebuild 780 BLAKE2B 89a68d6ae200ef016abd27f999697520bc1479c7fbaf863e55050b7a9e7c8975bc2702a80acbdb045a16d8574e1f2417a12c2cefae73460ccef60dfdeed559c7 SHA512 977d02ff9e65aee2fd28d4895d3861d45c38f1d1a55a731eae9f14f7624a4e1357f8f10ed301ba09e5debbc4d0aca676440b1444582ab5d18c96fbbfe1557ea2
+EBUILD vdr-satip-2.4.0_p20191027.ebuild 927 BLAKE2B dd4c616ec5347a257e245be3872be5c04ced2e0136d35e413f128398fdeadd5e751232dc518929c624fa809acfc116c74fab36b0df1e86bc950d4840760fe264 SHA512 818ab348d0143e995e0a513b95cae910e3a7016b1e10ca7ab78a7d29aac11fbbabc56b1c3bef39893196fad67fdca0775e789dd57ce2e9200599e703a9c798e5
 MISC metadata.xml 465 BLAKE2B 13cded0da3a72588225358dda5fd14556174ee71474c6b45f1a7e90cdf292febd74d5377ce20ae8a09a76c39ddc558a60d4cca25803131c4c8ca88ed77a5f00f SHA512 8ac89613741c22f977e5d4860aabf70a3b369d2ac8f1ce4015fbbf66e5ef1ea07d6df9f65cc3b625102edc7ab78d96b39e131642629d195c492134912aebf995
diff --git a/media-plugins/vdr-satip/vdr-satip-2.4.0_p20191027.ebuild b/media-plugins/vdr-satip/vdr-satip-2.4.0_p20191027.ebuild
new file mode 100644
index 000000000000..cd4da2275d45
--- /dev/null
+++ b/media-plugins/vdr-satip/vdr-satip-2.4.0_p20191027.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_COMMIT="19e3057f34d9c097c8c6bad30188b14d80b7a242"
+MY_P="vdr-plugin-satip-${GIT_COMMIT}"
+
+DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
+HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
+SRC_URI="https://github.com/rofafor/vdr-plugin-satip/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND=">=media-video/vdr-2.4.0
+		>=net-misc/curl-7.36
+		|| ( dev-libs/pugixml
+		dev-libs/tinyxml )"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-satip.*
+	usr/lib64/vdr/plugins/libvdr-satip.*"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if has_version "dev-libs/tinyxml" ; then
+		sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile || die "sed failed"
+	fi
+}
diff --git a/media-plugins/vdr-scheduler/Manifest b/media-plugins/vdr-scheduler/Manifest
index ac30b0ef8b18..98d1ae266e3d 100644
--- a/media-plugins/vdr-scheduler/Manifest
+++ b/media-plugins/vdr-scheduler/Manifest
@@ -1,5 +1,8 @@
 AUX confd 252 BLAKE2B 3ce93883b93f9e444d1647ddfebc168d14179e99a2f802de4fc461375ce1a6bbc6af1f136c1658874bca600e5021f80d5db47d2d63a713bb9f82702e22d308a7 SHA512 fe8bf99313b8c83b8e87e16b09d0cb396a5271b4b4f27c5c2c3758af9f63ed7729563012d22392c4eaf52acc3b30e2bc9d36287c5a63d62ebb36adfe5dde6cb4
 AUX rc-addon.sh 393 BLAKE2B 892ebe9123c482974eb1e7d47b241b2dcdbce054b0d795d77aa8299c6d96f9aae9c58d7de15b23678809895800e95bbdf0d31e1783bc162198157cd58dfc8499 SHA512 ab7d5c49d3ef5c2d7eeeab37318832887f17eb8bb8498976d98b8483bc4b5617bebd713048f3b2276c7329c9536b8199700e8eb855943c08bad58fa53a88e84b
+AUX vdr-2.3.5_compat.patch 424 BLAKE2B 6954e1f203cc73d13efe8250e7f354b6b0006d9adca581456252f8823568570b0ed7cfa35731d66ad8429f7aad8dc7c6e77a8a985de6f2268b1be742600a4ad1 SHA512 d2c87851584a75e21950617db5bfae670a470c3d2717c8d192426048ba91e044b0d1b3a99101f8d74ef6060bceedf3291767e071b1d9d9e3a6afbee6d349e998
 DIST vdr-scheduler-0.1.3.tgz 36556 BLAKE2B def23bb74a917c45bebc8f4bfb81c938eb6e73a71e00055ce61fe71bb605c0442bf5187be732b5984a7b7b9fae5782cf86b991a42202aa77191142f42765e11c SHA512 bb574377b6ea9237ca8259f73cf9f376e217ccded9b4ff33404364e669ef7b7ba727e69e274f27aacdafa14ba89943bb3a68404212e8c6471f9e015ce16de0db
+DIST vdr-scheduler-0.1.6.tgz 39541 BLAKE2B 0d8003397c6a3d92758eba6d276128a826f2e0f6cd379fc5fcaaf65fbaa728d4835ee3ae7bc134a171ba7e05a362f921538b524c0934518e3ebad69d0fee3131 SHA512 21997459ee452f3a1e65b07a8a2467b887537abcf30df5f29d97db2de96b8e23639c9a251002c32ada3f51e2d47244e9affb241d61cba77e5d22ccc7d972b360
 EBUILD vdr-scheduler-0.1.3.ebuild 436 BLAKE2B 33c76e26bafdd6f23909909d4dffb556e2aef07dad7f39acd2144e2f296536cefecf18a3b007800fed9fea4b7197009e4f148c022c83316b7983d9dbcbb2f485 SHA512 623673068446fe92a21688d7a344b5693dd9a8a9aa1229fb1d90607913c75c3be9fab86c4eed1d8227953ef69e6d561bd905a240e41859b6d8649d217cec17ca
+EBUILD vdr-scheduler-0.1.6.ebuild 475 BLAKE2B 391fff28fe921c7801ecea683e93ac0d7ed48407901f7ed0a322df241b692fbc347fcd608f8851338ad498b67f9fffe44b5cb11274915e6e79e266b50715941b SHA512 0e8eb1cbdc72e02b36255c3aa067031b63e3f7e92769af8b99f88710064dfd16f283f06ff56a49eba8bd257eb9c5b35dc83ff603c906520274be71ab1e5af917
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-scheduler/files/vdr-2.3.5_compat.patch b/media-plugins/vdr-scheduler/files/vdr-2.3.5_compat.patch
new file mode 100644
index 000000000000..546015d3eb8e
--- /dev/null
+++ b/media-plugins/vdr-scheduler/files/vdr-2.3.5_compat.patch
@@ -0,0 +1,17 @@
+Description: Fix FTBS with VDR >=2.3.5
+Origin: http://www.minidvblinux.de/git/?a=commit&p=vdr-plugin-scheduler&h=25981073415e8c74dd5ebe3f7d9d9a9407665f6a
+Author: Andreas McPherson <megax@minidvblinux.de>
+--- a/task.h
++++ b/task.h
+@@ -94,6 +94,11 @@
+ 
+ 
+  public:
++   cTask& operator= (const cTask &Task)
++   {
++     return *this;
++   };
++
+   cTask(void);
+   cTask(const char* Name, const char* Cmd, int AnnounceMode = 0);
+ 
diff --git a/media-plugins/vdr-scheduler/vdr-scheduler-0.1.6.ebuild b/media-plugins/vdr-scheduler/vdr-scheduler-0.1.6.ebuild
new file mode 100644
index 000000000000..b72473760032
--- /dev/null
+++ b/media-plugins/vdr-scheduler/vdr-scheduler-0.1.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: allows to control externel jobs from within VDR"
+HOMEPAGE="http://winni.vdr-developer.org/scheduler/index.html"
+SRC_URI="http://winni.vdr-developer.org/scheduler/downloads/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-video/vdr-2.3.5"
+
+PATCHES=( "${FILESDIR}/vdr-2.3.5_compat.patch" )
diff --git a/media-plugins/vdr-screenshot/Manifest b/media-plugins/vdr-screenshot/Manifest
index 5e8f74c9f7b6..c595ed1e49c8 100644
--- a/media-plugins/vdr-screenshot/Manifest
+++ b/media-plugins/vdr-screenshot/Manifest
@@ -1,3 +1,3 @@
-DIST vdr-screenshot-0.0.15.tgz 17586 BLAKE2B 1b7bf420f1eda574793250c5cbaa02e9cb4f98bd67794d936d9d35f456d75e1640b042bf83f8fdaa04787bda7b6ca6ce3e7505cb77f524c80aaf39be765a79bb SHA512 88100bd17e8be97acfe1b28f6ded7d844e019ea948e45cd36b0f5f54d5f02a1393c24110d374a14e340403fc838100a990e258af10a92b0f62e60825af36a0e3
-EBUILD vdr-screenshot-0.0.15.ebuild 478 BLAKE2B fa7d134ae625fa577fe0d514fefc8b7157610f5412cd014b0bc5e8243ed683def873d76b185fde9b2cadb7c746a17f0143e244b2259cd5339808c9c48d678ed7 SHA512 53602c68df2f0bd2248ebf6780a8521a9227f18ec9ba6a6b917f052641618691d18b9523bb4447968ffe514e54f04f20be44d176d903675b3e07627640057bec
+DIST vdr-screenshot-0.0.15.tar.gz 19439 BLAKE2B 186a44fc1c5645b5876051e2bd0f072557910bd4e66dbc3c1a0a0566a8d6470c384a50c6e949856fb960da9eddcc18e401702eb6df17d138399909dc4c045ac9 SHA512 31aacd2bbe591501b8891f5335ca882271406fad7a222fb640ddc8f9c6228ca2342b3fc78c4d8054b32a160a9cbde03e3bedbd060003fd27b9954de43be6bf5f
+EBUILD vdr-screenshot-0.0.15.ebuild 471 BLAKE2B d9656a107f6ed9e77b1bd71eb97daa48de6bf27ed2777969a7bfd4defd4802f1ea6eaa996146726034b0b96f45305370488bbfdc63ffe3b16ea882bf1859e7ba SHA512 33be7e2183955af7b95371587c6d866632e77ac1cdc2d6d84c80ab839f3c0cff884700644703a6cf19e987325c77b89181c2988e6a68f98bce97f8e33b84fb88
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-screenshot/vdr-screenshot-0.0.15.ebuild b/media-plugins/vdr-screenshot/vdr-screenshot-0.0.15.ebuild
index 7c20be5f820f..2acb61629019 100644
--- a/media-plugins/vdr-screenshot/vdr-screenshot-0.0.15.ebuild
+++ b/media-plugins/vdr-screenshot/vdr-screenshot-0.0.15.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
-DESCRIPTION="VDR Plugin: takes screenshots of the current video or tv screen by one keypress on your remote"
-HOMEPAGE="http://www.joachim-wilke.de/?alias=vdr-screenshot"
-SRC_URI="http://www.joachim-wilke.de/downloads/${PN}/${P}.tgz"
+DESCRIPTION="VDR Plugin: takes screenshots of the current video or tv screen"
+HOMEPAGE="https://github.com/jowi24/vdr-screenshot"
+SRC_URI="https://github.com/jowi24/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -16,3 +16,5 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-2.0"
 RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}"
diff --git a/media-plugins/vdr-skincurses/Manifest b/media-plugins/vdr-skincurses/Manifest
index cf1985405d30..bf09ede04925 100644
--- a/media-plugins/vdr-skincurses/Manifest
+++ b/media-plugins/vdr-skincurses/Manifest
@@ -1,3 +1,3 @@
 DIST vdr-skincurses-2.2.0.tar.gz 17141 BLAKE2B 42eaac425f246a352c9b5fe27c19f3183d6857bc38eb6fa4782d0a340be1e30473fb3f4cff797ff5f932b24b9bbc08ad15afd3ce34bff688552c4d3448fa4a90 SHA512 4b5fa7caab0bb89eed637732b005c4a3e1357624e8f73760645ffc6908c7d9595b4f95b87dac904b54b7292fc83669d6b1b0f009bb993d220392f8eb215085d5
-EBUILD vdr-skincurses-2.2.0.ebuild 421 BLAKE2B f6d8be38084a008a30d35e95b9fec2c27706f743e4aca17986c62066e85245db5d26a0589cb967bd17961a5c853fa00a41dc4e8dee79e79ba5bb17ada26600a1 SHA512 db57f3d12c5d0e2333d04406277202911ec512275d5a2b7702002f580c47488250f499ab029689e154c0ae15b071b209346cb9c23c0f68715256664e940dffe2
+EBUILD vdr-skincurses-2.2.0.ebuild 834 BLAKE2B 69caf7ec0daa7bbf42fdc87d2a266e59d1df1af6f245b11c4892d3a42692437c813a122496ff041bcbf82b5456b6ca019fb8707c87e8af933105330b4e5ace03 SHA512 dc93375e59d666f2a3845b71c1055a33a8545dba61e0265b58a3d2075f011ed2f16cce5be27f7373e0d8a5e3679edcbd84ca8d88087117a7f8628f38704e6e75
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-skincurses/vdr-skincurses-2.2.0.ebuild b/media-plugins/vdr-skincurses/vdr-skincurses-2.2.0.ebuild
index 0b8b534b2c2a..29127e9ebdcd 100644
--- a/media-plugins/vdr-skincurses/vdr-skincurses-2.2.0.ebuild
+++ b/media-plugins/vdr-skincurses/vdr-skincurses-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,18 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
 
-DEPEND=">=media-video/vdr-2.2.0"
+DEPEND="~media-video/vdr-2.2.0"
+
+src_prepare() {
+	if has_version ">=media-video/vdr-2.4"; then
+		einfo "\nvdr-skincurses-2.2.0 needs exact media-video/vdr-2.2.x"
+		einfo "media-plugins/vdr-skincurses is part of the core VDR"
+		einfo "To get this plugin in a later version"
+		einfo "emerge --unmerge vdr-skincurses"
+		einfo "emerge media-video/vdr with use-flag demoplugins\n"
+		die "plugin to old for >=media-video/vdr-2.4"
+	fi
+
+	vdr-plugin-2_src_prepare
+}
diff --git a/media-plugins/vdr-skinelchi/Manifest b/media-plugins/vdr-skinelchi/Manifest
index 4b0907102c0b..c68c35d63fda 100644
--- a/media-plugins/vdr-skinelchi/Manifest
+++ b/media-plugins/vdr-skinelchi/Manifest
@@ -1,4 +1,5 @@
-AUX rc-addon-0.1.1_pre2-r1.sh 515 BLAKE2B 64bb503cb99ed2ef0c30c56cc999081bd2a378d817ef57085c0d054a00d9dfc26f0a602d0d2503ad07851da6c6d376c6816a78bc54f9ce5b338304a75c5a5f5b SHA512 5d8eed7492add54122bf6d4a3a18f6be004f0c78815fe05c27df818fc68f221460178ba9b3936072ba1f433b1d65dafa766a6c9f488c4fa8ad851d1441d09af6
+AUX vdr-skinelchi-0.3.0_min_max_from_stl.patch 887 BLAKE2B 8f54521791e59a970fe61a0a66a4989ded5edb06893f685cf18060b04bc95f2ea7569e8389083d839fcff4a826598cba8e43154ac256bed0a13d614b67c6b643 SHA512 021f9a13d1898aafe436d877bce6b9eb3d0e3303012eba8ce244071f8529f4ad931c20af0a5db257dc817b0cad61916eb6934c81fa01a6a54a10efcc9abee6da
 DIST vdr-skinelchi-0.3.0.tar.bz2 78806 BLAKE2B b2f9e94484e6e8e9829fbc4a53485c8fa094563aab9a090b1dc0b1f55b769d416d21bba8fac81297740eb72cfed4110cbf545a2faf9e0542cf8b3e75f31e533d SHA512 28ffaf956435b8f5caf84b1562b1450214cfc96906dfce3455093627e1f1807a6c3bc37aaf1055148a719debd8b0a6a8c860a869a42850a61f0c6a1551294c8f
-EBUILD vdr-skinelchi-0.3.0.ebuild 1082 BLAKE2B f0c7e9e985ca3d5294e55efa1d3f85250874d6e89d8d8e9613cdd63135ea6da55d07d3ee44db577cff80bef3b46fe1a507db412e4ebd635a475e1f1d6e11a9f0 SHA512 c2e0e95ab17be23712a6b76e094d1c21165a9f8258817c0d73fdf901b9d82a9e1ad62748a4428d44e312e1695f867adaf922709411344549c2a1ef3ae4709368
-MISC metadata.xml 328 BLAKE2B b8a05db00f77a984e9b580144c99289528d6f42d9c871e69c8626c43b3b7c8b2116d4be77e0bb4fc78e270fb5670ef2c1142129713178a3a18eb7822c8c65a20 SHA512 0e3a0afd1065619a448bf317183ff69fba885f12bb5db47ce08a8b66e2cb2ce84504eff8ddcfc89a02968e6f6507d91acbe7415e6e3b0c543f67666df3873ef0
+EBUILD vdr-skinelchi-0.3.0-r1.ebuild 943 BLAKE2B 4318b6bdb0b159f6006730299ef659b11a60bf4ba47ad8ee9f098893df3e8d505871753b271bffda84bdf3585212b26255e89c950b7cb9bb9e4186ffb70d5303 SHA512 5b3c2cec0d1c3f9a7140977428fd89fe156cdc496a504ab58a227edd2d82f6a676b64ce9f0c36195a02f4b8159c61ab72b189b4933d7dd63d80ba4f294b47c31
+EBUILD vdr-skinelchi-0.3.0-r2.ebuild 991 BLAKE2B f3e099feb234328ce33ddb94933fc43b735446316acc3c784f38629dbc91f67a16bc285d24251e010d41ab1f9871a457d313c3a03d962fd68f91de99526fb3ac SHA512 60be2dd7e6d245d9dc6d57864daa7df84c51bb55975c0413f2ad8f3f437977e0bbf9fa83223027120e7ea3240e16e850f79b12215cfc2eed66c38074978e696c
+MISC metadata.xml 428 BLAKE2B 2ed768c50e4a1445a31d521bdfd93698d6610676f4669481af83c8d49c22ebdab2ac3f5c36367e5468802cfa2e6ed124d58729c7f81713cc2044109cbf377b8b SHA512 31851c49e8cbe7d898c861e0ae20b198d0e6aab47312785ca5c73364be4894a0f891be3c9898b3dff6cff836059ac4a96ea95ce5771bac5cd12a667834a3248a
diff --git a/media-plugins/vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh b/media-plugins/vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh
deleted file mode 100644
index 1798eade4531..000000000000
--- a/media-plugins/vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# rc-addon plugin-startup-skript for vdr-skinelchi
-#
-# This sript is called by gentoo-vdr-scripts on start of VDR
-
-# Check on dxr-3 and set default logo DIR
-plugin_pre_vdr_start() {
-
-# Next lines commented, not supported yet, remove this if dxr3 logo support is available
-#	if [ "${PLUGINS#*dxr3}" != "${PLUGINS}" ] ; then
-#		: ${SKINELCHI_LOGOS_DIR:=/usr/share/vdr/channel-logos/logos-dxr3}
-#	else
-		: ${SKINELCHI_LOGOS_DIR:=/usr/share/vdr/channel-logos}
-#	fi
-  
-	add_plugin_param "-l ${SKINELCHI_LOGOS_DIR}"
-
-}
diff --git a/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch b/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch
new file mode 100644
index 000000000000..123d0e4d5575
--- /dev/null
+++ b/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch
@@ -0,0 +1,18 @@
+taken from debian vdr repo
+this will fix
+https://bugs.gentoo.org/703994
+
+Reviewed-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2020 Jan 05 )
+Index: b/DisplayChannel.c
+===================================================================
+--- a/DisplayChannel.c
++++ b/DisplayChannel.c
+@@ -724,7 +724,7 @@
+       }
+       else {
+          time_t t = time(NULL);
+-         int seen = max(0, min(y9 - y6a - 1, int((y9 - y6a) * double(t - Present->StartTime()) / Present->Duration())));
++         int seen = std::max(0, std::min(y9 - y6a - 1, int((y9 - y6a) * double(t - Present->StartTime()) / Present->Duration())));
+          osd->DrawRectangle(x4 + Gap, y6a + seen, x4 + Gap + ScrollWidth - 1, y9 - 1, Theme.Color(clrChannelTimebarRest));
+          osd->DrawRectangle(x4 + Gap, y6a, x4 + Gap + ScrollWidth - 1, y6a + seen - 1, Theme.Color(clrChannelTimebarSeen));
+          changed = true;
diff --git a/media-plugins/vdr-skinelchi/metadata.xml b/media-plugins/vdr-skinelchi/metadata.xml
index a4ac816157a0..2aa794fd515f 100644
--- a/media-plugins/vdr-skinelchi/metadata.xml
+++ b/media-plugins/vdr-skinelchi/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type="person">
+	<email>hd_brummy@gentoo.org</email>
+	<name>Joerg Bornkessel</name>
+</maintainer>
 <maintainer type="project">
-    <email>vdr@gentoo.org</email>
-    <name>Gentoo VDR Project</name>
+	<email>vdr@gentoo.org</email>
+	<name>Gentoo VDR Project</name>
 </maintainer>
-    <longdescription>Video Disk Recorder (VDR) skin plugin</longdescription>
+	<longdescription>Video Disk Recorder (VDR) skin plugin</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..81062648c1c9
--- /dev/null
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic vdr-plugin-2
+
+DESCRIPTION="VDR Skin Plugin: skinelchi"
+HOMEPAGE="http://firefly.vdr-developer.org/skinelchi"
+SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-video/vdr"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	#bug #599148
+	append-cxxflags -std=gnu++11
+
+	# disable imagemagick support, broken ...
+	sed -i "${S}"/Makefile -e \
+		"s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" || die
+
+	sed -i "${S}"/DisplayChannel.c \
+		-e "s:/hqlogos::" \
+		-e "s:/logos::" || die
+
+	# wrong sed in vdr-plugin-2.eclass?
+	sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += -I\$(VDRINCDIR)/include:" \
+		-i Makefile || die
+
+	# gcc-6 warnings
+	sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h || die
+}
diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
index 23c1f70613a8..2dbe08a9b7bc 100644
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit vdr-plugin-2
 
-MY_P=${P/_pre/pre}
-
 DESCRIPTION="VDR Skin Plugin: skinelchi"
 HOMEPAGE="http://firefly.vdr-developer.org/skinelchi"
 SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2"
@@ -14,34 +12,30 @@ SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="imagemagick"
-
-DEPEND=">=media-video/vdr-1.6
-		imagemagick? ( media-gfx/imagemagick )"
-
-RDEPEND="x11-themes/vdr-channel-logos"
 
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.1.1_pre2-r1.sh"
+DEPEND="media-video/vdr"
 
 src_prepare() {
 	vdr-plugin-2_src_prepare
 
-	if ! use imagemagick; then
-		einfo "Disabling imagemagick-support."
-		sed -i "${S}"/Makefile \
-			-e '/^[[:space:]]*SKINELCHI_HAVE_IMAGEMAGICK = 1/s/^/#/'
-	fi
+	#bug #599148
+	append-cxxflags -std=gnu++11
+
+	# disable imagemagick support, broken ...
+	sed -i "${S}"/Makefile -e \
+		"s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" || die
 
 	sed -i "${S}"/DisplayChannel.c \
 		-e "s:/hqlogos::" \
-		-e "s:/logos::"
+		-e "s:/logos::" || die
 
 	# wrong sed in vdr-plugin-2.eclass?
 	sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += -I\$(VDRINCDIR)/include:" \
-		-i Makefile
+		-i Makefile || die
 
 	# gcc-6 warnings
-	sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h
+	sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h || die
+
+	# wrt bug 703994
+	eapply "${FILESDIR}/${P}_min_max_from_stl.patch"
 }
diff --git a/media-plugins/vdr-skinsoppalusikka/Manifest b/media-plugins/vdr-skinsoppalusikka/Manifest
index 5d7faa5c297f..90a03a9a6ef9 100644
--- a/media-plugins/vdr-skinsoppalusikka/Manifest
+++ b/media-plugins/vdr-skinsoppalusikka/Manifest
@@ -3,8 +3,10 @@ DIST vdr-skinsoppalusikka-2.0.0.tgz 41584 BLAKE2B 990550bdf8dfb63c3b019886ef52e0
 DIST vdr-skinsoppalusikka-2.0.3.tgz 42514 BLAKE2B 34a330b4c73295027ad188729c1422168895e0470a4880898e3131011987aac373f6761355038509efdc066bce9eb14a0a7ce5cc750626b3d7f51f21e37320b2 SHA512 6c47ca11bf97cfcca67f0daa8806243e7a9f9e852f412f0c470ba32bf63461df3a0154c156f7588e4d6adaa9a85b66781a6a7c75544fb8ff17e26e71522b4010
 DIST vdr-skinsoppalusikka-2.2.0.tgz 42981 BLAKE2B 96fe03c8ddfc8e2d1c7b9e100d2d807c40b6047e266f8d04764367e60a972db18754e1114e9fdb51c037f5bd8130cd12ad433764dc733e799fe781436375b03a SHA512 c3ebbe2bd2936a1023d38f02a03c959e2af9e750a7bfda93dd053981cda445b9db9320a0e0fc82b67f2bd35950280747ebd32ab01bf13f8223b1ccb294c03f91
 DIST vdr-skinsoppalusikka-2.2.1.tgz 44379 BLAKE2B bfd705460ebe4b2e54b9318c05b1a2261f59d05a1f443eb8f7c4b0668726a62f0d360d3e05f791e59243ac95681495690f8efdb3e0c0a158e103898d625eddb7 SHA512 4ac93be8cc31bcb452520957db087966b05c0e40b061537260f161d548de5c481dd16e130710a2cb2550a5e6444a35199d0a2f62a785cd662ea99a0075393cd3
+DIST vdr-skinsoppalusikka-2.4.0.tgz 45075 BLAKE2B e8cba52b21ddfc819d9a917f4adb49791f97078fe7adc6eadd20cc752aa43fb2e15fea43166a141a659966fe82ee92fecc6884886e375bba8cc22b106e7a0fb3 SHA512 60fe08140b2eb1bcf0f5b04d2c0eb04cdda0590e94ad034b54831fe35f89b6d3a1e0ab604cc4261a1858c42ebbc0c2b0a5aaa5e5475c3629572e4c76f51067d1
 EBUILD vdr-skinsoppalusikka-2.0.0.ebuild 684 BLAKE2B 3e12c874d5bbc0823f379aca8da3cff25092cb9548fb423267bfbcfb1add8e0761d4ab1e3cc13486baa83ea777edb68d93cf591628fe71edd927021a2777a13a SHA512 b077a97e8aef7a932ed9bad8e9e21cf06cb8149aa86d38c592942c9a36322a6f1c8c7d296b3a6375aca066d20bd802177dcdfeee77f6c86014b35ee4eb1b9f89
 EBUILD vdr-skinsoppalusikka-2.0.3.ebuild 686 BLAKE2B 592757a1d8a07102becb224cbcaec44e4fbb3e74c109800639c096fa20299cba0dbe8deafe4ffaae07af8df809337b4cb208eb23a983e874cf1783b734cf8f76 SHA512 dbd0b9bb7a02e56f4ae8e345c64565229c9404b1ed20dc1c11ce7d43b27096b58cf65686faf73f6227df7197ed440caec51cd2d707f53f963d16a399ef787444
 EBUILD vdr-skinsoppalusikka-2.2.0.ebuild 686 BLAKE2B 1b6b1cca272bde8b0754cc138771bf0c5ee509272ed2ffafb83b4f6a58bc19fcac5718d1c53f2b4e2dbf1e0118a6373cf04b16c554fd264c9c4f46de859ffdec SHA512 cb3cbf9a0f8310ad5c053a56e7b4bfabb88f4fbf0e411a4990fd0955ec545f62e7b4d360d7227bd86c3f8aa8685fd3a6615507aac68ef7038e7fc914caa309c5
 EBUILD vdr-skinsoppalusikka-2.2.1.ebuild 686 BLAKE2B 1b6b1cca272bde8b0754cc138771bf0c5ee509272ed2ffafb83b4f6a58bc19fcac5718d1c53f2b4e2dbf1e0118a6373cf04b16c554fd264c9c4f46de859ffdec SHA512 cb3cbf9a0f8310ad5c053a56e7b4bfabb88f4fbf0e411a4990fd0955ec545f62e7b4d360d7227bd86c3f8aa8685fd3a6615507aac68ef7038e7fc914caa309c5
+EBUILD vdr-skinsoppalusikka-2.4.0.ebuild 711 BLAKE2B 1f4fe070e606cdaee56041150d51cb052967c398dd6e93597fea3c01b2ec64613d362716008cef0ec9bab71436931a7dfc9ee94d84321197c0f252706594b8f0 SHA512 fb647fdd1f7acdd4e5f79b430106f67e7787ad821fe1d69fb5a4024df0a43c9712cd6994bd9d6cc47d1b1a80d068256a781e413941be4d8551081b1c30a5079f
 MISC metadata.xml 369 BLAKE2B 72b1eb035f62e0fbd16367c57957edb410a560e5c969efb4d57bb63ab957b3d3170c42c82f7008693b25acdabfd24d44f4777acee17ecffde49f186602e891f7 SHA512 4428f33498155a45c12994834a472f7ae576f2d49e8db258d962c79ea62119c61a34de79d9e09b8cc96030e1a3a7701298aa22e4b78c306c300758f6546d52e9
diff --git a/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.4.0.ebuild b/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.4.0.ebuild
new file mode 100644
index 000000000000..fb4274071dec
--- /dev/null
+++ b/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Skin Plugin: soppalusikka"
+HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka"
+SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-video/vdr-2.4.0"
+RDEPEND="${DEPEND}
+	x11-themes/vdr-channel-logos"
+
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-1.0.2.sh"
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-.*
+	usr/lib64/vdr/plugins/libvdr-.*"
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /etc/vdr/themes
+	doins "${S}"/themes/*.theme
+	fowners vdr:vdr /etc/vdr -R
+}
diff --git a/media-plugins/vdr-sndctl/Manifest b/media-plugins/vdr-sndctl/Manifest
index 98d2ed5e5e2d..df23441cf2db 100644
--- a/media-plugins/vdr-sndctl/Manifest
+++ b/media-plugins/vdr-sndctl/Manifest
@@ -1,3 +1,3 @@
 DIST vdr-sndctl-0.1.5.1.tar.gz 36332 BLAKE2B 50f1a3caa8c58e6c987e6bf1f66b7d7a9a8fa749e9e6c373c625e998ba1c0b9d8286b509b7aca61c5c53bd90f00c49c45ebecb7942ff39bc0be3350f0090ae6f SHA512 64bc893cf4fff68008267339cbccd48321022da1cbe8b7f277b794d1e264045793432c23b860045f3fc79c968a1e8d41470f7ae0014bbcacd358da5a16fcb842
-EBUILD vdr-sndctl-0.1.5.1.ebuild 678 BLAKE2B 2d3a540c47ea5dd1f02f2ced87b26fdce51145196c51851b456e73b843b6305f765fa5facea58317fcd56951fc81996e6f007bb745d3db6368b21d2530eb38e5 SHA512 95350dd465963531c5663601a7e284adeac2fd943609fb6d5be4564d48e619fe707204efa35deaab9e33d5d98cad5b1e63a8e1e28913effe81e96d351975b970
+EBUILD vdr-sndctl-0.1.5.1.ebuild 613 BLAKE2B 5f8144f78fdb48aa07bf372fc253c9a89ab2c5bc15ce5612aeea88eab7258446c36aea2cec03edcf3f56f902549f1d748011d55f748f057fc471b3cbb97078cc SHA512 04d2045ed727b0a314926f24259d00f71f8ac40c1a56afb222fcfb8b35a2d95f4c7254c682d943c44fbc1f29ffc27ed383474f2598070b00358877adf99a4418
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-sndctl/vdr-sndctl-0.1.5.1.ebuild b/media-plugins/vdr-sndctl/vdr-sndctl-0.1.5.1.ebuild
index 01935d4ea7aa..5948226fea3c 100644
--- a/media-plugins/vdr-sndctl/vdr-sndctl-0.1.5.1.ebuild
+++ b/media-plugins/vdr-sndctl/vdr-sndctl-0.1.5.1.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
-DESCRIPTION="VDR plugin: Control the vol level of diff controls of your sound-
-card according to the settings of VDR"
+DESCRIPTION="VDR plugin: Control the vol level of diff controls of your soundcard"
 HOMEPAGE="https://projects.vdr-developer.org/projects/plg-sndctl"
-SRC_URI="http://www.vdr-portal.de/board/attachment.php?attachmentid=25497 -> ${P}.tar.gz"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/vdr-streamdev/Manifest b/media-plugins/vdr-streamdev/Manifest
index 7b4d913291ec..f8398d3c16a0 100644
--- a/media-plugins/vdr-streamdev/Manifest
+++ b/media-plugins/vdr-streamdev/Manifest
@@ -1,7 +1,9 @@
 AUX confd-0.6.0 763 BLAKE2B 0034f680c9505a3af427d137d58ac4c64903662bf9ccd91692c5ea2f5aea4566557bbbc04872a04807751d55276316521d62ab8a526269235ddc7eee39ae4d19 SHA512 4e903271bd71ae285e83032ed6694053e1335346e4b27e1bde5b5545c2e0f1ce01e548f09cb15c938ed2f227fb565a1af2d43c774098b5aa5ed457a9d7ed1767
 AUX rc-addon-0.6.0.sh 727 BLAKE2B 88b49c42909fd14da2f428255a3abe0683c43532a4a2186a9a51673fad075ce2d1f309ed0d6140d016fd2cf9a8f91944021c3e3730ebc4fed0aa451a03864900 SHA512 36a04a5bcd7d0cc097b3b245108eb8451450c8a1d02afd6fdbc543e99c6e4613d8d93de9cbca0cfc526e177db39220009a77fd53f54e7b64b04a69fdf9ffa494
 DIST vdr-plugin-streamdev-674bb5b331240de3ba2a8beb63a1276003e64e3e.tar.bz2 163096 BLAKE2B f451c435b24b69b0b09b5f2f041888ed3593ed7deee727a027672df9dd4d7c9183a68d40751ae5c12765037b4d5520f8ad824ead357b2a6597aaa15be7e573f5 SHA512 f9439a4c3dd453869f9cf3171ddb5e34c2a625d7873cb1648138e4b94715ec3acd8d3db69df5ae5bf1bc21f0401f9b12a126395b0f2696c129ee7725c1715902
+DIST vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.bz2 163403 BLAKE2B 4cacadc091ab8d28ccd4318eaf18aaef8f45e6caab86ef461d1b1047039ec921984ebad091d29420779982b5b37606defe5aa6c6828e8f28788886ba9839efea SHA512 e1eb69f62785178c06fa6700bd1b94ac12f2c58b1a7b8067312613279b59c5ef8157474e27863e8b2d0e47700f67fca7a61595c49809512e9e1efdb27c85eac8
 DIST vdr-streamdev-0.6.1.tgz 186546 BLAKE2B 7d5d92c8ec92e7a57e8e335bdbdf5c91bcbfcdc3ea96fe8154af7015f33d6f2822cf35681a8018cad5b19776199d90870b747bc0a551f42a7b0eedc94f040188 SHA512 bbe6231bd8e69e299c8d94173e7ed4b1f49e5b17b7bcadf2d1e827b5e8dd57c6b975c8c409fd44f252110099b3565a7d4d8c2f7d03636fc2d2e3580d0050d971
-EBUILD vdr-streamdev-0.6.1.ebuild 2960 BLAKE2B 6f051e2857a78856cc9ef8abd7a63635a4ec89ac8063cbf3206b279148c5de86e2c71d3730b1ebb5a194a1280d4f162f2ea867dbf630000659c6f804836ae65d SHA512 3be67d6e4e24a23ec0d92521867cc0ecdad7f230452aeb54417c0953b1ea1b39b87eaf39735bcfb76b4305984bae0f91a57fb8f3840a8aa63fb57cae35135937
-EBUILD vdr-streamdev-0.6.1_p20160320.ebuild 3102 BLAKE2B 275b72276ecc8f22edacdd35b8f743e618aa91e58c58d05756c829cb81af86cbd14082f9b7afc274e4b1f9d1116bab92aaeea60d321fd967834ae61aa36eb513 SHA512 a9cb36573590c62b28087b509dac9bfd4507d176412cd0bb170c8f41255cd9f49e534125121c15f1ed821ee8122c347643b0169e11cc95c0e39098ba85d35dcc
+EBUILD vdr-streamdev-0.6.1.ebuild 2956 BLAKE2B db86b5f2947a2d2a38263a031cf2f51a8275ced65314c645a762c64dce6b860a0620fb585d78dcce0e3c6bb6f7c226d570415d49e228022f7e18791d1edf220c SHA512 59a204d12eee43f9a9bbcd993394e29a4618d13ee9fc6acb129bfcab5f24edadade6049032693edb7f7930382a2c5dfefd08d79fc6ec3cb4a671665446e0a41e
+EBUILD vdr-streamdev-0.6.1_p20160320.ebuild 3098 BLAKE2B c7b3d6db489f772f073077f5a6e25a3cba8f093ec8316e2108e3d1858ad57083d27810cf47c37107f46570c18a55730e22bf886080074855119978efc934c3bc SHA512 37f87dc10bc94c5bd37389292a2617c95879a0f5cea6144db80998bce7ad943c94ca9279e6221200ad006c686adf22472b00d058cfd84ce1877c5055094d7157
+EBUILD vdr-streamdev-0.6.1_p20170930.ebuild 2215 BLAKE2B f960f552495d0bd70e2feffaaea4fa213961921ddbb656acff73de57be61d4f2647ab24cebfbf6e7d5dd57bba3fbf62be0bf97a2c7be9e0361591135dab89743 SHA512 3c605948dcef8ec3d0bc5ac277107f571ec8a13f5b7c70e16b27b5992102e8f7f7c8a3547488ed4adb359ce3609636521f156f4211ab9dbc9d8c92ff2ff4e3ab
 MISC metadata.xml 540 BLAKE2B 3c69478def52669a549baee4a05af5a1b169bd8fb32ff774c465739f73a5b42bd92d7e294e1937c8d23daf7820055175ebe601ddc91b276533381812b5213d25 SHA512 7d8ee3fa799171758e6a5a174da5ad25b1d15b3099e9891f285cbffa163ced341347a550af2aa3a9e33612b1eac571feabf538bf0cccb9bd953568acaebd308b
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild
index bdacdc2493dd..86fe10fda4b8 100644
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="client +server"
+IUSE="client server"
 
 DEPEND=">=media-video/vdr-1.7.25"
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild
index 8e69d5831329..855928673f01 100644
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapsho
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="client +server"
+IUSE="client server"
 
 DEPEND=">=media-video/vdr-1.7.25"
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild
new file mode 100644
index 000000000000..b5c3b4f0a9cc
--- /dev/null
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_VERSION="e2a9b979d3fb92967c7a6a8221e674eb7e55c813"
+
+DESCRIPTION="VDR Plugin: Client/Server and http streaming plugin"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-streamdev"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-${GIT_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="client server"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND=">=media-video/vdr-2.3"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-streamdev-.*
+	usr/lib64/vdr/plugins/libvdr-streamdev-.*"
+S="${WORKDIR}/vdr-plugin-streamdev-${GIT_VERSION}"
+
+# vdr-plugin-2.eclass changes
+PO_SUBDIR="client server"
+
+src_prepare() {
+	# make detection in vdr-plugin-2.eclass for new Makefile handling happy
+	echo "# SOFILE" >> Makefile || die "modify Makefile failed"
+
+	# rm unneeded entry
+	sed -i Makefile -e "s:-I\$(VDRDIR)/include::" || die "modify Makefile failed"
+
+	vdr-plugin-2_src_prepare
+
+	for flag in client server; do
+		if ! use ${flag}; then
+			sed -i Makefile \
+				-e '/^.PHONY:/s/'${flag}'//' \
+				-e '/^.PHONY:/s/'install-${flag}'//' \
+				-e '/^all:/s/'${flag}'//' \
+				-e '/^install:/s/'install-${flag}'//' || die "modify Makefile failed"
+		fi
+	done
+
+	fix_vdr_libsi_include server/livestreamer.c
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	if use server; then
+		insinto /usr/share/vdr/streamdev
+		doins streamdev-server/externremux.sh
+
+		insinto /usr/share/vdr/rcscript
+		newins "${FILESDIR}"/rc-addon-0.6.0.sh plugin-streamdev-server.sh
+
+		newconfd "${FILESDIR}"/confd-0.6.0 vdr.streamdev-server
+
+		insinto /etc/vdr/plugins/streamdev-server
+		newins streamdev-server/streamdevhosts.conf streamdevhosts.conf
+		fowners vdr:vdr /etc/vdr -R
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	if [[ -e "${EROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf ]]; then
+		einfo "move config file to new config DIR ${EROOT}/etc/vdr/plugins/streamdev-server/"
+		mv "${EROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf "${EROOT}"/etc/vdr/plugins/streamdev-server/streamdevhosts.conf
+	fi
+}
diff --git a/media-plugins/vdr-ttxtsubs/Manifest b/media-plugins/vdr-ttxtsubs/Manifest
index 5241a2fcbf2c..c9551a46abe2 100644
--- a/media-plugins/vdr-ttxtsubs/Manifest
+++ b/media-plugins/vdr-ttxtsubs/Manifest
@@ -1,5 +1,5 @@
 AUX vdr-ttxtsubs-0.3.0_teletext-chars.patch 2983 BLAKE2B b18aa4f8a00ef102345531ba3fa02d2dc44ef1a5f38d93f74ba307b56828bc9861283fd8aa70777dc14c3bfb37688bfccee9ee4cc4259b2e2b7c45d21394ed7f SHA512 120ee81b47323792c94868a0e4b2bc3af26af9280854bc54a643777181ba6653920e6edb89558ee21eb94ee9983dbc929bd9a4d23ab8d5d7da0d1d644ca62408
 DIST vdr-ttxtsubs-0.3.0.tar.gz 58956 BLAKE2B 681b517c25793bc5a7cc9bde4efdfc5d61cb69ba9524348eaf1c9df1b896650634b489be4a2705d040b7cbdff7648f270d74b63493739544040ebc2051cadb7b SHA512 60edbbc152e4c168dbc91f67f2105f9e9536f108ba0210a8834d950659a0923bc7bc23f44dcfa484135d5d9a6f89abb4e90f0ad39db826ad41c8f1192446bc56
-EBUILD vdr-ttxtsubs-0.3.0-r1.ebuild 599 BLAKE2B 7ea9a615e4f945f2f1023f08c2752ad33070b99477a5712f89204bb265f13acb157c916692a602c057d2ddf0c21f2a15bf17a698aba562e81c4a304a72dc0543 SHA512 77dcef542e0b0d9455187a1e53e73e3a4698ef31fdea241b41de083d1974bb7784b431955de04565767d3cf3cc85eefb5001b6117e084f6827f653647846d240
-EBUILD vdr-ttxtsubs-0.3.0.ebuild 512 BLAKE2B ef801893a8d25084b077a04f2fa7b31c622e5bcf02e6a420420930162c638df1d96dfab92e8ef697fa736974937bc99fd1b4e61adbd5f7a742a4fbdd2598fd4b SHA512 3d0b1b4cf7b3a8f2d73ced3a78e0c8d8428c1a546432ae3588a4cf47f8fac88b0f764da73b6af026558a7a09c7c7167f88850c449143fcfc2d9195169f3288f6
+EBUILD vdr-ttxtsubs-0.3.0-r1.ebuild 600 BLAKE2B 6c3bc1696031316f9f6e89abeb2e1eb5f23f6dfd131709f2078ca429b322302c4c21393c065017aac3ff7cb63d9ed8ef41276bddfc35fbd278f4e32d8dbe6008 SHA512 1742e4d9fe6d423179332fd14d70a852914eaaf06b9ff6f2060defaead0e82e820ae4d3ffac960628dfde1dd53a4b0f8a1abf3090fd5118e8eb290366d45f9c0
+EBUILD vdr-ttxtsubs-0.3.0.ebuild 513 BLAKE2B cff7fbf91a6b9592c532dc81e92c3724a9dea10f6784e2a8eb380db75beeb220c1f1c5ba0e26b09ac8e62dcc8993401d9e4a69f1f720d5473b543e0aafb18028 SHA512 a187f1b95b6f7eb349233c8a604069528dd7acf9c764b95050e7689ea063bbce2fe740f33262c5af8f4db85a7627cf1211a4f7f6a6468cf84d294f450e42ee15
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
index 1f196dbb1d85..9fe2f3ec6aa1 100644
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 IUSE=""
 
 DEPEND="media-video/vdr[ttxtsubs]"
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
index 68a2183616c5..510673779e27 100644
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
 
 KEYWORDS="amd64 x86"
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.7.38[ttxtsubs]"
diff --git a/media-plugins/vdr-undelete/Manifest b/media-plugins/vdr-undelete/Manifest
index a73f4e4df889..a05fec64de39 100644
--- a/media-plugins/vdr-undelete/Manifest
+++ b/media-plugins/vdr-undelete/Manifest
@@ -1,4 +1,6 @@
 DIST vdr-undelete-0.0.7.tgz 34655 BLAKE2B 81f40ad993d06386112ef46c3ba1c1402211c2ec2138aa113dfe8376340416097a691e7b5f4c4fee24e85e7a0b5c16501dc6853374c3e8b27e0a84437dcb0f74 SHA512 c4d634580d91c3d3601767bb29cfe12e0bd13f9d8fd5bab31a3388db1f8724544b371b4ba333cd524aa5243554015517f487f6e8f2de31bd747f1094ba1c84ff
+DIST vdr-undelete-2.3.0_pre1.tgz 13865 BLAKE2B 065550c0c6aa150677550450f458db496ac55e6ad1b8024de22abca37093259adfdd6ffc7b9c07a66e76df573c3c1d4d69920bcf56872406234a4898f99021d2 SHA512 3200efcbd2eec5ef04d66fcf9dbbd1973ef7488a332618a6d2f5dc4bc20323e2b88746f02883e9488436b32f21aea2fb60e7e675e247af392ee121423af4b878
 EBUILD vdr-undelete-0.0.7-r1.ebuild 958 BLAKE2B 8a8c55b0ea229acc87ec2acb11acff603c02aee76a7849e8ddb3af020fd48b6daad36bfa48b9d34e0c5045c758ce79ab358812e97b64c29f343a69838041b711 SHA512 7df43a6cd5127736f33b9969f7f448c31262fee741b3a010f481e140c94341f7631257b343b46a9293a1bbbe2f0888dbb6531dec7aa6e337a3660c05054be807
 EBUILD vdr-undelete-0.0.7.ebuild 475 BLAKE2B 7188f8fa2b3ae7ed65f954648d9557af9aa25a8687b4ef203425ee72c2d17171d80b193f20e910d17807a95d654f76ddf20768b854c7f287d27bee8b9b5a26d6 SHA512 abf36f156e2356b43e0b90343b620e6b7893baa9a9e5ba21a69c0f67145ac4ecda41bb1e59221ff9892472c369e0feee2e4ac078925f06cb86477668cbc085ae
+EBUILD vdr-undelete-2.3.0_pre1.ebuild 444 BLAKE2B ba1c505e93762092179c7621392a94579dc3cc0fe1bc61bb583db8cc9abf430c228ff7daa763ff61b70cfd479303fde82c90bce589872b29013acfe709ecb91e SHA512 a6584257efb2baed7b6ae12b2dcd1ecfcf4a3f07ce4aa031a390691b6d68da02b8b01a8d96e0bddcd4ee57e3da3dec74eb126bce0b45464ee30a861e8abe7fdb
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild b/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild
new file mode 100644
index 000000000000..0bd32ff45520
--- /dev/null
+++ b/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: Recover deleted recordings of VDR"
+HOMEPAGE="http://phivdr.dyndns.org/vdr/"
+SRC_URI="http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -> ${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="media-video/vdr"
+
+S="${WORKDIR}/undelete-2.3.1-pre1"
diff --git a/media-plugins/vdr-vompserver/Manifest b/media-plugins/vdr-vompserver/Manifest
index 23ff4fb7c1c7..6691e9e7ee81 100644
--- a/media-plugins/vdr-vompserver/Manifest
+++ b/media-plugins/vdr-vompserver/Manifest
@@ -1,5 +1,7 @@
 AUX vdr-vompserver-0.4.1_c++11.patch 522 BLAKE2B 15a56f2f539665f3e5055994f5518c30bc94cd5a09a263e979a240f53eb1cc2134dee078d0eafa414ced7949191d3933a2c67401c9806113bea4c942fa4b231a SHA512 bd172ca5c8d24ed05be483e6f1dfe33b077e46907af44d8e21015c3f92eba387b874552ec9aa2a2f0daf1d8448e5a00f08d2548c0d0a0a27f6a1bf343595ea30
 DIST vdr-vompserver-0.4.1.tgz 87056 BLAKE2B a2106bc88407a198a218a003bb7973af8e96e5d367f7c6a86b95e802adfc9135dc2ede2534594284428acec418f22604ad49fe4ac245b37c0f51c5889a689cfe SHA512 79fbc311b48a752206842f21ec8d864df67aa7614f092b4e6a6623d732d4e053c2e35af7981aaed7d392f6510ebaac59f60640acae540e13c4f38cce04ddd1bd
+DIST vdr-vompserver-0.5.1.tgz 97156 BLAKE2B a4c122cd83eb9f228ec2acb53b3e4ca0774effdda85516d8af131d9d93b791d92e78373fc79c9260d6dc7961039acc452789b37e8a5f873bfb8293dc1123e40e SHA512 24c5c67c25889a62735ad473143246a99df72cc972ffa68989821214765cc16eb49e4057fd7e1987e7602afe631f07c6e3554499c768cfc45e3a030db105ce45
 EBUILD vdr-vompserver-0.4.1-r1.ebuild 903 BLAKE2B f0d93998228dc226f755ade90cbbc4eca2e8649ba535bb54fe487c35aa13dc1a991ee220c497cdabe0d962a4794eaa91b06bf9a091f63bbafa26edd9d392e179 SHA512 e6e847029ccdc5761d23368bc55448182442ec5c34a29ae8e541ad5c4392f5138de7f6b465c7a8a7de9c545eef085a9d4d8e1b19861d1bdd8c272b595cef1f6f
-EBUILD vdr-vompserver-0.4.1.ebuild 857 BLAKE2B 9b9c2dabda20dea653d5341d788efea57ea884f0c2e4eac326d27d6cb03cffb1dbdc8d119710d92b006b4fba920f23069c283f8b4580e948d5aa95724e9cbb4e SHA512 d4b6e63ea37f27aa01945a84d4fc283280fe7188bafafd967e759f5eeefd947997b178c8cac2e47c48783577e36a68a97b8286db767c7170eac8dff86d6dce8d
+EBUILD vdr-vompserver-0.4.1.ebuild 854 BLAKE2B 020a908ca53219ce24969cff4bbb0540c879bbf101631f1659e110846e5c3c2c7806f71146c536c126ec34bff564cf10918a3240154f2fe5a3331b1f17e9e1fb SHA512 bf552e032180bd3e5deae1bdbe7c6f22a9f599444e2cb59e04afd39f5705e3c44f81346fdf81b2d7adc1b25df852d85627d824d41f538fb6a7b8aabf4a33e48c
+EBUILD vdr-vompserver-0.5.1.ebuild 707 BLAKE2B 77d7b39df7cd54e8ece1ae976e7551e880f41d09fd828569e149c2a0bc7fcc0aac3f30f8c0e7336d1e3476cdc1d5cb5d424754f383ac6c5fb4337e25b1d37303 SHA512 df50d730f2360c87da3c0c8e211de96ceb54f58c7aa2d53772a2b820941555e263f49c4fe70851e6cdd9b15031435b73acf1b075c894c8e1edf36cfbb21ec48d
 MISC metadata.xml 463 BLAKE2B 9277a5c1b07bbd14380fab32ae4a95c62523dc07d432bcfb4ad8ae01ffcf3558f9d6873e3e0c6ab975e6a1c2bc81bce7c64acae4ee03840304236bf1a42aa141 SHA512 d1f13b57fbeb18dd49f3b5b22197e483d8d616f8723e3ac5b0102216c619beb1304ee21f0f15d7f0c3cf2e5f169cd52be1881dadad02d6f0c4cdd12e72315cdb
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild
index 4f5b50989fd2..b1a50c27fad8 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.5.1.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.5.1.ebuild
new file mode 100644
index 000000000000..c42150ece85b
--- /dev/null
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: server part for MediaMVP device"
+HOMEPAGE="http://www.loggytronic.com/vomp.php"
+SRC_URI="http://www.loggytronic.com/dl/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND=">=media-video/vdr-2.4.1"
+
+KEEP_I18NOBJECT="yes"
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /etc/vdr/plugins/vompserver
+	newins vomp.conf.sample vomp.conf
+	newins vomp-00-00-00-00-00-00.conf.sample vomp-00-00-00-00-00-00.conf
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	elog "\nHave a look to the VOMP sample files in /etc/vdr/plugins.\n"
+}
diff --git a/media-plugins/vdr-wapd/Manifest b/media-plugins/vdr-wapd/Manifest
index ec556b04e440..0b5ae9d967e0 100644
--- a/media-plugins/vdr-wapd/Manifest
+++ b/media-plugins/vdr-wapd/Manifest
@@ -8,7 +8,5 @@ AUX wapd.mk 2560 BLAKE2B d366cdef89b377bf82888758d77077c69bbc41413b33072922bf602
 AUX waphosts 234 BLAKE2B f5cb2d56b83508fdae9991a002f2d44b92a0a0332a931eab5b0c817ff79bfaa3a0547a022f5bfd794f8fbc26d2b187be159c73a59da3416aa3aff2817e348103 SHA512 f71b863e68a81f7e89c8fbf1b7cb96486f7a9d46d35b18a7b25cb59c931905a26cc279b23df7fbc869e6a335886e64ddcf58e45fdd41c6336727414af7aa2533
 DIST vdr-wapd-0.9.tgz 31975 BLAKE2B 5cef88fb6ea7582cfcdd76cb43c469aa99f10bec6db16abbcbdf596c889e41912dfe9c5344720a5e26634e50df0a4d3214e823e4fb97c4a3129419ecc99feec4 SHA512 787bc433896e01efb482507251f4a6cb878ce40b869625ff5b7177f64f4dba4b4dcffa648c39d1d8c1930da5fb98db9155ebc40ed349bf2093a5e10f7314f1dd
 DIST wapd-0.9-patch1.diff.gz 3091 BLAKE2B 53f9e0bf88a479cd7c3f09cdca4a87aa0988f02fdb2a0dc87a3745fd7d6230685d0c4796ddaafcaa2614efce5f6e8b07c6bbfa11aff93c0e1b2ad0006ca24357 SHA512 16dd9225bd0f40f668317ee8a957c0b113a261fe779931b546634fa8e09de3431359d7b8d3846b4781021438bcc660fc714bf17699dacc94af1fd16885a00450
-EBUILD vdr-wapd-0.9.ebuild 677 BLAKE2B be15349062f65a679f937ec431401380c308b8841618cc68adbc4761cca6fba19fcfc0ece50591c229a734944c4af8ef1e1b150dcdc5700b1b72fd1d4394e291 SHA512 fcb11aca660878111e54cd3f6a16b7928975672489ff40e30798c9e8b33af9d5fcc962624a0862b1ae5a481d8c29a90055496ecf46e663030d1e52293d0901f1
-EBUILD vdr-wapd-0.9_p1-r1.ebuild 1028 BLAKE2B 48490caad4ff631faf79803454d676af5aa3485a05cd0a298bd9d0c3665ad7b12cf8cad6770d3b5d01f5e859f8419f767cac11bedc1e672b0fc214ea082e2920 SHA512 92fc2c2afa12bac35e52c8a4c54d4a92320edcce78c57ec1209586338db8a9269f22a34fe48d445a01a099b8fd705c69519c3bbdcb4beaa983071170bf650570
-EBUILD vdr-wapd-0.9_p1.ebuild 886 BLAKE2B ac35cbc2d5807650fb98bc019e0ad6bea173f86be26f4b9d9ea19820826cd4e9f3115fced61d8ae7093842d569d711fd3c61956cc35b9606e719c330a8abf8b1 SHA512 8945548bcadf33f5285380e4ffefb75c5e30cd2c8f2aff2aa7ae71539e4801d9d17ccfbc309fa03f8c10690a4041e3c96e4de6f075589818ab7b2f2206b4bd8c
+EBUILD vdr-wapd-0.9_p1-r1.ebuild 980 BLAKE2B 88c53fe7c7c07dbd4b864581e8f490c416ecf979f7bdd4837f46f63982b0c9f0b475884830f4003b44dabe8c8504c7c434f59206d7353e0d1aa19ee30692e4f1 SHA512 79ef0f21d07f5e9bcba37355b495b50c3bab99fa15b8ce7e94cc92c71a49be46cb08b4050b0e818e08e8973d3cdb5ed478348608e5f4efde9d2df212f9013bfe
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-wapd/vdr-wapd-0.9.ebuild b/media-plugins/vdr-wapd/vdr-wapd-0.9.ebuild
deleted file mode 100644
index 7e7fd274897d..000000000000
--- a/media-plugins/vdr-wapd/vdr-wapd-0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: lets VDR listen to WAP requests to allow remote control by WML enabled browsers"
-HOMEPAGE="http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html"
-SRC_URI="http://www.heiligenmann.de/vdr/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.44"
-
-PATCHES=("${FILESDIR}/${P}_gcc-4.1.x.diff"
-	"${FILESDIR}/${P}-gentoo.diff")
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dobin "${S}/wappasswd"
-
-	insinto /etc/vdr/plugins/wapd
-	doins "${FILESDIR}"/{waphosts,wapaccess}
-}
diff --git a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild
index 56be4b687941..73a058020cfa 100644
--- a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild
+++ b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 MY_P="${PN}-${PV%_p*}"
 
-DESCRIPTION="VDR plugin: lets VDR listen to WAP requests to allow remote control by WML enabled browsers"
-HOMEPAGE="http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html"
+DESCRIPTION="VDR plugin: lets VDR listen to WAP requests on WML enabled browsers"
+HOMEPAGE="http://www.heiligenmann.de/"
 SRC_URI="http://www.heiligenmann.de/vdr/download/${MY_P}.tgz
-	http://www.heiligenmann.de/vdr/download/${MY_P#vdr-}-patch1.diff.gz"
+		http://www.heiligenmann.de/vdr/download/${MY_P#vdr-}-patch1.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild
deleted file mode 100644
index ad62d5d100d2..000000000000
--- a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-MY_P="${PN}-${PV%_p*}"
-
-DESCRIPTION="VDR plugin: lets VDR listen to WAP requests to allow remote control by WML enabled browsers"
-HOMEPAGE="http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html"
-SRC_URI="http://www.heiligenmann.de/vdr/download/${MY_P}.tgz
-	http://www.heiligenmann.de/vdr/download/${MY_P#vdr-}-patch1.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.44"
-
-PATCHES=("${FILESDIR}/${MY_P}_gcc-4.1.x.diff"
-	"${FILESDIR}/${MY_P}-gentoo.diff"
-	"${WORKDIR}/${MY_P#vdr-}-patch1.diff"
-	"${FILESDIR}/${MY_P}-as-needed.patch")
-
-S="${WORKDIR}/${MY_P#vdr-}"
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dobin "${S}/wappasswd"
-
-	insinto /etc/vdr/plugins/wapd
-	doins "${FILESDIR}"/{waphosts,wapaccess}
-}
diff --git a/media-plugins/vdr-wirbelscan/Manifest b/media-plugins/vdr-wirbelscan/Manifest
index 8b6040aa5330..8f297adea0fe 100644
--- a/media-plugins/vdr-wirbelscan/Manifest
+++ b/media-plugins/vdr-wirbelscan/Manifest
@@ -1,5 +1,7 @@
 AUX receiver-api-fixes.patch 2060 BLAKE2B 02ed94c3504b1989ebf061cef4904fae0e4dacc7fd4d6309c1893ef2d368516b3255fae5a78f54fcb687b0518d7c2acb308b404aa409f106f9c6ec0052d4899f SHA512 973afc96a1f0a162b90b91c8f2053dd538f0b5644c0295ade0398a1cfa0a03ccd938b2faca2a0bcfe75f9d8663b1f0e145afc28de14d0f3bf1626bb0132a30cc
 AUX wirbelscan.mk 3297 BLAKE2B 0b7d8676fc0791cbe877c3cec0d265afebe3be8daf52efb905f7c1ff3a2fd495cd57b4107afb33738e13f912e2e274a7a9516ff93a7bcc178bd9068c86aa15fc SHA512 a3a9e71d8e4da822cad2d9d747904f4fe505a500bc36a3b7312274bcde5dd66bab5dd346e8353de920eb9eec75c55d8e0ddc9ae9eaebca907cbfcd80d6e070cc
 DIST vdr-wirbelscan-0.0.7.tgz 149949 BLAKE2B b0b258b91bef493c352b8a2e7edec821b4046a7a6c2751ffe0e1deacd1ddcf3a563cc4051eee6424526903444952a0d489b8bca00533ba89a8214943948c76d9 SHA512 754b3089b1a8536b501fd8b62ddafedaf8304518856152a49b97149113929b47d6c6299b8eb4b78b2d3dc5aba147a3e21c00554ad02d2dc5018c296f6c55d6a5
-EBUILD vdr-wirbelscan-0.0.7-r1.ebuild 880 BLAKE2B f6764e3ade23f7c878ab01a70be52c538d5bc600b175ea16248086ecfe66451cbae5c9e58be9dbb8c27b3d52fd0fd5f6202956bedffb53581f651c23e3fc0fad SHA512 a3b6d298f952f8d787a588d095385e8fd86da2bbd11960ea35c06b661ddf964f62d654c5b5d96a596c0ac5e877f67134849f4118b6d9a91d504f79d5bbd80f4e
+DIST vdr-wirbelscan-2018.11.04.tar.gz 146140 BLAKE2B 067046dcd11837f2de5a44acce35cc1c58778b7cc110a69eb1f35e2c2e792a1dfac0f04dc50c230b0ee4940a3ed8bf8fe34484ba6cc988b7f7da59c361e2d1d8 SHA512 61d7109f47c3a1d87d520d3228b0737073762e877b9b08d2716337de071bdf7f8419ae5285a72c5e29e4c5081403edb2cb729adf6755a9e898a662af30a7b92c
+EBUILD vdr-wirbelscan-0.0.7-r1.ebuild 843 BLAKE2B b47b0f06eac3db375e82d9c7f88b4f15c473b79ef609ec98f19c27257428f528ea278dbb86d503286c782e3399aa667611c8654a5277add3c0392ac3c3242af0 SHA512 cfba3cc26f4a8f0999a902ce50f2a96c7ce2dfd96a490f810001fbe01915864a5dc76c81ed5653bf5b733cdfc764d77c9854dce557c95b8b9f6442fff567aa32
+EBUILD vdr-wirbelscan-2018.11.04.ebuild 836 BLAKE2B bb74fdd762063a0e4cdf1c5e2f716d319ba8132e57f3be9d649ce4b37c76a078cad32e5987b82404566d402796001e7e2027555c8593e956fda3bfaaae84ed3f SHA512 0799bc6a1a6401a7882d918212cd2bb172a7f9e7be9266fe8f39168242a5862056737d6d02c0b73fd7613be1024e7537d46c6d434778de45e1bb62721334b71b
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
index 5bdd8471ddc8..7920122c681b 100644
--- a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
+++ b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards"
-HOMEPAGE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
+HOMEPAGE="https://github.com/CvH/vdr-plugin-wirbelscan"
 SRC_URI="http://wirbel.htpc-forum.de/wirbelscan/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=media-video/vdr-2"
-RDEPEND="${DEPEND}"
 
 src_prepare() {
 	# remove untranslated po files
@@ -24,7 +22,7 @@ src_prepare() {
 	# new Makefile handling
 	cp "${FILESDIR}/wirbelscan.mk" "${S}/Makefile"
 
-	epatch "${FILESDIR}/receiver-api-fixes.patch"
+	eapply "${FILESDIR}/receiver-api-fixes.patch"
 
 	vdr-plugin-2_src_prepare
 
diff --git a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild
new file mode 100644
index 000000000000..e45baf07b3a5
--- /dev/null
+++ b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_VERSION="e1377b95312a138a41f93d7b06b3adb4ed4e7324"
+
+DESCRIPTION="VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards"
+HOMEPAGE="https://github.com/CvH/vdr-plugin-wirbelscan"
+SRC_URI="https://github.com/CvH/vdr-plugin-wirbelscan/archive/${GIT_VERSION}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-video/vdr-2.4"
+
+S="${WORKDIR}/vdr-plugin-wirbelscan-${GIT_VERSION}"
+
+src_prepare() {
+	# remove untranslated po files
+	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,es_ES,el_GR,et_EE,fi_FI,fr_FR,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include scanfilter.h
+	fix_vdr_libsi_include scanfilter.c
+}
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index e56d8e8e9a3e..73c211d89a2e 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,9 +1,8 @@
-AUX confd-1.0.0_pre6 856 BLAKE2B 2545bf913622d7043e7fe8d17bd0e1b3435801bc035598aff28287061c1eb3d3a14f3edc53156035ead91152dd9b5ab523882b6a35bea616637b6d8b5a478366 SHA512 67ab65984c2176edb7b3985b4a561bb41c8c529796d5cc44f559e275240c0c25bfee9e340744c7f25192de8a5231ff94f0bc87ace0edbb5b496846b0f8017fed
 AUX confd-2.0.0 1476 BLAKE2B a1f852cb07940ff54125d88bae9467e5068e66e903b4dcdbde295cb3aa89a49d92ff7e89632882ad8be59037ff44e1f6f1d6a4f53d7200024e0fe69b499da693 SHA512 8ab8b99e770dacbaadfc97ccc80f3d2c857bf95b662b9152959ccd88b940f4d2f7d2957ea4f6390f30470aca809cb3bb04b8b9e696122131fbb6d9f5d010f579
 AUX vdr-frontend 400 BLAKE2B 49713e916fbbf849517440d50343f4cedc6ffb7f65e44235df5706d4ef5881fbc92b657a0079f6c0ca9d93b3eb0fe582385b41c1d87b2dc835abd1783c723edb SHA512 e6ef3d51fa02290db8456c5b37f9a97f90557bb7943c1310ff2d8e77ee1beee3c98b1a6f012c9d97e048e3d7079b72cdeab9fa13e2a494bcb6dc58c2cd426e1f
 DIST vdr-xineliboutput-2.0.0.tgz 413085 BLAKE2B 85fffdbea51917035475863019095ed81bdda6e8e994c3d76b83433fca14cf680c64e268c04316199f6b707b5da7bf0ceafb991781ced552abebebf2e283fb5f SHA512 9410072bcd8ae71196e3417c12dc810da109f155748d58b3b0b422cd6d8cd29b3f8a7d0cbffada9dd22af679161ffeb096e952f620ed1c7f1122b46bf111f9ee
 DIST vdr-xineliboutput-2.1.0.tgz 415333 BLAKE2B 8311271dda889cde5ab69d5bf1f643c8f6b1991ca615ce6322ea5585aac12b07b32f6fd933bf6c3797d45971597e61d429e4d9de356246109cab7c8f059b4d79 SHA512 226654dcd47864e9df8282ef401509d291677587b2850872c535abb7bee468a7c6d72c30953090890d002f0977aa1ee357a0fe6938ce3f3c1b6324e82b926537
-EBUILD vdr-xineliboutput-2.0.0.ebuild 2960 BLAKE2B 8fa657edc879d8bb714622323caf29bbf51480be33df9808c481c5e2c2304dd5c6071e6e841a08548f3c353b5336b9eb28b7383a2ba3d82999e575b83c2134c1 SHA512 d994640eb60a8b701bd46d0c4e8bbf559cd82be6cbadc6a759e14ec75ce22e92df25a4982d1fefdc03873659d23cb432ec76d38f5019d79802d59a0fbe0cc441
-EBUILD vdr-xineliboutput-2.1.0.ebuild 3167 BLAKE2B a63b27f5452078abb4b44f3708adca30aaf5579117f07d1445c860ef83047d3437a0674a5274616993dd59496b78b1483d0f4f11b2b22b80616e65879813fe6d SHA512 e470953f353aa30ffd957c5329a90dd547231fca964c4981c38efee7b18f563ca4a1891dc4069627116f40f66f3e88563090e535fe132855a7e02e89a63e3130
-EBUILD vdr-xineliboutput-9999.ebuild 3334 BLAKE2B 1c0f32a978de1c52740d9971b6061ea37b55fa723d641739007a116f5030c944bcff01b6cd39f0a120c71de6730f574217055e91168fa12537f3798ba6d77c78 SHA512 5fa6e56ca18b8ce9950298d2fff76c54579a7373f1ac7a971b5a560cacd688b745f88e706822ce6da0c89a824482d35117b8cd78b4ee14b2327b0e2483a14dbe
+EBUILD vdr-xineliboutput-2.0.0.ebuild 2958 BLAKE2B 722234068e68881bce49d50e7715674165b83d65f87919e519622b2305fd74067aaa195f7d1697ae8f802c91842fcb1bbdfe94724b37b51247fbc31dce39d183 SHA512 aac5e4b0e527943451e87f2fd9eb0d9045971984b29f88487a3db7207b31e44cb72808bb7fdb9e8ae4fddf361216ff507a6e6961e77d3139522e30cc1eb884db
+EBUILD vdr-xineliboutput-2.1.0.ebuild 3168 BLAKE2B 11530d3e256e1c23f428e8d8fef34292aa6046ba0436d2fd4d4f2599f1ac05963eb584c0041aff07cbb3a84825cf02812d203ed2712b0677bca74e483d8be388 SHA512 968ec4d12ca108f657b6bac0352771e88e978ad0cc33c4cf84a5ab395c9e4baa5d74059cf2c031cdfc82e59e80eda5a230ee5c3ed4f1af99bcca6663fc877936
+EBUILD vdr-xineliboutput-9999.ebuild 3335 BLAKE2B dd251a11d5b4d1371ad03e35eff49ed746acc29789a8d7e67658c07f1a80729a3e07e2f250d73beb1b028ab8a6391a9d4f17274cbee15270dd07695a3e48d075 SHA512 16a1e737980e841b5722d21e4735a49c5a9ba6555e8affe876fd1f62cb1652d8fd4331e106603f21a1d58771c2f720211f8a1bc4973229825849aefd2fc283e3
 MISC metadata.xml 914 BLAKE2B 3066d82b14007277d69678a7765cc7fb3337c30a1796f7035f0f3572f169db13ed2a7fb4741c3fba245a5cbcdfab7bcfd6d730420d6263a87f590892f4d56973 SHA512 a51975de16515dec059a35494a2c74d13f70a0468395e711cf8c53b5c121b439a0a3b63c755ffcf6caba4ef6def4f927a307a46123f16adcbfa339e4feb921ec
diff --git a/media-plugins/vdr-xineliboutput/files/confd-1.0.0_pre6 b/media-plugins/vdr-xineliboutput/files/confd-1.0.0_pre6
deleted file mode 100644
index b4fab7ff9690..000000000000
--- a/media-plugins/vdr-xineliboutput/files/confd-1.0.0_pre6
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Usage examples (VDR plugin)
-#
-#  If no arguments are given, both X11 and framebuffer frontends are tried.
-#  First working frontend is used with best available video driver.
-#  Complete list of available command-line arguments can be obtained
-#  with "vdr --help".
-#
-#  Only local frontend, X11/Xv video, alsa audio:
-#    _EXTRAOPTS="--local=sxfe --video=xv --audio=alsa --noremote"
-#
-#  Only local frontend, (slow) X11 video, oss audio:
-#    _EXTRAOPTS="--local=sxfe --video=x11 --audio=oss --noremote"
-#
-#  Only local frontend, DirectFB: 
-#    _EXTRAOPTS="--local=fbfe --video=DirectFB --noremote"
-#
-#  Only remote frontend(s):
-#    _EXTRAOPTS="--local=none --remote=37890"
-#
-#  Local and remote frontends:
-#    _EXTRAOPTS="--local=sxfe --remote=37890"
-#  or
-#    _EXTRAOPTS="--local=fbfe --remote=37890"
-#
-#
-_EXTRAOPTS="--local=none --remote=37890"
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
index d594f721d335..349d81a244af 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
 
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
index 82652c7fe666..f157b6a17f74 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
 
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index d84cc0931176..a262a36247f1 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 EGIT_REPO_URI="https://git.code.sf.net/p/xineliboutput/git"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS=""
 IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
 
@@ -74,7 +74,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Allow user patches to be applied without modifyfing the ebuild
-	eaplly_user
+	eapply_user
 
 	vdr-plugin-2_src_prepare
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-plugins
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)