gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-plugins
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
314 files changed, 5339 insertions, 960 deletions
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index e4afd7653b53..dc4e4261df36 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/ams-lv2/Manifest b/media-plugins/ams-lv2/Manifest
index 3fc5bafa01e1..d7b1d5417b79 100644
--- a/media-plugins/ams-lv2/Manifest
+++ b/media-plugins/ams-lv2/Manifest
@@ -1,5 +1,5 @@
-DIST ams-lv2-1.1.0.tar.gz 217762 BLAKE2B 97320bf8314b3f8b208cc20db03511bd456e2268acf1d9453c494311fc00f0d1dc604ac12e9bef1429b1d9b75f93672a470aed4b2c0f7192036c4fff07e8f71d SHA512 4a994d21b9078ec84cbccc99d028a75a175bfc7a6648a7daf645da7877e2fda6a3ec31b351a01fa2ddf8f6a815f79e1dc1f9bf74ea8c5b82931076ceb645bf54
 DIST ams-lv2-1.2.1.tar.gz 233118 BLAKE2B 4ec5eca89c332405d9fe2b4c9bc25246f024cb9d629c1257d5dc6ad816fd45f4b7d7fea70f84a0715d7283022f348bcc1172d6ed9824f27d7e319dea308f4058 SHA512 216435bfc8620f7138791243dee60c27f7e3a38b972dcaba4150a47e1d8d53cec807246ace658b5136b45c43fd7e533df49f8b9bce8d40dc9d148121b9388886
-EBUILD ams-lv2-1.1.0.ebuild 802 BLAKE2B d639a39ac311395778b246060187f274f047bf1da4074950923beab789f3433d02ffe4ed04646ece271d5ade0332e81ce14a97c8ab02277af9285284999fbacd SHA512 50799271b847ee0997a4ce0ea0632938ae457c17ec5938b19c55e8320b13e911fa3a2924a7236049e04159e1d1e954b88ea286bafd04fc5533bb26901ef7cd3a
-EBUILD ams-lv2-1.2.1.ebuild 768 BLAKE2B 9dc0c768df4aab5cdfd09c0251480e98818306a1f8acbbaa278ac2a494b252da54696b99dae20339e156acfffbc7fd98bd81a849f53868a36f86b4d6a2057fde SHA512 a36a0dbc3fb602f217506b0b2c0800e802d0c151dcec3cba53b6bd8df8e21c8c805c21575b10bcde36494f88c2509d8f9c1d5b67d8766ac15e91283ded3ff3cc
+DIST ams-lv2-1.2.2.tar.gz 488234 BLAKE2B 1dfeaa2708bda64aadb00d8ec5f57fd3a7dd35a1fdce5fb2289f52f00fd73d25a11f39c91823c9322a5cd625ff369c4b05fd9de300b1635e172aefabb02825ea SHA512 6c1c6f3179a851f67e162d225a761c38678159d9f178d9bfa3991b84b84ea557f5a44882ea710626204f158c40ae18f0e87f24faec0a0bd6aa64e18eeb81c45f
+EBUILD ams-lv2-1.2.1.ebuild 754 BLAKE2B 58d243382d4c0af409e72ec88fde4936a4d2aa3f894e2aef8926f391d43d75b8ee029a410ccc65e2fdc19186262298fb13e0e435eadbd3be70108a9bea7433c1 SHA512 abc995b7147276b7ccc5629d6d2f30301e9f9bf750691c829b0749d276f1059ee5d340378155095454b7e0082d49b5304a0ddcbffbd489f2430a86a5f9099839
+EBUILD ams-lv2-1.2.2.ebuild 764 BLAKE2B 8e9954693290ed167f98796e81ac044eae2489fa80d94b7af7cb228aa234849529ea90e64023ecb4fed93a57afaf07b2e858334afba5fd40e123ff2d821eb45f SHA512 2364061ff3fc1c5ebe533675b482b3aa6a6bbb2de140da39dad5cbcd6422197cda633aa0ba73a2008b8122e92dc79c62a950dba8a355dfdae157711c8d872218
 MISC metadata.xml 350 BLAKE2B c86ae42bba6890c736a3d0713e5710adb317cf8d7270bc30f836e554a367d23b19d954c74174c97de60fdd2875f2bf473a75851f1de85889568c3926c78206f7 SHA512 ffbf5d59fc926a80abcb1d099bcffa5c89fe0fd1ea3fcc3a4ee0dcf431b705ad2cdc867f28961173c5b2c62490c3cdee3b0d9cc7ecf493b1f1be6511bc9f2c27
diff --git a/media-plugins/ams-lv2/ams-lv2-1.2.1.ebuild b/media-plugins/ams-lv2/ams-lv2-1.2.1.ebuild
index ffc95013c95b..8e968f561816 100644
--- a/media-plugins/ams-lv2/ams-lv2-1.2.1.ebuild
+++ b/media-plugins/ams-lv2/ams-lv2-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,12 +7,12 @@ PYTHON_REQ_USE="threads(+)"
 inherit waf-utils python-any-r1
 
 DESCRIPTION="A port of the AMS internal modules to LV2 plugins to create modular synthesizers"
-HOMEPAGE="https://objectivewave.wordpress.com/ams-lv2/"
+HOMEPAGE="https://github.com/blablack/ams-lv2"
 SRC_URI="https://github.com/blablack/ams-lv2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-cpp/gtkmm-2.24.0:2.4
diff --git a/media-plugins/ams-lv2/ams-lv2-1.1.0.ebuild b/media-plugins/ams-lv2/ams-lv2-1.2.2.ebuild
index badb755250c3..4bfd267c6c91 100644
--- a/media-plugins/ams-lv2/ams-lv2-1.1.0.ebuild
+++ b/media-plugins/ams-lv2/ams-lv2-1.2.2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 inherit waf-utils python-any-r1
 
 DESCRIPTION="A port of the AMS internal modules to LV2 plugins to create modular synthesizers"
-HOMEPAGE="https://objectivewave.wordpress.com/ams-lv2/"
-SRC_URI="https://github.com/blablack/ams-lv2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/blablack/ams-lv2"
+SRC_URI="https://github.com/blablack/ams-lv2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,10 +18,10 @@ IUSE=""
 RDEPEND=">=dev-cpp/gtkmm-2.24.0:2.4
 	>=media-libs/lv2-1.10.0
 	>=media-libs/lvtk-1.2.0[gtk2]
-	>=media-sound/jack-audio-connection-kit-0.120
 	>=sci-libs/fftw-3.3.3:3.0
 	>=x11-libs/cairo-1.10.0
-	>=x11-libs/gtk+-2.24:2"
+	>=x11-libs/gtk+-2.24:2
+	virtual/jack"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig"
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index ee2ecc99a083..7469cb561290 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,8 +1,6 @@
 DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3 SHA512 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
-DIST audacious-plugins-4.0.3.tar.bz2 1759123 BLAKE2B 7a389a1d8f1bc17ce53e4e8c2560291c00b305ca0988f7ee27ce8a15d4be200d380a3525d43d1c04f6de9d7653f73c91721ba985801dc49dfa64b56309145f9b SHA512 6aaf9ca1d70e211e779baa65de844118f2e3c5ecef2ce6342429748e64437ddc67286ea286fbd7b0282304747dab31972f73ccb0aa312968c19d832ac0e0a6fc
-DIST audacious-plugins-4.0.4.tar.bz2 1761281 BLAKE2B 36f77d19e2cac461cd5649589bc4cb19a76577c30d5de4015688da5bf21efe1c835e1160534bc377e9a6f495fc9c2650544cc6c7bafac61c2f7187991a4d7935 SHA512 d0b435658f5aff9318e521e85d335444e089f80a267c2b9391123365b1c95b535bfa668ea772d9c437ad2611288ec7961a2ecf1d8cf8687f3b32a3cb1e14ddf8
+DIST audacious-plugins-4.0.5.tar.bz2 1759133 BLAKE2B b806ac110875f94f6e0f1db757d2ec0c7a0391f83efeb068f3e79c7e994fa33d0045095669b5e7ec771714419aaa98b0d0125a5dd18a00f4ee23fc899142858f SHA512 90ab2edbfc797fa835aae9937b5f478a0ca575f31c443d9e8ba7394e1615f605beb417372872874c94d4f804dba7bea9fbae2078e162178386683d8a3e36c108
 EBUILD audacious-plugins-3.10.1-r3.ebuild 3849 BLAKE2B c829fdcb6a41aad4cf807ccf0719a1877789a06e1811fa64a574dad26838723cbafacf6645235417e2b68cecfeb2bb66b4a3d061816fcab8e554a8bc34a9c5c9 SHA512 7b5710f309e15c2e465531edf626238faa607369f2a46fb0b4defe3523286f04ae897c6016c0c4ff1f540e8701e7ee9ca15921840b32c8ae001257793b3dfd0d
-EBUILD audacious-plugins-4.0.3.ebuild 4145 BLAKE2B e05a4040a1c2f61f111ce4f4f3ef1e60c3e4594a292bc989dfc467fb8aefd2b30cfaca1576ef7ec582d1c851b89b75381e5a52a991809c75923629c5b3cd762c SHA512 5f6dae8d50a5a3641d27fa8edfe47b9fd5f56e05d984522a913c2211bc2885f45cc92a81ada71611220072166ec62122009804b086b6aeecfa898d68c2bc39de
-EBUILD audacious-plugins-4.0.4.ebuild 4070 BLAKE2B 720c0ce91402ad2fef3c60411eb675c09c173f2bd7fb50213ff244c86a1eb67713a8d8d4db7adebb1012465321659a623eeb83e98f6009e4d65e729a910c541b SHA512 7c84ea8b62ad9d9d570ce182ddf35391a547bb3a6990d536de157b08eeea4af2e2ffcd5fa8a707b701472d28f194eaefa182eb37b5d464daf3a5697c9124d3e8
+EBUILD audacious-plugins-4.0.5.ebuild 4068 BLAKE2B 468e953d5fbea584ae362fad99d08a011d10b463c7f22b327330b686b681da6f6a73d1a095c72b842088bd9b2de6c527870cee13282377f5d192e692c69e6230 SHA512 23cb363fd553122f519264d0f8fb1447d80248eb75fa6d9ed5a1e232a9a687dc23bd3df4f2416ae3e032cb4ab7ad40f32500c16006f63c63a4ac39e1b6931f9b
 EBUILD audacious-plugins-9999.ebuild 4128 BLAKE2B a4d64f7a16659e1cc4c939a9503756dfdc9f1297cdcf82e65204e768df1e6599596d4633ed2f2fdb406a01ca01c225ff73340051a92a81dcff63bc76a2b984d8 SHA512 c7c8861f1af4d563326ca9513101d48148c92fc0b90a545303cc8849e30debf689beb757dbb305f48606e3788832cb84dcda0af1a4e9511ae44ba0914ba7c3ac
-MISC metadata.xml 1251 BLAKE2B 1b67d43427b19c320e46b134c1780048def69a124aaa0c6d47ee1a55c7738a896cffae3a1f52fc2c5103d9d064fe6281d50f6bdcc839c046118b41b59f353d75 SHA512 145522b449bda87e294a0a63e95f4d12634695feea5d9d6f703079c9f742e7736cc232ecc7726e1d14740689b188ee473299d4fa5045e488f2fea5a4b4071d8e
+MISC metadata.xml 1170 BLAKE2B 80fb35c45bc273f65371a109969418bc8be28f23e2e5db6f78c0118b6c805975df1e689fc9c98ac47593e7da14546160a27c23a6534aa48ffdfc6a6323d0ad46 SHA512 b59877387bf2cdebdc227e0ca12b9b4cbfadaac816278d15e2ecde3e74f2a7af9d0af5d232972a311fdc7a0746b49136e60fc720c4fc4a86121e56c194a872a8
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
deleted file mode 100644
index 5dc53ffed93c..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame
-	libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio qtmedia
-	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack"
-REQUIRED_USE="
-	|| ( alsa jack pulseaudio qtmedia sdl )
-	ampache? ( http ) streamtuner? ( http )"
-
-# The following plugins REQUIRE a GUI build of audacious, because non-GUI
-# builds do NOT install the libaudgui library & headers.
-# Plugins without a configure option:
-#   alarm
-#   albumart
-#   delete-files
-#   ladspa
-#   playlist-manager
-#   search-tool
-#   skins
-#   vtx
-# Plugins with a configure option:
-#   glspectrum
-#   gtkui
-#   hotkey
-#   notify
-#   statusicon
-BDEPEND="
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	app-arch/unzip
-	dev-libs/dbus-glib
-	dev-libs/glib
-	dev-libs/libxml2:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	~media-sound/audacious-${PV}
-	aac? ( >=media-libs/faad2-2.7 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	ampache? ( =media-libs/ampache_browser-1* )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia:=
-		>=media-libs/libcddb-1.2.1
-	)
-	cue? ( media-libs/libcue:= )
-	ffmpeg? ( >=media-video/ffmpeg-0.7.3 )
-	flac? (
-		>=media-libs/flac-1.2.1-r1
-		>=media-libs/libvorbis-1.0
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	http? ( >=net-libs/neon-0.26.4 )
-	jack? (
-		>=media-libs/bio2jack-0.4
-		virtual/jack
-	)
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate:= )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	opengl? ( dev-qt/qtopengl:5 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl2[sound] )
-	sid? ( >=media-libs/libsidplayfp-1.0.0 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	soxr? ( media-libs/soxr )
-	speedpitch? ( media-libs/libsamplerate:= )
-	streamtuner? ( dev-qt/qtnetwork:5 )
-	vorbis? (
-		>=media-libs/libogg-1.1.3
-		>=media-libs/libvorbis-1.2.0
-	)
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-}
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
-	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-mpris2
-		--enable-qt
-		--enable-songchange
-		--disable-adplug # not packaged
-		--disable-gtk
-		--disable-openmpt # not packaged
-		--disable-oss4
-		--disable-coreaudio
-		--disable-sndio
-		$(use_enable aac)
-		$(use_enable alsa)
-		$(use_enable ampache)
-		$(use_enable bs2b)
-		$(use_enable cdda cdaudio)
-		$(use_enable cue)
-		$(use_enable flac)
-		$(use_enable flac filewriter)
-		$(use_enable fluidsynth amidiplug)
-		$(use_enable gme console)
-		$(use_enable http neon)
-		$(use_enable jack)
-		$(use_enable lame filewriter_mp3)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate resample)
-		$(use_enable lirc)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable mp3 mpg123)
-		$(use_enable nls)
-		$(use_enable opengl qtglspectrum)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qtmedia qtaudio)
-		$(use_enable scrobbler scrobbler2)
-		$(use_enable sdl sdlout)
-		$(use_enable sid)
-		$(use_enable sndfile)
-		$(use_enable soxr)
-		$(use_enable speedpitch)
-		$(use_enable streamtuner)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg ffmpeg)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.5.ebuild
index 76a54c61081b..e606a1dd99ad 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
 else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 30eb5c5c92d9..7ed1e8c94e0d 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
 		<flag name="gme">Support various gaming console music formats</flag>
 		<flag name="http">Support HTTP streams through neon</flag>
-		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Build with SoX Resampler support</flag>
diff --git a/media-plugins/caps-plugins/Manifest b/media-plugins/caps-plugins/Manifest
index de3b18358d6e..3d48a5343f79 100644
--- a/media-plugins/caps-plugins/Manifest
+++ b/media-plugins/caps-plugins/Manifest
@@ -1,5 +1,7 @@
 AUX caps-plugins-0.9.15-fix-c++14.patch 629 BLAKE2B 13b45c9448bbf1ea98c64ea008e004fed25a37fdae0961d3d73fd290f84ef98e7df3cc3f3d0d1ce8654570a14dcc3c7af0eccb5152273d3b0cb52e72bd567bac SHA512 f99ca7fb9244e0050b70df06103eda150a44d0e2a605642482afbbbfa3a2c06ea435a0289d08e533c27bb4be215b627e93566aa7b1d28d78b0d108aa42b5efc1
 AUX caps-plugins-0.9.24-glibc-2.27.patch 1057 BLAKE2B a61ffcef55d43664c4fb35137e98aae112e77aa04cc79ba7cb2883232e1c7e11d31289cc29a3200ed0a5a56af5b34040160b108f4b40d6f9b9d88ab698fe0beb SHA512 27b508094daedf4e1526b43ffdbb58b681ff52b41d58c2eccf061af5a492cd24741bbc871981927f4d11409e276bd5892c20184796d05fb13e4437ece16e80dc
 DIST caps_0.9.24.tar.bz2 181200 BLAKE2B a26ffd543696de11d1a21d4049944df64540cfe01c138e06815c84dc01e5541ad02c7d1ead1bf46a6296ad450acbe6ba30a8083850afcd697c05cf0f05ac4d3c SHA512 051d59c50302e45cec011a573385665e96b3bb0b6f0328e6b1e4f8fa26515d5cb4c2cc8230ea5bd242b1b8f62c86545997da2ab995e953a89d8de715807fc20d
+DIST caps_0.9.26.tar.bz2 182334 BLAKE2B 3ab75dc1ab6c5ecebe7c4983f5eb8e540396f7bacba147e1f2877c4e3e699c62d1f6af36af16eb9feac537acd9946eec40c3c90de59f6e740f6ce04c8bc0fa71 SHA512 ce9a7219ef0c6c33a5debb407e9b6ea7432c3f50ab32c1915cf91c40cda541a812da887bf57ee536d653195158939889c4baf5fcbe3ded551abc676517e1da7a
 EBUILD caps-plugins-0.9.24.ebuild 930 BLAKE2B ddf6bc2bc5120357944e5252ebe002b3a59367e086082957bbd770789605d920f1bcb138704f0ceabe1c26b17c854f30713b6dfcf61ce8f53ccab8b2897f655c SHA512 5238058fb7895ce82279a21ced457b5a925926324c8dc2c359ef93fc3522990b43ce1b9361afba22d191aa8d3b202181c085ae7972fadca89b9387eb905a2996
+EBUILD caps-plugins-0.9.26.ebuild 825 BLAKE2B d88e49a57e8adfc026495dc6cfcb0f6262ae6c9ecf2f357595454df57908983b75f6425a539d538c2b76ff16523912af75cfd473caeda29825ad33cea8f75d5b SHA512 7c00959db54d86721ab0a271bade77624b9eb70bf06e24f498ea38c6d4eac6396514ec2d79f722d3b2ddfa26e03085a2c0b5d4957362224943c0ddcb6b505fa9
 MISC metadata.xml 513 BLAKE2B de96870c0cc0d4aee45493a502939900d8cd603effacae05b65ceceda7ec121c6e63e1740c2a69d20f2244fd82656516d4f83e0c50a8e2d81ac8d262cd1c4790 SHA512 d528c2eaf9dc0a9a243ed3ec6ceb80a1ce72f4d5f144c2b7c9917d3a84914e896926bdf2c443ae113ccec7c83f37e4c8b284db9af48962f82b7b67f0a95b272e
diff --git a/media-plugins/caps-plugins/caps-plugins-0.9.26.ebuild b/media-plugins/caps-plugins/caps-plugins-0.9.26.ebuild
new file mode 100644
index 000000000000..2baf70547064
--- /dev/null
+++ b/media-plugins/caps-plugins/caps-plugins-0.9.26.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+MY_P=caps-${PV}
+
+DESCRIPTION="The CAPS Audio Plugin Suite - LADSPA plugin suite"
+HOMEPAGE="http://quitte.de/dsp/caps.html"
+SRC_URI="http://quitte.de/dsp/caps_${PV}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		ARCH="" \
+		CC="$(tc-getCXX)" \
+		CFLAGS="${CXXFLAGS} -fPIC -DPIC" \
+		_LDFLAGS="-shared ${LDFLAGS}"
+}
+
+multilib_src_install() {
+	insinto /usr/$(get_libdir)/ladspa
+	insopts -m0755
+	doins *.so
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/ladspa/rdf
+	insopts -m0644
+	doins *.rdf
+}
diff --git a/media-plugins/cmt-plugins/Manifest b/media-plugins/cmt-plugins/Manifest
new file mode 100644
index 000000000000..52b833a6874f
--- /dev/null
+++ b/media-plugins/cmt-plugins/Manifest
@@ -0,0 +1,12 @@
+AUX cmt-plugins-1.16-darwin.patch 316 BLAKE2B 898372b2a5a4a621758209adeb4d96185a5dd0dcd3cfec57bbc0cce4798f4a78b12eaf2e1bb9ec96b61457099bdea4a5cf2883a58ea17f38101829b45a7ccf17 SHA512 1a73be4184681fff4f6827fa47508d8177c1fccb492b66ad89638a5c4725fcc828545b225db6b38eb6971aefe7eef92edee4f6b3a7013365eb60010935db1497
+AUX cmt-plugins-1.16-mallocstdlib.patch 1992 BLAKE2B 0b1703227bb3d413fad609519a8c1555f2173684ec9b7f32e5d62d51877a8c98b52542c7e2321181b1b00d2d49fa41aab3f8a82b54827254bc9b3c14fa5cfaa8 SHA512 6b099ad314f4c2c3048a3b8e171d36bdf8dbca277989270666779881e02d1f9ba5b4027e5b1676c2092eca19221cd4f3d46789b4dcf7bdee0ab57e5e51d769e7
+AUX cmt-plugins-1.16-respect-ldflags.patch 369 BLAKE2B 4d64564551d56b9aad53e019c4b217f5d4e1fefdfce60995294783a74825a7bf356aab5ae48d5e4d83751e1fdd33e96fb2e814eb057a0a756ca28f9d7d13ee12 SHA512 3f4cfdab23de0b2fa2c841c4699a2f975b526575261f29756cdb3e9515dd7629e34bf847d027a305e32a9489e414dd59efd55e18a368f3ffc928ce86f80a5add
+AUX cmt-plugins-1.16-sa.patch 666 BLAKE2B de5b533d76cece9d5ffb93ae9956218bd090ee0f5b88afa8eca3ca9d435af401e472831f1e91c954719eb7c59057464057ed17bd7ffb9d93829d21aed39f20f1 SHA512 162791653741af546a64cabd74f8737f965c9e8799a1d80ae5d2b292b200b1710702b901aaf759457b7737530f2b03824cd135150329f60a2aa56011f17fd244
+AUX cmt-plugins-1.17-darwin.patch 361 BLAKE2B 64947385e7a1cb3cad87ff8036bd7b3c094cc432ad38fb279e971fbe914541e27329e7077d81f7ae89984aa833828edaad062793bbd2088228999df34f615652 SHA512 fb73ae2fe2c48e9235e5a9fc584dd4018792d94985706b41035c0dffbab99619bf9791f4a9da785f994b4488b3f05b99b64913242ed3357bf74a3a0b78bb5490
+AUX cmt-plugins-1.17-makefile.patch 845 BLAKE2B f2ae6fbc954ea1f40e4da1e320b89cd8e6b8478217a905dab9c0cebadb28a3ed2f22cac977b4a3233f78e0c9bd0b2f5057b3da203c2fd93d65b8c3c76b6058af SHA512 0cf21f829757000196555211ff65753e2f43716847905ef96ae9f0d44d71e7cfaca6049fe01ef20f557f3adbaa908cdcba087c84ae530351687a9c2efe122c20
+AUX cmt.rdf 3943 BLAKE2B e45e6b1e25a8be51d687e0eb931e62bba4a2c821bb35e7784077983df8b66b3b5f9a9497df19588acf68ab2f55a28a50c1cc392fcdc58651befda54f8e60edc3 SHA512 265bb9ed2cff657a2698dc1182bb3079a6d3f70a6db86aa20cfc992b5cf54a341a65f9af278630671c3657dc730de85a0b95caae785893412ad5659a195b820c
+DIST cmt_1.17.tgz 64070 BLAKE2B 903b540f0232e34dadb4683f5fe2478a0124dd1864c49868f8d5db4742cd89e55600c1b7aadea56b04b831b528b8930c472c2d05149b00e81cec503c69dc9c87 SHA512 7df31a44c41622785b569ef79bef91cba098fed89ca65dcb31b9fdd751caff863cf42eb7ca2ffab08e883fbcd040ab1c7290a96abf58e908be44ab803d672e26
+DIST cmt_src_1.16.tgz 63909 BLAKE2B b476b701f63125a11e2f03cb837552ddf26beba0c897873959c2577f3d897866bea0dccb480e4fcb0462a0ffea4d380b5a99998b082a46f7222049d2d2db4c9f SHA512 be4aaa064183b6121b4ca8d7d2535cb9a3bcb557e3a2f22b45ec9775b0e296f70a9a7edf697b78095d6ef1564bb5459bb742649082ac724d1774c0790379af21
+EBUILD cmt-plugins-1.16-r4.ebuild 1366 BLAKE2B 59909e4d1eb09213596a1e19816da22722da63d4e727a50129a4e0f12cbda914f68e2d41fb7a5799f2f0b72e2cd4ff42ddee4aaf1a98c6f1783f7eef40a3531f SHA512 9c9b370721a00fb0290b4a12dddc54e116e009cb9b19ad268242ba518a0ce63d0f08527246eb6d5b6ab1a5503782b47adb5ba42bb39e9dddb72f12835c5c56a5
+EBUILD cmt-plugins-1.17-r1.ebuild 1030 BLAKE2B b3d4d1256b83925a3eeda60200c3b083e7a0e492e6e0b02e224c8f54b8801c50bf98fb07f2e119f5e4677a55ae637a672c84daa2fe7e7e88eb091aebddc97351 SHA512 c082df57c6426f88ded1c4c4e12df2a86efd9362cee6f4c8a7f4e7a767fc75bb79b7643b5ab73428ff4ea100f68702130c6d51784b11f4080a5359f560846d21
+MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-plugins/cmt-plugins/cmt-plugins-1.16-r4.ebuild b/media-plugins/cmt-plugins/cmt-plugins-1.16-r4.ebuild
new file mode 100644
index 000000000000..73484d26bbeb
--- /dev/null
+++ b/media-plugins/cmt-plugins/cmt-plugins-1.16-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs multilib-minimal
+
+S="${WORKDIR}/cmt/src"
+MY_P="cmt_src_${PV}"
+
+DESCRIPTION="CMT (computer music toolkit) LADSPA library plugins"
+HOMEPAGE="http://www.ladspa.org/"
+SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
+RDEPEND=""
+
+src_prepare() {
+	sed -i \
+		-e "/^CFLAGS/ s/-O3/${CFLAGS}/" \
+		-e 's|/usr/local/include||g' \
+		-e 's|/usr/local/lib||g' makefile \
+			|| die "sed makefile failed"
+	sed -i -e "s/^CXXFLAGS*/CXXFLAGS = ${CXXFLAGS} \$(INCLUDES) -Wall -fPIC\n#/" \
+		"${S}/makefile" || die "sed makefile failed (CXXFLAGS)"
+
+	cd "${S}" || die
+	epatch "${FILESDIR}/${P}-mallocstdlib.patch"
+	epatch "${FILESDIR}/${P}-respect-ldflags.patch"
+	epatch "${FILESDIR}/${P}-sa.patch"
+	use elibc_Darwin && epatch "${FILESDIR}/${P}-darwin.patch"
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CXX
+	emake PLUGIN_LIB="cmt.so"
+}
+
+multilib_src_install() {
+	insopts -m755
+	insinto /usr/$(get_libdir)/ladspa
+	doins *.so
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/ladspa/rdf/
+	doins "${FILESDIR}/cmt.rdf"
+
+	dodoc ../README
+	dohtml ../doc/*
+}
diff --git a/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild b/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
new file mode 100644
index 000000000000..9ef01406f196
--- /dev/null
+++ b/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib toolchain-funcs multilib-minimal
+
+MY_P="cmt_${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="CMT (computer music toolkit) LADSPA library plugins"
+HOMEPAGE="http://www.ladspa.org/"
+SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+DOCS="../README"
+HTML_DOCS="../doc/*"
+
+src_prepare() {
+	default
+
+	use elibc_Darwin && eapply "${FILESDIR}/${P}-darwin.patch"
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	cd src
+	tc-export CXX
+	emake PLUGIN_LIB="cmt.so"
+}
+
+multilib_src_install() {
+	cd src
+	insopts -m755
+	insinto /usr/$(get_libdir)/ladspa
+	doins *.so
+}
+
+multilib_src_install_all() {
+	cd src
+	insinto /usr/share/ladspa/rdf/
+	doins "${FILESDIR}/cmt.rdf"
+
+	einstalldocs
+}
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-darwin.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-darwin.patch
new file mode 100644
index 000000000000..f4352bfdcb91
--- /dev/null
+++ b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-darwin.patch
@@ -0,0 +1,12 @@
+diff -u src-org/makefile src/makefile
+--- src-org/makefile	Thu Oct 28 19:22:56 2004
++++ src/makefile	Thu Oct 28 19:28:16 2004
+@@ -68,7 +68,7 @@
+ targets:	$(PLUGIN_LIB)
+ 
+ $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
+-	$(CXX)	-shared							\
++	$(CXX)	-dynamiclib -ldl						\
+ 		-o $(PLUGIN_LIB)					\
+ 		$(PLUGIN_OBJECTS)					
+ 
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-mallocstdlib.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-mallocstdlib.patch
new file mode 100644
index 000000000000..f4e7663282c6
--- /dev/null
+++ b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-mallocstdlib.patch
@@ -0,0 +1,75 @@
+Index: cmt/src/analogue.cpp
+===================================================================
+--- cmt.orig/src/analogue.cpp
++++ cmt/src/analogue.cpp
+@@ -24,7 +24,6 @@
+ 
+ /*****************************************************************************/
+ 
+-#include <malloc.h>
+ #include <math.h>
+ #include <stdlib.h>
+ #include "cmt.h"
+Index: cmt/src/canyondelay.cpp
+===================================================================
+--- cmt.orig/src/canyondelay.cpp
++++ cmt/src/canyondelay.cpp
+@@ -25,7 +25,7 @@
+ /*****************************************************************************/
+ 
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include "cmt.h"
+ 
+Index: cmt/src/lofi.cpp
+===================================================================
+--- cmt.orig/src/lofi.cpp
++++ cmt/src/lofi.cpp
+@@ -24,7 +24,6 @@
+ 
+ /*****************************************************************************/
+ 
+-#include <malloc.h>
+ #include <math.h>
+ #include <stdlib.h>
+ #include "cmt.h"
+Index: cmt/src/phasemod.cpp
+===================================================================
+--- cmt.orig/src/phasemod.cpp
++++ cmt/src/phasemod.cpp
+@@ -24,7 +24,6 @@
+ 
+ /*****************************************************************************/
+ 
+-#include <malloc.h>
+ #include <math.h>
+ #include <stdlib.h>
+ #include "cmt.h"
+Index: cmt/src/syndrum.cpp
+===================================================================
+--- cmt.orig/src/syndrum.cpp
++++ cmt/src/syndrum.cpp
+@@ -24,7 +24,7 @@
+ 
+ /*****************************************************************************/
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include "cmt.h"
+ 
+Index: cmt/src/vcf303.cpp
+===================================================================
+--- cmt.orig/src/vcf303.cpp
++++ cmt/src/vcf303.cpp
+@@ -26,7 +26,7 @@
+ /*****************************************************************************/
+ 
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include "cmt.h"
+ 
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-respect-ldflags.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-respect-ldflags.patch
new file mode 100644
index 000000000000..e851c2a781ed
--- /dev/null
+++ b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-respect-ldflags.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/show_bug.cgi?id=334711
+
+--- cmt/src/makefile.old	2010-09-13 16:43:26.000000000 +0100
++++ cmt/src/makefile	2010-09-13 16:45:08.000000000 +0100
+@@ -66,7 +66,8 @@
+ targets:	$(PLUGIN_LIB)
+ 
+ $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
+-	$(CXX)	-shared							\
++	$(CXX)	$(LDFLAGS)						\
++		-shared							\
+ 		-o $(PLUGIN_LIB)					\
+ 		$(PLUGIN_OBJECTS)					
+ 
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-sa.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-sa.patch
new file mode 100644
index 000000000000..161c06d27eed
--- /dev/null
+++ b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-sa.patch
@@ -0,0 +1,18 @@
+Fix strict aliasing warnings: reeverb/Components/allpass.h:36:2: warning:
+dereferencing type-punned pointer will break strict-aliasing rules
+
+https://bugs.gentoo.org/show_bug.cgi?id=307563
+
+Index: cmt/src/freeverb/Components/denormals.h
+===================================================================
+--- cmt.orig/src/freeverb/Components/denormals.h
++++ cmt/src/freeverb/Components/denormals.h
+@@ -8,7 +8,7 @@
+ #ifndef _denormals_
+ #define _denormals_
+ 
+-#define undenormalise(sample) if(((*(unsigned int*)&sample)&0x7f800000)==0) sample=0.0f
++#define undenormalise(sample) if((((unsigned int)sample)&0x7f800000)==0) sample=0.0f
+ 
+ #endif//_denormals_
+ 
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.17-darwin.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-darwin.patch
new file mode 100644
index 000000000000..ab2733373f01
--- /dev/null
+++ b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-darwin.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index ec6a524..700ff75 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -67,7 +67,7 @@ targets:	$(PLUGIN_LIB)
+ 
+ $(PLUGIN_LIB):	$(PLUGIN_OBJECTS) gcc_exports.map
+ 	$(CXX)	$(LDFLAGS)						\
+-		-shared							\
++		-dynamiclib -ldl							\
+ 		$(CFLAGS)						\
+ 		-fvisibility=hidden					\
+ 		-fvisibility-inlines-hidden				\
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch
new file mode 100644
index 000000000000..ca76e859b5f7
--- /dev/null
+++ b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch
@@ -0,0 +1,34 @@
+diff --git a/src/Makefile b/src/Makefile
+index 159dd46..5c2c0f4 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -11,8 +11,6 @@ INSTALL_PLUGINS_DIR	=	/usr/lib/ladspa/
+ # GENERAL
+ #
+ 
+-CFLAGS		=	$(INCLUDES) -Wall -Werror -O2 -fPIC
+-CXXFLAGS	=	$(CFLAGS)
+ PLUGIN_LIB	=	../plugins/cmt.so
+ 
+ ###############################################################################
+@@ -63,14 +61,18 @@ PLUGIN_OBJECTS	=							\
+ 
+ plugin:	$(PLUGIN_LIB)
+ 
++%.o: %.cpp
++	$(CXX) $(INCLUDES) $(CFLAGS) -c -o $*.o $*.cpp
++
++
+ targets:	$(PLUGIN_LIB)
+ 
+ $(PLUGIN_LIB):	$(PLUGIN_OBJECTS) gcc_exports.map
+-	$(CXX)	-shared							\
++	$(CXX)	$(LDFLAGS)						\
++		-shared							\
+ 		$(CFLAGS)						\
+ 		-fvisibility=hidden					\
+ 		-fvisibility-inlines-hidden				\
+-		-s							\
+ 		-Wl,--version-script=gcc_exports.map			\
+ 		-o $(PLUGIN_LIB)					\
+ 		$(PLUGIN_OBJECTS)					
diff --git a/media-plugins/cmt-plugins/files/cmt.rdf b/media-plugins/cmt-plugins/files/cmt.rdf
new file mode 100644
index 000000000000..c63fd9249a1b
--- /dev/null
+++ b/media-plugins/cmt-plugins/files/cmt.rdf
@@ -0,0 +1,91 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE rdf:RDF [
+        <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+        <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
+        <!ENTITY dc 'http://purl.org/dc/elements/1.1/'>
+        <!ENTITY ladspa 'http://ladspa.org/ontology#'>
+]>
+<rdf:RDF xmlns:rdf="&rdf;"
+         xmlns:rdfs="&rdfs;"
+         xmlns:dc="&dc;"
+         xmlns:ladspa="&ladspa;">
+
+  <!-- New classes needed by CMT -->
+  <rdfs:Class rdf:about="&ladspa;AmbisonicPlugin" ladspa:hasLabel="Ambisonic">
+    <rdfs:subClassOf rdf:resource="&ladspa;UtilityPlugin" />
+  </rdfs:Class>
+
+  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1092"/>
+  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1091"/>
+  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1090"/>
+  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1093"/>
+  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1087"/>
+  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1094"/>
+  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1089"/>
+  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1088"/>
+
+  <ladspa:AmplifierPlugin rdf:about="&ladspa;1067"/>
+  <ladspa:AmplifierPlugin rdf:about="&ladspa;1068"/>
+  <ladspa:ModulatorPlugin rdf:about="&ladspa;1070"/>
+
+  <ladspa:DistortionPlugin rdf:about="&ladspa;1846"/>
+  <ladspa:DistortionPlugin rdf:about="&ladspa;1227"/>
+  <ladspa:WaveshaperPlugin rdf:about="&ladspa;1097"/>
+
+  <ladspa:DelayPlugin rdf:about="&ladspa;1225"/>
+  <ladspa:DelayPlugin rdf:about="&ladspa;1053"/>
+  <ladspa:DelayPlugin rdf:about="&ladspa;1054"/>
+  <ladspa:DelayPlugin rdf:about="&ladspa;1055"/>
+  <ladspa:DelayPlugin rdf:about="&ladspa;1056"/>
+  <ladspa:DelayPlugin rdf:about="&ladspa;1057"/>
+  <ladspa:DelayPlugin rdf:about="&ladspa;1058"/>
+  <ladspa:DelayPlugin rdf:about="&ladspa;1059"/>
+  <ladspa:DelayPlugin rdf:about="&ladspa;1060"/>
+  <ladspa:DelayPlugin rdf:about="&ladspa;1061"/>
+  <ladspa:DelayPlugin rdf:about="&ladspa;1062"/>
+
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1080"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1081"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1078"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1079"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1098"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1099"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1849"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1071"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1083"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1084"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1085"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1086"/>
+  <ladspa:UtilityPlugin rdf:about="&ladspa;1082"/>
+
+  <ladspa:ReverbPlugin rdf:about="&ladspa;1123"/>
+
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1221"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1096"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1069"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1222"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1226"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1841"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1844"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1843"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1063"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1064"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1065"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1066"/>
+  <ladspa:GeneratorPlugin rdf:about="&ladspa;1223"/>
+
+  <ladspa:GatePlugin rdf:about="&ladspa;1845"/>
+  <ladspa:LimiterPlugin rdf:about="&ladspa;1848"/>
+  <ladspa:LimiterPlugin rdf:about="&ladspa;1842"/>
+  <ladspa:LimiterPlugin rdf:about="&ladspa;1076"/>
+  <ladspa:LimiterPlugin rdf:about="&ladspa;1077"/>
+  <ladspa:CompressorPlugin rdf:about="&ladspa;1072"/>
+  <ladspa:CompressorPlugin rdf:about="&ladspa;1073"/>
+  <ladspa:ExpanderPlugin rdf:about="&ladspa;1074"/>
+  <ladspa:ExpanderPlugin rdf:about="&ladspa;1075"/>
+
+  <ladspa:LowpassPlugin rdf:about="&ladspa;1051"/>
+  <ladspa:LowpassPlugin rdf:about="&ladspa;1224"/>
+  <ladspa:HighpassPlugin rdf:about="&ladspa;1052"/>
+
+</rdf:RDF>
diff --git a/media-plugins/cmt-plugins/metadata.xml b/media-plugins/cmt-plugins/metadata.xml
new file mode 100644
index 000000000000..f79bb67acbd9
--- /dev/null
+++ b/media-plugins/cmt-plugins/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index be5d3eb398c3..c6b8926473d9 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.11.tar.xz 1449408 BLAKE2B 8ed9bd49f779eadb486a13be3bbdee0df797ebffb7833eaf2632cbb6fac90b33e2f3c92223c7e6d268257aabd710e0b9fd6c8e9395bfae776990a64e7537b41a SHA512 eefeabf333568d06ce77ba865f2dc96592428ae41c459f51e2ea7f37914c2b3d52778e5548b7d49059f1e4b83c8c07e5a8798272c5ced0259de1900d9e3f6991
-DIST grilo-plugins-0.3.9.tar.xz 1418148 BLAKE2B 438aac490f2e099c40f5df15d8b3958dc29c4344e4846a3ff452561f60bf041fe2975b6c67b634f5f54721fd69e53f86c5008eadb3a402cbc8b479e805ab8221 SHA512 4700b08cab53afe0899edf7859a2e18608f6ed2016a9139694e8f1eb628c5b7318b04fe1633406fd1685a8dd54d1632b886352eac3192d52a1c1a1ac55896479
 EBUILD grilo-plugins-0.3.11.ebuild 2984 BLAKE2B e8a9e012cce22692ca8d7861f51b48fec217088306fdec1d5bc193a328f9559c42f0123faf4e531cb13cd21e9e5a4f6c9a822013b15dc75ce361b7d2138f4589 SHA512 30a0c52cce8e919de20d4ea0332b75b075853d1c001912b8edcd3affb630925268306fbda99ef82db1513d6885e888e0908e30977a60122161926f23053160f6
-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.9.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
deleted file mode 100644
index 10527d60d629..000000000000
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,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.8:${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}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	upnp-av? ( >=dev-util/gdbus-codegen-2.44 )
-	virtual/pkgconfig
-	lua? ( dev-util/gperf )
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.3.8-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/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index b1fae9def073..36a68c144b98 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-a52dec-1.14.3.ebuild 443 BLAKE2B d0286a3b2f42fdafb69337c992ed8a231c0e5a8de9b7de572727474150e75c8fac8abf655eaef2576911f9b824b4655400293b354d7daa49fc83e37b16b669cd SHA512 81c5ddffca77dc295cfa49861508248aa23283f1dbc958ff11918efa6cfaddcc89843faa45c4618a01840ae361bd6379996d54e482f1c4f260564d8556b7ec97
-EBUILD gst-plugins-a52dec-1.16.2.ebuild 446 BLAKE2B 76875ea22ffd6937ad9139ba6fb73d4fdc464009c83a801462d80306448cc767a57dfe033306d9da9b39e82e1a611c5157f66d554282bdb188761a2539e10ba4 SHA512 cc6f10077c99525f42f7e1cdb57bd5248ea7c951b5100559980aec114e04ba1cad5d5de6c5c427b57440236def4874dd46cafd5452b8ee8b8dd245a298ba6ac2
+EBUILD gst-plugins-a52dec-1.16.2.ebuild 445 BLAKE2B f6c00efbd3d9c0d5a5745dd912dc2bea9ae404d7365646883bb4dc5418eed49b0c01d14b12f07f3623e3d58595066fac600788b63038726afde1fc8e3720d3d0 SHA512 6e4b9f6354ae76d451c4b1cc9a65106458b8c41abefd1e408a6638bfbb1211516ca09be5602a75cdc6b67322b5ce448c1bfd404ebad867a5af790ad596e83442
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild
index d54499f4a7a4..fbedc9f2d130 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="ATSC A/52 audio 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="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index d526f91d0809..478c0369c144 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-assrender-1.14.5.ebuild 398 BLAKE2B 26d6e39579c44a31c96892a409a39d464e1c6ebb99fcc1ddbea24e9f8612a09104c277276328518303d546ed38a6663911cdc4c427c3a89db4a79dd458d1adf3 SHA512 3f86d5cdd0d9dac391414cb6cb76512fc0b34635b928f84101322f00250e7b367fcaf9bb66e2ca2200b1ce913c2709b221c452a516953279aefabdfc0a566fab
-EBUILD gst-plugins-assrender-1.16.2.ebuild 401 BLAKE2B 372b00a5a8a75d3dcf07145c351eb0bf76f587ca66642db709409d1f8c080807795368c61338f225ef50ed426f283d7272b15e58019c2f1e99182f022bb53cb1 SHA512 d1cc6821be4dcfeedb03b76c0b21d6c77937bb5f5027d41e740d22a33bd5f1a262f0c0e5fc960432c9d8e597b4f216cff998d05950b0b5a6da32b0469fbffe79
+EBUILD gst-plugins-assrender-1.16.2.ebuild 400 BLAKE2B 352db0e92335f7a2f5cb86d5bd71a6db12b9ef7bdd8f018276325726a1206702993d939d74ba9b764b3ff02b27ebfc0cfaf557f52100a4cb9abdbe05d9bfaec1 SHA512 15d336218d72161bd014cefa35e39830e5bea5e89d7df8ea997d9b4184fecafffa10be3f82281f9181946ea1b4aca46d40773e3421be4f291c8f7916491b4933
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild
index 2c15f3b2696c..ae79abd8ad84 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.16.2.ebuild
@@ -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-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index f560e5608827..267451f28936 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
 EBUILD gst-plugins-cdparanoia-1.14.5.ebuild 475 BLAKE2B 2734efd3661b6453e9625a08777c555cbb618ed14a11772dbc7398ffe55c3f0e982435fe4da9fcdf1233baa459e4b0b43610e5c1466adecf68068ba670f6dae9 SHA512 d7da322158b303b68f726b061415665ace907e1bbfd405736870e23099c7049663b1362cf4309b97bbc617d69d1b05ac75e446a7a2b022b4f0055097b7e36694
-EBUILD gst-plugins-cdparanoia-1.16.2.ebuild 478 BLAKE2B 5ef016e18ff1d0540277fd116741a7b1be7d5e686f05690fb860aff6708ff33cd41762b5228a1221ec7ef0965c56a1822dda9cc4c14c7f91cf568d7e7e025438 SHA512 a430cd6e0ea23f6b76b665335461e9db890d89971b6818c007f11dd8628ee3c1841a015272e21ddb5fe91ba66178b356ff0deef742aeb51028d5c5bc58ea6171
+EBUILD gst-plugins-cdparanoia-1.16.2.ebuild 477 BLAKE2B 5a4390e689db7822f74c02c1290078487ac653429cdc1df0d9044e3e7359b7d37a655ffd7838762777aab66c13a13ed9afb7ecbf0247ebd61069d93ae756ecf7 SHA512 7c6ee1a47db556bdd26c048f3c86df1d0c70f00f710f995c7a1f51985261561930aaf9c31d78dfb8c8d8955c14d11341a5ef21d8275400f71d68b7144161ab09
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild
index cce2ab153da3..64f9a11ec91d 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.2.ebuild
@@ -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-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index e9c266746612..9424d537c497 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-dvb-1.14.5.ebuild 411 BLAKE2B 932f952b5636c5004280c8bbe4c3c39bac9db41e381014b2abb4bb3c5d31ea54384c02e128bfdd42684c84dafe4ed153f6696b948a3a7ff615fef906d085b012 SHA512 bdcecd83108eaced2ec689bb6c08f1bcd0492f302e466ec8669fecbc7939c03df8acf5ad82927d041fff051c0943cde50904cc950906211527babc833231609f
-EBUILD gst-plugins-dvb-1.16.2.ebuild 414 BLAKE2B 53787f9ee40506f33fb06d43148f8af05675149b9bed598a2b6a170355aecc15fc5bc0f2b98d5c10bd4e29547f1d780102d715b9339b533cccb6f6d098e63d3f SHA512 c3a4fa611e80c9fa05b36682558d2beb8f101305ab3fde59a46283a85ac73c218beeca416790732a311070a9c99e82a4fd872fd6eece4b09a07315ba7b8e9c60
+EBUILD gst-plugins-dvb-1.16.2.ebuild 413 BLAKE2B 37f3d79e39f0bc48abf6bfa6cb7ab70e578cfdc3d874b1acac5aceff8ba16cabca5a2236591743cbb86a40d64c2597a97d0e8f2ef4168ef616fab4497805cd96 SHA512 03456bc72e7743f003c7ee16cf79f9f31b48d4a24f126f15812d271e63c6f901b34388c17e8439a0899645d3dc969bfe73c7b2b09907fc886220722b46150bd0
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild
index c8d270539c12..358d5ef09c56 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.2.ebuild
@@ -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-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest
index 9d7c30578582..acb1ca9ee8f0 100644
--- a/media-plugins/gst-plugins-dvdread/Manifest
+++ b/media-plugins/gst-plugins-dvdread/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-dvdread-1.14.3.ebuild 376 BLAKE2B e8964a05efc0d4aa99e63c58ae9749a61a2bf91b85653a324e012ac9e567ba2fe72905b4b9dd5b93c529cb94be0a0f501590af0a4620a01a64b73677947bb733 SHA512 b28bdc8d097d909043bba8c8bbfd09e06486dedf2a0afd15e4364f75104b4300f31d51b8c99d92639a86f9d64f645273f1318d64acd8b58d0c1801c6f05c4df3
-EBUILD gst-plugins-dvdread-1.16.2.ebuild 379 BLAKE2B b89f20879efe8cd8dac4b02641d7001d40d0a8c8506ef00c40dd77beee288283a5e306add34dadc733a03942d904ca46faf602da514b8309f54cf453c0b4ee93 SHA512 04bd51fc1d1364e7ef90c8916686ebca8e3202426108906bd4f9ce842ff5453d10ae30e7b2a31c10ac21995272fd6a7c2e501747431e00109d2757c5f69f9c0a
+EBUILD gst-plugins-dvdread-1.16.2.ebuild 378 BLAKE2B d19ee92a279cd599db299753ee8e03d2f2550a09992eb919158fa447c3ee1fbdca3c00b0796a4f3ff32885847b046e7da0d5be9c7150db4d8562af23943dcc6b SHA512 018384acf786c624b98745e7bafcef52d7146e1b613861e68b1fd91a4b1521cd9b58307be31d9891000a565df66d965b02745a6da93f700e5993f21db5a1f8d4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild
index 57dc8970f4ea..7e81d1719919 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="DVD read 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/libdvdread-4.2.0-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index 9592aa37d75d..bd5fbcb1072e 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-flac-1.14.5.ebuild 386 BLAKE2B 038d67891ff5766f89bd884648a53efc518d84ccf9ccd24d6c0d00b5e5d3d50f63f481fb4009a20290584a0f24d15a9687b246a5183228ab1a947c0630390271 SHA512 37cdef1d004601e22b1b89b5a505aac0b3d42bab8e9b572349529a3e1d7224c05940929d23ca04d2f9ef42d4a6c43d1a86a57e2faf52726e104263112bece22e
-EBUILD gst-plugins-flac-1.16.2.ebuild 389 BLAKE2B 9443a45f24616e706ba60d45aeb205a4c9f22fb153db33773b542330d5f8d0fc2010ab9a2a46b7dcc1e7e7dcc67e028ee936fa6f588da0a0fc732e2f9c2b7c3c SHA512 e253b7274e330e035b2b394af16ea663d77daa107c5d7d0461776673c02c1719501f361c7a017d245b2a6cfb495c531c7c4873f0fe3f4dac27c0c6fa55a1eafe
+EBUILD gst-plugins-flac-1.16.2.ebuild 388 BLAKE2B d090ead63ca1215e229d18fb5815f658bf14ae2cac3584d669186dafed78c8020fe1e2969476f54eb1733316267963036bd80b86f52184b3dfb20f7be8183ee9 SHA512 8d9ee1e05b30a1f90546eb7fa245c071ecf84f59380e6b8e18c3f890fac81d419327f671a21681cc98919de736f88dba4011981f8c53e2abb8dfcfa3d51f0363
 MISC metadata.xml 555 BLAKE2B 0a6c97712429505d543caaa732d716a95e4f6f5256aeb202da38bd2399ceb335e1fc6079279c96848d479d3fa3e2b8bb1c92b37ba284204b1936078d0175caf3 SHA512 2ffe5f5f8ef59e30a7da2efe1b5e88858c5f27776b7f48a7748f9cd72a18d5c97ddb239609c7bab808de874f0a51bf886ec24e395641fac995c8d3f041271e7d
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild
index 80003b354827..8f3a76048b69 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.2.ebuild
@@ -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 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 dee7fb47f49c..4982edbd55bd 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-gdkpixbuf-1.14.5.ebuild 461 BLAKE2B f050eeb612057848d0017a90e489951c17d96e595768532d47ab3f95213ca6dd5c3d1cfdd1d0d00693fce2b658628b57a4ef89d858126eee47f8d9a289e71369 SHA512 cf363c2742d987faeeb284cdca1cc950d89726679fd45614cdbad0604aaf924796451bde414e7aff4bd4e1f05f0f2ddfcb0e2e9393c0413313c45f68109169ed
-EBUILD gst-plugins-gdkpixbuf-1.16.2.ebuild 464 BLAKE2B 4eeda5786d4bf602ea9716d66a54078abd328a3bb41096bb60c575e246c945997940771ca21b3d66747e302cc5ad3ef95df80dd9bc82d00abaf2f5dcf20fc4ae SHA512 7406e7459c24ee028a82c7654bd960c34192c95e94a1ca5887e6f3980e8c8f1fcc90a89b60295610d9b7b4718939afb17c35dd2e7d183ee9cbe5c4f0e43c4518
+EBUILD gst-plugins-gdkpixbuf-1.16.2.ebuild 463 BLAKE2B 2c8cd3855c29b3740fde493c4b4ecd1d4040e4c9ffbfa3a4e6c806b4f9b90f5b97fe0310b0aeedf77bf7dacd5c71c337278661c9d664c13ccbb6160dad78d3f1 SHA512 b7008bf9c2ca3dae1445814da870212befc95c9bd50cff584b0fc839aa1f2b1d312c12f25a0b5ba2138e686f1b4720533b534a0cce9522515691e787b7122a80
 MISC metadata.xml 610 BLAKE2B e0597a0e835fd058d1d172bef6cb6616efbd83b3f97e9b9d644afa6a68956dc97b37385ba7b5996468911f9da16e54b2dec18d9657ad8b1b6a4dcd71cb229f7e SHA512 472dddb540087c89be5a85ab67733d345bf039a95fc1a7bd2ec6ce3b08b8556b2676af77b93ee903bc8ace178963935b21dfcfc6c1c0a6ecab5a7429d60e5cbd
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild
index a1e2bf4b6a8f..e15478ce5733 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.2.ebuild
@@ -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 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 9c5bbb99f456..c409e32b8fac 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-gtk-1.14.5.ebuild 1178 BLAKE2B 291fe2e131bee9c2f07d9af09fbab28a182bbc1829d57484fad0b4e53f3521af3d0a33d559d5b5367ded88411322d6f729d83837bb1ae825b4b2fe2bd8fb85ad SHA512 99409d7214bbf4587c850bebe5a079f0983be00a6e86d6fd65ff57dda1431c97eada97557ab0a8c83b564eef8a45c72edfeee8e406668d2f4d9aaf6c4d439133
-EBUILD gst-plugins-gtk-1.16.2.ebuild 1182 BLAKE2B 1bb833ac0b1c64647b95fae6849d05af5b759d1912a6f06f9741f421753bf4fdbbf60e2d5cdb59b72d9e6182af2713c18a129dbeb53ed3ff3a7522e6fd83dc30 SHA512 32b7ba91e4e8adcde27d9f98a27870f4e02559624ac4355904e10c5a6380560e7e55d41cdc2af4043ab1be8fccfd427857502a4828731879ffc2d9059a8631be
+EBUILD gst-plugins-gtk-1.16.2.ebuild 1181 BLAKE2B a1b118ba465fb669d3baa3be8b85c70e0bd8a9245146749cf25b796e51b2eae05b3b2c1313f1484962c4852a5bb9c791574c1b87dbf5fe4ab32c8cd35e81cd98 SHA512 d792e649c4ae0575633f5ea6bb2357ea54d5c50cd943e384ada8fdfa5f32f4cda0eca447f741a6a76a41586419da00f2a5f7b177051845264797d01699ae3511
 MISC metadata.xml 790 BLAKE2B 609210afdad563f5d63ea609ac6a65301907d447a137537aa9451ce6bf5774f9a15a8294a4e11b72697e123a4ffac44cefa5f6cf820a78bd998cd581e7ec720b SHA512 8ca80354a5c57ccbc941bc62cd7fc1b3bfbd2223901c24afac0ade01ab751e790cf9bafc4e0d4a3074606be99ac7aae10a45a9f7c65068342495f2995c956fa5
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild
index 343c25e66d5d..bceb5712dc10 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.2.ebuild
@@ -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-base is built with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 987d9991b93a..54c796889ad6 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-jack-1.14.5.ebuild 367 BLAKE2B 233a1456fc309d21cd9a606c2fc29e55983294b588442b54ec25c60d06a3d95d2b219555344fa881921395491e3e20e8ea23eb948e8d9d85477c4140c61cf71a SHA512 dcf8e090c5a54a63cb60050589071ab8657e8a63a1dc3628323ce05c76ffe31d4ccf58dae74111789694522ce494f3abe999581365984bd13c38d7568ec2400d
-EBUILD gst-plugins-jack-1.16.2.ebuild 370 BLAKE2B d5e7bd52d3b65d612f9b4c0fa1fa86947dbb874d7d240ec963c54b5f5c36b1308d744f077c8fb5262305396de54641613105ae0ec50e6dfc02c73934e66b56a1 SHA512 07130d3e17025aa383cba6ff5dc2dacc19d098d531fb8cef778127efb9189ffba9675bb949061570f1d248a6f498c6ec645ff337a1cab4d5ebd6560860162cb2
+EBUILD gst-plugins-jack-1.16.2.ebuild 369 BLAKE2B 94f6e17b9c76c0ab9a68dc8142781fb715ca35f1c08db608dae7d83a3efe8d8fddeecd1ed6c81f747f0e6dc0bd51c36599b802b493138498f5aff0bf1205dae9 SHA512 c651e20a00a97d354de090f4d28761774248aad34ef9da9bc629d841d1139eb945d406ca19092aa614ad9163f3e3ea53b066918051d55eee236108e41cf1d209
 MISC metadata.xml 487 BLAKE2B 182c55b79c188f12dcc000cecf9c507933183ab62a78c806b6f43918af528c1c7bf3adf435ad077f689a2b64706b7517b14393500dc4d1b7f2cc14b45dd6b764 SHA512 811374b3dabbff1084c5b1b6fb502197f58da02da195b922ce7556ca6e0f3668f266a14ba1a03ff352edb89a0cff9550e7d59f3f4e116ff63a22c6e8436ef6b8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
index 103920bf70eb..81e5adf50433 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.16.2.ebuild
@@ -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 ce1528f032b3..566bc52e04a3 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-jpeg-1.14.5.ebuild 374 BLAKE2B c1927a186414fa14e2ce4a049b41617a51ad4817375a3a9fe5d62e75eab37bb70618563fb0c5a7f094f692f83f0aa63ea7ddbbd903f0e996ae702ea0edfa9e78 SHA512 1c12f8b6d44e24d55059bea1a1d530591337b3a33befce92d3b5cdb89723e91046d03de94e8c955cc1c71e6e6cccb77544ea0c3a8d97012aa2d457858cca0786
-EBUILD gst-plugins-jpeg-1.16.2.ebuild 377 BLAKE2B 8771a8ad1d52ac6f022d3e2d9588645286d2fe4a46fd8a00fb6f6d8a50c252298731108df07a3e126cb6b9507b369354acf03db0dd4ce6819132fa9c0b6ffbbc SHA512 436fcde4f39036021a279f8ce0d26259568336ce504504437d22decb7ce0d313c37405471e791b6290c0b90ceb306a496963e79d2d8289d043ecede7a9614bf2
+EBUILD gst-plugins-jpeg-1.16.2.ebuild 376 BLAKE2B 58fe2898cdf4dde8c55062706b37a0a88093261258b61668fb284996438d32056680e8bb1d3af6c80b6ca67520e3bdb010da6db9b7c4988774fe0725b2e823f2 SHA512 3e3a73bb77bb71ddf3ac1c1e0fe5af12681894cd507d74b14a57782b02d0d49b65193cf782071e4a171abd12c150628909036c781742b9097221b787f36d756e
 MISC metadata.xml 659 BLAKE2B 8da81502aaf3eecb4ef62469b494598b329cb7e134511df9bd4269807882564e052ec76ddb50640203d96c08fa80deb3cb96d2b2c3c8dfae21fe296b87351ff5 SHA512 c4d076bdd3a4cf70540a9cc56c91a8e805f0a809065b629970158ca002f3cc03f3b7b91615121813030f510eb2e9a912aa4ca79504a20e023cc36f1fa3acf329
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild
index 4cb1b1f6d9e0..f9667cd425f1 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.2.ebuild
@@ -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-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index f889f5c70034..5934e3da2810 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -6,5 +6,5 @@ DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d
 DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717
 DIST gst-libav-1.16.2.tar.xz 9466288 BLAKE2B c14f3921bf357541b6ae4b5095dbff963fec90aa9ae3ef59e7b52c1d1f68fce8f497de017a6654f293d7b489ff5a880896018f5de0412456668f60bae1b2a32a SHA512 10817dec823b8ca84372d16e36c4ee11ab7a96a9168418f4c0bd0909fbda0ff45426bd3f754d7d491d4b07a51ec7eaa8e065e7e5c1daa120828c35a68adb312d
 EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3126 BLAKE2B 3d8267242e1af55656243bdc89f85d35714babe276a05bc3c1b15f47304dfcf15b13a49cf9206e5e50f19fc17fab91bbb0f49d0ac1cad490cc157749ee8d79c0 SHA512 d8a41201e8960baccdcdd727aab7a29448f2885eae2623ac4c2d186d965c10a32d96ef47afeb485bb06c980f15dadb7bc215ab39fa1b80f242d0bb9797406a05
-EBUILD gst-plugins-libav-1.16.2-r1.ebuild 1545 BLAKE2B 17fdabaf7328d5b9d44012ab434b285db8081f8c3c56ec0a9a58a8c5c86a63dc3a5c59448385eb9f1b9da09e11869ed7e17fcda125fd1fa382c97d17a8807943 SHA512 d0a0cda374f676a767efc3acd64856af044848a5822e613c7bbe3d5f995322839baff711b0485b4a1c5d5442e6401828f7d144c575c1576804f8b52dfa4a189a
+EBUILD gst-plugins-libav-1.16.2-r1.ebuild 1544 BLAKE2B 4856c0e5c322c6b1faf28fdab4f5379c1d66bb0dedad794752a453eb78e182f9fecdb1f93dc7ba7d67146905e892502f7fc54e160aebb56f6d8de46975c802a3 SHA512 ad3adc4267ac1f866bbad0900353fc4048891624055c61ead71347d93049f248a0b10eed0a30ce68b0017dad6495c19b38430f6338540e392a28abf9ed5a04b1
 MISC metadata.xml 435 BLAKE2B 8ee96f01d191e918656c2a80e8cacee47237740f7639d34f0205417815a06ae8dd5b0a27bd7bffac668f3a74ce8fc377112e3cbc369ad4fb34089b2975f3c733 SHA512 5c65497b650587ba929108974a18116b9fdea3ae175fc637c470725a39375defbaf962323f7062ce4287655fc47e8fd28ce4a1d8608fe7ea243bc6999a1bf753
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
index 0f8403073081..95549622530c 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 93e184a5f031..2dbf4fdbda4f 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD gst-plugins-meta-1.14.3.ebuild 3757 BLAKE2B 3370f8e71eb9860e1fb93315ab3a52a9890c1a12f88fc0cdf0b6d434ef806a66210215cb38285d60071254867bc04578c7c3e91ea4a75475cf87f71f458176a5 SHA512 42145f77d8566be12fe3c831fb46f6044db6dfccb625d7e533c4d0aceeb61397307a40131d0d7f998dedb147e896e0c66ff604dcaf85c6ff9bead7efd599cb67
-EBUILD gst-plugins-meta-1.16.2.ebuild 3759 BLAKE2B fe7b098e22f0106ecac90b8ab6c214d8d9a3b31c6eaef10b125780a667d1a658b31ccafdb626f8adf5845f3b63bf5d56f7a6658328a13cd368470d909b8f50ef SHA512 0e1f2762e04adc1105def44d86427e5ca272fb3d136da29d68592d97ce51acd595af2ed4e52396d3212f8f5453fa7a081fa78c8e6d635583128acc8d9fc51cb0
+EBUILD gst-plugins-meta-1.16.2.ebuild 3758 BLAKE2B 940ed9314ab5e8c568fcad114e80ad2c6e767a3618001c737472d93e96da4af9c222ec9be584020cd0499450417c851e258173324a2de9c0f7d049d4d930ed59 SHA512 3a3e8435c046d1f85dbfd99a2142ec253f75e3895c87f7c630e36d93b82b91ce35666d0486c39fdf280370548783c5db58c90488c7f6fa9aceadbf9d991111be
 MISC metadata.xml 996 BLAKE2B 1bc83f42a32de2aafdf03808fffb16d603986c19160d2802426ecea7f279e529ff7ad0e2c321671681f80c3575dceaea0064db559dba1212b0a30b826ae8e2a2 SHA512 4d905ac8fb0f07b2ba3c6791d7a84daef638ed552d2fac834a71febb274d1c667abe66735e7cfe77f5ed83c269c01ca7c2761b13d176164cd956e8fadf31fbd0
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild
index b5707813524a..8b99ab38747f 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.16.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="1.0"
-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="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index 24d8d7a8ae9e..9070a6c771fd 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-mpeg2dec-1.14.3.ebuild 400 BLAKE2B 752307fea50171afef2ccd2c333c1f87e8cb0ed3b2154d4184d75e2fb4c061503d5d5ce93ba8823437cd632357be2da5d0a059e5509a62a1aed741fd0fb7a2fd SHA512 4f10015f7cf540f61b9325b49fa40564defabc5e3196ebab7e3b71f89696054aa82c86562b124c4d19adf656e754667eace71738e922fbf02a80e6f9167befbc
-EBUILD gst-plugins-mpeg2dec-1.16.2.ebuild 403 BLAKE2B 7bec7bec0dfbe2d94cd4dbc2ba2d0ab99d67373e39dde8a8fb5b1564db197cb4611d2676e4ae7825361e081e831c1c3811b38dcd064c79e05a4c369014f593c6 SHA512 13c4cefbc6489760d4aac8b27ce6feaa6f56db93e4704a238a2fc8d35dfb6cbac2a08bf404a4718ca4eb1302a48f34665b45a35029b19787e82b9418e22063a0
+EBUILD gst-plugins-mpeg2dec-1.16.2.ebuild 402 BLAKE2B 92237eba90faa519863ca6e738964a60d90c08c6ed4d6de082a4540720c69e802d68181fb168881e6ca03b0cfd64ecd39781ff481e46e70085cd5771e258b095 SHA512 089052ced33ff5a5509dc6c342103b0305f5be8599615f6d17af8a5906e00b038a06127b99dbec5002ece3523e2bbb17fc16f285fe7ac8c0c39cde5d6e256092
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild
index 244081e1998a..6e277f3e2505 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-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=""
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index c377db7e6403..eea31397581e 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-mpg123-1.14.5.ebuild 372 BLAKE2B b57c63db53446aca6e5c8e4291bdc698bb8d23596dc32ffe1c8f4c7062d4a4b1b59299f69872535f6b04d6915677887f9a92ba19a6c60bdc552dd3f1a3d229b8 SHA512 c146745007dedaaebe8eea537b0a1b029d9c436084fd351aa003a11ea851de8721eb9ba743b7468d3383da767c9e56898720bad932b59e5052d036d77e1b82d4
-EBUILD gst-plugins-mpg123-1.16.2.ebuild 375 BLAKE2B 5149807aaa4ff04ebd407c63984fd74d54956a8ddcf79fb3e487401d791ca85c49c399c793cef46d0c2b148c1804390c45c28256b46002df6805966c7854ed51 SHA512 989f628f7097dfcd9f743f2fbd74b6e8e6091f837f0091edda3353d5a0d2c2967ebe2c921eb6202264c08e44d39c9a2d0a32d22491a991e639da3e27b6d46897
+EBUILD gst-plugins-mpg123-1.16.2.ebuild 374 BLAKE2B e980449aba5c6ef6b00a0ac43e79f54b9c8744c1c5e43c5c2c11e2aced73bae2cb9b53d26cb7c1a8738fdf167a43ba54a3ce9ac6c7739f79b2fb6f164c8e4be5 SHA512 4ca31fa014b0c1551ed070b31ad8d8a7a1a69fff49ab326cee217b697b899462c90fc949b358121864530365a4f382f7549504f77cb22d6450aff56589a68e87
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild
index 7b1b0c3f4e64..7972fc74ad15 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.16.2.ebuild
@@ -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-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index dbeea265fbaf..967b357cae37 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b4
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
 EBUILD gst-plugins-opus-1.14.5.ebuild 1238 BLAKE2B 2a49f4dba5a185cbc236b11220a769729adaa3f328391647459e556a7757c7c1c4e8d29c04ae9bcc4200be976df86d4a028d0328ee356587c25128748a916152 SHA512 8fc53f59d3ccc66a34eedeb15ab1a2ba32b39424ed3b5ee23f60caf53fe83ee5509a0936b642616b82f09083330d95989d2bb24c52a8633e737aae3116ce30c3
-EBUILD gst-plugins-opus-1.16.2.ebuild 1241 BLAKE2B d5a386bed2b140edb22d5980a15cb08ef816756bb462482bf26f0bf2856ef4731ddb379bd5e72617be461bba40fc0a5970e513401eb5a36936248140617f6a0b SHA512 54d407522f8cb569bc70403b2567be2db1185cdf13ee65baf773c5c85b2a7ba7c837e305b791e51c800c282259ded1f5d21bc3faa36920989e4f910543911cb4
+EBUILD gst-plugins-opus-1.16.2.ebuild 1240 BLAKE2B 96ce7af4e2f9706268ff6aa7999c4b900a953a429d3c4269b76f5fe8345473bdf58f64976e3ebb067d3a32e01b93f01127731a236f63b9cb9aa51aeac11b249e SHA512 21dd78cd38332ee93276b513ef03b3a70494bdf47b94f3f9b545f5c6a2cb78758884aa172caabac3308561875c563dbe1f406cd8bbf231cd7558dfeb0ee456c6
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild
index 0d9bf54a5dca..388dac0d3436 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.16.2.ebuild
@@ -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 da0b4b60596e..eacc8bece693 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-oss-1.14.5.ebuild 352 BLAKE2B 80573c5fa704718c2dad70ab726f32ca39146187b5ba6ddba62a3d68e44f95229a361c33ddfff2d3b6d06e55776a8a00da51055a9d06fb093732da976dc087b4 SHA512 262ec1e5f8d50677af6ace83760c76f252890555c27e8db4c13d57d9d795da96e77f6b3175c53eaac756ae4dc4333c9c5df0ca8f5b89999d5d907885ca23ecb0
-EBUILD gst-plugins-oss-1.16.2.ebuild 355 BLAKE2B 119c3115db4d01a5929cb8d63e0e369ac21a2ed1c6efa90370439b83340fe980ba19f47cf98f5066b6492ee0672677e95f7e553404957476b6aec106cf187cdb SHA512 d74b853cab2f7eb5a4f913b5ec5573a595a7302bfacca7584a60bcb48786ae90927586cde316503f8747358f981fca376a7e110c5206f57d765988e7524a06d4
+EBUILD gst-plugins-oss-1.16.2.ebuild 354 BLAKE2B c85c299db7622e9ed4e982c37be073c9a3dde4704be80c7b7094185776ff6785b555578a64b4964fb2809de1f471b20982423bda3e9c4ee8ea33554f4eb3f52f SHA512 92eef50d0a1731ceb0972acb0af6891b4110f523a7187f00be56b02e678ebedeacf884310ac0816610adf114898f7498b8d6533985e8071f1beb42089949a60d
 MISC metadata.xml 488 BLAKE2B 72817781f31070fbba548a5a0e724d3a3a419f55b2c1ba1155e88f66b0f779d34fc5705c39d60ecc5c40a9ba47ed568aa2458c0557de1795ddacadf54b39a436 SHA512 6ab36e28308e33d9b2e74a419ed558c913510f23bee1fd1a58ff87c6937dc2c3b4c8c683831e771460258424e89797a6b8c5ebed95cb87506ae7d67c11b2c243
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild
index 0468f946895e..89a41f298af8 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.2.ebuild
@@ -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 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index f077db09f2b6..86fecafb9370 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-pulse-1.14.5.ebuild 455 BLAKE2B 3d137f882a5402b29f6f30b92ffdd4960621cd8dd82f192f9b65a391bd462c96dff0038e3c9df38831e458adcad0b4b3f1f7cbccf29fd95895506ad4ecd3fb3c SHA512 e78f7ce36cba90003a339218449406a8d6803a5748d03f531547f4974abf7cfbcb6a46ea0eb64430ff17727cb927d8f8eb82461ff95aa9e996423f3aaa4726ef
-EBUILD gst-plugins-pulse-1.16.2.ebuild 458 BLAKE2B 483367234a605c7890cf1b8b38aa6b089add562ab1b436f1c0cb0909fea04d095660086d617912ca039da6a05cbf89679196bd242c231385eebdeeb7e23c6b3b SHA512 59e0e99df9e7a8b138083448f0109c928b0d0df538f07ac6097dbcc9d9632508c294c0d889afd68d3bf4b499dc1704cd3bc72cdcbe0082a887cb3747bfad6cb6
+EBUILD gst-plugins-pulse-1.16.2.ebuild 457 BLAKE2B a92e3668bca1cad27be4db656ab1918aa0e9b34746ae636dcf0428556c08f19fd844e1bc4eff1023cfe8e75f13446281fd9fc192c8f0f6412214391ba2dbc211 SHA512 0ec78507accb27b6a1338ea0469416e0f0599af37948abd2e7a5c3c970ba8edbba4d5967af069c618a8f1e2cbad0806341979737ca1a2b548ab63612527e2e43
 MISC metadata.xml 610 BLAKE2B c8d30b8baa2a2dc5dc43b2a0f5badcb212567f7ce4873f58b1662b3454c8232a4916f10470bb98c3dae745f818f0e02d7266542d44d3fd4b9eb7edf99bf2a419 SHA512 0f0fa4496446fbaa649c3d76538c4960ca0d7918b40e305aa0da8516e79ef25c10136b0097fd687cb968c37de636b57ae667be1bc3197a571f557400a9c0c478
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild
index 4f77bba55312..103a5f75673e 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.2.ebuild
@@ -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 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index 5e69d8a78ffb..84b1a4e98dd7 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-resindvd-1.14.5.ebuild 445 BLAKE2B af736ed1a5400432fae9d86bd40cef62c8953021df0354d342ea6cfa2e7556350942bb54e4d1eb5b510d8fa0faa12e4c94848dc8f8cda9a80a8f77956cbc21ce SHA512 cf0d49b5796796be420e7b5bd4e00de962a463daaf90ddce902cef0eb38542641f998b4c51b572efc79223b3608228a250fbf8c8c2a36c5766f51182f66acc6d
-EBUILD gst-plugins-resindvd-1.16.2.ebuild 448 BLAKE2B 76ad52c8dcfac13627f151195c58c8c676cb55d4be91f7c0f78226b28fdd8b3fbba2c585afbf75a645f6a46554dc50bea6dd6bfa63b082a84fda949084d44f64 SHA512 f0032d36a1d8a6398c98e382f9608107cee49256ec51a7697e07862d61ea5fd946719f1cf56db6175b9a2fb232e13ed69931fad1073332bdd9ffb2752b90cda8
+EBUILD gst-plugins-resindvd-1.16.2.ebuild 447 BLAKE2B 646181678caa1794955c4c7c195a60a6e03b2fd5761f1fc8005a5919c81b7eecb144b5e68dc2d475f02a5937ff517e2f4e7766e95507f810c478b321b1027daa SHA512 e5d8ad254cfcf6501c2d87861eb67de3fe78baa25b850de5b08bb1c73298c6a897dec0908b4bc6a50b1bbe0f1723f01da5a05d7ec234c26a05e42ee0f4d01c34
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild
index 2006b29a3675..4cf1a1f6495c 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.2.ebuild
@@ -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-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index c8a10fafbc85..8434666c1d3c 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-soup-1.14.5.ebuild 394 BLAKE2B 06e3142367300416a53e4fd10da7866b90131d90720e76a654fffa587b031ca220f6ec896a73c7efc96bb65cb12bc1d29c2dee77fc915e0d42d2a0941750f8ce SHA512 1a02a7be9e461ab6a1f06a72c21d8d4032b570a7270e96a5e1c238505db4e9f1a7351071a7186fde13cab631c1b5cebbe3d89c30d35299568ea57736cf44f732
-EBUILD gst-plugins-soup-1.16.2.ebuild 397 BLAKE2B e0844ba657c368dbf873ea3be093dc6f79de086a4b12ce46a9476acbc64d9c346eb2d452b6442bcd003fb6bd0cca4e668fa885f26077ed2f0df1a4b75966eb3d SHA512 30f7c403c43b1393fc9a9d6f0d667730be1cd8ee42ddf4e0d6fb2fbbaa429cd89868273de7fa670d4501f3a1ccb7d51cf45756c7f125481d092faac6e94ab581
+EBUILD gst-plugins-soup-1.16.2.ebuild 396 BLAKE2B 15bdd05cc64d30e3867835231f3f382313b2c05bf200c3d60246380eae04c8a10ebeaf7e9b16d0d63b0f657e29f94f04f5ecb5ce4b28f371045caa466e743172 SHA512 d8feaebda416e8481042bd3c72476c5f91ff99e953b714054688a3488591974d0a111eb834c11c35dda0ceff0cc0719ae7430a833d98ea5fb5ff8e01f8eb155e
 MISC metadata.xml 552 BLAKE2B d1dddafba0b921d7484d1c52567a8b9fbecc611b5234bc602cef79c7953a2a3a9bb423bc929055127ab894506409ddd8e8a71cb432169b1370e65b83b2e4341e SHA512 ce8b5a2a0d33e00ef141b82b3c6d192e31b681f016f431f1306d2066677d7fac66135129f57d25f9d13644c9d3976baf74fa6e6f65f5feebee045b82d04e2d8c
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild
index bd1c4465050d..ba2a8664bb8e 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.16.2.ebuild
@@ -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-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index f44afcf7045e..63423b4cae12 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -3,5 +3,5 @@ AUX gst-plugins-srtp-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a3
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-srtp-1.14.5.ebuild 483 BLAKE2B c1d5a22be1404cf85137d041685c69637591d157fce0b7c0206d0ab28784b1068d393ba85de0adb4ce0b2f0eee8759359ac71c036e26e7775e49730a6b2d257a SHA512 d6c548ae9bc44fb9a2db9faa7398fd42be0122bb0714b7b21af6b689662c65a2486aea0240f4d61d8113952672549ea1ccfe7785b3f7cfca467f298ac2aba455
-EBUILD gst-plugins-srtp-1.16.2.ebuild 486 BLAKE2B a56426f1270f907e874f69f500796b20f07dc00fc11276253bdfcdc7fef0df952a18bef880545058ad98655ce07abe3a7e137a515668524a78e9f7d4a6d63e52 SHA512 450f06b78a81ee3e4a46e09ceb5ae75185c25a29922d55d5540589a9fad49fb8cccf1aa0de9f857a359484a69eafab529d022bfd618c676d48687125c3fb429f
+EBUILD gst-plugins-srtp-1.16.2.ebuild 485 BLAKE2B 40979abfdd44058886c5dafb1f49ebbd2dfaeeb80124ee759d736e428cb5dbddd235718847424ad7861c6a29f5cc56b876c1643bd896597af8dc56b108ca387a SHA512 3564953bf2bca576b1a2337851ea0a27a6c15bddc40f6ee60b4ec578cbf516f7bd5512f98d23fdd7c010a7de0ffe5e3570ecaffac2614b78f2c657d4f70e60aa
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
index fb70a29d61c8..6ae0c915dc43 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.16.2.ebuild
@@ -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 97ae6e5eb850..38508ace7dae 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-taglib-1.14.5.ebuild 377 BLAKE2B da8e0b8b8e6e80101fcd0bcbe91e750e34b01cc6e3d953147dc102a16037edd7656d33333f7033bbf783cfe5ae7b97b88917f58aa4f1318d72e4c7bac846b4af SHA512 2ee864013cace861719983b1478fbb900786f80cb56bc6ce87723932b7e8f8fdb4c967334672b089777fdc7e69c92854249e7a0acc699d70d5fe993a1591bb86
-EBUILD gst-plugins-taglib-1.16.2.ebuild 380 BLAKE2B 36fb5614733837d741263dd3c45f81bcb9abe4adddeda42297fe8ce222cdc46081272477e766b69cb287625166d7e88dea621dbd4010daf19442aed7fc824d47 SHA512 f501c077684d392828ac2beb3289507058e281460a87d8532bd573295a20e238fd675c8d0820ece1df353095d62dd39ab5bd4037c159eaf8b16915ecf2a83108
+EBUILD gst-plugins-taglib-1.16.2.ebuild 379 BLAKE2B 420b5073bfeece62d6ec50b9735d2c61914bd0ba583b625a37f9a745f3eddd7434d7a1644b6f3dbf2c2ec634e1a462038037f19544217ef29a61fe55e4b4f84a SHA512 41c5deab4a1989dd5176a4b9681baf0777007717ef4b6b3631e677d86ee957915a5cb12a1c0a61a7610007a82457538f01be765f25fc99ffaeb5fc884d4297ba
 MISC metadata.xml 472 BLAKE2B 2ddad354e550883322f2276a979d7cace56275d6b0ebe9301c40a6204043c0a05b0efae27cea079bdf1c0c04b8f588ab39e080d8b0e4f405c0d0287a00c4c746 SHA512 8ddf53f0cf2e92dbc2adc5f4910b2a6fab0b0ac68eb9c9c33fd94809714d0f10d0d9d546df012a70c5d9a13adce7cccc232be4fc107b63c4649ba3ff0ff32444
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild
index 0fa1b1930a27..fec6fa252510 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.2.ebuild
@@ -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-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 6c3640705b9d..bbb623b0c526 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -2,5 +2,5 @@ AUX 1.14.5-glibc-2.30-compat.patch 1315 BLAKE2B e02cdb5b6ae1b2a8c94d577a0378a3c7
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-v4l2-1.14.5.ebuild 729 BLAKE2B a2cc46df6a7ee806ff755f589d62fdff7288c4e0f723b39d71abb23d78bc63fe54fc7f8b7190c454186dbc3038fd9f4f78176562c5178557a5edb1b46273c56b SHA512 b8cf6427c18231eb6090c8eb8d941cfcef086a92a2580a9ba88ee446cec12bd7d7b6e2e2537f160517ebe5d9d48dcf7ff904d71eaee117213d96eb9acb7fa446
-EBUILD gst-plugins-v4l2-1.16.2.ebuild 666 BLAKE2B 255384f7c2bf4c3aa8b10f9d43b076e36398cc4ebe2d097af6f20f7fc9fe1bb631ced5658bd36035b6a5c40c519354257920233838a71cf7b05561f0c72abac0 SHA512 0b2434dba64dd1733b851b6749e777dd6f127d1c6ba7e862f66b228ae9ae130ae72b12bf1e63afe2132171672e9e470b8411d74efa58faa20ece2f0aa1e75fa9
+EBUILD gst-plugins-v4l2-1.16.2.ebuild 665 BLAKE2B 19e5086bfab96ac9dd603f13cb9106fbe1f739f9b38695579be842335bb54410e68ba6ff241edd84f15af426c39114e2b9b5fb6e1850a9ab3b13b30fa9e395dc SHA512 2ca68cd07b76b1b433f4be8872f18f4e62353b6e74eadbf4e1c43726cdd5c62f9537213726f9759dfcd17313b8cf676dd6562213021286a5ca9ab2607dbc6d28
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
index 5d51a608f92e..8a33add9735c 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.16.2.ebuild
@@ -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-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index a08a90f662ae..7726439c77e6 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-vpx-1.14.5.ebuild 387 BLAKE2B ffc214c464565ae91a0cd125df491646106a15aab467f1f5416a94132d12bd7040f7193462271d504eedfdfc13d6de83074f13d0f7ba4a41ba8694ab47425ac0 SHA512 5437d39c59c339b89d161aaf34d600a623a1e6a58057380d83ac64d3865b570ce1be68289a6e6590579c7b4ecaa3ad75f458c6d24b12b360f8bb0eb9a3374896
-EBUILD gst-plugins-vpx-1.16.2.ebuild 390 BLAKE2B a102d3077cc011e0ba298adf3f99d5b03ae480410563999a3861c5efb56de5e258e129e0bb27561e382c6711da698a26148c8a2792d3c853e983c196da7ef353 SHA512 bfe612ec3c82abaaea2de44a102b13674cc3b706ffc01cd90b2bd99c5efd463c5f7e60797333245a6556d185a997a52ad5684d1179496b8bbd25595023fb5a56
+EBUILD gst-plugins-vpx-1.16.2.ebuild 389 BLAKE2B 53a4103894406d633dbb5dc2beb8146b7adf890a0f97fa8e7392695072f1b186616ffad21f0bc45080f774f3cac02e627188488cf2f37dd8adfbd4640bc9e5fb SHA512 62b83d1f91354b8a936fde2a218009484a22a836ce9a25df6d3a25114c36562ca1eab5fdf44d74812909a1a9885e646035f9317452ff80cc16b06117ed1c4fc2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild
index e24306304147..22fc509f144e 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.16.2.ebuild
@@ -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 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index d1df56fefeac..4dfac120876e 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-x264-1.14.3.ebuild 412 BLAKE2B 5120035a98dfcf2e055f6694ccd74886e546300da0dc159e3c3f9d59415e06e0c097286f16cf9a43e2c288a609c81873ed80c45ab592bdf9816773d74fa419fa SHA512 f04743c5275651ba79875a7b0dd7eb6a6a67395f347d012e41f270f8db2af31ea7a2d38eba2977390fc5a2caf702f39f760a5100f777355f3ef0a3806cf1b177
-EBUILD gst-plugins-x264-1.16.2.ebuild 415 BLAKE2B 3889abd964ba6eb445e88c196fd650a22cc79edb123cd09abb015561f8064f90ae57e27f73d87419939e0481c2a4e9ace0e5fd6313288f63c779ba9b2fb9247d SHA512 0c1e17727003438e0f8f57de49b2ebe7eff719381629e7c54dd320bd207004faa77365c74abc39d2e11e01d561c3d08705f7211c43c0bd7ed995bba7e637c60c
+EBUILD gst-plugins-x264-1.16.2.ebuild 414 BLAKE2B 84d9327c99d7bddadcd1b94ad52c891bbaae6b4edd838e95080a8e632721f3b5ebbec7e48a2e6515ebd9e1eeaefef50d0a7ae64328b3fdf6e851826a042940c0 SHA512 80a9fa53675b7eab564b43cca11f77bf3f2d2a24dce04b7c6dc8c57b3b167ee30899ea83702e6f8ce3c8b3b30697adc0a44cc2a2a45dc5c11bd9c6521f592a13
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild
index 5965ccfbb716..6c7510fa2bf9 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder 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=""
 
 # 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/ir_lv2/Manifest b/media-plugins/ir_lv2/Manifest
index 01674dac8bfe..2781c41fd534 100644
--- a/media-plugins/ir_lv2/Manifest
+++ b/media-plugins/ir_lv2/Manifest
@@ -1,6 +1,7 @@
-AUX ir_lv2-1.3.4-respect-flags.patch 1139 BLAKE2B f5e7d891e443c32c21b5db7360479b9d4ac80013805a10a6bd714ab6db5d64cc5d673571894b103db3bea12e5baa2d9f7c4a1053e6d6df517058935d7f799f06 SHA512 a9021b12c6663bf6bb20e87db01981f21afd9ceeeaaedce584389f69abd87c713c937250eea87f12a03610885cd02ab3cea6e756503b1987d1b678acd9e55b14
+AUX ir_lv2-1.3.4-lv2.patch 433 BLAKE2B 3f831851c2354b4695780a6df057dcd3885855ef19bffb0cd0a12e2671d18fc789a7ffa5ad38176a006e5ea2f43361caa8baae50157db3898af2b2b965bda3f7 SHA512 cb2208857e61912fdd1e2f6b5c7e81fd3bb86ae2d8195926d1c23ed99cacc8bc90a1758767c6f9733696a8aa128573098cefeeb2271d9df5bd0a751689489963
+AUX ir_lv2-1.3.4-respect-flags.patch 2213 BLAKE2B 110fc8963f65f4e520b395d7ead9605d94f65030e61277ca7d6b5d34d41c3e847a6313d67c7b0b0e2ab7a4fac77e3aca2f022179ef0398cf27562df65aec308a SHA512 88d9d7739be0ae0b202e94e1d4f40615e876419624ea8af743365c761fbe440c077c40e7dae3b4f43b29fa4e7c33e2dc2931c2334101d835e14f13782f594de7
 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 953 BLAKE2B dbffe6edc29622b0e9c530aecf935cf5ce17094c47a685cfd5780777bcbeda9a379e73e4e8bff924445338e76ec41272a6dae8795751a7f60260f2b863f233ff SHA512 ecd86f25e7652e5bbc9dfd177cc0eb0aaea474728730fd1955b318c6bbc90fac7d91f06a0b7df100c3a94839011b5843947ca6c2c03c9cb42e3fa93a41c38110
-EBUILD ir_lv2-1.3.4.ebuild 1380 BLAKE2B 78998f31ff1d35158c0a02ee97c4e67c17d542040941ee563c903bb34250870681fda9063cda9aa125bd019f3ada4aa5d30ad771628b03ea0f4ae5d21bf46af7 SHA512 c8abe786e3e2e624cfb4cb04e0b10549829d3aabaccbfd54608b145787240cb5f7c9f5844042a491870bf247078c12edffb9a40e5c978cca86227369e355b00f
+EBUILD ir_lv2-1.3.4-r1.ebuild 1403 BLAKE2B 0744931a106821c25366de148df9e35a0446024ae764a164263472376e9258b554be7b89e77f7fc1b4098bca7d930a64fc48860e17b88dfb164daf8a63980449 SHA512 4cedc7b1685ccdce55d2a24b9dcdeaa3ca77a9a6e3a2461e8c54a6015245e900962d512ce680aa4484d341a8645d69fb00fdd52a0464046027fe9420f53215a2
 MISC metadata.xml 319 BLAKE2B de7f0ee9cfe123a77f79cce2ade2dce0e5c3e5243ce13611bf6e9b613f04b7b2824bb70185796ed81d8fdbfc023722c1a45f9cecca16a35f8bf8cfb376dcc322 SHA512 d01e35b0d4b6fac4baefdac78473637585ae45a47f486c114f6fbaaa0c781ccc4d5f55e143c67dfe5fa074fe60cb60dcf5e6f5fd59b6dcd3e582c3e5dac68064
diff --git a/media-plugins/ir_lv2/files/ir_lv2-1.3.4-lv2.patch b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-lv2.patch
new file mode 100644
index 000000000000..904dab659e73
--- /dev/null
+++ b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-lv2.patch
@@ -0,0 +1,13 @@
+diff --git a/ir_gui.cc b/ir_gui.cc
+index 74ff90a..0f482c6 100644
+--- a/ir_gui.cc
++++ b/ir_gui.cc
+@@ -1523,7 +1523,7 @@ static void cleanup(LV2UI_Handle ui) {
+ 	free(cp);
+ }
+ 
+-static LV2UI_Handle instantiate(const struct _LV2UI_Descriptor * descriptor,
++static LV2UI_Handle instantiate(const struct LV2UI_Descriptor * descriptor,
+ 				const char * plugin_uri,
+ 				const char * bundle_path,
+ 				LV2UI_Write_Function write_function,
diff --git a/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
index cd664a6728a2..e375969072e3 100644
--- a/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
+++ b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
@@ -1,6 +1,7 @@
-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
+diff --git a/Makefile b/Makefile
+index 031f865..4d25e97 100644
+--- a/Makefile
++++ b/Makefile
 @@ -20,7 +20,7 @@ CC ?= gcc
  CXX ?= g++
  
@@ -10,7 +11,7 @@ diff -urpN ir.lv2-1.3.4.orig/Makefile ir.lv2-1.3.4/Makefile
  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
+@@ -31,28 +31,28 @@ ifeq ($(shell pkg-config --atleast-version='2.20' gtk+-2.0; echo $$?), 0)
     CPPFLAGS += -D_HAVE_GTK_ATLEAST_2_20
  endif
  
@@ -19,3 +20,30 @@ diff -urpN ir.lv2-1.3.4.orig/Makefile ir.lv2-1.3.4/Makefile
  C4LIBS = -lsndfile `pkg-config --libs gthread-2.0`
  
  all: ir.so ir_gui.so
+ 
+ ir.o: ir.cc ir.h ir_utils.h
+-	$(CXX) ir.cc $(CPPFLAGS) -c -fPIC -o ir.o
++	$(CXX) ir.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir.o
+ 
+ ir_gui.o: ir_gui.cc ir.h ir_utils.h ir_wavedisplay.h
+-	$(CXX) ir_gui.cc $(CPPFLAGS) -c -fPIC -o ir_gui.o
++	$(CXX) ir_gui.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir_gui.o
+ 
+ ir_utils.o: ir_utils.cc ir_utils.h ir.h
+-	$(CXX) ir_utils.cc $(CPPFLAGS) -c -fPIC -o ir_utils.o
++	$(CXX) ir_utils.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir_utils.o
+ 
+ ir_meter.o: ir_meter.cc ir_meter.h ir.h ir_utils.h
+-	$(CXX) ir_meter.cc $(CPPFLAGS) -c -fPIC -o ir_meter.o
++	$(CXX) ir_meter.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir_meter.o
+ 
+ ir_modeind.o: ir_modeind.cc ir_modeind.h ir.h ir_utils.h
+-	$(CXX) ir_modeind.cc $(CPPFLAGS) -c -fPIC -o ir_modeind.o
++	$(CXX) ir_modeind.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir_modeind.o
+ 
+ ir_wavedisplay.o: ir_wavedisplay.cc ir_wavedisplay.h ir.h ir_utils.h
+-	$(CXX) ir_wavedisplay.cc $(CPPFLAGS) -c -fPIC -o ir_wavedisplay.o
++	$(CXX) ir_wavedisplay.cc $(CPPFLAGS) -c -fPIC $(CFLAGS) -o ir_wavedisplay.o
+ 
+ ir.so: ir.o ir_utils.o
+ 	$(CXX) $(LDFLAGS) ir.o ir_utils.o $(LIBS) -shared -o ir.so
diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.4-r1.ebuild
index 03d78346ab04..232d3932b3de 100644
--- a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
+++ b/media-plugins/ir_lv2/ir_lv2-1.3.4-r1.ebuild
@@ -24,7 +24,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.4-respect-flags.patch
+	"${FILESDIR}"/${P}-respect-flags.patch
+	"${FILESDIR}"/${P}-lv2.patch
 )
 
 DOCS=( README.md sshot.png ChangeLog )
diff --git a/media-plugins/kodi-audiodecoder-modplug/Manifest b/media-plugins/kodi-audiodecoder-modplug/Manifest
index faacf8f24da1..872c7a114bc6 100644
--- a/media-plugins/kodi-audiodecoder-modplug/Manifest
+++ b/media-plugins/kodi-audiodecoder-modplug/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-modplug-2.0.3.tar.gz 77468 BLAKE2B 37d92be2eac6723324f9c2f01fccb95c5f34ffda34b6021475d79be009d27582f3c7f898d7b571e77223fde63fb5577383b81a355b1ada461763aaaf20a3acc3 SHA512 934cd62f48d63b5ae707f85c4f9f1b5dcabc97d1393d1b079b1453e28d088f9cf6d4a404584e1f5cac6ad5769121f798df69bcd88cceaa855b56bac84ead4c4e
-EBUILD kodi-audiodecoder-modplug-2.0.3.ebuild 719 BLAKE2B e31c0d3c619161159481f463b29c088f3e3d4815e2bb584f9b4d6f4cb7b83d3f8d0e121f95d0c8fb52905d234d6cf37635ed8de38c700249d1836c23b0b39d2b SHA512 bb8def4daaf01de2d23ce132ad8483e0ef32c2fe59c3a9fb4761dc8c8517b672f403a6ea882cc6a3305794d977f58286e85cdf0d8d3bfb078bc29e6e03810992
-EBUILD kodi-audiodecoder-modplug-9999.ebuild 720 BLAKE2B 263d2f141adda617ea968402fff214490ce56218590f9cf2d5c46cec9fdfac38917875cc023aa00cce15a64780b26bab8cf790029beff634f1facd439734c117 SHA512 9c6705fde720fc5e0cb11c6091f52fafbadcf3ba40c05fac3be6189988e32440e0f128a1045d9ec952e1c51a03142806c0faeb6bf75ca92a1d803cb66cf9f644
+DIST kodi-audiodecoder-modplug-2.1.3.tar.gz 83312 BLAKE2B 95f6ece6481c73d1b09c16883aa8a778d3eb91a7a974ffafe16f3eddbd6f354bd157dcb4561f7b2408364cca9679ee6c539226b13296df76456e8e8b9c961e15 SHA512 3db62ca8e348b66c27298f6f81b16e6fe8ded3937a90e2e145d40c7e6865fbec0c041ffee76f8cfb79b9667561daecaa4c2325d813e799448c9f7147e580991b
+EBUILD kodi-audiodecoder-modplug-2.0.3.ebuild 755 BLAKE2B 16650dbceef7f4b4689c9377047efbb023bcb82710948fb2c0445f27fdf39e1c7d065c16322120738db794d7fed88cd29be94261d63611734cc01c27ec73d245 SHA512 aa538fc59e08fa5bd0ef6a52fb2d7a6ba45955995caf6fdd241b1d81be128a94333017e0b6a95dde42193c316914e2fac8f595f4aea3bbcb54d566057f0e0ea6
+EBUILD kodi-audiodecoder-modplug-2.1.3.ebuild 750 BLAKE2B ad1e8c95c6872219cda63fbc1bc4b848e60f9751bf2bdec4f9ba2d8b726cd180b2571c6588887f930acbab4ea8b34f51651d4e9bcbd0d5246dab6a5a60c8fb40 SHA512 73e4b8f1010eb62bbf15a72f4fb80e1579ebfa7e87b31669c38b6842a5cc291c258b516c588c1ad38630fe0913d8a0377dc1d5734f5bb23ac124ba98627ef7cb
+EBUILD kodi-audiodecoder-modplug-9999.ebuild 748 BLAKE2B 3a114b1cae794f7daefeedd0fe2aebe7a90b2ffd43700d0291932c082156b4c8dd20f814918eb4fad3875f93f1553e13b19badc946dc705ad7158ab033c4f54a SHA512 92c8c97a50f5469895a59621c57fb014dc2208ffd6e58505f9c8becd0bec2f677e52f0cb42a8d2460dd34cc617c1e77c0c03339110b1ade0ef8de16d2bb859e7
 MISC metadata.xml 442 BLAKE2B 7ac417393f7d1a671942b34984b98caf86a36c6b58ef5ad5eb49806e47ba2e5efad0f208c81343fc63c1949831fb9f8e5b83a16138d7a607ca900a0dce649709 SHA512 5b54a7fba19f53f9b07621207d7c71a95ee934e453bebd00a8a9c4f44831ac51f4055c033872ae937b9df9a9aba6d708bc067bb89f68284fff730dc349c2949b
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.3.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.3.ebuild
index 23cb35453357..6c879cd0bf24 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.3.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.3.ebuild
@@ -6,29 +6,30 @@ EAPI=7
 inherit cmake kodi-addon
 
 DESCRIPTION="Modplug decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.modplug"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.modplug.git"
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.modplug.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*"
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	=media-tv/kodi-18*
+DEPEND+="
 	>=media-libs/libmodplug-0.8.9.0
 	"
 
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.1.3.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.1.3.ebuild
new file mode 100644
index 000000000000..ff4f50bdf147
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Modplug decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.modplug"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.modplug.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libmodplug-0.8.9.0
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 23fdaf6ce07a..5c53010eb0db 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
@@ -6,29 +6,30 @@ EAPI=7
 inherit cmake kodi-addon
 
 DESCRIPTION="Modplug decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.modplug"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.modplug.git"
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.modplug.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xbmc/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*"
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
+DEPEND+="
 	>=media-libs/libmodplug-0.8.9.0
 	"
 
diff --git a/media-plugins/kodi-audiodecoder-nosefart/Manifest b/media-plugins/kodi-audiodecoder-nosefart/Manifest
index 540a9ce1c173..d82962ec4005 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/Manifest
+++ b/media-plugins/kodi-audiodecoder-nosefart/Manifest
@@ -1,8 +1,10 @@
 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
 DIST kodi-audiodecoder-nosefart-2.0.2.tar.gz 93194 BLAKE2B f8521331857c8a0d739f596000050869e7760b42c2611a3ef7d626c8b4d23514a53e1d5fa5b9cd88abada49791007cf74ef2ff99cf8c34e683a7fb4e2b4e9e42 SHA512 b0d7767562d3ad9305af76e436292f877cc51cad7a55c93c71af64724ae105596a0575d92db1e9e85da9cac06b968569f788ee9314539368d3f663d3b6d7ee54
+DIST kodi-audiodecoder-nosefart-2.3.0.tar.gz 99567 BLAKE2B 2dac5d61fb568a0f0685fb5066ddedf7dffc02a94575068be3c60d193cd02a985cdd4248bb0fd8afcddb1a7e2ef2627b57bb6986b759c2cc6e61d5e267398dd7 SHA512 452bd93b300c19b31d072c8474ee69f4f180f3df5929bce828c6e3186db967176cec9288d844aefc6dc15673a0029768863c52ddc05e5dfa3e6a270dd13b636e
 EBUILD kodi-audiodecoder-nosefart-2.0.0.ebuild 723 BLAKE2B 710cb2781dd91060752684b0ff799c13bfabb5ae90c6b420008d929257291a6900af663935c4194d4d0a5e6e396a84e05748febb0bc393864bb44da55186c5f3 SHA512 b929e8f7c3b793755b3a43452b3023215c891500f0455678218601aba2e67af4666ccfbc1ac6ce2e380a3c8d39130318e4269acc384d5dc8a44cc4d8fdf6f92d
 EBUILD kodi-audiodecoder-nosefart-2.0.1.ebuild 686 BLAKE2B 7d3c706384e49c8213da9fe4c5300877471b2e0cea772e13988cd8e825da9536b77cbf7d1e5c54e157f6b356a42c11c4e3dfee9de3c386f90b6b0cad8443366e SHA512 22027bd71c4a3633d6ecf7429d0b1b39ff76f3f866b5f1951bcd78a10c1f3b20adb3f5e7fa413bc0391a40fc2ff384bcd4d41309633c67e88579300709bb7a0e
 EBUILD kodi-audiodecoder-nosefart-2.0.2.ebuild 686 BLAKE2B 7d3c706384e49c8213da9fe4c5300877471b2e0cea772e13988cd8e825da9536b77cbf7d1e5c54e157f6b356a42c11c4e3dfee9de3c386f90b6b0cad8443366e SHA512 22027bd71c4a3633d6ecf7429d0b1b39ff76f3f866b5f1951bcd78a10c1f3b20adb3f5e7fa413bc0391a40fc2ff384bcd4d41309633c67e88579300709bb7a0e
-EBUILD kodi-audiodecoder-nosefart-9999.ebuild 687 BLAKE2B 8f4b2ba63f5a9c897baf88de4bb94d9937be58de8d102a708488cf6c7ebeb84b1344db02475184b0aceb6a8e6f6047055e37ddf48572798568ac6a139715ca84 SHA512 2e3c3e62847be2d7a7138d1ac3acc01616498a2657b4dd9ffa3ef5fc00224a5e03aa9c679b38dd740a1e7928f91e4adc09b2f18965e06da3461a5119d18a28eb
+EBUILD kodi-audiodecoder-nosefart-2.3.0.ebuild 676 BLAKE2B 71631f7bf0371eddd3643986374f5ae0c59578f4f4c7874c87f46da9c057f0ba6f778a3c7a6142f2390753ad8a2d876e886b8bd45d68fc13cb18ef20f2ae963c SHA512 a9940335a9147a36021cb060518b8edf0412bf4b98739ad950ac2f2dac11903adff2907b182668556ebe752e5f7adaa60494683097c9ae2fc1b23e821cc38ea5
+EBUILD kodi-audiodecoder-nosefart-9999.ebuild 675 BLAKE2B e897fcc755b6782671f6750fa15c4cdb8a0cb4dcad61ea40b610155ace1b9466a5bbe25e5e13d695ef4024ae1f0751b400fae058a57c453954ffb051f89cb656 SHA512 7626c55ea19497d8cc652bfd75782a262a02161325b7428e71657beb7fe9abd0a15028fae4c7b11b9af33f46d43813338e1f5d59f2bf69c47473cb38fa9fcafd
 MISC metadata.xml 444 BLAKE2B f2946063cbdf62c0e0eddbb32b3a9f42a7e03c52975934a191a19e0bd59c97bf8bc70b55eeaf45ad3cad54a7081d238cfbbe1e235cc23855d8a7404cac2d436d SHA512 9a6295c8af39d75437b1f56b8a91e234ac1578110e1e64b52ee5ade240bd43764a52ec843735e7e3814fea6a662937315db4ae5e0988c9c016c1f72ab12fe91a
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.3.0.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.3.0.ebuild
new file mode 100644
index 000000000000..5f75dcfd39e0
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Nosefart decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.nosefart"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.nosefart"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.nosefart/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.nosefart-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 b70fdb9bf600..6cd597a58cd5 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
@@ -6,19 +6,19 @@ EAPI=7
 inherit cmake kodi-addon
 
 DESCRIPTION="Nosefart decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.nosefart"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.nosefart"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.nosefart"
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.nosefart"
 	inherit git-r3
 	;;
 *)
 	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.nosefart/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xbmc/audiodecoder.nosefart/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audiodecoder.nosefart-${PV}-${CODENAME}"
 	;;
 esac
diff --git a/media-plugins/kodi-audiodecoder-sidplay/Manifest b/media-plugins/kodi-audiodecoder-sidplay/Manifest
index 25a94f78cdbc..5f7cdf5ed8b3 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/Manifest
+++ b/media-plugins/kodi-audiodecoder-sidplay/Manifest
@@ -1,4 +1,8 @@
 DIST kodi-audiodecoder-sidplay-1.2.2.tar.gz 26125 BLAKE2B 0c6076df3ba167423daccc32feb35509e9cbef9e74499db45e71c77fc51a3484a22c217d49b440d10e169ab2bc905a10875a2f6f38cea294774c8e2312b83b74 SHA512 6af355f3ef3cf11f8d95763f9676d8f8ebadb2f9d2fa4cdb17db75ab29bfeb26d6b56e4d1aceced0742319af943860f3cfef4d0723d62d8ea520bbe529bdf1a9
+DIST kodi-audiodecoder-sidplay-2.1.3.tar.gz 31160 BLAKE2B f67f3c9c330e66f2128945ee4d70aedb981f08cd75dfa50618d1e1d1d1beba5558d6c43306897459050de530dd0c24b2b6957e51916b13c51e298aeab147a651 SHA512 0ecf3e2905cf417efa3403afa43a28ee45a65bab8b261e6f3f3322281414a7a732286e60c0bcfe93ebee821dd1cc3123d12412948a5ae72893fdbd2b6d3d8236
+DIST kodi-audiodecoder-sidplay-3.0.0.tar.gz 33311 BLAKE2B d600ffbd69baccca33b47d6af57d4e0a78f4d08da9390c6a92620962ba91464600deff69b62cfdaec35f24a0db8da4d1332f8902293cc041e7c543f659098a2f SHA512 6e17a4f7a1095595081fcc76e58ac22994b50b3a1e1d4599524029a0d4058b8583a6f0fc0a32ecb6c4b9a159bf74cf28fbd7166eea587575bdd5dbe6d8aebe69
 EBUILD kodi-audiodecoder-sidplay-1.2.2.ebuild 788 BLAKE2B 09b67aede2659deba86f706861f64078ef894e6d7a0729cdec39c03f4c5641d7c08603e7d5bacbd1f407199db7f64062f0c3f87a92626dfc5e488a3412370493 SHA512 01bbe792d21beb28be4a1ff38475e50586a87b4604ca20650c8bca7d22210fface9303f7efe3bacd341e0c6e3232be6c632503933e992a0eb8d047aa49b5e95f
-EBUILD kodi-audiodecoder-sidplay-9999.ebuild 789 BLAKE2B 97bf13fafe9c532937b023628e16c511ce55bd44e3e098f39193bae9160be4426f1bfd3034f2a173bed254dadc712937edd73194f2352cc2d053af55022a66d9 SHA512 550cd70200283ee8e8cb90c22f6c71b2a9b4326d096889e52aaa2fbb9d06c74df3ea849a7c2f4623f25d24265c66732212a8cf1b79e14c1b9093049bfca48ee0
+EBUILD kodi-audiodecoder-sidplay-2.1.3.ebuild 778 BLAKE2B 2033bc3a8521eae8ba336661c1af9ce0864eb556062440e4665580e6afc7f07ccc4d8a090c64b687f7f8adfa0fa7bcd3255695551a7bfb8343f9da532044c640 SHA512 b2b7efcbe7e8b125963582ea3e8e9b9723aec30dc3e2d8f71873e1ceb9c987524550214d792fa4b861ec038669aeb9272f728876f1efe5e5dc94efd682f94eb4
+EBUILD kodi-audiodecoder-sidplay-3.0.0.ebuild 778 BLAKE2B 2033bc3a8521eae8ba336661c1af9ce0864eb556062440e4665580e6afc7f07ccc4d8a090c64b687f7f8adfa0fa7bcd3255695551a7bfb8343f9da532044c640 SHA512 b2b7efcbe7e8b125963582ea3e8e9b9723aec30dc3e2d8f71873e1ceb9c987524550214d792fa4b861ec038669aeb9272f728876f1efe5e5dc94efd682f94eb4
+EBUILD kodi-audiodecoder-sidplay-9999.ebuild 779 BLAKE2B 879c0d2faed9de9e36751830fc1bc696ac5648df2b00311deac27346794faadffb98c33720b94619a669ceff3566a4a6d926643c97cdf9688ca1550cdc87945e SHA512 ee680a9b34eaaecad077c8e391e1ce0ce7afeb7963a8e9464bdfb49880fe9af5fec574dc24afe03b8cf572ff0756baf8a43ba71a71234ba9c471c2947f20a411
 MISC metadata.xml 442 BLAKE2B afc3ae3f9157185ec41cbd144cce22ddd50be0f1409ccb2c764a88a0e448d6504904522d0a18bcf089ca85bbc4a8b05f51e795ec30fb9f7614479835b1ec1185 SHA512 4046b1455fe5c4cb63127751d2fbcc21b3b124609fbe0798c9675e50a837cabf1ef8d7d48103162633a6b47b36394feb1f15d45fc92f6266760de36ea614d6ea
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-2.1.3.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-2.1.3.ebuild
new file mode 100644
index 000000000000..cbdf4dc859bc
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-2.1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SidPlay decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.sidplay"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.sidplay.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	media-libs/libsidplay:2"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-3.0.0.ebuild
new file mode 100644
index 000000000000..cbdf4dc859bc
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-3.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SidPlay decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.sidplay"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.sidplay.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	media-libs/libsidplay:2"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	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 0025322b65a0..ad7aa5f3b133 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
@@ -6,19 +6,19 @@ EAPI=7
 inherit cmake kodi-addon
 
 DESCRIPTION="SidPlay decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.sidplay"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.sidplay.git"
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.sidplay.git"
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xbmc/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}"
 	;;
 esac
diff --git a/media-plugins/kodi-audiodecoder-snesapu/Manifest b/media-plugins/kodi-audiodecoder-snesapu/Manifest
index 9c1bc3046afc..56973bd540f8 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/Manifest
+++ b/media-plugins/kodi-audiodecoder-snesapu/Manifest
@@ -1,8 +1,12 @@
 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
 DIST kodi-audiodecoder-snesapu-2.0.2.tar.gz 70750 BLAKE2B 54696e7e9df82474e22754f9fbb662bc12de01e3946f48bc9c093f838ca3add77881f5a7ed8cdbc75689c25cf081d0c0935d81fbe32203039df74c420b4bda8d SHA512 7b3ed7556626fd20492720b7b87c3e3885ee565066c2dd34e239608d3a5845584cca8a7a3be50019f2365150072c28480652f3eda6a4e584da4fa1a45337c9ce
+DIST kodi-audiodecoder-snesapu-2.1.3.tar.gz 76768 BLAKE2B a38a6576625f198837547128ef1e96522bd329cef9f70e8b1855ee16f3d16f68ea40f2bb12d1f49b1337e54af0de0ac184f4d6754cc160be6bb769ccc2bb1b5b SHA512 d596fd12da85736bbc21f5f42f791e54672246a6e782e7e25082883a29f270f837bc21d76c79182dc08c2cd8314f7bdd40fcebca393216c15882977161c17f64
+DIST kodi-audiodecoder-snesapu-3.0.0.tar.gz 78398 BLAKE2B 7bd97f6586b4aecc5948d967a6986db6292aa0387bbb75b59c3b2698f37afc9e511ad8be90b83a88bf69241dec51db22965d62d09e79dac0e820b70601947711 SHA512 cf3a23a6181459e0513ed644d79315665f11c3186a66e9a3d3f4a7d9ffa820ebfa0d050bb329ee36b93c2f2113b734cf7a6d8c4c17ca40a6bbe22056998ed0c0
 EBUILD kodi-audiodecoder-snesapu-2.0.0.ebuild 718 BLAKE2B 7b5b99a2d25eabd68267d06716a5aa6713b8901c5ab018fc269c563c0978ef2956754f90e677f820a3b50665e359467584d83a4e8dfb29b543fd6828c74674f0 SHA512 6a31ee44c729433ac50a202d97f3865c7e0f92e0df66e6452bb6f6ba783900c453df7fae77c9cffbbda8fe08f04eab984c767d1a1e35139afde15fe873ea2fdf
 EBUILD kodi-audiodecoder-snesapu-2.0.1.ebuild 681 BLAKE2B f7e7c05204c11ac195e3c6b46c5cd462329e043743a56513fde132b5c396f8f3a97ea8554eb7dd8e2e9618a0c6bb7bb77e0552789aff21d5f09848748b9bed66 SHA512 d84511894bb581666ff186f45fd8db750dc9b33fe0b8bfb8f564212f252ee3f3545d43cdd51a1010430e410196ef59973f14d524ee6c4cfc1efa3c9c054c388f
 EBUILD kodi-audiodecoder-snesapu-2.0.2.ebuild 681 BLAKE2B f7e7c05204c11ac195e3c6b46c5cd462329e043743a56513fde132b5c396f8f3a97ea8554eb7dd8e2e9618a0c6bb7bb77e0552789aff21d5f09848748b9bed66 SHA512 d84511894bb581666ff186f45fd8db750dc9b33fe0b8bfb8f564212f252ee3f3545d43cdd51a1010430e410196ef59973f14d524ee6c4cfc1efa3c9c054c388f
-EBUILD kodi-audiodecoder-snesapu-9999.ebuild 682 BLAKE2B 66edf07bf05d8aa33e0574b8bbdc50e94fd7eb11c1a6b3e941fbff0f83d30e65add903ff492f7522c042deabbda7532b5b3018ebdabc14341cd168016bd02963 SHA512 5e9d8811bcde50851bbc854b5a7405d540dc277adab59d906fd38ca7696a340e758fe4e7817b30491314f838e21e3d8aa0f32c1cf045ced840703f8419c7957d
+EBUILD kodi-audiodecoder-snesapu-2.1.3.ebuild 671 BLAKE2B 084a99c944524b573433fbbbb745a20a7be44154a14aceeff02686f5ee9fe6330a44c3c2e2b65e38587fd0404c128a0d93f2867e8c5c5ffb2111a83dff5912c6 SHA512 81c67f77647fefcf83efe88cdf753664050b973c2f742767bb1547838a36486a4ef726469ef385dc4d2b1f821fadc09e79d721b9a2b36848609e0b035dabe0bd
+EBUILD kodi-audiodecoder-snesapu-3.0.0.ebuild 671 BLAKE2B 084a99c944524b573433fbbbb745a20a7be44154a14aceeff02686f5ee9fe6330a44c3c2e2b65e38587fd0404c128a0d93f2867e8c5c5ffb2111a83dff5912c6 SHA512 81c67f77647fefcf83efe88cdf753664050b973c2f742767bb1547838a36486a4ef726469ef385dc4d2b1f821fadc09e79d721b9a2b36848609e0b035dabe0bd
+EBUILD kodi-audiodecoder-snesapu-9999.ebuild 672 BLAKE2B eea9c85956e5246a2ba074a9901b6e2745da8bf45f4b655556eb7883a1a4470fc3686a6b970c06be15092723ca2913d6d17065fd6ae2480b261904297e58eabf SHA512 40c970149efa7c8b3da7f0401830489a0f370eb7c4f474b8db1389f27ea98ef92cf9d3d7618dd864fbc138d338017bef40b437271750b1eaf7bdf21e80a07acf
 MISC metadata.xml 438 BLAKE2B 0b8c0545fe3ec7e6ead7eea42baa9255946bf7d27762d392899356ed45e1e7182d7087c25a56b34d114e6de8b95c8a5311fe90b0d52a9e7d007851ec22ab970e SHA512 9561349a81107c52fe83cada11fb8ab55c176fa4e410556741f5259503b7d43732bcf7debfa30a7c98fc7d1e5336abef914a7c31b9663556cd10fc7daf3dab14
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.1.3.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.1.3.ebuild
new file mode 100644
index 000000000000..b3e2b19abd82
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SPC decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.snesapu"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.snesapu.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.snesapu-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-3.0.0.ebuild
new file mode 100644
index 000000000000..b3e2b19abd82
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-3.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SPC decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.snesapu"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.snesapu.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.snesapu-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 5fd96a092f8e..c0d1e5690e95 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
@@ -6,19 +6,19 @@ EAPI=7
 inherit cmake kodi-addon
 
 DESCRIPTION="SPC decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.snesapu"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.snesapu"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.snesapu.git"
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.snesapu.git"
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xbmc/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audiodecoder.snesapu-${PV}-${CODENAME}"
 	;;
 esac
diff --git a/media-plugins/kodi-audiodecoder-stsound/Manifest b/media-plugins/kodi-audiodecoder-stsound/Manifest
index 278a41e8558b..a150126456e4 100644
--- a/media-plugins/kodi-audiodecoder-stsound/Manifest
+++ b/media-plugins/kodi-audiodecoder-stsound/Manifest
@@ -1,8 +1,12 @@
 DIST kodi-audiodecoder-stsound-2.0.0.tar.gz 63097 BLAKE2B c797c7fad5811aaa12217cd6c4caf4167581940e25fc2684c04578e06a04e44d683e0871d6847c6cc3367ee5f5925de4e5640b9eb2b4381a713a3ba6c5860dce SHA512 2770da6d379499fc53d013163e28aeb2c1ffdbbe1cb54f2f2a4d5bac33b68d867a8de0865fe72d283f28ded1f3bd79efee7c98fb79f04ff99459d5bcf3f0f1e9
 DIST kodi-audiodecoder-stsound-2.0.1.tar.gz 89746 BLAKE2B 4429890376ed67e10e5abe76d450731a0d05a5892cd8a5f66d49fdbd8f0743547fa7752c87bad11f2b2e49e1519a0fbdf457da91eb16a42554d5a60f2bafecad SHA512 133eee1892817b69ec34d7897316ab6e967e67968b72ad7d73199d36fe86f119ee015f703022fb850c2c8bef11d990bba3c0a5df5f24776d4861cbbcb6b466db
 DIST kodi-audiodecoder-stsound-2.0.2.tar.gz 90362 BLAKE2B 07e99effe9fd60ae723ca61cb1a55408c5cc5458571c6e991c3acfdaf64d635ca24355c0930c79df77afe3e024735be2ec9a46a2d1611014d76364de325aae6a SHA512 6925bc4a21db7b2b997721227689c94bca3389b8c4879d4f10e754231b1be4f0e0cb163f07945624ffb6963c58b6d243b535c7f1490382a89192b50e558227c9
+DIST kodi-audiodecoder-stsound-2.1.3.tar.gz 96164 BLAKE2B b29f1b11cdcd1a275cf766cfa33d800fa0b9be440e061ba0219348509a3d8e26dd5e505f9b81080226450311fcc8a5d85fe8040b89a8bddc9b1d128618e12e94 SHA512 b14f1fc70c6a6cc749dd8c7a85c4177e49d7444518e28cf6b1a6024fb268278ba33b7321269eaba000ee2487a946e05d5e68e8614ad4df7470b1c85fb7da826b
+DIST kodi-audiodecoder-stsound-3.0.0.tar.gz 97776 BLAKE2B 8896592b822c2bb59ef7404e12d47a9a8977c8277905f07797173cc7b66f61dfc947a8bb02a292365fbb7ad37cd6d39c1ecf74e5fe4156dee87a5b3d04ff0a9c SHA512 ac8c284912c1ccc8975ef9a35153ef0e9d6754a67c3f51ccbb69c2bc4b0533666cbb80e45803586e70dec4f23d9b714b593f957d2a2bfb522cc549c6e1f1e111
 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-2.0.2.ebuild 681 BLAKE2B 8fcc319c5617660e5a1555da7d6fbe02b0c0dec38937aab58370f8b3988c109bbeb6ee954071f93eac32f3a8184308465e428532c01eeae1b0ad930774dbc750 SHA512 3168d5556703af89bc5fdf76a6ce8faefac077bb0c649026a686b99f2b47e125d5dd7fde827e4cfbd935eee15730efb653d336ee60aeabb3c622002e77c7c3eb
-EBUILD kodi-audiodecoder-stsound-9999.ebuild 682 BLAKE2B a1f342ac418f5d4f534e188f8ea8dc8082e6e118593ea97d33e430e4ac27c088cc4755e9be5d47626f4661d44fd862dfab44fe22541660adceb70f4ab72572e2 SHA512 c4909c12aedc565b2ab34221a0ad1d87a4d3d4e81643aa18e08aa189a464ee7918caa4668d6deb3366ce166812518c28bcb99a53fe3ea6e2fa4bac9336af5449
+EBUILD kodi-audiodecoder-stsound-2.1.3.ebuild 671 BLAKE2B f13d4a9d004cab97c7c330c5ecd7e184392f3c8757e700628af52900ae3fcf4e8f403eb2a10561ae39ec849be3e2e2a48b355f42a67be935341418fc04b91ec2 SHA512 1761596c64540e71e08a9d596da8b4c24fc7b0dc21889d4076d30a7ac1d50f7018d01f81af51ed20eaf6e08b1e917bdeac880815fa85a48525bdff3dbbd74576
+EBUILD kodi-audiodecoder-stsound-3.0.0.ebuild 671 BLAKE2B f13d4a9d004cab97c7c330c5ecd7e184392f3c8757e700628af52900ae3fcf4e8f403eb2a10561ae39ec849be3e2e2a48b355f42a67be935341418fc04b91ec2 SHA512 1761596c64540e71e08a9d596da8b4c24fc7b0dc21889d4076d30a7ac1d50f7018d01f81af51ed20eaf6e08b1e917bdeac880815fa85a48525bdff3dbbd74576
+EBUILD kodi-audiodecoder-stsound-9999.ebuild 672 BLAKE2B a09990ad142a4ba49018563f729bb194d861077c3ceea84f31b68a9ff1a27d92dd9c1096e45c370fd92f401c61f75644f8594d7b8ce3978ab4a1e7b3e775ee76 SHA512 ab576cf5999194435860cbd9e224893f1832724b1a6c1f0f86e484294579e3a1ecaa1397f2c96c55811afa7e216ef97986a9789ccd33add5c9feb241afcfb35a
 MISC metadata.xml 437 BLAKE2B 36e61faf2f1098a85827d6f81536b35d874e325a7094d535b742c71b30afaf671ed77cf9d84993ebe5e2407ee316d72453a3e18b3cfe55c0d5ccd9691f3cf12f SHA512 a985c629c36655238f0125134c4f64ffae47add726888adf934b8b66aeb9622a12ac256703206b98ed39f29ecd0a0f9ad9043af80160a8d545a982c9fe659504
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.1.3.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.1.3.ebuild
new file mode 100644
index 000000000000..6ebb9dad83ae
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SPC decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.stsound"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.stsound.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.stsound-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-3.0.0.ebuild
new file mode 100644
index 000000000000..6ebb9dad83ae
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-3.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SPC decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.stsound"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.stsound.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.stsound-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 7fe04f1dae88..c1b7d70e71ef 100644
--- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
@@ -6,19 +6,19 @@ EAPI=7
 inherit cmake kodi-addon
 
 DESCRIPTION="SPC decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.stsound"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.stsound"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.stsound.git"
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.stsound.git"
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xbmc/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audiodecoder.stsound-${PV}-${CODENAME}"
 	;;
 esac
diff --git a/media-plugins/kodi-audiodecoder-timidity/Manifest b/media-plugins/kodi-audiodecoder-timidity/Manifest
index 3c66fd3c91ea..42b1dda3b1ea 100644
--- a/media-plugins/kodi-audiodecoder-timidity/Manifest
+++ b/media-plugins/kodi-audiodecoder-timidity/Manifest
@@ -1,4 +1,8 @@
 DIST kodi-audiodecoder-timidity-2.0.5-Leia.tar.gz 1822081 BLAKE2B a4d251e46ed1f614c7ad479be5b139f872d4bfafb9f8ad16e96e5c000b96a80b42755d8710551c5e7be1a8f2a6dc02d7fe2a249a38fdeb5d186746de7260a621 SHA512 4b77c1a1680321515cf22ed269b801304a20126f237fc2151c54cd53569bcd446547478d4ff50e02175e4df689eb815af35de75848c4e2ab97451912783c49b8
+DIST kodi-audiodecoder-timidity-2.3.0-Matrix.tar.gz 1822842 BLAKE2B 92545858b9deb5fb61a05830be2b22cd96340e6e2db09bac7dfce5b16ccbd329d677013352117204609d13159d674f1bc919e8fff9cd0e2cde8eb587d83082fa SHA512 d119a50baf8e387d1212e10bf7f8dd5c22e462a85cb0dbd3df2fef7fa3490336af098b518745d4192d22703465dfbe182c5a3047db97d7beb4babfb9017eb0a9
+DIST kodi-audiodecoder-timidity-3.0.0-Matrix.tar.gz 1836160 BLAKE2B 31211bdcbd136e869c889304360a2b7726674b8c7f0bfa5b4d6b1e534d8d9b7922b1435941354b6c21bc8004664078cd41f3374dd4d434ba3917fe7e25e07a22 SHA512 e98487ce3d08a3215be86b161ca79e04fa611c75c51a4dbbca9b80779b2ae4729faa98e3b6f810deda025a57fe7278420a3b5d532683b8778d15773fcae04ba4
 EBUILD kodi-audiodecoder-timidity-2.0.5.ebuild 702 BLAKE2B 6fd2ee0760d4e9dd1a4e9e8d3247837d40c53b4ae35068668fc498f90728afe4cada15668a4b1a42999c992433ed8f7fb1d0c381cbb142c6623583e7bc686acf SHA512 a69394d9e284cfd7458637b34e67b121e7729aa6997c5cf7f8be583cdb97c0d1f318f54414e086e76e88099ce584ea2d1db5b83fd7336c256a6dab298141f785
-EBUILD kodi-audiodecoder-timidity-9999.ebuild 703 BLAKE2B 37c241398c5cf30560086d913ae36fe84b525568e836e2e93ca07c2528f1364048f28c7b19d1db1c1ebe4f1277174cb0d51c062e9414c75c42ff5ba021d19924 SHA512 ec0773a5fdb2369bba6e893c91c81065b74b3bed7c2f37ef623088ab59453e40f350d4b699dc8ca46dbf9ccaf018a8162603d26094924a55762996bcee06ffa2
+EBUILD kodi-audiodecoder-timidity-2.3.0.ebuild 821 BLAKE2B 5c83a9914d30e8b2831d4d601f8816ab3df3bd79d44d6e496c8de56dab36dc787a2cec18a6c0c73d486fc4174df04609cd11f465e179aa10313601da7e7b05ad SHA512 f62d009f4309a68b7c53baa73e06049122581f5d3ae751f6a2f24088750ea3daa40d0cd546d460f7b674316a6a526af0e23fa0d48ae3c86e6c10606fa999250c
+EBUILD kodi-audiodecoder-timidity-3.0.0.ebuild 692 BLAKE2B 273117efb0fd36a663f9cf5828149999b5b3986e721e2bc0c335f96b7507488a417411b2cbc8dd330965b2faf891c337d4dd37a46a65e7f4539fb389dbb236a1 SHA512 d4484a2611e3e8b2e0413a266c6f28a6438efea296e39a7e54632b34b7b0b1807cba365f42a4455cdce26283930760f882e037ba39cdb0c9f00d0a56181d0671
+EBUILD kodi-audiodecoder-timidity-9999.ebuild 693 BLAKE2B 2adf9ed2e7887ee7d247b37c87b85793be0d69784f937aca3f51b5914233b84d2b67134e628c30ee035e02e1042c88890d77f9e9d94a0eec6b4dd487d2c7000a SHA512 7863dc860914ff16c3fcfd772285d293b42c5c1c6c3e2b40c6b609527c2a976afaa86d6c3cf3948258110536e33fb59f9dd30757db1705f0b594db0a6fb0a0c9
 MISC metadata.xml 444 BLAKE2B a8bc29439b6fada05640522f57d0c97d905ce14abee08f1cff2ab2e1fc36c20ca4491e836b9092ca4d0c7a2b9e66e66d6882b1c5c77b4973d038b294e7d82503 SHA512 924f94fe1923314c5ab70873705dd30874bdf52c5f2f1d13282c140b0080a71a483206c7554dacf0c4dbfcec9f4f4ac340e024b32fd9286f8ce69d52caa8aaa2
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.3.0.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.3.0.ebuild
new file mode 100644
index 000000000000..fe575b284cd9
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.3.0.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="Timidity decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.timidity"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.timidity.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
+	S="${WORKDIR}/audiodecoder.timidity-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
+
+src_configure() {
+	append-cflags -fcommon # https://github.com/xbmc/audiodecoder.timidity/issues/32
+	kodi-addon_src_configure
+}
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-3.0.0.ebuild
new file mode 100644
index 000000000000..5de6569fbb21
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-3.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Timidity decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.timidity"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.timidity.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
+	S="${WORKDIR}/audiodecoder.timidity-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 afe8e0357021..295f3f727169 100644
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
@@ -6,19 +6,19 @@ EAPI=7
 inherit cmake kodi-addon
 
 DESCRIPTION="Timidity decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.timidity"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.timidity"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.timidity.git"
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.timidity.git"
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
+	SRC_URI="https://github.com/xbmc/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
 	S="${WORKDIR}/audiodecoder.timidity-${PV}-${CODENAME}"
 	;;
 esac
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/Manifest b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
index 3112d9ae115b..90fc58758aa5 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/Manifest
+++ b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
@@ -1,8 +1,12 @@
 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
 DIST kodi-audiodecoder-vgmstream-1.1.5.tar.gz 275897 BLAKE2B a9a902b0a2444125675f4f237bfc07c44947856e127b7c0692ccabd0bbe91b90b76f7f6f183b1836bb21698bb932c24dfa3db91063492d024983b3dfce977c53 SHA512 52369b677e0eb04787887241d34db7e24ac1a6c3110ccd9369f1ae4dae190347b0800fed35c0fa28c2dbf268925ef559d91566b745ab6b03000e4c5e1628b90e
+DIST kodi-audiodecoder-vgmstream-2.1.2.tar.gz 4634107 BLAKE2B 53a4f92cb42f304b23c25673e9ac0da97f45a60dc2cf690505c65afd7c4b7d0655e25a331c275d1916f79c0b39435ef7cf61c265651b87602de6e38ab523b09b SHA512 8b955e16c629b11f62a1549461e71ea242cc6cd6fbb6dddbe61311d978dca7e014f2f7534696afab5800814b9d35d7f9e09e96838209b7d5080ab0d723b00bc5
+DIST kodi-audiodecoder-vgmstream-3.0.0.tar.gz 4857345 BLAKE2B 394e955a319d7ea0d4352a2ce801f74a64839949d533b6d753da0c3163131b70e63f873c4831eb5734d806e8db915c4dde5dcb93e4f1df458d0b3f3c346b6dd8 SHA512 896879c26896596fe4bca83f581e2b4f1d597ea25e9295680db9488508bfa6e09f3a624255a0ab556a1cc429c596cc05b7382c862222d66a28f942f916775b12
 EBUILD kodi-audiodecoder-vgmstream-1.1.3.ebuild 728 BLAKE2B 6af6cca76ee3aeb860bfcaa606edd22385991eb920396ea860a44d34a701a4915d2f3326f14a3e82d9f2fefa885f40649644fef6cd45d3678f23ab6cdb7ed7b7 SHA512 3518755dba1f5db9f6d571c7e3d52e83bb1c790c9b1df844c5152ea0d1a0a370bc4d5bc1efec35b3be642fa64764e962f3ccaa8a5c4c6ef591d449739a1f4fac
 EBUILD kodi-audiodecoder-vgmstream-1.1.4.ebuild 691 BLAKE2B 8b0f645e4452d2c70c1cf86aadb92fd47ecf9a74493fdae4cde8ab2415d5d61afbb78efe3a2a842d3fa31f7752f2cb2f200eb9e048b10efb7e2e05b803bec7a0 SHA512 444510104ad06ca0e25fb96d610cab06fdfdc0c07841776e9a3c78509f545b09c6436d76da75d7695199cb318fc0e3e13526c20059faf94adc1e0119570e954c
 EBUILD kodi-audiodecoder-vgmstream-1.1.5.ebuild 691 BLAKE2B 8b0f645e4452d2c70c1cf86aadb92fd47ecf9a74493fdae4cde8ab2415d5d61afbb78efe3a2a842d3fa31f7752f2cb2f200eb9e048b10efb7e2e05b803bec7a0 SHA512 444510104ad06ca0e25fb96d610cab06fdfdc0c07841776e9a3c78509f545b09c6436d76da75d7695199cb318fc0e3e13526c20059faf94adc1e0119570e954c
-EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 692 BLAKE2B cdefff3a4235151d001356b5d3fabd009466afcc88dbf3832b4431fa885c6fee0d53d8d69702b51bcb4479d2195cc414a2c70b33e595718648fdd8bfcc7a8779 SHA512 1255f40d978649d61ac88e3ef3d81dbd63f65670cd3bd0d53f32847ca4b39ec08a678b9b25e7ddbadbd8c97587b587e42f59779d041344755f1bc6944f7f475c
+EBUILD kodi-audiodecoder-vgmstream-2.1.2.ebuild 681 BLAKE2B af4f0dd8e973ad6b105f2c24b15bd5b9f3db2b3df0ae4e3962f2781ec9a8ec1bb4e92eaefc18786cc950df31b7c659021c126a6dd9f8c9e0d95a344355bf7ed2 SHA512 4ec5a4ad21e8f19de9eb074a88d879d9cc05acfda8da1742b4c9a4360011373755b88660a2ce78fd94569f9f17eacb88d7219fba4d3ae112a3333a814383588f
+EBUILD kodi-audiodecoder-vgmstream-3.0.0.ebuild 681 BLAKE2B af4f0dd8e973ad6b105f2c24b15bd5b9f3db2b3df0ae4e3962f2781ec9a8ec1bb4e92eaefc18786cc950df31b7c659021c126a6dd9f8c9e0d95a344355bf7ed2 SHA512 4ec5a4ad21e8f19de9eb074a88d879d9cc05acfda8da1742b4c9a4360011373755b88660a2ce78fd94569f9f17eacb88d7219fba4d3ae112a3333a814383588f
+EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 682 BLAKE2B 3f999989cd911bc1cd8159b5443295c839ead5e13412e1eda02372de7930af8c5d99ab761b724d6f944f4c324dd63c0209176938404a00a61f72d3c388a1bec3 SHA512 c18d0a7503474fb39c29cf759665de610ec7e2bb8ad81fb34a16e9dc9410ea8424e58284be784751e6060bca3c4f2e7b7345797203edf03e324f565855d914ff
 MISC metadata.xml 440 BLAKE2B 534e3b04fc69fd47da8b492744fc924ab8e3ffca3b8bb4ab06853dfd5e707f3131630ff06272548c3b05227a9d1cb110441a6b39315203918aca4dfc9fd1c52e SHA512 280074c2c911f1df1c0fbfaead6f51f49992accac7cff643e3d03a0b52f6b64cce156937430d950bc1c875c48c15632d703e5eb69a6c270bdbb25ea7faf7f03d
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-2.1.2.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-2.1.2.ebuild
new file mode 100644
index 000000000000..55137a89153d
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-2.1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="vgmstream decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.vgmstream"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.vgmstream"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.vgmstream/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.vgmstream-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-3.0.0.ebuild
new file mode 100644
index 000000000000..55137a89153d
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-3.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="vgmstream decoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.vgmstream"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.vgmstream"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audiodecoder.vgmstream/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.vgmstream-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 1dfdb7479cf8..be660c751385 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
@@ -6,19 +6,19 @@ EAPI=7
 inherit cmake kodi-addon
 
 DESCRIPTION="vgmstream decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.vgmstream"
+HOMEPAGE="https://github.com/xbmc/audiodecoder.vgmstream"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.vgmstream"
+	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.vgmstream"
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.vgmstream/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xbmc/audiodecoder.vgmstream/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audiodecoder.vgmstream-${PV}-${CODENAME}"
 	;;
 esac
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index 336b302be53f..6cf1b4062aef 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,4 +1,8 @@
 DIST kodi-audioencoder-flac-2.0.6.tar.gz 21666 BLAKE2B 13c63fd4987dd4e911e3af44642dea33a7d652b5f465654e7038247000aa324ff2b2422f22d7ed88a7f956c3d15dcf960cb9e5bde4b70b3dac3604ada49a099c SHA512 7de2b0f5b36b62bc1f066e5c99fba2aa61baac5f204a75556172aa95332999806a34babef08ac5e516e62a123b83d3befaee6654d3089ebd1a305335a40d88b5
-EBUILD kodi-audioencoder-flac-2.0.6.ebuild 781 BLAKE2B 78836d57e1ed8032d86085ba33b4d070378c6c3ba4969d68f8d1de0d349fda38d482ca5a356183aca6063f7f0f73997b4edf325f0db593ffc5efcb0b06f11e5b SHA512 2ff981a296b6a608d4cb23dbd7710c42d1126ca7acec2db5938183fc68cb3748d1fb9acc4dc0e375167e5cdffbc27f4c75e6c873927125e6060638e571c69d57
-EBUILD kodi-audioencoder-flac-9999.ebuild 782 BLAKE2B 5c6a06ae2ecfc60a5d48092d06e7887e672f173a9b0b561f62681e186d89072cc1de05022aec62050189d00005fa17b7231048ecf670319423d618e377625c87 SHA512 f093a119fc4d992674db912c14d58e3f4774e9f7b21d07ebe0f1ab74df1252289f209d566e9a2f2379f5233d35b8e48bc16421c6f3971edc2fa129a0acfd4d49
+DIST kodi-audioencoder-flac-2.1.1.tar.gz 27295 BLAKE2B d1fee7d52849389a08584e2acf72da804a410bf5b8f6d891f9ec8f47904029469fa57cd2320bf603f9ccb3e4d4e97f72593bdbcf09a4d34c67730945b7ed183c SHA512 e817592fb237cebdb87abbba4488bc25d48776ae069fda3557c08aef08cf840d5c0a8a2833cda8a6766634d42196f90f9d78eb70272f2f38a38044132e517074
+DIST kodi-audioencoder-flac-3.0.0.tar.gz 27573 BLAKE2B ccef84245eb6ce23527b33900e22e304282477eccca728f5a899db80d7b1f64a00fd1de65f4303bf4261554c038d48adf49f417a8161a9359e9ead81c7288a7b SHA512 73dd9526a498dd92076eb98044f75baaeb4dd93251f6a9a2d9e9a9a8553fb9b047b861b8518c2fe2803ce06cd794a5436f80561bedd82de1fc2df727f28d1b7c
+EBUILD kodi-audioencoder-flac-2.0.6.ebuild 822 BLAKE2B 7212e7e2546c5b98346064254db6513a7a294d71cfe7fbab0526853c9a5e4b31ca04998453ba30154439479e7523fa047681837af6daa86a9c057d88a3cd2458 SHA512 787bbc97724bbc24c2c1719a5cf226b33137fdc642ea0537205d03af5178ce7917e36048c628a03ce183be8b8a4ca44986ef9520062ced0cb9406064cfe70898
+EBUILD kodi-audioencoder-flac-2.1.1.ebuild 824 BLAKE2B 897e82bd0d5d7f1ba00b20d70b913be3b200e9d4bf527bc70d73ce9b44f54462906d4bb4211a686ae1f045c20d401fee19419b7d0cb69669decd3c12ec11bdf4 SHA512 300ddeb7a8d3e0f966fe87f57f80ae2fcb2ee82ea8471e3df885b14b6f720f4c734675ffd44b4457916f5a4acba33297b0a774bebe4f04290d6c848f4d4f83cc
+EBUILD kodi-audioencoder-flac-3.0.0.ebuild 824 BLAKE2B 897e82bd0d5d7f1ba00b20d70b913be3b200e9d4bf527bc70d73ce9b44f54462906d4bb4211a686ae1f045c20d401fee19419b7d0cb69669decd3c12ec11bdf4 SHA512 300ddeb7a8d3e0f966fe87f57f80ae2fcb2ee82ea8471e3df885b14b6f720f4c734675ffd44b4457916f5a4acba33297b0a774bebe4f04290d6c848f4d4f83cc
+EBUILD kodi-audioencoder-flac-9999.ebuild 824 BLAKE2B 897e82bd0d5d7f1ba00b20d70b913be3b200e9d4bf527bc70d73ce9b44f54462906d4bb4211a686ae1f045c20d401fee19419b7d0cb69669decd3c12ec11bdf4 SHA512 300ddeb7a8d3e0f966fe87f57f80ae2fcb2ee82ea8471e3df885b14b6f720f4c734675ffd44b4457916f5a4acba33297b0a774bebe4f04290d6c848f4d4f83cc
 MISC metadata.xml 432 BLAKE2B 08bd867e97f6d3b7a103a557f95103159b2df2be3ef336f02d1f2551acc722d59331f981d4069451e33439730f0e9648cabb6c2f8559e214b421467759202c3b SHA512 2ef0c92e158ae0677b431163a8ca974a90c9d8acdf9fc95c563b152f1250657fcc0d64a212ff20ddd46585284ffd2e732088426b1e033b07862bfa889b7a4058
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild
index 91fe93ee0acb..a90179ab97e7 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild
@@ -14,21 +14,22 @@ case ${PV} in
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
 	CODENAME="Leia"
 	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*"
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	=media-tv/kodi-18*
+DEPEND+="
 	>=media-libs/libogg-1.3.4
 	media-libs/flac
 	"
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.1.1.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.1.1.ebuild
new file mode 100644
index 000000000000..580c59f48c6e
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Flac encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libogg-1.3.4
+	media-libs/flac
+	"
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-3.0.0.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-3.0.0.ebuild
new file mode 100644
index 000000000000..580c59f48c6e
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Flac encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libogg-1.3.4
+	media-libs/flac
+	"
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	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 eca3bdf31ea7..580c59f48c6e 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
@@ -14,21 +14,22 @@ case ${PV} in
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
+DEPEND+="
 	>=media-libs/libogg-1.3.4
 	media-libs/flac
 	"
diff --git a/media-plugins/kodi-audioencoder-lame/Manifest b/media-plugins/kodi-audioencoder-lame/Manifest
index 390c031dbd91..9852c592d1c4 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -1,8 +1,14 @@
 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
 DIST kodi-audioencoder-lame-2.0.4.tar.gz 20819 BLAKE2B 38340fb3069cbb8539ead53e91dbcabd21e169fc5ab76d3b7142b126f192bf8a295e9d7ead2c4e68d822dc1596f0b7e83a962ef8709783979279e4a9aebb562c SHA512 8b57d20c2d02ec7148a83ab7af78eaf92b600a40faa666c4f26b5acb59838ade54f026dc3869b23fc79511fc5901acca5322d2f04336fc8d4f545f5d7c04cb2c
+DIST kodi-audioencoder-lame-2.1.1.tar.gz 26524 BLAKE2B 68f1d0f6a999b0fa8de42c1d9d3ee436eaebff9279f60c5677832f2eb5569e862cb2e11710bb04019483543939536a86e1a93fa156536806395195878393fb74 SHA512 ad8cdedc7973eeda3246428579aa27969528dee8cb4eb1c778a90bb6a537f6d448c9d8ef12af940faca5154c066107f4831bbabe7304a07cb236653e8a98be05
+DIST kodi-audioencoder-lame-3.0.0.tar.gz 28725 BLAKE2B 3dab3eef8da3979d5cf13a3542d55d0c9be6d43b5bf7a87a133c35449a8848c557792dc80e52337bf525e3f8fbb8f18dee6204b1ffba9ee2ad1d73b72724761f SHA512 98901f26d46318d35a41b6656cbe0e7b7e4f14db40af9341bc950ee33a2ffd73ad60edb77badd7d3cdabc01fb87eb573764b7736bea8a55ad0ffdd0ac0abd3d0
+DIST kodi-audioencoder-lame-3.0.1.tar.gz 28721 BLAKE2B fc5d2184ccfe29fa7c5eb148a026f3bfba40812b79a3efd45ef17e0899691a290b91e7364d5307d8aa522452590305cda2661e051ca74d9141a2b138776e5589 SHA512 4e8a3d2ea9ecbf3460e6e94cce0b1c3f425f825621e426801aff5602dbcd9cea6a079c67b9629fb95e26899b90b803e297b301a8d11506ba1d8012c5b9a231ae
 EBUILD kodi-audioencoder-lame-2.0.1.ebuild 647 BLAKE2B de177cc8b6520999c840a786a31e56d715cce0f815ddccfadba9f6f15e21c5c4931720c4bff995d2dff1a45179018f3d363c585b9ad054a658114d1ae2c4085f SHA512 3f17ff30706653b26f130e6323f0ec22d1bb0933667efde7280d7e97c22a908c651d193f5242115bb4b4af294da7285171104d6b62356d690c0906de1564a422
 EBUILD kodi-audioencoder-lame-2.0.2.ebuild 768 BLAKE2B ef79fa480179a1a7fb588c4cc93eab55dc2c6f345b36b6d61dc072bfb2e0624d61612fa4889ba0aa64c4fc4a4801845a8ef74440e03dd18af5a08b65c5155d58 SHA512 24d2cb05f0e98803a58af2df6c92a83eb932163f56439b4a038c35ebf8b97e2d1eb9da26aa5cdeffa1229d90187f19eb5be572ae45adc03e305d96b5a2e7ac6b
-EBUILD kodi-audioencoder-lame-2.0.4.ebuild 768 BLAKE2B ef79fa480179a1a7fb588c4cc93eab55dc2c6f345b36b6d61dc072bfb2e0624d61612fa4889ba0aa64c4fc4a4801845a8ef74440e03dd18af5a08b65c5155d58 SHA512 24d2cb05f0e98803a58af2df6c92a83eb932163f56439b4a038c35ebf8b97e2d1eb9da26aa5cdeffa1229d90187f19eb5be572ae45adc03e305d96b5a2e7ac6b
-EBUILD kodi-audioencoder-lame-9999.ebuild 769 BLAKE2B 47dfacea40915e869d838c29257045820d3955696c03f966fd4113634801e6827c17b96fedd7df16ca635c0fbee7be5a0d96b7b0c962aae4fedfda96e85315bc SHA512 01627912efda1c8cfac67fb552bbd0d6dfb6cf77ba91d5ee9fa22ce90a8451efd956cd323353fc3e924edda237101b3138ca2bebbad4de3b8f5e6232ab3fccc7
+EBUILD kodi-audioencoder-lame-2.0.4.ebuild 809 BLAKE2B f5bae0aa6f2e5c298cc3bc9930e19725d7cfdc2bbf04dcb7af944ca483ea5624724a21adac553c78db31f725f34c6aa98d7b28952a364bfe234de534d823819f SHA512 c4c0ac32f2db201976da9dee39607b0ab231c66ed9d5cf83bc7b282b775dea37a321b53e88be355236ef5ec13eb2649c2b11ac393ac900e18469479f23524032
+EBUILD kodi-audioencoder-lame-2.1.1.ebuild 811 BLAKE2B f3c905dbeea54b523c934acd07ba0befdf1656bf4b791cbc0e371d7b2e54fcc39c3733f0c01471b913c51171c8435610148805c749a86d7b9dce29f1282a495c SHA512 20d794cf201afa804273a2ad20fa693b123790b49dcfc9ae9dcbd87c11ad7643191000fc1391cbf760047ae61e9e6d47e45c0820ae67c5519c8d6dc8b8c040c7
+EBUILD kodi-audioencoder-lame-3.0.0.ebuild 811 BLAKE2B f3c905dbeea54b523c934acd07ba0befdf1656bf4b791cbc0e371d7b2e54fcc39c3733f0c01471b913c51171c8435610148805c749a86d7b9dce29f1282a495c SHA512 20d794cf201afa804273a2ad20fa693b123790b49dcfc9ae9dcbd87c11ad7643191000fc1391cbf760047ae61e9e6d47e45c0820ae67c5519c8d6dc8b8c040c7
+EBUILD kodi-audioencoder-lame-3.0.1.ebuild 811 BLAKE2B f3c905dbeea54b523c934acd07ba0befdf1656bf4b791cbc0e371d7b2e54fcc39c3733f0c01471b913c51171c8435610148805c749a86d7b9dce29f1282a495c SHA512 20d794cf201afa804273a2ad20fa693b123790b49dcfc9ae9dcbd87c11ad7643191000fc1391cbf760047ae61e9e6d47e45c0820ae67c5519c8d6dc8b8c040c7
+EBUILD kodi-audioencoder-lame-9999.ebuild 811 BLAKE2B f3c905dbeea54b523c934acd07ba0befdf1656bf4b791cbc0e371d7b2e54fcc39c3733f0c01471b913c51171c8435610148805c749a86d7b9dce29f1282a495c SHA512 20d794cf201afa804273a2ad20fa693b123790b49dcfc9ae9dcbd87c11ad7643191000fc1391cbf760047ae61e9e6d47e45c0820ae67c5519c8d6dc8b8c040c7
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild
index d2d98a617356..6f523be95226 100644
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild
@@ -14,21 +14,22 @@ case ${PV} in
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
 	CODENAME="Leia"
 	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*"
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	=media-tv/kodi-18*
+DEPEND+="
 	>=media-sound/lame-3.100
 	"
 
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.1.1.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.1.1.ebuild
new file mode 100644
index 000000000000..4d887654f37c
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Lame MP3 encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-sound/lame-3.100
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.0.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.0.ebuild
new file mode 100644
index 000000000000..4d887654f37c
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Lame MP3 encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-sound/lame-3.100
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.1.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.1.ebuild
new file mode 100644
index 000000000000..4d887654f37c
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Lame MP3 encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-sound/lame-3.100
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	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 6617beb066ad..4d887654f37c 100644
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
@@ -14,21 +14,22 @@ case ${PV} in
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
+DEPEND+="
 	>=media-sound/lame-3.100
 	"
 
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index 713fe583c951..a67410e9a99c 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,4 +1,8 @@
 DIST kodi-audioencoder-vorbis-2.0.4.tar.gz 16343 BLAKE2B 788d1a64dff47594841e129e734b8bb1f2589b18557ea78477607a265efcc34c723f8e632698bd78b46cc392489a9ef278c21da805f0545b3ebc37811cbb691e SHA512 df618e078d1b0aa3f9b6cbca87288908058f4de13e52056d66239e9606c67a31a84734d8d650520920b8a9e0dfbd1c031aa81e2d1ece1316c11fbd59a6a8d8a2
-EBUILD kodi-audioencoder-vorbis-2.0.4.ebuild 805 BLAKE2B 24360ebcc7a010ece1d84555d5cb957f5b449baca3930ad5136532fd3f0d7bae5ed8056e6895ada93e494a3381046cda6772cb8123d79ecfef9ae02be1c47b5f SHA512 58cfca007baf8ceeba7793de02fa7c697ac94a062b3edce51a76153c08dd26acd37eccfaef38fea637e9c44c4ac6729a8b18a0ddcaaeae110d3869576630c763
-EBUILD kodi-audioencoder-vorbis-9999.ebuild 807 BLAKE2B a08b001d1fb8f82b4f0aa4320f66a5502b8d1c8142bf1460f286b1e6480444024b86ba214f108d599a7e2d00f80075a18bea9c5ff71db725c1e070e54aa9245d SHA512 dfbf0a05bc6485af855363866a1e80d53582c1e41746198fd01f5be920f5620162d66ef7a1e20d91c30780b117f050a8d00832bfc3b6648178c2c3e8b3b62a8d
+DIST kodi-audioencoder-vorbis-2.1.1.tar.gz 21818 BLAKE2B 72f61ab6ac4a9482b8c1dc73207740f9eaa801c90cded5f690b9fcf7873fc59639f34f2aaf51c879071a4c989567fb734cf1fef485d80aa74002018693e0b739 SHA512 74b8528ee142c0e35c1c1254e40ed9d40f0021b615a96e65628e957c4d56093e889c61bf04639f0aedbb74b109eded756d428253ddda7bf094007d842967956e
+DIST kodi-audioencoder-vorbis-3.0.1.tar.gz 23518 BLAKE2B b995969f3d23ba0af692f571a7a92855b73d99f7360b169b7e69bb6e8cb6761de430a80041eef101025c9d83b05479780f3c67785161516d81934fbf07fb78e3 SHA512 f0e9e152574881943f4c8bad6e8249e502590503104e5c456858e25634004c223e9be91b274b2870dd07327254664f7ffa5549cf573241192088a3287d2511ad
+EBUILD kodi-audioencoder-vorbis-2.0.4.ebuild 846 BLAKE2B f69a215caa7973dbf3da36e7e6e97ac82105c454dae29b5e78080fb5a54a4f1cfb160ed4aae51b9829e3d593a36f09eda0b095a88b9668c95bd1be1d8accd325 SHA512 8fbee8fd1b494e8223ed8cfc2af20ca4f416f5de0e9cc02a5e04d0540ca7a7d96a67704bb0e6d3623abf69ea023dc1f397be4f5484e192c14d8cc6bfe76ae2a9
+EBUILD kodi-audioencoder-vorbis-2.1.1.ebuild 848 BLAKE2B 698ad3ef068771e23e33627f6bc8c9cc9ba7f960a4204fe5c4bba07087a2f41a1e91127ff05a6372e84b4675e15e5a2cd63da1d767dba372020abe205e58331c SHA512 4f0cbb2f72456a357639f908658b1aae54a273e29a5f91c9c4f63989029675f79b96d8f000761000542346633a5574a699adf857b382fdff620267b111a6bca8
+EBUILD kodi-audioencoder-vorbis-3.0.1.ebuild 848 BLAKE2B 698ad3ef068771e23e33627f6bc8c9cc9ba7f960a4204fe5c4bba07087a2f41a1e91127ff05a6372e84b4675e15e5a2cd63da1d767dba372020abe205e58331c SHA512 4f0cbb2f72456a357639f908658b1aae54a273e29a5f91c9c4f63989029675f79b96d8f000761000542346633a5574a699adf857b382fdff620267b111a6bca8
+EBUILD kodi-audioencoder-vorbis-9999.ebuild 848 BLAKE2B 698ad3ef068771e23e33627f6bc8c9cc9ba7f960a4204fe5c4bba07087a2f41a1e91127ff05a6372e84b4675e15e5a2cd63da1d767dba372020abe205e58331c SHA512 4f0cbb2f72456a357639f908658b1aae54a273e29a5f91c9c4f63989029675f79b96d8f000761000542346633a5574a699adf857b382fdff620267b111a6bca8
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild
index ed07dc68b7d9..50969af7760c 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild
@@ -14,21 +14,22 @@ case ${PV} in
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
 	CODENAME="Leia"
 	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*"
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	=media-tv/kodi-18*
+DEPEND+="
 	>=media-libs/libogg-1.3.4
 	>=media-libs/libvorbis-1.3.6
 	"
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.1.1.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.1.1.ebuild
new file mode 100644
index 000000000000..78220ef2dae9
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Vorbis encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libogg-1.3.4
+	>=media-libs/libvorbis-1.3.6
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-3.0.1.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-3.0.1.ebuild
new file mode 100644
index 000000000000..78220ef2dae9
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-3.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Vorbis encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libogg-1.3.4
+	>=media-libs/libvorbis-1.3.6
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	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 5552170ae472..78220ef2dae9 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
@@ -14,21 +14,22 @@ case ${PV} in
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
+DEPEND+="
 	>=media-libs/libogg-1.3.4
 	>=media-libs/libvorbis-1.3.6
 	"
diff --git a/media-plugins/kodi-audioencoder-wav/Manifest b/media-plugins/kodi-audioencoder-wav/Manifest
index 56509a6ae6a1..6daf99f1ea90 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -1,8 +1,12 @@
 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
 DIST kodi-audioencoder-wav-2.0.3.tar.gz 10447 BLAKE2B 8ddb4ce4777f35d75e428a4565dba5a949f85a262dec300a23f7b1425eeea416d7cd601fb5b3910df263edc420ea50111393d8d00d3d5834190040f9d5f4edd3 SHA512 f6b444483808b9e75426cd8b3252c4b3ed57811d9f1433d851d3cd6b3168f376bdfa2311aa3797642450b955ff8d231e40c7c49ad03a5f2b1b3e0679ec3a8617
+DIST kodi-audioencoder-wav-2.1.1.tar.gz 16194 BLAKE2B c08d249b264e198b8e8b87fa4ac94a20090cbef458af7609d156b42dc06e49661647dec762b9647181458a6d6110b24d9170fc1c2a63a527b7d42b0d82ccc93a SHA512 8d40387b792b55fd7348c34cb9d13d34fde30698269fd4871a793143ab1f877e3aac7ab1680581227ec48f80a9c04ca94d846b86013638d5939a6103dd0b138d
+DIST kodi-audioencoder-wav-3.0.0.tar.gz 17665 BLAKE2B 048915e147bd40f03db6b1cdb02183e1c68c298fe2251cc86a86fbfe2259f70fe17ede46898d1dc5b7d0261454fe0a65d74b8ac3cb19f465ef3eb8b6c1f5be33 SHA512 68673e432d377b895172e398628c5dfd506bdb46c83c38933d0d674abaf1715d44e488d4c158d27c0480b92a947f21534502aa8ed473e9225c37f62e28b05512
 EBUILD kodi-audioencoder-wav-2.0.1.ebuild 619 BLAKE2B 85236318958ef404e09e37f37880a9ae4f1fc875e197dd10b4ac9651eca03975b6015d774d006f4eba8bb7b057c924ea9381c8788bd45d507ca8f705a563c440 SHA512 457ee9c98394779b65e4697d84773313778ef65881ab508352312027af420821a3cdef2d2172bf1143b8a5ecf618736fb6b7e6c85bded6be884d11c6eef0a3e2
 EBUILD kodi-audioencoder-wav-2.0.2.ebuild 653 BLAKE2B d9f74a7e7a7238ba8f99fc114c0594afbb81bd6b27570c5d81b6c657a7973b69425f4c82611be8212934b522e19f7b4040d2e148be1a6d6a3b08d2c94d67ed18 SHA512 03a1c495f46df359a2fb25e0ac33d6327fd5032e892de143f201a998c493ef3d89403d4177c6d66b0da8a9a4ff997961ebc7b7423d3615e00fc25fbdc3c267aa
 EBUILD kodi-audioencoder-wav-2.0.3.ebuild 653 BLAKE2B d9f74a7e7a7238ba8f99fc114c0594afbb81bd6b27570c5d81b6c657a7973b69425f4c82611be8212934b522e19f7b4040d2e148be1a6d6a3b08d2c94d67ed18 SHA512 03a1c495f46df359a2fb25e0ac33d6327fd5032e892de143f201a998c493ef3d89403d4177c6d66b0da8a9a4ff997961ebc7b7423d3615e00fc25fbdc3c267aa
-EBUILD kodi-audioencoder-wav-9999.ebuild 654 BLAKE2B c2d97733eee26d3b203a62b71467e2ec8daa8fb38c09e5a0d8fc239085c4d17408043834c77aed4591f38eee0dc72f650e2f81b14eca38288cb0b48af6020e84 SHA512 bb2f744e2caf7805b1dfa030d68941ab0ef1f8ba8cf990299307a517da413dc025d60e404c35ae2119aad45ec9f07ebcae70ba3077f05b21f95b8e813b5e4e66
+EBUILD kodi-audioencoder-wav-2.1.1.ebuild 655 BLAKE2B d999a837ab23fcd34cc52f2bba451db7617156813c206c2ce8cbf4584d4584db2d22c014bbb3ad79ccf7574dd739ba40d12d897cbc1c78cd9af8b3eb742dbf9d SHA512 b5be906101342ea837a218e71679067fe778690363f63deb805bf9b3ef83227d67a7e89c5057aabf326b2d3239625823d7e18c373161a42c65221f4311e469e7
+EBUILD kodi-audioencoder-wav-3.0.0.ebuild 655 BLAKE2B d999a837ab23fcd34cc52f2bba451db7617156813c206c2ce8cbf4584d4584db2d22c014bbb3ad79ccf7574dd739ba40d12d897cbc1c78cd9af8b3eb742dbf9d SHA512 b5be906101342ea837a218e71679067fe778690363f63deb805bf9b3ef83227d67a7e89c5057aabf326b2d3239625823d7e18c373161a42c65221f4311e469e7
+EBUILD kodi-audioencoder-wav-9999.ebuild 656 BLAKE2B 29ade224eaa01c5904207874caca846523522d8632f411900dcaed926db7e1ebe0fe295bed9e79e654179fa4bb232a48083a4932b942d35c7886ca8e52ccde15 SHA512 677d1ee2a8e56bc6b235c857f9028a4798805b4cd86ac7cf854ba6284ba1c9b58138590fcfe8afc6be6c189638832dbd4ba50bb6aaef60d5dab22f627d19df96
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.1.1.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.1.1.ebuild
new file mode 100644
index 000000000000..7387ed345a1c
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="WAV encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.wav.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.wav/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.wav-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-3.0.0.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-3.0.0.ebuild
new file mode 100644
index 000000000000..7387ed345a1c
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-3.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="WAV encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.wav.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.wav/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.wav-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 5566b5dd943b..c4d9b77e9932 100644
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
@@ -17,7 +17,7 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/audioencoder.wav/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audioencoder.wav-${PV}-${CODENAME}"
 	;;
diff --git a/media-plugins/kodi-game-libretro-snes9x/Manifest b/media-plugins/kodi-game-libretro-snes9x/Manifest
index 938301a56423..9af6f509689e 100644
--- a/media-plugins/kodi-game-libretro-snes9x/Manifest
+++ b/media-plugins/kodi-game-libretro-snes9x/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-game-libretro-snes9x-1.60.0.10.tar.gz 1374802 BLAKE2B 3ce46bbda7412e7cd561ab3caf0f5d466ed23dd20ba730a6181ebf78d7d01f4f80b38d51b20061ac17e03e6e90047c977555e53ef3deb8f82b7dd409f8def750 SHA512 0b59b4d3038a0e85d2380a7de1ec7c8f70bc37679c7fe6ad1fc284ba2dabb195274c732dc7e9e6a78d4337c935de84087297424ec8afc981f08a70fba1150f31
 DIST kodi-game-libretro-snes9x-1.60.0.11.tar.gz 1374854 BLAKE2B 26d56c86e65d1aac7b90d9a1f4cdcc226c3e8d4edfd68a740846f4718f17dcc4fc114ed02ff6e737c3c6274a61c5f8f7b4b7833501365bd14a92be04e9e396bf SHA512 0d434053808f85b45ed7eb54de1dad8cb1d78b9e7c4cff25039620f622c942d10eb38c982c7ea92a160ec42f485a129a1b77692d6794628bf5ba0f778ea429a9
+DIST kodi-game-libretro-snes9x-1.60.0.12.tar.gz 1374887 BLAKE2B b25ff8975151eaa89bf3ccde4d8d70e12458468f63c55c3b611c0d1382fe5b5d482c617d07e48c87020365432fa73d41cb3f6f114e3ec93e1041f2f93dae9e1b SHA512 e7b92508b7c0fce6c4756a0fa1ad53935b5388fa4771b4cafabdeaa968f711fc8c5557ddf43c937e5c649ab34a814d134439630946ebbb40de58b31b14919441
 EBUILD kodi-game-libretro-snes9x-1.60.0.10.ebuild 936 BLAKE2B 81b18b77e848e7c09b74ddb869154142c7e0278ef4bf817a26e7ff0d7f12a45803469a3df80abb643b3abfed81bf87ab134f827b8c1f8a29a1830818f9b2f2ee SHA512 9cc7bbb7068a6688211ae6e357e609f691eaa08f34ebf4414202e996c7827634d972384715b983ad5ddf98d41c8e6855f9b5e67ee661139f81c380be4830cfeb
 EBUILD kodi-game-libretro-snes9x-1.60.0.11.ebuild 936 BLAKE2B 81b18b77e848e7c09b74ddb869154142c7e0278ef4bf817a26e7ff0d7f12a45803469a3df80abb643b3abfed81bf87ab134f827b8c1f8a29a1830818f9b2f2ee SHA512 9cc7bbb7068a6688211ae6e357e609f691eaa08f34ebf4414202e996c7827634d972384715b983ad5ddf98d41c8e6855f9b5e67ee661139f81c380be4830cfeb
-EBUILD kodi-game-libretro-snes9x-9999.ebuild 941 BLAKE2B 9352846ee95d9e11e9b6f7ea930e864d936bc48882f7acc9d2924e50db5360485799a74fcdced783c346478ec5fbf7b346aeb7a34727b284ab033f05ca3ce57a SHA512 e61149466dc0e1a04d53524ba68a93c2f4a3b3cc11ec0d52c28fbe8ffd18e4382187f084e673d17f927d5f2788ea11ba68348e9f5fda6ffbe196d93e3a31e0dc
+EBUILD kodi-game-libretro-snes9x-1.60.0.12.ebuild 938 BLAKE2B d2cb65c93093f891a56d267fe4fee94c5dd0cdf92fecc61e746f33fc5d5968cbcd6f586183860bf159f0a3305c53c271a0b2ad9983fae99c561aa03081d0c099 SHA512 882aba4ea6a6063b44408ccea8a49d3872950e1b2ab31e661d19c5b74a394e7c1a90441893296cc9f2d5b5cac2524bdae0110acbe7e9c76e597aaeb34adf3c89
+EBUILD kodi-game-libretro-snes9x-9999.ebuild 943 BLAKE2B 260a5014a243eda6a388a1ad1694114de9817b766779939453fb7d5c0676f8093ec7933084a32f7de6eb9770b91633a87a76b098f00486ec09639187e27b48de SHA512 ccbd05829df65f54b48efdee9039dba12c340c7bc74364fa4a7c1f2702881baef4e665f8c412d238d3d2ef7f5db40abf1164e4bb3abc2b3a751ab1bae0262d58
 MISC metadata.xml 439 BLAKE2B 6cec6faa75fdb35edf1f33f2a47d370318b8ab96f2c712571b33d22bc30130826cade398c3f7b4aee986e78baf9c3161b342215457b38d09994a1793b8704fdc SHA512 e3c0f999e2123aa2b23b0b29d1d6d24da0d804e435351c5971a2c60390c33bc3bf001571025cfe4ea7a76680a45be27f18169b201d16c8d8dcad9dbb55e9ebcb
diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.12.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.12.ebuild
new file mode 100644
index 000000000000..47c4e9a3401d
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.12.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Snes9x GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.snes9x"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.snes9x.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/kodi-game/game.libretro.snes9x/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.snes9x-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	games-emulation/libretro-snes9x
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(SNES9X_LIB NAMES snes9x_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-snes9x.cmake" || die
+	default
+}
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 1d5ec5a2f6b1..1b63e3b85540 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
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	SRC_URI="https://github.com/kodi-game/game.libretro.snes9x/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/game.libretro.snes9x-${PV}-${CODENAME}"
 fi
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
index 6b0863d2a1ed..a4afacdcc1b3 100644
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-game-libretro-twentyfortyeight-1.0.0.111.tar.gz 94690 BLAKE2B 54a48051a2b49161ab8fd75872935af2d313856b1e465d37270819aaaaa7548a01c4078020911e5630ecabc348475842c5d8f813cdb6e94d4868fbcc686fb423 SHA512 3f539c4e238ed9f8872fc443f15fd4ecf6234a6c5e3f9dd701b53fec0804a98f87d27a40023fd861afca3cafd4d17fa5b187e24b921fd87d37a23205a6c798e8
+DIST kodi-game-libretro-twentyfortyeight-1.0.0.113.tar.gz 94713 BLAKE2B d161fd0b5314b21bdddb97cd4a4bcdf6066ad6b0280d75ca5c810435867d0edc1b7d58e77021744bc9d39628025d151f628ef07f3e9e5a6be8cc1b039dd0ae2c SHA512 19e667bb4a658a8319c626113f8ff839d5c84afd23a1dd013adce51a29cc9761cd2a93f30f4a8cf3a82a84685269c8e5354982b3022d464057a6f6059eb301d3
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.111.ebuild 920 BLAKE2B e79ca0c71d4d2bfe9a032236396d6429f5d2ab2b37e5758635dc196a8aab9258176887026bb48f726859f3b8c89c515aa541a9b548260382cace23ca5bf2e97a SHA512 d3014ecaf71d074b0c4d82949acc4e6333cb6c20f65daa1e37609a0af2aae751b100751d2aab269344f354e64b09dc784d281ead4f7a5fa6af9b83f54ff3ede0
-EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 925 BLAKE2B 90e52c9d467f6f545c7f5f027e04426b3b12492fd9d2cbc46ec393d86c8f5736b4689680f0b79bd0bcb1c189865652e4679ad0fee42718b5a18ca219f5aab262 SHA512 ecd3bb0678747a6ee0b91fb7bf1bb283f0d999988f06259f8e55309fc929051bd2a80adcd2e5b07684b35f322df83ab951b3708775f596b4c3c6cb501decb5d9
+EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.113.ebuild 926 BLAKE2B 20e2e512c04c3c8370be9c3c77dddb2f8379ec5fb0e37ac2e1b97f2f93d5f626f43009eb531c19383b3cf9130947e5eaf319dc5982162c7dcf3761c38f15e58f SHA512 0a3c51312a25ed6ae45c86e27cacf6f9bc5d6ca623fa529062cd790f50eacc10c98ca0fc084288b6f8b9cd4051d7ffe279e72f5b3c9b97e783025d5f9c4eabac
+EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 927 BLAKE2B 4e305e130809f3b107a6d5ca442213fa4c6f0b3995b6c508890dfa0d835ee4320bde3d38d4ca4e9d8420fc40d56f74d19d3e55c97e73da1f1a74c7b8a61ab1b0 SHA512 7c39e51a0806f3dd2c05c3ca29c929cecdd404e3cce3b72e3127e4da3e4c7f3d001761b258729f3c1013a31403ad447cee00d8d51c2cd58fd0f87e8269596939
 MISC metadata.xml 424 BLAKE2B ebec5842d30789985a87b437a5684959fbd41f0d93389726be3bf30b07e49fb851c095f0b1e2edcd6245241f83bf37668ce6494ebcbb90b7e9d6421cbd15ce03 SHA512 3b407c1fad96600c9f9ce0c1f8cf0f3695a5cb41d66762e79b0e0428ad36af0eca33a0ee421d364fb979b661fbe62a047f48ed10f71fbd963e64c205d0174b5e
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.113.ebuild b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.113.ebuild
new file mode 100644
index 000000000000..40a5d4cac208
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.113.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="2048 for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.2048"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.2048.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/kodi-game/game.libretro.2048/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.2048-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	games-emulation/libretro-twentyfortyeight
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+
+src_prepare() {
+	echo 'find_library(2048_LIB NAMES 2048_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-2048.cmake" || die
+	cmake_src_prepare
+}
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 54c4ca455484..c87648aaa370 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
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	SRC_URI="https://github.com/kodi-game/game.libretro.2048/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/game.libretro.2048-${PV}-${CODENAME}"
 fi
diff --git a/media-plugins/kodi-game-libretro/Manifest b/media-plugins/kodi-game-libretro/Manifest
index 66330af88643..f6696dbd43b8 100644
--- a/media-plugins/kodi-game-libretro/Manifest
+++ b/media-plugins/kodi-game-libretro/Manifest
@@ -1,6 +1,10 @@
 DIST kodi-game-libretro-1.1.0.tar.gz 101454 BLAKE2B 8fcd65c8221b0ec4d24a41361eebcf1a144906e86b46749625462d507ca2813b6fdd0cb63ef0fcbe29b1f11039dc5b9cdf3d24eae788e4c275200c93855eed7b SHA512 80cc868d57d4284085a7cd736930da6f1b2440cbd8667a20634c329c282e7f0b79158d4d510504a230427fae4d84d9ae29c7a76fab5e2a23820bfa72d75a8e91
 DIST kodi-game-libretro-1.1.1.tar.gz 102246 BLAKE2B a158a0148845dcdaf563b84739b73fc72f29f5795e66c748aae6a761da7765fdd3f70f2cdf572c4c987cfda6ef7ec50bedb7b0a1c20e72e9f3157b333cf5c832 SHA512 f26776eba765a010a86994a02658045ca0c1e887481a31d90ae388765620fb1a0cbd4da79285ae161e99feb311ca9ddccd25193a73a22e7c5f19a78ff1164920
+DIST kodi-game-libretro-2.0.2.tar.gz 109177 BLAKE2B aaa853b8719004386e1ca01041ed7613f0bd263e16d1929f6f4cef05fd4f7bc2ef99dba97730b35205790e2e24df078def73e4c021f6e01db850ee07206d0576 SHA512 02a2a9e93fa522138cf15dfaf29b86ca9e6b4d2707e7fa4f7e4e613db141dd9daa2af1920920f1228616b3c03b528b630824f106aabcad00842ad8c5fd786d51
+DIST kodi-game-libretro-2.1.0.tar.gz 110430 BLAKE2B e4a7c92914c4a56783c8f8d7c8bf94eea387fe92e66e794fc45737e26776b37b1d55953367dc36d98e3dcdc4755db5096ad9a35439499385d3d3e9b4e651a6a2 SHA512 f9d86291480db8de4276df37ddb502c7ddff3f0e33caa757debf6eb8f54b02a62940d183bb9b5094cfc3b4398fe21dd76ab0450c05704ba540f44c817ab7ddfc
 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 739 BLAKE2B c3eb25340d9445a9cb8b7e5fe39de6802e731d308517907d9c8f383d198039724494c6e7110db5ec9725ff6f6b89d397f268531aa01a8402799677ba58972583 SHA512 621ba60bf8cf18f5135c52c1c1071f4a30ffd8ce21aea94f249e2edd407d68be6032317130eb4d340ff0f5e4f0fbac8c60299f9d409213fdc2d80043a7c19373
+EBUILD kodi-game-libretro-2.0.2.ebuild 682 BLAKE2B dbc2d96c59d541a0dd4e465a2158ef83be684181cecbacc398921ce91f596ebf13cd8da87dd653771f5c42c01e2b723a7b1ba0d6cd45afa01684542e60611c30 SHA512 4eb201823ce967d20f9e1a969ffabccf512963786ba0b9df94426b11a82043029970dbf36f32d90c35c2ff09d8980599c490b1462a3a728cd9a9c871e55ae6a3
+EBUILD kodi-game-libretro-2.1.0.ebuild 682 BLAKE2B dbc2d96c59d541a0dd4e465a2158ef83be684181cecbacc398921ce91f596ebf13cd8da87dd653771f5c42c01e2b723a7b1ba0d6cd45afa01684542e60611c30 SHA512 4eb201823ce967d20f9e1a969ffabccf512963786ba0b9df94426b11a82043029970dbf36f32d90c35c2ff09d8980599c490b1462a3a728cd9a9c871e55ae6a3
+EBUILD kodi-game-libretro-9999.ebuild 683 BLAKE2B 57220c351b1dcced47b15b4d2a35b545ffe6a77b41e0d95104caf4b7fabde65d6bd97e146309e9aa4ea746836715bf438db31467f579f0f61531f6313b597399 SHA512 ec20589a4caf202b401460f231d75b19b3c4386b8752c83fca6b06310d133659be78b824fd6c787c4f3f3fcc3f86de28720e7cf9501bf5aa7a30d0bb62e1fd3e
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-2.0.2.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-2.0.2.ebuild
new file mode 100644
index 000000000000..c9b9d57b397d
--- /dev/null
+++ b/media-plugins/kodi-game-libretro/kodi-game-libretro-2.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
+HOMEPAGE="https://github.com/kodi-game/game.libretro"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/kodi-game/game.libretro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-2.1.0.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-2.1.0.ebuild
new file mode 100644
index 000000000000..c9b9d57b397d
--- /dev/null
+++ b/media-plugins/kodi-game-libretro/kodi-game-libretro-2.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
+HOMEPAGE="https://github.com/kodi-game/game.libretro"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/kodi-game/game.libretro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 71dd76e64dda..44afb58a78b0 100644
--- a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
+++ b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
@@ -17,7 +17,7 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	SRC_URI="https://github.com/kodi-game/game.libretro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/game.libretro-${PV}-${CODENAME}"
 	;;
@@ -29,8 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
-	=dev-libs/libplatform-2*
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-imagedecoder-heif/Manifest b/media-plugins/kodi-imagedecoder-heif/Manifest
new file mode 100644
index 000000000000..516281216624
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-heif/Manifest
@@ -0,0 +1,6 @@
+DIST kodi-imagedecoder-heif-1.1.0.tar.gz 26928 BLAKE2B aadd843020ebc29608c53c3c3bf34d1280cdde6c8636649067a169decb2d141c6898b083d1ad7ecdaabb8c06aa1f510f87d38156c9e1a77f9844fe2a227767cd SHA512 7c3ba8851fbffab24db0951a5aaca51ec4391e1350c2d9f9317bb1d305f16c210b404299f8c20c6208f5b8dbe1f53598d2d3fbc9b2e62ccadfbb84e3936ec04b
+DIST kodi-imagedecoder-heif-1.3.0.tar.gz 32393 BLAKE2B 76981fe8759e93b2aaf5db5452db4fb414d295d637bdd38950fb89ba0e21c9b22a7ed87dc183bd3c47f457c09672348e9af74a9015408ce4214dc847599cbae0 SHA512 63181558f31804a1dd12f4a895535ab303c5e3c5f75b5fcc5bdda892b31a78d9b48b917d85dba66df23a8d118eea83825d24c4b797b289be11169b3a1a29df4a
+EBUILD kodi-imagedecoder-heif-1.1.0.ebuild 882 BLAKE2B 1ab3ba3e6def65fc22499c19002f8f55abca158d5d730e824fc096197f9d5320c484b6df86531c8b1103e93523af91b00601db5d871be53f13c255ef5c6213b7 SHA512 6aab4c94712ff5b548d8bc38b6eb22acd8e919236d44f9c64a9b67d9a5e5ef9b800d312ac496cbd38b0d69a48f878ac81d6b979cc9d3c6c706326965b39cc739
+EBUILD kodi-imagedecoder-heif-1.3.0.ebuild 872 BLAKE2B 6be25f0b8c58570e85ad19127d4105f358e4dc8f4b531c8e5a94c2fb23fbaceea45bcac9f19dcbab1181c96c44dae54aa15fc2c55182d614717f17464a8805cf SHA512 f54a57869c93cdcbd2f23845c5bd1388e87cba5a204455945d5c30ee22b81da2b25707876a73f0daadd7bcc255aed6c59e0cc79e305c463ea86393bf215b48b4
+EBUILD kodi-imagedecoder-heif-9999.ebuild 872 BLAKE2B 6be25f0b8c58570e85ad19127d4105f358e4dc8f4b531c8e5a94c2fb23fbaceea45bcac9f19dcbab1181c96c44dae54aa15fc2c55182d614717f17464a8805cf SHA512 f54a57869c93cdcbd2f23845c5bd1388e87cba5a204455945d5c30ee22b81da2b25707876a73f0daadd7bcc255aed6c59e0cc79e305c463ea86393bf215b48b4
+MISC metadata.xml 495 BLAKE2B 50fee8ac28478455e2f841b59e31f3dcaf5bc6a7e224ce9674f42f79b821d6c9b460705b952f42c492ec5a2ff91a8dc8cb075e1b1a3782d422bc2cc97d40ef23 SHA512 bb68b1780e35d7a9a1b194402912f60906fd6b599bfa790056af14cbd51b7196c6756fa6dccde1bf1526d910e0eae44e88a4267aaebbf91903df9bbcc48ce05d
diff --git a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.1.0.ebuild b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.1.0.ebuild
new file mode 100644
index 000000000000..d9d8059b0b48
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="imagedecoder.heif"
+DESCRIPTION="HEIF image decoder for Kodi"
+HOMEPAGE="https://github.com/xbmc/imagedecoder.heif"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="=media-tv/kodi-9999*"
+
+	;;
+*)
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libde265-1.0.5
+	>=media-libs/libheif-1.6.2
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.3.0.ebuild b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.3.0.ebuild
new file mode 100644
index 000000000000..feadc6204739
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="imagedecoder.heif"
+DESCRIPTION="HEIF image decoder for Kodi"
+HOMEPAGE="https://github.com/xbmc/imagedecoder.heif"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="=media-tv/kodi-9999*"
+
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libde265-1.0.5
+	>=media-libs/libheif-1.6.2
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild
new file mode 100644
index 000000000000..feadc6204739
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="imagedecoder.heif"
+DESCRIPTION="HEIF image decoder for Kodi"
+HOMEPAGE="https://github.com/xbmc/imagedecoder.heif"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="=media-tv/kodi-9999*"
+
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libde265-1.0.5
+	>=media-libs/libheif-1.6.2
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-imagedecoder-heif/metadata.xml b/media-plugins/kodi-imagedecoder-heif/metadata.xml
new file mode 100644
index 000000000000..43e482f1bb34
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-heif/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <maintainer type="person">
+        <email>k2k@narod.ru</email>
+        <name>Karlson2k (Evgeny Grin)</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">xbmc/imagedecoder.heif</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/media-plugins/kodi-imagedecoder-raw/Manifest b/media-plugins/kodi-imagedecoder-raw/Manifest
new file mode 100644
index 000000000000..9462ddc2d365
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-raw/Manifest
@@ -0,0 +1,6 @@
+DIST kodi-imagedecoder-raw-2.1.2.tar.gz 51308 BLAKE2B 6b1dff38073ae3f97f070bbc8ad2b35d168c4649515f628627f5d146f3449108f6ce4b5c89fb862b206f84c1be99798c3d59f247d89180157b2bfda46af7cc44 SHA512 502594f19532535062c561d3a70035385de0001ac75783451fb734bd321235bf71009644f3add84a6c7ceccad985e2be30c797b594b1a941530cea0f72113385
+DIST kodi-imagedecoder-raw-3.0.1.tar.gz 51343 BLAKE2B 04fb42a64dfd712bcefc6c81af6519566c1cfdfaf97115dec28d4cb05794b918baf4d50179bbc43faac41294b8398f615e6562a310503b13bd18b2d236559bde SHA512 ac4c3a4d042bb8c18340efb2f2929f6301089a407731d6cc371b7b888da978bfb017e0e563d614209bce396f9425c4a618b6109f228c4943282ab4b823f159de
+EBUILD kodi-imagedecoder-raw-2.1.2.ebuild 882 BLAKE2B 40afad0721f24d7566fae1e79fc3bdfa5513f445e5d38a1e16f1bfec8ca29f68437a10a0d0fbff09a137cbf33e97bf2b667c86b911de071557bfe87847d09466 SHA512 e2a77a65a94f9d954702e2c743398ea69df0a8347a668ca174e8dee9db59018a6c2245288da4ea49e000b0c48e425bae71adf5b0cb718dc187e3ee65333a7fe2
+EBUILD kodi-imagedecoder-raw-3.0.1.ebuild 872 BLAKE2B 64b8d15b4ca3cf877cd1a965536911c9ccb5af8397fc3cec65a5648dc6fe1bf846bf9c22e425938a57ac21bcc720df69c7cdf3819e8bbe3ceb59cbff3b2956b3 SHA512 14c3d76a0fa85a7bc1d3fa8efcbc8cd7de3d75064778c2e624f58b80d60fd9d3231266c142620f42554b373644c1acc0355eb8a7cc732a2608b7cdad740fcb02
+EBUILD kodi-imagedecoder-raw-9999.ebuild 872 BLAKE2B 64b8d15b4ca3cf877cd1a965536911c9ccb5af8397fc3cec65a5648dc6fe1bf846bf9c22e425938a57ac21bcc720df69c7cdf3819e8bbe3ceb59cbff3b2956b3 SHA512 14c3d76a0fa85a7bc1d3fa8efcbc8cd7de3d75064778c2e624f58b80d60fd9d3231266c142620f42554b373644c1acc0355eb8a7cc732a2608b7cdad740fcb02
+MISC metadata.xml 494 BLAKE2B 0d474ac752f83269cd0f1af90e9b0915a7e931ae48568a0db1b3fe282a7acb5ab1b4a818dac52eb87e93226308d00d8fe3845ca6e8a0b16c2a2c06bc56482707 SHA512 3d01ac0d2ee617a08e5dfa5613027f24997427de28c416564b9cbb7152b1beaa2a55df9be344f8d3edf2ae0ebfb406ce0c2df57f4a193c4bd438d04723fe02b2
diff --git a/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-2.1.2.ebuild b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-2.1.2.ebuild
new file mode 100644
index 000000000000..da5659b403da
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-2.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="imagedecoder.raw"
+DESCRIPTION="RAW image decoder for Kodi"
+HOMEPAGE="https://github.com/xbmc/imagedecoder.raw"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libraw-0.19.5[jpeg,lcms]
+	>=media-libs/lcms-2.9
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-3.0.1.ebuild b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-3.0.1.ebuild
new file mode 100644
index 000000000000..c9ee870557e8
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-3.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="imagedecoder.raw"
+DESCRIPTION="RAW image decoder for Kodi"
+HOMEPAGE="https://github.com/xbmc/imagedecoder.raw"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libraw-0.19.5[jpeg,lcms]
+	>=media-libs/lcms-2.9
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-9999.ebuild b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-9999.ebuild
new file mode 100644
index 000000000000..c9ee870557e8
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="imagedecoder.raw"
+DESCRIPTION="RAW image decoder for Kodi"
+HOMEPAGE="https://github.com/xbmc/imagedecoder.raw"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libraw-0.19.5[jpeg,lcms]
+	>=media-libs/lcms-2.9
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-imagedecoder-raw/metadata.xml b/media-plugins/kodi-imagedecoder-raw/metadata.xml
new file mode 100644
index 000000000000..0d9eaa00feeb
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-raw/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <maintainer type="person">
+        <email>k2k@narod.ru</email>
+        <name>Karlson2k (Evgeny Grin)</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">xbmc/imagedecoder.raw</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 4af20e1f90c9..e3a2cd438668 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,6 +1,9 @@
 DIST kodi-inputstream-adaptive-2.4.4.tar.gz 727535 BLAKE2B fac4034f3333e01951ad592e16cb4f7978cbfb96bf7b7492d8d80c663e7a95a14647a5d68bd32a97c7a4550428359561bbb4a880544f9b76ebdb17fe829d706b SHA512 5ddc8ee08144f43369d807b1a8a2b1fc2fa70a3a0063be09a47d1df021442f0a7fb46acf2399e458bb807429f38abe9bdea5b4994ab58f93f07214b330e150f2
 DIST kodi-inputstream-adaptive-2.4.5.tar.gz 731621 BLAKE2B 8f644efcce0268833fc0688ea291558e9eaf3b0732656e865299f39cfb5cf3c51cd5dc460139fd457c83bdcaa065be916794886fbc75225d2a8eef87249147b2 SHA512 b38e175fb21dcc155aa5b5cda4ffdbd26336a763c9ecf8857058352a3a8f6d9a617a4999f6aed1bee4edd97d18e7a1f4e4a2318cdf871982415e7dd2b519f498
+DIST kodi-inputstream-adaptive-2.6.0.tar.gz 731726 BLAKE2B ab0c39e936cf80069753293fd93e0bfcc1d952c05a43402cb0b351003130738da3cfa6a98970d7eab5abd1e2224e3402f947c260789d967fa7f5459e243e1c08 SHA512 2c9f61831a7a8e3ba33438d00b5a9611fa643bb296b209fcf68fdec129c6f6d38b2cd6cbb383472187122b983d794519eab68b7e948275f98e9deddce3763eb0
 EBUILD kodi-inputstream-adaptive-2.4.4.ebuild 765 BLAKE2B 71c04c5948acfc0f891ca14c69aa7e1d13d5ca99bcd9485c159362b2b193d9f552c95c198b8673d79fd1797503ec709b9775f2727efd1997af9a87dce318686a SHA512 d4d91d410b73613bd19095dff69d36dd127b45bf7a2977f90fa634525a2b95e5d88b42610995685c99311bbcc27f37cb064984aa7103e5aa4ee99e5f618fdf39
+EBUILD kodi-inputstream-adaptive-2.4.5-r1.ebuild 874 BLAKE2B 369b9343c46080c24cf1bde3b56dfa0a9aa084e68dd615e6638f1b26e0464ea7474880969551c4011314dc3ab3cb4415ce5affa35c21f59c615b69cd2e17ff27 SHA512 6712ba9713dd12e08ffc64468a8145bf6c5d5a4d2c8e78c1c491064b8d36c46cd730c51e5747eed9592fc6ca0371730966c163116e7d9f4f94de795069c58952
 EBUILD kodi-inputstream-adaptive-2.4.5.ebuild 765 BLAKE2B 71c04c5948acfc0f891ca14c69aa7e1d13d5ca99bcd9485c159362b2b193d9f552c95c198b8673d79fd1797503ec709b9775f2727efd1997af9a87dce318686a SHA512 d4d91d410b73613bd19095dff69d36dd127b45bf7a2977f90fa634525a2b95e5d88b42610995685c99311bbcc27f37cb064984aa7103e5aa4ee99e5f618fdf39
-EBUILD kodi-inputstream-adaptive-9999.ebuild 836 BLAKE2B edf07ed61ef0e7ebb3e0a5d9210ce390cfa78a4e14beeb69164b7e921ef3fbb2407f564bfe5c3df12b13cd1b9a1bdbbe573ed8d212cc23f16a10b02ae6e78559 SHA512 8390ae7d060df1c33655e53a90309194911575fbabbc04a168151a0ea06cf1e70f43283103574893690f06c8a5843f6f8104f2338c634f2f416cab5cc9f21996
+EBUILD kodi-inputstream-adaptive-2.6.0.ebuild 805 BLAKE2B 71bcc875bb24adedb30fc8c187b52ac393b9faf613b9a3a18a81b63ccb6443f7445a6e9d9ff8607bb5fd603d7762bd52cfeed4abf2e9b8401a116f75afb64612 SHA512 9ce95379f2e314b1d8f2ff38c8006baa75c4b55f91ebe46bd4db2818faf1b8e4951f4e8f6e960b3687cb1e3a9c19188102d291fdcb82469cfdc385b23272e8f3
+EBUILD kodi-inputstream-adaptive-9999.ebuild 876 BLAKE2B 40d3153ecc7418d1c0c4b5406e9ddbefa877aa1ab4d3b63b1223754d4c0630405471e63317843696bd1165175bc74d41e3156c89e13fabd72e0372118cb562c7 SHA512 9458947596c7edee381a5d27d105277506f04ac5472c9f2c4e0cee25a46034955ed9164466571a9b04d54e37482f3ec74346b98389f2154870a7f11dbaf5255b
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5-r1.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5-r1.ebuild
new file mode 100644
index 000000000000..1185349b60ef
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+KODI_PLUGIN_NAME="inputstream.adaptive"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	dev-libs/expat
+	"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.0.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.0.ebuild
new file mode 100644
index 000000000000..e11b1e51347b
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
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 288d61ebc27b..18e80d341a6d 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
@@ -3,41 +3,41 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Kodi's Adaptive inputstream addon"
 HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
+KODI_PLUGIN_NAME="inputstream.adaptive"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	EGIT_REPO_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}.git"
 	EGIT_BRANCH="Matrix"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
+DEPEND+="
 	dev-libs/expat
-	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
-	"
-RDEPEND="
-	${DEPEND}
 	"
 
+RDEPEND="${DEPEND}"
+
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index a83f69469db6..e0cfa8fd9f4c 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,4 +1,7 @@
 DIST kodi-inputstream-rtmp-2.0.9.tar.gz 66408 BLAKE2B 466419ef7182c53ddbe358ffb9480f756b8ab7f1f8fe790bb7942ac1cbd14731e4ef2faa0c15d31652733fe49881cf7588a6e560e6f132b61da47d7a8e0e0367 SHA512 b38b45f6313bcf2827eabf80875840b8b24cf010e0f44c20241f8a20f438273020ebd34078562581c34c83f3c9109ec953ef1de819c85de2260f0377903fbd23
+DIST kodi-inputstream-rtmp-3.1.1.tar.gz 75658 BLAKE2B 4a776d3e44326cfa8195ad75b49eecba08d4a6de6a43ea51ee31791556ed2a28536e77033d0c9833838be9a27b2a32dc5ac34c4e9ee92e7a9084b021afbd1100 SHA512 9509fe681c3e2699ebe18a3090bd31c32ccc2634ee0c3c5a686b380ce1d104ff7ec1620f6615495d26fb271164592c0cb4f287ef1852468edddfec9440773a53
+EBUILD kodi-inputstream-rtmp-2.0.9-r1.ebuild 870 BLAKE2B 6229a48d0be846dda6b5c8a9d674667082ec2fe99e51e167255769eb95f89fa8d7979a4085f692559123da5a60d8eebb2222f9f4c8c4eb8c7cdf598b684f6922 SHA512 ea126c01a4c3fd910c52ea1bad96a57f46775ae73a744c752176705d58e76b4ae339ee0065e5a31807c0dd96b61c28ea9192d4bc886d0a6d87571af2ceea553e
 EBUILD kodi-inputstream-rtmp-2.0.9.ebuild 757 BLAKE2B 5b46c0b9291a24577d5895b53295fa44ff0e8d75f0917daac4915a039e445f3fd285d7084eb5e30d873a511533d65949bab87f70169311706613a49fc685aeb3 SHA512 7bb521e1bf183c4d8cdab8ce936febf6181b727160346c3d0716d6cc037666ebce2caa5a7e32e32872d9dc5dccdbb842c36f505885a8b4918b8f0068ec3b58b9
-EBUILD kodi-inputstream-rtmp-9999.ebuild 780 BLAKE2B 532e212bc5d34fc156c775edcaea9b307991f44ed03c38d5d84a75ac34a79a16b1023b45b7dea39c7245cf1e39f2b70ede1fdd857de008e4e700f2e2c13b8ebb SHA512 a2c1236c3a5529af7f5e39e3ee5aa48e50dd3aadd663abf21b60b2cda4fbe88b83d47c855ee25042c47c4c6cd3ded1ede35059fc683606fe67704108e24bfef0
-MISC metadata.xml 433 BLAKE2B 5b159068b2431fb4b669662f4e36d8768afbda1e076e866678c193590945ff0ba4d6c03228475dda7bb7ca5d204d09e0e5d5804baacbfa653563f199045a1c80 SHA512 0cb47e468304977fd3624c4ec07d254271406897eb4601eac57a68167463a8379e3d8cf4d4e0e4988ae78d832ae39da9a457ba30a7c0fbbe8a32fab4e5e94f53
+EBUILD kodi-inputstream-rtmp-3.1.1-r1.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
+EBUILD kodi-inputstream-rtmp-9999.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
+MISC metadata.xml 364 BLAKE2B 0b1adf56169d01816334fa11c7b1a6f978d51a262b4324248e4381e158e8e9e9f0488154bfbcf4067edd93dec8f219676115ca1c23b7e6ecae0b95b896383c02 SHA512 ca3f4281e478607a86570a19c4fd345af115184527b623711943a96c222e2f7e08fa593b86c4cda89e109f32bb02eccbe94d1a78281aa9bc2a899fb2bfc6f976
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9-r1.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9-r1.ebuild
new file mode 100644
index 000000000000..420dcee6d343
--- /dev/null
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Kodi's RTMP inputstream addon"
+HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
+KODI_PLUGIN_NAME="inputstream.rtmp"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	media-video/rtmpdump[ssl]
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1-r1.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..a0b89342cd1c
--- /dev/null
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Kodi's RTMP inputstream addon"
+HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
+KODI_PLUGIN_NAME="inputstream.rtmp"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	media-video/rtmpdump[ssl]
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	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 65b4a76c90df..a0b89342cd1c 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
@@ -3,40 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Kodi's RTMP inputstream addon"
 HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
-SRC_URI=""
+KODI_PLUGIN_NAME="inputstream.rtmp"
 
 case ${PV} in
 9999)
 	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	EGIT_BRANCH="Matrix"
-	EGIT_REPO_URI="https://github.com/xbmc/inputstream.rtmp.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/inputstream.rtmp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.rtmp-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
-	media-video/rtmpdump
-	"
-RDEPEND="
-	${DEPEND}
+DEPEND+="
+	media-video/rtmpdump[ssl]
 	"
 
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-inputstream-rtmp/metadata.xml b/media-plugins/kodi-inputstream-rtmp/metadata.xml
index 1ebb385c856d..d571b6f58c00 100644
--- a/media-plugins/kodi-inputstream-rtmp/metadata.xml
+++ b/media-plugins/kodi-inputstream-rtmp/metadata.xml
@@ -5,7 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription>Kodi's RTMP inputstream addon</longdescription>
     <upstream>
         <remote-id type="github">xbmc/inputstream.rtmp</remote-id>
     </upstream>
diff --git a/media-plugins/kodi-peripheral-joystick/Manifest b/media-plugins/kodi-peripheral-joystick/Manifest
index 53118ad1b408..34e6e53ed061 100644
--- a/media-plugins/kodi-peripheral-joystick/Manifest
+++ b/media-plugins/kodi-peripheral-joystick/Manifest
@@ -2,9 +2,11 @@ DIST kodi-peripheral-joystick-1.4.6.tar.gz 91142 BLAKE2B c80daf4e9a425c88ecb323d
 DIST kodi-peripheral-joystick-1.4.7.tar.gz 90671 BLAKE2B 281a1d821586224ad155ac621fe5fd48c189733277c877799355bf432a580311967c7300cdd201ca9561f149b42b3327a320bd3641108d8c69cbfd27242ed4dc SHA512 89d9c993f598f7660fccfcc1926ad3b944d88586b0399b3e47524fe5a68665eec8fc7b196acd6d59e36488f830afef50c402ecd05d69cee75c21a69c538e9acd
 DIST kodi-peripheral-joystick-1.4.8.tar.gz 90965 BLAKE2B b9bb3aa6e1a5531c304f2f3466bac8f00cffcd771065052d41645f48316c7b246fa07823395aeaa484ca9839d1b8025e6640e7cb504d29642d52c02a1fb21553 SHA512 4ca692589050c225bb9ec45b79f3532a4c572c57b3c2400dd4afa398c3d77194136ffde7bc85b7d24700d7eafb0f813cc3fce5dc48d4de51869fad0f68679939
 DIST kodi-peripheral-joystick-1.4.9.tar.gz 111161 BLAKE2B bcee8aedff118cbceec050ae1b6c0a559aeb735c539624f59ae59648107937b5a904ed24bc1c323443e00289d78b2c1b83ff8e18fc9affb22b8ca706b115fb12 SHA512 6d5d8e5922c7b9c38a55372da585366331f550864ee7d95369bb8b32897250b38d4cbb0e2f5fc7eb91aea34f09f6f33a62b148f731f422ac1b6ead9b2eac4ae5
+DIST kodi-peripheral-joystick-1.6.0.tar.gz 117163 BLAKE2B 24e6eb1b4b4310fc3fc452a719094cdaac7caf7ef4825add4a9bcde453044e5a352b859b0c247fa445bde5554a3b82e40c65f185adc524f855140126716a3e27 SHA512 9fd11af0e75a80cfd1086caf29213616a441c0f8c5066ab2d54dac94603240c5f13af9048ae0691f6bd34511ac36c8cf478cdd6cd179ef97f282ae82f932e0fe
 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-1.4.9.ebuild 760 BLAKE2B 710419d728e80a52f1fa4902bb633dd5299b666a53af35bfaa3b9d27780bcaed98a4c5f7cd43dea02f3b142cfc4ff65aa697581bde1d1010b00431c1145d27d7 SHA512 b372ff1138e02fd62b7af5e187c89e3a0802c58fddc21470ae24b68ce0719b7c5ee6d0814807f6f8fc9aaa8f2545468bc1301402085b3c6216fd0ede38fba17e
-EBUILD kodi-peripheral-joystick-9999.ebuild 780 BLAKE2B 30fda77bc405e5aad2fb95940d14fe6d9ffd2de69697f46bb0432630eee53b02061b90a2297a446231585b87b6120eb55685fe4e0741f16420345422d8cf6582 SHA512 2a5d7c1a97dfba9e8930b11df8586d37f73d7eafadb3e74c391a2943e4c902deaea4148963d15ffc74824b06854c9d823b02819ce853bf0b220b14640af20927
+EBUILD kodi-peripheral-joystick-1.6.0.ebuild 749 BLAKE2B acc30904e3490680ba2a92a482e799972ec5fd26f5c4eaf8aa0cf66188fbf86dc8d070d470d740add8291e49214212121dbaaa01b1f9ae041cba25ffad5085b5 SHA512 9de576166d8da26899f790d4748edbab1c50b1cfa842ac52dd98fdf904f536480b32524103bcb19d464ccd3b0f0320af08bf49e138756e94baa1e2a6d6d7e22e
+EBUILD kodi-peripheral-joystick-9999.ebuild 750 BLAKE2B 45fd88bbb36d359752f0f92e9cc8dbd7138affc0ae6d14375962b81c61f797d287f9734f2258c5226d2eaaeade4de41bb5c16085ca49cd78edef9fd3b50afa01 SHA512 eaf1f44c31bdb530a716c575acb0ca89f121d5c019dbc7e7283d540b3a1a6e30f4c6bf3933b2d65108c97322fb2aad49486faeef72da0a731c4ce98eaa16d9a2
 MISC metadata.xml 439 BLAKE2B 4713d97899dd9cb12cf064f17d88b197f872a38952d435445b0097c9cacd297dface9c9efbe034eafe595c7cccc3a37773fbf025c0fc45fe3283ea406785c47d SHA512 1489ac3199dbc3033892af4d492e843fff379a18a93059e4c0e164e9140411f8f7756d275b70214c375f4ee649d48786255aa6500c2b6b218f843295ebd6c29e
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.6.0.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.6.0.ebuild
new file mode 100644
index 000000000000..b29f362fab00
--- /dev/null
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
+HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_BRANCH="Matrix"
+	EGIT_REPO_URI="https://github.com/xbmc/peripheral.joystick.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/libpcre
+	dev-libs/tinyxml
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 986cb29e7214..eec5915d9a2c 100644
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
@@ -18,7 +18,7 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
 	;;
@@ -30,7 +30,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	dev-libs/libpcre
 	dev-libs/tinyxml
 	"
diff --git a/media-plugins/kodi-peripheral-steamcontroller/Manifest b/media-plugins/kodi-peripheral-steamcontroller/Manifest
index 7fc0e3011278..21ebb7622f03 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 751 BLAKE2B 2793a226612bc6553d45578bff7db68bf89e3a8d431ad47a7a502d6da3b8cd143b0d5bf643225a4036555d87a2a3f579d748895a38eee36aa001bce14eb450a6 SHA512 f9c58c048969cc201b725f9bbe4f25242c50bf63fe2867c36beb35705f1a42d7ed05048e4bb617c6274404597d77d23087e7482ca581c44f161ebe5bcb3b91bc
+EBUILD kodi-peripheral-steamcontroller-9999.ebuild 719 BLAKE2B 183342b602c26a920b24c720d071b0cfc432cf176669e937a2d722f28c5408ea488a3e1ad913e4acba881582323ed38c39476b9ec7bb34cc3300aaad7cafe56f SHA512 b57a0956fac767c6aacb20e0a80609fc8bf3134292f297d852870add52edea3984d7daf696d6580d21e6586e7e6150e7245ed53e725242dc834f3a2c44e908b8
 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 71316e3fea70..f2e187f4215c 100644
--- a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
+++ b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
@@ -28,7 +28,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	=dev-libs/libplatform-2*
 	virtual/libusb:1
 	"
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index b08c9eeb23f5..f3d7f510d6a4 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-argustv-3.5.4.tar.gz 149660 BLAKE2B 0afd36f8e7c153bb5d00235664ab40e7fa165d658b0491a271f9cc04c7ccf2f3bf9666c949b43c03b86ab8d6479863c7df9e05d75b8e18676526bb1d30f8b62e SHA512 37ae3fa9d3e0f49ce87429de56f16e875bcbb289f94e019822c9e8661f54cd62d11d6cebe195f29871d7c24241d859e88fde988fc6ed6dd2a3f64cd7e8efe1d3
 DIST kodi-pvr-argustv-3.5.6.tar.gz 150434 BLAKE2B 9cd59c57816ae30912d6410c3a1373fbfe0242a7b60ffd55576c898eac26715e61fbf4bb239e121549b92249b52bc484b1c961eaa3460b36bca0ffa8aa540f76 SHA512 788643e236f0d4e053cb6580ad033dc5f00ed4749138b93631609a203adbcc80d55655cd02634a9f762383fe549f769bd79ad3bbd5023fa74d0748c5a3c9fb71
+DIST kodi-pvr-argustv-6.0.1.tar.gz 153659 BLAKE2B c991b1addcc81e4e07f763b0794f2a4ff998747729d6ea9c8433c9c85872b51c702b0dcdaa92f487ee562fe8d167e54dcbdacb55d8df6ebda5ab6ec6c3b35b10 SHA512 103f17c503c0ef9c0e40c9ad2602bff314bce0b7f7e4dbc1f7eb66082ef5dbf0f55878be012ce4728644ba30a473d6f292c7bdeb3bf72b41928a4c7e528f83e5
 EBUILD kodi-pvr-argustv-3.5.4.ebuild 703 BLAKE2B 88426f2bd633dba02be419e2067a5860fba8ac022d16961ed2216eb34a1e7a8feae2520da95a1fa0bcd118c951a0ddbf36dcfccb016404eebba946849a4eb418 SHA512 b12ce181413e81ed518c09d8820985b1dd54a5aa64e64413f993a426c6bda743f52c6203e8769b198d446ed5f8a2248acdecbf95d8f9891cc2afdb9b17e8e4f0
 EBUILD kodi-pvr-argustv-3.5.6.ebuild 703 BLAKE2B 5c02b33738a4a47af00343f3379c89b816f7b033653b554971e7287a0fc4264ba17e4678ed57de5d33bd6f226fcb6450fbcd7278986d67be6fa8618ddfa4ef29 SHA512 2dfb679668f2cb382cee0754b1118290a4e49b03df71c4b5a736d4e65b8727665602b767805362eb4ee8ad7cc1b31a0b07bc461582d1a190fe69224f357a1c21
-EBUILD kodi-pvr-argustv-9999.ebuild 699 BLAKE2B f8321f9979555e96b14853e7eeda3d9a36641986e1f5a1c28ef5acc5d0e2fc6a8fa01c6fbe4f4b5c3aaebade6ed6365ca396ceca878ad01e1fb6c0175e1dead3 SHA512 47e0b3418ecba071de0887fa0c93fd308594321ce2fccf5e57b99f0f656981f3d0a58b4a7e02866bfb98796f1e5d6af4b6e1e1ca386147c6b7b1201153f82f78
+EBUILD kodi-pvr-argustv-6.0.1.ebuild 694 BLAKE2B 1fd8029faa8e1cddf6bdeabb6e9226c43ca3861fd9cfc5ea4909053698b281991ca6fa097a9d5834c0fb5b23755a027984f42f5920a630b1d52d8ebcd644293a SHA512 86ba51038e6265b422ac94fe135da3d7ad95744114210f7afb429866f27cac56efed011d17b1e4c57eda467a86123849887bbbc53a8797996bf59fe2041707e0
+EBUILD kodi-pvr-argustv-9999.ebuild 695 BLAKE2B 0c1a0530be5dbea1e1812e12e3d3a9003e15b5f1fd5da081cad63b34137ce66e720fe425e520b2cba1a38f6029a9c28a08168e8e4dfe2cc7c715ef3e3c4c8aee SHA512 3e96caf0fdebd538b7de4dc8ec766d22a34250a7266c22c60406b02c3b6e328288741f59d6e17b46253e9d06c5048073a1be23d98240515e31d39e7d782f0bc3
 MISC metadata.xml 431 BLAKE2B 7cf6fe3e6a6c6cec6b72acbe12ed6b95b8204c33f9f8473f6ed48831e189063b9b5584b579365bd5551cf9ba109bcf85b6ee1dc77eeb18871f049fa5490215f3 SHA512 ee08e760ff80ed37cbc40ea35ef0daebd9b8b7dd7a532123787a022fea25c9441912103dfb154491b81aab1f79675408c4fe4022c4937b03433df826bdfa90bb
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild
new file mode 100644
index 000000000000..d89cc6b5da9a
--- /dev/null
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's ARGUS TV client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 84972b44dff7..3cd2a5114177 100644
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
@@ -29,7 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
+	=dev-libs/libplatform-2*
 	dev-libs/jsoncpp
 	"
 
diff --git a/media-plugins/kodi-pvr-demo/Manifest b/media-plugins/kodi-pvr-demo/Manifest
index cd6b3e0ed470..45aebe3202fb 100644
--- a/media-plugins/kodi-pvr-demo/Manifest
+++ b/media-plugins/kodi-pvr-demo/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-demo-3.6.1.tar.gz 35070 BLAKE2B f916f89dd701c5fa9b6f9ad4950115433382c94ec5cc73afb0c753b80c1850947ba4776e494842e9181595b5a8bdb0e38f3a6b0baeaa6b19dfe2fe104b2ac06b SHA512 ddcc0c91b9173920ab5a9e05622312e7363b85be74254e451cff7d415d09fe9b60f59acb75c66359eabc3e737921116c2232042a76dcabcf9e2d52d4d3e31a09
+DIST kodi-pvr-demo-6.0.1.tar.gz 41271 BLAKE2B 71fc5d308ef122929f62b140c6aa4561a305a5c2dc34b289f1cebb116ae14637da02e4c1546e57085dfd389ad8a02bbece82af53f4a03ba583ef162eab7b1ae1 SHA512 cb1eb595226543b92878d2a3a717a269647524baf6429518637d1fa1fd2d46de9a2e9481831760e9647da529a4c05bc4d1f1a54c5474d030d1d3ac92b74100c6
 EBUILD kodi-pvr-demo-3.6.1.ebuild 674 BLAKE2B ed3a82045549e464c2defe8cd64fec4446ede8c2a2bc65187d6ba028aff54e0ba81de83278804c3b4dc077582042fe480930eda26a4b2f1e5f043b47df6038a2 SHA512 45997c5405ec5aa944b4a76f6bb034cd5bd0d4e8b0701c4ee31f74b7c3345d66b82b4870db01243d814d296484d48f753d8ec64647c105767def9067228325b6
-EBUILD kodi-pvr-demo-9999.ebuild 676 BLAKE2B e7cd23d56efa1bf91a743e76f86efa63e74e54cf6767ef8bed5baf653b5ef15a81b13f2cbc28313653cbd3f88a03c304c6be41e8dfeb2b64f5099685c0fb9d76 SHA512 89fc66a1ba8a4b8a2a964cf58367aa3ae4568f384649d34cf06182852b71f95202de27141533326df6411de83f989c5a1abb72b83b2b63cd30724d72f9a1b07e
+EBUILD kodi-pvr-demo-6.0.1.ebuild 645 BLAKE2B ff415ce8f2bb05a79501172ba483fdfdb4f3a7024378052c490f8a7e1efb2acc727f8a449b308269b2c2961b0b38388f4c5bcf1116d84d86dab61db7bb0f81a9 SHA512 0eabd03dde4511dc165fcab1c007eceffb55fa0fc128ba888420aa665ed7a9c723e934c097d6f5375ef8e8e2667f067e10cfd2be2e801d1f0f7e77ad383922de
+EBUILD kodi-pvr-demo-9999.ebuild 646 BLAKE2B cd1cdad1b6fbd450f79c2e16927f76db90734062b66a185070e42ff06590c404e1736ee42fd42ab10229710c9307b2da5824b7b513434d2e2589cb2102a4cb56 SHA512 98b19d4b466f173b0b14dd3a56c118a6b3d6822a977e8bb922bbdb1314310d55478288082feea641f8280d1758cb3a3d2a680a004e7654f1f383c8fe684afec3
 MISC metadata.xml 436 BLAKE2B 657769c7828eb3034e2d71aba8377aa2f7d9e4d314904e24e17f08659c2e58ade1c24d1903b9b30c5f96322c4c9ab85c92fceb41c468afda496d52bc9f4c5a7e SHA512 a60cfa34672d7940ea934fbc3dc6c2b0e11c0ff59cecd7d41dae08d040172c65e70117748ced3a74c5a772af9ebd00259e91db26cb73d635502d85ed48ff4538
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-6.0.1.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-6.0.1.ebuild
new file mode 100644
index 000000000000..8f0fbad7e073
--- /dev/null
+++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-6.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Demo PVR for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.demo.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 1a0dec61888c..cdcb5fc127c1 100644
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
+++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-dvblink/Manifest b/media-plugins/kodi-pvr-dvblink/Manifest
index fe9f7768ad2f..02f19867e980 100644
--- a/media-plugins/kodi-pvr-dvblink/Manifest
+++ b/media-plugins/kodi-pvr-dvblink/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-dvblink-4.7.1.tar.gz 181247 BLAKE2B a9368ed515f942a7144a50e02c5ada8029d3b87a61230ad9021065c90587afd449ef56e402e36e0cb0c9aefa226486ac793b11c2d509c9559a91c81b50753cab SHA512 66e132274632c10034c8dff78e1b72cf273b6e9e3dffff4ab2efb877ed509a88c8afda600734c93cb228ad7879a5e6815e89ae83d8b5e8d9d88c0c8b8dd3e25e
 DIST kodi-pvr-dvblink-4.7.2.tar.gz 180347 BLAKE2B 83ca3cf04de7cfda420da8f068022062ee08920d5313cf2e740c1512bc5c1ec3dc8cd1613f5aa1f30049193d777773d5e73ae66e616dc3e5ea4064cac72b4f01 SHA512 9057a066fa228a271e4b21935bf1b823bd7184d3cea62bdb358932d3a8018c86a1129548c5e54414bf068bcdaad7726a8355d5bc5c61f64130396fef8e089be5
+DIST kodi-pvr-dvblink-7.0.0.tar.gz 189965 BLAKE2B 7e20cb8e0faed944b5aa617c13ff5b0e55ed58947e5dab9a49e724417074a686ae2faf59ba2e034bc2e641c3d9a467e1431fd120ffb42812bb747cb8dd6ce7f1 SHA512 d6e7690c50c8e1d9788bfe2ea067ea88f4f656897013222e3a3b9c97837bd2b00b694be97dd11290312ebd418e523bcb5080d2eba275dc91e609ad3707a88380
 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 702 BLAKE2B 4c56c39b29c2093a5b4108dcd64328fb6d8b81a57d8a9bbef908c5026e4932ab18d4168b38ee675149c79c427d1f17716f9c2dd66abc2dc6e4a00991edfa8bfb SHA512 7e61efdb09d46689f6290dff0e05dbd72ac036843cf999785cf3c75e23392d5124b01ef33a796a1752c8be52b5ef863484e256b7e14fae74b13c2df4d51ad9ff
+EBUILD kodi-pvr-dvblink-7.0.0.ebuild 694 BLAKE2B f9a53b83120983fbe17cd3a63413fdc56e8e24a10575ad56aa1a80c26128582164ae38e9938aa1e52cb9e9d924cf9007b9a75a50d385f873df86ef932f9628d9 SHA512 011b26e23ce9afde90f8e176efcb4cb6a724e5808d47e37561025684f6d0c1535653468aaef2f66b96d8d79ea30f9da3d5f83ec51539bd1f8ab79567dc12b5f6
+EBUILD kodi-pvr-dvblink-9999.ebuild 695 BLAKE2B 2a7374d8b7c16c84a43d84076ae7ac53e602ce4407ec8de2befd20d3dd7322fb257f8a5a6c0c5f2212ebf1bb650948dae6f79c49c4bcf838c03e93a1ff598b25 SHA512 44f1db2fec5b3a56e664abaf4fa0d0ff3c0520ac71e9cc597c9bc3c2c109b6097594d1f30bd5eb8954912ca1a80322037acd28ad0f311d11c461d4ff49d63240
 MISC metadata.xml 430 BLAKE2B 3e8e91274af301f44e000e54762c98b68a732dcb24bab5f8114df0bfa2b82485cace8c2dec1258efc202b227f946820aa0833dfd7c4647968756b84feea3311f SHA512 f5087df98e004c6319dbb7bf9b4428e5e52636e129cd34f3450d23b7b21b6dc36e7d935c3921e08796831082d4bd101d4c4b185a70236eb1a4b8c6b8522691b7
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-7.0.0.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-7.0.0.ebuild
new file mode 100644
index 000000000000..b4558dcb6657
--- /dev/null
+++ b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-7.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's DVBLink client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvblink.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.dvblink/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.dvblink-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
+	dev-libs/tinyxml2
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 c1627141521e..5b90cab21cf0 100644
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Krypton"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.dvblink/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.dvblink-${PV}-${CODENAME}"
@@ -29,7 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml2
 	"
 
diff --git a/media-plugins/kodi-pvr-dvbviewer/Manifest b/media-plugins/kodi-pvr-dvbviewer/Manifest
index 6786e514cf0b..89af2bfad430 100644
--- a/media-plugins/kodi-pvr-dvbviewer/Manifest
+++ b/media-plugins/kodi-pvr-dvbviewer/Manifest
@@ -1,8 +1,10 @@
 DIST kodi-pvr-dvbviewer-3.7.11-Leia.tar.gz 128370 BLAKE2B baa4a6bdab5fc96b8e34c73beebf7959fa20575fec87e7ce8f4634462704ec7eb1dc354da55f8073f7393dbdfe422f9b3fd328ef986d40fd6b8aaf68dc838997 SHA512 f20eb91641df1c56782884622b0a60f9c65bb0384b72bf5e1d71d38fc092a954866935658edc36873272b060a8ce8e712b997666012608745b52d91a474d5f7b
 DIST kodi-pvr-dvbviewer-3.7.5-Leia.tar.gz 125918 BLAKE2B 413a752c092ff250e01db404dcd8c35f522546c42c33d93c66f2b5dd7ade1b62fc1686f5b4453260155fd4e1c6b624318a8aeebabccf9041d90952308cc04570 SHA512 03aa18b4946d2d3c345feb5fc26d999a0ca2a929f2ec0bf92450a170f4ceea085fbd16d5daec3782090ffa054bcec8ca02d997716854b493b4f9b8373f2321eb
 DIST kodi-pvr-dvbviewer-3.7.8-Leia.tar.gz 127666 BLAKE2B a1f73598ec8b3c6db067b6c991ea829ebfeae526e4575f9392c0fe36280b467ccee46eadc65f14309bf422e06f9ce9754ae3b2d3444f58fe0c938541be9130d3 SHA512 8d0c16c21b6b80f16801d0d253987f292aaa324f0eabd508c0023e87fce9502ebecbcc89f8fb00007dbd792ced83a8925e280f6cb1dbf0a5f319699a8b7d95d8
+DIST kodi-pvr-dvbviewer-6.0.6-Matrix.tar.gz 137151 BLAKE2B 51eb189d9a2f7a5f36f7efbc542c68b4460e0e23bb829b1dec39d38fdbeab5700078b06fc2b39187f8602e6b59e371e097481238f506069f3deda73bdcdbee57 SHA512 c4bdc8459d6d9b396540397b33d9055779056edbcb226a6d033825f3bb71d31981886813350b943d55247d6d8cade9c7ae0d3b921ceacba312cf9de2944777a5
 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 720 BLAKE2B d2cf8b84ffa04316c169011112124fc3aa057906c51f497e95965c7aff366e8303c6463a32a6b7fd1f727e4dc45b772f9322e878bb5c2f08e8c868f50f047178 SHA512 3ad1347c10f82ffe4df5616678204925bd29c7287b5262d8585fd99c72c2fae2b1645f8c808f4099eb82f44407035695413cd0a63013f431af7460d5e6d523ca
+EBUILD kodi-pvr-dvbviewer-6.0.6.ebuild 715 BLAKE2B a62dc022e091e40897750608e163cde3d1a008d1f546305d4b9390083fefe6bc069b7e1b1a6f3ce0a3324b9a0713c717e9db04c750177c4ffc9166e3b908de4e SHA512 7bc858a9057e624a5023b5d08b2a08e5c05f970003574f0d4c9acbb66fff3033e98bf69e25ca8b1acb199bcd664ec6bd2a94b7c96617024b95edbc1370e162c8
+EBUILD kodi-pvr-dvbviewer-9999.ebuild 716 BLAKE2B 6d98df2f1aad511a0d54cb457289d562f07bb9f9a75af806e5c48af93a84173a2016fcc8f7129c3b8e90c7cf8ef8f662d0da0e38bdc8310f71bf93aafac884b3 SHA512 99a48f399240b0a18bea8697dce95f65311d66f725b28643db08bed908933bcd1217e799a1499defa3be233f7ecf30a4d49c00360086ea91b6097c58888ca01c
 MISC metadata.xml 434 BLAKE2B 8c6842bc4a5a0dc248402680bb06f034883ec52717aff60b0d8a55a27619f288719caf002056bb6c36f09506e8ecf0b45a173f7cfe85699db9477b30fdd380cd SHA512 9e817d4a01a0c99faf30fcbee42cf386310ee8e2a74799d5384bca834ee88c534740bd304b5febae834536c6283e6570199d6692b7091e5c2b9ebe35c1d717c4
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild
new file mode 100644
index 000000000000..54f5e15ff029
--- /dev/null
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's DVBViewer client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
+	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 529bf13e5e36..0c558b474324 100644
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
 	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
@@ -29,7 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-filmon/Manifest b/media-plugins/kodi-pvr-filmon/Manifest
index 6aa6a45922ca..998772947815 100644
--- a/media-plugins/kodi-pvr-filmon/Manifest
+++ b/media-plugins/kodi-pvr-filmon/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-filmon-2.4.4.tar.gz 104862 BLAKE2B 8333be55812ec5cb18535aa696c07e16cc02712522b540bef346bd030fdbd572daae47d81bed78be243014fb920911309d5f924079d323104c60090d0ca2c72b SHA512 f6d7c90842ca59ebb3b254860b47d7c1b7e6e5bd70f06744341eaf30a4bc2847027818a2bb097e56398354315753cfea7878cf2b82c3fc69b0aeed106b8d8e80
 DIST kodi-pvr-filmon-2.4.6.tar.gz 105423 BLAKE2B 75c64e863da1609ed7f8176635c90062de9008d1f814fd4cfbb7110d6e46fc1a9bb79dbddfce2e3edbb341048c11f80a126666701209afc5152ccd2035d7b4d1 SHA512 832840319bfb8d9d89883ecc58a4cbc1e32807bed5296dd1bcf033199109b47c5a48be4609e6879ba49a69da61958b2dec033729bb9536a0d26990102472f400
+DIST kodi-pvr-filmon-5.1.0.tar.gz 111224 BLAKE2B 8c65a7ed7bcd1846c0bf64ccf99111d8fdbd882a06a6045577d031fa68730ade691362f8b60105714e5ebe7f57e31d1e76927b1b505926b4fd7f3e99efc24983 SHA512 02ba24e23c44ae3000c4f41e90169ea1455678927c6de1fda1927c705bbb236ed06bd5ecd0da59f547f02afe7b695306f7282cdc5014816fd9e0f1922243b2fd
 EBUILD kodi-pvr-filmon-2.4.4.ebuild 697 BLAKE2B 40d100012cb3c7583684aebf7741c4629291a227af15627c4d9dac9a2b47ae2bbbf322ab34b70f03dab4c026ebb70e7bbcf6688468d81df840e151dcb9700760 SHA512 162b3053e55f4ca20f5586592b96538a4640dc32c5ed682262899880699b2097b013533eda33c3cf74d35b7a8aa6ce595188c16dea1054811e0cd8cfd2c0614e
 EBUILD kodi-pvr-filmon-2.4.6.ebuild 697 BLAKE2B e191080842e83d16027afe50f4fb0879683684e06f9f63057ead9c22fa4db97f057ca84e592e9f25a68312dbf8ecead1f52f60290d5e4c5e798d31aa31451c5f SHA512 259df98dadf703e067d10534ac68eb0fe0c382b986435f19ee677d6f6dcebbb6735cf4a10f79eace7cc6494ee92746aa190523ca03ad9f7515eb48189e661442
-EBUILD kodi-pvr-filmon-9999.ebuild 693 BLAKE2B 853a387f263ccee8c7ee57d917a86cc2474340aff997f51ab6e98ae2bebcbf8e0917d968a36fb264679c53b88e80bb80719fecfa7666c1cee47d31677c618abd SHA512 a078ba6b6776ef0dd88847b91d216882ab3c555daf3ffe057c09fe61696e90c78ed918e752977afbbb962c2fa380b02a199708ce3faa404b0594cc337322666b
+EBUILD kodi-pvr-filmon-5.1.0.ebuild 662 BLAKE2B 7866d82a74f4c3636f63ef889ccc87abb2ef325002b5313fa2c5f28ab3ef80e544747c0ce9add7386ac39bee3ed34cad22d68da2ba28464a5bddf7488f945ded SHA512 32a94940509cdb8523bbf0ab6013b37dcb9ef18b865ab3b82b005f7eea88a64804f457092d8a69f0c94fc7e4caf64f0f626c518bce690ee01f4369d7a598f7d3
+EBUILD kodi-pvr-filmon-9999.ebuild 663 BLAKE2B 4b2f64e7ad0b13994ae98e611346d88b3b24255e8d4ffe3dd9eda35b553b9de85c78538855df31ad6d7bea05660251a1f53eb603d87a5e3039a0a3b24230cd5b SHA512 8aa1ccd46a6af7fcb08e54e833652f5e6747a0c223f450fd8a6ecad4918a84082d7d32fe4686a2d1829ff1ea75757928898fc61e653b3d434a18f47cf663462a
 MISC metadata.xml 429 BLAKE2B 5432fd7942694c454c239f39e4835bb6430f8e5dbc14b4bb11d32f6aa618822be12b1fa6a6b39422f4fb5c0d7a1b8203ce7fc3f2090a7d2a7253ee65fca11439 SHA512 dea6258c8509740209e941e13d258d165e72fee1902dba1d5364ce3c453e53de4698df34cff64f591f192336a46e69278ae7409c187788df6ef1a0bb4cf10ee4
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-5.1.0.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-5.1.0.ebuild
new file mode 100644
index 000000000000..6c7b60670368
--- /dev/null
+++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-5.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Filmon client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 b43635a1ef10..7fba7bf710f0 100644
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
+++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	dev-libs/jsoncpp
 	"
 
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 340063b2b43e..3baad4f0bbca 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -5,6 +5,7 @@ DIST kodi-pvr-hts-4.4.16.tar.gz 160594 BLAKE2B 5ae9bff9ec9460c860b6333f93748d70c
 DIST kodi-pvr-hts-4.4.17.tar.gz 161495 BLAKE2B 494d63cd77d6ada7090418140e7aebdb678941236fe45fc46464b213090a2cb5e386d0a59b589afc36cc4cbe020bd3205341b6d893de61c106aee55747172e18 SHA512 0c9eeb8194e4c5b54d5d4df86dc794604d8df91ef172eff9207001ece9a485f7eea40ece449c28bb4cbb414a5a195e6fc50b9571744420c76da104f5fadff377
 DIST kodi-pvr-hts-4.4.18.tar.gz 161525 BLAKE2B 22d869989fc2151ca5ec39c7802d4612d2dcf5e29065bb27a45f528b939f94835585a6a5d427c29a79bea31f5cae811e450be6d80a30d0a18d6934eb63eff395 SHA512 1a0fd0fdec46178262c3f03544d02d13601858043d58ff71bae97c60514f3b11edf12fa53e4436a0de13dcb6877e937d37a5a02f7d6b9ebebbcec9c39e357ce9
 DIST kodi-pvr-hts-4.4.20.tar.gz 161693 BLAKE2B d69e72c8d189b540f2d8abc97c50e5a9e93346823333fe2441d3f7b625b94de72dfe50f6e8af5d17506265746819fff1a3d1f1e06ba7b79934ce234151940525 SHA512 aa8ed5487fa00c7cdc13aa167f103daa2a2cbfd93da2414fa85a339edbca3dda056e1073d52bd3a752e00652e83e3c5ddd1de42741600b9da143b18557f598be
+DIST kodi-pvr-hts-7.1.1.tar.gz 167379 BLAKE2B f2391d7997a7e17ed1fb7b2326cdb0cddfecdf9a6b0785fc89ecf8b58004575c6b7a1f6efb976edda827b9e83d334e0bba518498886c1e1769b9ed1deacf25d7 SHA512 5d1e049c23e82964ab87b22c716028d57322f81b749f84f07f66e3bbd2990e711186eee2b562d1f326a369b5fc52d1f7b2aea31b4d8edc827f6555965fec2b69
 EBUILD kodi-pvr-hts-4.4.12.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.13.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.14.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
@@ -12,5 +13,6 @@ 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 717 BLAKE2B 709c9a2deffee129bea3666078668d41b7cb82d3ee5d2cda8a35ba9f31264f828226862a314bcf8a1d8e714c278ee14c18ae0cb68b74ec3c41ba7b0978e0de1b SHA512 d405a9b5e8ae321bf6bf52a9c4eae06c54e3bc79c3a8c7acf923cf61a92ef2485fa1210bb122e249c85cecab836d3ae156d96b0761d71e08c745041b8dd47963
+EBUILD kodi-pvr-hts-7.1.1.ebuild 686 BLAKE2B 71475aa7b92deb77359b521d10487da4a340fd4d6b5282d144c984a34afe2515059f21205e12ebb95f182a1b27cae107daa9900c9c1876691da9dc121b74b08d SHA512 34df4626bd706780cafda9f15e8d308573b0155a2cca4bb4d556bf95e8c64d34ed07868fd77085f06043fde19848ba4ae27632340d3dac925342453469b4031f
+EBUILD kodi-pvr-hts-9999.ebuild 687 BLAKE2B c7e85954a91a7bcb2fc5c6df8a52c886143a64422a46d3ea2c76deb2e13908b1e97ce5e0070c731bdfe43edea4ca9756c8b1aa4e1998479676b94075768520ce SHA512 502828e8917351e5f39c8185e90ca2dab634d98f2563ff7deb17ab963f1af6a7d94f243f6fee9bb5b2c16d9204a9d335c4d959df2c0cb0ebf836b37d89f5f3d6
 MISC metadata.xml 529 BLAKE2B 75957634fa1689db9429bec1f25738c6700813d2714a4c80a4381fa9dec88a126144ef661cbdf1ba7ceb94cddde73bcdc376714abd08f9c205fdc8156e3fed55 SHA512 e6eab8498b684a786e899769dca6949b3252e7534fed233cf7b59f9eef8de4180b676445f455d1736713738c4ebbbbc3e761e8b2af86e386b93e20cfd04f0439
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.1.1.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.1.1.ebuild
new file mode 100644
index 000000000000..764206faf8d3
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
+SRC_URI=""
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
+	inherit git-r3
+else
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	=media-tv/kodi-19*
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 df5b0487b346..6c70bf3c61b3 100644
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
 	inherit git-r3
 else
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
@@ -26,7 +26,6 @@ IUSE=""
 
 DEPEND="
 	=dev-libs/libplatform-2*
-	~media-libs/kodi-platform-9999
 	~media-tv/kodi-9999
 	"
 
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 916d28ebaf36..97fb41739b52 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,4 +1,8 @@
 DIST kodi-pvr-iptvsimple-3.8.8.tar.gz 125231 BLAKE2B 9e887261295f75c96095c9566e5c1a555bb62a2ad97d7527efa9d294c4e392058f99f5205b32a7b4eda949ed0f9f49a288df656777dfba87c243528e74ac5277 SHA512 32c95c2e314eba3c4871c50fdc024be276874b790339c5b558425bb960080784533dcbadbab64c7b76b598c08bfca384fb3b1fa618447eaf30870e296d4c5e46
+DIST kodi-pvr-iptvsimple-6.2.4.tar.gz 178392 BLAKE2B 5cb96bc2c13c429486c596aa5eeffa445fe1b68fbed8265626d855fdb7ab4dcac5071d8033a60621a235dcea37b206a56b9a73e0a9de1fecdfecaa7c3de0b893 SHA512 66bab95ace5d4b25fe5e24c5515674a4daf8d4a4e766f9eed67d6b98c1c0c6d64fb6a2d82b19f239a522d73e55707db4097c3cc12a1936f6f6c6bd57bfd451b7
+DIST kodi-pvr-iptvsimple-6.3.0.tar.gz 178520 BLAKE2B 9536d15145f009a950d21537d6fe3659957589b38872f174ae26088f6c16eef3765485c3c6e9f6d36ad2a1d2c03bffdb983222f5d4878751f567e8c6eaa41302 SHA512 ffbae476606f1e2c286da69ece731c0e8894d1e50c8faba9f493951d1526ae73db3a4a00fe5b2f868f90416fd971321a130e251ac39a40f15d5515915f24cad4
 EBUILD kodi-pvr-iptvsimple-3.8.8.ebuild 832 BLAKE2B ac2e8e2ca456a4246a6d35f6a91c4ebddcc0d02699e3e24e75a04891ff9f828f9f5429a22ec1798e6a749b2a13680ae14156788db0927a5734b733e64c124650 SHA512 28af2a01df4189ccb4ca5f35be6a5b7e00c93cf9b0dbb457154ec7ee260ca2eb5d0689a3da4e51f33264a34c58923393fac10e1d4598327a9bebebc1d0884439
-EBUILD kodi-pvr-iptvsimple-9999.ebuild 834 BLAKE2B dafc19bf28c456fa5090feedf1dfcdfd1712f351422849d9b2742f36678190f75a87604cad1bd4b31cb95a579f45a4d3fe37aeea3f04d32beb51909bb2a56fc8 SHA512 dc5a18d9ae798ff723939a05d5844b5ec3f7e1b2917749a40978bd8f6fcddfdc13cd80823486a4a0a02fc83c4de59dd62fbbf7f19829115e5f1caf6cc858f89a
+EBUILD kodi-pvr-iptvsimple-6.2.4.ebuild 802 BLAKE2B c592515b2b56a24ea223a837e21c96b171bffe323703a8011c04741432ea0e474204701aa3ade26d0fc088dfcf6661cf775fc111d9c548200b47f9a17634b8bb SHA512 b348a54ff3daa6cc31d278a6d7cc9a44bfb8943f6d0507e5429ff9302b6864b3573457ad52ffcd41cd8015cb679dd888af520213b54c8bb7e23283dcf3bc8bc6
+EBUILD kodi-pvr-iptvsimple-6.3.0.ebuild 802 BLAKE2B c592515b2b56a24ea223a837e21c96b171bffe323703a8011c04741432ea0e474204701aa3ade26d0fc088dfcf6661cf775fc111d9c548200b47f9a17634b8bb SHA512 b348a54ff3daa6cc31d278a6d7cc9a44bfb8943f6d0507e5429ff9302b6864b3573457ad52ffcd41cd8015cb679dd888af520213b54c8bb7e23283dcf3bc8bc6
+EBUILD kodi-pvr-iptvsimple-9999.ebuild 803 BLAKE2B 9cd17e335f3a0bd80ba95e91f184d0126593711b14b8d7194a5ce21dcd38f6791d2df67e1c9e5dc2ddb8e37939dce2e036c460cf18e810c578667c3672d2e39e SHA512 3e67596d473a49682723e0c60ff4252ea437fa9de8e8ba40c18581dfb03030f106deaef1bd0a04da43492d19830a90a690dcfacfd46a07f1f8c7c7643adc60ef
 MISC metadata.xml 436 BLAKE2B 657769c7828eb3034e2d71aba8377aa2f7d9e4d314904e24e17f08659c2e58ade1c24d1903b9b30c5f96322c4c9ab85c92fceb41c468afda496d52bc9f4c5a7e SHA512 a60cfa34672d7940ea934fbc3dc6c2b0e11c0ff59cecd7d41dae08d040172c65e70117748ced3a74c5a772af9ebd00259e91db26cb73d635502d85ed48ff4538
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.2.4.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.2.4.ebuild
new file mode 100644
index 000000000000..ca427448e66e
--- /dev/null
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.2.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's IPTVSimple client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	dev-libs/pugixml
+	=media-tv/kodi-19*
+	sys-libs/zlib
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.0.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.0.ebuild
new file mode 100644
index 000000000000..ca427448e66e
--- /dev/null
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's IPTVSimple client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	dev-libs/pugixml
+	=media-tv/kodi-19*
+	sys-libs/zlib
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	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 41598619e82c..5770de5567db 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
@@ -29,10 +29,9 @@ IUSE=""
 
 DEPEND="
 	=dev-libs/libplatform-2*
+	dev-libs/pugixml
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	sys-libs/zlib
-	dev-libs/rapidxml
 	"
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
index 8e0f951c7898..16930ef64484 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
@@ -1,6 +1,10 @@
 DIST kodi-pvr-mediaportal-tvserver-3.5.16.tar.gz 398113 BLAKE2B e944a49bd5d996d2c62325ec7c8b8dd6f69ca2918331cca198afbc11a1badafd4ad7ffd15f562016d540c5777cef285fcd090be28662988f71187899a43609f8 SHA512 4784b97d1826a8846156910b658a32b6b133dda04a8b2366f0dd67445fb4247132da427f63ada4284cf9889b8c5e7ca5f66785998e23b8ee5845ffdb352a83ea
 DIST kodi-pvr-mediaportal-tvserver-3.5.17.tar.gz 398338 BLAKE2B 52ed303aa236fb77bb5f79709f322b980aa29ca4e5077efc20894b610eaf81bd0d6f2a23de72bd3bf768ca0d819d57b920573515e0b134465b4f5399db966f35 SHA512 916d3a2f5ef8802a49c70f62bfb94145c3aa8f140ff3674ed3fef21c4d644a85a0cfb1088f1fc893b677635263f47455c0ffbe6554ca484659a1b7c8ebd47207
+DIST kodi-pvr-mediaportal-tvserver-6.0.0.tar.gz 402033 BLAKE2B 7ad12b7a18e759167fe06d983ad20c0dd00f10f6a23a5f87f526835b893451110152c036bdbae565d623fd8034e6bd1780446a688a6837f30027d7412f214706 SHA512 ac1b14bb1e75e4b802c1d6eb9f94b8c437d808ff31592b3e9ed0b9c19151acde3927c1bbabd4f890cf3aff6c71b68a859abf8b2d8942e4c9df8953c934a123aa
+DIST kodi-pvr-mediaportal-tvserver-6.0.1.tar.gz 403268 BLAKE2B 7c063ebd18d539c5ef844d55a93363540c19776564fd7cb2db4cb861e7acd0fc4fa9be88e835bb868f293db8af630ab709ea4f5075c06a15934e39647bd76745 SHA512 3e77f65362f55fa8902d77fa4522b5f76e553578270121fb0727cf42a57121d3bc3076ed84183576423a942c90c995546850992a4800d5f29017e39b1c2aa961
 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 763 BLAKE2B 81b1011341a7c02b5098238836f68363c352520bbd9073ae68c2966705bbb4349ecd9069b56f6dfbe87421a473b673f8f33ddfdf7449e180317deaa3ca9c02d7 SHA512 9b98867dec22e3fdecbf9b6d6e415d7c3bf2b628933c7c76e79c5716253d1f568a59f4e9b85b09ea6b0d66bd28707a48fe175cf5b83be4d42defd0c58d42e73c
+EBUILD kodi-pvr-mediaportal-tvserver-6.0.0.ebuild 758 BLAKE2B 4ae36c09ab363a5093e7b23cd4c087065a3795fc291b11e3c0d479420a91b880adb1c2b74cc14e28d32d28cc91ba6c3ec312deaa6243d1d99c6835354f1930a3 SHA512 9119d78331d2fa7581356080f86f5f2878b95c6de12f4e042e8a4b65c3ca223db05bf11f8d9d84df9a59b25f9c15b67f0ed154c82e9369cb3814996a7eb7ae8c
+EBUILD kodi-pvr-mediaportal-tvserver-6.0.1.ebuild 758 BLAKE2B 4ae36c09ab363a5093e7b23cd4c087065a3795fc291b11e3c0d479420a91b880adb1c2b74cc14e28d32d28cc91ba6c3ec312deaa6243d1d99c6835354f1930a3 SHA512 9119d78331d2fa7581356080f86f5f2878b95c6de12f4e042e8a4b65c3ca223db05bf11f8d9d84df9a59b25f9c15b67f0ed154c82e9369cb3814996a7eb7ae8c
+EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 759 BLAKE2B d4bf2e93def50393fa5f7809e7a764aacb722829191ee57025872ca8c62faebd785011a2e35252c49374f268e7cab4482c587d5de908b03f4d986a7ade0e9193 SHA512 5eefdd2195f56d7e067229219c1095d20f225173ab038a1e4f9abe28e8cee3542277aa96d32f7d133c4887dacee6b0b828e0e538ba238f9c397ae6df17f42d54
 MISC metadata.xml 456 BLAKE2B 79a150e9808ea82b402897e6b22c8da560055cae8a82dd38f2564895f417edb195720ddf7c9823eb9a001a8b9fae1626cc9704032b571c4f2e60906767b501b5 SHA512 dc787d33279a0b9f0fb8290f722f25f7cee998781de3d4d7bc16bf24ed0165ba0f967eee97a6e03865b5b3822952b545debd8ebec9f7dc0c18e1bf06b2486121
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.0.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.0.ebuild
new file mode 100644
index 000000000000..26852ce2d13a
--- /dev/null
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's MediaPortal TVServer client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mediaportal.tvserver-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.1.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.1.ebuild
new file mode 100644
index 000000000000..26852ce2d13a
--- /dev/null
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's MediaPortal TVServer client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mediaportal.tvserver-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 52540a9742c5..660cf92598a2 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
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.mediaportal.tvserver-${PV}-${CODENAME}"
@@ -29,7 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-mythtv/Manifest b/media-plugins/kodi-pvr-mythtv/Manifest
index 058fb281d79f..800859387050 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1,6 +1,12 @@
 DIST kodi-pvr-mythtv-5.10.15.tar.gz 702682 BLAKE2B 54ba8e4883dbdae88071b1b69a4d489d384c95911bf1113e944b9a4528f8349ff044a1440afd05b3657c8131c4738264f366a7a63bf8606ce6f796c143743f37 SHA512 bf7e4d6fc1436fc01596a4587b4334e495b72e4fdc9638393c94bd289c9f58065ad5d61c87ce109d727a0d656873100da050b8d395e28aac5efe567da70839e8
 DIST kodi-pvr-mythtv-5.10.16.tar.gz 702675 BLAKE2B cc2f229e53b9c91b1a09e954dda88f4b199510de4a47844795e0b2d41aa9cf3201b85d39dd43716ce189d9385784a85dcfd4639d6dc07d5ad74d5673fa5102e3 SHA512 d089cc365dd42268510996a1ca306dee94c4d3dd72eaf5c90815f29dd1d5bf0be7e0177db1929a33beebe9fefa927b52a83a2ce1c8c8aecdec91fbdf7c5efb79
+DIST kodi-pvr-mythtv-5.10.18.tar.gz 702659 BLAKE2B 90e1d655633a857e8068f4b1cb30c3f4cd802adc1139002399107989d3e8477ed38b83076f5a3a96bacd18e10c8a28399e752d43078cf4d9fafb73ef4d4328f9 SHA512 cc09de5086f69e1cee073719d306a44b41f2b0131bc70f74ee730eb681a72d4cecbd263d52ac7610574ce1a8d1b737cdc653adbf9642559e5e0fafa0e06aea25
+DIST kodi-pvr-mythtv-5.10.19.tar.gz 702741 BLAKE2B 0baa0e7168ca33af0198205323b1ec8036b46ad33cde2c9a0ce928ae3335d4e0c2704094e3e5b77af41a53f07ded7a77e8709a3c29b389dc044969523982c08d SHA512 7b0ce0ccd74fa5743c774804f6f8d34d3d2085195da26a9da74a12948d611a25142a7ffb228e342120d286da140b234cbfc8a5ca97a77a5a2fc807d6d52d60ae
+DIST kodi-pvr-mythtv-7.0.5.tar.gz 706430 BLAKE2B 569725596d66efd8076f39f7ff6fd6aba10057f77be395a94c03d58146e50072c055adf625a02ab9390dbe1cffeddb3b7775e03c689b1b32bef138bdd9af19a6 SHA512 ad94f44f0fa853776da62af7b23a54d884cb25b6fab3186b1bc02f9c4716e7cdeb371f5eb789d65221573117ed7afafcc2a7e1f53a004d42866b61d8deae1dac
 EBUILD kodi-pvr-mythtv-5.10.15.ebuild 674 BLAKE2B 8cbe86d07d447b078076dcb69cd4dcdf1338c01c7924277446ff07253d4ab10496fce89acebb55b0f9377261f22ecace20f82ab7a3be79bbd08d9c87072184f6 SHA512 6b6929052c87b85c8950ae075ce8077436a2a6715719ece104d43f4ef890a1433eaa4167d8ffbf10ad39b3c1cc31befb56a0fba162bc3e5c0c63cb926b98b5df
 EBUILD kodi-pvr-mythtv-5.10.16.ebuild 674 BLAKE2B 8cbe86d07d447b078076dcb69cd4dcdf1338c01c7924277446ff07253d4ab10496fce89acebb55b0f9377261f22ecace20f82ab7a3be79bbd08d9c87072184f6 SHA512 6b6929052c87b85c8950ae075ce8077436a2a6715719ece104d43f4ef890a1433eaa4167d8ffbf10ad39b3c1cc31befb56a0fba162bc3e5c0c63cb926b98b5df
-EBUILD kodi-pvr-mythtv-9999.ebuild 676 BLAKE2B 4618553eb130421f305ee9c1dc9eba6fc92cc18467d6c3d7b533da90cec11856e9b66ac9aaac8c0d184fb34da5361f7b3de71a2f1c5fd16064156d2eb1e49bb3 SHA512 63843305fad41dfe295ab44efbb8780cf0a650b421e034392ecf1dad7e07747d47d40cf6516e99b3a60a7eccab0fd423dd84160bff560d6df422917f155986ae
+EBUILD kodi-pvr-mythtv-5.10.18.ebuild 674 BLAKE2B 8cbe86d07d447b078076dcb69cd4dcdf1338c01c7924277446ff07253d4ab10496fce89acebb55b0f9377261f22ecace20f82ab7a3be79bbd08d9c87072184f6 SHA512 6b6929052c87b85c8950ae075ce8077436a2a6715719ece104d43f4ef890a1433eaa4167d8ffbf10ad39b3c1cc31befb56a0fba162bc3e5c0c63cb926b98b5df
+EBUILD kodi-pvr-mythtv-5.10.19.ebuild 674 BLAKE2B 8cbe86d07d447b078076dcb69cd4dcdf1338c01c7924277446ff07253d4ab10496fce89acebb55b0f9377261f22ecace20f82ab7a3be79bbd08d9c87072184f6 SHA512 6b6929052c87b85c8950ae075ce8077436a2a6715719ece104d43f4ef890a1433eaa4167d8ffbf10ad39b3c1cc31befb56a0fba162bc3e5c0c63cb926b98b5df
+EBUILD kodi-pvr-mythtv-7.0.5.ebuild 645 BLAKE2B 5405ba4ca16dd2cb96185b8009dfcf4dc01acf9b235c93197a866272e60265ea2750e881a913cadf10d678ce862e954f201e9e9d605163023ab4eb82b980af4b SHA512 244252c06dc736f3c13f31fa58b0b290dabb79a22f7cfc213467b16a38d255e41a9f97032df9e7f2fc625657572b0ee09fff0b887db4bbc149d283ca929f5333
+EBUILD kodi-pvr-mythtv-9999.ebuild 646 BLAKE2B 945ccbf5fb4ed33920e33a81266feccbfac05dccd0980c6a069ac2c10be0377b00012468452e13cf964cfe5524519984042b57dea2f7bc885cf86177177a6250 SHA512 7f2cfe7f187ba1796c96406cf2a9a8be18ed36915a23474c790955bca0279b1bcdbdf504f72c1672de9887341457ed21f7e9821b4eaa445e3b72d01efc2476c9
 MISC metadata.xml 419 BLAKE2B 71f7f4424dbf1c992fab169ce530ce61ff39399842089905618bfc800011ed7960c92428cb9e6e89b084872fa61d08da8df0c4179c483ec6dc2ab745d684f15e SHA512 5b6c21c0e780ed90e92fb080f0a15cf62fee13e8b8597081f7b5480eb21f3f013495aafb389a302a227e6e22b757cc6b83d3dd56d7cd74ed16587edb09ef871e
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.18.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.18.ebuild
new file mode 100644
index 000000000000..2211824cdbf2
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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.19.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.19.ebuild
new file mode 100644
index 000000000000..2211824cdbf2
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.19.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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-7.0.5.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-7.0.5.ebuild
new file mode 100644
index 000000000000..3e6fb192fd68
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-7.0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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="Matrix"
+	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-19*
+	"
+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 c2343eb35268..3d4017e79aa6 100644
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	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}"
@@ -30,7 +30,6 @@ IUSE=""
 DEPEND="
 	sys-libs/zlib
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index 7cd6e92f7ede..fd98096eb504 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -3,10 +3,12 @@ DIST kodi-pvr-nextpvr-3.3.18.tar.gz 129996 BLAKE2B afc8a582793cd2f618f39f6f48dac
 DIST kodi-pvr-nextpvr-3.3.19.tar.gz 130174 BLAKE2B f29766ad2fff67df72c67eba05b0de775c67752b7f4d4b31ba62a7acbfd66723f52fd802dca39dc05b83900dabaad5e04ab3baa64dad51670e7f82f9fa86be2e SHA512 d78201980ad4d76441d6d3c9acb5c23775c56c62dce9b7e116576e17e7fa14c11a2ade5b9fe1dba3d12d1b509d441fdfead05ac66796e2362e310b8d85a37f7a
 DIST kodi-pvr-nextpvr-3.3.20.tar.gz 130242 BLAKE2B 52ed3235b08574d521e7400e441b9ab2a0962d839c28ac317e2318895024d26bf3ed4b1bacdb8e6b58bb3430921cad7958711ce64bc766f2fee743d8cba424ea SHA512 8c7d21ede01839ba251b4367db90f5f028ca2ec0d6eafeb124881eb9a6078b28917292fbeb0ea452c782d1b943b8b8d24997f67faf83b516bdfaf451fcbd5bb0
 DIST kodi-pvr-nextpvr-3.3.21.tar.gz 130510 BLAKE2B edbaa2e1910d8f601673c55be264a93749713f893c78400ebbe790c9437dfdfefe8f156dc4ff73b09aa603f0d4bd54bd722d09bf39835720d0e3bb5d32813861 SHA512 6439f29a16d9b85b643c53a49624a2202e83597abd4d770f2caad9adbde4851d1f2f808857b5ab1bb1d1b99c7cc883313fb3a9b668240bd22ef7f4915b9a51a6
+DIST kodi-pvr-nextpvr-6.0.5.tar.gz 146642 BLAKE2B 76f06dc933f3b23ff16da2faa9726a7c7120fb54bc10883787669bfa0f24c9998849c44237727160b2b96d3ae5375de8e6cc64c96b9bb430f9eb634e3d0fa4c5 SHA512 67c43f6a781d233a8c157d3a8718a9bf106526ca6844a1296f17510171c5e76be74d1884d04bfa63ed7dcaf4ce683c1b03d71be64bc40c3cc335114532845f5f
 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-3.3.19.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
 EBUILD kodi-pvr-nextpvr-3.3.20.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
 EBUILD kodi-pvr-nextpvr-3.3.21.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
-EBUILD kodi-pvr-nextpvr-9999.ebuild 698 BLAKE2B da655781d2653e000dc890c425a03f9e7d9ae0d0b9a2f870867899aba9e437317b7f7530963dfacf78b5cf04a33ff958c18ea30e63d5868e0b04d62a7e096355 SHA512 33cbafaa428db2d63c8571a8e88d75d2ab146acb5681999ccea8e8c4b1ca275757ef8d38d3c6c72ebe9c27e64020111f3d0cfb82d7631a7647c613d6763a8db4
+EBUILD kodi-pvr-nextpvr-6.0.5.ebuild 693 BLAKE2B d10af8247c688c34f8c388f597ca8942b42fa3672bc513d959ecff05fea5ea7e745ee9de316fef3466fa688a62336dd5fb5675f795d9960224aaa1d592440e14 SHA512 5822566bc638a1ba6d906052a97b7cb83c751f3bb5b003cb25662aebb55ae18442c664c330f2f46920fd84c187939f5108a42aed11186fb36048223037e4ce98
+EBUILD kodi-pvr-nextpvr-9999.ebuild 694 BLAKE2B e6ae5463d4c9fd77fdc3407b37fa5e58208f95f8a78afe8955764c4d2ca66816dc22526ee03e8767a08b3825ce33aa8530115e841cc6a395043af7b572ee7494 SHA512 aa100751a31d80ad4246544f20e267a71cd66e6f2a319dc85a5d22a6db663355e154053792617282c705c494ef8477485e0e7e39d3c9ad045249dfb5b676c0ac
 MISC metadata.xml 430 BLAKE2B 60ef7af47e0cd7d264fd19275a356b83cd9fd4e5ed4e237658c47152315d4abcf807377bd8c94d88ec3088530a5fd9ab2d9482336328eeb9ff380963364644a9 SHA512 b0bd41b39d6e1379e1b3c36124432716cb222205ed587246523a8a48c42e2d9922b1b24c87ef601bf5f7452cfb874710c1ec7b558b9224c95c921b80967e02e3
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-6.0.5.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-6.0.5.ebuild
new file mode 100644
index 000000000000..141349d2e0d9
--- /dev/null
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-6.0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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="Matrix"
+	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-19*
+	=dev-libs/libplatform-2*
+	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 caf7d7deacd9..e1a24be35f99 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	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}"
@@ -29,7 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-njoy/Manifest b/media-plugins/kodi-pvr-njoy/Manifest
index c975cdd2dfad..5f285c58dc59 100644
--- a/media-plugins/kodi-pvr-njoy/Manifest
+++ b/media-plugins/kodi-pvr-njoy/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-njoy-3.4.2.tar.gz 47637 BLAKE2B 258dc10c06b68b6812b320aab5236a2ddb3f565ce616efb9ec6cc7710f60b58c24b827b61109af89e41430d4ef33a1daf6cb526ad8d449b954589c82783f5035 SHA512 5f30afb07c8c683920cce9acc2aa182273943e1381304e4e17f396fb42f1c464884e9134f507d7e787d9f271d24193eeb20c72870d2c7012a07aef94e1a686c4
+DIST kodi-pvr-njoy-6.0.0.tar.gz 54587 BLAKE2B 94d499840f91a1ffc57fbd3d364df1810eb82807532c8a95d66a8a2cd3e3da6c6177a01ae97ff5936aa9b35fa4ab6e1b8ed56691fe32213031f433691090cbc2 SHA512 3279226b3aef3511d7fc5c0cd73f6bb943321f8ee903a1f3736e707488c6ea7e14ab930ef54b22548a87f8daa6e19fc33f7f86d62e4b7ac53ad7eb4dfe526fd1
 EBUILD kodi-pvr-njoy-3.4.2.ebuild 684 BLAKE2B 1735a80f8e1a34f9a7e23edea7ab39d39c970d388dcbbceb9c83e2b2d0918db9e9681a88761c655f6e65c6bbc17d913f14f892084edbab91598182b573302900 SHA512 c75badda30f262d538d29c919c274591a4cabaca3549e45e300d96588addd0e0a0b23e43aae8624061d8e13ade282eb9766faa143991b1505a94ca456635d6e8
-EBUILD kodi-pvr-njoy-9999.ebuild 689 BLAKE2B 8bb4ae958078e1fce4b29588ca8c028aa1bd22b61f7388b3f2e01ac2983bed0c611076105cd6fd12821bea8a0e7161e575992570b5491b00b4f997b468214b33 SHA512 120d1bda6b44c7e46d577a715fa99f9907b836b98fa56068d1819cf1557015f5b81f74e97f3e7b4dacda47a0b18aedeadac20afcafe96103b652a4fbff78f3fe
+EBUILD kodi-pvr-njoy-6.0.0.ebuild 655 BLAKE2B d51d50533f4892bf7d9f75f473c10ea0a1526636c650171e2bfcec676bc34f8061cfbe961ae9576ab6987b4d950d1d2bcb06045999810f5a4e06cee37a735f45 SHA512 6c66fdd69d5e7cb0a3d8c586bcec60b920626dc1a87c97d0bed03fb40c99efdda93f42cf08f0adeba13447db9676c84b28c3fe41092063157f515689b2fbbafe
+EBUILD kodi-pvr-njoy-9999.ebuild 656 BLAKE2B d408f7bfb0a2b90b1a840ead5402b3da96157c6b6b6fb45d574e2b4b11f466fa378eaa8eeb6aeb1d9bd9aa0e98ecaed65d7de521ac39d3d38da1cd42e98da4e4 SHA512 d30ee6601c254b39b02c37fafb420ae2731227f51ab6a8cd0349f52c8906949b41ed57155e373901e4048c4e1adbeffde5500f557d4a891781cd87ee07d94b85
 MISC metadata.xml 427 BLAKE2B 8fbaad407c2e34375e6dcb350d39071fe3b022e4d2799fbe97746d2afb7f80fe70f4ec51161bd3751097c4de98da76b07a79dd1cefaf9bb5c449beb4faaa5817 SHA512 4e03412ca3ca3e739de135eafb479c6479f0260f2bab7a69cff6913556bf6d101f306388fbcfa0e61b3c8037ae39f08d246106fcad3d0f8281b3259f6d2a1c36
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-6.0.0.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-6.0.0.ebuild
new file mode 100644
index 000000000000..264ca39f933a
--- /dev/null
+++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-6.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Njoy N7 client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.njoy.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.njoy-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 51ea910fc5fa..74a326cac365 100644
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
+++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Krypton"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.njoy-${PV}-${CODENAME}"
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-pctv/Manifest b/media-plugins/kodi-pvr-pctv/Manifest
index aed2733c743a..fd1e36441875 100644
--- a/media-plugins/kodi-pvr-pctv/Manifest
+++ b/media-plugins/kodi-pvr-pctv/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-pctv-2.4.5.tar.gz 67169 BLAKE2B 99861fadf9fba102fb45b9d095cf8ccaa58ca53b5182f714f8666dddecc43f98ce57583b3e7b3d156aaece9f63acc7fb653d2b3763104c280d9ef30dfff6d664 SHA512 288446a04b9dca623ab12759500123d3bc548b131a3cf6757431e99571611834408da2918085d52c29380e5d5f856a6c4dede7a9793ac427123291346a28ed62
 DIST kodi-pvr-pctv-2.4.7.tar.gz 68065 BLAKE2B 0ee70bb53be42bb9b3d82c0e429f53fb1fcc847db5072ff9507fae02a9cad9ca6757ccd801560ae2d7eed2ff39588755b8b2e1f81e144253b22fd704f77cfe0d SHA512 a7c6e81d31635aa15d9cb9a5e9636bff4ed510f73495013aecf2eb1e6898c902e481f3dc13c91838407c970f8698bf40e47ca4e32ab4d067eb0566275e6bebea
+DIST kodi-pvr-pctv-5.0.0.tar.gz 65924 BLAKE2B cf2a526359457d057c32fd0ec726e59fa64010b51f1cb48841c387f38834433062487c1c12ae83aed9e653a639a4d6329145ee07f21972b0d452d5f9f9919189 SHA512 88addbfea0d39384ccb8818e88984e8eb55f9214f350285a6fa42de18045611c0cf98937e252fcd787b473fddcee0f2b3760262d901fc4b158aa4b416332b795
 EBUILD kodi-pvr-pctv-2.4.5.ebuild 687 BLAKE2B f794a38cd128e6693c201becfc7c50743c47b28bac56724800490c8a707f72c39975ab26a16198d26a71a41c7a3e1860a9d3d95ebab1c28b255aa1e807d59e91 SHA512 2d853652a23ba3be606befad46257b9173c63b5ab1852f5df5fd4545eb41653ebb38fd48726c4e55bc4cdf01b98d8dbddc76b796bd3d775cddeb5b59a0c88ca6
 EBUILD kodi-pvr-pctv-2.4.7.ebuild 687 BLAKE2B a2f89391ffa6e13192f02050d9fa8366c417f95d87d93dfb75923614c3dbbc3b6330c3800871b74caa878f05e9d8e1380aaed9256c9213948cf65a0cbbdfc270 SHA512 2a8c3ac08218c6a889ad75414440cdeb31e3dbf902e90f33aa7d39f677afd2c171fee6fbc50dd897db243119df218aa76b4fc07a56b6334bd6bb26046713c4c7
-EBUILD kodi-pvr-pctv-9999.ebuild 683 BLAKE2B b9829a385f898b123fe48d16177335ac3b6bdc095c494c0f24622b9275d82c2b86287cbeed7b891614e588a56223a7b23e24923ca3e5997b7e2b2f6a7b12122d SHA512 693dcea039b1966b9c2032be90ce5b3e856448beaf1d623f29f858ae03448eb350b34c227c92e2cbf0ab8ee67d6925ac6519bb4a3b120dbb543abbe8a4773dd3
+EBUILD kodi-pvr-pctv-5.0.0.ebuild 652 BLAKE2B 9312b0e48638475e6cb2cee4257afac0d4e0f2342987f52f9876cb9376ef182ea87e635ef6c1bf9dbe543e1a6860bbd189932ea315651b7617e6218bf7b461c2 SHA512 d03c811c7be9209db2f1eb6e0990675381951a40401fb137f9569ef5b3e039af5ee62a7220da4b3a72a9bad5e0ca2aeda7cf56977c5ac063af90cae06a26422f
+EBUILD kodi-pvr-pctv-9999.ebuild 653 BLAKE2B 94014b007543d55e5e419af01d1b1a28792a5fb01728cdb02cdf5256e7ca9b565104817eca6fefc86488b441da97763212f310f5684bee052b8d79c5bfa9dece SHA512 94f34ce270a89ec35993f5949bfccaf200a8b4f7ad3599ac6dd359ab5d4458eae81c371d42fd6005c1273355341490733a3c10c44e93b0bf0944511adffbcbcc
 MISC metadata.xml 424 BLAKE2B 0637f01f1175e2d607d0e590535ef8d262173f71d42c265b5225d396bfe9783d03b6a231de1f75a9f548487769db28f9b9988ed27aadb5838ad5b37734405959 SHA512 91f472cc7c5eb36bfd24c3565a0679af173643011140133c98f6782fc6a14aef3ac30f30e86429bbe0b361c696998fca96ea968f97963eb08a64d14655f1b344
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-5.0.0.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-5.0.0.ebuild
new file mode 100644
index 000000000000..8eaf25ef8f17
--- /dev/null
+++ b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-5.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's PCTV client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.pctv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.pctv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 9fdc35ac9bbf..e999a0429b4a 100644
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
+++ b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.pctv-${PV}-${CODENAME}"
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	dev-libs/jsoncpp
 	"
 
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index 4bd1b842fce6..f8a04e56fdb7 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -1,8 +1,10 @@
 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
+DIST kodi-pvr-stalker-6.0.0.tar.gz 114838 BLAKE2B 31f567d73dc4851acd748bcfa8187014aad9451e05727cf8b8b705ec936b10b39e62c82f451c6b4049bc70c70708beae2228cb0b5ced71b34de53b497c137076 SHA512 99b9c2a2876023efe510a9970e0520804180e138d63ed1a13fb94e86b346d09c252c8edf12f3c3a7d2610d80d25cc74e938b35ecd925846f6adf648430b0938e
 EBUILD kodi-pvr-stalker-3.4.10.ebuild 793 BLAKE2B f707e953708706a90f0e3fac40e06960be4ef6940787b674b2fba939851023bdb5e104259f62b5ffe341a6944ff99f178c497f421b013bb16bcdf0f95d292d5a SHA512 5b18fd82f1267c93c4e05dabb628ecabc6582b46b7ce3be7c50e89c7ccde70cc715d729cf155a18adac88a76af18f99b77d247a500cd30e09ddc02e8ea1558ca
 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 789 BLAKE2B fe0e482fd29735e4ad9745f2c499bb246890c6d00a75526bb675768dd3050ff593a76e40a268a6d4ca1e6adc01b07855fc7773706ae745adc3fbf023c869ed4b SHA512 9283450f048fc52bcd07eadbd68a0b52a1326cbcbe48a8decff34c76ccbea5e5c8923719c38da17fb9f521f0813ff5a378feba46edee760e2d37548d32ecc756
+EBUILD kodi-pvr-stalker-6.0.0.ebuild 790 BLAKE2B a4496feeb3d9c7b45a68ad3446da701dc1a9e89994a6fce095ad350d9ebca8950f8491a52d7260f3a1a1f241462b6afab2e1c3e334e7a34f6da5ce0a7b5bb3dc SHA512 52f717dd999f9ceea6e725b091f0bec8848185af2e217cff13c5f313ff823c932411391d104d399fa6b49f4d74bb2ae484a57d3e3932cd6b038db86f2fdb96d4
+EBUILD kodi-pvr-stalker-9999.ebuild 791 BLAKE2B 5135447a4bc6ecd6805ad16bb48f3b052132547771f76f3d204546b46a3dda2c6e602d782214e681ff05a896ae2a9eb937843d18b9469440d693cc6e9a420b16 SHA512 99dc471ac1a0699096cd45204e5d89d9e102a7e9beb95d0351a85adb321ae8483a0678800beb576ad211929c9eb99296380804273dadbbe3dc5e66fb4b29e5de
 MISC metadata.xml 430 BLAKE2B 65eb48c9c9d6e307c0ce5950a5e79b705cf5cdb3e1032f97805dd5dec7ed9c302acedac823b4cc9d263156936576257a3097f7535d017f3c4cfb9bfc08b200df SHA512 b461665fc6954e9377b3afd38861852becea318284dd6ff089153679b4fd93dd92523d633299942314e439624d7516c466f57029025a7d4618f1e51919b09263
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild
new file mode 100644
index 000000000000..fd220bfdc74f
--- /dev/null
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Stalker client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	dev-libs/tinyxml
+	=dev-libs/libplatform-2*
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	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 9ae2b1dbae49..134a230b5aca 100644
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
@@ -30,8 +30,8 @@ IUSE=""
 DEPEND="
 	~media-tv/kodi-9999
 	dev-libs/jsoncpp
-	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
+	=dev-libs/libplatform-2*
 	"
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index 3c75184d5d6e..74db6e4e2d87 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -4,11 +4,13 @@ DIST kodi-pvr-vbox-4.4.8.tar.gz 155911 BLAKE2B bcfd48ebfa0a6378367794df5789e8cc8
 DIST kodi-pvr-vbox-4.5.0.tar.gz 159512 BLAKE2B 3e5cb709c0720bcbe8f1cef4ecf13e653e933329374743c089c22b806a9ed5711466fe0186bb0d11a734c368ea576dbca72bb6269ab13c10edf6fddc8707c8d2 SHA512 e2d9583e86f28e192659e19ac853b26190b7a754bf9dad3f7a2fcdc4139ce918342a97d5424b12fae253b307c1a855b599bee8776bcc4fb319dc46887003b8e7
 DIST kodi-pvr-vbox-4.6.0.tar.gz 158310 BLAKE2B 910885dd30ce4a21419118f2af536de97f3e25eb12b453752f45a7f1f96f1e3255016039af30dd138820456895e561c05c08ed9124903faaaaf55dbbb12b9402 SHA512 98a8e7a9cc6de29028bddeac05cc0c106d5b7cfd2de658cd77a9cda94ddc9f87d4b2312ef627c17ee1a1cdba7e473981c25df2fdceb1e55543f38fc6af85c379
 DIST kodi-pvr-vbox-4.7.0.tar.gz 159117 BLAKE2B 626ad92be749bc19531d7cf156e426c000843b849f3f0bbadf0fc440c62885cf227679139b83dda4950ae82708edadff962efebe0068e357a773d9b641acb777 SHA512 1f1e4a0db20e43376cceae222ef89644304838d9bad1d7e234420c8e896f7db19acebd4cb6dd484ddd99b836e182eec8268dbbee733e49773826b6e350ec7a22
+DIST kodi-pvr-vbox-7.0.0.tar.gz 159504 BLAKE2B b0046434338d0afbd11b965a58ce292e5c141ab4ea13e07ddba3868e1217e50dc4d266351a6b1b6c08287bf65b7eb736d8efc9074fcfe602d30df49a41141632 SHA512 7e8965422c750e00104c27f6b67d6d14648c840684702bb85cd7350647734848ebcc43bc6cf53e2edd2c432c8e1289908f43eafb87bc7cf70652026abee0177e
 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 702 BLAKE2B 50693d53e28e88c2713b96531ba2f3487359263fd007f318dfb037b2d8272740635a0b67e4d7b93754979021ec5a896ca70bc6529236df4c2331c4ec8a25f8dc SHA512 275e316e0e93901696fbad09fabff8c742bf915217a029a49124c3d908d94a3b3b2a86e11ebf3e9debf51289acf3ef5a623fe752ee1829b2edbd7a73d59c3c66
 EBUILD kodi-pvr-vbox-4.6.0.ebuild 702 BLAKE2B 50693d53e28e88c2713b96531ba2f3487359263fd007f318dfb037b2d8272740635a0b67e4d7b93754979021ec5a896ca70bc6529236df4c2331c4ec8a25f8dc SHA512 275e316e0e93901696fbad09fabff8c742bf915217a029a49124c3d908d94a3b3b2a86e11ebf3e9debf51289acf3ef5a623fe752ee1829b2edbd7a73d59c3c66
 EBUILD kodi-pvr-vbox-4.7.0.ebuild 702 BLAKE2B 50693d53e28e88c2713b96531ba2f3487359263fd007f318dfb037b2d8272740635a0b67e4d7b93754979021ec5a896ca70bc6529236df4c2331c4ec8a25f8dc SHA512 275e316e0e93901696fbad09fabff8c742bf915217a029a49124c3d908d94a3b3b2a86e11ebf3e9debf51289acf3ef5a623fe752ee1829b2edbd7a73d59c3c66
-EBUILD kodi-pvr-vbox-9999.ebuild 704 BLAKE2B 3911bf09448e6e765c8fe1d1e4e691043c0a3719ce8b49a70a261941aff2402f68fe07a0c64a7cc185442d59fbb993d3017f5ca3859a7b1ee5fa1421d6903c03 SHA512 7ced3ba1b7862fc8397ae1068a8aa42b0ef4f93686be1b99e6485957c425c53a875b8471fb57dbc7197add8603f67740fb99049de00855f1eb8d7dc44601ac16
+EBUILD kodi-pvr-vbox-7.0.0.ebuild 699 BLAKE2B 3ca6d54444eeb7e3107e725698ca26ccbc881b4f836ef001099aa38858bfb18d6b9efb2696f76eed9ac4c2068a3c04d361306a65ac4db2f1666494a3b32ec2ac SHA512 d977479ac9890ac3a1fd2206aa27bb27b2fd3a109a3ab9c57c8910d738e517168553891e9e80563493ce855ffab589316cbad3acb9d43abc10173c9fdde719cc
+EBUILD kodi-pvr-vbox-9999.ebuild 700 BLAKE2B 2fed6293948107ccc6e1dfb479ab84efae836e976de3520456c0c7cdd6f890d70710553b6777f480b7294726a4b337d0a596e57e4d95bc059953bfd563d60da4 SHA512 71c8171a88aa0f3d2c5e1d395030d54ace79c17f53e0999f4df0a6970c0875c141be538638743e8cf32e552493f747c58f884168636ad5c41bdb3f1a658d75ac
 MISC metadata.xml 444 BLAKE2B c614b42e40b284fb6433935458137624ec0bdb22db86221922d82ad2fdde06eaaef60f430ad871998fc54792a03decb577167a3e1c9e9ea048e0c1fd7faf33ac SHA512 9c7992961c43a1e7bbc60018b282f41796dd8d0ba1127d6cafe0945127c2e65653fad5e47b2f283bf04ef9d3436d8693b6aee31513ae17fc98c245f97c9e3dbc
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild
new file mode 100644
index 000000000000..482dc7190457
--- /dev/null
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml2
+	=dev-libs/libplatform-2*
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 eb167d35ccd6..0a2ee36fd45e 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
@@ -29,8 +29,8 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	dev-libs/tinyxml2
+	=dev-libs/libplatform-2*
 	"
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/Manifest b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
index 4aba9280872a..15e369c2a01c 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/Manifest
+++ b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
@@ -1,8 +1,10 @@
 AUX kodi-pvr-vdr-vnsi-3.6.3-remove-kodi-platform.patch 1916 BLAKE2B 70b5129fedae5711723853678f156ab79f839d039be3470860871227f9c2838efc370566677eb778992abd11aee2e312719875b2f69f18f4bedb366eee554adf SHA512 2ffd7ae78297651ae264bfec6b70b0c59e6ff5bd2393402ebf55c2f29e0d65d783d5f88c0b06bf8c9543682317432310388e46fd31c2101fac2ed840f6b747a0
 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
+DIST kodi-pvr-vdr-vnsi-6.0.0.tar.gz 153905 BLAKE2B 20ff651453206063ecdd5bee6f3ff469f91ab82ceb4b8f82a0aea808d596a7c98da2999297c32df64650f584877cbd685298d2441c7636857ab3a91a05a43eaf SHA512 a226fff4d88679ea61e6af39301350444d8c3d7ad564afb27bca5901d0054711dbfcdfa695c1635aecfd6ccd5063706b47230638132f37bbb5c892e86a556c77
 EBUILD kodi-pvr-vdr-vnsi-3.6.2.ebuild 665 BLAKE2B 549c00829a828235bac2455a2f62aada5733940bf13a5cbc02c373cc61c9a4998e13849744b81b1f880a627d528c0d04f5eaabce8b9946043fd560ed92c66df5 SHA512 fb1cb4333073c7b9fee9e7919e975f85f75206e80877c76e6793310283be36ab591cf1054c1f20ecb0d184ef99b860263c749e1e29aeaebe64a3e62ec1e74b5a
 EBUILD kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild 745 BLAKE2B 678b2a7d08f704d8bf96df52dc17fe387ea813df1d54e544525f9ea14da2ac64c86c961c6e7c43bd8de57ef2e15b660c6d792af0dfdf3ef8ec47ff2193a8f15e SHA512 932a7c2f01e4e20d009f7d089c6c48fd563e31c35ce2700178fa40f6bd885dc11d35c52057150517d6eb390628599643cbdce64c466d63d64b8614a193a8a31a
 EBUILD kodi-pvr-vdr-vnsi-3.6.3.ebuild 696 BLAKE2B 616070d579738d34d9f4349642e14792433904b0cf3ab7f826b6c5fda9e29b7007eb4dcbd1854973988afe84cf49dbccd77041600d6686889f1ccb0757c68ca6 SHA512 bdb1549c09488af7b71a8af6e116603eba7c6169ae010d6a505df8451be70cfb4876b0af41ec150084c612b6b200080622b7b923c86e8e22da3fe50cd2d3fa4b
-EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 686 BLAKE2B 58b628fe19b4c72e55d65400918663d635b1e592ff86317b7b4fa3a105f129bd64ecb30950a8de108dd5225342177fea2c711861859689aae3c3b7533ce648d5 SHA512 a0b90331cca8ddc26c83a5c9dfdd355420a960fd290513e567f5ce6a3d0426e0fd5e178fa95c5dd8180969cb8476e88fa7adb7ba707daf22e10a5a310994750d
+EBUILD kodi-pvr-vdr-vnsi-6.0.0.ebuild 687 BLAKE2B 32480f5b86405fcf3090dfbce26613702c4f5b725c2e43be87cb4e0ecfafc9eeac1a527139ed61dfa4a43069bc3f16ec717b00d4c74a22bf635202eb540b07eb SHA512 3d2c9b8fdc20b0a1f52c56357ac2fbbb612008f53429332c4267e10d8389f6b008ec83c622b36f1751512ec15bd214a33f0f26f36a164ab49afd16b6c2ef0181
+EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 688 BLAKE2B 46fc841e79fe3c5a38c3bbf397c2fa5d0d3f088facc6adb27ef7f7c67a16fa1eeb902e40567a1837492f9b9960734f2091df71f2e592d4fad82a1b9bde46bebd SHA512 8db355c3d26efcfdb33a2f5a1f0c2a475ad0871ca860108a42f143c6595ac779d3b9ca862b37780d8830b9d688e91f7a2c9201b358e81a0e98a70880cf807dfa
 MISC metadata.xml 423 BLAKE2B ff5a21d61f4516f52b4a139f695048b1483aca09426e249c3165ecfbdef8770a47bd98d4bbea582e06e21c8d508884f67389d69ad126a3c7d46de1bce2b48207 SHA512 e81e80ae101dbd4b405ff3b8056c8cc901d5fcf2ff2d1eb595e26f5f59954d6931c5acce9fadb94bfbb533865017f17fb579bf382ce6c226ca32a2dc10f1e0a8
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-6.0.0.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-6.0.0.ebuild
new file mode 100644
index 000000000000..c5a36ea070b4
--- /dev/null
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-6.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi PVR addon VNSI"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	=media-tv/kodi-19*
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 c773d9543091..b9fa5be43335 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
@@ -17,7 +17,7 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
 	;;
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index f26fcaec3679..53dcbe9f5f58 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -7,6 +7,7 @@ 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
+DIST kodi-pvr-vuplus-6.1.1.tar.gz 278369 BLAKE2B e8c9ba3a00fbe467eb4779d22ff189e24189d546050a6d69c1a982c4c797adab31eb760a68eee19ddf22f6fa94ca5a9405f4ad7cd9706246b8c899679b05c615 SHA512 87de5784610275051f68fc732d4a53b218443d0e93b2b1a7e2f4b07cb285e888cf66dc26de0b947080763f5cfa3a58a7ac3363ca00254b4956cba8edba7f7a69
 EBUILD kodi-pvr-vuplus-3.28.0.ebuild 714 BLAKE2B ddc7ca2601a67b0e9d6caea02534bb560f98289893d4d42f354962a7997e3103484bd47842b7d10db546064176dd470c7b14cdc5831334464361a97e41fba1c7 SHA512 1aeb62f2471889fd95448abf155566ce450dc043f27a69c7318e6c5cd874c382a12f9787b86ed4a3f72f867862dc793680660c0bbfd80377481115a6ad9664f6
 EBUILD kodi-pvr-vuplus-3.28.1.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
 EBUILD kodi-pvr-vuplus-3.28.2.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
@@ -16,5 +17,6 @@ EBUILD kodi-pvr-vuplus-3.28.6.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d970
 EBUILD kodi-pvr-vuplus-3.28.7.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
 EBUILD kodi-pvr-vuplus-3.28.8.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
 EBUILD kodi-pvr-vuplus-3.28.9.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
-EBUILD kodi-pvr-vuplus-9999.ebuild 821 BLAKE2B 11827a84db5745ae036536bec483694e8450b2619c800081a203f4eba3efc91e0d6cdef280e0678700662f7e8b305b6ac642ae15d18a463e86ed57e62b30682c SHA512 9f780ab4715d8733097184c0ce99de9856fb3d7010354b5a6eb1df7ef62900bdd7496dad83cb2f698a129ef31a199ce75c1e88cb9e07c978439fad4fe8c3064b
+EBUILD kodi-pvr-vuplus-6.1.1.ebuild 790 BLAKE2B 318c0bb6d01af96d85197cb7a09f5c7a409321e4fc08736bc726efd3000084cfca631eba3aba714ac0d90e692a9ffc4286969e17bf7e4e0371a6225b70cb2333 SHA512 0cc0c5cd415ef5ce9a42cafe109fd7d397b4702de87779278390422c549d27e564b1d0f606d4074ae5e11261e4664ef2308ae0306ce93d94e24c7862a8ba28f3
+EBUILD kodi-pvr-vuplus-9999.ebuild 791 BLAKE2B 9f92260c4ea414dc0e8bee61d366b1c6a48c1055d2c55f7ef2209a17fef92d360c56167726c4f3fc5ea034542c90e5ef6a320a92d0932d3a31436dac5cb62daf SHA512 a98f18e3e191e4964f1fb0cc262489951aca47c7f7bff7dade9976ac0d6c2bedde1430d177a3f4512d62272a91e73cbe27b87b8754418ab48331ab321d3f8610
 MISC metadata.xml 428 BLAKE2B ac264c6bbfc925ff772eda61b1b4069b52ed5bf12836af8d8e86a72fe42bd852be1d00f74056c1d6b925fa2a026ea7df57ee57e7434a797884741b70762ff173 SHA512 573f803447cb7a7d0095eb21caa9f55c41fa4fb68c0f40aabad63df2ee262ce168fc75f28f3a3ae6aa7bf41f258be771c6a6dd06d1f2e2486b3d557d89f28f4f
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-6.1.1.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-6.1.1.ebuild
new file mode 100644
index 000000000000..514a694a91e0
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-6.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	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 e3d879c290d5..2340779b0704 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	dev-cpp/nlohmann_json
diff --git a/media-plugins/kodi-pvr-wmc/Manifest b/media-plugins/kodi-pvr-wmc/Manifest
index 97719fbb0fb6..f5ad8552c22b 100644
--- a/media-plugins/kodi-pvr-wmc/Manifest
+++ b/media-plugins/kodi-pvr-wmc/Manifest
@@ -1,8 +1,12 @@
 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
 DIST kodi-pvr-wmc-2.4.6.tar.gz 179322 BLAKE2B b82761c76fd1d49400f5aa38ebe32adf6984b94c6d6feebeca2e0c6b31fbc413960af7a09955bfc0a5a50d454a4cc52a36098b74313a4ce673b08802ac109525 SHA512 2912d57f1d9d03d7f40c041c76737a620205e5fc81c6fc72c34c2f4d12e0fd18ccf185d78501dcd0b633aef3d5d2ce91d4201b60b92e0f6ac59d36df5eb19d15
+DIST kodi-pvr-wmc-5.0.1.tar.gz 184896 BLAKE2B 28f321f9a6da6c96ec3482bcdd6939229f121b87e5378429b9a37b1638d0c9d3682d9442c5b0cc544b97fcd60d84dae5c442d4430ed0a5bcda2d7bbe52807be1 SHA512 f705915c1cbd47a024d53709f734c6e5ec4bb01f2b6e648a9c385712ed8101340c8a4fd45d4ce16a04de29e73c5fb9ecaf8163c7c30f848bd2acada6cf66804e
+DIST kodi-pvr-wmc-5.0.2.tar.gz 184922 BLAKE2B e1515a79d94bd4950af4f1c1058f0db4527f5af51dfe5368e4f7762505c6db8a8e986e4f17a99a355952c12a558d81e088a36aa2e2ac82803c4e2ca0e94472c2 SHA512 aff8f1e8bcb2b8fe6e4137b8af1c61e8036d262953f21f4512e40d7b9b5925cd078d021c569e1e51a7d260db5c90ddee8e3c158499d2cd656fd4861ecc90e0fe
 EBUILD kodi-pvr-wmc-2.4.4.ebuild 680 BLAKE2B 7e2ceda9bcb53bc2c284d9876226abf5f87455e3e69eb1fb8cd3dc151f2a09b7312adae0ea0272ae2945d3df85bb3bb2464f7cf3b80483836ff6419037928aab SHA512 50105fb1457f40160a5f08546baccc73042e842738ea81b96904a68a5d60e9a87ad056d4db292ff391ca7c6ad2326682fb3ca6a84186d96beaf86d0526c85dce
 EBUILD kodi-pvr-wmc-2.4.5.ebuild 674 BLAKE2B 738b8ce98a53a1380a9a502b2e422f36091ab8d4184cc1a20272c538d00e24a288e7866de312cfd119411eeb21b4d715ea600f36926db0de2af460b5bfc9fcd9 SHA512 67baca8507a923b2c7e81b601a12b6878e9d145d3c525c7e6c37dbaf75b7814459a0354ef6b90a773f3327a88e06a3b17888ea4c166dbaa162a64f1153798290
 EBUILD kodi-pvr-wmc-2.4.6.ebuild 674 BLAKE2B 738b8ce98a53a1380a9a502b2e422f36091ab8d4184cc1a20272c538d00e24a288e7866de312cfd119411eeb21b4d715ea600f36926db0de2af460b5bfc9fcd9 SHA512 67baca8507a923b2c7e81b601a12b6878e9d145d3c525c7e6c37dbaf75b7814459a0354ef6b90a773f3327a88e06a3b17888ea4c166dbaa162a64f1153798290
-EBUILD kodi-pvr-wmc-9999.ebuild 670 BLAKE2B e632de6bf907313ecd9140efad25833c6b0a8a3218282cd7fdb70d684661dc80a7158b71a23ef21b35b9eaf80af91a40011631f82d81e2ad8c2a39f8214a7c39 SHA512 926542c4e016c1f4156ad7035d97d53094d54fb60c952bf31921f5bd4876aaa4f7e5a07c05bd1c5b76f2f48d66ee27148db7c8ae614090a63646ac0bafb86611
+EBUILD kodi-pvr-wmc-5.0.1.ebuild 671 BLAKE2B cea6ebeb3d6533a75c6b4b6bce98802a8b47328b1b88654fa7da256e594fc34d4cfd81e371c687de1b70e9c2c4bc5d8c01677b8e1f49eb0bfbf127b2a3741594 SHA512 a36045da186380df4d48ce7a4908a6f7865c0c5f4e9b755650fb33e134df548820231fb0639a640db3d3b835fba5f028e6d092c693ef904d96e2e7420980e024
+EBUILD kodi-pvr-wmc-5.0.2.ebuild 671 BLAKE2B cea6ebeb3d6533a75c6b4b6bce98802a8b47328b1b88654fa7da256e594fc34d4cfd81e371c687de1b70e9c2c4bc5d8c01677b8e1f49eb0bfbf127b2a3741594 SHA512 a36045da186380df4d48ce7a4908a6f7865c0c5f4e9b755650fb33e134df548820231fb0639a640db3d3b835fba5f028e6d092c693ef904d96e2e7420980e024
+EBUILD kodi-pvr-wmc-9999.ebuild 672 BLAKE2B d33f39250a6b1faad7a0a70451a31c08af9fa51f90fc691aea2227585c8b6abd6a07c66bf088c54230df701c242984d89b14d21c01d44a12e522df14a4492f73 SHA512 a4c10a79ad84582c2a7384c84da599446c42cf75e8b878510743a23b7b95c375c440944231f396ce239371c791fb5e7c8a60f21e89a6822df7b66885fc0d1fec
 MISC metadata.xml 439 BLAKE2B e9d6404796d298720abff6d7afd2db18b95007cb65ee3ff471b83ee7e7e864eb648a37e3d9d8405842c6b8fe3c409096abad8c8b6c3b1eb2e7df15d4865bfcae SHA512 d85d185c415264b312fc1cccf1155b4f49d1091795989e617c68a4a910f0c85e19b8e34764b4a4a31bc825c927f5a939a7bd7b2f4d1412263aff6d0e50b3fdf6
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-5.0.1.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-5.0.1.ebuild
new file mode 100644
index 000000000000..f1ee4b584ccf
--- /dev/null
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-5.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Windows Media Center client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.wmc.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.wmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.wmc-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-5.0.2.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-5.0.2.ebuild
new file mode 100644
index 000000000000..f1ee4b584ccf
--- /dev/null
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-5.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Windows Media Center client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.wmc.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.wmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.wmc-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 c1134f09373b..580ea4e57960 100644
--- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.wmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.wmc-${PV}-${CODENAME}"
diff --git a/media-plugins/kodi-screensaver-asteroids/Manifest b/media-plugins/kodi-screensaver-asteroids/Manifest
index 074027f6bfec..43de4a803e04 100644
--- a/media-plugins/kodi-screensaver-asteroids/Manifest
+++ b/media-plugins/kodi-screensaver-asteroids/Manifest
@@ -1,4 +1,9 @@
 DIST kodi-screensaver-asteroids-2.1.0.tar.gz 18838 BLAKE2B 26504e8a10afed55a780fc18e127df7029adabff913baf4da89e76ebc1ee1bea46431e4a578f8273335a40a30b0bf8e678c86624e75fd3419696c3cb9d494a69 SHA512 61d848aa136ab3a9896446d92c5bc8d02867bcdc67b8eed58cff0b9c3573c52a19b4d16de5494dc45c0f69946075749d73e8681858d534f8cbbe31d005a9a5c3
+DIST kodi-screensaver-asteroids-2.3.2.tar.gz 117462 BLAKE2B c17837e244baeb65cfef11b8f9a20796922aae19ff48e95baff52163ad2ad44e272e219123ab875ca017a1347d77d07a943991a7822ebcae9e8d96ce881b77db SHA512 1ea720ba96e65e2d63984ece928f40d60eaacd207cfa64979f1fb38e779957bbd91f41df0e0dcb0bad1b3efbb5dd9be17f2a06bcbeb3c06e7a386c07e99d22db
+DIST kodi-screensaver-asteroids-2.4.2.tar.gz 120463 BLAKE2B 3ec2c8142f8d763e85095f6c89c59583fb0ca309c18a57407fe456113dd8964f6bd896c23fc6d86b9a4d1aacb25e097202e52844faf9272e08d507e50f523ca5 SHA512 795c7ef2eaab9e1801d48430b9544a7f721d45ad5aed79ca2e361b16186043dd2ac9dc2b47ddf459744717f4704c9212d23c18df9da6c1bd158e6e6e9ef76fc5
 EBUILD kodi-screensaver-asteroids-2.1.0.ebuild 659 BLAKE2B b7b187fc3f12ebcafa40a29f58707a472761e8e3a0bd36fa4c38b2d700493696816c928a5e7e79dbf080e9a7de57c721ed31c937885aa3b88526b2aaa1196cb6 SHA512 3511ec63d44bb7f1123c4a564fee3e21ce121b6f01d167b9a552de6c0d2a7522305c314f5a0bd2cd1b11460b339839ef62661eac701487d13265d8492e4c7eeb
-EBUILD kodi-screensaver-asteroids-9999.ebuild 654 BLAKE2B 4d4e0591d98fa1c135e7bd5d010d0face83f4818bd61cf975ea4e839d08f69915cea23ae5ee85363c32f866a770207da7201b67b7ce7e07e92168f94f5ae9688 SHA512 50c232939216d4d84d7728bf8a62a31e62611f23884ea10d59ff00818a149a89c9983b6103f16403ba07202a12780cd8e58ae9c978c74a5f12dd553c653b7200
-MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
+EBUILD kodi-screensaver-asteroids-2.3.2.ebuild 883 BLAKE2B de4e0d60a83be20eeb86c1cd09c103ef30fb27fbca103c628d5eb552a2d8f89defaca7ef0d21ddf2081ec347f4d6830a1465dfe747847095b6d292c142e587be SHA512 a33e0652c73c3dd85d326a438f4d5c394f9ea4118236156e3a7aad88d5cd2ac68561eae317dabcf04cee3ba469b6f110422734426c67abd6713d65edb1ab7f3e
+EBUILD kodi-screensaver-asteroids-2.4.2-r1.ebuild 885 BLAKE2B 89cded4503c14f2be2b981d150605b4d2f84ee32e3cdfe0c671f14f91e65e4d1da8f7aedd90391a1c3e503f69046fece82b0668f324bebd84bf9972803af9fdd SHA512 099d2b02baedcee62f4bbaa19054b50c3fc93752bb08aebcbe64322eb2ea552093506a1e68ca001cf6d879906dc9c09062b3112e31d73d400954fb46f2f82fbe
+EBUILD kodi-screensaver-asteroids-2.4.2.ebuild 685 BLAKE2B cf03c9569fa82bd0734ae2d5a05c57cb9441fa57cc1c56a7e525b6e3eb74360e7bec4a70f4cba9032d10d03e234d840a85896539f5d28120d553040fe2e78b9a SHA512 758b4ab1ec79139fff43fd71146a37cecc9b33a7090368ff2606483cf313cfff40db7625c3ec73146146e28f8afe29d93c812a6904a83b563eb9325b4e7c43c9
+EBUILD kodi-screensaver-asteroids-9999.ebuild 885 BLAKE2B 89cded4503c14f2be2b981d150605b4d2f84ee32e3cdfe0c671f14f91e65e4d1da8f7aedd90391a1c3e503f69046fece82b0668f324bebd84bf9972803af9fdd SHA512 099d2b02baedcee62f4bbaa19054b50c3fc93752bb08aebcbe64322eb2ea552093506a1e68ca001cf6d879906dc9c09062b3112e31d73d400954fb46f2f82fbe
+MISC metadata.xml 369 BLAKE2B 509cffcea78f84f6540b6f4f37595405872335fbeecebfb6fd905bb4596b26a5892f4e381f29cc581165c34db301b0c1291f6abb3a8b39c56ed0d53a50db4e26 SHA512 235fb045de9c4ecaf3258d431bea88e4bfedb2522a7fa6f17d5f2c733297498dc8a37a73bfa7cc5953cc070faab8db296cad61f0c975e37e2c35dd70b6bce953
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.3.2.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.3.2.ebuild
new file mode 100644
index 000000000000..27287d27bc2c
--- /dev/null
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.3.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Asteroids screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.asteroids"
+KODI_PLUGIN_NAME="screensaver.asteroids"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2-r1.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..a423eb767979
--- /dev/null
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Asteroids screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.asteroids"
+KODI_PLUGIN_NAME="screensaver.asteroids"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2.ebuild
new file mode 100644
index 000000000000..dc97eaddcea5
--- /dev/null
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Asteroids screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.asteroids"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.asteroids.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/screensaver.asteroids/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.asteroids-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	media-libs/glm
+	virtual/opengl"
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 1b2552c29bda..a423eb767979 100644
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
@@ -3,30 +3,42 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Asteroids screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.asteroids"
-SRC_URI=""
+KODI_PLUGIN_NAME="screensaver.asteroids"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/screensaver.asteroids.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/screensaver.asteroids/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.asteroids-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-asteroids/metadata.xml b/media-plugins/kodi-screensaver-asteroids/metadata.xml
index 2263c79c6cd3..d0c604b276d9 100644
--- a/media-plugins/kodi-screensaver-asteroids/metadata.xml
+++ b/media-plugins/kodi-screensaver-asteroids/metadata.xml
@@ -5,7 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription>Asteroids screensaver for Kodi</longdescription>
     <upstream>
         <remote-id type="github">xbmc/screensaver.asteroids</remote-id>
     </upstream>
diff --git a/media-plugins/kodi-screensaver-biogenesis/Manifest b/media-plugins/kodi-screensaver-biogenesis/Manifest
index e7e5b3b3158b..0dd633d2448d 100644
--- a/media-plugins/kodi-screensaver-biogenesis/Manifest
+++ b/media-plugins/kodi-screensaver-biogenesis/Manifest
@@ -1,6 +1,11 @@
 DIST kodi-screensaver-biogenesis-1.1.0.tar.gz 8792 BLAKE2B 7e6d64cd5e4e53fc3c53adad6bfb66f2ee9bceaad5ee2a35243782a931d5d2eb67af4ac5489cfae52d5fd5240ce1b2142feef9c80306276d86f91b697eeaca8f SHA512 db970113a44d87ccf44c520d5d6adfc640617ba9fd01f0b0114129d1901b2e853804871d9f5377a0869034b2379663922069545f3a7bd38f98b2d9894013c5ae
 DIST kodi-screensaver-biogenesis-2.0.0.tar.gz 10579 BLAKE2B f6dbd9f99b453f33b3cd2650d901c4fa39b98ce77382362fa93b1d2e31a54a23394677006b3be97b8bd1626c97564ae812f3452bd17f9cb165914d8793e2e00a SHA512 3aa4668f009561b3615d68d7a61d47a86970e32ff97012f1a9a7ad8dab367008267949d736c47a913f878aced1daae8768c2531d3af6239419470baa2e9f835c
+DIST kodi-screensaver-biogenesis-2.2.3.tar.gz 141092 BLAKE2B 64d3f9b4b87a7a6533fba653ae8e281777a6df6ff085886e9e556378203a0badd52e2124fd4f5b01984c24caf84b07bba6cb40a6c7b11e3e0a89e55ee83ef4f9 SHA512 62f96e318766d609110fdddd3d56a56b7402630a137a7ded051a60b042c9e8f5e7b414d5d48d760c16cc272bbaa5f664478ed7beec216e2d8f6ce5b363ea4f9c
+DIST kodi-screensaver-biogenesis-2.3.2.tar.gz 143025 BLAKE2B e454d8fdca397b163d4e1d4856257e3db819423706b153e833b39a3f789b493073a0047456eff75f912b26723fc63f7b6956eeaf88d410a786a8b71266c76b77 SHA512 c4761f486aebe08df8811ff54bc32ae0f44e416bf2bf22f639478ffe27f26d2e4239704f6e8f93871a9d9c7903351e04ed05295d60345e8eb829c82874c6cfc1
 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 659 BLAKE2B f70f913d0dd894e45f42d6653d0fa870bb9450eb3831e201e38f3fb72690694f64c6968056402bb3a3a112c39b9105f5ef57c10ed35cfcc551865ff365b28992 SHA512 7b77a4063f218a194ef0531fd2f8dda50023285beb5bf658e533dd2d7015bf07dd4d59ced0d192ac23e61604b460f154eb5f5217c712ca9a8763dcf66684a1a8
-MISC metadata.xml 441 BLAKE2B f5c19cf70bcc5dddc98d5d1f01403fe32e05e859fd18cd972e8df08b76e4356bce05910535a336dff4f11554f9e8cd7a69addb00b0c5efc2bc021d68a8198624 SHA512 ed6d1fe10c992d7f28c115e86eb2565b6dd2a753d670dae7815ecaa717b208d762a62504aa67a2bc1853a203fdb49d1763ac03e00effddf4db81567f20100791
+EBUILD kodi-screensaver-biogenesis-2.2.3.ebuild 690 BLAKE2B 44692c5d50542af1fe6a3fd8d92502e36584a7ab55ac37a7810e55211ba53b7faa63067be17ed60caab8598c02976352ea52ca4aee616f6e93dd6ab760fc0a33 SHA512 abbd2dec6e1979c9587690ba73ee57331b24e1fcbb494f6d30b85025f302381c49f17f55b478f6477f2680f11cf94e6f1d3899719e0343c3dd4b0408f977a941
+EBUILD kodi-screensaver-biogenesis-2.3.2-r1.ebuild 693 BLAKE2B 96f78c24d88bbdee8bc10ee07f8a7badf72a0444455af49584506db88f3647489ee98d6abf6c723c1d59710a3ace2e78ec060addc96d5824a67d35c27e4cf5f7 SHA512 5451041185df4e4c64c31ebde0d39158ad592eaefb118d1a00f9f4932dd869637ac4a3427554fa83affabcf74bffe763f4cd53913ff89a3e27adf62f236fb7b0
+EBUILD kodi-screensaver-biogenesis-2.3.2.ebuild 660 BLAKE2B 8b9df4caaf3ce601d2983d84fc81f8dd5c6449852ddf2baabb122e9fc33af1de452ee231373c8612f591534b5ecb896c4d08861486fac33d6a543dddd0a2c0e5 SHA512 6aaed9d86d21ada79c6bda22c351ce90e292a359c7d25a6ea4292c7e88379aa7708f5758a160ea7918dfb7dd63d811cb8df2ef1ec6add45b1fd3c874f67346de
+EBUILD kodi-screensaver-biogenesis-9999.ebuild 693 BLAKE2B 96f78c24d88bbdee8bc10ee07f8a7badf72a0444455af49584506db88f3647489ee98d6abf6c723c1d59710a3ace2e78ec060addc96d5824a67d35c27e4cf5f7 SHA512 5451041185df4e4c64c31ebde0d39158ad592eaefb118d1a00f9f4932dd869637ac4a3427554fa83affabcf74bffe763f4cd53913ff89a3e27adf62f236fb7b0
+MISC metadata.xml 370 BLAKE2B 5622fe770f1267cd83d53da16a3ba7676d07eb32c4bfd2cb792d68983e60102d22829f1fb31e0a9794817e11419774fb4c268c8f55b78e6e84de3ebcfbef583c SHA512 aac43e7a3c5ffcc8f5c85e0e0fd8e8276c2870f958b0c14b199524fc0f5a69836c8fe9f34e0a3a6af74d3f30b3cb8c8021dbb5cb38c9a3f5139f69d8b075a59e
diff --git a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.2.3.ebuild b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.2.3.ebuild
new file mode 100644
index 000000000000..a8276426225f
--- /dev/null
+++ b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.2.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Biogenesis screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.biogenesis"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.biogenesis.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/screensaver.biogenesis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.biogenesis-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.3.2-r1.ebuild b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..1c4c5134eec9
--- /dev/null
+++ b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.3.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Biogenesis screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.biogenesis"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.biogenesis.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/screensaver.biogenesis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.biogenesis-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.3.2.ebuild b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.3.2.ebuild
new file mode 100644
index 000000000000..fc33cc303c55
--- /dev/null
+++ b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.3.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Biogenesis screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.biogenesis"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.biogenesis.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/screensaver.biogenesis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.biogenesis-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
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 ef5bdd9f2afb..1c4c5134eec9 100644
--- a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
+++ b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
@@ -3,30 +3,29 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Biogenesis screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.biogenesis"
-SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/screensaver.biogenesis.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/xbmc/screensaver.biogenesis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/screensaver.biogenesis-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
-	"
+RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-screensaver-biogenesis/metadata.xml b/media-plugins/kodi-screensaver-biogenesis/metadata.xml
index d7ea1698fbfe..6470434e8c9a 100644
--- a/media-plugins/kodi-screensaver-biogenesis/metadata.xml
+++ b/media-plugins/kodi-screensaver-biogenesis/metadata.xml
@@ -5,7 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription>Biogenesis screensaver for Kodi</longdescription>
     <upstream>
         <remote-id type="github">xbmc/screensaver.biogenesis</remote-id>
     </upstream>
diff --git a/media-plugins/kodi-screensaver-greynetic/Manifest b/media-plugins/kodi-screensaver-greynetic/Manifest
index 9fd2197e8dc2..06dcc60fb96b 100644
--- a/media-plugins/kodi-screensaver-greynetic/Manifest
+++ b/media-plugins/kodi-screensaver-greynetic/Manifest
@@ -1,6 +1,11 @@
 DIST kodi-screensaver-greynetic-1.1.0.tar.gz 5115 BLAKE2B 357a4d51b2271c4181a33521f8cd2b0ab991d168f4768474bcc81c64b3f058b8a84b1e5ac812abad650de22f925f894ea0fd3aa35b7a33b63413a7fe783ceee4 SHA512 ebc35da057f425ab5a4832324f4e26bbd6767aa1aed13177073caab8a099b4a4cbcb6e9c84ae88970eb13401bdf411422588ed9ba83a9d5d9749c3add6e43375
 DIST kodi-screensaver-greynetic-2.0.0.tar.gz 6608 BLAKE2B bb48adc922d3949670d3685ca4adba7d608a42e9f9c0c659ca91a26e9181568f4a6d1f1f9aa707eedb395a9eb54c4aa40a83b36b6594bef5f9159ead5585381a SHA512 15a577bb9e10f81d86582eb43c20b4e2dcf430f478c76b3c18c1800532e38d9dc87754b7e0df669ca8df4e1d4d589224c561688a4fd14528c70dc6728c7be16f
+DIST kodi-screensaver-greynetic-2.2.2.tar.gz 334717 BLAKE2B dddfd2bc96d7b08dd8107b6830c5db3fa999a34f26845bce3f5be11442bc8e00aa7415be2312192af785710773648cdc8a5f1019be7e74e522641c216a1eb741 SHA512 2ff75111db2df696055bd7b5d447662bae8871f05750f9753f646d9167d57d694442efe59ec277c0de0b064d6f5ab0d73f3c8cc1d1e918d065e35646d3311b41
+DIST kodi-screensaver-greynetic-2.3.1.tar.gz 336191 BLAKE2B 54cc3f93bb18c315e75faca68dd7683e7afb50ebadcad01c33e60457958702205d51321b665ac72c95f4d758ddf896b9bb120e4a9a9315be33d24f9c1707989b SHA512 e4e6e513c4b2c7476ee0f29a436abf102a196e5c307c17e9b197572cc7eb7a12890033250a8115ea4bc43baec0f5cb87f1103413a7d6b852235f0710b4086279
 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 654 BLAKE2B 9ed22673bf4107752ede4b2dc7e2fd84c7f79ff3092ab130fed743add091e5c1693cf15be24725b520515293e46344d2bf3152d72d9c68449fef1c00803df296 SHA512 0b6fdbbf1fc8007dd19eb6cfde4cdaac58b0d0b53b97238116f89515cfdd891f81fddc0949b4796df2392f678751bedc9bbda0f08843f89e201b3d7eab5128e3
+EBUILD kodi-screensaver-greynetic-2.2.2.ebuild 883 BLAKE2B 598583cb11365f04a0146071819bbd1d8a4d556b3a1dbf8300398b0ffb98da2ad61e17d9a64fa52832f555b71b25cedd426b1d69e27dcc687b746428974ff798 SHA512 0ddb36cdc2b767ed36bef5fef0c53a43db3cdac937f0d5591f67b5264521bfaccb480b9697f0b85fcd6ce224c665ca6549651fa43c379afffc6934397742b372
+EBUILD kodi-screensaver-greynetic-2.3.1-r1.ebuild 901 BLAKE2B 403fbe945809faf151fa3d631a4a3f6d0e8854c35de2b58c58edec964a050091c18bf1b8afdfade3f22a9552b0e6f7b3fc5b1d129bdeb7690e8c2c9477e44bc2 SHA512 9d22e1764246769f1eb31ddd17d391c4e216565125979c11b267a65ceeca9f4152c980208df1effa83b68b9e9aceb78e2d101ab74a829558f5f07befb96b9a1f
+EBUILD kodi-screensaver-greynetic-2.3.1.ebuild 687 BLAKE2B c428c4ace17487b33cb8edc93cd29046457be7622df63f0c44f37720c921e580d5510bf8cee5023f5a4b3a867f124d724a8af1a5aac2790a8183fbd9d09cd523 SHA512 66de2a94fec145501332316a1249e5b674d41d1fb5a7969b631c97f2bd718eb242cd5b96e8ef823835ddfafde8b6d70f80fbfbd3d67e8d6941a5a27d71e0e0e6
+EBUILD kodi-screensaver-greynetic-9999.ebuild 901 BLAKE2B 403fbe945809faf151fa3d631a4a3f6d0e8854c35de2b58c58edec964a050091c18bf1b8afdfade3f22a9552b0e6f7b3fc5b1d129bdeb7690e8c2c9477e44bc2 SHA512 9d22e1764246769f1eb31ddd17d391c4e216565125979c11b267a65ceeca9f4152c980208df1effa83b68b9e9aceb78e2d101ab74a829558f5f07befb96b9a1f
 MISC metadata.xml 439 BLAKE2B 61919ac2fc5a3efc8278e1dd40f196fcd000ac12cdbe633b4f53bd0653978f4030fd3dcaeecb6f17a86c4e8fbabdb8e9d6e11e7ec245693c54baf57ac1042445 SHA512 56833abb5a30439a7c4736e4f695f555e79bcdd0cad2d53a87897c35d4c3efedb65a4bc5818572c5fbb7768eedc635659299186339d3557d98d86de7a54885c4
diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.2.2.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.2.2.ebuild
new file mode 100644
index 000000000000..846592b822fb
--- /dev/null
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Greynetic screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.greynetic"
+KODI_PLUGIN_NAME="screensaver.greynetic"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1-r1.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..ef726bd9c51c
--- /dev/null
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Greynetic screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.greynetic"
+KODI_PLUGIN_NAME="screensaver.greynetic"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1.ebuild
new file mode 100644
index 000000000000..dd0202a1506c
--- /dev/null
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Greynetic screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.greynetic"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.greynetic.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/screensaver.greynetic/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.greynetic-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	media-libs/glm
+	=media-tv/kodi-19*
+	virtual/opengl
+	"
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 f363ffaf5d4e..ef726bd9c51c 100644
--- a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
@@ -3,30 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Greynetic screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.greynetic"
-SRC_URI=""
+KODI_PLUGIN_NAME="screensaver.greynetic"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/screensaver.greynetic.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/screensaver.greynetic/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.greynetic-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
 	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-matrixtrails/Manifest b/media-plugins/kodi-screensaver-matrixtrails/Manifest
new file mode 100644
index 000000000000..91859a01b165
--- /dev/null
+++ b/media-plugins/kodi-screensaver-matrixtrails/Manifest
@@ -0,0 +1,6 @@
+DIST kodi-screensaver-matrixtrails-2.2.3.tar.gz 1669456 BLAKE2B ebc44866ad1c7b42ff3f0efd0fc1fdb33c2552e432735b0a196388f57e7405e6115b0fa316ccf0840f593aaf1ad0eb333ba0ca0b8271e7152a2cd5d1707619d4 SHA512 5347dc6b7ec32bc305ee71859070229609367a3231f8ca18e4712588f56387cec4c5591abbda2375d047f951f8482d96ed93e8224cb1afd92cbbecdbf151b03e
+DIST kodi-screensaver-matrixtrails-2.4.2.tar.gz 1679056 BLAKE2B 1f8ff378de25aae23b0d97702364e322c1e941610ca2afad42f947d7e2ac352f1911ba75cef68b4487b1660eacfb502ba37bbfb55eee284fbd023848a6cb4921 SHA512 1d93ede840b578aabbc83195e1234faf4a4e8408dab94a0e7573e49df826878f5618fc49348c1f1f24c947eaeae7406aadd1bc4e0405a6155c92f32f7c413d71
+EBUILD kodi-screensaver-matrixtrails-2.2.3.ebuild 861 BLAKE2B bd11ffe6c42133308d2dd785f1e73137a847e8af0749e8a97dea7d14493c5a449c25b61aeea5f4c917de5a1ffa7a2962f787b16e2ee018fa590c6095e9b719cd SHA512 c20535061927b998693bbeab247e5c199d4e7c4371c3d325e78d8517f176dd36d5479dfe2500ece342d02cc7839739fd146e694f3466bfbe21261369af4b9b9b
+EBUILD kodi-screensaver-matrixtrails-2.4.2.ebuild 863 BLAKE2B baf973adee3f68e959a08ab8d6e0a99f790b775678d96350fc641e378dc4bd547a4e1a91a0c20c36c3feb7d984b2680fdd46fcafee8778fcaf2f38b9b1416e7d SHA512 01046722810078473f56b20b9834f505dc02b11f6c2921f05399c846907f040151089b731f9c860b87e3a41babb1435bf059c5009167fbcecdc9587158fe40b1
+EBUILD kodi-screensaver-matrixtrails-9999.ebuild 863 BLAKE2B baf973adee3f68e959a08ab8d6e0a99f790b775678d96350fc641e378dc4bd547a4e1a91a0c20c36c3feb7d984b2680fdd46fcafee8778fcaf2f38b9b1416e7d SHA512 01046722810078473f56b20b9834f505dc02b11f6c2921f05399c846907f040151089b731f9c860b87e3a41babb1435bf059c5009167fbcecdc9587158fe40b1
+MISC metadata.xml 502 BLAKE2B 3aed11a8a0092acf679fccecee47e42275d4b69242c2d74b50c8d4c723acd9574dfc74b1cae83943fc642115ef1a3ae19452d51e3f1a32f91492b413674aae36 SHA512 e3d3bc984f136a536f61d2384d7b62a942b20c4e8d750d2450a958b0171db835d0725016248653a58a3c9522557f816d026f94985015628fbdaa07bbea084576
diff --git a/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-2.2.3.ebuild b/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-2.2.3.ebuild
new file mode 100644
index 000000000000..7ac2462f0896
--- /dev/null
+++ b/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-2.2.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="screensaver.matrixtrails"
+DESCRIPTION="Matrix Trails screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.matrixtrails"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-2.4.2.ebuild b/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-2.4.2.ebuild
new file mode 100644
index 000000000000..497606cc108f
--- /dev/null
+++ b/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-2.4.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="screensaver.matrixtrails"
+DESCRIPTION="Matrix Trails screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.matrixtrails"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-9999.ebuild b/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-9999.ebuild
new file mode 100644
index 000000000000..497606cc108f
--- /dev/null
+++ b/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="screensaver.matrixtrails"
+DESCRIPTION="Matrix Trails screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.matrixtrails"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-matrixtrails/metadata.xml b/media-plugins/kodi-screensaver-matrixtrails/metadata.xml
new file mode 100644
index 000000000000..6584d4783bbb
--- /dev/null
+++ b/media-plugins/kodi-screensaver-matrixtrails/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <maintainer type="person">
+        <email>k2k@narod.ru</email>
+        <name>Karlson2k (Evgeny Grin)</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">xbmc/screensaver.matrixtrails</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/media-plugins/kodi-screensaver-pingpong/Manifest b/media-plugins/kodi-screensaver-pingpong/Manifest
index 32a8de50b1c0..ef2464cdecae 100644
--- a/media-plugins/kodi-screensaver-pingpong/Manifest
+++ b/media-plugins/kodi-screensaver-pingpong/Manifest
@@ -1,6 +1,11 @@
 DIST kodi-screensaver-pingpong-1.1.0.tar.gz 14476 BLAKE2B ce9a13968394ff607beff2fec8ea8b2e17a8bf7b08cd7be12af426dc45c100a666fb104a5cfa05287b6e632cf51d7d27b6d504d481fb4b6ae85066ddb179be08 SHA512 304bb57cb4d5a9807ced12ad1503f7a1be0f57b2ccc8a024651dcdba83ee17fb1b3adde1799b62d41c0ad2fc75ec0757dc06492c9b3adb5b89e6ef77a63856b7
 DIST kodi-screensaver-pingpong-2.0.0.tar.gz 16768 BLAKE2B 1b4864ae3b88245733dec758cd815ff7a9f4673e1ab249275239c4ac1cdf04fbd256001d5ee984bd509730094b91cfe1d2e683169624f87192dbebcd4dc98f74 SHA512 c754b38a549589488e524e6b61088b3d9afe8f2f76bd65aa72901c7004880087cc7cb614f4b1cde49b0200a11f2f57181be913523a8b339abb6c26589a6a3d39
+DIST kodi-screensaver-pingpong-2.1.2.tar.gz 23187 BLAKE2B eca285634708491d2a9ae4a00bc203b99b8d13c38e7c852060e9f4b89907c01204f231769558e7111a6c1700a48f7a78add0dfbb388bbe56cad9dcd589816f8d SHA512 d7a1b316920a4ecea88462c6ade886f8bebf35d4b2be7108eca8fc929838c01b02a1f7cc1dce5ce89f677e84cea7cdd7eb259cc23fb70b6760bf2eb57d6a9e5d
+DIST kodi-screensaver-pingpong-2.2.2.tar.gz 25546 BLAKE2B b396f1e7e167c46b1acc49587b25bbb95b7310b5f10ec4a35daeaa752cd65fc3919811453c5be0b93ac807b6775db27f4f4be9be1183766eabe287e4b1b16a16 SHA512 bf7df6298a182479c676434ec23a20c120e2483a921ed7bc059f0712d7b0e1a8e97e2c140205a243321eef755cfb6e346aba9122924b59dea29ff386a94173ee
 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 650 BLAKE2B 065c70919c4599b8a8363bbafd80365d080a5b8ee052ef11e1de40ff6a833476f5a826192069b9a4f186ac03c4822ddbfaf4a5c7b04eac807c33f262d02323a0 SHA512 bf993c1f1a6bdc775e068bf0d236349018b199ae5abbfa9ad701f720ce0cad0a102931ede7bdccc3cd57bc4486a8b8d0c0a9a11a907c0e94713e18e6e5bb03e9
+EBUILD kodi-screensaver-pingpong-2.1.2.ebuild 881 BLAKE2B 8f63a66be8ebbfcd072ec58248270d164a068f99a652d93bf086c730c5663f87d0f4d819872b02b01b689622c9e7c4bf928ec45b10b397e6d5ba6518c3cdc7a3 SHA512 515d6e9591acb3f1a08e5f8c9de33a895452ee3fbf0b8ea707afd2e3035d4053864e80957e564094517347eba96b78a5c274b5afed5f63e4864ed499b0901f45
+EBUILD kodi-screensaver-pingpong-2.2.2-r1.ebuild 899 BLAKE2B 6d03c5cf9ce6468b0296e442bd78f494a4883d5c6f6380d32c5d4926b01a59fda86bfb0e6e0bca12cbba98fbdd389e89e3202332470f6f4447d0d384188858d1 SHA512 401770baeddf756162c455b3bb0ea56b6c643b4f7cd0174274ebc5a5267f12233a555bf7a8f53c702560c5f3545a633b736e90c1c9ad888171923508c6821172
+EBUILD kodi-screensaver-pingpong-2.2.2.ebuild 683 BLAKE2B dc0de79e3eb2f70bac87eb49b63a3ec92c35030d24c6767cd4795300d4ace9b0a4fa6a8bb88979540cfaec2b747f289ff13fbd431280b4661103f36effde7a21 SHA512 19a5715ab99cfe56c774c3d65b3f81f5641e80a73e11f5824ee931a5a82d96f9dddfd2a5cca5c49e0a74175e84a1af2e29650d80d9e68961fba1236656be8292
+EBUILD kodi-screensaver-pingpong-9999.ebuild 899 BLAKE2B 6d03c5cf9ce6468b0296e442bd78f494a4883d5c6f6380d32c5d4926b01a59fda86bfb0e6e0bca12cbba98fbdd389e89e3202332470f6f4447d0d384188858d1 SHA512 401770baeddf756162c455b3bb0ea56b6c643b4f7cd0174274ebc5a5267f12233a555bf7a8f53c702560c5f3545a633b736e90c1c9ad888171923508c6821172
 MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.1.2.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.1.2.ebuild
new file mode 100644
index 000000000000..4ed074531ad3
--- /dev/null
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Ping-pong screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.pingpong"
+KODI_PLUGIN_NAME="screensaver.pingpong"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2-r1.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..5046bcdc53fc
--- /dev/null
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Ping-pong screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.pingpong"
+KODI_PLUGIN_NAME="screensaver.pingpong"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2.ebuild
new file mode 100644
index 000000000000..bec402307a6d
--- /dev/null
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Ping-pong screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.pingpong"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.pingpong.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/screensaver.pingpong/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.pingpong-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	media-libs/glm
+	virtual/opengl
+	"
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 e217d0db3e4c..5046bcdc53fc 100644
--- a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
@@ -3,30 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Ping-pong screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.pingpong"
-SRC_URI=""
+KODI_PLUGIN_NAME="screensaver.pingpong"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/screensaver.pingpong.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/screensaver.pingpong/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.pingpong-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
 	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-screensaver-pyro/Manifest b/media-plugins/kodi-screensaver-pyro/Manifest
index 2267a78cd9e3..6e614efcb7f7 100644
--- a/media-plugins/kodi-screensaver-pyro/Manifest
+++ b/media-plugins/kodi-screensaver-pyro/Manifest
@@ -1,8 +1,10 @@
 DIST kodi-screensaver-pyro-2.0.0.tar.gz 6502 BLAKE2B a0ccc3346f6482db303d4d12104b09611fcc21658eefd23a6af7610cfcff996e2e6507f90da1a8ae3b853a5104da1d4d2a316ae5a335c14e1af4c88b5ac6a7fb SHA512 383fd40fc2bde9a1fe52126300b6279ec78ceab773bd6a763c8b72c3d3ed9b04e5b15eaa0de6da34af7e1d86046807e4734f75e524fa8335bf18cc8bc3965360
 DIST kodi-screensaver-pyro-3.0.0.tar.gz 81858 BLAKE2B 4d48cfeee5d51c45e0caa99e742226ed6f6b0704391d657be8863ffe76acfeb2e3f3740903cec89e0dcaa2dcbff6109fb91e582c5855598b9fd75549880ab87a SHA512 92335e156950f7da5800dc9c9fd57262a2d608d63cb2015e3f5711686b657930f05651a35e043480ed64f40cb34a3228c44b6c641b63a8d0438e0944abc09515
 DIST kodi-screensaver-pyro-3.0.1.tar.gz 82462 BLAKE2B 166dd754877ae9567fcf3983080ede532c2db0c577242232cf89a4b05ef2ea1cad2db6070d1e9756140f196c2c7f319d011b1f5c6b0b7454844b5ea14d9267c8 SHA512 bf2b248d2448342cd4b4e1b7c8b77ff1391050221a6c229f6db0e21cd7b9192ee925dedddbe2361b8cc2a2a943fbf53670f2d3832bff5cfbb29dea08896c9acb
+DIST kodi-screensaver-pyro-3.1.2.tar.gz 84503 BLAKE2B 3bb804f971a116ef3bc8ac46a4c887d818d2d51769ca4af8dce4ca4bebefe486d52e61adb9f57ba8c746c69aefbcad27d8b1cb9dbcd0291927e7264d67527f2c SHA512 4de06ae2d2a3665f2614d28249b99d6fa8559d8d0c876aa5dc6e2ac7a4731d016a7e414f312e4537b8b3da01d66a3759fe113b9a1bdfc3b3a1f19530638494e0
 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-3.0.1.ebuild 634 BLAKE2B ff15d671cfd9fbc860773437fa547b15295539a54982b3c140f360172250cf11307a7e7bdf0edff01cf8d60996a386ab33a0a8dedd3659c2fcc6f59503504927 SHA512 f273d1b2a1b16dd84aab702f86a4d25adbd9331c70c8044c88d06795e726a43932db313b40751ff95f233809bec5c574fad3effa6ed63cb519b1db23f477b6f9
-EBUILD kodi-screensaver-pyro-9999.ebuild 651 BLAKE2B 46cf638c7dddee87efe62baf42fe9f980573a5e27eeb5f6a6ccbe561174c4a687e5e993e8d2cf0c7fe888faa657bdb2af17ab9e9ed3ade415dba117e01b8aad8 SHA512 b1a9d627b378dc4bf6aa5f2b04a67987f8fffb2e021e292cbb3234e1159e066475154faf75b2b74f0ac93ffe2b6616183dfcc9d6e041ad08b182a22ec84221d2
+EBUILD kodi-screensaver-pyro-3.1.2.ebuild 652 BLAKE2B 6bb121138731a59d4a22fa3d60cc6d5929375b1104973a64621ed1f4a13aaaa9b9c3565140b000c3ab8df0c8e3bc61dd4dd48e00c5180c343688ea7c56d12e0b SHA512 aaad27e132e0e6dc003b7119ee393c58136c0174ede889548067d9541f843b3f6b3c9d45219842c380b637d76674d94534f8f63c5eec7aab70a9e49fe2840298
+EBUILD kodi-screensaver-pyro-9999.ebuild 653 BLAKE2B 73ebe9d0404b3dcd80c0e3c44e83063ac1e63ec5251f8018e96ce223c544517008491a2d8fd540fb9c5fa014f35705072c3879b8a4b7a3ee515cf19b7866d4af SHA512 e5132bc7e16e8a2dc7a0e5c4576df494350dc7247913d998f315ac1d9ad58e9d8f3a472766556f84f556120093b042c7e2ac6cc539318731333dc618006be572
 MISC metadata.xml 429 BLAKE2B 75a3ac26d3c3383485d3aa0b9a674f6bc249d95f13b637d9d07fb64f7ab46226301f8abf8a4194b3a30ea8dd6815d6565382a0e1e342bccf880ea0ca6a3d11f1 SHA512 df4dd73cbdb3c1d9a32ee398273356b506391363fee7d5e799a1bfed2765a1cea5c40ddc60716aebd272c4ee91d4d72d148a0644d3e47a84d3b31d03fa739f3d
diff --git a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.1.2.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.1.2.ebuild
new file mode 100644
index 000000000000..6b20cc260690
--- /dev/null
+++ b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Pyro screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.pyro"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_BRANCH="Matrix"
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.pyro.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/screensaver.pyro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.pyro-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
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 d82d82c4773f..2c68585723ad 100644
--- a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
@@ -17,7 +17,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/xbmc/screensaver.pyro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/screensaver.pyro-${PV}-${CODENAME}"
diff --git a/media-plugins/kodi-vfs-libarchive/Manifest b/media-plugins/kodi-vfs-libarchive/Manifest
index a9fb44d3227f..fdc9f65bc07d 100644
--- a/media-plugins/kodi-vfs-libarchive/Manifest
+++ b/media-plugins/kodi-vfs-libarchive/Manifest
@@ -2,9 +2,11 @@ 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
 DIST kodi-vfs-libarchive-1.0.6.tar.gz 47484 BLAKE2B ed0140b6266884c277f58d33280942cd2274e9b07a73a6471a58eb0fff54836d54c8956921617fc92e332d318451af6fb58df85ee5be2fc20c8d1c359c1d6126 SHA512 395f226640fca5adc31a3dc12e99c25bf379d531f5ee972a8c087afeda6d872add1aef8bd66aabed53671a6657ea223a998521902a7ce8c9d4c96384272b8b2b
 DIST kodi-vfs-libarchive-1.0.7.tar.gz 53326 BLAKE2B ad9088f04cc4b4ec19b10535bcff3d2c8d4fc33eb0751f7d97be95d68db9359a9598be806e03da427cd7a0d75c26ba09be06c1277f1e235900ae00240fe6e2c2 SHA512 982d691e290aa3aed5c9822903a540a13a5f65f3b85d52987ee2bedfcd06faee7bd7745d8e614a5e6502f102e637baed111e60b371294b658ea1f733623ad53a
+DIST kodi-vfs-libarchive-1.3.0.tar.gz 54434 BLAKE2B cf5c0e039d6054c249e5f1699751f20eada69953d69b67c7203d0b99ad65356a94a918c6feee61bae1e536e53f63d59cdb8cf006042811a80222f210f62bff86 SHA512 b53f76bcaed7f9f8e8645972901a7394b3e2bf481bb0044f54f98314b3593b80922dbd30027c5ca808d5dfc9822d2b0b69265b4bcb4fb529a1ac4bcd8e33c9d3
 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-1.0.6.ebuild 877 BLAKE2B 2805a10d48f693a67e6f623f16e3791a5eef70df28e13762d5eefa458477534766b1c0172d2ac6e358267f0b2c69b9b217e9aa8eaadb5705eefe702acecc58b3 SHA512 08241d35497d571d4df1d9d266c1b506d3bff2b18d17dce516a7ac1139cc6a93249589d86d78786f99f931b998e665f5a47c368b7827d7bff2b0cda0e9cbc8e3
 EBUILD kodi-vfs-libarchive-1.0.7.ebuild 877 BLAKE2B 2805a10d48f693a67e6f623f16e3791a5eef70df28e13762d5eefa458477534766b1c0172d2ac6e358267f0b2c69b9b217e9aa8eaadb5705eefe702acecc58b3 SHA512 08241d35497d571d4df1d9d266c1b506d3bff2b18d17dce516a7ac1139cc6a93249589d86d78786f99f931b998e665f5a47c368b7827d7bff2b0cda0e9cbc8e3
-EBUILD kodi-vfs-libarchive-9999.ebuild 914 BLAKE2B 0d0a6e5a3d44f3216744b4001cc540d2c2cd18c70e1a9896599283f77f3132f6a7016908b3c0d01a49e3cf301fc4c74d5a034affc554bc49cc2d9ab83d617281 SHA512 066b871746ee9869e25f9fd6c922a02738b8858a4658338e16d0f4b486f95b40069747e64046739ddac3d907dba28a9c274b08070739e7457c2ffb754ddfc053
+EBUILD kodi-vfs-libarchive-1.3.0.ebuild 915 BLAKE2B b5ab69ffd29d2e9989af56554236753a3eb0ffcca84fcfb821173f5fe5f45c289f5eef31464915afa2e16509022d8bce699bdf8c1a8d91a4b4825c8a0206ed00 SHA512 caa9e7d511fb8d091b21984d71dad754d3e9aeb3113754e1cf835180b667273c2eef42dd6e3e1d847b86c95fe10be506425707833eea2a6108202d45f868d2e0
+EBUILD kodi-vfs-libarchive-9999.ebuild 916 BLAKE2B cd40e056a5c3717e4d0ed9e73e002e101b618a8f46e3f5379bac8fd34852f10a10668dae337fd53a1819f24c341d137b37ff62c3201eda463007c62b255f2add SHA512 6ae39b87ac61c199f40262f559e8089f36572081bef86fe747b98104039fcaf4f657fe1b9a5514e1d2ad738829dfd777202fbd17d1e6b1ab24b9cf2a6394a6a0
 MISC metadata.xml 432 BLAKE2B 3006fcd638bfffcaa3100d40c3b1ffad2afa58ac1141edc5baa79640a1835db8104753cb64161530396f1d9549726044653ecbef6d4096769751f00dcba8b6c1 SHA512 553da085bf4fcc70c1b4ab666004ce9d0e68ad95b185d78713381392e6c0590f5aa8a23cd8f022e3a12b77cc96ef06ccc54e262233326921ad45a921a32af135
diff --git a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-1.3.0.ebuild b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-1.3.0.ebuild
new file mode 100644
index 000000000000..551c21eef802
--- /dev/null
+++ b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-1.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Libarchive VFS add-on for Kodi"
+HOMEPAGE="https://github.com/xbmc/vfs.libarchive"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/vfs.libarchive.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/vfs.libarchive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.libarchive-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="libressl"
+
+DEPEND="
+	app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib]
+	app-arch/lzma
+	app-arch/bzip2
+	sys-libs/zlib
+	app-arch/lz4
+	dev-libs/lzo:2
+	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
+	libressl? (
+		dev-libs/libressl:0=
+		app-arch/libarchive[libressl]
+	)
+	=media-tv/kodi-19*
+	"
+RDEPEND="${DEPEND}"
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 ec2ee28f5f58..a5aade57e1d1 100644
--- a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
+++ b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
@@ -17,7 +17,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/xbmc/vfs.libarchive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/vfs.libarchive-${PV}-${CODENAME}"
diff --git a/media-plugins/kodi-vfs-rar/Manifest b/media-plugins/kodi-vfs-rar/Manifest
index 7d149b6ad2a1..4a3c46c2d578 100644
--- a/media-plugins/kodi-vfs-rar/Manifest
+++ b/media-plugins/kodi-vfs-rar/Manifest
@@ -4,11 +4,13 @@ DIST kodi-vfs-rar-2.2.2.tar.gz 456689 BLAKE2B d874338fce92548bbf3223d103bc1083c7
 DIST kodi-vfs-rar-2.2.3.tar.gz 461697 BLAKE2B 08315b17e61a2074fca7382e69a6c4d76e75e123492614c0e2f3ccbade888c891b305df591df6f5a785df0a9abdae022f27020045d1db8eff3112f3c7bdd026e SHA512 9adc3fb36366bf14f3cf8229c3efabf6459228b148a19745e5f62230683aa607c94bf36c1739ab32a07ca50a33742e3094f21bc5d47d0fc27b26071fea231736
 DIST kodi-vfs-rar-2.3.0.tar.gz 462195 BLAKE2B cc351adff4ca0b130a71606dac3cd2abd0da295b09a80f974ed4bc1fad9c96fbd3d869633d5d8b10fee12b2a1954f89bf989e4c2ef01bc5a5c7bcab055e72580 SHA512 8efcae79ee860ad376888e6ca2ef77b68baa64e6e7f82dfa505b341e5fe141f769d5ac3cb4c7b1adb89edde1ae98f684bfdcade5084b403c47b2f3ef877b0a71
 DIST kodi-vfs-rar-2.3.1.tar.gz 463099 BLAKE2B bbe83bdef495d9996c93fe1953b7c0b11b2638d563ef6f1bc32b8fb866293c37810ee70e881136ceb1723f4b94e35884155faa1273e06069476705cea722a0ba SHA512 c14501e4f10c6a0e07b9df0d8543d84033e4f2143fe3e31af1ac829423c4f55fdf26dfccf236cac7598638428e6a80740171a0d25c23ab9cb574909d4f8e7b64
+DIST kodi-vfs-rar-3.4.0.tar.gz 462875 BLAKE2B ca0f683d5c62d5b4da943234774fa94e3e705d9b1f23ccf308e1b1cd3a0896333ab002f4101f9aa6598aa6d58adc9c69742ee9f6a949006266c1f654a575688f SHA512 b7b4889e6eac87098d12bf5b93327266772b0a2ef2e5889c3d95b3aaa3a7d5ebe5622ecf329cfdf1b82c1f1c6f32a5b60bd34f335309be93cf56106125bbe2a2
 EBUILD kodi-vfs-rar-2.2.0.ebuild 646 BLAKE2B 582b48740af3e7f23c3677c5c0e1a3c0d9e7cc3d73934290742410a616fbda4e182ec1d1e743cc415edebdd89caaa842b6ba50d868c5a29f2f6c0216687aebba SHA512 a0e7aa6f120d63815df1a91708152dbed1151e29c2d68d379cdab35bfdc078907fe64a722dc17b20cda6e4e2ca2f65326a1c00460c06f3d4af680a5dd4079bb1
 EBUILD kodi-vfs-rar-2.2.1.ebuild 646 BLAKE2B 582b48740af3e7f23c3677c5c0e1a3c0d9e7cc3d73934290742410a616fbda4e182ec1d1e743cc415edebdd89caaa842b6ba50d868c5a29f2f6c0216687aebba SHA512 a0e7aa6f120d63815df1a91708152dbed1151e29c2d68d379cdab35bfdc078907fe64a722dc17b20cda6e4e2ca2f65326a1c00460c06f3d4af680a5dd4079bb1
 EBUILD kodi-vfs-rar-2.2.2.ebuild 646 BLAKE2B 582b48740af3e7f23c3677c5c0e1a3c0d9e7cc3d73934290742410a616fbda4e182ec1d1e743cc415edebdd89caaa842b6ba50d868c5a29f2f6c0216687aebba SHA512 a0e7aa6f120d63815df1a91708152dbed1151e29c2d68d379cdab35bfdc078907fe64a722dc17b20cda6e4e2ca2f65326a1c00460c06f3d4af680a5dd4079bb1
 EBUILD kodi-vfs-rar-2.2.3.ebuild 646 BLAKE2B 582b48740af3e7f23c3677c5c0e1a3c0d9e7cc3d73934290742410a616fbda4e182ec1d1e743cc415edebdd89caaa842b6ba50d868c5a29f2f6c0216687aebba SHA512 a0e7aa6f120d63815df1a91708152dbed1151e29c2d68d379cdab35bfdc078907fe64a722dc17b20cda6e4e2ca2f65326a1c00460c06f3d4af680a5dd4079bb1
 EBUILD kodi-vfs-rar-2.3.0.ebuild 646 BLAKE2B 582b48740af3e7f23c3677c5c0e1a3c0d9e7cc3d73934290742410a616fbda4e182ec1d1e743cc415edebdd89caaa842b6ba50d868c5a29f2f6c0216687aebba SHA512 a0e7aa6f120d63815df1a91708152dbed1151e29c2d68d379cdab35bfdc078907fe64a722dc17b20cda6e4e2ca2f65326a1c00460c06f3d4af680a5dd4079bb1
-EBUILD kodi-vfs-rar-2.3.1.ebuild 646 BLAKE2B 582b48740af3e7f23c3677c5c0e1a3c0d9e7cc3d73934290742410a616fbda4e182ec1d1e743cc415edebdd89caaa842b6ba50d868c5a29f2f6c0216687aebba SHA512 a0e7aa6f120d63815df1a91708152dbed1151e29c2d68d379cdab35bfdc078907fe64a722dc17b20cda6e4e2ca2f65326a1c00460c06f3d4af680a5dd4079bb1
-EBUILD kodi-vfs-rar-9999.ebuild 683 BLAKE2B 6f3cdb65b799733e7724d35b9e7b87b464b0f48f625f2437419e8f08464ffdc4e9501b4eca49df5c054b7f11efea47aa7477e494a7189aa7916e3b3a0590868d SHA512 9006ab23cb68be4636ec4e9cd1f21c7bcc8d6b8602fbeceed20df7de737d88ab6f24e698d0c49aceeda61f3ab90a0be7d6ec85aa857b615b76d54a92026a803d
-MISC metadata.xml 417 BLAKE2B 848739e38b8064c10732cc179fd55c24c49fa32bd9067706443b0efec47f697a66d330a52733033271638d3b0ba7ef1661f372052bb6dc1a25f5e0dd745f83ed SHA512 70d2ec7f4f00ef2c208db31180e4520f26bd059cd12084e7764297542f75798d2bbe55a3558971fde8709b403968da29011f271bc6f3c4b4a63ae2589c0ae76f
+EBUILD kodi-vfs-rar-2.3.1.ebuild 691 BLAKE2B 799f887a311d9f35445d8448edfc02cd3a85d3ab78def3d6f962a1830dbc8cd518b1fc65f5d09fe6c6289f39422a92eee0132e20d608a56563a680fc2ecae8f2 SHA512 3472ee3c010412b64291b7126f1f4f8fb03566891b5560c058d250bc06dce31b3d4d39183fdb554a190db25d9d7c741fc01672b45bb32d590a94c2dad5ee9c4c
+EBUILD kodi-vfs-rar-3.4.0.ebuild 693 BLAKE2B 0bbfbcf050c66b88e1aad81bb43767e564dc9d3ad2984b6413f33fa8310686eae84415a151d21481072a346439c3fc3ff7d80baa7a53e5764514199f0323a610 SHA512 9303c7781a2b399dbcd60019fd298ab156d972f1e875e0114d6c56ac563f5ba051020e82230415e714a6d2c75e225ed8f2b83e7b261bef8da3b5d8260bb2552b
+EBUILD kodi-vfs-rar-9999.ebuild 693 BLAKE2B 0bbfbcf050c66b88e1aad81bb43767e564dc9d3ad2984b6413f33fa8310686eae84415a151d21481072a346439c3fc3ff7d80baa7a53e5764514199f0323a610 SHA512 9303c7781a2b399dbcd60019fd298ab156d972f1e875e0114d6c56ac563f5ba051020e82230415e714a6d2c75e225ed8f2b83e7b261bef8da3b5d8260bb2552b
+MISC metadata.xml 355 BLAKE2B ef486210265218894d8c3f53616c55ad00ec8b386323c340b4e79dd73442b2ac1781e8572865cb0fe4af0036726ef60d6fc5d4da1b5acab7c68a50a8c95ecdfb SHA512 0f2d7e0ccb04a1f3e63ca0d2064af8523286931c6657bb5be12c0caa0c8d8c4e5d7ddc3ca46cae8b25e57e40283306b773c018fe9f8f512913209517eb04bc8c
diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.3.1.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.3.1.ebuild
index 800adb13571b..529f08dce3c2 100644
--- a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.3.1.ebuild
+++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.3.1.ebuild
@@ -13,22 +13,25 @@ case ${PV} in
 9999)
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/vfs.rar.git"
+	EGIT_BRANCH="Matrix"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	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}"
+	DEPEND="=media-tv/kodi-18*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-libs/kodi-platform-18*
-	=media-tv/kodi-18*
+DEPEND+="
+	dev-libs/tinyxml
 	"
+
+RDEPEND="$DEPEND"
diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-3.4.0.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-3.4.0.ebuild
new file mode 100644
index 000000000000..e30e27c6e9b9
--- /dev/null
+++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-3.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	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}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	dev-libs/tinyxml
+	"
+
+RDEPEND="$DEPEND"
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 a3a654fefd45..e30e27c6e9b9 100644
--- a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
+++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
@@ -15,22 +15,23 @@ case ${PV} in
 	EGIT_REPO_URI="https://github.com/xbmc/vfs.rar.git"
 	EGIT_BRANCH="Matrix"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	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}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-RDEPEND="
+DEPEND+="
 	dev-libs/tinyxml
-	~media-libs/kodi-platform-9999
-	~media-tv/kodi-9999
 	"
-DEPEND="${RDEPEND}"
+
+RDEPEND="$DEPEND"
diff --git a/media-plugins/kodi-vfs-rar/metadata.xml b/media-plugins/kodi-vfs-rar/metadata.xml
index 3698906773d0..e3b16f64161c 100644
--- a/media-plugins/kodi-vfs-rar/metadata.xml
+++ b/media-plugins/kodi-vfs-rar/metadata.xml
@@ -5,7 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription>RAR VFS addon for Kodi</longdescription>
     <upstream>
         <remote-id type="github">xbmc/vfs.rar</remote-id>
     </upstream>
diff --git a/media-plugins/kodi-vfs-sacd/Manifest b/media-plugins/kodi-vfs-sacd/Manifest
index a5578565bf90..aed4f1b5a5b2 100644
--- a/media-plugins/kodi-vfs-sacd/Manifest
+++ b/media-plugins/kodi-vfs-sacd/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-vfs-sacd-1.0.3.tar.gz 185930 BLAKE2B 7c80cd2a7bfccaf4ca61c7bbe6654b4bedf9e054eac76fe80a3ebbd7c6a8e3896891d4da3c60391c47f7cf585524822ddf5b740a632c9067fa3fdf8684398a65 SHA512 418620256c0ebc5f4ea90ce9e22428f46b318fc1824c17f0a1034443f73333b887abb7fd6a36747c9d2db33a9f7d03d7e0bc2606f5b1c9681a6feae92252918e
 DIST kodi-vfs-sacd-1.0.4.tar.gz 192147 BLAKE2B 6cc09d620a0db1acfa54e4a172410220cb50d68da719afa36ca19396737292e23c16bc1f381e7b43cbd6b19a609af1617e7e015ebe91766e18dd62cf415eacf6 SHA512 27a9fe9070ab52c6970e13ea7f10964e9adb4ee1fd5493ba1ac2edb97159dc77e2d9c140ad9c86ebfad51efdaadf9c16b57c03348c1f7fc9232429f01b753446
+DIST kodi-vfs-sacd-1.3.0.tar.gz 192158 BLAKE2B 5f31cb74ccf374f243eb2a9a3dc8abd2b8978430a49f468ad645ae6bb74d0b661ab217a1be79eb25ef3151c7d8a1a9c018b3c2da3bc6e2b2174dabe2f567f52d SHA512 af4e24f09882e0537318232872d8dc44a490be6b847df48768a96e12d210a72e89d9ee98e2f8ab2ad0ade0d24cba403f4177e2ae6fcea7c681f5401bf522e0e6
 EBUILD kodi-vfs-sacd-1.0.3.ebuild 685 BLAKE2B a51adb8dc576afeff67a48270dd530e8ca1f0ac0d4432920255a0de2525a5d3f8cd41d30936db0eb64d53f0ce6b3998f57ca5eff125c710279ac5f5a732646c6 SHA512 e7ef302effbbaf714e24fef0ce14e7cf2e6eb0f1701309fc0831b77024fcb0f4f6b03452fed9c3119cd765e43a092bfa8a2b3d1e1355654d53ea4027fcc175dc
 EBUILD kodi-vfs-sacd-1.0.4.ebuild 685 BLAKE2B a51adb8dc576afeff67a48270dd530e8ca1f0ac0d4432920255a0de2525a5d3f8cd41d30936db0eb64d53f0ce6b3998f57ca5eff125c710279ac5f5a732646c6 SHA512 e7ef302effbbaf714e24fef0ce14e7cf2e6eb0f1701309fc0831b77024fcb0f4f6b03452fed9c3119cd765e43a092bfa8a2b3d1e1355654d53ea4027fcc175dc
-EBUILD kodi-vfs-sacd-9999.ebuild 687 BLAKE2B 414612d2e6def54e86f7e7c15f1d45a6fa1a6bbbe802613350b53413daef4c1051db31487b50d8666c23611b5a3e37f56e39fbc9afb3e7cfc918a128d9a6da05 SHA512 e25997d70227475756d9f92e71d636e8e3bfef7e243ddeb11f78178f52028eb14877b904a06299ece6921517753ddb664e15ba193204dde60e64910b27a6b5ad
+EBUILD kodi-vfs-sacd-1.3.0.ebuild 656 BLAKE2B c7210623a717f454ef173b5a124fdfecd539c149bbd5b5c018575ee90b4859a1799ab69985536d13175a86a1d6fc9654487c1414369a9d7d421fe8c63fe7e908 SHA512 495cb3274fdafbc67a7db49d95e2b72d52db6c6987eee674f77aa7b5e228ae5303841fc0dced8ba80df0ad4ea792476cbf10d74e0926ef7d2098624b5f9972d9
+EBUILD kodi-vfs-sacd-9999.ebuild 657 BLAKE2B 52329ad4aecf8790b41e865866c36e9f8aa998a2ca4710e0406239d6dd45cefc9bc63cfe61c5d45d4fa2f89dc5c1dddcfad7db14d0d8a59cca785e110e4429ad SHA512 21384f7dd21e6810c94f26ff8cd5a51f4625f59df47b97b9c89148d4d1bc98edb7f274fd4d0e497f4ee411dc759509b1d21278ffe66db8843be053d058af1b87
 MISC metadata.xml 419 BLAKE2B 18019581cc35ab24aed35e146674d26ab57c18ad0d0468954f8dff16c2bff757d9a7acf718e5655fa96e02be9fd1a05d8f87f3c46b83fe09692b6f71677d89d4 SHA512 931961ed7c4a909bd1f15c7e02a3a37e7815b9ff293708aab813eaecca25ab38b8fc98872295b8dc6d46029d570dd238d68259f57504cba67601099f3f30dd55
diff --git a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-1.3.0.ebuild b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-1.3.0.ebuild
new file mode 100644
index 000000000000..45902cf944a4
--- /dev/null
+++ b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-1.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SACD VFS addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/vfs.sacd"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/vfs.sacd.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/vfs.sacd/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.sacd-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	virtual/libiconv
+	"
+RDEPEND="${DEPEND}"
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 27b1b6ff53ef..ea887f2febd8 100644
--- a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
+++ b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
@@ -17,7 +17,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/xbmc/vfs.sacd/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/vfs.sacd-${PV}-${CODENAME}"
@@ -29,7 +29,6 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	~media-libs/kodi-platform-9999
 	~media-tv/kodi-9999
 	virtual/libiconv
 	"
diff --git a/media-plugins/kodi-vfs-sftp/Manifest b/media-plugins/kodi-vfs-sftp/Manifest
index ec7e3400b4e3..37a5f8a08d0d 100644
--- a/media-plugins/kodi-vfs-sftp/Manifest
+++ b/media-plugins/kodi-vfs-sftp/Manifest
@@ -3,10 +3,12 @@ DIST kodi-vfs-sftp-1.0.3.tar.gz 20923 BLAKE2B 3f2856fa97453739d6a712b5ce63d97771
 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
 DIST kodi-vfs-sftp-1.0.6.tar.gz 37162 BLAKE2B 7f2a4e9dbabd01b2fbd4efd6c19e8f5bcf1f6e6f55fe7a286c6bf616fa83303f3a0e26cf8c82cc6e4a69a7c981645f72bbfa06b4c0545047b5c1ae579cc22257 SHA512 e7e6d70e974179bb1d7b5a22b495490d75ad6988b8b519a03c167dd9731ed8c695a2ef3b72264107b9559ab9ce2756a4aa3247d6417de50d9a3652d2c890e618
+DIST kodi-vfs-sftp-1.3.0.tar.gz 36956 BLAKE2B 213049a4a3b2e35040622f4c5cb5ab6a76a6c4a0f56cd8157248fa83fb7a8a7054623a11f919e73ed0ace5f64d2ead88db6e613ba12a978ee76e936dcb606bd4 SHA512 2edf833761da194d53d33e7a35ec440283eacd9a31adec3518408fe318c3131a1a2c59c7e61c4562af7029030d97adaad500eb83bbcc0e679aff1568ae6732e0
 EBUILD kodi-vfs-sftp-1.0.1.ebuild 678 BLAKE2B 629a085af07b523d098035fc5344b6956e8876f271a2b33e58b7d7bb5e4bfafbcd94d8932cc4ae4a11440189dd92c52bad52e2a956e609fa3559721fd120e2c9 SHA512 c6d4b2b2d7226736e98b155a5c8e1875aa9bff8fe3daf3a1749d795d4a0cb4e404ddb5640aaf772ad84da745bfefd312464d42fc50a72679a5b86aee60e0774b
 EBUILD kodi-vfs-sftp-1.0.3.ebuild 751 BLAKE2B f9455b5d3e2354051a93dac1bba34917699dbe116e27721a32212bd264479fe56dc8595d6750fd90e5dcdd6e0b7f17b30208d5f3d35dafdc0f350f8badcbee2d SHA512 8dcc063cc4740359acdacc7a9bffe035d1c6669355b4ec24cbe52ace41916c4accd03a0e5cdb50b4026ac2940acfb6e28eb72ad03750e448b71bda56feb7523b
 EBUILD kodi-vfs-sftp-1.0.4.ebuild 745 BLAKE2B 79f8b7f75f5a44c4c06013418921f096611688f69bca6201ed4563c2ce08021a01a7c84af7895a8db1aab07513a821325e05c2ea4326fa3e19566d7d918a1b01 SHA512 f84e77a0bbd848d9e2b2a4a3854e0b093d9a1d182eeaf21a495f8eaf18f71f1f183321cf6800ca46ffefa084d2cbb237df254f05cf2f9f8268868a34b8761bbf
 EBUILD kodi-vfs-sftp-1.0.5.ebuild 745 BLAKE2B 79f8b7f75f5a44c4c06013418921f096611688f69bca6201ed4563c2ce08021a01a7c84af7895a8db1aab07513a821325e05c2ea4326fa3e19566d7d918a1b01 SHA512 f84e77a0bbd848d9e2b2a4a3854e0b093d9a1d182eeaf21a495f8eaf18f71f1f183321cf6800ca46ffefa084d2cbb237df254f05cf2f9f8268868a34b8761bbf
 EBUILD kodi-vfs-sftp-1.0.6.ebuild 745 BLAKE2B 79f8b7f75f5a44c4c06013418921f096611688f69bca6201ed4563c2ce08021a01a7c84af7895a8db1aab07513a821325e05c2ea4326fa3e19566d7d918a1b01 SHA512 f84e77a0bbd848d9e2b2a4a3854e0b093d9a1d182eeaf21a495f8eaf18f71f1f183321cf6800ca46ffefa084d2cbb237df254f05cf2f9f8268868a34b8761bbf
-EBUILD kodi-vfs-sftp-9999.ebuild 771 BLAKE2B 3042e68a6d567a867ca36d969bdcb7cfe4522d35c05636817a22934fd8d149cefbac8f7412e085759693ab73fef7d6ff31686c9f08a445bf42b997738aec0f04 SHA512 84300f6ca208128e3f050e6bff69920972e8831dcb0b23349c47191c56ce6b6639aa9343bf15c73dfea712a6645b03a2486c7fc63387d612f9289fb91d3bda6c
+EBUILD kodi-vfs-sftp-1.3.0.ebuild 740 BLAKE2B 1748ce2cf58a0da874b86ec7e6fd4bae0877075b1a7aae24f57fa609590a33e8d54f9e68d3cf6ddefe65885b61a3969a1d530740ed29e1658acfba5045afccad SHA512 a38f1987be50c977b5e8f11e21d79b425444816c36a0c16c24ff5113138e372e6611ccc81cf44423e5d1b981d74e54c24b9bb2a667f0c5d1590dd73e5d7b9074
+EBUILD kodi-vfs-sftp-9999.ebuild 741 BLAKE2B ac394c62a47d066d65eaeea1e080c0384fda8e96d9032dfca52f5846624e96f0c17292b674ccc590f095da23a548b35b46dbe92934092325c80fe03b787f66c9 SHA512 e68456f35086fc39a8c437be71d7b834db68d97d00b164c50a2af956606a98f77d432d4c9546711c20ba50baeedb52e1c55264b202b9416713fb54b7713cdbbe
 MISC metadata.xml 419 BLAKE2B 7167e481bfec9e94de9e9bdb25f4a5d3d77596a73e3cabeafa265322f0da3043de844f2db94c8767e3b5657c37ba1e77643acac9970f509fe956399ccadb1e36 SHA512 31d530be90d385a7d6756296909e5dd5454a2efc2a83d83c47cff14fc2260c1bc772bc23b95fd6bcb91511c0be21d9297074367aa445642ae477623f8f545a21
diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.3.0.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.3.0.ebuild
new file mode 100644
index 000000000000..4f57d2b4aa6c
--- /dev/null
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.3.0.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="https://github.com/xbmc/vfs.sftp.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	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-tv/kodi-19*
+	"
+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 5b29331e4edc..33d843ec7c5f 100644
--- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
@@ -17,7 +17,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	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}"
@@ -30,7 +30,6 @@ IUSE=""
 
 DEPEND="
 	net-libs/libssh[sftp]
-	~media-libs/kodi-platform-9999
 	~media-tv/kodi-9999
 	"
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-visualization-fishbmc/Manifest b/media-plugins/kodi-visualization-fishbmc/Manifest
index f9dc57761cb1..6cc4bf249420 100644
--- a/media-plugins/kodi-visualization-fishbmc/Manifest
+++ b/media-plugins/kodi-visualization-fishbmc/Manifest
@@ -1,6 +1,11 @@
 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
+DIST kodi-visualization-fishbmc-6.1.0.tar.gz 367284 BLAKE2B a3c1a7c7446602276ce3dc20920fb441a44c3ce86b61e28581a196a0a64db8bde4f0306b900e57d29c2284c878357e94b3b041914e17a5f99eaab9203f6ed2a8 SHA512 ea429d66ea12478a7e6533f48f57077f68b12d2f1fd2efeeba8e5908ec423dad57576d463393620588d87b12b484108f55afd3a9c7802458830c738ba3931dde
+DIST kodi-visualization-fishbmc-6.2.0.tar.gz 367475 BLAKE2B f6af3fda3352bcb97c5d58c1952ee9b2b1a6ca3d80be6b560b80f3897af793dacf865b2ef986482491a2f9179ab4d9d1b25223d3cf1935b5c8e5dde8ece50a1e SHA512 8fc32adb76bd7b065d6352ada911ab059c182e20ad81075322b7de79d892c7864926f2ece6396bb61df58658cac73c109f43cd2fa6b496b870f7fd7ab117be23
 EBUILD kodi-visualization-fishbmc-5.1.1.ebuild 797 BLAKE2B d98cb7889b558414ab81f297959c61b108125ff24e83a43e0c042b24ab1517582454b3a213880f028531153e9716dcb68dec6d5ce5b3a03d28352d8ae909b669 SHA512 4b4a746b04e68df884fec1fa2635575a289490a31555c0a8c51f5d0799c7c1dedcbcaaa13620a7faa8f2218adb36cbc02b77c098eb6a2fbd662517943514879e
-EBUILD kodi-visualization-fishbmc-5.1.2.ebuild 797 BLAKE2B d98cb7889b558414ab81f297959c61b108125ff24e83a43e0c042b24ab1517582454b3a213880f028531153e9716dcb68dec6d5ce5b3a03d28352d8ae909b669 SHA512 4b4a746b04e68df884fec1fa2635575a289490a31555c0a8c51f5d0799c7c1dedcbcaaa13620a7faa8f2218adb36cbc02b77c098eb6a2fbd662517943514879e
-EBUILD kodi-visualization-fishbmc-9999.ebuild 798 BLAKE2B 7c9f026ae8dae80a6ed270044860dc96cbea0c25cd683415822c5a236e8a09446f966dd6a779f35783a5947b876ae7bd88d977ccc1de0655b251e3582c0f8af0 SHA512 6a32b067379d6ba6f9b7dd1deecd3c3ee4b231177d9122ee037b5d368b44cf7e298ee75773c85367d0082e1fdf1e93a70b420006771dddf412228aad24c512f0
-MISC metadata.xml 439 BLAKE2B 538bd3c4a9323c884584cefda4f84d01e1ac2d677ac8c0f4b57a8b81dae2ac3cf6632769ffb50d46a5e162cb3571034fee417ece1878102dcaa8838e839495ac SHA512 0bdb34edf345e638dc3bd557a77adf3745d9332bd0858c40bc003511df26d87597932d2d2987e2245345c44b95d0d03696b61443c1eafaf95b0e151ddcc921d5
+EBUILD kodi-visualization-fishbmc-5.1.2.ebuild 895 BLAKE2B 692992b6305cc689fa822581d4e2bd6740951948ba757b9e018913fe10ce51699cfd2973f940d7f1da503620953b6fba92e7172d04ed8f41903a53309a0448b5 SHA512 0f0e34317769d28277e996e0bd0a08eb6e0391ff2a28a51bd7f37d5acf0407214f062a8a6917a7178aa48bf0af6d8c84117642a81ac3a854e733bdc4982a1243
+EBUILD kodi-visualization-fishbmc-6.1.0-r1.ebuild 897 BLAKE2B 3be223eacd34426e59c18a8b8a9518a8e1a3ade74ce0428555b671a9cf5ba2b61158387a4f73cb1460b03351dd48b953cf6d938dbacc85f2780a63990369643f SHA512 f1eb1a7d0b7c9143b65ce12a8b9447cd2c7a30b5ba4ed612c58a07710885674d7df14efb372a97735d327a0915c03d52459a0c27f1e8f0b7f8d16df3af094ca8
+EBUILD kodi-visualization-fishbmc-6.1.0.ebuild 897 BLAKE2B 3be223eacd34426e59c18a8b8a9518a8e1a3ade74ce0428555b671a9cf5ba2b61158387a4f73cb1460b03351dd48b953cf6d938dbacc85f2780a63990369643f SHA512 f1eb1a7d0b7c9143b65ce12a8b9447cd2c7a30b5ba4ed612c58a07710885674d7df14efb372a97735d327a0915c03d52459a0c27f1e8f0b7f8d16df3af094ca8
+EBUILD kodi-visualization-fishbmc-6.2.0.ebuild 897 BLAKE2B 3be223eacd34426e59c18a8b8a9518a8e1a3ade74ce0428555b671a9cf5ba2b61158387a4f73cb1460b03351dd48b953cf6d938dbacc85f2780a63990369643f SHA512 f1eb1a7d0b7c9143b65ce12a8b9447cd2c7a30b5ba4ed612c58a07710885674d7df14efb372a97735d327a0915c03d52459a0c27f1e8f0b7f8d16df3af094ca8
+EBUILD kodi-visualization-fishbmc-9999.ebuild 897 BLAKE2B 3be223eacd34426e59c18a8b8a9518a8e1a3ade74ce0428555b671a9cf5ba2b61158387a4f73cb1460b03351dd48b953cf6d938dbacc85f2780a63990369643f SHA512 f1eb1a7d0b7c9143b65ce12a8b9447cd2c7a30b5ba4ed612c58a07710885674d7df14efb372a97735d327a0915c03d52459a0c27f1e8f0b7f8d16df3af094ca8
+MISC metadata.xml 373 BLAKE2B 58a8bd87eb8d917719095ef685822446acaac684883b25f443f5912f7e0d2a0e2342711893479222f1d2b92a934a78d4a9c2d7695c6b9ac524caa2fd8f6706c6 SHA512 4b97cb76b6161b843ea3be6add2b48d6e9d61560aecc5fa8941280b8e3b7518b412f35c5cacc32e101aa25c0f39834c9118e9061d1835a42b0333cd703ffe3c3
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 61d420f35e17..a874dc3da575 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,41 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Fische visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
-SRC_URI=""
+HOMEPAGE="https://github.com/xbmc/visualization.fishbmc"
+KODI_PLUGIN_NAME="visualization.fishbmc"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.fishbmc.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	KEYWORDS="~amd64 ~x86"
 	CODENAME="Leia"
-	SRC_URI="https://github.com/notspiff/visualization.fishbmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.fishbmc-${PV}-${CODENAME}"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	=media-tv/kodi-18*
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
-	media-libs/glm
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.1.0-r1.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.1.0-r1.ebuild
new file mode 100644
index 000000000000..4264440c3a7b
--- /dev/null
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.1.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Fische visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.fishbmc"
+KODI_PLUGIN_NAME="visualization.fishbmc"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.1.0.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.1.0.ebuild
new file mode 100644
index 000000000000..4264440c3a7b
--- /dev/null
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Fische visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.fishbmc"
+KODI_PLUGIN_NAME="visualization.fishbmc"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.2.0.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.2.0.ebuild
new file mode 100644
index 000000000000..4264440c3a7b
--- /dev/null
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Fische visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.fishbmc"
+KODI_PLUGIN_NAME="visualization.fishbmc"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	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 aa75a08aa46a..4264440c3a7b 100644
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
@@ -3,41 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Fische visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
-SRC_URI=""
+HOMEPAGE="https://github.com/xbmc/visualization.fishbmc"
+KODI_PLUGIN_NAME="visualization.fishbmc"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.fishbmc.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/notspiff/visualization.fishbmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.fishbmc-${PV}-${CODENAME}"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
-	media-libs/glm
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-fishbmc/metadata.xml b/media-plugins/kodi-visualization-fishbmc/metadata.xml
index a0d45002398e..d7211a670581 100644
--- a/media-plugins/kodi-visualization-fishbmc/metadata.xml
+++ b/media-plugins/kodi-visualization-fishbmc/metadata.xml
@@ -5,7 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription>Fische visualizer for Kodi</longdescription>
     <upstream>
         <remote-id type="github">notspiff/visualization.fishbmc</remote-id>
     </upstream>
diff --git a/media-plugins/kodi-visualization-goom/Manifest b/media-plugins/kodi-visualization-goom/Manifest
index 03d56c9124c5..cdbe68defa4f 100644
--- a/media-plugins/kodi-visualization-goom/Manifest
+++ b/media-plugins/kodi-visualization-goom/Manifest
@@ -1,9 +1,13 @@
 DIST kodi-visualization-goom-2.1.0.tar.gz 8119409 BLAKE2B 4162201e4415df9b8dc4e22f40d6e9eb71e85804cfb6898d472e2d612a090e81041ed2bf3c1c7423012aff53cc239d25400948fad20e0ccf93fe59270491818e SHA512 5e2b4b2133938224506d94cf55cefb4aa77212e16b570900da33b84ea5de94bd4dcb3d161cc7d0d632353a9c9dd9a5925ce25b9c016cd13818944122c0806054
 DIST kodi-visualization-goom-2.2.0.tar.gz 8119581 BLAKE2B 4e02ac797420f6acf59c9a2c3ce8c185fcf64fc6306d9635401a026207b92eaa6465e492bcbae06b95130fc114c31529d31e5ddcc1e6eeb855f513a8689500e4 SHA512 b6ab828e76b4c1dae54b853cfdc2f31c143e93ec02e81492c3e7152174ce74553eb06720a448f1434a81e44d886ee2b5751c3674ce3f9a45e4988421ea5931ba
 DIST kodi-visualization-goom-2.2.1.tar.gz 8119580 BLAKE2B 92558e0560e0590bf7ed52e9506518e32ba80d5a71d10d1c622ec99186c8621a73308bb70cd95f97e86f6e2b6bf2920938e6692b5f080d98e2d457e95c1ab958 SHA512 f93f602e77e754545a58dc9f4ff92c850754503db853b47acbb36468263059919e827e8ffeafe261eca7f6e9c8b563a83787914fa8669bfb50f66aa5c551fbc6
+DIST kodi-visualization-goom-3.2.0.tar.gz 8125972 BLAKE2B 2de0580cdda6a0f94a6dc1bd487910b7683448683670c9ae2c1793beff44351db617ae79fd0aad1bc55b39d030868cdc0f71f8c1853162faf4b68248ce0a0510 SHA512 78111b28918b3ef7a1f00ed1c4b0e74377b7c9e4e11bd7615399d577510da62333f7ad24f40a66a65cd4bec8ad1619122809590054edafd1071e546c7b64fd69
+DIST kodi-visualization-goom-3.3.0.tar.gz 1210480 BLAKE2B 1e1f5b48820c2fd6847e5fc241a409eacefae1bc2a95d3b5fca72e6bf4e6d1202b1b9806c0a6810724834655f071bd183528e7cec8242db97ea3826fcffbe72a SHA512 5a51ffa0730786616f38cf156d480c747ddcef5e099c26de1cf9b3459732d50c553e72a5a84b4b00939b91c1cc06b944f0901e357b11895eb87d83290d00e2d0
 EBUILD kodi-visualization-goom-2.1.0.ebuild 688 BLAKE2B db5a77cb452f61a08b02f0b64e9a51b7123b3466077b9595b63529ae19727b70a87a4ea28d1f8104cb96110ab727fd4ca0afabe412bb3a996e718b412cc9ccbd SHA512 45fadb5f1bc434c2852a7485a2a12bcbbe20edbb788e3996dab12c11acd22451e590918c84947f88090c2909f6530b93dd03c13333c61d998c85de2414c3ae5d
 EBUILD kodi-visualization-goom-2.2.0.ebuild 688 BLAKE2B db5a77cb452f61a08b02f0b64e9a51b7123b3466077b9595b63529ae19727b70a87a4ea28d1f8104cb96110ab727fd4ca0afabe412bb3a996e718b412cc9ccbd SHA512 45fadb5f1bc434c2852a7485a2a12bcbbe20edbb788e3996dab12c11acd22451e590918c84947f88090c2909f6530b93dd03c13333c61d998c85de2414c3ae5d
-EBUILD kodi-visualization-goom-2.2.1-r1.ebuild 704 BLAKE2B 99f2a4620af3447451c2e68b4c4fda921e0818233e5e909a252e7f7ef99c7015cc4a970b39504c2f459f4259ebc253fae68d9fee8d21c6b447573f7093feacab SHA512 64a690cfb1e1fb37e05fed86df2ffc41ee9d2c0860d36bbf4ce19164c3d1c509bb0fc27d6dd1ea8ba58482b332f2f0ac6b7e6a85cc42c4eb4e1faff1fd430091
+EBUILD kodi-visualization-goom-2.2.1-r1.ebuild 887 BLAKE2B 4b0f1e5b22e784938d72807d2010b36ac7ecf9ac71275bf416b256eb852bd7ccb5f79234434a4f714fa169964d4b5f0466283a02cd79f7d41d103dd0a996b82d SHA512 25786e5b7b406eda8378837fd4e48836592f376b453a16410dfd62af6fd1761d080bebf2b490234bc1680e5df8a766522e7b3c6aeca1aba58753723071e24adc
 EBUILD kodi-visualization-goom-2.2.1.ebuild 688 BLAKE2B db5a77cb452f61a08b02f0b64e9a51b7123b3466077b9595b63529ae19727b70a87a4ea28d1f8104cb96110ab727fd4ca0afabe412bb3a996e718b412cc9ccbd SHA512 45fadb5f1bc434c2852a7485a2a12bcbbe20edbb788e3996dab12c11acd22451e590918c84947f88090c2909f6530b93dd03c13333c61d998c85de2414c3ae5d
-EBUILD kodi-visualization-goom-9999.ebuild 705 BLAKE2B 47436e5cdcdc232addb644333ab07296a230c385afcb33b12dd61a843cba5a184a9cfcea4196fdfce1b15ecebf5a036d212c781ded61d84057439a56a6aa54b0 SHA512 b5bc74947580f95564d6ddf6c1e6a9206b9e71d87b5d50b05518364a6932f5927fd2af32c33ac31e73f2cb372d98eeb9c514e04331f84bf31704e18216eb677b
+EBUILD kodi-visualization-goom-3.2.0.ebuild 889 BLAKE2B 81ca413eb39a0e0c82a394f92ee1660dbd26e560b6bb36ba48fc2ae2f029b5ac3cbd12492ec9f31924fb0dcc1b30ce78839078ce0c81b1c0a61021ff12be5e1f SHA512 a6e1c6a9e3f5fcd943e36a2748005e90c2a4924fbaf8580c0cd1fb8247d46e44f6b3001605f4c3b8a13f3324850d0ef19549317bf976c33da189f1083c90f7b4
+EBUILD kodi-visualization-goom-3.3.0.ebuild 889 BLAKE2B 81ca413eb39a0e0c82a394f92ee1660dbd26e560b6bb36ba48fc2ae2f029b5ac3cbd12492ec9f31924fb0dcc1b30ce78839078ce0c81b1c0a61021ff12be5e1f SHA512 a6e1c6a9e3f5fcd943e36a2748005e90c2a4924fbaf8580c0cd1fb8247d46e44f6b3001605f4c3b8a13f3324850d0ef19549317bf976c33da189f1083c90f7b4
+EBUILD kodi-visualization-goom-9999.ebuild 889 BLAKE2B 81ca413eb39a0e0c82a394f92ee1660dbd26e560b6bb36ba48fc2ae2f029b5ac3cbd12492ec9f31924fb0dcc1b30ce78839078ce0c81b1c0a61021ff12be5e1f SHA512 a6e1c6a9e3f5fcd943e36a2748005e90c2a4924fbaf8580c0cd1fb8247d46e44f6b3001605f4c3b8a13f3324850d0ef19549317bf976c33da189f1083c90f7b4
 MISC metadata.xml 434 BLAKE2B 14ffadbe7c568eb11922b64df1f82c0404092fc971b8e8181955fc21989c70d3c2198a4beb7ab426cf6cf2356d2bd89d71e3ed7155ba35fb647303b231d45a26 SHA512 614347e4b283abd727a963d2b276fc6e0e1477ba1e5571957b123670be073a50e14e4c0460aba90b5f01380fd40f8f1e334b2b6a9409e038b3c9dd79ee2fc15c
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.2.1-r1.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.2.1-r1.ebuild
index 97a386c15cd4..842215df3206 100644
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.2.1-r1.ebuild
+++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.2.1-r1.ebuild
@@ -3,36 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Goom visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.goom"
-SRC_URI=""
+HOMEPAGE="https://github.com/xbmc/visualization.goom"
+KODI_PLUGIN_NAME="visualization.goom"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.goom.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	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}"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	media-libs/glm
-	=media-tv/kodi-18*
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-3.2.0.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-3.2.0.ebuild
new file mode 100644
index 000000000000..e1aa393b2927
--- /dev/null
+++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-3.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Goom visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.goom"
+KODI_PLUGIN_NAME="visualization.goom"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-3.3.0.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-3.3.0.ebuild
new file mode 100644
index 000000000000..e1aa393b2927
--- /dev/null
+++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-3.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Goom visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.goom"
+KODI_PLUGIN_NAME="visualization.goom"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
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 39f82f9aaa11..e1aa393b2927 100644
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
+++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
@@ -3,36 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Goom visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.goom"
-SRC_URI=""
+HOMEPAGE="https://github.com/xbmc/visualization.goom"
+KODI_PLUGIN_NAME="visualization.goom"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.goom.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
+	CODENAME="Matrix"
 	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}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	media-libs/glm
-	~media-tv/kodi-9999
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-projectm/Manifest b/media-plugins/kodi-visualization-projectm/Manifest
index 38323a059f90..e583a28af4b5 100644
--- a/media-plugins/kodi-visualization-projectm/Manifest
+++ b/media-plugins/kodi-visualization-projectm/Manifest
@@ -1,4 +1,10 @@
 DIST kodi-visualization-projectm-2.3.5.tar.gz 2479207 BLAKE2B ae67f42ec6b5430f99b7a4fe72addb5bce59c1d9ab53909f80724da1c521b1c16df253038653110972617365d0aecf604ac683bab7b25f486147a797cb19a91d SHA512 dbcddc99e2278fe5e0657ceff142ce625833433e3d6ff757228f59f47606dcf7125138e2c381dfb5b00cfbb41cc24ce1c805617b42a6e3dabb665f5e33b94682
+DIST kodi-visualization-projectm-3.1.0.tar.gz 2509529 BLAKE2B 398f24325707d1ea79804ae047a6108be789961cd81f49945e6c798ca1f3ba8b4f375152fecfa9b195bb24e1602ce35974d065c1cb4dfb7718fc6426c106fb4c SHA512 8ae1bd4de726edb0f6434d0a4669a1a828d415a3fdc62984e20e135f79c0e710ca7374ee2da5dc78794252327e84ed678a6548510433938d87a0a98165d3abdf
+DIST kodi-visualization-projectm-3.2.0.tar.gz 2497196 BLAKE2B 6ac289661c63588678680bee36a5b881aae35e8468876979c4a7975843f3750334beb8b23e63b9b3271231589d26b72abdb267a4adc289e43bd37d1f1ce08a23 SHA512 9368978e20fce99d9f7005b4bd9c96efce7c9afe239d80839c665bc8517fc212598444dcf422bba9b2e500f87f52f0c18153969f3287ed9b5a9cb78d72669c65
+EBUILD kodi-visualization-projectm-2.3.5-r1.ebuild 904 BLAKE2B 8bb1d32f39b2b01913b145b55e81a2b118fe473fa4bfe1cc751df1aaec700f4997c7890ec7a051a66433e570842be167c5cf208d814af33b1e91e31067fe4e97 SHA512 4a0abf328fbaeeffd3efc982dc73282f6eef498845115e4c756d8231c38267f57a2e462bc8ab084b6632f065ad6cc6de9f690aff31ee8f1d5533f8d7ff92ec5d
 EBUILD kodi-visualization-projectm-2.3.5.ebuild 866 BLAKE2B 82b4cabf4e7de0850c2fb224d5a1528970ca2ef815cfb5b4b07070f9ba71aee93d962125386fb3ae86e52b41bff89d71499e59e0e8769d15c7af9e2b5fc7a108 SHA512 c8069decd8af10231123fcef35ada0ea74d60a9e6a3d64c644d1dd605eaf2f47568a9781885a5db6eeb6e892c8f2a74a1176385d0e2155d552114badc432ba4d
-EBUILD kodi-visualization-projectm-9999.ebuild 868 BLAKE2B 66a7f84789d036e16ce3b2d67373f89694b1d121764fc9c662ba339c8394d5616c4594049739b64c4d0cdbaafbd4f2859b3e950d5c27ed5910a1b200a36f4c24 SHA512 20f6a01555a960fb89d213d2968f36bc13b72f18c8b0427f731cfa8a7d9c95156843ffd55afd786fca64f2fc71b67d27e0c82230bc2dd41168c1b2a559b99897
+EBUILD kodi-visualization-projectm-3.1.0-r1.ebuild 906 BLAKE2B e23dcd339afecc961dc0734361163b4df642f249850ac509bc6c14245984a98ae85055adbadb7ef1f286dbb821ad10aa570fcd3709833299018caec70a1aa81a SHA512 2a68b6330079d2519ca484523589c84e25f1c4d149891cc28095cbc0f753dd7a52f42015141959f63ec36217730bf0b93d11c2e43c34b35cb4755d3666c7b6d5
+EBUILD kodi-visualization-projectm-3.1.0.ebuild 837 BLAKE2B 69d76b8e0535ca0cdeb9fef291c276ed82ec1b4f088d2c8af554f1cde17351e0d1d141d215d8cf0d4f678e0c647c888cdf59299a5d64410f08126f6b2d15eb28 SHA512 3bc0fb8467bde7068355839a5679c197e74dd9f7942b80e81dcd1ab11357e246f62bb3d7ac13432f7e77c5e94e573c59408fefba9874cc572a2b56fe3fc7e4ac
+EBUILD kodi-visualization-projectm-3.2.0.ebuild 906 BLAKE2B e23dcd339afecc961dc0734361163b4df642f249850ac509bc6c14245984a98ae85055adbadb7ef1f286dbb821ad10aa570fcd3709833299018caec70a1aa81a SHA512 2a68b6330079d2519ca484523589c84e25f1c4d149891cc28095cbc0f753dd7a52f42015141959f63ec36217730bf0b93d11c2e43c34b35cb4755d3666c7b6d5
+EBUILD kodi-visualization-projectm-9999.ebuild 906 BLAKE2B e23dcd339afecc961dc0734361163b4df642f249850ac509bc6c14245984a98ae85055adbadb7ef1f286dbb821ad10aa570fcd3709833299018caec70a1aa81a SHA512 2a68b6330079d2519ca484523589c84e25f1c4d149891cc28095cbc0f753dd7a52f42015141959f63ec36217730bf0b93d11c2e43c34b35cb4755d3666c7b6d5
 MISC metadata.xml 438 BLAKE2B 7869da7be1eac18bc4e35672134270f92ae7dc4178edc4b62399dac713fe14eb83fecbb14d8712677d802742eed9d34df1f0eda581117dc0649a929a903ba823 SHA512 2e7259aa9e981c4a6a72e3f055e1475bb140e07785976fa586d8ebef2fe6013fb373cacee9500320cdf0a4cae56486555612ed2d9109415cf9016359b9cdba0a
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.5-r1.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.5-r1.ebuild
new file mode 100644
index 000000000000..f1891b47eaea
--- /dev/null
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.5-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="ProjectM visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.projectm"
+KODI_PLUGIN_NAME="visualization.projectm"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/opengl
+	>=media-libs/libprojectm-3.1.2:=
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.1.0-r1.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..759f84a9e7e2
--- /dev/null
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.1.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="ProjectM visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.projectm"
+KODI_PLUGIN_NAME="visualization.projectm"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/opengl
+	>=media-libs/libprojectm-3.1.2:=
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.1.0.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.1.0.ebuild
new file mode 100644
index 000000000000..6beacd7eafbe
--- /dev/null
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="ProjectM visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.projectm"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.projectm.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/visualization.projectm/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.projectm-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	>=media-libs/libprojectm-3.1.2:=
+	>=media-libs/glm-0.9.9.5
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.2.0.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.2.0.ebuild
new file mode 100644
index 000000000000..759f84a9e7e2
--- /dev/null
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="ProjectM visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.projectm"
+KODI_PLUGIN_NAME="visualization.projectm"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	virtual/opengl
+	>=media-libs/libprojectm-3.1.2:=
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
index f867f54b7bdc..759f84a9e7e2 100644
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
@@ -3,43 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="ProjectM visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.projectm"
-SRC_URI=""
+KODI_PLUGIN_NAME="visualization.projectm"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/visualization.projectm.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/xbmc/visualization.projectm/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.projectm-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
-	>=media-libs/libprojectm-3.1.2:=
-	>=media-libs/glm-0.9.9.5
+DEPEND+="
 	virtual/opengl
+	>=media-libs/libprojectm-3.1.2:=
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-shadertoy/Manifest b/media-plugins/kodi-visualization-shadertoy/Manifest
index ba275d3ffb90..3d9a589893c5 100644
--- a/media-plugins/kodi-visualization-shadertoy/Manifest
+++ b/media-plugins/kodi-visualization-shadertoy/Manifest
@@ -5,12 +5,16 @@ DIST kodi-visualization-shadertoy-1.1.9.tar.gz 11825717 BLAKE2B 683b89be6b02574b
 DIST kodi-visualization-shadertoy-1.2.1.tar.gz 11833386 BLAKE2B d62f907426ba6cddac91fa7ab0592f62e15f77ec3fd7af3dda15b467c72e36a248f24ad374897746b337b7223a1b67a156e595999a3e9ba9b5d8a543eb5a220b SHA512 5dd92e8629c6fe5319fd9d7715f474c3c146218a812e312a2335501f20319c8385a736b02d37d769c4025fb2c6a10882e9979359f3667aa390d1de77f373483e
 DIST kodi-visualization-shadertoy-1.2.2.tar.gz 11833357 BLAKE2B 3b7c87785dcc1c93795f34599f64ab61e2a0f7ae5f465f014efcbc77d6f7e0cc49ba3defc4a982ff352b61ac5d96f9f59368af8884b660e337c54ec0ceea4729 SHA512 bc4c0fab5ab63205b4cd3cbf669bbcc93d8273592082d741dba762b2a72c5f468d8eabf158b309c62a813a14a17884a240c22c88b133eb34315e0fb7b064b507
 DIST kodi-visualization-shadertoy-1.2.3.tar.gz 12495585 BLAKE2B 821b4bf4b380125c5bf0bdb0e5b3d62624155729abaa4784a7606ec0f48d9517317064f0a8442442f7cc549c6623cc58734b99dcfbd23c68dcad9fd24efc35fb SHA512 ea6aafd9afe221b3f12584f081eb55db29dd3a4483b6eb9cb53f8ccff105c3fd9bea9ced3badb171c5b2795387afd062d10b1b2f1dca31b1efcd896c89131958
+DIST kodi-visualization-shadertoy-2.1.1.tar.gz 12481964 BLAKE2B 179e60218a86ab3294fab5a7c8d5c1f4892ad0f6ff9a3a799a05088551a61487542a0624201a4025aafeaeba097228b21ddf36310f930661f25b27fed4588ccf SHA512 e406ceec5f4efc6bdc7b22ec96cfb36a59177a836ea3bf6a3a5df6cdde0c2ee9f7e7c93b240d9b0e4c2f3f2c7c8fe6d88123c4cb104d547b5ce15f8223b20ea0
+DIST kodi-visualization-shadertoy-2.2.0.tar.gz 12483112 BLAKE2B 6b8a841085b316eeddcda95e4d4d79949f2bc822605469a4fddf589180f6a93310b14a449201ed600d22422c47bce8bb53e92faded294a7c49dcce9e93bc7648 SHA512 0050f35614b17e48adbe16c8255c111e0927245b46067bbf8d547b460b556f3fa8cf12fb3c6cfd7320a06967d2b397da3d83aa5b58e9f997dfc2d318771d5302
 EBUILD kodi-visualization-shadertoy-1.1.10.ebuild 733 BLAKE2B b70e59671f5d3a92bed86531b1053a4a2e19b9f02d6bf7bc90ae2d7d3686f03f04f03eed97e07c451fff12343ecb753a2146582055d3449567c8e36eee0eab3b SHA512 8050a8c641107b37b4940e3d09a783d2f2b8f911d3a9e6c5613bc22b992ed4173e385c3513cdcfe5ab24cb4a86d4ce86b02a7229f606b643b325b5bef61c51aa
 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 822 BLAKE2B f8d98d893ac742c7a6766e3d5c9ad375c2ca81874c93ae86c5a72da413dd51d4c452be5568ae3b75fb4a53a6e8c5e5590649beafb9fcce0a613297a9aef5ec53 SHA512 4ae7a06332d8206eb4632686f6f148885b1569a6b43c53d9b310c49dcba02e0fce14f35f52ebe8e37e2941f7bbd05dbb3736f0ab13e31c46cee7ca303b999460
 EBUILD kodi-visualization-shadertoy-1.2.2.ebuild 822 BLAKE2B f8d98d893ac742c7a6766e3d5c9ad375c2ca81874c93ae86c5a72da413dd51d4c452be5568ae3b75fb4a53a6e8c5e5590649beafb9fcce0a613297a9aef5ec53 SHA512 4ae7a06332d8206eb4632686f6f148885b1569a6b43c53d9b310c49dcba02e0fce14f35f52ebe8e37e2941f7bbd05dbb3736f0ab13e31c46cee7ca303b999460
-EBUILD kodi-visualization-shadertoy-1.2.3.ebuild 832 BLAKE2B 53bc1d185df7dc96ee33790ac75ddeebc029d0b4d6d3247c81fce2c1bf77b8782bd0c8f3e4434a66ba32be7bb1dda1eea19dec65a678c22f140cf7f336c8150a SHA512 cb869f6612420bd248c0adbaa663163af323d1bb4d1437cb131bd0fb415d3d5a40c05e67718365eace787a35909572beab8cfd1ea42a65896d0889a2ca8e8e74
-EBUILD kodi-visualization-shadertoy-9999.ebuild 833 BLAKE2B 2413a2ac97a54616d07482c98f6f90811c84030b5dc41e8eaf5d9662015cd3a18f8486e6db61687105da9e50cb03d972ee7313bed83bc1ccb50004068c194356 SHA512 12e960a2239b42bebfcc415287cda3e40976028faf620894ebc8e72fc4058b504d38692e4cdf2b46e0aa3bb4d54489a72387c0c0cfda04a2bf7a008845f5169c
-MISC metadata.xml 440 BLAKE2B 8ca7ad0546c9c0590eff12d403b863109b99964ac6d5a9f73d05253ed65719f53ff8a043f1ef1a2f3ce4fb7a06d0e2ad3a5586c49308f22ab7e9690979d88050 SHA512 76e524e7318f8137a70002b265388a1cd107c8e970688ad5616b8895d38108760a06fa3a4e00abe46463ce7d346ef19756237eadb677c4ace52b44bff8a81f17
+EBUILD kodi-visualization-shadertoy-1.2.3.ebuild 845 BLAKE2B e8f634bd6e87cc510eabc26e976692019724964d69f1f34e6495a0439299cf18a47bf6a1e440883484f79a68363ea0283ed96d56fdeb6bb61a23181dd2882bff SHA512 b288a9c1cbea514f82a41dedbf7cc3b328c9c339fafba5bcaae57bb71a820ff5af93b8b77fdb134f58f63f185fa5b50232372fbc88e729899a52b6d12c61b62b
+EBUILD kodi-visualization-shadertoy-2.1.1.ebuild 811 BLAKE2B 45c0def4a70f2b01630ee18dbc177ad528e9b990658a1f73ede94bac9fbbf8ce54bfd5c79595ec2fc62feac646ab8358e6d8207f796ce702c7f20b9b3c20f764 SHA512 50a3e20efd233fdf9104084447ceed17dacc8020e1b816113d6547a1df809c92cf1d6f5e45bb077796349a6910e612ec6a4ac64fe5f4d09fbd82987ca075b1c0
+EBUILD kodi-visualization-shadertoy-2.2.0.ebuild 811 BLAKE2B 45c0def4a70f2b01630ee18dbc177ad528e9b990658a1f73ede94bac9fbbf8ce54bfd5c79595ec2fc62feac646ab8358e6d8207f796ce702c7f20b9b3c20f764 SHA512 50a3e20efd233fdf9104084447ceed17dacc8020e1b816113d6547a1df809c92cf1d6f5e45bb077796349a6910e612ec6a4ac64fe5f4d09fbd82987ca075b1c0
+EBUILD kodi-visualization-shadertoy-9999.ebuild 822 BLAKE2B eb354b7a28e9512cca2babb7a85d2842a13186b4656c7e043a27adeaecea9d554cd8f665dac8052d4df76f7feb5e7f9865e2bd87c854d72e75a42d5afa870089 SHA512 0a809e0ec9c2c68cba8adc0adcc7e4baec3b69f2c57831e055348e74043d76bf70ea2af8a22a97aa2270746f998a9b23e0141c6d07cc94d5f1aaaa719a9a16d4
+MISC metadata.xml 371 BLAKE2B c08128796ef45f0b7328ae8a8c89527181f79450d7b76ab85931e8f48fab219a21f46dc9c541e0820bdeeb54bffcab382996fd3c24b1fa0b7bcb1d55ccb448cd SHA512 b27afda7facc52025ba34c428656957042a8ad4e903b62b629f9251b149a6a346df8e9fcfa2f2a7a7c1dca327fa35199f88d0d655f15aa1938afe7e809567b85
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 3dc44570954b..ecceb22c0037 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
@@ -30,7 +30,7 @@ IUSE=""
 DEPEND="
 	=dev-libs/libplatform-2*
 	=media-tv/kodi-18*
-	>=media-libs/glm-0.9.9.5
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
 	"
 
@@ -39,6 +39,6 @@ RDEPEND="
 	"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-2.1.1.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-2.1.1.ebuild
new file mode 100644
index 000000000000..ed5256b3ad5d
--- /dev/null
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-2.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Shadertoy visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.shadertoy.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/visualization.shadertoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.shadertoy-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-2.2.0.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-2.2.0.ebuild
new file mode 100644
index 000000000000..ed5256b3ad5d
--- /dev/null
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-2.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Shadertoy visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.shadertoy.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/visualization.shadertoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.shadertoy-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	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 6bded25f3768..8e2766b5dd93 100644
--- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/xbmc/visualization.shadertoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/visualization.shadertoy-${PV}-${CODENAME}"
@@ -28,9 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=dev-libs/libplatform-2*
 	~media-tv/kodi-9999
-	>=media-libs/glm-0.9.9.5
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
 	"
 
@@ -39,6 +38,6 @@ RDEPEND="
 	"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-shadertoy/metadata.xml b/media-plugins/kodi-visualization-shadertoy/metadata.xml
index 5bb7e29b7f33..8cf5d1ddb93d 100644
--- a/media-plugins/kodi-visualization-shadertoy/metadata.xml
+++ b/media-plugins/kodi-visualization-shadertoy/metadata.xml
@@ -5,7 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription>Shadertoy visualizer for Kodi</longdescription>
     <upstream>
         <remote-id type="github">xbmc/visualization.shadertoy</remote-id>
     </upstream>
diff --git a/media-plugins/kodi-visualization-spectrum/Manifest b/media-plugins/kodi-visualization-spectrum/Manifest
index 0dac6d3c08ab..52f97711805c 100644
--- a/media-plugins/kodi-visualization-spectrum/Manifest
+++ b/media-plugins/kodi-visualization-spectrum/Manifest
@@ -1,4 +1,8 @@
 DIST kodi-visualization-spectrum-3.0.3.tar.gz 324645 BLAKE2B d7cae4829a0d9032d26dd7642617286dbd1f86baea6672de1d819aaa07657113fba2ce0876a5a18ea212ccc5c4e0de8c1233460e4172950b7af663fe8fdd5c86 SHA512 8c6f111100ae155fc8486dba269d184d65a00235643ed10e77cbe1b5442e466143039fdc1faef17af6545817fd721a7057b09937c91dde1f1b2ceee74f87a935
-EBUILD kodi-visualization-spectrum-3.0.3.ebuild 791 BLAKE2B 2c6449a97e04ed7e0b34e77c3261e67eb3da3b6373ede5b570f1ab740f99e1ac39b3bebb780230003bdcea4b922527105745762c8f4762b250513fd868c7b411 SHA512 aa1cad92e751f0cc63f4a90983ea48d43d37ed8bc2b15b1b032670a4f71502b0facc7bc478043e976e4550fb9c852c70354d094ce159f4556a4d5e574befb5a8
-EBUILD kodi-visualization-spectrum-9999.ebuild 792 BLAKE2B eaef960e1a55c058beff78a758e3bef549194ba04926b572a046428e12671d055fa0989cbb518fc71d2557ea88b654ee5c7b0c1eda0f308de3873accd6e132cf SHA512 3ca758c730487c7b8a8ec94f1fbc6be4a0c3eec645a1ec8c6db77a59b17f73859cbc376018f3cf49939947847ae9540b0235253b043b9d4b5052cd04793d4d96
-MISC metadata.xml 438 BLAKE2B 8662b3f30cdc08223e10e8fc8515a3afb59e199f33e645f1dd011465f2d0b02201f2b64e5aa0c269cde77f20e3ca091d4e72afd817985198da5e3bd8c0f054da SHA512 8d683f5aa11f95edbf8a91e43c85c1882e19400dc55a79116ce9527f9f89ea552da28ccf65ea9aec8a5b166d18638c01def152dcee57fb054575cc636c0f0a0a
+DIST kodi-visualization-spectrum-3.2.0.tar.gz 327841 BLAKE2B a5a4e858419beabe93e302d129efe8d8a75778cc52e90408150b43f000812b7949cfd3ebeab34e62f52e7467e839291b56d97984284141a0209d02b19a5b2043 SHA512 1378a8f082bdb255c0c48875c87cec27c549525fa1a1f94f2d31c91bc3f70c2c50afb1063ba03fcc71d1948337ef85168f29c0edb8102e6be1eba82dfbc7377f
+DIST kodi-visualization-spectrum-3.3.0.tar.gz 315547 BLAKE2B c1586f28f6a7de1696fddb06ba68ac7920c6f9f1300eef96c56f6fa796e4e2c92d41043c9d303c64878720efa8f335a85cd288d5649c46002cd9cc3d9b33950d SHA512 fbf063c5362ef7f837acc648f5a78c537990873ff0539662eb95e0312250475038fed450631ba7b2ec7b9654776e263f329419aeee7559fcf8e37eccce928364
+EBUILD kodi-visualization-spectrum-3.0.3.ebuild 899 BLAKE2B c66d9144764439f9894b926beb11642d8ab25581dcee7e86f33e305e8e6815bf5378a75e28769c20d958b7f2d63411f2453de9339129939677277e9958cc8dd2 SHA512 4f2c6da15c9882399c9881ceae96a20740c97e08146e82c4f88fdf5e304b08cc0bc9b343f60aa8f5a3a3f09d5f8284a73fca93aa5059e09b0f38b09a72ebdc7d
+EBUILD kodi-visualization-spectrum-3.2.0.ebuild 901 BLAKE2B b88b0cbf1f8679335754842e1f9abd496176c1239354b0b677de244042bd2d93c3f99a5500c3aa28fa5dbb381fa15494d2194530b01074c8e5ce77aa032a3b80 SHA512 342f35baa5c09ea6f50203d9ac36631d2670b72e6066770ada9a465e28e087455b109dcfd04f590f0765cac89c0280f3688a60651051ffb43194cec044399b16
+EBUILD kodi-visualization-spectrum-3.3.0.ebuild 901 BLAKE2B b88b0cbf1f8679335754842e1f9abd496176c1239354b0b677de244042bd2d93c3f99a5500c3aa28fa5dbb381fa15494d2194530b01074c8e5ce77aa032a3b80 SHA512 342f35baa5c09ea6f50203d9ac36631d2670b72e6066770ada9a465e28e087455b109dcfd04f590f0765cac89c0280f3688a60651051ffb43194cec044399b16
+EBUILD kodi-visualization-spectrum-9999.ebuild 901 BLAKE2B b88b0cbf1f8679335754842e1f9abd496176c1239354b0b677de244042bd2d93c3f99a5500c3aa28fa5dbb381fa15494d2194530b01074c8e5ce77aa032a3b80 SHA512 342f35baa5c09ea6f50203d9ac36631d2670b72e6066770ada9a465e28e087455b109dcfd04f590f0765cac89c0280f3688a60651051ffb43194cec044399b16
+MISC metadata.xml 370 BLAKE2B 9660b98180f5e561be6f3fea3180c29109a6ce96f56e2e911e2c28acef668e8acb6ea6f86296ef8aa33a16e470b4cbe691a4035b0cca0b162b4e993ab7c9118e SHA512 6289890802f971af2c1186be792a052bd32dc9384b12ac99ef788bcb8f14b41f98d9eb150a2ca490eb1478d8cdd5f286c295f7b9fb29de0e0cd895e802e53107
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.3.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.3.ebuild
index d80cf89a5104..c5bfc95f2070 100644
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.3.ebuild
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.3.ebuild
@@ -3,41 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Spectrum visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
-SRC_URI=""
+KODI_PLUGIN_NAME="visualization.spectrum"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/visualization.spectrum.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/visualization.spectrum/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.spectrum-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	=media-tv/kodi-18*
-	media-libs/glm
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.2.0.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.2.0.ebuild
new file mode 100644
index 000000000000..3284a024509a
--- /dev/null
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Spectrum visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
+KODI_PLUGIN_NAME="visualization.spectrum"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.3.0.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.3.0.ebuild
new file mode 100644
index 000000000000..3284a024509a
--- /dev/null
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Spectrum visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
+KODI_PLUGIN_NAME="visualization.spectrum"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	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 99569b83a489..3284a024509a 100644
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
@@ -3,41 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Spectrum visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
-SRC_URI=""
+KODI_PLUGIN_NAME="visualization.spectrum"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/visualization.spectrum.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/visualization.spectrum/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.spectrum-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
-	media-libs/glm
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-spectrum/metadata.xml b/media-plugins/kodi-visualization-spectrum/metadata.xml
index 673ffc320649..7199132488ae 100644
--- a/media-plugins/kodi-visualization-spectrum/metadata.xml
+++ b/media-plugins/kodi-visualization-spectrum/metadata.xml
@@ -5,7 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription>Spectrum visualizer for Kodi</longdescription>
     <upstream>
         <remote-id type="github">xbmc/visualization.spectrum</remote-id>
     </upstream>
diff --git a/media-plugins/kodi-visualization-starburst/Manifest b/media-plugins/kodi-visualization-starburst/Manifest
index f7ca8677918e..1c5d5fc4a7cb 100644
--- a/media-plugins/kodi-visualization-starburst/Manifest
+++ b/media-plugins/kodi-visualization-starburst/Manifest
@@ -1,8 +1,12 @@
 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
+DIST kodi-visualization-starburst-2.2.0.tar.gz 139247 BLAKE2B 2aea5f1e685e0d16a06120ed5d2a0a0e913c78d0f023f73a80d2ad32fa25de55a9038b399e353e6e14894a3e3d457f253968df459e91e7ea41fbd5bea13b2940 SHA512 3dc0361370be406a3bbcf4353e44a4340fbbc98d1d9baa0250b1b94c780f04bd3edb016c88a00d3e74e022bf94c317afb01a11117e0f90c81b95cc3ba6b83b32
+DIST kodi-visualization-starburst-2.3.0.tar.gz 139410 BLAKE2B 08183257f49b815a77dd6881393780342df541405725ef5561f1e7fb289c3434297e2e9ba6bcc9d05226580ef94e3b48858a13dc97de74dd2b830b886537e345 SHA512 c185b3ad75c49d7d488dff0172581d44f6f81944a5b96bd946adcd5de499c7ad9efef6b23825e8352cf3bf2077ad99106c3de7ea88ff3f7645cf8ba3b592ca21
 EBUILD kodi-visualization-starburst-2.0.0.ebuild 729 BLAKE2B eacf31cb4e5cf548ecc369f519464fb00df53a9d39f14357c587a0012562babe0d76ef20a298fd425db63a891c0f6e10c628a3459abcc77c8156c48ffa1ba689 SHA512 92fed53acbc0caf4ccc97ae728c37e5fb96c776f16ad28945e44615a934e3072d312c90327446e20c2562adce37e5fab9c8455147ced72154842cfc3a8e972b9
 EBUILD kodi-visualization-starburst-2.0.1.ebuild 808 BLAKE2B 7be230c08e7ba4ff3ded1e88d38e67cdbe0000d34dec933410a4296a61f50f59a604a95a6358d9a5d0e07d9d818f69e08ce7278df3c29608effc54874b8ef001 SHA512 6e27caf525d6a48cdc1c5b6c28774127545fc20196749db866375c8d28a9094116ab1f5dc4e57ab366edcdeff1f63c97c247ecf93c9c42199c1a64d9fecfc86e
-EBUILD kodi-visualization-starburst-2.0.2.ebuild 808 BLAKE2B 7be230c08e7ba4ff3ded1e88d38e67cdbe0000d34dec933410a4296a61f50f59a604a95a6358d9a5d0e07d9d818f69e08ce7278df3c29608effc54874b8ef001 SHA512 6e27caf525d6a48cdc1c5b6c28774127545fc20196749db866375c8d28a9094116ab1f5dc4e57ab366edcdeff1f63c97c247ecf93c9c42199c1a64d9fecfc86e
-EBUILD kodi-visualization-starburst-9999.ebuild 809 BLAKE2B adaadc94c402ce9fa9b3dfdcd951bb8a76772730425eb602ebb8622bbeb3702e46fae39a13bdb41247cd1767d568603fd84c7a7419d23d1e5c26f26e6e05a636 SHA512 f305ffa94fc60cacb057a72178527a35e3349b74ab8ff3f960f2ed133a01bd1ed2ddadd628a2c1c8dece1bf4e804834c95d3a7c5d40fd63ce93cce01469cf8ec
-MISC metadata.xml 444 BLAKE2B 5f3221e98532824daa5b94268b4b1891206428444a4d0a82f6d388d05ed28d264171b34b0d13d58099dd0075879f9d0e85f52c80a1311adf75c879358722898a SHA512 c263072074bffb4a1665ebc90aba169c61f836e51d7778c3192b7ba6a370d4eb17691aaa1e3efbc869a4f64e367aea8795e93439e9d82515be443c1f66a77464
+EBUILD kodi-visualization-starburst-2.0.2.ebuild 906 BLAKE2B 404e1479562c85f5fbd6a5e4d822df9c7789a528e3e492e95c3a29bb38c41a26f182b65091f70ad0954715c24cc055342a422874bb4f9e9ae147a260516425cc SHA512 0d4042ab156fe14461f6a7c7c2c31e3c68c7d72d52b920b9c67a2156d55f0f381911d9a4f90ae31c92543ca44dfa1e4c19df7d2770193920e60ab504d23f8d9c
+EBUILD kodi-visualization-starburst-2.2.0.ebuild 904 BLAKE2B fe13cd815cbd7b6bdd3919049fab610c386830ff1bde099900d94750a8ddabb9dffd5e4a7b3daa48ce0c162e42f46d101c19f06eab3ec84c242d1139b6eb91a5 SHA512 a24698b081596e03e69e34c78ee2b2fea74936ef858226fb2419d68ea23ff0f8f6fcb0e862a30ed6ac1289e9c1929772bac44bad92491515f2e89dce77045711
+EBUILD kodi-visualization-starburst-2.3.0.ebuild 904 BLAKE2B fe13cd815cbd7b6bdd3919049fab610c386830ff1bde099900d94750a8ddabb9dffd5e4a7b3daa48ce0c162e42f46d101c19f06eab3ec84c242d1139b6eb91a5 SHA512 a24698b081596e03e69e34c78ee2b2fea74936ef858226fb2419d68ea23ff0f8f6fcb0e862a30ed6ac1289e9c1929772bac44bad92491515f2e89dce77045711
+EBUILD kodi-visualization-starburst-9999.ebuild 904 BLAKE2B fe13cd815cbd7b6bdd3919049fab610c386830ff1bde099900d94750a8ddabb9dffd5e4a7b3daa48ce0c162e42f46d101c19f06eab3ec84c242d1139b6eb91a5 SHA512 a24698b081596e03e69e34c78ee2b2fea74936ef858226fb2419d68ea23ff0f8f6fcb0e862a30ed6ac1289e9c1929772bac44bad92491515f2e89dce77045711
+MISC metadata.xml 375 BLAKE2B 2dd375a09aabe4c261d914c205bddb2168dfa099365e0af5be5520acd508ac1eefce07e2e171eaae188a2de2c3b50dfe73b28c1794678d336cd153eeb75abdd4 SHA512 7d93ac6ed350d443743356aba9f3731bfc34495a43010178ae4b068749bbb1b0d9101de69eace191a29a4a065e7ed80db0ac4e0a3d0d1d41596d6bbce2145d58
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 9ba2ff248210..0288a46c379d 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,41 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="StarBurst visualizer for Kodi"
 HOMEPAGE="https://github.com/notspiff/visualization.starburst"
-SRC_URI=""
+KODI_PLUGIN_NAME="visualization.starburst"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.starburst.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	KEYWORDS="~amd64 ~x86"
 	CODENAME="Leia"
-	SRC_URI="https://github.com/notspiff/visualization.starburst/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.starburst-${PV}-${CODENAME}"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	=media-tv/kodi-18*
-	media-libs/glm
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.2.0.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.2.0.ebuild
new file mode 100644
index 000000000000..532d4ca45e77
--- /dev/null
+++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="StarBurst visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.starburst"
+KODI_PLUGIN_NAME="visualization.starburst"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.3.0.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.3.0.ebuild
new file mode 100644
index 000000000000..532d4ca45e77
--- /dev/null
+++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="StarBurst visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.starburst"
+KODI_PLUGIN_NAME="visualization.starburst"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	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 71b5faf43766..532d4ca45e77 100644
--- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
+++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
@@ -3,41 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="StarBurst visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.starburst"
-SRC_URI=""
+HOMEPAGE="https://github.com/xbmc/visualization.starburst"
+KODI_PLUGIN_NAME="visualization.starburst"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.starburst.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/notspiff/visualization.starburst/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.starburst-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
-	media-libs/glm
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-starburst/metadata.xml b/media-plugins/kodi-visualization-starburst/metadata.xml
index 1b1356a2a704..95934d1f86ee 100644
--- a/media-plugins/kodi-visualization-starburst/metadata.xml
+++ b/media-plugins/kodi-visualization-starburst/metadata.xml
@@ -5,7 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription>StarBurst visualizer for Kodi</longdescription>
     <upstream>
         <remote-id type="github">notspiff/visualization.starburst</remote-id>
     </upstream>
diff --git a/media-plugins/kodi-visualization-waveform/Manifest b/media-plugins/kodi-visualization-waveform/Manifest
index 22dda2fa6633..0ab82d74c3a3 100644
--- a/media-plugins/kodi-visualization-waveform/Manifest
+++ b/media-plugins/kodi-visualization-waveform/Manifest
@@ -2,9 +2,13 @@ DIST kodi-visualization-waveform-2.0.1.tar.gz 43929 BLAKE2B 5ef24c80ca035ffe92e9
 DIST kodi-visualization-waveform-3.0.2.tar.gz 546352 BLAKE2B 98d35bbbbda2a44c35d8c1a8275085ae645b39ecbecf317f97e18b018e09def8ce48acdbe79c7c3bef5e42ea0490961f99a345eca211372e6be3137422af41e4 SHA512 a33e1f79aa23449255c5c1e9cfc172df900f53dce1adaabcad63b4e57c3cd07cce62cc7fe4923bc08fbc5632401af1c4b9fca9e9f265cb27aa6ac20ab4f31bc5
 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
+DIST kodi-visualization-waveform-4.2.0.tar.gz 551580 BLAKE2B b043d16956a28a184a4de23653dbbb2a8fbe7b3f6118824a4170e9b5b0c0b93d44faf0f57ca94cc37a6a622472df4de06dd56650e5bd91b1490ab4dfcf3103cd SHA512 589bc23efc99f848d429632f00ab6cd34bb47ef9b9fa32cd20a2cd6fef44d7cb9bb08a02e343e1eba99626feb60b234812880be89162b98f3cc3fc15629e11e4
+DIST kodi-visualization-waveform-4.3.0.tar.gz 540639 BLAKE2B d8202f914329ea77255a46364d61a22798e4a2ea793459606e96677d7d91e41d21361d5cd96f7af605ad30e147036deaa4a2d9c96a5c67ab005e61357dc2b2ab SHA512 d85f74ea65a42b1a997237026b9fa324b0b510144418ddf0e07013602718186ab9607bc4114d0bacf1e9a38f4c2b324656306e39f6b54ff621df7ea0462ada1c
 EBUILD kodi-visualization-waveform-2.0.1.ebuild 702 BLAKE2B f6fc517ed61febf3197a735e36d0e31b27de4b9ebdde134c59350ef35b71bf7d6dc5d419dcfa597562ccb084f81c8ffe5c1da14fabddb478bed780f2d122dd09 SHA512 9789f3388ecb56378b1a8ce097b06d30c2bca2bb5aff926b127e3935b5c9fd52283a658a4b87213ce57958fa4f4df43ce0b1004418539441f5f206f12cdf5ddd
 EBUILD kodi-visualization-waveform-3.0.2.ebuild 791 BLAKE2B d7693b58ce4a20a357b31f3a108cfc7c881b29ee6922a72c42b086852b9926775592a270d61f29b4243e794373847ea7e0b517e39f19635918f376f27e999fc1 SHA512 43d254793a0d46c8f71b87008c8ee63f2ccffb946d67c13404d0c76f42d834cc093940893c8e8fbbcaae84b84ef10e0eaf5b8d146477c015792fca0ef2a8d0d0
 EBUILD kodi-visualization-waveform-3.1.0.ebuild 791 BLAKE2B d7693b58ce4a20a357b31f3a108cfc7c881b29ee6922a72c42b086852b9926775592a270d61f29b4243e794373847ea7e0b517e39f19635918f376f27e999fc1 SHA512 43d254793a0d46c8f71b87008c8ee63f2ccffb946d67c13404d0c76f42d834cc093940893c8e8fbbcaae84b84ef10e0eaf5b8d146477c015792fca0ef2a8d0d0
-EBUILD kodi-visualization-waveform-3.1.1.ebuild 791 BLAKE2B d7693b58ce4a20a357b31f3a108cfc7c881b29ee6922a72c42b086852b9926775592a270d61f29b4243e794373847ea7e0b517e39f19635918f376f27e999fc1 SHA512 43d254793a0d46c8f71b87008c8ee63f2ccffb946d67c13404d0c76f42d834cc093940893c8e8fbbcaae84b84ef10e0eaf5b8d146477c015792fca0ef2a8d0d0
-EBUILD kodi-visualization-waveform-9999.ebuild 792 BLAKE2B a629b57e538a77e5a9b9a7e6f6e07a65464f388e2b965273ca85c21ae8fb519000e292cb82157f050b10e5d7dd698059548e7c6b1d1be09b3983458186e8d8b1 SHA512 9b0c679bdf4a88322590a55290c18115945181b8ae5a5d222f436163a608f10cd75a8e46ce604362a6c1cf5c0dc2b1441394573a9fcbaef29a56fd504c31ef54
-MISC metadata.xml 438 BLAKE2B 223c9bc0d06814774f32141ee66b19a512091bbcd1658eacb1a1ecdeaeb2c450ddaaa301f2e6914abaa98d34dfbb456c5bf5a94ac9fadfbf84e75421d6233b45 SHA512 7bb4e6ec9690bfe2742cfe205f1e88db4f51f67bc05ee918ca9e181fb707fae8e75887bea9128a3b2d1e8c6cdf5613599b912816bd9b5093877d311bfec8f851
+EBUILD kodi-visualization-waveform-3.1.1.ebuild 899 BLAKE2B 547c7d89a34062f8a057608dd0c7d4d67b6cd4ec6ff1bb67b8aef27e8371b831c643258dabb1f0ca8a5568dbc045bcd015ebce4da6abd34b0882a1b7fa81e372 SHA512 ea7de0d0479d1540c1dac42bfbaa023b3e6b810bc13c4a703f7a13e32c6fdd0b8738935ab4630240752ba526bafc8b5ad9e267a4cf27e646cc9bfe7b6f290e5a
+EBUILD kodi-visualization-waveform-4.2.0.ebuild 901 BLAKE2B 21f656673f5d3c8387a02627ba41fd5d143367ce4d54fea07046f90f9bb72dd3f351ba6db726e9fa8cc5f0ee5673d14e4248699ad2f137754724b6265a04d672 SHA512 c16163543f3d6d8aa88af1cf4e83b0ec2ee992c596fb0501d937abfc651d0efc09fee67325c00484e0067d07a0646d500bf12a594d6aa4c30643dfec4cef52ce
+EBUILD kodi-visualization-waveform-4.3.0.ebuild 901 BLAKE2B 21f656673f5d3c8387a02627ba41fd5d143367ce4d54fea07046f90f9bb72dd3f351ba6db726e9fa8cc5f0ee5673d14e4248699ad2f137754724b6265a04d672 SHA512 c16163543f3d6d8aa88af1cf4e83b0ec2ee992c596fb0501d937abfc651d0efc09fee67325c00484e0067d07a0646d500bf12a594d6aa4c30643dfec4cef52ce
+EBUILD kodi-visualization-waveform-9999.ebuild 901 BLAKE2B 21f656673f5d3c8387a02627ba41fd5d143367ce4d54fea07046f90f9bb72dd3f351ba6db726e9fa8cc5f0ee5673d14e4248699ad2f137754724b6265a04d672 SHA512 c16163543f3d6d8aa88af1cf4e83b0ec2ee992c596fb0501d937abfc651d0efc09fee67325c00484e0067d07a0646d500bf12a594d6aa4c30643dfec4cef52ce
+MISC metadata.xml 370 BLAKE2B 4e67a09099ad95d4318a8fe4500337ec8e2cb804cf94c5238e60e457631a1813a1eee4040afe4baf9f1943394d43d9f7be035aa2ab3e133411502ca02a75d81f SHA512 adddd37fefce2eb74d04bce22dd479d8f0bf2255ff70b034975c87219ab5c36a7484c27e70894879bb5309a5ef6872a3bb0e01f9b4ffcfe2d77658170b9bdc39
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 97b415b36b20..3086c42e5070 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,41 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Waveform visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.waveform"
-SRC_URI=""
+KODI_PLUGIN_NAME="visualization.waveform"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/visualization.waveform.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/visualization.waveform/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.waveform-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	=media-tv/kodi-18*
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
-	media-libs/glm
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.2.0.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.2.0.ebuild
new file mode 100644
index 000000000000..55c275ff5f4e
--- /dev/null
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Waveform visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.waveform"
+KODI_PLUGIN_NAME="visualization.waveform"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.3.0.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.3.0.ebuild
new file mode 100644
index 000000000000..55c275ff5f4e
--- /dev/null
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Waveform visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.waveform"
+KODI_PLUGIN_NAME="visualization.waveform"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
+	virtual/opengl
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	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 4483bdcfbe86..55c275ff5f4e 100644
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
@@ -3,41 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Waveform visualizer for Kodi"
 HOMEPAGE="https://github.com/xbmc/visualization.waveform"
-SRC_URI=""
+KODI_PLUGIN_NAME="visualization.waveform"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/visualization.waveform.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/visualization.waveform/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.waveform-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-	~media-tv/kodi-9999
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
-	media-libs/glm
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-waveform/metadata.xml b/media-plugins/kodi-visualization-waveform/metadata.xml
index 039bae438254..657e7feffd06 100644
--- a/media-plugins/kodi-visualization-waveform/metadata.xml
+++ b/media-plugins/kodi-visualization-waveform/metadata.xml
@@ -5,7 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription>Waveform visualizer for Kodi</longdescription>
     <upstream>
         <remote-id type="github">xbmc/visualization.waveform</remote-id>
     </upstream>
diff --git a/media-plugins/libvisual-plugins/Manifest b/media-plugins/libvisual-plugins/Manifest
index a8c7bccb17e0..63de693e2b9e 100644
--- a/media-plugins/libvisual-plugins/Manifest
+++ b/media-plugins/libvisual-plugins/Manifest
@@ -1,5 +1,7 @@
+AUX libvisual-plugins-0.4.0-fno-common.patch 627 BLAKE2B 507b9da964a1f636adedfcb5df07466ebd3d360ed91507239c8fb8f8197b0d1afc58c35ee8113deb9c507b9f3f329e3f9671e4e9f8b23e7842dfcede1f1fc801 SHA512 820682ec181739a060adbe9be2dbc704259a99cf2e30840008fd39afd0344bdc33b6486ecdec7478d56c81f08172172ca2fcade4b1384954b2334e5f978fd73f
 DIST libvisual-plugins-0.4.0-m4-1.tar.bz2 1872 BLAKE2B 438fa805e4dccde1f446d3e78e6d3578bbf8ada8ab664bc6e408be1a32edacdf4cb587c213300022cece442c63e88258f2d189d0b35dec9ac1a9b8de826a84db SHA512 6522491f0797d0d442e1839fcfad985fcdba4a6d43ec94eb6edf13cea09a0b187b1e7c09b0c3b2f7b8f22d9b41f9cfb1f5b3559fed00b9dc3935fdf37bf7c08a
 DIST libvisual-plugins-0.4.0-patches-4.tar.bz2 10814 BLAKE2B 75e1df7ebbd7455475a9035fe5fd1249117728c74e27ff17407ae9b941bc2e4bfe3cf890ed72bb389a8be27906b7b2ec2dce61403fde8831c127198d663b3666 SHA512 e6c20ebad338c300e1c049d33241daab3d6cd25a73be3402aedb13bb3cf6a84112e074fc2d57f9a7a158d12addd0d320a94d1690ed789f3a90e9cb14cfb966d2
 DIST libvisual-plugins-0.4.0.tar.gz 828631 BLAKE2B a3afdb65b5da4cd19d9793fe8da3b14e99df77e21fb888b9f26b9c60af6b71e331b7250029144cb56281e77d2b579ce45d2be1445cab96bc8dc99dbd40794275 SHA512 f8666b548bc04e8b9ab69a37bdd5483080c820115903aabaa629bb0bd0fa8424969ee596e6e66bb90d8e62d6e14513fd57f85c1b5e7e074792cfa94638134901
-EBUILD libvisual-plugins-0.4.0-r3.ebuild 1930 BLAKE2B 2d872c1048c37789e9665cad56bf6f123bfcb75334474e4e9f132cfab1a4e46f2b60ed424a0eb14410e0ddc0c3a22c128b6bb41f60dabae9bc7ca89f5b6c7bd1 SHA512 23dd9a279c1a9c4b3043cb568b80e9127f5295a233e333c9a8ca1bb9f7e8c8ada6290b3046ebdb99396e261109f06fe6cef4c4a4aba4ed69db036668532b158a
+EBUILD libvisual-plugins-0.4.0-r3.ebuild 1962 BLAKE2B 068bd77ccdcd44315420489e973481e7c4308aacb84995b8da8500818c74f90687b6e0ab3d37b41458d23bb76e71239cc4468b861a7018723abcf19b954211ad SHA512 2160bf96d38216ca0260981b3f649f5c12fdd6d48f9eaafa2b3fd4595791631fbd59c0b1c8078b05403f644e34bbcff6afa7454a7e8c9e46cf422dbc9664c08e
+EBUILD libvisual-plugins-0.4.0-r4.ebuild 2605 BLAKE2B 345b53183b674cf65672b66dca363aaf0d17eb7a1d3b1e4e8599bfe663a80d8babfdeb3f643ef6ec65a2fb59e26f72ff810c22bdf6e1c6631e172cc647eac588 SHA512 89fc27f8b408cabd96c1e2564ad60923681607085929726a06c0d4b6a2a2528a9ca2191f457277d70485eab66574899e8bc05f718bf814d5997ca68fa45dd9ac
 MISC metadata.xml 332 BLAKE2B c29c386b29c500e0f8a7827985e0c26ee50f9f0465b92c42feed113b3b1fdceae581a6b8d7089ba2d304428f604b531d8e8833da12f2d44e8a1643d952b11445 SHA512 62db2eb31068dc2c0adf100ff0a9782bf9f92118fb2c2322fbde5fff6a22dfe16ff826b22218b44a86b7350ffbbc3e9fc6f0135f0a43feff8f83e3e6365b7288
diff --git a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch
new file mode 100644
index 000000000000..5544d1895e02
--- /dev/null
+++ b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch
@@ -0,0 +1,17 @@
+--- a/plugins/actor/oinksie/table.h
++++ b/plugins/actor/oinksie/table.h
+@@ -27,10 +27,10 @@
+ #define OINK_TABLE_NORMAL_SIZE	1200
+ #define OINK_TABLE_LARGE_SIZE	12000
+ 
+-float _oink_table_sin[OINK_TABLE_NORMAL_SIZE];
+-float _oink_table_cos[OINK_TABLE_NORMAL_SIZE];
+-float _oink_table_sinlarge[OINK_TABLE_LARGE_SIZE];
+-float _oink_table_coslarge[OINK_TABLE_LARGE_SIZE];
++extern float _oink_table_sin[OINK_TABLE_NORMAL_SIZE];
++extern float _oink_table_cos[OINK_TABLE_NORMAL_SIZE];
++extern float _oink_table_sinlarge[OINK_TABLE_LARGE_SIZE];
++extern float _oink_table_coslarge[OINK_TABLE_LARGE_SIZE];
+ 
+ void _oink_table_init ();
+ 
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
index 2ebdcaae9d40..b15a83b81fde 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils ltprune multilib-minimal
 PATCHLEVEL=4
 
 DESCRIPTION="collection of visualization plugins for use with the libvisual framework"
-HOMEPAGE="http://libvisual.sourceforge.net/"
+HOMEPAGE="http://libvisual.org/"
 SRC_URI="mirror://sourceforge/libvisual/${P}.tar.gz
 	mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2
 	mirror://gentoo/${P}-m4-1.tar.bz2"
@@ -37,6 +37,7 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 src_prepare() {
 	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches
+	epatch "${FILESDIR}/${P}-fno-common.patch"
 	AT_M4DIR=${WORKDIR}/m4 eautoreconf
 
 	sed -i -e "s:@MKINSTALLDIRS@:${S}/mkinstalldirs:" po/Makefile.* || die
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
new file mode 100644
index 000000000000..118a9ee48ba8
--- /dev/null
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+PATCHLEVEL=4
+
+DESCRIPTION="collection of visualization plugins for use with the libvisual framework"
+HOMEPAGE="http://libvisual.org/"
+SRC_URI="mirror://sourceforge/libvisual/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2
+	mirror://gentoo/${P}-m4-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.4"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+IUSE="alsa debug gtk jack mplayer opengl"
+
+RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	~media-libs/libvisual-${PV}[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1"
+
+DEPEND="${RDEPEND}
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fno-common.patch"
+)
+
+src_prepare() {
+	# Can't use eapply on ${WORKDIR}/patches since the patches use different
+	# values for -p. epatch handled that automatically, eapply doesn't
+	eapply -p1 "${WORKDIR}"/patches/005_all_cxxflags.patch
+	eapply -p1 "${WORKDIR}"/patches/010_all_LIBADD.patch
+	eapply -p1 "${WORKDIR}"/patches/020_all_64bit.patch
+	eapply -p1 "${WORKDIR}"/patches/030_all_analyser.patch
+	eapply -p1 "${WORKDIR}"/patches/040_all_gforce.patch
+	eapply -p0 "${WORKDIR}"/patches/050_all_automagic.patch
+	eapply -p0 "${WORKDIR}"/patches/060_all_gstreamer.patch
+	eapply -p1 "${WORKDIR}"/patches/070_all_gforce-fbsd.patch
+	eapply -p1 "${WORKDIR}"/patches/080_all_qa.patch
+	eapply -p1 "${WORKDIR}"/patches/090_all_nastyfft.patch
+	default
+
+	AT_M4DIR=${WORKDIR}/m4 eautoreconf
+
+	sed -i -e "s:@MKINSTALLDIRS@:${S}/mkinstalldirs:" po/Makefile.* || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-esd \
+		$(use_enable jack) \
+		$(use_enable gtk gdkpixbuf-plugin) \
+		--disable-gstreamer-plugin \
+		$(use_enable alsa) \
+		$(use_enable mplayer) \
+		$(use_enable debug inputdebug) \
+		$(use_enable opengl gltest) \
+		$(use_enable opengl nastyfft) \
+		$(use_enable opengl madspin) \
+		$(use_enable opengl flower) \
+		$(use_enable debug)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index b6e9d73b52fd..e4f31cb172c7 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,6 +1,6 @@
 AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
 DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
 DIST live.2020.05.15.tar.gz 7229400 BLAKE2B 74532c178aa1044750110eb52561b99cd70874574ee84992201a145b18091d4f8475e2a299a83f0fe42c7e64483d46175fb76465a22509db3ba2633aff1327f6 SHA512 d53fb7e8c586f50e561aa361567ccd45babdbbcbe96a06d95e42a04a54b23ac3f474fefcacf94a49b604008623acf06789b92238364713853babbe356eeac4aa
-EBUILD live-2020.03.06.ebuild 3309 BLAKE2B 300acf8483430163c136dd4a6fb06ad83c942cc90d89cf30a9dac61415ed2ed40e3fffb8b891befb8272b440643f8ad7027763618571c2ec03ccc7a2cead659a SHA512 a4304a0c5e311373098ebef2e67c4b3143e619ff704c145def45a9349bf852d8a01352800f60b7f1a29372b67fa19eabdf5c2c20f906692db63ad81dbe493c14
-EBUILD live-2020.05.15.ebuild 3171 BLAKE2B 3db86728b930caaffc62266072acead0e9da871925d07ae6b2c47a144ac5c121f2052ad1ed113d9ed38869b0853fc13ca773ebcf1f0a8da17ec4fb78c571d38f SHA512 242b1570d863957225f9da0d0324667e79ada49a337dcf7e2895a01525c4431d602e85b1604d1b47bf60820a5e2899beebc80eab7206cb4ddb975df4ce6ea5e3
+EBUILD live-2020.03.06.ebuild 3309 BLAKE2B dbdccb12baac1a91f5e3b5935fe1d1a7ca274bb95315e166dd211e90b79483c4ec65a107c51fe0c0c1bef87e31b2a139d71de007a07335d5609baf89f44cc797 SHA512 570363972e35b906f29df0b71289505a49828752d207946a638aec5e6f3cc88350fbc0867e8cc67dd997c9cbe188187b413a928ecc772c28bdbe801ff1235535
+EBUILD live-2020.05.15.ebuild 3171 BLAKE2B b97290749364f82d1f0cf5ceaf9c87ddf3dbe5937bbf76a16c265bb2b5ec2ebdb8eef6861a8d5a14d231af6b59f04aafe5d45d397b92184812abc4201f7edd25 SHA512 dab4a7fc72936be392172a2fe9e020d092939d6943fd60c6a2aa2da03c143fa4ae7700c6b137a2a5f75e6acbe62db1d12ed521d4d743c9ace0ff65c091ed70fb
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2020.03.06.ebuild b/media-plugins/live/live-2020.03.06.ebuild
index 1faafb5ccd34..41bbf155685f 100644
--- a/media-plugins/live/live-2020.03.06.ebuild
+++ b/media-plugins/live/live-2020.03.06.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "live-shared/README" )
 
-# Alexis Ballier <aballier@gentoo.org>, Sam James <sam@cmpct.info>
+# Alexis Ballier <aballier@gentoo.org>, Sam James <sam@gentoo.org>
 # Be careful, bump this everytime you bump the package and the ABI has changed.
 # If you don't know, ask someone.
 # You may wish to use a site like https://abi-laboratory.pro/index.php?view=timeline&l=live555
diff --git a/media-plugins/live/live-2020.05.15.ebuild b/media-plugins/live/live-2020.05.15.ebuild
index cce1f38eef20..4f30941cdf98 100644
--- a/media-plugins/live/live-2020.05.15.ebuild
+++ b/media-plugins/live/live-2020.05.15.ebuild
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "live-shared/README" )
 
-# Alexis Ballier <aballier@gentoo.org>, Sam James <sam@cmpct.info>
+# Alexis Ballier <aballier@gentoo.org>, Sam James <sam@gentoo.org>
 # Be careful, bump this everytime you bump the package and the ABI has changed.
 # If you don't know, ask someone.
 # You may wish to use a site like https://abi-laboratory.pro/index.php?view=timeline&l=live555
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index d436d2f5ac07..344453c1e374 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,5 +1,3 @@
-DIST mythplugins-30.0.tar.gz 101169041 BLAKE2B 0125c6234c168b9b24110b817e9e9a632187743c9ca44a46a8d464be6c330067f31da6fb252ed2a5fd770756229f2d95a746bd5d0e03be1e97fecc0de86603be SHA512 a29125ca33b1b100f51feb7a2ccff16d62928e474a393f11fc4b4fb77d0a85d9d4dd138acf757b527c0f936f3ff2e7d3eddcacef183d642429e36bc3e44ecbf4
 DIST mythplugins-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
-EBUILD mythplugins-30.0-r2.ebuild 4461 BLAKE2B 75ade4698ab445f25b1d5a53adbcf18f418363eee1119b12a35bf6a6cb61aa03f1d0ac6759e3d30d8f82f9a12e69f6c8c23cc864f49a37692453b02bd8f20ee1 SHA512 5e9435e4cfa7a6ac063cbcdc925e8b8bdca3d7827a45908149b54d5332ac1c6d11af9d70d4d464e2d7c28526796b0698f5ac4be29c1785e795e3fae282395404
 EBUILD mythplugins-31.0.ebuild 4134 BLAKE2B c492412dd23446c4707beb5c91393c252f6c16d35a7f460c6f99ccd2f7490be1e47d2a3c674bfd0b6a8edca6124266df112a51de6720b207fa5e53a2f7d756c4 SHA512 5b804535c769ac4395bb8429d56d51eca5f7e464463598e143eed0b2b8e670fd8387f4834c97df592e44fa0181008c71a6b829d1a74e1cf1213472c2eee695be
-MISC metadata.xml 1648 BLAKE2B c3bf88af62ef3c7dc370c085f99e555c890ffbdac07e3a9106ed1c277d4c6943a1be2702b3cb8d376665073d69e42d0e629186825fd09ccb03d5d5378ff2ce31 SHA512 43e6c090619bd621b07683e56aa2c90cb163072aa3c5093f6ec5eda147dd1b67ca01488934bb49f851b8fd667b3f47f2e106b98f7f53d97b600fa5ce77d5c7b0
+MISC metadata.xml 1569 BLAKE2B 721600943857e1531edd3c5cb323809dc3deb80de3f3d2e83ac179a5fc5ffaf40f180565d48c9e57079bcff25f0cbd72ce489142f0ac6a15caf83e047cdb6e42 SHA512 410354edf8d459b5fa3bf83ff95a13316f4ccd2d3e2121689356e52d34a371b37168c677d38bcfe9812d88ddbfea3868fb356c7b8c8f697327494bdaff04e961
diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
index 3b81a44089c8..d81da3debf32 100644
--- a/media-plugins/mythplugins/metadata.xml
+++ b/media-plugins/mythplugins/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="raw">Allows MythGallery to view photos saved in RAW format</flag>
 		<flag name="mytharchive">Allows you to archive recorded content to CD or DVD</flag>
 		<flag name="mythbrowser">Adds a web browser within MythTV</flag>
-		<flag name="mythgallery">Adds a picture viewing gallery within MythTV</flag>
 		<flag name="mythgame">Adds a frontend to various ROM emulators within MythTV</flag>
 		<flag name="mythmusic">Adds the ability for MythTV to act as a music player</flag>
 		<flag name="mythnetvision">Adds the ability to view netvision devices within MythTV</flag>
diff --git a/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild b/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild
deleted file mode 100644
index efbc5d121caa..000000000000
--- a/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Grab only the major version number.
-MAJOR_PV=${PV%%.*}
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
-MY_P=${P%_p*}
-
-inherit python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="Official WMythTV plugins"
-HOMEPAGE="https://www.mythtv.org"
-# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
-SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-MYTHPLUGINS="mytharchive +mythbrowser +mythgallery mythgame \
-mythmusic +mythnetvision +mythnews +mythweather mythzmserver mythzoneminder"
-IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtsql:5
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-apps/util-linux
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXv
-	x11-libs/libXxf86vm
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	hls? (
-		media-libs/faac
-		media-libs/libvpx:=
-		>=media-libs/x264-0.0.20111220:=
-		>=media-sound/lame-3.93.1
-	)
-	ieee1394? (
-		>=media-libs/libiec61883-1.0.0
-		>=sys-libs/libavc1394-0.5.3
-		>=sys-libs/libraw1394-1.2.0
-	)
-	libass? ( >=media-libs/libass-0.9.11:= )
-	=media-tv/mythtv-${MAJOR_PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid]
-	mytharchive? (
-		app-cdr/dvd+rw-tools
-		$(python_gen_cond_dep '
-			dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		')
-		media-video/dvdauthor
-		media-video/mjpegtools[png]
-		media-video/transcode
-		virtual/cdrtools
-	)
-	mythbrowser? ( dev-qt/qtwebkit:5 )
-	mythgallery? (
-		media-libs/tiff:0
-		opengl? ( virtual/opengl:= )
-		exif? ( >media-libs/libexif-0.6.9:= )
-		raw? ( media-gfx/dcraw )
-	)
-	mythgame? ( sys-libs/zlib[minizip] )
-	mythmusic? (
-		>=media-libs/flac-1.1.2
-		media-libs/libogg
-		>=media-libs/libvorbis-1.0
-		>=media-libs/taglib-1.6
-		>=media-sound/lame-3.93.1
-		fftw? ( sci-libs/fftw:3.0= )
-		opengl? ( virtual/opengl )
-		cdda? (
-			dev-libs/libcdio:=
-			cdr? ( virtual/cdrtools )
-		)
-	)
-	mythnetvision? (
-		$(python_gen_cond_dep '
-			dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
-			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-			dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]
-			dev-python/oauth[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	mythweather? (
-		dev-perl/Date-Manip
-		dev-perl/XML-Simple
-		dev-perl/XML-XPath
-		dev-perl/DateTime
-		dev-perl/Image-Size
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/SOAP-Lite
-		dev-perl/JSON
-	)
-	mythzmserver? ( dev-db/mysql-connector-c:0/18 )
-	theora? ( media-libs/libtheora )
-	xml? ( >=dev-libs/libxml2-2.6.0:= )
-	xvid? ( >=media-libs/xvid-1.1.0 )
-"
-RDEPEND="${DEPEND}
-	!media-plugins/mytharchive
-	!media-plugins/mythbrowser
-	!media-plugins/mythgallery
-	!media-plugins/mythgame
-	!media-plugins/mythmovies
-	!media-plugins/mythmusic
-	!media-plugins/mythnetvision
-	!media-plugins/mythnews
-	!media-plugins/mythweather
-	!media-plugins/mythzmserver
-	!media-plugins/mythzoneminder
-"
-REQUIRED_USE="
-	mythmusic? ( vorbis )
-	mythnetvision? ( ${PYTHON_REQUIRED_USE} )
-	mythnews? ( mythbrowser )
-"
-
-# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
-S="${WORKDIR}/mythtv-${PV}/mythplugins"
-
-DOC_CONTENTS="
-Common plugins are installed by default. Disable unneeded plugins individually with USE flags:
--mythbrowser -mythgallery -mythmusic -mythnetvision -mythnews -mythweather
-Additional plugins may be installed with USE flags mytharchive mythgame mythzmserver mythzoneminder
-"
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		--python=${EPYTHON} \
-		--extra-ldflags="${LDFLAGS}" \
-		$(use_enable cdda cdio) \
-		$(use_enable exif) \
-		$(use_enable exif new-exif) \
-		$(use_enable fftw) \
-		$(use_enable opengl) \
-		$(use_enable raw dcraw) \
-		$(use_enable mytharchive) \
-		$(use_enable mythbrowser) \
-		$(use_enable mythgallery) \
-		$(use_enable mythgame) \
-		$(use_enable mythmusic) \
-		$(use_enable mythnetvision) \
-		$(use_enable mythnews) \
-		$(use_enable mythweather) \
-		$(use_enable mythzmserver) \
-		$(use_enable mythzoneminder)
-}
-
-src_install() {
-	emake STRIP="true" INSTALL_ROOT="${D}" install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-plugins/tap-plugins/Manifest b/media-plugins/tap-plugins/Manifest
index b76259b47948..dad081fea36c 100644
--- a/media-plugins/tap-plugins/Manifest
+++ b/media-plugins/tap-plugins/Manifest
@@ -1,4 +1,8 @@
 AUX tap-plugins-0.7.3-cflags-ldflags.patch 901 BLAKE2B fac21c62373310ec7a9a1ab067cbeaa8d202f4cc54c84c11757122786f24a2a811a3a032b6d7eb37d43261946160f74ab33c58d50d777a45a152dfe9535f9803 SHA512 f345e823400b7ea3dcdc8a880cc16d476dc4f55662eb041d2ec40de6763c52c05019990a762fd623c257c870874940c974b628e7ce315d6e4cc4babc70e28a90
+AUX tap-plugins-1.0.1-makefile.patch 1548 BLAKE2B b718586d51cb7e843c71a41965f08331510214cbb533d6464df5c33520021d818b9943bdb39c526f42611accc4000ff62e0f1175b3ccbccacd7b462312957f27 SHA512 c56af56531b10b6b0ff016813779280ff1c9bd52e6b79208d431ebc4c0e1e3cbf4150005997466492791867a1a8044824f0d3339cb4db567f8823bcf6e2d4ea2
 DIST tap-plugins-0.7.3.tar.gz 70495 BLAKE2B 6e0974be78fa9a8092555282d1d8a3cb5d11731e78119bd0f71e843f6a7557aebd48cc2c8f3cdcc4f90e52eaea357926c0ad2fc9bd9c95bb361ecb7d181f098e SHA512 c4e9c93b9fd8afb82067cf3a48ae665843da775c3af6124147ff1f8651d96734a4b961c4c5ea48877b32770e6d0b5a793af32a5cbb6e3b9afd5b59c8b3cc2621
+DIST tap-plugins-1.0.1.tar.gz 64649 BLAKE2B 2b8ac9a26197f5c980512d33daf4c604d7bb3046fb40e3826d559d4420921a0e124a5577d53d0896bc92111f69765f714d5f55a9da60546e2e6f29e5c851b2a5 SHA512 25f72bba83a5a40d480bc9d4659b64096102281d02e43ad93d5064b0ef7972184db40162d1ef78fd783f431740a4c4d5e03160cdd5f43da3bc1570ff462c863a
 EBUILD tap-plugins-0.7.3.ebuild 675 BLAKE2B c84accc1815f5c1e6bc6752b260236568b382cb6d0d38157452bf8936d86eb64766df99415b5d040b35f109cd22de5b247ffc65dcf9a1ef62e07d117952ce507 SHA512 983f48fa26c940ac111e741e9be49d5e1effcd98122a0dcbbe3a988a3464aaace46f22144e1757cfd15e8cb6e75df04b2e4af1bcf7f6b2875a3f18becb015833
+EBUILD tap-plugins-1.0.1.ebuild 953 BLAKE2B 955ee7aaf2582bd151677301b706876055e9f4149780ddac1da5f122908d5ac911c5e24265a6de4b8643796f58cd2d7ae354e84ab57d59f89ebed747ba4e6381 SHA512 2baa08d658443f9312ff659ed02aa2c26020d8107a86525300c84ebfed9ead1a6e99301a8354e58d4a7f6ab56c80a3211760376f876095d09c68a2c27d489930
+EBUILD tap-plugins-9999.ebuild 953 BLAKE2B 955ee7aaf2582bd151677301b706876055e9f4149780ddac1da5f122908d5ac911c5e24265a6de4b8643796f58cd2d7ae354e84ab57d59f89ebed747ba4e6381 SHA512 2baa08d658443f9312ff659ed02aa2c26020d8107a86525300c84ebfed9ead1a6e99301a8354e58d4a7f6ab56c80a3211760376f876095d09c68a2c27d489930
 MISC metadata.xml 1616 BLAKE2B 55ad5ec5fb9218329bd3454b553115c4139d71d6d31a182e0e35750e99963b8b83de92b9c82df3928f7a570395b9bfdf8d5a171a1ff33c7c8443875dca7af9e7 SHA512 876598a8cda8a0331c5fd97d04984a222b2e6a9c0aeffe780f5e970dc1914c75c7e56701fcfa42ef318b0aa88183149f498346a23c5990d6bd7383199c875e01
diff --git a/media-plugins/tap-plugins/files/tap-plugins-1.0.1-makefile.patch b/media-plugins/tap-plugins/files/tap-plugins-1.0.1-makefile.patch
new file mode 100644
index 000000000000..a5b441ee6d4f
--- /dev/null
+++ b/media-plugins/tap-plugins/files/tap-plugins-1.0.1-makefile.patch
@@ -0,0 +1,47 @@
+diff --git a/Makefile b/Makefile
+index 54049cd..86f7175 100644
+--- a/Makefile
++++ b/Makefile
+@@ -23,8 +23,8 @@
+ # Change this if you want to install somewhere else. In particular
+ # you may wish to remove the middle "local/" part of the path.
+ 
+-INSTALL_PLUGINS_DIR	=	/usr/local/lib/ladspa/
+-INSTALL_LRDF_DIR	=	/usr/local/share/ladspa/rdf/
++#INSTALL_PLUGINS_DIR	=	/usr/local/lib/ladspa/
++#INSTALL_LRDF_DIR	=	/usr/local/share/ladspa/rdf/
+ 
+ # NO EDITING below this line is required
+ # if all you want to do is install and use the plugins.
+@@ -37,13 +37,15 @@ INSTALL_LRDF_DIR	=	/usr/local/share/ladspa/rdf/
+ OS := $(shell uname -s)
+ 
+ CC      = gcc
+-CFLAGS  = -I. -O3 -Wall -fomit-frame-pointer -funroll-loops -ffast-math -c -fPIC -DPIC
++CFLAGS  = -I. -Wall -fomit-frame-pointer -funroll-loops -ffast-math -c -fPIC -DPIC
+ ifeq ($(OS),Darwin)
+-LDFLAGS = -nostartfiles -shared -Wl,-install_name,symbolic -lc -lm
++LDFLAGS = -nostartfiles -shared -Wl,-install_name,symbolic -lc -lm $(EXTRA_LDFLAGS)
+ else
+-LDFLAGS = -nostartfiles -shared -Wl,-Bsymbolic -lc -lm -lrt
++LDFLAGS = -nostartfiles -shared -Wl,-Bsymbolic -lc -lm -lrt $(EXTRA_LDFLAGS)
+ endif
++EXTRA_LDFLAGS =
+ MODULES = $(wildcard *.c)
++LIBADD = -lc -lm -lrt
+ 
+ all: $(MODULES:%.c=%.so)
+ 
+@@ -54,10 +56,10 @@ tap_dynamics_m.o: tap_dynamics_presets.h
+ tap_dynamics_st.o: tap_dynamics_presets.h
+ 
+ %.o: %.c tap_utils.h ladspa.h
+-	$(CC) $(CFLAGS) $< -o $@
++	$(CC) $(CFLAGS) $(OPT_CFLAGS) $< -o $@
+ 
+ %.so: %.o
+-	$(CC) -o $@ $< $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $< $(LIBADD)
+ 
+ # OTHER TARGETS
+ 
diff --git a/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild b/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
new file mode 100644
index 000000000000..6a1fa34a0a5b
--- /dev/null
+++ b/media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://github.com/tomszilagyi/${PN}.git"
+	EGIT_PROJECT="${PN}.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	SRC_URI="https://github.com/tomszilagyi/tap-plugins/archive/v${PV}.tar.gz -> $P.tar.gz"
+fi
+
+DESCRIPTION="Tom's audio processing (TAP) LADSPA plugins"
+HOMEPAGE="https://github.com/tomszilagyi/tap-plugins http://tap-plugins.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+DEPEND="media-libs/ladspa-sdk"
+RDEPEND="${DEPEND}"
+DOCS=( README CREDITS )
+PATCHES=( "${FILESDIR}/${PN}-1.0.1-makefile.patch" )
+
+src_compile() {
+	emake CC=$(tc-getCC) OPT_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	insinto /usr/share/ladspa/rdf
+	doins *.rdf
+
+	exeinto /usr/$(get_libdir)/ladspa
+	doexe *.so
+
+	einstalldocs
+}
diff --git a/media-plugins/tap-plugins/tap-plugins-9999.ebuild b/media-plugins/tap-plugins/tap-plugins-9999.ebuild
new file mode 100644
index 000000000000..6a1fa34a0a5b
--- /dev/null
+++ b/media-plugins/tap-plugins/tap-plugins-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://github.com/tomszilagyi/${PN}.git"
+	EGIT_PROJECT="${PN}.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	SRC_URI="https://github.com/tomszilagyi/tap-plugins/archive/v${PV}.tar.gz -> $P.tar.gz"
+fi
+
+DESCRIPTION="Tom's audio processing (TAP) LADSPA plugins"
+HOMEPAGE="https://github.com/tomszilagyi/tap-plugins http://tap-plugins.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+DEPEND="media-libs/ladspa-sdk"
+RDEPEND="${DEPEND}"
+DOCS=( README CREDITS )
+PATCHES=( "${FILESDIR}/${PN}-1.0.1-makefile.patch" )
+
+src_compile() {
+	emake CC=$(tc-getCC) OPT_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	insinto /usr/share/ladspa/rdf
+	doins *.rdf
+
+	exeinto /usr/$(get_libdir)/ladspa
+	doexe *.so
+
+	einstalldocs
+}
diff --git a/media-plugins/vamp-aubio-plugins/Manifest b/media-plugins/vamp-aubio-plugins/Manifest
index abba248a21f4..c09e1aa63b23 100644
--- a/media-plugins/vamp-aubio-plugins/Manifest
+++ b/media-plugins/vamp-aubio-plugins/Manifest
@@ -1,5 +1,6 @@
 DIST vamp-aubio-plugins-0.5.0.tar.bz2 26253 BLAKE2B dc05ef4d642fee389e60dee5ab46ad9679e641060a47cd084d5328067e88c325d007f9b317b9d46d0600c7cddb82ea7af156ab67330b23746dee6fa78adce2eb SHA512 7b1c13a91cb12b9e5f25a78ed31ccb4b5cfdabc8b3ac546dee776de1786008e6bb4471aa242bb4b128d202ea523e15efa4889e4f1c4189583b6d20d8b0dba675
 DIST vamp-aubio-plugins-0.5.1.tar.bz2 234156 BLAKE2B 99b064a2d2372a6c42e1251ac5d29d0cc607543b4e651c3b006106bad888c9ab22fcc2a907acde135d7e663187388a52c2513f8845501908318ff9d1c0b5df9b SHA512 ebbd8466ec3907d55e24824d7a725586df38212994f1398b75974dfac8e282dd8b2cb2a9381ad7e3da1a130b77936f109b36909b23591cc58ff176d6eb22625e
+DIST waf-2.0.20 104725 BLAKE2B c9467b5205f596cd1b5d4b6ccb97806e9fa1f4d4eb9109d378a0978179ab49a029926cb86876ca2088878378f88eb292d899840b4a072e62fc6542b93bc2d894 SHA512 72de1c5a78eb353da4b4a6ea4fbf52d232ed6dd08e972872744e3727b952f813f44e47f0b47106bd6f05ce7fa137c4685ac313fb0b0d70e5fc85dc34918e66f0
 EBUILD vamp-aubio-plugins-0.5.0.ebuild 713 BLAKE2B 5b57027d701cc2ac58eee1ba9c631846308ee5745d2333ba344d51d3df2a405f761bd777512ef95c4b3484ec00ba8d72f3a5a0e6fb024a0536b6ce2dda73d651 SHA512 6f3e282f95a70c6f2cd012a9fd25ea3cd687f41eab1dbb6b661189eab757c754483e830a6d38a174d591af50ba679117f8cc23b3bf8df5e3a14883e1ce2c2b9b
-EBUILD vamp-aubio-plugins-0.5.1.ebuild 642 BLAKE2B a6e51a131420a2a7799ee64c07760a012c663177223d84e7dcbad4d81ca0408c096d51ca167768adba71484e5fc624f595ab0c0eb9a39e6d9def02dfb9b95ad5 SHA512 5715fac75053e62e9a47109d2f2c3e286a01ea6c54a65b6abed2f07bca6f52b02e87777c9e2d4cb510dbb977ac4aa1387032c3f6eb585129ddaacf747823e110
+EBUILD vamp-aubio-plugins-0.5.1-r1.ebuild 820 BLAKE2B 90eaa5175c589aade3cc1785561aabbd74e225e8ae4b688c119d08fe11f92d1e9a75c0c43063cbd5e1f6fab28d000d684ba86decdf7fcd61b93e2b72bcad64d8 SHA512 718cfa1becc72fa25eccc620c9937ece4a06e2e63a6bbcea11088c5d9fbf80911d8f919c3ba0dc0f809940dae43430b8fc68782d6b913b1b510ff386cd941d17
 MISC metadata.xml 333 BLAKE2B 757b233440a9b77b19c9812c5469814f18f4ef144588f81520a2458aff7cb4b404ec0a9255f12409881593dce35bcc3c9893daec4fb71e24668904f3bcca1d8f SHA512 355bf8dc7fbdba79cd07d3b4754b301d368c055534932400dc46172a1b0f4d800490dee7ecc7187b6bff0e8be618434e5fe3030dbbba55622033e161c58f8fe1
diff --git a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.ebuild b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
index b8f7cf32509f..a718fed01412 100644
--- a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.ebuild
+++ b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic toolchain-funcs multilib python-any-r1 waf-utils
 
+WAF_PV='2.0.20'
+
 DESCRIPTION="Onset detection, pitch tracking, note tracking and tempo tracking plugins"
 HOMEPAGE="https://www.vamp-plugins.org/"
-SRC_URI="https://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2"
+SRC_URI="https://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2
+	https://waf.io/waf-${WAF_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,3 +25,8 @@ DEPEND=">=media-libs/aubio-0.4.1
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	${PYTHON_DEPS}"
+
+src_prepare() {
+	rm -r "${S}"/waflib && cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die 'Failed to update waf'
+	default
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-plugins
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)