gentoo resync : 18.11.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
commit: 536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree: 697733f5cb713908dcf378e13fd15a798a906a91 /media-plugins
parent: f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)
134 files changed, 1813 insertions, 456 deletions
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 33d0aa8d9808..96c0b89cbbf0 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index d4d08a0de81c..44c4303e3356 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -7,6 +7,6 @@ DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6be
 DIST alsa-plugins-1.1.6.tar.bz2 367485 BLAKE2B efe8b8447db4f68761060e4f48c86c76f821fd7795d8edec0c8f5a03f7406a422f630f012433ac12c3af3222b7b587820a92e937c80dba6bb8766deb854b9706 SHA512 f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b
 DIST alsa-plugins-1.1.7.tar.bz2 369866 BLAKE2B 8305f17a7e72e159f1710168cc3a4f0c7deb870c813a8a48b335911717422ac584b6846b047a29880448bdc0597a80881b87e5df1ff018a1e174aea490d3e9df SHA512 c3bb22ec3c5a167fb246cfc94131d53800e321b486ab743c3395a9d91dee0ff9703f6e4a2feaea5a4ee42a7e486d835d48ab880c784c5c34bb4eb5e9ded06d8e
 EBUILD alsa-plugins-1.1.1-r1.ebuild 2698 BLAKE2B 3fac1377af069760efcc93fe6daa55a3d821742e7ffd5c0976dc0f3a066151ff087d20a65803aa59f253f27f8077d20345da879f92fd3dc28398440e31b3d148 SHA512 9df4f03ae71fe97423bdb37cd28755873a915f210ce92f5f394e15bcecd6662f321acff20b9f212fdb06b63337a7f58d2fb25a6c18eac2be3c5820bc21394860
-EBUILD alsa-plugins-1.1.6.ebuild 2873 BLAKE2B d8332fa2137294668fbb903eaa84122cdfa67840ed18bfc1f9e9de6df5e9d13093f3f2322c225960444983684e4d51bd0e02a6347f70d16256490ea2e511b3bd SHA512 b17870bb04956da4d82ad7d4ed32c317985e02544889accf6af2a2c1d112abea889e25618cc0a6239030a30868296f06ef4c427ae0ca7aa1fbca0ae86b2f5d25
+EBUILD alsa-plugins-1.1.6.ebuild 2871 BLAKE2B 9237177da7962b41c133f03ce43551bade96df33cb8308c72f8e48515e5b74585682220754b2dd0e1cff539e3c2e93aff5be0deff0c08b000af018f89492c133 SHA512 bd24fb484361cdda38ed6f9819a3cf9a66a9ae7fae060818f958168353a199abfc88cf67bc48de3b7ccc7cd5ba36d680c67f85297d5aa0d17600dc29c72b8309
 EBUILD alsa-plugins-1.1.7.ebuild 2820 BLAKE2B 7b75a11208b7d17639c95d97c4146482f724f15b4f10faa597bc98e4b92c81315bec24f1732b16786cca8b226a6e130e124405347f1393769d622931f2675a7c SHA512 e99dfe0dd098ffb7debdfaf29eca29688f7a9c0e82c3c05dd2b48a61339b622d53a37bc1fc22dc2dd46cbec12df3155d0cc706517efa3447eae4fb26f14967fd
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
index 33cc025c6846..ca281b26c415 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux"
 IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
 
 RDEPEND="
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 458828754687..d771ae1dbed8 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,9 @@
+AUX audacious-plugins-3.10-fix-slow-search.patch 3373 BLAKE2B 1b66928f0f92395179931ffe681d60db466bd9fa70cc6d1cdf6e4ebd9803737d7dd2d967d006ec6a90eca557f63610059407987dbe54e2c41f69d2443b257836 SHA512 8287ad3a85c526cef99f155752b6de53ab4100eec08a3b746536123973c59c7e7a4b917d7e143bb59d99b9aa7812dfd11000add11c2c293f4f7d08259a02f4a3
 AUX audacious-plugins-3.9-qt-5.10.patch 1022 BLAKE2B 0bad9beb8ab5c53b696e324fd0d973a1355b6bd6f8a4052ee1619baa43d720066b0b424d066aa1d9427418d1dd5e4e0fb343b6f843c8fb7345c7abff0d21f0fc SHA512 33e854ba848ad8cbd7b53a81bf8c219069ae72aac6ba5a226ebb5152b46dbcb31e04e4fef7a1bbd912b1a6c2a9f1f8d904be750dc132e94cc53c138a354b52ed
+DIST audacious-plugins-3.10.tar.bz2 1701877 BLAKE2B 4db7351af494ff5b7d2a7968524e2480f321505759f4a6532dd86f8fd87f43ab0a66e9f1fc75cfcbc8c59d35c1071048b61a8452fa6e041cd1667872f5b5699e SHA512 88dd93b5a7f6582ec42cf539d1000de0900cce683f4de85d8a17f57c7ba34545c6277882cad1505cb6682ee7b885ffcd1fe5675f7e24dc3e2a650615789d9d52
 DIST audacious-plugins-3.9-gtk3.tar.bz2 1842950 BLAKE2B 55f373be204a9b4c9cff41d41d43c4776f680ab203643e90e5d338bec2e7f8a4c60cda9caa08e461089a475f3ec1bc237538f781718eb0d26a4365743337e977 SHA512 e2529af761bc97e589cac08689b16db657096b1bbfcc802789726ae1b472746025bec1b492de52eef755d7b50574d09b9250761bf701b1ca37f8a0e8db0f207b
 DIST audacious-plugins-3.9.tar.bz2 1843084 BLAKE2B fa3a8433a869a2df0589f59e12513adcc0da0545b53ee441db4b18be7e12334b4125bd60b48902c37041041555859ab19df814c483f7d971214077e9980148b6 SHA512 00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa
+EBUILD audacious-plugins-3.10.ebuild 3914 BLAKE2B e9bb66444f4e31023360d5f5847e80639e0f0abb39c28a27066041dc580d587122fb7926ecbb51c844477e24c5f1cbb3da165f3ea24c85b85b74e78614d139dc SHA512 48e8b2643c9db930a9e3559ef2d70cdd95041deea5f3b79e9c712c44b78b1db7409e6871ac1acc900e08a6872b213505dfecb1167064d6042f2e7145495efeee
 EBUILD audacious-plugins-3.9-r1.ebuild 4500 BLAKE2B 160c9c5c24829855b59c613d1f8cba6ab63375567e5b4056603f3053ec7bebdc8134db8daf3480b821d30547544e914e30ce3f7a4f64482de30b75d7c9a1ef1f SHA512 00a64329376e63822a4df0974332cce9e2feb80ba8bd5e17134310ae052f7561fdde11434aa72efcc1c470e66589e2bc1841bc84c3d1667b28ac965e1f0fc2f9
-EBUILD audacious-plugins-9999.ebuild 4454 BLAKE2B a56e8d4b521c484b8fccb8796771df9aa6e7fb8273442c78f75faa4c213612962518aa717f54f4f7b95db9c5fe8d9f6a8a70199479ace970ca8ce4b6ee190b90 SHA512 45f53d21305d862a222f5bc659cb184d354e896788b4ba20f8cec8ee4d805890dc3736383ae796d1a716219e2b6f4ffd55f9bb6e2fb573fe40d39d75f9d83a84
+EBUILD audacious-plugins-9999.ebuild 4428 BLAKE2B 62886db82bd137bcb38ef9d98fd34f4c59557ea3122870765b1d983a8d997beaa37f7d30e86ac04a9b3a737ad03f02aeac4d6bd08bfd9d2ef79b0a4176eaea51 SHA512 c9753c7ec6b04860e2c582375e7de64733e9c969410c8d4dbb7db60484687d52ae5bd2d208eb9b1adeee44b92af01e9f22b9265bf2082da734727a62b2cc8c02
 MISC metadata.xml 1428 BLAKE2B f6f35bd76daa789fe1700ef910aee207bf132d9dee3660796d2d6182e54f839370dcb6f7eedf73cd52d5e3713a8460fed1e9db625e5208c76f3a857cb09da24f SHA512 720a609a086b8477062fa836b1e7ac2dcca5e9a0aaac25848fd6a6c69d48fcc8161885ac9bc3c428d81c3e8e1b2256f0343c799cc07e8ceb7ec4fd2ce3d7680d
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
new file mode 100644
index 000000000000..968cfc473386
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+
+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
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav
+	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+REQUIRED_USE="
+	|| ( alsa jack pulseaudio sdl )
+	ampache? ( 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
+RDEPEND="
+	app-arch/unzip
+	dev-libs/dbus-glib
+	dev-libs/glib
+	dev-libs/libxml2:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	media-libs/adplug
+	~media-sound/audacious-${PV}
+	aac? ( >=media-libs/faad2-2.7 )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	ampache? ( =media-libs/ampache_browser-1* )
+	aosd? (
+		x11-libs/libXrender
+		x11-libs/libXcomposite
+	)
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		>=media-libs/libcddb-1.2.1
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
+	flac? (
+		>=media-libs/libvorbis-1.0
+		>=media-libs/flac-1.2.1-r1
+	)
+	fluidsynth? ( media-sound/fluidsynth )
+	http? ( >=net-libs/neon-0.26.4 )
+	jack? (
+		>=media-libs/bio2jack-0.4
+		virtual/jack
+	)
+	lame? ( media-sound/lame )
+	libsamplerate? ( media-libs/libsamplerate:= )
+	lirc? ( app-misc/lirc )
+	mms? ( >=media-libs/libmms-0.3 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( >=media-sound/mpg123-1.12.1 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	scrobbler? ( net-misc/curl )
+	sdl? ( media-libs/libsdl2[sound] )
+	sid? ( >=media-libs/libsidplayfp-1.0.0 )
+	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+	soxr? ( media-libs/soxr )
+	speedpitch? ( media-libs/libsamplerate:= )
+	vorbis? (
+		>=media-libs/libvorbis-1.2.0
+		>=media-libs/libogg-1.1.3
+	)
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
+
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+PATCHES=( "${FILESDIR}/${P}-fix-slow-search.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	if ! use mp3 ; then
+		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+	fi
+
+	econf \
+		--enable-mpris2 \
+		--enable-qt \
+		--enable-qtaudio \
+		--enable-songchange \
+		--disable-coreaudio \
+		--disable-gtk \
+		--disable-hotkey \
+		--disable-notify \
+		--disable-oss4 \
+		--disable-qtglspectrum \
+		--disable-sndio \
+		$(use_enable aac) \
+		$(use_enable alsa) \
+		$(use_enable ampache) \
+		$(use_enable aosd) \
+		$(use_enable bs2b) \
+		$(use_enable cdda cdaudio) \
+		$(use_enable cue) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth amidiplug) \
+		$(use_enable flac filewriter) \
+		$(use_enable gme console) \
+		$(use_enable http neon) \
+		$(use_enable jack) \
+		$(use_enable lame filewriter_mp3) \
+		$(use_enable libsamplerate resample) \
+		$(use_enable lirc) \
+		$(use_enable mms) \
+		$(use_enable modplug) \
+		$(use_enable mp3 mpg123) \
+		$(use_enable nls) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable scrobbler scrobbler2) \
+		$(use_enable sdl sdlout) \
+		$(use_enable sid) \
+		$(use_enable sndfile) \
+		$(use_enable soxr) \
+		$(use_enable speedpitch) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index adef73f950d2..2481a86bccb4 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_P="${P/_/-}"
 
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
 
 if [[ ${PV} == *9999 ]]; then
@@ -20,11 +20,11 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk gtk3 jack lame libav
+IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk gtk3 jack lame libav
 	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
 	^^ ( gtk gtk3 qt5 )
-	qt5? ( !libnotify )
+	qt5? ( !hotkeys !libnotify )
 	|| ( alsa jack pulseaudio sdl )
 	ampache? ( qt5 http )"
 
@@ -61,6 +61,7 @@ RDEPEND="
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		>=media-libs/libcddb-1.2.1
+		dev-libs/libcdio:=
 		dev-libs/libcdio-paranoia
 	)
 	cue? ( media-libs/libcue )
@@ -136,7 +137,6 @@ src_configure() {
 		--enable-mpris2 \
 		--enable-songchange \
 		--disable-oss4 \
-		--disable-qtaudio \
 		--disable-qtglspectrum \
 		--disable-coreaudio \
 		--disable-sndio \
@@ -155,7 +155,6 @@ src_configure() {
 		$(use_enable hotkeys hotkey) \
 		$(use_enable http neon) \
 		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
 		$(use_enable lame filewriter_mp3) \
 		$(use_enable libnotify notify) \
 		$(use_enable libsamplerate resample) \
@@ -166,6 +165,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable qt5 qt) \
+		$(use_enable qt5 qtaudio) \
 		$(use_enable scrobbler scrobbler2) \
 		$(use_enable sdl sdlout) \
 		$(use_enable sid) \
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.10-fix-slow-search.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.10-fix-slow-search.patch
new file mode 100644
index 000000000000..3012d3138737
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-3.10-fix-slow-search.patch
@@ -0,0 +1,108 @@
+From 9d162207ef01c5972e4bb718d390c494f0ad0241 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+Date: Tue, 4 Sep 2018 23:39:00 -0400
+Subject: [PATCH] qtui: Fix slow searching on large playlists.  Closes: #819.
+
+---
+ src/qtui/playlist-qt.cc | 58 +++++++++++++++++++++++++++++------------
+ src/qtui/playlist-qt.h  |  1 +
+ 2 files changed, 42 insertions(+), 17 deletions(-)
+
+diff --git a/src/qtui/playlist-qt.cc b/src/qtui/playlist-qt.cc
+index 28c480ead..750d87c37 100644
+--- a/src/qtui/playlist-qt.cc
++++ b/src/qtui/playlist-qt.cc
+@@ -89,6 +89,31 @@ int PlaylistWidget::indexToRow (const QModelIndex & index)
+     return proxyModel->mapToSource (index).row ();
+ }
+ 
++QModelIndex PlaylistWidget::visibleIndexNear (int row)
++{
++    QModelIndex index = rowToIndex (row);
++    if (index.isValid ())
++        return index;
++
++    int n_entries = m_playlist.n_entries ();
++
++    for (int r = row + 1; r < n_entries; r ++)
++    {
++        index = rowToIndex (r);
++        if (index.isValid ())
++            return index;
++    }
++
++    for (int r = row - 1; r >= 0; r --)
++    {
++        index = rowToIndex (r);
++        if (index.isValid ())
++            return index;
++    }
++
++    return index;
++}
++
+ void PlaylistWidget::contextMenuEvent (QContextMenuEvent * event)
+ {
+     if (contextMenu)
+@@ -379,33 +404,32 @@ void PlaylistWidget::playCurrentIndex ()
+ 
+ void PlaylistWidget::setFilter (const char * text)
+ {
++    // Save the current focus before filtering
++    int focus = m_playlist.get_focus ();
++
++    // Empty the model before updating the filter.  This prevents Qt from
++    // performing a series of "rows added" or "rows deleted" updates, which can
++    // be very slow (worst case O(N^2) complexity) on a large playlist.
++    model->entriesRemoved (0, model->rowCount ());
++
++    // Update the filter
+     proxyModel->setFilter (text);
+ 
+-    int focus = m_playlist.get_focus ();
+-    QModelIndex index;
++    // Repopulate the model
++    model->entriesAdded (0, m_playlist.n_entries ());
+ 
+-    // If there was a valid focus before filtering, Qt updates it for us via
+-    // currentChanged().  If not, we will set focus on the first visible row.
++    // If the previously focused row is no longer visible with the new filter,
++    // try to find a nearby one that is, and focus it.
++    auto index = visibleIndexNear (focus);
+ 
+-    if (focus >= 0)
+-        index = rowToIndex (focus);
+-    else
++    if (index.isValid ())
+     {
+-        if (! proxyModel->rowCount ())
+-            return;
+-
+-        index = proxyModel->index (0, 0);
+         focus = indexToRow (index);
+         m_playlist.set_focus (focus);
+-    }
+-
+-    if (! m_playlist.entry_selected (focus))
+-    {
+         m_playlist.select_all (false);
+         m_playlist.select_entry (focus, true);
++        scrollTo (index);
+     }
+-
+-    scrollTo (index);
+ }
+ 
+ void PlaylistWidget::setFirstVisibleColumn (int col)
+diff --git a/src/qtui/playlist-qt.h b/src/qtui/playlist-qt.h
+index a2894323c..df44205af 100644
+--- a/src/qtui/playlist-qt.h
++++ b/src/qtui/playlist-qt.h
+@@ -66,6 +66,7 @@ class PlaylistWidget : public QTreeView
+ 
+     QModelIndex rowToIndex (int row);
+     int indexToRow (const QModelIndex & index);
++    QModelIndex visibleIndexNear (int row);
+ 
+     void getSelectedRanges (int rowsBefore, int rowsAfter,
+      QItemSelection & selected, QItemSelection & deselected);
diff --git a/media-plugins/caps-plugins/Manifest b/media-plugins/caps-plugins/Manifest
index 44a1654440f1..de3b18358d6e 100644
--- a/media-plugins/caps-plugins/Manifest
+++ b/media-plugins/caps-plugins/Manifest
@@ -1,12 +1,5 @@
-AUX caps-plugins-0.4.5-double-free-corruption.patch 434 BLAKE2B 4dbca390256aec71c202209dcfff4612535ec720d9e95708a661e12ec34d38b9bac6c8d59eefc565e3d07e4aff327170ab7aa9d533d4b14f76eaa542e12aa5da SHA512 5984966a52278c6bfc892824bbac8d1946d1eb92e76ab136a11ee14d074fdfb7260b71367400e7fd016fdc645a2cb02d16564d40081990799b1dfb83c8e35bf1
 AUX caps-plugins-0.9.15-fix-c++14.patch 629 BLAKE2B 13b45c9448bbf1ea98c64ea008e004fed25a37fdae0961d3d73fd290f84ef98e7df3cc3f3d0d1ce8654570a14dcc3c7af0eccb5152273d3b0cb52e72bd567bac SHA512 f99ca7fb9244e0050b70df06103eda150a44d0e2a605642482afbbbfa3a2c06ea435a0289d08e533c27bb4be215b627e93566aa7b1d28d78b0d108aa42b5efc1
-DIST caps-doc_0.9.15.tar.bz2 795374 BLAKE2B 5aaf1114e078becd4c769eb19821db109ed1533248f93eb1391bda0f143da29fbdfe012e7d5d4b5f1ca6cb023f00fd9369d6fbfdb7a53ce7675b5ec389195152 SHA512 5fa72b6b057ceefda0695df9cf2e1866a4635bb757ed6e184fa3548f54eb0dc3a0ef3f65808819550e326f557d0de5614940c2f700d00a8ffa8d364026781f65
-DIST caps_0.4.5.tar.gz 790187 BLAKE2B a7d6ae1b8f2ecb5e3267faf099be637918d40be33b20793d10325ac0061bc1a28c63b914e62e45bd9a798d6db4e4bb8978c0aaa7beb2afcdd2d337bc06889a34 SHA512 5ceaa43e40f3a5d746abc847b8c8e4a2aafe1569b3d370b32b09a64ac52e642b172cc6b944b495b902e5c2a81c538f3406e08124475a80cc143c6e33ee960f15
-DIST caps_0.9.15.tar.bz2 683218 BLAKE2B 8131af033e330da72eef989b207474b7b0d5d60a0ee2fb16ae2c078c38c0df4cc743f5a0dc7eb976a1278c7d7560c60bff4b97d26679aabc5ab63cb6109d53e9 SHA512 91984a80cd3e750fb995f9d7f7d4ea44cdfce1a6b49944ed4eb5c3ddbdf9abf87dfd3005ba5a94686d2320bea603f4faf177201e15e0eeafb6a0284f0cb368ae
+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
-EBUILD caps-plugins-0.4.5-r1.ebuild 837 BLAKE2B 5465f83584e8da138a8cc9c34ca1708303bc02c86847e6188eabbdabc69379d2f2ab353b1507df5b92e24a56bb632ce85e7358c1c02b0aea138a4c8df632aa35 SHA512 a50f909df71346a36298b7a7e66f820d31c0009e0141b30c5fd7536c0966922cb577dc35cd0787af7744ba12cb43f94b23ca3a7250db414b7558b6f10ddfd5b1
-EBUILD caps-plugins-0.4.5-r2.ebuild 937 BLAKE2B 9bdc4ecca9490feb23ae32ad6913d038aeae2f3bb1daacc1c7b40a2254d337de2e61c183eaad03d7358142f3f5b2240573d6c2955c758c9eb6d52166af6f35d4 SHA512 684eecec971e32d7f57b945098c666779ba9fc358f6551ae63fd364130e6a2a485f051edd4708c29df4ad16a72f74fb5c79cfb49dda615a54cc42686dfdbecc7
-EBUILD caps-plugins-0.9.15-r1.ebuild 1011 BLAKE2B 80328a9bc7558de0be7c6728d56e467692d037d9071c4d9e45a2c751cfc4f6667d524f4e59b5f64cee13bf8417ac5137cd30193f2bf696bf6932758345dbd1f6 SHA512 0771427f4e46f3f207ecc9de30d93ffe268d3525e674f03a20c1ad203bf981145499b8256ec25fb482d8c052e7217b85d7be470d7569bb1bac91c20fa795834e
-EBUILD caps-plugins-0.9.15.ebuild 965 BLAKE2B 176970394a5cc351fb83c584f1c41f80402ce596a20746a96f3dca3f4400c9fa0481b31c439140076c4c09c4fc12a9987603eb9cda1573b829663b0d03ed0edb SHA512 42020479ad5d239b7148255c27b9a0ca2660eaa1823f77d9f706efc5eecbda8801d01b72331e284e91f68c7eb4da892f6b3b4d7e13a0f1e46c68ac697af8494c
-EBUILD caps-plugins-0.9.24.ebuild 882 BLAKE2B 461cbc607250dd8433f50ee805cb908b2476ca3b6bd8e26236f45cb59f65ca5e90caeda7872b9fd382d3a810a6570fae8f4f0b51b7ff14c2afd40b486eedb3eb SHA512 e64a7df061e4c2278fe0b49cfcb4ae96da7685ff1c96ac07edc9b4dd31ebb07d6f671eb3a82e020a1d56ca9cef7a3d99275f330df5cd55dd1ec75f5f0bf0a882
+EBUILD caps-plugins-0.9.24.ebuild 930 BLAKE2B ddf6bc2bc5120357944e5252ebe002b3a59367e086082957bbd770789605d920f1bcb138704f0ceabe1c26b17c854f30713b6dfcf61ce8f53ccab8b2897f655c SHA512 5238058fb7895ce82279a21ced457b5a925926324c8dc2c359ef93fc3522990b43ce1b9361afba22d191aa8d3b202181c085ae7972fadca89b9387eb905a2996
 MISC metadata.xml 513 BLAKE2B de96870c0cc0d4aee45493a502939900d8cd603effacae05b65ceceda7ec121c6e63e1740c2a69d20f2244fd82656516d4f83e0c50a8e2d81ac8d262cd1c4790 SHA512 d528c2eaf9dc0a9a243ed3ec6ceb80a1ce72f4d5f144c2b7c9917d3a84914e896926bdf2c443ae113ccec7c83f37e4c8b284db9af48962f82b7b67f0a95b272e
diff --git a/media-plugins/caps-plugins/caps-plugins-0.4.5-r1.ebuild b/media-plugins/caps-plugins/caps-plugins-0.4.5-r1.ebuild
deleted file mode 100644
index 6a1805fdbcb5..000000000000
--- a/media-plugins/caps-plugins/caps-plugins-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs multilib
-
-IUSE=""
-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.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-double-free-corruption.patch"
-}
-
-src_compile() {
-	emake CFLAGS="${CXXFLAGS} -fPIC -DPIC" _LDFLAGS="-nostartfiles -shared ${LDFLAGS}" CC="$(tc-getCXX)" || die
-}
-
-src_install() {
-	dodoc README CHANGES
-	dohtml caps.html
-
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-
-	insinto /usr/share/ladspa/rdf
-	insopts -m0644
-	doins *.rdf
-}
diff --git a/media-plugins/caps-plugins/caps-plugins-0.4.5-r2.ebuild b/media-plugins/caps-plugins/caps-plugins-0.4.5-r2.ebuild
deleted file mode 100644
index 808268e57c01..000000000000
--- a/media-plugins/caps-plugins/caps-plugins-0.4.5-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-IUSE=""
-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.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-DOCS=( README CHANGES )
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-double-free-corruption.patch"
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake CFLAGS="${CXXFLAGS} -fPIC -DPIC" _LDFLAGS="-nostartfiles -shared ${LDFLAGS}" CC="$(tc-getCXX)"
-}
-
-multilib_src_install() {
-	dohtml caps.html
-
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	insinto /usr/share/ladspa/rdf
-	insopts -m0644
-	doins *.rdf
-}
diff --git a/media-plugins/caps-plugins/caps-plugins-0.9.15-r1.ebuild b/media-plugins/caps-plugins/caps-plugins-0.9.15-r1.ebuild
deleted file mode 100644
index 64f40121bb4c..000000000000
--- a/media-plugins/caps-plugins/caps-plugins-0.9.15-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-	doc? ( http://quitte.de/dsp/caps-doc_${PV}.tar.bz2 )"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/${PN}-0.9.15-fix-c++14.patch" )
-
-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() {
-	use doc && HTML_DOCS=( "${WORKDIR}/caps-doc-${PV}/." )
-	einstalldocs
-
-	insinto /usr/share/ladspa/rdf
-	insopts -m0644
-	doins *.rdf
-}
diff --git a/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild b/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild
deleted file mode 100644
index 18d7a5623ea4..000000000000
--- a/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-IUSE="doc"
-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
-	doc? ( http://quitte.de/dsp/caps-doc_${PV}.tar.bz2 )"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-DOCS=( README CHANGES )
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake CFLAGS="${CXXFLAGS} -fPIC -DPIC" ARCH="" _LDFLAGS="-shared ${LDFLAGS}" CC="$(tc-getCXX)"
-}
-
-multilib_src_install() {
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	insinto /usr/share/ladspa/rdf
-	insopts -m0644
-	doins *.rdf
-
-	use doc && dohtml -r "${WORKDIR}/caps-doc-${PV}/."
-}
diff --git a/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild b/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
index 607d8447c910..f427ec2503bb 100644
--- a/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
+++ b/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,10 @@ RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.9.15-fix-c++14.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.15-fix-c++14.patch"
+	"${FILESDIR}/${P}-glibc-2.27.patch" # bug 647874
+)
 
 src_prepare() {
 	default
diff --git a/media-plugins/caps-plugins/files/caps-plugins-0.4.5-double-free-corruption.patch b/media-plugins/caps-plugins/files/caps-plugins-0.4.5-double-free-corruption.patch
deleted file mode 100644
index a85e41cd1f10..000000000000
--- a/media-plugins/caps-plugins/files/caps-plugins-0.4.5-double-free-corruption.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=418241
-
---- interface.cc.orig	2012-08-11 07:35:45.723235289 -0300
-+++ interface.cc	2012-08-11 07:36:46.656565620 -0300
-@@ -128,8 +128,10 @@
- __attribute__ ((destructor)) 
- void _fini()
- {
--	for (ulong i = 0; i < N; ++i)
-+	for (ulong i = 0; i < N; ++i) {
- 		delete descriptors[i];
-+		descriptors[i] = NULL;
-+	}
- }
- 
- /* /////////////////////////////////////////////////////////////////////// */
diff --git a/media-plugins/caps-plugins/files/caps-plugins-0.9.24-glibc-2.27.patch b/media-plugins/caps-plugins/files/caps-plugins-0.9.24-glibc-2.27.patch
new file mode 100644
index 000000000000..7c688d7f3bfc
--- /dev/null
+++ b/media-plugins/caps-plugins/files/caps-plugins-0.9.24-glibc-2.27.patch
@@ -0,0 +1,42 @@
+From: Aurelien Jarno <aurel32@debian.org>
+Date: Tue, 20 Mar 2018 18:29:34 -0300
+Subject: Use standard exp10f instead of pow10f
+
+Starting with glibc 2.27, the latter is no longer supported
+
+Bug-Debian: https://bugs.debian.org/890633
+---
+ dsp/v4f_IIR2.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dsp/v4f_IIR2.h b/dsp/v4f_IIR2.h
+index a68ecf5..9682f7b 100644
+--- a/dsp/v4f_IIR2.h
++++ b/dsp/v4f_IIR2.h
+@@ -33,7 +33,7 @@
+ namespace DSP {
+ 
+ #ifdef __APPLE__
+-inline float pow10f(float f) {return pow(10,f);}
++inline float exp10f(float f) {return pow(10,f);}
+ #endif
+ 
+ class RBJv4
+@@ -142,7 +142,7 @@ class IIR2v4
+ 				/* A = pow (10, gain / 40) */
+ 				v4f_t A = (v4f_t) {.025,.025,.025,.025};
+ 				A *= gain;
+-				A = v4f_map<pow10f> (A);
++				A = v4f_map<exp10f> (A);
+ 
+ 				RBJv4 p (f, Q);
+ 
+@@ -429,7 +429,7 @@ class IIR2v4Bank
+ 					/* A = pow (10, gain / 40) */
+ 					v4f_t A = (v4f_t) {.025,.025,.025,.025};
+ 					A *= gain[i];
+-					A = v4f_map<pow10f> (A);
++					A = v4f_map<exp10f> (A);
+ 
+ 					RBJv4 p (f[i], Q[i]);
+ 
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index 22a7b96f1a9d..bfa415fb8067 100644
--- a/media-plugins/gst-plugins-chromaprint/Manifest
+++ b/media-plugins/gst-plugins-chromaprint/Manifest
@@ -1,7 +1,7 @@
 DIST gst-plugins-bad-1.14.1.tar.xz 4651852 BLAKE2B 915798f9d07e18b445cae818978def1356299034d14ca2cba8f07df93d5dcf5ed257290bf111298c4f8063b32ceee38dd78c02eae508f6e88956b132740bfa36 SHA512 6969b6c91279fb96bc28acde0284ce980b3982ae0c77820284a903beee61dffa863554dcfadb55de1987404b59c3c7c421372e65dc7b4014fe64a0c91d4ce729
 DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017ad997c4d0ef136845a7ad34d15745d5f1abf4486dda7a226feb5ff6c7c65c8788cd39eb5e9901f3f15a426d79bf2b81e78c SHA512 7282c8941f1eabf7141362bb8e61097b3b26ef39410ae767712c34d7e40779fc22f6ea97a950009fdb6d62175f9a153d435ead8f663cf66cc6af5aac7f2a73db
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
-EBUILD gst-plugins-chromaprint-1.14.1.ebuild 362 BLAKE2B 26e56e0a72f44fe95e247ecb7a2777895dbbfb6597eb8f2d33c6eefe5b0c26d7aa9a94ee86829b28ba4800df5a587cb866d2ec7a8782dfa4a7f9e155ec37b629 SHA512 84eedc5b9fa1d6ab08dbd56ee58432b539f972e60cca0e4d6a6b6a3deeeb624b24194e3143efeff8b4261dc2fb1c8fc5ac83217bd9199fa0e5424cd1c85b135b
-EBUILD gst-plugins-chromaprint-1.14.2.ebuild 355 BLAKE2B 43b5c80032259f180e1e0bd70fec06052bfeb4a2266aebaa74806622711c5849a39ec117ee6e085092cd58fa913d9696e360c278a8b13f56e9e28470ff5c0ffd SHA512 c08b417cd44888dd3136f5fbadc3949f40482317fa0e1dd0ae74eef2113f8f842a722cf0ecfa0ea880498ac2c01e3b0a466a365ac4c9200b2d8f0e2d3db7d7d3
-EBUILD gst-plugins-chromaprint-1.14.3.ebuild 355 BLAKE2B 43b5c80032259f180e1e0bd70fec06052bfeb4a2266aebaa74806622711c5849a39ec117ee6e085092cd58fa913d9696e360c278a8b13f56e9e28470ff5c0ffd SHA512 c08b417cd44888dd3136f5fbadc3949f40482317fa0e1dd0ae74eef2113f8f842a722cf0ecfa0ea880498ac2c01e3b0a466a365ac4c9200b2d8f0e2d3db7d7d3
+EBUILD gst-plugins-chromaprint-1.14.1.ebuild 364 BLAKE2B 451afb6d7f89518fef209069a08127d1d667deae0ef91712a5e5674565fe111caa3df286e1a616fd1cc1bdc2d58d0d6c067576ad4bb46f86560ab44a1f8aa59b SHA512 839912741a2f8210b1e7d41a0af631e69e24031b0dac2beaeeecbf5eb23673ed6d48f95e364de3ec18aaf559d51fcd4291a0e4c6f5dd6f4fb7d1b79cb458851f
+EBUILD gst-plugins-chromaprint-1.14.2.ebuild 357 BLAKE2B 3e14a5b60e283520cbe74a6533b40b216654f9c926b05cc2d517883efc0079712f780f3c905c6868d62b7bbd5eb5e9262c2cf2568c7b9b27dba8617ef3c0ec07 SHA512 6787cbb51af459ad5c224765d38341f0257ff7b709a5d54b5cac4182e74532acd6005723880350755692090e31cd83f1d57563095572cae5dea1e7dd0135f462
+EBUILD gst-plugins-chromaprint-1.14.3.ebuild 357 BLAKE2B 3e14a5b60e283520cbe74a6533b40b216654f9c926b05cc2d517883efc0079712f780f3c905c6868d62b7bbd5eb5e9262c2cf2568c7b9b27dba8617ef3c0ec07 SHA512 6787cbb51af459ad5c224765d38341f0257ff7b709a5d54b5cac4182e74532acd6005723880350755692090e31cd83f1d57563095572cae5dea1e7dd0135f462
 MISC metadata.xml 493 BLAKE2B 2a86d0343178b353fec290f550a1442e2e1492e1e5bfb3bbbbc24a9f18cad04c12c582f5fb3deb5c845dd7633c2b6d0c30566ff86c68bd60635c49d0b46a8058 SHA512 2eba41dd2cd60d1101e79a68553188fd8d6a43711de3121e7ce230c1b09e598d3123aa2b1e65a415af80182848cc0ea17433a39b34d6d6cbeb8aa3f8644eee4c
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.1.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.1.ebuild
index 6b9d7bf953f7..924844fc346b 100644
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.1.ebuild
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.2.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.2.ebuild
index d71c5cabac91..88ac97348a15 100644
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.2.ebuild
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild
index d71c5cabac91..88ac97348a15 100644
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 5f2e483a4650..46ac36ea6c06 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,5 +1,5 @@
 DIST gst-libav-1.14.1.tar.xz 9031916 BLAKE2B 4f8426fd0c91ca9dd99d4d3820cee852610e957b4836b248f285a0d89b202af907f5f5f0ddb0cf2562eca6fb032a45ebe7fe3e6cbe5198f6d6852297cfd08091 SHA512 368d794d88b20fc879178c1984186a9dda7f8717e2e6bc17bd2dcd67be6d9dd55220da617f9872c40a63f5c9b3d11713ff96c8dbb0e4ffffb196f9464aae43d2
 DIST gst-libav-1.14.2.tar.xz 9036096 BLAKE2B 68000c35a1c582c93ad1113941ce17e1c4212e79a5eae627a1c41fb22a9d8fe2d5bb5165abb3ee81e36938b8c0485e2b7ac5f4a4d59199e28cbe0b35d3d85ef3 SHA512 ce8e7eba57b14d522b90c94f933987659b7d6e58e66513b4b3f41a70354a3d0065bb6d077285ed56074aaddff65c3d1f1fa7fb17fb2f75e94fbe814dffa790de
-EBUILD gst-plugins-libav-1.14.1.ebuild 2063 BLAKE2B 6a3a1a99e4e554bfcad0c093796800d05394b9d047fe856067fd78376e99f95f8376e1773b8035205c509c6dd90125f5b442e60836acb8aaab62f1454a03c011 SHA512 db44819fa6a0b71f07cfe04618bf5737ba7f770ff922f2ffa503c8ea702f04ccb2bc88c2e75ebeb4dd0b55343526382880bfd42bf65a413c457dde5ae13c5abb
-EBUILD gst-plugins-libav-1.14.2.ebuild 2076 BLAKE2B d02d8e47f32d85f3d7747b42e9c66c745d2fdb4baeb71c94c315a5eb96e07d27b487adce08049a9ee117d0b8e644e147f6c866b341a147aec069941e5a0b8f63 SHA512 f837da63e773bd13ae0ac8f1a83efa7e13b28f5bc9d782dd596a2b47727e14b849057f2d6610422bf2e88afb32714a5a701a8851d44950ffddb992326bf1bdbd
+EBUILD gst-plugins-libav-1.14.1.ebuild 2086 BLAKE2B e581232c7a38f2db8ce91291bfada3be80e16be6767da9a506e0eb2285f5106acc2580f37a4fd1f66b2546fe3c2e8c73040720a9c813157e4e8db42f71f43482 SHA512 5d423238b219f017c90368d1056f5087cd15e69c9ed171e2d9f6997c9dda63312095bf64a6022cbbcca81a42bca7f2632bd814257e9890910396c1db28f174b4
+EBUILD gst-plugins-libav-1.14.2.ebuild 2099 BLAKE2B 12f6d0fa0015bb9ceed744e3459c0163eda929c4524d4eedff7591548a520798ba868be4d7e442c3fdc6e97bfd62b65fdca7f689ad6e8442b3cebf6bf71c4e06 SHA512 e320e60696af789fcf9360fa8b1ff044bb61b9360336c9d2e284bc4895bd60c893a6e3f99e7408674d1d52b51fe88c7ef4757d5cb5c60b4c0d152044040aedf9
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild
index 2f7753d327a7..36627fa21b75 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,9 @@ RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
 	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
+	!libav? (
+		>=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}]
+		<media-video/ffmpeg-4 )
 	libav? (
 		app-arch/bzip2[${MULTILIB_USEDEP}]
 		app-arch/xz-utils[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.2.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.2.ebuild
index c94b53d700b0..085a01f68317 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.2.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,9 @@ RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
 	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
+	!libav? (
+		>=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}]
+		<media-video/ffmpeg-4 )
 	libav? (
 		app-arch/bzip2[${MULTILIB_USEDEP}]
 		app-arch/xz-utils[${MULTILIB_USEDEP}]
diff --git a/media-plugins/kodi-audiodecoder-modplug/Manifest b/media-plugins/kodi-audiodecoder-modplug/Manifest
index 577080bff785..622b32956a69 100644
--- a/media-plugins/kodi-audiodecoder-modplug/Manifest
+++ b/media-plugins/kodi-audiodecoder-modplug/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-modplug-1.1.0.tar.gz 25619 BLAKE2B ca431badbfa6c7e765543b0e386895bce9ac7a2f6104e72713c146e5097e382ff8e56c1483e4688f1e373c2f6e97a76d95a78e2cab26141116c224a5c5f1e10b SHA512 38ddb6a86019cba493790df6a09de553fadec84943de98dd18dd8bc1b1741b498fc1e621adfb8d6b2dd983e7bd7014951cdcb8bd5d82c980594363c6626cff5e
-EBUILD kodi-audiodecoder-modplug-1.1.0.ebuild 699 BLAKE2B e4b2fe66fb8612fa4031ae9e6eb382bbb3f3f3af37fa193a8862bd5cf645d5da203f3dafa726bd3ae1b5069991325feaa47c54ef0638511f1106b4c1b9e746df SHA512 50286bf06eb6322ee3d3652bd5cab47d4c66ad3af736da8aac3a512c8b961ad7e185e83641f51e5dae4bd16b3174490f2578b168635953ffbeff7534e013a68b
-EBUILD kodi-audiodecoder-modplug-9999.ebuild 699 BLAKE2B e4b2fe66fb8612fa4031ae9e6eb382bbb3f3f3af37fa193a8862bd5cf645d5da203f3dafa726bd3ae1b5069991325feaa47c54ef0638511f1106b4c1b9e746df SHA512 50286bf06eb6322ee3d3652bd5cab47d4c66ad3af736da8aac3a512c8b961ad7e185e83641f51e5dae4bd16b3174490f2578b168635953ffbeff7534e013a68b
+DIST kodi-audiodecoder-modplug-2.0.0.tar.gz 30001 BLAKE2B 9ce90103a9b50a37c3f6c8671ecf9986f2b31320fc483dfee6d97331cb56829a9641c8cd1efe1fa9edf6ada360bc1b10bfcff0022022f4ba097a191b52dae0e6 SHA512 8f1cbd95b4fd6dcd560dc615c161e733d7b3413a80abf91c19eb59137e7acf250c9bfd5561a722ddeb52afcc4cf7e2ab0d4f6d8bc5143ef18e0b2c431635063a
+EBUILD kodi-audiodecoder-modplug-1.1.0-r1.ebuild 706 BLAKE2B 92862756b7b7044744599432610e183623d3cad30fa27d087951ee3cccc0a7cc2f429e573e2dd6e257b5d609c907b7be1a1ea82ed380e4430ab7646b3a46d6a2 SHA512 fafce743382edf211c6787e2da919df3ec0f22820e2df2c3f00de683d78a3c5f70a4ebf3f7b3dfeb9f9d744034064164cb2aaa6593eda8a2a9d1085843f9e0df
+EBUILD kodi-audiodecoder-modplug-2.0.0.ebuild 746 BLAKE2B 6100bfca367bfb618d12a59bedfcb19d3930d574dbb502815b7ea04ae1413532369a8cf510020f318f911d16d17b073c6439c2f991b70c1a4d3c2fa6a17eb4eb SHA512 cd60e7b2c102078b7f49b851a221ebc3602fb41c8876947b88efd75e2931369d92163802c62e40a7e768753c53b089ed5a29e86908796384914b236fdb28792c
+EBUILD kodi-audiodecoder-modplug-9999.ebuild 749 BLAKE2B eff46be6ffcf76b252fe8c12c6848d65566ba80a59645dab903f31fe251715329b358b84cf1901b2e5017975179cb882c587e4e3c486dfaae9bcf5eefcc3ada4 SHA512 fa512443264705e12e8af26dde7f4227f9b38a66f6f1b90d857044513abd45b41cefcb969f5001feb27528932f08d0de850a62d1fc603de0ad47e6f648255ea8
 MISC metadata.xml 442 BLAKE2B 7ac417393f7d1a671942b34984b98caf86a36c6b58ef5ad5eb49806e47ba2e5efad0f208c81343fc63c1949831fb9f8e5b83a16138d7a607ca900a0dce649709 SHA512 5b54a7fba19f53f9b07621207d7c71a95ee934e453bebd00a8a9c4f44831ac51f4055c033872ae937b9df9a9aba6d708bc067bb89f68284fff730dc349c2949b
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0-r1.ebuild
index 276bbf03b5f6..eee4b14ab81d 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,8 +27,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
+	=media-tv/kodi-17*
+	=media-libs/kodi-platform-17*
 	media-libs/libmodplug
 	"
 
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.0.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.0.ebuild
new file mode 100644
index 000000000000..e80d840de639
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Modplug decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.modplug.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	media-libs/libmodplug
+	"
+
+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 276bbf03b5f6..78e9c1d36776 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,10 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.modplug-${PV}"
+	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
+	~media-tv/kodi-99999
+	~media-libs/kodi-platform-9999
 	media-libs/libmodplug
 	"
 
diff --git a/media-plugins/kodi-audiodecoder-nosefart/Manifest b/media-plugins/kodi-audiodecoder-nosefart/Manifest
index 089fa6522cbc..06b326948329 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/Manifest
+++ b/media-plugins/kodi-audiodecoder-nosefart/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-nosefart-1.1.0.tar.gz 59921 BLAKE2B 617b001325a43e25ab6541534a33b7e43d4f67d754bb741e0172705b27413bdc98a93afbcf3e00bae25f1d4709f589a9588d70109a1c4c2cb89b4d8be9dce2d1 SHA512 c85768e3b7b31607429d85f6d2f9254bb42a4500a0e42b0a76d953a87b6d2275cef4ed922eb7a2af51770b90cb35403171df6258dae9157683be0a07304f6e6b
-EBUILD kodi-audiodecoder-nosefart-1.1.0.ebuild 676 BLAKE2B bfcd50bf0b1c3f2e33c0483ac49a24ab37c3d168300b54d80e0fbc27f1f6a9b0c902fce4d7e29521fb401c4514a6724bff483e28cd76597cec7d836d43649eaa SHA512 d4bd5c32269f323d4233215c4701fe34e892b5d38ff73f14b2136921e6a80711d2d8333c23adf5f9f56cdabe5219ff9680b8f5f828aee3deaa845213347d46b7
-EBUILD kodi-audiodecoder-nosefart-9999.ebuild 676 BLAKE2B bfcd50bf0b1c3f2e33c0483ac49a24ab37c3d168300b54d80e0fbc27f1f6a9b0c902fce4d7e29521fb401c4514a6724bff483e28cd76597cec7d836d43649eaa SHA512 d4bd5c32269f323d4233215c4701fe34e892b5d38ff73f14b2136921e6a80711d2d8333c23adf5f9f56cdabe5219ff9680b8f5f828aee3deaa845213347d46b7
+DIST kodi-audiodecoder-nosefart-2.0.0.tar.gz 61006 BLAKE2B 8c3499b8820eb124f6532f722fae39c10880b31d58dce81a1170ae18005047b2ecdb7f9963e1a957de61beaf4a89d682580ea62e739bdc3045e0cd6402685394 SHA512 8dfcae6e81553bccb093dac2aefdbea6e405ebcf3c3505b4647a4970f46ec8aa2f45690a0fd73ff356d074c86c670ab0a60ff5a049dd1e54de3100457fbae935
+EBUILD kodi-audiodecoder-nosefart-1.1.0-r1.ebuild 683 BLAKE2B df56a62216666abde98c9750250b2702cc1f4664ab2ca24b09344e88f362a0448168eb197f408f82f2d954311bebf6bf596257f13b78c34f9d05eadd53634669 SHA512 cffffb04e7b7b91be4b5e3a51669c8b3c8f96c7b33e2396a8314c518b865a33ff05760f9a538c23313070d7bddda89fd94e2182f411d62a6c5a554c2339fe16b
+EBUILD kodi-audiodecoder-nosefart-2.0.0.ebuild 723 BLAKE2B 710cb2781dd91060752684b0ff799c13bfabb5ae90c6b420008d929257291a6900af663935c4194d4d0a5e6e396a84e05748febb0bc393864bb44da55186c5f3 SHA512 b929e8f7c3b793755b3a43452b3023215c891500f0455678218601aba2e67af4666ccfbc1ac6ce2e380a3c8d39130318e4269acc384d5dc8a44cc4d8fdf6f92d
+EBUILD kodi-audiodecoder-nosefart-9999.ebuild 725 BLAKE2B 1e61761fa789b3c4e900828b718fa45225b2a55115069dde7cfdabcb2062478efa0061cc1c539f574879ff474231770a9c36da8b968a8700fa5db73cb3e67ede SHA512 beae47b0245e11940a3896876309b7e43497b0f85048d91230683926c52f7aaf7833cd6c931f839213d7b511ab077491dc28c169cd1dff9f03a7c06701388b0a
 MISC metadata.xml 444 BLAKE2B f2946063cbdf62c0e0eddbb32b3a9f42a7e03c52975934a191a19e0bd59c97bf8bc70b55eeaf45ad3cad54a7081d238cfbbe1e235cc23855d8a7404cac2d436d SHA512 9a6295c8af39d75437b1f56b8a91e234ac1578110e1e64b52ee5ade240bd43764a52ec843735e7e3814fea6a662937315db4ae5e0988c9c016c1f72ab12fe91a
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-1.1.0-r1.ebuild
index ace5ee08839f..b043af12512e 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-1.1.0.ebuild
+++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,8 +27,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
+	=media-tv/kodi-17*
+	=media-libs/kodi-platform-17*
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.0.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.0.ebuild
new file mode 100644
index 000000000000..5bceea5784f2
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Nosefart decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.nosefart"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/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"
+	S="${WORKDIR}/audiodecoder.nosefart-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+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 ace5ee08839f..1266bc7680ef 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,10 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.nosefart/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.nosefart-${PV}"
+	SRC_URI="https://github.com/notspiff/audiodecoder.nosefart/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.nosefart-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-audiodecoder-timidity/Manifest b/media-plugins/kodi-audiodecoder-timidity/Manifest
index 0d9c44cac7ca..adbc0f9048d5 100644
--- a/media-plugins/kodi-audiodecoder-timidity/Manifest
+++ b/media-plugins/kodi-audiodecoder-timidity/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-timidity-1.1.0.tar.gz 1785627 BLAKE2B 4adcb4c2331174d5f023b5698b5fa2a589df81575eb6e9b8b162f9054aa673ca49d516b94eb07b6c769f9301f6c991cfbbf9cd50eaea12d8580f3db97111d8d3 SHA512 d6bf19761a60306cfd89bf4cd654f8e6c6725c29d15da80bd22236add62051671cde1363ea9df1e5488cc8dcf8c31fc8b432466480d44af0141e639f5cf36a88
-EBUILD kodi-audiodecoder-timidity-1.1.0.ebuild 654 BLAKE2B 17a8b59198b4b55f51d06b4530fe07c951ee401104737fa39cdb5c7b12cf97636e64da6de9dc6ac6fd9684cb61ecbe4546a87bb5c274b39f0321e5c9821e1046 SHA512 283e9aa8bede20c30297f3aa7b859a6fb9bc5e0759943604335f43a671d0de3422b09b22f560d2f3fb252cde93f77a5ece7f1410804f4272e032c31a23e8a216
-EBUILD kodi-audiodecoder-timidity-9999.ebuild 654 BLAKE2B 17a8b59198b4b55f51d06b4530fe07c951ee401104737fa39cdb5c7b12cf97636e64da6de9dc6ac6fd9684cb61ecbe4546a87bb5c274b39f0321e5c9821e1046 SHA512 283e9aa8bede20c30297f3aa7b859a6fb9bc5e0759943604335f43a671d0de3422b09b22f560d2f3fb252cde93f77a5ece7f1410804f4272e032c31a23e8a216
+DIST kodi-audiodecoder-timidity-2.0.1-Leia.tar.gz 1787950 BLAKE2B d0547f80eff154f2129d91077e25b0f51d19ee66ff371c7a11d4a7d0e3f479506961ea290a9a71643fd4a707dfe1ae29de7b5ed5fc7ccfd6e1d5625cf6d7138f SHA512 91db2fa954d441901ebce35189d642931882f5b20ca815af45dce67d3dbcb201a8920fb76e0e8074038f476a1dba1192cba28de7c374c76800cc50161f6915f1
+EBUILD kodi-audiodecoder-timidity-1.1.0-r1.ebuild 656 BLAKE2B beba8a19bb335695156398f9d662174073e596a70994027dc2a094dcec7e2b56ce2bdd0ecb204ca3368cca24215444a0b607c1d727d17cbde79a8e3de4140c09 SHA512 054da9c730713c80101442674ae5dd8430811982907bca2e4d5de5452864aa4c35b6b75d7c2cd96eb7debeae1721b7775223a977b0cce4defd3dffe7fb91c268
+EBUILD kodi-audiodecoder-timidity-2.0.1.ebuild 708 BLAKE2B dbe849e00740a969bd20c0d281fd5599239ed989585af2fa0fc62ca2f574cbf44419b04131d3fe7cd9fa9c6e1ac7582ca20d41c74c99325baf4fb8ef842f98fc SHA512 fdada114d5c02b47f1b8827f38360ce740527e124c43f8c9cd4dafb98eb8dcfbaec5dbce238defebafa33c9361f644631cf4b48972af30047b9078fb22607703
+EBUILD kodi-audiodecoder-timidity-9999.ebuild 709 BLAKE2B 8f59b4deb65f9955ed356860e86d7146d030a96946f57494790d8a13c9df95f3d9223e4adc0257fdccfe668eaad3655e759e5bc2a77039e6b0e007879a913797 SHA512 b4fd91cf8aa918bb97d271d87d893107182b43ebe781ba853e35ea1ff4e2d665144ee87def9ab641e96f773464413a17959af774544a3e01decffb5b56f8416c
 MISC metadata.xml 444 BLAKE2B a8bc29439b6fada05640522f57d0c97d905ce14abee08f1cff2ab2e1fc36c20ca4491e836b9092ca4d0c7a2b9e66e66d6882b1c5c77b4973d038b294e7d82503 SHA512 924f94fe1923314c5ab70873705dd30874bdf52c5f2f1d13282c140b0080a71a483206c7554dacf0c4dbfcec9f4f4ac340e024b32fd9286f8ce69d52caa8aaa2
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-1.1.0-r1.ebuild
index 581fe93158cf..c539371a7f9a 100644
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-1.1.0.ebuild
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	=media-tv/kodi-17*
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1.ebuild
new file mode 100644
index 000000000000..9f8206d9bf2b
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Timidity decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.timidity"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.timidity.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/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-18*
+	"
+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 581fe93158cf..9bcec2d315b5 100644
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,10 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.timidity/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.timidity-${PV}"
+	SRC_URI="https://github.com/notspiff/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
+	S="${WORKDIR}/audiodecoder.timidity-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,7 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index 2ddf10dc6a62..a2e4a5daac56 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audioencoder-flac-1.1.0.tar.gz 18508 BLAKE2B 35c85811b4cc0c37bc14d28afc3c8189ee694bd6be0a4c547c0a930398cbc404d687a45b575e77f9b570170acad1df09b59d9c5823202fb4bc9dd19bcb9bff6d SHA512 1a89cd5cd02305b4121582e06a7e88dd745133fa0676d01a9c5f15af025050875a9fa59e74efa71bc5a9d85cb845050edecac507ccd8f4f1f3300016e74331b3
-EBUILD kodi-audioencoder-flac-1.1.0.ebuild 658 BLAKE2B 6bf08ed7a585b27ce4bbc70659bf496ab414b4296e19476173b2e7388f552bc1426bda8d0a9aec2212ee0fd924dcda72ab559fc7293ad2530384575a27e8ce5b SHA512 549a5cc8c1cec8666bcf9dd38f3fc0e9dc101d9a4e4be163f5529031b6792352369125549286680cc61fb8795ee1ea5e98283984ab7123dd6398ae945551eec2
-EBUILD kodi-audioencoder-flac-9999.ebuild 658 BLAKE2B 6bf08ed7a585b27ce4bbc70659bf496ab414b4296e19476173b2e7388f552bc1426bda8d0a9aec2212ee0fd924dcda72ab559fc7293ad2530384575a27e8ce5b SHA512 549a5cc8c1cec8666bcf9dd38f3fc0e9dc101d9a4e4be163f5529031b6792352369125549286680cc61fb8795ee1ea5e98283984ab7123dd6398ae945551eec2
+DIST kodi-audioencoder-flac-2.0.1.tar.gz 20523 BLAKE2B 6ef8f51df7d0c0113389508e3d295b9adf7757684e42ab01ed19f4837881b2f9adfcfd6950f01fb0de54a772a7ea907afd3c4595b0df4b8fd2be647149a5a510 SHA512 4fcbfd4efe52b6983622367eefbbf09a9392c460160d6b4659df0e8b86a565a23f140a22728a2e40b033ad8cdbab68b786e90120dca034dd690217f8ba2b5c01
+EBUILD kodi-audioencoder-flac-1.1.0-r1.ebuild 660 BLAKE2B 50950c9cc03cae3969c4115ba8314ab6f3a3928b1c05e7d2037359c7cbced6a66c0e5615a3f26ab920e4936b2109965365538113a756e624e6f390f0b0625603 SHA512 d4f02a799422b55c5e5433eb135ccde8315a56d412ab8aa6f9d1fcc92bb8796a86506f871d98baa9866ad5170712a841e7c3ea74d1bedffd98ac85eedb72629c
+EBUILD kodi-audioencoder-flac-2.0.1.ebuild 660 BLAKE2B 18fb51dc940f5ef49f33a29304e0b4f4ced49a6337c9a46eeac530474d4dc84a8cfd43513ed14b6ee446e4d7b2efa584dd2e924ac8f396ddbb6ce7325b471785 SHA512 954d4337b5ddc2cb0e20c8ca658b9b8b520638f7a613dcc3265a884cca2f2c28042e9dad96a875fab1cac00e952e8dca17575af2bb3b8b76ed065ca91b95bd79
+EBUILD kodi-audioencoder-flac-9999.ebuild 661 BLAKE2B 54e3cabc5b1346cc543819651a904dca3f12eb719da6e4dd1dc35a847445e90d1789616e6fdb30d20a87b610538cd6b3b0b67ac5ebfbad77d9007462fb39a817 SHA512 7aca5a57f24763ab1ffea13a9eef71a40f392d9dd109ecc16885de4060b8f245fc9201f3153b6339da8bc8cb8c49559367159fc695a2e2d4a3e82309faa351ed
 MISC metadata.xml 432 BLAKE2B 08bd867e97f6d3b7a103a557f95103159b2df2be3ef336f02d1f2551acc722d59331f981d4069451e33439730f0e9648cabb6c2f8559e214b421467759202c3b SHA512 2ef0c92e158ae0677b431163a8ca974a90c9d8acdf9fc95c563b152f1250657fcc0d64a212ff20ddd46585284ffd2e732088426b1e033b07862bfa889b7a4058
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-1.1.0.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-1.1.0-r1.ebuild
index 4ed77262818c..949c5bd8e25c 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-1.1.0.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	=media-tv/kodi-17*
 	media-libs/libogg
 	media-libs/flac
 	"
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.1.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.1.ebuild
new file mode 100644
index 000000000000..68b701ab3ff3
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.flac-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	media-libs/libogg
+	media-libs/flac
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 4ed77262818c..29993fc9d89b 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	media-libs/libogg
 	media-libs/flac
 	"
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index f15d8b61701a..e8b20b2660c4 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audioencoder-vorbis-1.1.0.tar.gz 14964 BLAKE2B df97adfd06660f95d060ddc18105a7279f09488f16ba2fd9ef640bcfbc92e676a9ff3b782a4aeae98a8dc9b169b4197221b5136798969995ceea85bdf569950c SHA512 db07cead7c814003ce231e650b9e66718b9dc3860363f5d1019e73ba3763b1e8d6dd68d0e4f37b3f0eafd6504b60f69ddd7414f8e790956036a350196a360408
-EBUILD kodi-audioencoder-vorbis-1.1.0.ebuild 674 BLAKE2B de3698fa8b1b8e69e87e47bc727f38da6a95b71898ce49ae5a3b1cf1e2e85deb61b632efb5a36c4c32ac216ca7797ff2ec75c8b42e62ae63da5121e04d1ffb67 SHA512 72bcc391de5145c77b6ea05a52c72a1b9e00a2ff56803a3675f774c8ecf4859a42aa0a49525234e72366a019e550455cbfaf529d92ada1e79e1a27994fa501a4
-EBUILD kodi-audioencoder-vorbis-9999.ebuild 674 BLAKE2B de3698fa8b1b8e69e87e47bc727f38da6a95b71898ce49ae5a3b1cf1e2e85deb61b632efb5a36c4c32ac216ca7797ff2ec75c8b42e62ae63da5121e04d1ffb67 SHA512 72bcc391de5145c77b6ea05a52c72a1b9e00a2ff56803a3675f774c8ecf4859a42aa0a49525234e72366a019e550455cbfaf529d92ada1e79e1a27994fa501a4
+DIST kodi-audioencoder-vorbis-2.0.1.tar.gz 15878 BLAKE2B 66bed287d8af393d914678a3e8da13e73d969fe8dabdaa3ed3c579851f40456d12f32f7edf416eb2a9b8734a2868ed8c0d4eb0a22b70fbb74167f3de1cdca2e5 SHA512 ed560a014d135dc9bc57f0185afd3fc4636158309eb4029b0fa1392ef2109c7795902eb37ce051d99199e5834d530c67b63362fdfb9db500a27e10c39d49e1d9
+EBUILD kodi-audioencoder-vorbis-1.1.0-r1.ebuild 676 BLAKE2B 67c8dd994662554a3a6f7c6c5979ff1ca410de4619a7a6fbbe394531b96424d91b4704c23af5032252291a8eef61839dda95d4772ec39cdd7297bb0599203d18 SHA512 cceabc4aa4362734b44511207c8fdbb6bef546277c0eda87529d0b4b9652ccc959d438256d9c749c9c653cb78271648b52ced33c87eb7850e45ef43ed68ebfd2
+EBUILD kodi-audioencoder-vorbis-2.0.1.ebuild 676 BLAKE2B a88b02c3d1675debe95a216a9f798fdd9d5a30963807d89869590fedaf4ef2fa6d2e69b52c540519a9bb18abdd4bf783d3b0afd0f185a74ee90fb02f6126664c SHA512 1d4172c6815c00d4ae4cb27a3f0616b39911defe8f0bc3ca2bfbbc14e28e6aad8d807759f220ae77424d80585cec21451a8229758eed08ecec710ffc1d2f345c
+EBUILD kodi-audioencoder-vorbis-9999.ebuild 677 BLAKE2B 686fdc05b819c57ac78fcea264c6f6c2da6bb61082943abfa6611107763b046b04502be68e6801b0a7cda8626927dd785bca0de5edf16a5ae209da01d9d5d51e SHA512 39a5479aa92049f2cb17378d83b194249a86b15f4e72ec6a2160178c878f7f37cdd2eb05a754ad6c4a03c08b9e8eb0f3d42fa2c91f0dc3e1a567cdf6c91318a2
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-1.1.0.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-1.1.0-r1.ebuild
index 50b421d042d6..ee8720fcd3b1 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-1.1.0.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	=media-tv/kodi-17*
 	media-libs/libogg
 	media-libs/libvorbis
 	"
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.1.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.1.ebuild
new file mode 100644
index 000000000000..639f30b3562b
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.vorbis-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	media-libs/libogg
+	media-libs/libvorbis
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 50b421d042d6..45b19d3b5cd7 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	media-libs/libogg
 	media-libs/libvorbis
 	"
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 8a23f9bc72f3..036e79c43f9a 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -2,9 +2,17 @@ DIST kodi-inputstream-adaptive-1.0.6.tar.gz 556505 BLAKE2B 0b093850cf61ed75627d0
 DIST kodi-inputstream-adaptive-2.0.19.tar.gz 881342 BLAKE2B afa1341e9f45d5b97338d21359e4527c3a19ac8ca30066ea2c83ea0eb8e2a34a72bc179cfc222612579ee1b1be12bda52325b3f32c85b53c7a9cefd8461d238c SHA512 0453998749df691071bd54e22eda8042f15f0ab1a11b04a260c7005048b533b51b6c82311bcb364fb10e68816512610a08db5331f974a042bb8967939d759d99
 DIST kodi-inputstream-adaptive-2.0.20.tar.gz 881743 BLAKE2B 210b23fe42a262696b2dc10efeee5303b3c859a5d1cb4a94cb3628f6d2ca17fb29d170c728a51e1ea6767ecaa79b2c56831169d960da569fe71f18fc474cb2d5 SHA512 51d65fc83f50f7544198666123eb82bcd55a6524b7bbbec403375013264d24ecf8c3f326c815df98f77458af121dc4d81e863cd5f6b9ae49a1fcd50207a37bbe
 DIST kodi-inputstream-adaptive-2.0.25.tar.gz 881743 BLAKE2B 210b23fe42a262696b2dc10efeee5303b3c859a5d1cb4a94cb3628f6d2ca17fb29d170c728a51e1ea6767ecaa79b2c56831169d960da569fe71f18fc474cb2d5 SHA512 51d65fc83f50f7544198666123eb82bcd55a6524b7bbbec403375013264d24ecf8c3f326c815df98f77458af121dc4d81e863cd5f6b9ae49a1fcd50207a37bbe
+DIST kodi-inputstream-adaptive-2.3.10.tar.gz 484101 BLAKE2B f811933ad283ef824a6b663aed2752dee4fa5da9851e9919c99157ab0d8a760ed7f8db23f6b8d473433d57bb20d44f53992e8ce938c19cab97bd1e88ea89e215 SHA512 bb18d61b134ceafc94879d3fbde5b0f8bff86af70283786d45cf8ab5e77f9b0610a347405dc8f5761e58c218dc26282f9091cde96284e37683f2e9792141b0dd
+DIST kodi-inputstream-adaptive-2.3.7.tar.gz 482344 BLAKE2B 40b3b70799ba57c36c11a0dbd29e2a0938e9cfc356994005fc894a8454f310c3fc454e024f96cacee031cb141d0c7697cf852f7e604693d495e43a6232ad0c5e SHA512 ae344350b0df188a1adfbd5e7d72a473d6dbac35a4f71cba2646d2190009dcaff0ec7a802d368a0a15fa69b2d08130664cb5985b19cd65938c36c756b113919b
+DIST kodi-inputstream-adaptive-2.3.8.tar.gz 483567 BLAKE2B 603c56662cadbb95afca8b7cb7dd7902082e27814148580389c3d58c626ce1b65635ea0f17636af2dc654cb7691bd431888d37880d2c87d55f4dea47da15c3a7 SHA512 277535556bbb9f430b04a4ef80a519f18e4a6082b197cceee0a8c10a4b35b8d3eed5d9f30d1a15743a4637d93ffcf43f50aa9b484d59ec86ba6a922a0c0acb80
+DIST kodi-inputstream-adaptive-2.3.9.tar.gz 483983 BLAKE2B 98c7862c66dde1a8f72ce140cd3c5b290f898b9f5a75060ff3c00bb36ce4daf1704726b58e102b6b78ce67f66b01b4ca91779297cf65426323430a28be02b12b SHA512 8875162308aa5a9e259695d5dc0059725eeaa565baf3309470a87e6795e78aea7d0485eaee6aaa48247a8e0d9ebb3fa9e81b2d1e06c024bea5d6cf66e732bbee
 EBUILD kodi-inputstream-adaptive-1.0.6-r1.ebuild 712 BLAKE2B 98e7767a0fb45a23133bd6f19fafd54db7a6523785f3e29a8846ee1cab2e777e32242aba6367007aa6832d32753421d605e2e48f1f3d995911383197a034a138 SHA512 c06736459fbc7e161837bdb0a102c25640c2f33283394b3dc55dfbf0441e039ae57287e40282be3aee4806e06a73426223c0b3fc0ad32a83016d244d56fa358d
 EBUILD kodi-inputstream-adaptive-2.0.19.ebuild 799 BLAKE2B 3698cc34e454d7ad3c0b817a1210835bdb8acb05a6bfe90800a00b79bec02934c5584a4261b48d29b2071c20a5a3676787807c6854fe0a05f49edb539ea87a56 SHA512 36b57bbffead2f2bfc9c7e212423224e532f7f7008a4ae7c661de49caf5417c1ddabdb79ef9735a4a068ecafb378858c00119253d3b9090faf86c3f3ebf88f39
 EBUILD kodi-inputstream-adaptive-2.0.20.ebuild 799 BLAKE2B 49612b21ce2fce4f3fd32f5f15ef872ac3738bbee99210e68f68083e413c2bdc6a5eab012fde212e1ec6ab2fd998214a9ad30162ff60aebe52611892afb6ec4f SHA512 a088a71d77ced70bf1e697412f56f92ae3108d2e88a5a3cc1855b35ee89e2fd603f325e5efb70ceaf74af05b0003e9af55aa6511cede51195dcf9cb80e264336
 EBUILD kodi-inputstream-adaptive-2.0.25.ebuild 799 BLAKE2B 49612b21ce2fce4f3fd32f5f15ef872ac3738bbee99210e68f68083e413c2bdc6a5eab012fde212e1ec6ab2fd998214a9ad30162ff60aebe52611892afb6ec4f SHA512 a088a71d77ced70bf1e697412f56f92ae3108d2e88a5a3cc1855b35ee89e2fd603f325e5efb70ceaf74af05b0003e9af55aa6511cede51195dcf9cb80e264336
-EBUILD kodi-inputstream-adaptive-9999.ebuild 730 BLAKE2B 895d00c8dc5d433b7e786a0a6accfe620e45689e2a7c9b434397a3a5fde511d85a83c7714147f828db8bc56887f98d7d0d77b6668def7bb311c17f00d2a8f1a8 SHA512 2b5f7e3cb3960e2fe7f91d8c68b4055fb7ff852147f6d7d0fab7764e0a22644c3d2cc4319dc50c6a44e57afac0a7cc5f3c1171893bfb6cf61a2e2d687633c31c
+EBUILD kodi-inputstream-adaptive-2.3.10.ebuild 724 BLAKE2B 5ea90abb612d6a36a1ff0ce4a436e15061f7a327fdaa57ea3be7e8c62e318d26a4a2781f9e1a117d8deca548fb2c57c5f32e1a8ae515f495b18d312eba4832c4 SHA512 a7a099c05e52555bdd09401b01ff1c0bb6ab716260827a394c22466a081b9c5ba9167a67cb851a8042b226eb8f94582e53f359f287c5088223230f4fa3f4b41f
+EBUILD kodi-inputstream-adaptive-2.3.7.ebuild 724 BLAKE2B 5ea90abb612d6a36a1ff0ce4a436e15061f7a327fdaa57ea3be7e8c62e318d26a4a2781f9e1a117d8deca548fb2c57c5f32e1a8ae515f495b18d312eba4832c4 SHA512 a7a099c05e52555bdd09401b01ff1c0bb6ab716260827a394c22466a081b9c5ba9167a67cb851a8042b226eb8f94582e53f359f287c5088223230f4fa3f4b41f
+EBUILD kodi-inputstream-adaptive-2.3.8.ebuild 724 BLAKE2B 5ea90abb612d6a36a1ff0ce4a436e15061f7a327fdaa57ea3be7e8c62e318d26a4a2781f9e1a117d8deca548fb2c57c5f32e1a8ae515f495b18d312eba4832c4 SHA512 a7a099c05e52555bdd09401b01ff1c0bb6ab716260827a394c22466a081b9c5ba9167a67cb851a8042b226eb8f94582e53f359f287c5088223230f4fa3f4b41f
+EBUILD kodi-inputstream-adaptive-2.3.9.ebuild 724 BLAKE2B 5ea90abb612d6a36a1ff0ce4a436e15061f7a327fdaa57ea3be7e8c62e318d26a4a2781f9e1a117d8deca548fb2c57c5f32e1a8ae515f495b18d312eba4832c4 SHA512 a7a099c05e52555bdd09401b01ff1c0bb6ab716260827a394c22466a081b9c5ba9167a67cb851a8042b226eb8f94582e53f359f287c5088223230f4fa3f4b41f
+EBUILD kodi-inputstream-adaptive-9999.ebuild 726 BLAKE2B cd3693fd8b4832ee1a9d7aa2841151cdf799b09798566e7ada2bccc558cc4577db076f2fcaa7adea8f273148bda81d55a78e5e7a8f9164704797f5efce05e5da SHA512 0ca52c003def92bafee5c0865aa6c413ff94531c2a804ccd9b4691418265a101929f3b25d2bd1ca94de16c030ac5d8b5a1985009bc1af2174181781b05786399
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.10.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.10.ebuild
new file mode 100644
index 000000000000..4c3d3f943e54
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's 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"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.7.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.7.ebuild
new file mode 100644
index 000000000000..4c3d3f943e54
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's 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"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.8.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.8.ebuild
new file mode 100644
index 000000000000..4c3d3f943e54
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's 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"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.9.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.9.ebuild
new file mode 100644
index 000000000000..4c3d3f943e54
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's 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"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 2764806685e0..f7b4692c6e48 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/inputstream.adaptive-${PV}"
 	;;
 esac
diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index 88a13fe31052..e20627b43e29 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-inputstream-rtmp-1.0.4.tar.gz 7271 BLAKE2B c76b46fc1ba1bbe45084071ee0521b8f421a87886723abce3103867f8c542dbee364c9cb64a3e7237c59cfcc9afd910bb4ba5b749d5e1f6efa4ac215b1ced26d SHA512 659990b2cbe6e9119c650e151aaae0ccd33f8b9f5d6efd1436f4cb6c78beb51c8fae528b844278348066e1b10fe2a7fa6c05e32b54be82f5a750a5a14c8bd9d2
 DIST kodi-inputstream-rtmp-1.0.5.tar.gz 7271 BLAKE2B dfc7a80684d0c872761baf4e8603b491b6530cb0e8a5aad782f18165cb15ec54aaf7557b877eab74c87a46d68481aefecde2f0b15fc748c5a7800593f9033a45 SHA512 7a58ec265586fc0ffc8b1021aa1529d171c8ea14202f80b443d51dbfbfd8f0424a2b5f94687d302a3681e2931ac268e89e8d2e82635ac5b792cc8c9bd8f020af
+DIST kodi-inputstream-rtmp-2.0.4.tar.gz 18259 BLAKE2B 714090d52b1e46e79b88b34b3a400edb444668be2856eb92b61769ecec802be4a7fc1ab73380febbf0cb277b6a1758f2f4f81efb6d1c6c1d266691de6071f7cb SHA512 ac7a7f3f40f4c7d4ec176299ae0d8dd389f1e041d6633a65190e7e8a0a87e87142ebf4f80a36b7429524f7d1571ce5d1708ac753edae695b1d1d84de73e5d88f
 EBUILD kodi-inputstream-rtmp-1.0.4.ebuild 659 BLAKE2B a2b0e2a99fa914ae03ab14db0f6d0aea5ef561c1bcf4d8885751096d0df4f99250388168066c391c24df2b56c60275c55045e1fb0a35d9484201c21c8079ef01 SHA512 4877df994ca70060b38976fa956ce5e8bfc196dc17c08c79e8c437468a7885fdab7752e9c6a550b861a84322b82d25d186d462f5ef7c613bc5f7fc931bac935b
 EBUILD kodi-inputstream-rtmp-1.0.5.ebuild 659 BLAKE2B a24a3762a845bfcf1f4096962c2fdd4d69101cda354ae3ff8436ccaa965cf203b6d5b102771112468cd86bca6b722ac909c73e2571a3d2d496d2e95ffa9109cc SHA512 956a5fefa57ad78b53e7ff85ee65e581e8abaa37c3e15ea3dcfd67c23fe0d5d2bda887e9e1c0a17d42e0a6e71e5117ae19689c7d1ec3ba1a5812d01f118c14d6
-EBUILD kodi-inputstream-rtmp-9999.ebuild 660 BLAKE2B c9d2990e123ae0b476a4d833bd3829f6d2f6f19e9fb5f2b039cf4ab48cbf4a329d211ee0f2e87cb1469fd982fa404ed4097ff90af6da9deec644761e255ec9d1 SHA512 2c7ae4993e870fe31b414e5015b501dfb242bb7f57dbfd8f107dab88511be575e9fd5f5e3134066d023c61a87dc10d31002bfd28976cd38c7efb114c235240f4
-MISC metadata.xml 437 BLAKE2B ee8cee756e2afa1a07e2bba7bf68d6b22fa8fce79860b79a215db68a2f39f84e8d42dd49146941c4ea4c419f6928b30e097963e825253523b969c159a87f645b SHA512 fc9a96c9a2889e0f4edd80638ba0dd50c4272660f3724ff170c4b34ac71824e8e2b32829826bef8efc2327f6aaa1b694a73049103cd2e772f17324eb05b565ff
+EBUILD kodi-inputstream-rtmp-2.0.4.ebuild 684 BLAKE2B f8f25f5846d5576b656555155f213c817a18de0c20cb0a4c55952d694dc2e21420c5b8e21813c2744dfe23877ea408c3876efe66fbbc2e54642d6eefd5686c5a SHA512 39147f7f41ab05b76de6c4aa800b3ea292a6b4dfa6fde6d322f30822ba8319f0f08e9a090c4b45cc5d3bf59ab0fb0b5c9a621fc831f12d972e61d8057f73e2d6
+EBUILD kodi-inputstream-rtmp-9999.ebuild 685 BLAKE2B 374e8719bcda88ec5c7f36aac819825302775dc1eca54d4c2027eddc3fbafc2096ec756103f51bd1e84f0a7523368813a66354edd980c2feef81a5a7a7b5cc65 SHA512 5440ea6b458366246f9d035854e7b990047eb10f347289ef0855375c9dde4f565104039aa516c79ea2ed8df92a56373f6328ac1189d21ed9c72db3607044d5c9
+MISC metadata.xml 433 BLAKE2B 5b159068b2431fb4b669662f4e36d8768afbda1e076e866678c193590945ff0ba4d6c03228475dda7bb7ca5d204d09e0e5d5804baacbfa653563f199045a1c80 SHA512 0cb47e468304977fd3624c4ec07d254271406897eb4601eac57a68167463a8379e3d8cf4d4e0e4988ae78d832ae39da9a457ba30a7c0fbbe8a32fab4e5e94f53
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.4.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.4.ebuild
new file mode 100644
index 000000000000..b9b53d260348
--- /dev/null
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's RTMP inputstream addon"
+HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/inputstream.rtmp.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	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}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	media-video/rtmpdump
+	"
+RDEPEND="
+	${DEPEND}
+	"
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 28be9b91015b..c866d60112af 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/notspiff/inputstream.rtmp"
+HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/inputstream.rtmp.git"
+	EGIT_REPO_URI="https://github.com/xbmc/inputstream.rtmp.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/inputstream.rtmp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.rtmp-${PV}"
+	SRC_URI="https://github.com/xbmc/inputstream.rtmp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.rtmp-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,7 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999
+	~media-tv/kodi-9999
 	media-video/rtmpdump
 	"
 RDEPEND="
diff --git a/media-plugins/kodi-inputstream-rtmp/metadata.xml b/media-plugins/kodi-inputstream-rtmp/metadata.xml
index a9d8bb311bc5..1ebb385c856d 100644
--- a/media-plugins/kodi-inputstream-rtmp/metadata.xml
+++ b/media-plugins/kodi-inputstream-rtmp/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Kodi's RTMP inputstream addon</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/inputstream.rtmp</remote-id>
+        <remote-id type="github">xbmc/inputstream.rtmp</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-peripheral-joystick/Manifest b/media-plugins/kodi-peripheral-joystick/Manifest
index 66a13c40d1f0..a61793eb603a 100644
--- a/media-plugins/kodi-peripheral-joystick/Manifest
+++ b/media-plugins/kodi-peripheral-joystick/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-peripheral-joystick-1.3.2.tar.gz 82787 BLAKE2B c3edcc037161e7f1b865b1761a1296e15d6428ac6f32907569f8b32d3a7ecd7e2c27103ce72079b92b4329818d6709209d8f7caea386223fef6e59df281774fd SHA512 9aa2e5d1af51b83abc0691fb9f6c7603d07c37b61fde898e2010d6370b9dca44275bd53caa2252479128360bc97eb8bd904d268a9c0cab7f2958c0b31f64ba1f
 DIST kodi-peripheral-joystick-1.3.3.tar.gz 84408 BLAKE2B 53ac931708319945c132c7a835fd37e4fcd2c003d64db32c7a888af116625746b96685563dd732873810f28adec20ff5dbed37bd66dcb6bff74cdd192f5a45bb SHA512 e566cfab838b471f4d5cd6d1bde48479868bf1e401e2d5512627f6cfad606c9ec359fade3612dc32424b4a5baffad82278d25906e59062bea9e8aea009754a78
+DIST kodi-peripheral-joystick-1.4.6.tar.gz 91142 BLAKE2B c80daf4e9a425c88ecb323d7f5ab7538aa5a8af06758723310f133f63ac65b74650f6374e4361e9086813474a6b84cf54bb8bc054d54eaec19c1ab32da5181e9 SHA512 ae42a295e548c6bda7a258d02d7a68ec3f34c66e88b1e3848181d8fb76da6ff83f19f8adc007e2697c096052fdd1ea9879b178aab9f8f4118f4d2d57691c2a7c
 EBUILD kodi-peripheral-joystick-1.3.2.ebuild 763 BLAKE2B 529b4ab8aad7d7dca87cafbfec5bfd153a625da49b7a4bdfaa45593b2043abf3a3d3c526e94a0fd179aa768e90a6eceb13db3271bc25dd160a3379c6f5950259 SHA512 b3e15fc2640315e8df3e45a5554dd61a893f668c5aec593b37d82b4f15676ddaeb8c681a7e9a721c8ddfee40ea5ad2cd3692a1525f164d4ad563751565aa5460
 EBUILD kodi-peripheral-joystick-1.3.3.ebuild 763 BLAKE2B 529b4ab8aad7d7dca87cafbfec5bfd153a625da49b7a4bdfaa45593b2043abf3a3d3c526e94a0fd179aa768e90a6eceb13db3271bc25dd160a3379c6f5950259 SHA512 b3e15fc2640315e8df3e45a5554dd61a893f668c5aec593b37d82b4f15676ddaeb8c681a7e9a721c8ddfee40ea5ad2cd3692a1525f164d4ad563751565aa5460
-EBUILD kodi-peripheral-joystick-9999.ebuild 735 BLAKE2B 3c5d1af15aabe0831967008e3d62d6fb979c2243e7fd5274aa6f268791750d0812ffa741cbea15c84e116cc97577e0716604a4e0d6b1d8b991ab9b520d3cdacf SHA512 a556e792db0a637979dc31beb8e32a9b821ec253728e29def090172f40bf8f1c4ce8b93091ee6952f77e124adc2390d223022be115325a49e65923a82d5ef42f
+EBUILD kodi-peripheral-joystick-1.4.6.ebuild 730 BLAKE2B 76309930faf2294995b1df7eef268c6ee8fea244a129bdc2c2a65e30018cd6fa4e9afb32398eb5e17c8a8956cec8439d321a01eb4015058f54e52ad06be52b69 SHA512 6fabf1aae054025f89177e8bf00672ef62679e31238c048bf7598e92391d82b43fc5815356bc083f3986c0256762c40f85c6849bb00ff5ed4442f0ed4d39ce95
+EBUILD kodi-peripheral-joystick-9999.ebuild 732 BLAKE2B a6b3628199d1f4a9198ca4a3e91a63f28062b95bf02bfa65a85f86d38e23275e29f270666efbfe5fddd88c1e84e3b5b557641a2cc69a3b74e2de491b27437a43 SHA512 7c507d9869f70b4b967e7feaba94dd0ee30347543410190b14b20820eadafbacfed08e10f6fef8dd119c4e6b719230b44f240d6c10a11e0a24efe9077261986b
 MISC metadata.xml 439 BLAKE2B 4713d97899dd9cb12cf064f17d88b197f872a38952d435445b0097c9cacd297dface9c9efbe034eafe595c7cccc3a37773fbf025c0fc45fe3283ea406785c47d SHA512 1489ac3199dbc3033892af4d492e843fff379a18a93059e4c0e164e9140411f8f7756d275b70214c375f4ee649d48786255aa6500c2b6b218f843295ebd6c29e
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.4.6.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.4.6.ebuild
new file mode 100644
index 000000000000..e2e2c669b701
--- /dev/null
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.4.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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_REPO_URI="https://github.com/xbmc/peripheral.joystick.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/peripheral.joystick-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	=dev-libs/libplatform-2*
+	dev-libs/libpcre
+	"
+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 a5cfea8b92ed..614e3fb6c4cb 100644
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,8 +27,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999
-	=media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	=dev-libs/libplatform-2*
 	dev-libs/libpcre
 	"
diff --git a/media-plugins/kodi-peripheral-steamcontroller/Manifest b/media-plugins/kodi-peripheral-steamcontroller/Manifest
index f2f47da0eba7..578609d33bdb 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 755 BLAKE2B 737ee3ed3cb0a034fd876810ded2c1fdb64679745ded5796ac4a453d3a582381a9d396f22570148b08f2b80f14149dd5baaaf19d65035e93c6ca31010e9d5b00 SHA512 a29b34882927c88f62a594dc4a371947194a4be0252c280719e356603b6540be3568c7a8f84c726e03f429b5be965a287e0b87444a77ddd20c31b7f93e660e45
+EBUILD kodi-peripheral-steamcontroller-9999.ebuild 757 BLAKE2B ec03f723fc37b77d073f3aed78e14be76fe97695c4da20e7e1f931b7f3fe32370fbfc7e7a2601f24239c54cb5120774cd6d56653bfd171eb79c35e922c9b6034 SHA512 c2daecee1b673e1b0e2532be5d870fc7f1c687bbb984fcc9d9d705a27977111263862279d278192b02ded3593900aea75f601b69fdcfa4609cf56fe3343ab6aa
 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 d0320868c73d..d357c789b6dd 100644
--- a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
+++ b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Steam controller driver for Kodi"
-HOMEPAGE="https://github.com/xbmc/peripheral.steamcontroller"
+HOMEPAGE="https://github.com/kodi-game/peripheral.steamcontroller"
 SRC_URI=""
 
 case ${PV} in
diff --git a/media-plugins/kodi-pvr-dvbviewer/Manifest b/media-plugins/kodi-pvr-dvbviewer/Manifest
index 132400a525f8..08996b56fd3e 100644
--- a/media-plugins/kodi-pvr-dvbviewer/Manifest
+++ b/media-plugins/kodi-pvr-dvbviewer/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-dvbviewer-2.4.11.tar.gz 97354 BLAKE2B 6f9c04c0a0a4dd2ce9cab06e1ed96cdc0c674bcb3665db7df6525a2c5ed8e46023e050a4ff9c378fd80a494b34015d37b995f0692c2c8ebfaa1c4e333fbc7468 SHA512 282e11e6ec3bb6a0fdb8b7001a18d335b2cf7c9c28dc1f965ecbcef50b38d2ae52e7aff54508765eeb107ceff67ba0c5b5aa620e792ef88ad86930432cb37a02
 DIST kodi-pvr-dvbviewer-2.4.7.tar.gz 94802 BLAKE2B a2d952b56cf3dcf06563c0a63741026bb77c1f91e0b854d1c3e8f4b06923d71487a835497342955ef2f77af883d94dcc0b5e1363430cf20874b7af29ffe8b964 SHA512 b88dcba491af5f4bb66c3e6f38f28446978fdc7046ff1cc5579957316310e55cf9f00b9162decc0b701a95dd7e76260175d9d66dacc5357930a3f144c48e1ad1
+DIST kodi-pvr-dvbviewer-3.7.5-Leia.tar.gz 125918 BLAKE2B 413a752c092ff250e01db404dcd8c35f522546c42c33d93c66f2b5dd7ade1b62fc1686f5b4453260155fd4e1c6b624318a8aeebabccf9041d90952308cc04570 SHA512 03aa18b4946d2d3c345feb5fc26d999a0ca2a929f2ec0bf92450a170f4ceea085fbd16d5daec3782090ffa054bcec8ca02d997716854b493b4f9b8373f2321eb
 EBUILD kodi-pvr-dvbviewer-2.4.11.ebuild 718 BLAKE2B a048aa4e0eaf017f36140c071626a62b3fb25e1e2eb2d2d539f56a4b43d6b7d680b7dedde4af93971a99000f4c039281f33b167aba05269a8cfa53e1209775b1 SHA512 c8ae47ba0e89c0e3eba50ee7ea7e80318b2b321fbafbab85ff1b8c1d80b10feabb34716333f58418c51b3746bf0fd9570a9f0b5b2a6ada7029f30fdc716327b0
 EBUILD kodi-pvr-dvbviewer-2.4.7.ebuild 674 BLAKE2B 63d7528276796aeda1bb86784ac02d7ec0d3c83f6d9d4691ba8a961706f648cab6460133f63d2b937f1fde2513a7aecf30680aab6b6bd9db5fcd6e9589695ebd SHA512 71fb7d624ba2e71a4632daf8545dbb2c01759f7cc739c4cfcd6b99ab56203c827c30805dec183cc3f6626377f92ded174d113de8d202f00f12680ea272acbe83
-EBUILD kodi-pvr-dvbviewer-9999.ebuild 734 BLAKE2B e421bc7387223751ddc20261afe8068969542023a75e9b933da31e1b9cece63ff580773b75b3d0026726a92035f8d87c28999925dd131bfbf44ce51a13456016 SHA512 0db9c2c82c730c562f6b541e8e8f1f0680d6dd5f9b0024b3c99095061ae551b201bea83684a8d8121ae91a6019ffd53482f05e59fb86681d03a23d5ec13ca68f
+EBUILD kodi-pvr-dvbviewer-3.7.5.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
+EBUILD kodi-pvr-dvbviewer-9999.ebuild 726 BLAKE2B faa78ff1a46d710284b2043c26f458fc279161d53f6632ec320e5583b9c6576156ea5f52b1409ada64c32a6a52f79c5245c7d2dbdd6b81cae8a5101a3a2d4405 SHA512 59c05d893f445fef677587cfe13fc5340ad571f9a3856e6eb23ec119da39bfd5b863ce0051977bc4a5d3a4684a639af2e82670d0cdd99d16b225f8ee22326698
 MISC metadata.xml 434 BLAKE2B 8c6842bc4a5a0dc248402680bb06f034883ec52717aff60b0d8a55a27619f288719caf002056bb6c36f09506e8ecf0b45a173f7cfe85699db9477b30fdd380cd SHA512 9e817d4a01a0c99faf30fcbee42cf386310ee8e2a74799d5384bca834ee88c534740bd304b5febae834536c6283e6570199d6692b7091e5c2b9ebe35c1d717c4
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-3.7.5.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-3.7.5.ebuild
new file mode 100644
index 000000000000..cdd6fb80252c
--- /dev/null
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-3.7.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's 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="Leia"
+	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-18*
+	=media-libs/kodi-platform-18*
+	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 46914e08d18a..56e77f938fb0 100644
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Krypton"
+	CODENAME="Leia"
 	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}"
@@ -28,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999*
-	=media-libs/kodi-platform-9999*
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-mythtv/Manifest b/media-plugins/kodi-pvr-mythtv/Manifest
index 98c59a3a1649..df5ab3913577 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1,4 +1,14 @@
 DIST kodi-pvr-mythtv-4.15.3.tar.gz 650217 BLAKE2B ddc6b11039bd8e5e6b46331030909063e127f681f4059e604734644a3159c10f10c3dbed770ba8a58bb5ea3b7e543dfba042b28f347c842d963d7966e35cad32 SHA512 1171f4e6a05878660795b585185d35707ef713e310f3508e7fb3327caf79feb6a941e4b4f4d9f2331ef13492c141a4d36157547e350642eee900f3fad1d46b55
+DIST kodi-pvr-mythtv-5.8.14.tar.gz 696544 BLAKE2B a80b84d6c3aa2244d68f7c7ffca16b17e5942239a55a67e059a6a016f9970f7c8ca65071a6b498dbae8c0addea95349f49f27a7e7ce8888a1d9a2fd5294a8d0e SHA512 44630a944eeee7cb97de91183b560beef00d686148880ebba51063fe1f320bd43cd2c9a89061c49fbf8c5e038ac5d6788440fc948ba46ca130e8bd8a980dff97
+DIST kodi-pvr-mythtv-5.8.15.tar.gz 696549 BLAKE2B 408575d8995a5c25a1f2d32b4f7fad37ec4d929a622e287594b700aec41162db9b5b1df4dee59f68a3c4c417af95f6b9297e94de0852e4895f12aebbf40c267d SHA512 8bb8b6dc69cd62eb1b62f7d08abb17a698d354e2280e5b2c5d68d1037e1b48e048aa10dd8b9a4f830c2af7e1d232813fe53c8634669e39665e8e8abc7ae53474
+DIST kodi-pvr-mythtv-5.8.16.tar.gz 697062 BLAKE2B af0d96959904b34368934117a721e0190107f8d772f9ea6370b6eaba61848d183672edd9639737510f3f7fb8e2525aa18874a0c85db6a7ea9d9f168e08102187 SHA512 9ffe4c8defda0111e371bbde72f3b2e746b7b9003dced1956552223b344d868f344ff076f7021534d5a41781fc5b06dfd1bb75d12d1e64f97589ebefa7c030d6
+DIST kodi-pvr-mythtv-5.8.19.tar.gz 698885 BLAKE2B 2852426c9f2b6b559356a21173ff5b59edeb1ae120acd2f679c2076a034d68b01cc43b1bec72302487e1421ee05c6fb67dfd44c59d3a8e90d14c95d29626abfc SHA512 7d61a090321d68937dba20277060d7e41841b0c080178092ac7d709fc7a1f964ef0cc92919ec26659f466c276dc1543ddfe44e7c9fd33db640653abc2f28369d
+DIST kodi-pvr-mythtv-5.9.0.tar.gz 701955 BLAKE2B 002293de752d0e5e3d61d67dfbd397039571527ad850a234ed878eeade0b99d654f4aa744e43572bc8e340513be5e20cbb6353ab4cd7487e5339120d9ca1f202 SHA512 49833fc099d4e3408664d8e196ebf8dbd78756b41556bb9e69c1086d9c97d7e01cce3ae9e4635571d529a7002e8e2f4937dd6356f290ca594272d2e65522499b
 EBUILD kodi-pvr-mythtv-4.15.3.ebuild 642 BLAKE2B 6b294e422af541a0867bf05d2bbb49e97f343d441b528836deca12cd1f919ecd7504978e5378713ec7019675a50f973dec956d6d93ad2de1d5a3308f3c37f789 SHA512 a5538514f1395a1f736ab751d46cadf5472c3db443ed8ee61b6ed021c358b93b5262cf1cc123c032e4ce3883a73ee677f4e7872190ff971506f2130f4c859283
-EBUILD kodi-pvr-mythtv-9999.ebuild 644 BLAKE2B 4248db09dd346e28baf20da4c19c945d899ac143f248414a2cf675db6ee0db1b8d1e5cefb02879d6d9ae6f9f443ed25cd3a5b9180062b928772a5d2083e12ee8 SHA512 967821ea4ee29e20e4b0cce5c7044197d1cb8ab9d2e88a30c4b5efe6736e876fb9e31192eed7e6b356406db1599a6472e4bb238b48624686930a16622ce326ae
+EBUILD kodi-pvr-mythtv-5.8.14.ebuild 680 BLAKE2B dadebd6ff7bf56b9f11dbd44f04fbc9f3c9cff0fdf9f322340b070d534a37e72e0df943c27cf37f68fa40cc29b8b2cd6c5ac2d73e7097b7a57d1a6c7d11f0305 SHA512 99cc81f96752512a0361d0147ca3503f5692df6ff3a4262164bd08431afe4a5dd6ce4173d1839e43df5b6db048c1c8370a8abc8301e6eba8656e7f5a2bb7f033
+EBUILD kodi-pvr-mythtv-5.8.15.ebuild 680 BLAKE2B dadebd6ff7bf56b9f11dbd44f04fbc9f3c9cff0fdf9f322340b070d534a37e72e0df943c27cf37f68fa40cc29b8b2cd6c5ac2d73e7097b7a57d1a6c7d11f0305 SHA512 99cc81f96752512a0361d0147ca3503f5692df6ff3a4262164bd08431afe4a5dd6ce4173d1839e43df5b6db048c1c8370a8abc8301e6eba8656e7f5a2bb7f033
+EBUILD kodi-pvr-mythtv-5.8.16.ebuild 680 BLAKE2B dadebd6ff7bf56b9f11dbd44f04fbc9f3c9cff0fdf9f322340b070d534a37e72e0df943c27cf37f68fa40cc29b8b2cd6c5ac2d73e7097b7a57d1a6c7d11f0305 SHA512 99cc81f96752512a0361d0147ca3503f5692df6ff3a4262164bd08431afe4a5dd6ce4173d1839e43df5b6db048c1c8370a8abc8301e6eba8656e7f5a2bb7f033
+EBUILD kodi-pvr-mythtv-5.8.19.ebuild 680 BLAKE2B dadebd6ff7bf56b9f11dbd44f04fbc9f3c9cff0fdf9f322340b070d534a37e72e0df943c27cf37f68fa40cc29b8b2cd6c5ac2d73e7097b7a57d1a6c7d11f0305 SHA512 99cc81f96752512a0361d0147ca3503f5692df6ff3a4262164bd08431afe4a5dd6ce4173d1839e43df5b6db048c1c8370a8abc8301e6eba8656e7f5a2bb7f033
+EBUILD kodi-pvr-mythtv-5.9.0.ebuild 680 BLAKE2B dadebd6ff7bf56b9f11dbd44f04fbc9f3c9cff0fdf9f322340b070d534a37e72e0df943c27cf37f68fa40cc29b8b2cd6c5ac2d73e7097b7a57d1a6c7d11f0305 SHA512 99cc81f96752512a0361d0147ca3503f5692df6ff3a4262164bd08431afe4a5dd6ce4173d1839e43df5b6db048c1c8370a8abc8301e6eba8656e7f5a2bb7f033
+EBUILD kodi-pvr-mythtv-9999.ebuild 682 BLAKE2B 4d6be5c4849cce45961fccb26fce2c62c207b2983766a874e49f66cb8fc8719da23cd5dff6d843ec0792bb044275631fc357fb5fa85872455913637fe07a8eb9 SHA512 b65d91251b7fd381ee76bed85df2843548c0f044528887ed52338f6d5933f0f6c1dbd52997f90d744eef314a17826efa8ea9d981553222c13cc0715f429b9106
 MISC metadata.xml 419 BLAKE2B 71f7f4424dbf1c992fab169ce530ce61ff39399842089905618bfc800011ed7960c92428cb9e6e89b084872fa61d08da8df0c4179c483ec6dc2ab745d684f15e SHA512 5b6c21c0e780ed90e92fb080f0a15cf62fee13e8b8597081f7b5480eb21f3f013495aafb389a302a227e6e22b757cc6b83d3dd56d7cd74ed16587edb09ef871e
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.14.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.14.ebuild
new file mode 100644
index 000000000000..05d2594341ea
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.14.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="MythTV PVR for Kodi"
+HOMEPAGE="https://github.com/janbar/pvr.mythtv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	sys-libs/zlib
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.15.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.15.ebuild
new file mode 100644
index 000000000000..05d2594341ea
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.15.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="MythTV PVR for Kodi"
+HOMEPAGE="https://github.com/janbar/pvr.mythtv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	sys-libs/zlib
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.16.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.16.ebuild
new file mode 100644
index 000000000000..05d2594341ea
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.16.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="MythTV PVR for Kodi"
+HOMEPAGE="https://github.com/janbar/pvr.mythtv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	sys-libs/zlib
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.19.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.19.ebuild
new file mode 100644
index 000000000000..05d2594341ea
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.8.19.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="MythTV PVR for Kodi"
+HOMEPAGE="https://github.com/janbar/pvr.mythtv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	sys-libs/zlib
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.9.0.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.9.0.ebuild
new file mode 100644
index 000000000000..05d2594341ea
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.9.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="MythTV PVR for Kodi"
+HOMEPAGE="https://github.com/janbar/pvr.mythtv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	sys-libs/zlib
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
index 4a54f66b3130..d0a95543a96a 100644
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,10 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}"
+	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -28,8 +29,8 @@ IUSE=""
 
 DEPEND="
 	sys-libs/zlib
-	=media-tv/kodi-9999
-	=media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index b4eb74599777..1c753419dab6 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-vbox-4.0.2.tar.gz 150156 BLAKE2B 82751404d60b8064ad4c56c5de2bb2745cf1d3bbf6a10c6c96391e3021353a1c64c1d7c54ecbd53722b3e39edaecd97716877ad6738bdbb9c0a3ff1f10c35d42 SHA512 2b46cd6090764660c25a8c229bc11c23b0b200e4eecc6682a89f2754f6869217b93600ac5eb7a48b7d9183ca6eb237e1a396902b84493668c7045a6b4eb23a6e
-EBUILD kodi-pvr-vbox-4.0.2.ebuild 660 BLAKE2B 684f63013c9d0210b12ae261fecfc64d223874f363db66414e1dd407e85e6326c8ce96df528c71f6a37a03f07cb393f4569118376c31c8a516c54fb822654e10 SHA512 1d05297c4899eb4887f7ffa42fdc10d06480586b499f2640e89d9bcc1178d9c2e7f029d769e395460c3ddb4ca9d4064b1613c182a3e251dc7d746ad30dc91e1a
-EBUILD kodi-pvr-vbox-9999.ebuild 660 BLAKE2B 684f63013c9d0210b12ae261fecfc64d223874f363db66414e1dd407e85e6326c8ce96df528c71f6a37a03f07cb393f4569118376c31c8a516c54fb822654e10 SHA512 1d05297c4899eb4887f7ffa42fdc10d06480586b499f2640e89d9bcc1178d9c2e7f029d769e395460c3ddb4ca9d4064b1613c182a3e251dc7d746ad30dc91e1a
+DIST kodi-pvr-vbox-4.4.6.tar.gz 155719 BLAKE2B 178ec1adfd17f8afc80daf526fec863b93c17ec13b5a54c7a2aa166c6a73cbe5d57a3e349f2c6522c2081af6b4f892a731b49a0aee2a6e5686a2adf5f95d5fc9 SHA512 b34b2ddc9bdae9a51e44a7dbe483f9a21d6d4de951e0c996a2f82e63b87718b7f56a3bfbeb45c0cc7a6d828d279bb1f6ab25292b328b1853a09e1267c22026fe
+EBUILD kodi-pvr-vbox-4.0.2-r1.ebuild 667 BLAKE2B 3495ff192480eb5a64efb21b4b261013da980d23e4381e37968583f3cf05484ffd26829f40d30c68ec88ad87f38f5e0e09f645afcfc3eefbff95ea7569560994 SHA512 14f2541702cb41201518a39d05bc96800e70c9d194cf43b13353489335c0eca745041ee601ac70c3b2278998fb168469d606d336b775c08b22315d007748b53a
+EBUILD kodi-pvr-vbox-4.4.6.ebuild 708 BLAKE2B becb6df88da03e58ceba1bacf22755e9e61f164fc59304fc9f7202683024d18a79ba1f1d443711950d347ff61c46adb8ed9b358f8074670305e6721c4f7f65cc SHA512 e324b196bd485d805988aa23c2a4895e83da9ea03e7b357b0151201a10046220a1821b67e70ead7ada4cc3c4ff7e53ff6f173a78f1b5ccab2e999b0558ffe7ce
+EBUILD kodi-pvr-vbox-9999.ebuild 710 BLAKE2B 11fabe5a61dec61e501671c7ce7e3cca3562d558f7dd7fda6a8bea6266b878a44874e8fa856ccc8020fef253d27d63e466dedece18439a36a044e51eb86a51e5 SHA512 c1d3a417fd6384478332eacbb1e080c6b85581c2f257b14a07533c331424b6dc41e84e99127e77700cea1cf2a9c70a469ae5da5757436c181479e66f496f8a96
 MISC metadata.xml 444 BLAKE2B c614b42e40b284fb6433935458137624ec0bdb22db86221922d82ad2fdde06eaaef60f430ad871998fc54792a03decb577167a3e1c9e9ea048e0c1fd7faf33ac SHA512 9c7992961c43a1e7bbc60018b282f41796dd8d0ba1127d6cafe0945127c2e65653fad5e47b2f283bf04ef9d3436d8693b6aee31513ae17fc98c245f97c9e3dbc
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.0.2.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.0.2-r1.ebuild
index ca7823da941b..5bc893a7257f 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.0.2.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,8 +27,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
+	=media-tv/kodi-17*
+	=media-libs/kodi-platform-17*
 	dev-libs/tinyxml2
 	"
 
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.6.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.6.ebuild
new file mode 100644
index 000000000000..42079e6ec24d
--- /dev/null
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's 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="Leia"
+	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-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml2
+	"
+
+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 ca7823da941b..0836a8ab7ea2 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,10 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vbox-${PV}"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	dev-libs/tinyxml2
 	"
 
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/Manifest b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
index 0e29ed499091..1b28793b8a62 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/Manifest
+++ b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-vdr-vnsi-2.6.17.tar.gz 145541 BLAKE2B 3682369144e75de78728c2b4c04f0edc4af470c696a96ab2204817173c507900de26810fa02a25111efa86a57090bbf8cdb1466e8ec375e69fb86ccc120e398d SHA512 43b9196d9cc08dc115638145ed06359cb78616534535b266f96c320ce8f7c808820654ae313a735a0a41a0ec71d5bceb50ed53bb869829c6bc79e434bb1dd653
+DIST kodi-pvr-vdr-vnsi-3.6.2.tar.gz 145275 BLAKE2B 40f1f21b80411c772b093a4a117522b31d93d3bc87d876154f46cfa58781e56e10d92e0dc67ca40be07a8e3e2b7c1c0a9716bd7a9b81ff21601b921b5a21f343 SHA512 ed76ba60188f513a6c43b21985522cb5e8eb8da3ffdf35ee88e95cec94c078cfc322c2e267a8837626c60242082bd61214c9ec26bff844967ce9f28f1cf885f8
 EBUILD kodi-pvr-vdr-vnsi-2.6.17.ebuild 659 BLAKE2B 1010fbd87812331d707e2a9ad43ee76317b1d6df79d0e7960cab0ce11e26087dbc5c285213a5aee68a87dfdd30192782ad6d5eac8f3bdedfc5b1efa836a21342 SHA512 5635dd1a75f25cba9059d03c6acb08723b99d70ad9c1cac6180bf947e9d6e60d9ef5632e768f0a0cfcc566b79c13e03c03f3ae30405d40c26d08c2f5c56071f3
-EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 670 BLAKE2B 47122adb0a15816718539a3ed70f592cbca61a04277e431da8f6303df195d0284785004f17e2964339d6f0749e75d14ebdb699cf668e3e52011559fde96e664a SHA512 3533ccbebb9e2936da1735813240dfdd14c0947e02eced70ebac9933098dd835fca2faaff9e8dfa68b8160d4cf377a428fddce26ebf5405101bb7479d7358b83
+EBUILD kodi-pvr-vdr-vnsi-3.6.2.ebuild 665 BLAKE2B 549c00829a828235bac2455a2f62aada5733940bf13a5cbc02c373cc61c9a4998e13849744b81b1f880a627d528c0d04f5eaabce8b9946043fd560ed92c66df5 SHA512 fb1cb4333073c7b9fee9e7919e975f85f75206e80877c76e6793310283be36ab591cf1054c1f20ecb0d184ef99b860263c749e1e29aeaebe64a3e62ec1e74b5a
+EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 667 BLAKE2B 5197eaf4f3ff68e7d613cbad405a1d24439697b78c250646e32e40c0a2bea90da9147ea80cc7769ddbd808bb426b88c30189875c4b8789ed2736d12c93bbd5f7 SHA512 b463d371fe31cf1ba38d06fce024dcb4fbe975c87bdbe494846e4fd6b5aa18bf9e29afa5a1c53c095811d2f484620705c0cb3c2d3c291b0553688f478792ae2e
 MISC metadata.xml 423 BLAKE2B ff5a21d61f4516f52b4a139f695048b1483aca09426e249c3165ecfbdef8770a47bd98d4bbea582e06e21c8d508884f67389d69ad126a3c7d46de1bce2b48207 SHA512 e81e80ae101dbd4b405ff3b8056c8cc901d5fcf2ff2d1eb595e26f5f59954d6931c5acce9fadb94bfbb533865017f17fb579bf382ce6c226ca32a2dc10f1e0a8
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.2.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.2.ebuild
new file mode 100644
index 000000000000..d8a1ed02d609
--- /dev/null
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi PVR addon VNSI"
+HOMEPAGE="https://github.com/fernetmenta/pvr.vdr.vnsi"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/fernetmenta/pvr.vdr.vnsi.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/fernetmenta/pvr.vdr.vnsi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vdr.vnsi-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	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 a377794836af..62e0e7857b7a 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,8 +27,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999
-	=media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	virtual/opengl
 	"
 
diff --git a/media-plugins/kodi-pvr-wmc/Manifest b/media-plugins/kodi-pvr-wmc/Manifest
index e1d3c856e2f7..90209c7999f4 100644
--- a/media-plugins/kodi-pvr-wmc/Manifest
+++ b/media-plugins/kodi-pvr-wmc/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-wmc-1.4.7.tar.gz 177937 BLAKE2B b11358971780005f12ae318cc8fb202e4b0ab92f4b97e712cf639dd4f5f568133b089780323fdace0fd1029ba233b0cfc7457d624408fc2443c2c22e629122d9 SHA512 15c2807528d169a9de7831b653c948bc8e597324f43dfaa1b1cd1bfefd37979387301c73cabe30ae87532f36d280d84b0e81b6a695f95eb4b4be9e75ebe3736e
 DIST kodi-pvr-wmc-1.4.9.tar.gz 177965 BLAKE2B 680896d2f519977a0dbaaffdb6fe92f815787615dc9014934e2415eb817ac1a1f5dd5669f3d8ba1a0d6a98f0518062b285cdddb5cdf54efac4ec79aa3795ab73 SHA512 51ddfb064df5861b3fa89decdf78a499f8251fee3f18ffcf09fcdfbe9c3c741536cafce460486b38bd8abb447e3494f819aef3a2d0764b8e1579d649f386503f
+DIST kodi-pvr-wmc-2.4.1.tar.gz 178040 BLAKE2B 4c76796d5a9ac1d89e602ebd5c58d3d82010fb433e531a7f36ccc005624561e333232ea532da01bbed5038017634f7c9e58fc33a49118795f1c9a1930f167734 SHA512 a2072ba33e3b1f2b0f87a6e2ebd713693814e520cb0aa6de1871122be45b233f5c68cafbf8f145f8c4983e9115391cfdb0cee76ab0a14a8270c839136d535587
 EBUILD kodi-pvr-wmc-1.4.7.ebuild 686 BLAKE2B bd1f105e7d6f1842167f48d81851d4493eab2fc893cc564ca6c1e9f3ba28ba61a888b9c18cff489d1ed99b52780d342444a8809772e22cc3cb76d26b75064423 SHA512 a0196957e9db5166b09f2d1c3342558145f262d969f26dc1105e366c915b6c83d0c323a6520801f5faf4f5a4c4bb8fa599503e825045d26031a1fddd6a938bcb
 EBUILD kodi-pvr-wmc-1.4.9.ebuild 690 BLAKE2B e6037d104fa02dc06a3003cf36c7600c9d310024f5050629736d8e7c1089f6ad99e2508d422179b87310dec03a3feab39b81feddf7efb9ff46247609f593dd20 SHA512 e28b7fe4354f8b12ffd0d15add45459231f9c458489de444b4d817196df14c0ad9ece62a0cc0b49cb7ab951241030a789eab47b65c0df50dbafb0ee7ba65c145
-EBUILD kodi-pvr-wmc-9999.ebuild 688 BLAKE2B 570b84aad0173164767675d229557d9fc599755d7da0156c7eb42db48bbb5fdc3f7464a435a8478c136553bcb13df2cd308883e70a336ae53f4766b207482db5 SHA512 1eee60ad87e691ea2b8bf4be500d399f576001056b67100acbcc982c4f64233dffaf7480145b67e2fe1d6a23455f59f66fcf0340a57c6d7bd3030fa7796fe2ac
+EBUILD kodi-pvr-wmc-2.4.1.ebuild 680 BLAKE2B 2814d5ea052df3f80edb2dceb530d1bbf66afc5f709e9a6141c37d8c15c9a6b7eb6ecd10f69d1406d9df12471be8374e09ac17995e6f3f123cf1779e830fca9a SHA512 89ad91d22a608f040d8b56f5dee195009a1be6fd8068ad360becf2599b8d9500f512db3af3d9951c302e9c424699894d367cfffdbea5c0bec34fed205ff7997c
+EBUILD kodi-pvr-wmc-9999.ebuild 682 BLAKE2B 0929f6e052949fe8c50fe6ec872fdfdf30dce2424f067b5bc0004e7364a3506fb4f5a096a728718ff61b010d4072cf8a1a01d41762f7349f36f1629229f337f7 SHA512 8ba688262ae557058d090fd1e289223d396f697e0f67aeaa563745ae5fb952eb276efa42fb499996bb76dec88c16b17efe7816606231abfa2bd23528634b0bb7
 MISC metadata.xml 439 BLAKE2B e9d6404796d298720abff6d7afd2db18b95007cb65ee3ff471b83ee7e7e864eb648a37e3d9d8405842c6b8fe3c409096abad8c8b6c3b1eb2e7df15d4865bfcae SHA512 d85d185c415264b312fc1cccf1155b4f49d1091795989e617c68a4a910f0c85e19b8e34764b4a4a31bc825c927f5a939a7bd7b2f4d1412263aff6d0e50b3fdf6
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.1.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.1.ebuild
new file mode 100644
index 000000000000..4b761be86741
--- /dev/null
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's 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="Leia"
+	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-18*
+	=media-libs/kodi-platform-18*
+	"
+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 087a61245af3..416de5a5756a 100644
--- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Krypton"
+	CODENAME="Leia"
 	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}"
@@ -28,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999
-	=media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-screensaver-asteroids/Manifest b/media-plugins/kodi-screensaver-asteroids/Manifest
index faad59889d9d..160417dabb80 100644
--- a/media-plugins/kodi-screensaver-asteroids/Manifest
+++ b/media-plugins/kodi-screensaver-asteroids/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-screensaver-asteroids-1.1.0.tar.gz 9762 BLAKE2B 5d4da0beb5f344732432b0cf9b8fb8d92e0428bffde6ad384e0fd837d9c12ec1ff96e3eb78c3fc639983b91ce0b405d8e77179d88e6f8d71c022663cf51a92c9 SHA512 38cbdae262ac9136654699dffaa51f9c854557c3aa0bb0abf038d3f5d4f94045f73aa054498b0283d7a38a6a985a49ab2df80f9b4d5f3fae6b4cc09794ddc838
+DIST kodi-screensaver-asteroids-2.1.0.tar.gz 18838 BLAKE2B 26504e8a10afed55a780fc18e127df7029adabff913baf4da89e76ebc1ee1bea46431e4a578f8273335a40a30b0bf8e678c86624e75fd3419696c3cb9d494a69 SHA512 61d848aa136ab3a9896446d92c5bc8d02867bcdc67b8eed58cff0b9c3573c52a19b4d16de5494dc45c0f69946075749d73e8681858d534f8cbbe31d005a9a5c3
 EBUILD kodi-screensaver-asteroids-1.1.0.ebuild 629 BLAKE2B 5175b6d182e3738af2d85468b8bd5934988c9ba3704324228bb7e2bc5bbac4bcddf235f8c4d73626df1742bf964075379a2c64363c98a20bffdfa2f85243ee12 SHA512 51f7b7a5b15d72be346757efa8c50452d337666206919a1815e232df78ee36dbc476a5938296f32f2e1ead6f8a533ee6aa5101cb6431609d49c582664aa73b28
-EBUILD kodi-screensaver-asteroids-9999.ebuild 629 BLAKE2B 5175b6d182e3738af2d85468b8bd5934988c9ba3704324228bb7e2bc5bbac4bcddf235f8c4d73626df1742bf964075379a2c64363c98a20bffdfa2f85243ee12 SHA512 51f7b7a5b15d72be346757efa8c50452d337666206919a1815e232df78ee36dbc476a5938296f32f2e1ead6f8a533ee6aa5101cb6431609d49c582664aa73b28
-MISC metadata.xml 443 BLAKE2B c5785ac6f3e1d111b1ada7ac5c7fe22511f7bf498d477219f0970b7289d6ff5310c6c23e71965904572947f5288a8cac6779e627ce35e363521241f8c8513602 SHA512 a2b47d64fac2f88c537ba63fbc35b0074c774b32c288cef95dd8540ce1e469efa74e98538c58950b9bccb79b23553428d25964ee688d53bcf713b99307563d75
+EBUILD kodi-screensaver-asteroids-2.1.0.ebuild 659 BLAKE2B b7b187fc3f12ebcafa40a29f58707a472761e8e3a0bd36fa4c38b2d700493696816c928a5e7e79dbf080e9a7de57c721ed31c937885aa3b88526b2aaa1196cb6 SHA512 3511ec63d44bb7f1123c4a564fee3e21ce121b6f01d167b9a552de6c0d2a7522305c314f5a0bd2cd1b11460b339839ef62661eac701487d13265d8492e4c7eeb
+EBUILD kodi-screensaver-asteroids-9999.ebuild 660 BLAKE2B 1cd8195ec37d29c1e70710426f6b356df5e4e4813cabbafc50e16ef69d9263416dbcbb58deaac2c6bdd25db24d705f7e710674d889a5ac0a1d5baf2ce71c8dca SHA512 d6476debc0eed1e10853c6cb9840f06f182317a535bb6a78e20085a33135fa10dacab98560d605afff4d25a7b90cb22629955bc538e9852877283e3cf42a09ce
+MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.1.0.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.1.0.ebuild
new file mode 100644
index 000000000000..fc030729fef3
--- /dev/null
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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="Leia"
+	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-18*
+	"
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 d9849bf6cb5a..58c3b5bf9593 100644
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Asteroids screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensaver.asteroids"
+HOMEPAGE="https://github.com/xbmc/screensaver.asteroids"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensaver.asteroids.git"
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.asteroids.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensaver.asteroids/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.asteroids-${PV}"
+	SRC_URI="https://github.com/xbmc/screensaver.asteroids/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.asteroids-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,5 +28,5 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	"
diff --git a/media-plugins/kodi-screensaver-asteroids/metadata.xml b/media-plugins/kodi-screensaver-asteroids/metadata.xml
index bc6bc4641c48..2263c79c6cd3 100644
--- a/media-plugins/kodi-screensaver-asteroids/metadata.xml
+++ b/media-plugins/kodi-screensaver-asteroids/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Asteroids screensaver for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/screensaver.asteroids</remote-id>
+        <remote-id type="github">xbmc/screensaver.asteroids</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-screensaver-biogenesis/Manifest b/media-plugins/kodi-screensaver-biogenesis/Manifest
index 3d05f49585c8..398e96e9f9ca 100644
--- a/media-plugins/kodi-screensaver-biogenesis/Manifest
+++ b/media-plugins/kodi-screensaver-biogenesis/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD kodi-screensaver-biogenesis-1.1.0.ebuild 634 BLAKE2B 4b4dcef78e103d861517ee394c647d7acec70d748e39fedc2fd1537d7e5f1d7195e62038646ccebd397af177a7c3b8b6e6ad1bc946eccb22637bfd3418f23b6f SHA512 75f7f8e6ac7560e2fce53cd347a7141ff0ad81ede49d84907b30378d60c1700968ba47478db3ac4a2aa453d3d112d43ee685db9b39aac9c0bbc2130b4022448f
-EBUILD kodi-screensaver-biogenesis-9999.ebuild 634 BLAKE2B 4b4dcef78e103d861517ee394c647d7acec70d748e39fedc2fd1537d7e5f1d7195e62038646ccebd397af177a7c3b8b6e6ad1bc946eccb22637bfd3418f23b6f SHA512 75f7f8e6ac7560e2fce53cd347a7141ff0ad81ede49d84907b30378d60c1700968ba47478db3ac4a2aa453d3d112d43ee685db9b39aac9c0bbc2130b4022448f
-MISC metadata.xml 445 BLAKE2B 1ab8a97d33e753d9965e87f1e5beef007c423ccdd09e93ef316f1b547316543d278aa9c811fef4471527e4342d0ac79d717ecc01b77257a21a20c2097e2626a8 SHA512 eae6ee21acc9d6689f8a7cee7817d967fc8d6c5a584f7c069b6f82253cc2630699c678cfb68c7ee3edd7b67ecc7b9431ebc82326094ad832dfbfb1bfae527af0
+EBUILD kodi-screensaver-biogenesis-2.0.0.ebuild 664 BLAKE2B a8f0fb5e6a227876991f24f7f7fa24f7d24bbafa311aa2b3ee75d7a2ddd916c34162ec5e24f0b9a2b1dcbfa6c92c69a8d1075748e8053713f2a2d68c4b8ffa56 SHA512 9ff72d54ece2a4e4f224d6b641aa601f351358eee14908f15bd86cf9991ef1b3afb1f073b5b0bb87c88ee8bb5c04ccd9fa4e4f3d4dc4bb4233c31260459766df
+EBUILD kodi-screensaver-biogenesis-9999.ebuild 665 BLAKE2B e7812ab99f0cd8905c4d3304cbeedfb6406158cf23b0e6d897cc932c00df5cabb1096a588f66eafddb58be0fb600ba1d53308693ff0b1c57272e89a9c2fdadb5 SHA512 5a60343b906157af49ad248922e113afead82f363310a9364b1be175393e1cbef82f3912be15833c6f4bcdeb2835b46540e87cda24c2d2fce1afca194da4e365
+MISC metadata.xml 441 BLAKE2B f5c19cf70bcc5dddc98d5d1f01403fe32e05e859fd18cd972e8df08b76e4356bce05910535a336dff4f11554f9e8cd7a69addb00b0c5efc2bc021d68a8198624 SHA512 ed6d1fe10c992d7f28c115e86eb2565b6dd2a753d670dae7815ecaa717b208d762a62504aa67a2bc1853a203fdb49d1763ac03e00effddf4db81567f20100791
diff --git a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.0.0.ebuild b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.0.0.ebuild
new file mode 100644
index 000000000000..0b42f0daabef
--- /dev/null
+++ b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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="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}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
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 2d4344f8b9c8..75a3fbf914aa 100644
--- a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
+++ b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Biogenesis screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensaver.biogenesis"
+HOMEPAGE="https://github.com/xbmc/screensaver.biogenesis"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensaver.biogenesis.git"
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.biogenesis.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensaver.biogenesis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.biogenesis-${PV}"
+	SRC_URI="https://github.com/xbmc/screensaver.biogenesis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.biogenesis-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,5 +28,5 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	"
diff --git a/media-plugins/kodi-screensaver-biogenesis/metadata.xml b/media-plugins/kodi-screensaver-biogenesis/metadata.xml
index 9c601b176831..d7ea1698fbfe 100644
--- a/media-plugins/kodi-screensaver-biogenesis/metadata.xml
+++ b/media-plugins/kodi-screensaver-biogenesis/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Biogenesis screensaver for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/screensaver.biogenesis</remote-id>
+        <remote-id type="github">xbmc/screensaver.biogenesis</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-screensaver-greynetic/Manifest b/media-plugins/kodi-screensaver-greynetic/Manifest
index 05626aab1f3e..504625677fd9 100644
--- a/media-plugins/kodi-screensaver-greynetic/Manifest
+++ b/media-plugins/kodi-screensaver-greynetic/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD kodi-screensaver-greynetic-1.1.0.ebuild 629 BLAKE2B d903f527a0c14316a872b1741cd44ddf02339a73a58b888482b40135d2b46ab35c4d388905475d3ba6262fb68050a7d56adf0786fd99f9c51749b52ad3761c8d SHA512 0afdf7c85059546e955d443a9a3b54c805712c8882d1e61a3e93025b1108aceb335ac06a6f6ee322daa760a7196404881054024431d5d765dba5fcadc076837e
-EBUILD kodi-screensaver-greynetic-9999.ebuild 629 BLAKE2B d903f527a0c14316a872b1741cd44ddf02339a73a58b888482b40135d2b46ab35c4d388905475d3ba6262fb68050a7d56adf0786fd99f9c51749b52ad3761c8d SHA512 0afdf7c85059546e955d443a9a3b54c805712c8882d1e61a3e93025b1108aceb335ac06a6f6ee322daa760a7196404881054024431d5d765dba5fcadc076837e
-MISC metadata.xml 443 BLAKE2B 5fb9d83df65c67d384a0fc2e87f8cbade98d6f1381c0892045b40c69ffae53c9ac89e7f132de3bf3419b866f16cbd9e78895d22d15a3407291f63bde3b893849 SHA512 8c260738f3714d9ceaef78969ab76dd6ba83b16857357d5d3614138062ba58f6b0f398de863848aae10a8ded703abff646aad140bb3e0564b465d01963970a90
+EBUILD kodi-screensaver-greynetic-2.0.0.ebuild 659 BLAKE2B 8175e6f35ff1710cca777c1f3450404f1e91c722239090bae403964432c9c15abbcb7085dcc4283c4e3f6c9186d184e2d4b591dc102afb939dde526a56751a05 SHA512 3cd27f42ffda2a43db0362e01ce7ecab2c092702412cc3995f17baedb91a51b6eaa13c4a5da3363eaa8f24da4be735e083d8fe28b042a63b60c8e42b2bc85570
+EBUILD kodi-screensaver-greynetic-9999.ebuild 660 BLAKE2B f76147a93694f01d93f5d412ae7f65303297e398dedb00ab9a76788834fbf29fa90e7b397864225ac4142aecccd79de0e53c1201e7856a55f63f147c222e8ab8 SHA512 0abbfcb95de736591e1120dbde8327a4921c1cd8b91f611ad69ee859a9e93451abef93beba66cfb8d6c5098098af742b7aaff863354d1f33ddc1762ecbecfc5c
+MISC metadata.xml 439 BLAKE2B 61919ac2fc5a3efc8278e1dd40f196fcd000ac12cdbe633b4f53bd0653978f4030fd3dcaeecb6f17a86c4e8fbabdb8e9d6e11e7ec245693c54baf57ac1042445 SHA512 56833abb5a30439a7c4736e4f695f555e79bcdd0cad2d53a87897c35d4c3efedb65a4bc5818572c5fbb7768eedc635659299186339d3557d98d86de7a54885c4
diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.0.0.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.0.0.ebuild
new file mode 100644
index 000000000000..d018688d7843
--- /dev/null
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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="Leia"
+	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-tv/kodi-18*
+	"
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 46c8e6cebc5d..fc568b0174aa 100644
--- a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Greynetic screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensaver.greynetic"
+HOMEPAGE="https://github.com/xbmc/screensaver.greynetic"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensaver.greynetic.git"
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.greynetic.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensaver.greynetic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.greynetic-${PV}"
+	SRC_URI="https://github.com/xbmc/screensaver.greynetic/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.greynetic-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,5 +28,5 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	"
diff --git a/media-plugins/kodi-screensaver-greynetic/metadata.xml b/media-plugins/kodi-screensaver-greynetic/metadata.xml
index ab34da82d630..4f3f139b975e 100644
--- a/media-plugins/kodi-screensaver-greynetic/metadata.xml
+++ b/media-plugins/kodi-screensaver-greynetic/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Greynetic screensaver for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/screensaver.greynetic</remote-id>
+        <remote-id type="github">xbmc/screensaver.greynetic</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-screensaver-pingpong/Manifest b/media-plugins/kodi-screensaver-pingpong/Manifest
index f3244d23e884..4fb15b6068c6 100644
--- a/media-plugins/kodi-screensaver-pingpong/Manifest
+++ b/media-plugins/kodi-screensaver-pingpong/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD kodi-screensaver-pingpong-1.1.0.ebuild 625 BLAKE2B 9de8a58bac01aaa057c80d232bd4f0546be2855c76608da93a52d15f054c8adb7f2dffb1a31708a3a88a7766dc439f47ef8118b061946787144bba8be6d3f4b3 SHA512 13986351400280f6b9224110789dca0b5ac6930ee7214bbcf80d8f25a961c0c1a57bce5fa43fefef333ae2bd4c6129410a7eb55245ed8a05d0b5816b817b3fcd
-EBUILD kodi-screensaver-pingpong-9999.ebuild 625 BLAKE2B 9de8a58bac01aaa057c80d232bd4f0546be2855c76608da93a52d15f054c8adb7f2dffb1a31708a3a88a7766dc439f47ef8118b061946787144bba8be6d3f4b3 SHA512 13986351400280f6b9224110789dca0b5ac6930ee7214bbcf80d8f25a961c0c1a57bce5fa43fefef333ae2bd4c6129410a7eb55245ed8a05d0b5816b817b3fcd
-MISC metadata.xml 443 BLAKE2B c5785ac6f3e1d111b1ada7ac5c7fe22511f7bf498d477219f0970b7289d6ff5310c6c23e71965904572947f5288a8cac6779e627ce35e363521241f8c8513602 SHA512 a2b47d64fac2f88c537ba63fbc35b0074c774b32c288cef95dd8540ce1e469efa74e98538c58950b9bccb79b23553428d25964ee688d53bcf713b99307563d75
+EBUILD kodi-screensaver-pingpong-2.0.0.ebuild 655 BLAKE2B 609c646adb52ee425e66f4dcef2a3e1512e0631e2833c6331351b9db4e43fe1c51160a994287d5047e591919de71f552b1ac8cfd63792b5944a1ef227ec7c009 SHA512 c76cb1d6db4bb84d464735d6bbce7cac16e70329479a0a47d966d1ac78dad8850a28d6c7b45b553bfe7dfd0e999042837dd33c00b7a39715ea48d96be29baee8
+EBUILD kodi-screensaver-pingpong-9999.ebuild 656 BLAKE2B 70488f9d4a6a331dc9137b3ceba30132abbad5ea903a3be39b23164d8ee732148c8d8980bd5cfb6622500e09c4aebdd09aa397d61bbc29a3a58b6dc26c53895e SHA512 955d4924e6f88601d51416e8e82731d9748a676153625476aa7394cbf9f6c1bf748d251f9d8ecab1abc472100dfaa016fa530d6556040067a6c8e61494f1b887
+MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.0.0.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.0.0.ebuild
new file mode 100644
index 000000000000..40ed6c4dd4b5
--- /dev/null
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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="Leia"
+	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-18*
+	"
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 554471db61c1..a28bd3f5f731 100644
--- a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Ping-pong screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensaver.pingpong"
+HOMEPAGE="https://github.com/xbmc/screensaver.pingpong"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensaver.pingpong.git"
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.pingpong.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensaver.pingpong/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.pingpong-${PV}"
+	SRC_URI="https://github.com/xbmc/screensaver.pingpong/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.pingpong-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,5 +28,5 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	"
diff --git a/media-plugins/kodi-screensaver-pingpong/metadata.xml b/media-plugins/kodi-screensaver-pingpong/metadata.xml
index bc6bc4641c48..2263c79c6cd3 100644
--- a/media-plugins/kodi-screensaver-pingpong/metadata.xml
+++ b/media-plugins/kodi-screensaver-pingpong/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Asteroids screensaver for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/screensaver.asteroids</remote-id>
+        <remote-id type="github">xbmc/screensaver.asteroids</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-screensaver-pyro/Manifest b/media-plugins/kodi-screensaver-pyro/Manifest
index bc446cddaf34..ac4e9c495484 100644
--- a/media-plugins/kodi-screensaver-pyro/Manifest
+++ b/media-plugins/kodi-screensaver-pyro/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-screensaver-pyro-1.1.0.tar.gz 4664 BLAKE2B 92ebff9b42ca257d24e52bad267a301fd9b85bcae9a0db254b2d679722c63dc32abb94c7fce7a0cef7da35cfdc60a44b0f07d0f139332b086c0ff924ea6daff8 SHA512 93cbf40393dc2c50c927daffbdc10756c4a8e4a9a960e07edd6841ae4b0ac5c49beb097ce0710ca38720963e77859b7ed0198dc611c6990a73e066c8ee91bcb2
+DIST kodi-screensaver-pyro-2.0.0.tar.gz 6502 BLAKE2B a0ccc3346f6482db303d4d12104b09611fcc21658eefd23a6af7610cfcff996e2e6507f90da1a8ae3b853a5104da1d4d2a316ae5a335c14e1af4c88b5ac6a7fb SHA512 383fd40fc2bde9a1fe52126300b6279ec78ceab773bd6a763c8b72c3d3ed9b04e5b15eaa0de6da34af7e1d86046807e4734f75e524fa8335bf18cc8bc3965360
 EBUILD kodi-screensaver-pyro-1.1.0.ebuild 604 BLAKE2B 8438058fddc5fc5bb9c628002127119bfd3a9dd7364bbbe6adf515f6cdb22fe681d6744a2baf95e8cf51a5690d33e120767a3cc7b890fdb40d4401e7c256d580 SHA512 1e12e76cf53154970fd16f9146144ddba92af9acdcb4c5bdd73fec9412c0f04eb9f7a3fb5484568bb0d27b22f1c742d5b1dccd8b3105cd169261a592c7bcc4b1
-EBUILD kodi-screensaver-pyro-9999.ebuild 604 BLAKE2B 8438058fddc5fc5bb9c628002127119bfd3a9dd7364bbbe6adf515f6cdb22fe681d6744a2baf95e8cf51a5690d33e120767a3cc7b890fdb40d4401e7c256d580 SHA512 1e12e76cf53154970fd16f9146144ddba92af9acdcb4c5bdd73fec9412c0f04eb9f7a3fb5484568bb0d27b22f1c742d5b1dccd8b3105cd169261a592c7bcc4b1
-MISC metadata.xml 433 BLAKE2B 1e81c14716f535e4927e8ecd93a6d42121c766ea3b8c3fe866bc519f82b7fc30e807bde8dfd12093ba6e05df4467000e61a003cdc584c71f19cedf3ec9699526 SHA512 cd9560d70dee041d233ee25328372b49081d2742a0ca0b663f0b29e37eab6feb3792c5d7f7e4054498f6b5f24d29b23c1632f38859c06ca35245b33772e7c8f8
+EBUILD kodi-screensaver-pyro-2.0.0.ebuild 634 BLAKE2B 4f29003cdfb6c264d5f9f3b40eb802775eae4671846f1b4013c59465d1658548d2dac77f82c0e374a00d120095b6804e129a9b9a3ec92287af7e0233e3dd3672 SHA512 791bf456b3a17cea6dd22dcb5c100002240e2de81176fa7f0b020f0c1216df208e400c17b721726691f8a75d806195502eb1fd0bb96cf537cb0bde2714dc5274
+EBUILD kodi-screensaver-pyro-9999.ebuild 635 BLAKE2B af92ccaa044443360519d3549bab476bcc2d39442a043a1eed6ce40a419653915e9c2143b12c31deebcf61e22677401b8bf867a983e59d8ab8c54953eedb6525 SHA512 b707ec722debfa1b9a3739a7ae25041fc4424d2329f748132656579d751ba9f4370c16b1d6117977d3ef633fb9acbfe9fa002e3fcaec7b07d811ec61c12dada8
+MISC metadata.xml 429 BLAKE2B 75a3ac26d3c3383485d3aa0b9a674f6bc249d95f13b637d9d07fb64f7ab46226301f8abf8a4194b3a30ea8dd6815d6565382a0e1e342bccf880ea0ca6a3d11f1 SHA512 df4dd73cbdb3c1d9a32ee398273356b506391363fee7d5e799a1bfed2765a1cea5c40ddc60716aebd272c4ee91d4d72d148a0644d3e47a84d3b31d03fa739f3d
diff --git a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-2.0.0.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-2.0.0.ebuild
new file mode 100644
index 000000000000..0455e7ee5e59
--- /dev/null
+++ b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Pyro screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.pyro"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.pyro.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	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-18*
+	"
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 4cf7f36bed99..2587a2913dfd 100644
--- a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Pyro screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensaver.pyro"
+HOMEPAGE="https://github.com/xbmc/screensaver.pyro"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensaver.pyro.git"
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.pyro.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensaver.pyro/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.pyro-${PV}"
+	SRC_URI="https://github.com/xbmc/screensaver.pyro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.pyro-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,5 +28,5 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	"
diff --git a/media-plugins/kodi-screensaver-pyro/metadata.xml b/media-plugins/kodi-screensaver-pyro/metadata.xml
index 73e5d065fbbb..fb6af09a7885 100644
--- a/media-plugins/kodi-screensaver-pyro/metadata.xml
+++ b/media-plugins/kodi-screensaver-pyro/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Pyro screensaver for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/screensaver.pyro</remote-id>
+        <remote-id type="github">xbmc/screensaver.pyro</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-screensaver-rsxs/Manifest b/media-plugins/kodi-screensaver-rsxs/Manifest
index a72810605db9..6adf52a32efb 100644
--- a/media-plugins/kodi-screensaver-rsxs/Manifest
+++ b/media-plugins/kodi-screensaver-rsxs/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-screensaver-rsxs-1.4.0.tar.gz 6181175 BLAKE2B 4873027b5f3583129a243c90fd7b3770c43cbba22428301778835e9cd62123a4248a0bf9199c3727f30f61cb7df6b6b1268ff7a1211405c0b72be75462a6781b SHA512 95d553e54be91b914b40d4616d2a6a127404215ceb4fbdf40abc4b6c9d981b33681dbe88c6def34d0bf80a8c0188c59d3760a5804a5189dce1257e5242568497
-EBUILD kodi-screensaver-rsxs-1.4.0.ebuild 758 BLAKE2B b30feb1c84b28e7548d23e136314dc1b936b228f75c9e7a349ddce3c2ca06a5a332534f7f6f80bd9d6f33d462ed580840b88603333f6f6ee8c091b944fd5f346 SHA512 ab16bf412c16eb978b087502a765fad8e93b8287be3a4d5515d4bee13dd7e41394a3f4a90e9b25eaa0652e0010951b83f586daf0e7a6b9de18fb97c13be406b6
-EBUILD kodi-screensaver-rsxs-9999.ebuild 758 BLAKE2B b30feb1c84b28e7548d23e136314dc1b936b228f75c9e7a349ddce3c2ca06a5a332534f7f6f80bd9d6f33d462ed580840b88603333f6f6ee8c091b944fd5f346 SHA512 ab16bf412c16eb978b087502a765fad8e93b8287be3a4d5515d4bee13dd7e41394a3f4a90e9b25eaa0652e0010951b83f586daf0e7a6b9de18fb97c13be406b6
+EBUILD kodi-screensaver-rsxs-1.4.0-r1.ebuild 760 BLAKE2B 0033a65dcb6a49befd3a5dde38e5f36f626fd068defe31761fec2f824d8a1b9b24432d08f14af0d13ce1ae8538b3d7b482aded2225bf23fc406df4306fd03866 SHA512 dfb2e37d5f259bfa5631263e51897edd5b5f9c0c6f6af4c150a370a93a43021d7ba82da842300df7861f5a4bee4b5262cf06dc8b76c25661d364d02dfc3333d6
+EBUILD kodi-screensaver-rsxs-9999.ebuild 761 BLAKE2B 42809d2b2e8eda32c4f703c5e2ec306974beac7541d2222b2296207c06fb502a7f0b99e00e6d9cda66eda800d402c5275a8e3463521c8be84fb11939ab7f80eb SHA512 567159422fed2e727331a858947984f41e533b6609f665f3fc1c230096dc78cc5509ee180ab91f21b29e9784157176a88e4df93b3843604fe6be07de4f405e26
 MISC metadata.xml 433 BLAKE2B eb81b1aba0ed7b5e827682e7db8752b045c0db57c5323b676ac117020a3c7f4b5cfd26801f6a3b9b6ad9c43f525790c646b9cb8bff3a65c2cea23e7560192d5a SHA512 24139a96ed95abd60bea9b882f8aee0166953652a3f187045c9fb691e295b97bc55f00b7911b2bc60c41cf3926c3900654e1ab1e0cc59f0705cea5d75bb0b2c7
diff --git a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-1.4.0.ebuild b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-1.4.0-r1.ebuild
index e71190387be8..d4a92cb85d14 100644
--- a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-1.4.0.ebuild
+++ b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	=media-tv/kodi-17*
 	media-libs/libpng:=
 	sys-libs/zlib
 	media-libs/glu
diff --git a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
index e71190387be8..2945bf22cc7d 100644
--- a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
+++ b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	media-libs/libpng:=
 	sys-libs/zlib
 	media-libs/glu
diff --git a/media-plugins/kodi-vfs-libarchive/Manifest b/media-plugins/kodi-vfs-libarchive/Manifest
index f52890a44fe3..52d6d7ed8fcc 100644
--- a/media-plugins/kodi-vfs-libarchive/Manifest
+++ b/media-plugins/kodi-vfs-libarchive/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-vfs-libarchive-9999.ebuild 853 BLAKE2B 44216ae89246a153e77d9d3815d4f9ec88e45ae1b84a76cb66d435ea88812c788ea56ca851c37e33a110984cb625a0a8d2c073db2c68d1ffc5c1bcbabc39f28e SHA512 5b87ab194a9e5ac6a1c73556bf6b04b20a4e75ad0c284c7d38cbf04eb2016b06e0154a5be2c52ac5b1eb23938405cf53624efa0e64dd0bda96d2fd24bbd9dee6
-MISC metadata.xml 436 BLAKE2B 3581c25f3005590779439674c8ec82c004b6fcabfbe74cd8c7c9a1b365905a95d6aa48e195a2dd2efd18b1e77b298a37c0ab3e3930798890a226cb44b803363f SHA512 625f273f0ea58d64ad2cabca6967cf4916e93b52c9deee04b44e1e5f0a04b15745ccb685ee7591105ab6f17813b2d0cd039d19ff1b91dd5169f2c76916635942
+DIST kodi-vfs-libarchive-1.0.2.tar.gz 21985 BLAKE2B 0d3b8d7405cc7ea1a766a138b4327de295811f248ba50ab085d223406e172607ff08e1cd395b8d421e8f81a7339e9f053a4542567007803ea6285b52907d2264 SHA512 fec6506e4e85da9cde8fb5b800486cd95666bfcf834e4da9331ee67ff35880507175249229504fd3e10d3b3b475ffc8d1bd90d5c5ad0d3457dc5cf01eff36f83
+EBUILD kodi-vfs-libarchive-1.0.2.ebuild 877 BLAKE2B ab0ef79088afd96837f796f1b9ac8bac696aab214fd234b370ad3bbfee4998441e3140622ae683370a1e0086d6db784272e5fb63a4f057d5218d07c73235728e SHA512 e349e72aec6646445782a6b49b8588eaca41d2f9683408835a49e89b17e7f0618126ccf650bdd7a935db2367025e569465f0243e8bf45a31f1040f7d2c076ce1
+EBUILD kodi-vfs-libarchive-9999.ebuild 878 BLAKE2B 37b51c472a676c5daabad879cf891cb4faea77fd5b63fc71e4ab4ebb2c4c70d285647d6d3dde18ccd21c22c061be8b382ee627efb4824746c2b303aacf38e5e7 SHA512 16e19b3f5a283940b11e387e5f17fc12cee32d4214b82de07635783c3b4afd5035e7057bf93c8da2010b03d1cb14595cc175c8139e5a93ca7a12e70e51086d7d
+MISC metadata.xml 432 BLAKE2B 3006fcd638bfffcaa3100d40c3b1ffad2afa58ac1141edc5baa79640a1835db8104753cb64161530396f1d9549726044653ecbef6d4096769751f00dcba8b6c1 SHA512 553da085bf4fcc70c1b4ab666004ce9d0e68ad95b185d78713381392e6c0590f5aa8a23cd8f022e3a12b77cc96ef06ccc54e262233326921ad45a921a32af135
diff --git a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-1.0.2.ebuild b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-1.0.2.ebuild
new file mode 100644
index 000000000000..4b45a0b4c5c7
--- /dev/null
+++ b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-1.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	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-18*
+	"
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 d34a42fb2c29..1c03b73032f0 100644
--- a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
+++ b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Libarchive VFS add-on for Kodi"
-HOMEPAGE="https://github.com/notspiff/vfs.libarchive"
+HOMEPAGE="https://github.com/xbmc/vfs.libarchive"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/vfs.libarchive.git"
+	EGIT_REPO_URI="https://github.com/xbmc/vfs.libarchive.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/vfs.libarchive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/vfs.libarchive-${PV}"
+	SRC_URI="https://github.com/xbmc/vfs.libarchive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.libarchive-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -38,5 +39,5 @@ DEPEND="
 		dev-libs/libressl:0=
 		app-arch/libarchive[libressl]
 	)
-	=media-tv/kodi-9999
+	~media-tv/kodi-9999
 	"
diff --git a/media-plugins/kodi-vfs-libarchive/metadata.xml b/media-plugins/kodi-vfs-libarchive/metadata.xml
index 847da4336b36..c533d11ddd6a 100644
--- a/media-plugins/kodi-vfs-libarchive/metadata.xml
+++ b/media-plugins/kodi-vfs-libarchive/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Libarchive VFS add-on for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/vfs.libarchive</remote-id>
+        <remote-id type="github">xbmc/vfs.libarchive</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-vfs-rar/Manifest b/media-plugins/kodi-vfs-rar/Manifest
index af41f377fd37..9e00eb5082ad 100644
--- a/media-plugins/kodi-vfs-rar/Manifest
+++ b/media-plugins/kodi-vfs-rar/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-vfs-rar-9999.ebuild 629 BLAKE2B e4043a7b0492d01d480b39c0fa3e04b3df86fa22c99e4f126c2be3bdb232de8a4f6e3ab92331fede7782f032f58f35cfaedcf1d40f8d68638ce5f301d9c49887 SHA512 8fa5d8daa536abff9d32ac77db71453f14ad179ec591ea76e22766119460f75e5887f605c93cb63b0700342057ca0e106fbe27355868197d30fe8888df921f35
-MISC metadata.xml 421 BLAKE2B 7052a824fa2e4114c89fcaef6dd9eb535eefbd013b1efa5170113aa84d5003c55ee2c6e6ad20e2b05caef7b3f2f0a24ebcbee5ee19e681525096f5b48e45ccca SHA512 ad4622cfa8b0f3efece524762d2267d25fddee519d87d684a0c4c9ad3ee6eb55f1c6489837d3399d59ed5dd451f6d5bd32f4cb5fc1720c2826c271f336d12d5f
+DIST kodi-vfs-rar-2.0.5.tar.gz 132264 BLAKE2B 1c092fcc45a9b540ab43da9d93028bf3ecca5342fbe99e0380ccf1945be2bbe931e0c93454b69c8091c5919ea52347ab24ee27a72e96e202e6c38775640c016b SHA512 46c17952b1933a5958082ecc6d904b3300acfc6982ef42fd63a15c68ce60c79528a52369fb7e5d0a912cd4346c7701b1aa07dedd882bec618d9e7343ffcbef73
+EBUILD kodi-vfs-rar-2.0.5.ebuild 652 BLAKE2B b36b05c304dd57e616c1f8d30024a34f6eacb9bbebf4f40ff9c8a92f7bffa8f9252e289a1e4d32536ed13c7836be14c14fcae036e469337393b0f6f02edc826c SHA512 923b6dcae197faa632bef703cce6959f10c5480a76bddd3e188667859b4ee265ad3f1fee57ca91b6caeacc08315cb5f1fcf53598d792de46e5d5539d1844c5fa
+EBUILD kodi-vfs-rar-9999.ebuild 654 BLAKE2B 8a5694ad5196e0fa332ad6dec7c3c4aa9566db66b78538ba4ee33ba1695f8e1737200d269368d8dcca1f55d1eecbdc50a3480c788a45472a24351a889157a423 SHA512 181f2742355e8c0c0532d8f6a9fe5a1a47e9305c48768bff2ebc2abf24d83a40e6833f4aa131a72bc847b434be9424435b0faf9191b3ece49b106b0c9093cfc0
+MISC metadata.xml 417 BLAKE2B 848739e38b8064c10732cc179fd55c24c49fa32bd9067706443b0efec47f697a66d330a52733033271638d3b0ba7ef1661f372052bb6dc1a25f5e0dd745f83ed SHA512 70d2ec7f4f00ef2c208db31180e4520f26bd059cd12084e7764297542f75798d2bbe55a3558971fde8709b403968da29011f271bc6f3c4b4a63ae2589c0ae76f
diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.0.5.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.0.5.ebuild
new file mode 100644
index 000000000000..981a91d09b32
--- /dev/null
+++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="RAR VFS addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/vfs.rar"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/vfs.rar.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/vfs.rar/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.rar-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	=media-libs/kodi-platform-18*
+	=media-tv/kodi-18*
+	"
diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
index 35789c57ed64..f64d451adecd 100644
--- a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
+++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="RAR VFS addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/vfs.rar"
+HOMEPAGE="https://github.com/xbmc/vfs.rar"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/vfs.rar.git"
+	EGIT_REPO_URI="https://github.com/xbmc/vfs.rar.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/vfs.rar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/vfs.rar-${PV}"
+	SRC_URI="https://github.com/xbmc/vfs.rar/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.rar-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -28,6 +29,6 @@ IUSE=""
 
 DEPEND="
 	=dev-libs/libplatform-2*
-	=media-libs/kodi-platform-9999
-	=media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
 	"
diff --git a/media-plugins/kodi-vfs-rar/metadata.xml b/media-plugins/kodi-vfs-rar/metadata.xml
index ff4a8e488c6a..3698906773d0 100644
--- a/media-plugins/kodi-vfs-rar/metadata.xml
+++ b/media-plugins/kodi-vfs-rar/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>RAR VFS addon for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/vfs.rar</remote-id>
+        <remote-id type="github">xbmc/vfs.rar</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-vfs-sacd/Manifest b/media-plugins/kodi-vfs-sacd/Manifest
index 9209bef75943..d36ed41c0f8d 100644
--- a/media-plugins/kodi-vfs-sacd/Manifest
+++ b/media-plugins/kodi-vfs-sacd/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-vfs-sacd-9999.ebuild 634 BLAKE2B 58459fc1ea8b97e6ab2a37080594d02df7e1f86ef987c55fc544574da0cc2e8a057fa6196a28cd9eac219c34a07cbf95936ffe5957df6d090af56e8f23a5e703 SHA512 c9a832fb91aee1f17b51af3d3622aa19de2e018d7d9cdbcd5d54548af541a65a224f7b1667d60bf662ea4a2ecea1527385af25b7deb3b31fcd621c817a0fe760
-MISC metadata.xml 423 BLAKE2B 47a55aef30c61a545d8a7b60b3be8d0ec5067461cefa6183a028a6dcb2b366fe9e279a6abd1e184cd9165bf377427569ec2f40748c80be1c10f67205670ecf03 SHA512 f1d5951a35cb376fb6be52352b186f46e2f0b5bbaed86e21d267ee5b4cf9d46af9144b93fd71049aef9ac5ff252340930ad8cc210c279ebd6114d400861d4602
+EBUILD kodi-vfs-sacd-9999.ebuild 619 BLAKE2B 21533067c84024081864be400b104ad63667110e52bf04c2d41edc3af4b850b75520d7ea5df1d95e7d5c269a50e02bf848f148623c6d581aa6d53d7ee67ef5fb SHA512 b542ff2148ffc439b8eb35e9e070598789a96959f1b3ed3e2868b2ca31bd360b0da7ff3aefcaa2ead1e1a94d348a5d255006b52b080c635bd50f76b06a8ae31a
+MISC metadata.xml 419 BLAKE2B 18019581cc35ab24aed35e146674d26ab57c18ad0d0468954f8dff16c2bff757d9a7acf718e5655fa96e02be9fd1a05d8f87f3c46b83fe09692b6f71677d89d4 SHA512 931961ed7c4a909bd1f15c7e02a3a37e7815b9ff293708aab813eaecca25ab38b8fc98872295b8dc6d46029d570dd238d68259f57504cba67601099f3f30dd55
diff --git a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
index e2af235a8561..5c8b40fee8b3 100644
--- a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
+++ b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,18 +6,18 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="SACD VFS addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/vfs.sacd"
+HOMEPAGE="https://github.com/xbmc/vfs.sacd"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/vfs.sacd.git"
+	EGIT_REPO_URI="https://github.com/xbmc/vfs.sacd.git"
 	inherit git-r3
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/vfs.sacd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xbmc/vfs.sacd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/vfs.sacd-${PV}"
 	;;
 esac
@@ -28,6 +28,6 @@ IUSE=""
 
 DEPEND="
 	=dev-libs/libplatform-2*
-	=media-libs/kodi-platform-9999
-	=media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
 	"
diff --git a/media-plugins/kodi-vfs-sacd/metadata.xml b/media-plugins/kodi-vfs-sacd/metadata.xml
index 7b93c006e4c0..d63999fc9119 100644
--- a/media-plugins/kodi-vfs-sacd/metadata.xml
+++ b/media-plugins/kodi-vfs-sacd/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>SACD VFS addon for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/vfs.sacd</remote-id>
+        <remote-id type="github">xbmc/vfs.sacd</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-vfs-sftp/Manifest b/media-plugins/kodi-vfs-sftp/Manifest
index d7f4ee0c8003..45c5fa3744bd 100644
--- a/media-plugins/kodi-vfs-sftp/Manifest
+++ b/media-plugins/kodi-vfs-sftp/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-vfs-sftp-9999.ebuild 655 BLAKE2B 1283513efd764f8f156a3844e671fcadca2eee7617f5c26d26757c518d7cf6f0e439f7ee9158f36ad126829003ae774a873490d92847f9f4cd07d122d94a7da3 SHA512 a437e72d09a002eb76265bb33202b9ee5e535cb031ab5ce0d12142d9d5b271dbd3f9c377e9b8a1aa397f8c907458d808f62e261d65553fc52b80e13c4ad1a3f5
-MISC metadata.xml 423 BLAKE2B cea671f9ea0e83d0325844036e298e0b5c5be177e4587936ac60cb430e059421a8ea71591e6d317649f671b750b1cceae395e6d5826d88c5b8f927d11a7a9ce4 SHA512 8348a66a9935b9e82c1e00db179df2e4fd41d0ed66ba31ea3da33b6a8cb2e230e198c76f5ac609a44417d22d0ea19956dcc2b67f78533f223d14b63bc02ebc5b
+DIST kodi-vfs-sftp-1.0.1.tar.gz 20059 BLAKE2B 3ff2178738dbb85de731d5268d80cad079f684234ff39ca1141337c384377ca75dd5ad51026471af4e8a1229c6739fa9212b6fd6253cad9be6d9b19a7dc7081a SHA512 e51aeae2bf6e611e679b38401add778fc5605ededb8b8b9d2f6732eda4b87fdee5ea352d2c491cf1ff671c0299395de1cc689404e2924266ffef84c4e7cc71c3
+EBUILD kodi-vfs-sftp-1.0.1.ebuild 678 BLAKE2B 629a085af07b523d098035fc5344b6956e8876f271a2b33e58b7d7bb5e4bfafbcd94d8932cc4ae4a11440189dd92c52bad52e2a956e609fa3559721fd120e2c9 SHA512 c6d4b2b2d7226736e98b155a5c8e1875aa9bff8fe3daf3a1749d795d4a0cb4e404ddb5640aaf772ad84da745bfefd312464d42fc50a72679a5b86aee60e0774b
+EBUILD kodi-vfs-sftp-9999.ebuild 682 BLAKE2B 1a7ba9b858a0d09d940f17bc8d0b2c2df25efcbeea1fa27c31af0395510f058105574d8391cd6701fd8c53eda8ef34e135137785cefd9f7fcfa9b7c185c4219d SHA512 0699f0e74fc860d1f2868e86d2606acd829a0d136e7c9cdf88facb66cac229976ab27d8aeb66a4b8d196c48052f7bb48b922da476c94fd837f22659d535d26d9
+MISC metadata.xml 419 BLAKE2B 7167e481bfec9e94de9e9bdb25f4a5d3d77596a73e3cabeafa265322f0da3043de844f2db94c8767e3b5657c37ba1e77643acac9970f509fe956399ccadb1e36 SHA512 31d530be90d385a7d6756296909e5dd5454a2efc2a83d83c47cff14fc2260c1bc772bc23b95fd6bcb91511c0be21d9297074367aa445642ae477623f8f545a21
diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.1.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.1.ebuild
new file mode 100644
index 000000000000..439c41cf4706
--- /dev/null
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="SFTP VFS addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/vfs.sftp"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/xbmc/vfs.sftp.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/vfs.sftp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.sftp-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	net-libs/libssh[sftp]
+	=media-libs/kodi-platform-18*
+	=media-tv/kodi-18*
+	"
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 b84c71c0291f..4bb7e369a978 100644
--- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="SFTP VFS addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/vfs.sftp"
+HOMEPAGE="https://github.com/xbmc/vfs.sftp"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="git://github.com/notspiff/vfs.sftp.git"
+	EGIT_REPO_URI="https://github.com/xbmc/vfs.sftp.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/vfs.sftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/vfs.sftp-${PV}"
+	SRC_URI="https://github.com/xbmc/vfs.sftp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.sftp-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -29,6 +30,6 @@ IUSE=""
 DEPEND="
 	=dev-libs/libplatform-2*
 	net-libs/libssh[sftp]
-	=media-libs/kodi-platform-9999
-	=media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
 	"
diff --git a/media-plugins/kodi-vfs-sftp/metadata.xml b/media-plugins/kodi-vfs-sftp/metadata.xml
index 43113e6d73dc..0c6ebd5ac048 100644
--- a/media-plugins/kodi-vfs-sftp/metadata.xml
+++ b/media-plugins/kodi-vfs-sftp/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>SFTP VFS addon for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/vfs.sftp</remote-id>
+        <remote-id type="github">xbmc/vfs.sftp</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-visualization-goom/Manifest b/media-plugins/kodi-visualization-goom/Manifest
index 217c235935ab..0ae68d735b07 100644
--- a/media-plugins/kodi-visualization-goom/Manifest
+++ b/media-plugins/kodi-visualization-goom/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-visualization-goom-1.1.0.tar.gz 493839 BLAKE2B 97e99f0f8bc657b5f92464bd80c591de48c48839982005e5996ea949e6e6a4db24de0c31ed010becad29da8f4eb5d9b579006b2a4c28ee567f094460cc4aa063 SHA512 d0e7ab3931ad32f16f4b97f3746e2e5ec9ed08ba23184ac880ab4da1c0da16511c6a9e1ea595ccbbac3c7c8f385fa5dced1e554d0a1a8122db4f35223eb66ace
-EBUILD kodi-visualization-goom-1.1.0.ebuild 652 BLAKE2B b92d42815585f54af113eab340d6dab9987ad943df550a5563a9ac0fb1dabd4bc0decae681553225c1aed8e920e7d5bc651382b83ce0a8c71d3e6846b25d27de SHA512 8e1387bfbd8083d44aec6471a5e2adce9ea997b47472adc2066e77098354619b13998f27f2e3e4e469adc318907de2299c6a3508f29096b6e7820491ccdef8a5
-EBUILD kodi-visualization-goom-9999.ebuild 652 BLAKE2B b92d42815585f54af113eab340d6dab9987ad943df550a5563a9ac0fb1dabd4bc0decae681553225c1aed8e920e7d5bc651382b83ce0a8c71d3e6846b25d27de SHA512 8e1387bfbd8083d44aec6471a5e2adce9ea997b47472adc2066e77098354619b13998f27f2e3e4e469adc318907de2299c6a3508f29096b6e7820491ccdef8a5
+EBUILD kodi-visualization-goom-1.1.0-r1.ebuild 654 BLAKE2B c3ad3c7d1e9c3f62d92177401ebb1911fcc12ef0c61cc2275565c7da2167ead0a7c7f155db60ff285a83be910f01c4e6f072202bba9d03b59a29a693d8237cf8 SHA512 73fb6db3760dc2325f26425be499bf004402cd84a9e5e75b2e9083851f889f4b09af19d1a826df950326561abf34d630d2165c34979e67940afa841740faefe7
+EBUILD kodi-visualization-goom-9999.ebuild 655 BLAKE2B b5dde5a0b1eb8c109fb24347f7aeff0e42aff6a5b0e7af262826c6afe5a8a72b9891912f4468b9528584ca708c1fe67f5f0aaa0dc549c09b1a2ba45bb29b502b SHA512 f87123ec302d660acea6508a5e826139b8d95e089e34359542b4b4de3a0dcd2cc8f0196453365bb7232d68bd5ac769bf5f451fec70e97af931bc7b10a59fffba
 MISC metadata.xml 434 BLAKE2B 14ffadbe7c568eb11922b64df1f82c0404092fc971b8e8181955fc21989c70d3c2198a4beb7ab426cf6cf2356d2bd89d71e3ed7155ba35fb647303b231d45a26 SHA512 614347e4b283abd727a963d2b276fc6e0e1477ba1e5571957b123670be073a50e14e4c0460aba90b5f01380fd40f8f1e334b2b6a9409e038b3c9dd79ee2fc15c
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-1.1.0.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-1.1.0-r1.ebuild
index eb3bb95da398..15d76968e81f 100644
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-1.1.0.ebuild
+++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	=media-tv/kodi-17*
 	virtual/opengl
 	"
 
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 eb3bb95da398..9e658ae6affc 100644
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
+++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	virtual/opengl
 	"
 
diff --git a/media-plugins/kodi-visualization-projectm/Manifest b/media-plugins/kodi-visualization-projectm/Manifest
index ca951f427c50..5fc85caa47b8 100644
--- a/media-plugins/kodi-visualization-projectm/Manifest
+++ b/media-plugins/kodi-visualization-projectm/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-visualization-projectm-1.2.0.tar.gz 450058 BLAKE2B cd612cf2680bd5d1ef13bba41e9bcd20245ed40b0fbf4396259ad850232a4fed739f99738b118e6603512b155e73d487e94ff4f0077bdb22d8604a151d221b7d SHA512 9ad106cb97ac9c626908988a5c9cf7a9b18b23585f7c905cb8298a93afaf1e735eb3b582152e30e4e5bdd83625608228a9abaf233c8bbb765b7031c4a2d5a44e
 DIST kodi-visualization-projectm-1.2.1.tar.gz 450055 BLAKE2B 36be46629f927f4e9555f4e76521c2d55a2603f438b0dc5b9f4e83ea95a5b6b27ad20c02f211fa38298f08cd789bd5c4edd14215066575dd5e41d5cab603c2c6 SHA512 37091b7656c791434c80572d57424bfc7161c0f2b752adffc2c4d837c93d733e104f7b68893544f3efc32c67e607882063c34ecae240754b1c71856d83ba4c2e
+DIST kodi-visualization-projectm-2.1.0.tar.gz 2479742 BLAKE2B e0fc2953ef1d242aa89d3e0afe7804b22460c70a2f98758bd252fa6aa1978001b60cc167878e725f09e2e38e0ebf2c013b3edad88ca015e54148da73a0fceb51 SHA512 74924f524d8e4d5c108cf23ae52d034404db9d1d5f63866cda920f552de93f524c6bd7eaff894295c2dae779be11dc17808540f22ad5f2536ec90166d2a95cec
 EBUILD kodi-visualization-projectm-1.2.0.ebuild 732 BLAKE2B 8fe53b114aa9adc38334c521e1592b50fff5473ed2b48a79cd9b06873fc59b5b4fd9322b35622d94c2ca057f1db0f4e2be62c8043fc9bdedbb822ab5d76dd253 SHA512 66ed3a37a1b0caeee1704afa91f075af8a7dc6536c56da12e38c9e4e3ca510848f9a235a97d4e10e7dc46a2838a6a578863fdf87cab1ae3bd2ac78bc56578b5c
 EBUILD kodi-visualization-projectm-1.2.1.ebuild 732 BLAKE2B 8fe53b114aa9adc38334c521e1592b50fff5473ed2b48a79cd9b06873fc59b5b4fd9322b35622d94c2ca057f1db0f4e2be62c8043fc9bdedbb822ab5d76dd253 SHA512 66ed3a37a1b0caeee1704afa91f075af8a7dc6536c56da12e38c9e4e3ca510848f9a235a97d4e10e7dc46a2838a6a578863fdf87cab1ae3bd2ac78bc56578b5c
-EBUILD kodi-visualization-projectm-9999.ebuild 734 BLAKE2B f4c7fa789f922237c0662fed0299e057b61ef117f0b28aa571836f884c75711742345b75dc0a69a13e9bdeaa796a7d3d89ca724c8cad08f053eff69c17f58555 SHA512 126ec30d61fd6eb656ee26f2532c42be01e8b6851659a2e5a47fd48c4bfdc3afeadd792916df1f4200692eba4d1a7c4dd30758de763d88df8a8c53da6bd07f46
-MISC metadata.xml 442 BLAKE2B f94c2415b2e0ebd1a9a0b9c8ca40dd15be9026bcf84b27866771e99f1be749efe12ca41799ac09c94fedecad4e441c7c1ac4b8c25a412016b4ca1bc01dc69995 SHA512 8da50a72485eaa2797b57c26d60ac28e94637c7c9b7ea6ada94b18d79e5aac91735f56001a637497ee65cace1ccbd3405d2219395af990215e7de7af5b40e9eb
+EBUILD kodi-visualization-projectm-2.1.0.ebuild 814 BLAKE2B fd77790e57dab6507fdcc83c2029a7e56e548349c5616927ea874eaf595aeeed965ca748828e23fc3a464a56ed46f500c0056c30316332f4623d3c8a0f1c6d78 SHA512 f10a72588fa5c93ededd7361a0648d83464eea10dcdcb4582360eac559716b510a2905b11626046bdbad38dd47975e4eb9c535ce80238b79526a7974925a913c
+EBUILD kodi-visualization-projectm-9999.ebuild 816 BLAKE2B 44b79eb51e5c066cd454163d76f49b09c214c89b744d71e5401a6598414ecd6b21b04bd149953e8a9c707cac397975aac8cb86e04530b3e9b673226cc46196cf SHA512 1e69d9bfac921de937b912441681af7d31ef977702e340970859d274fd66a2cf3631023f8812d739983a65852f244c636adda7fa9c9e170085a2cc9109b5c40f
+MISC metadata.xml 438 BLAKE2B 7869da7be1eac18bc4e35672134270f92ae7dc4178edc4b62399dac713fe14eb83fecbb14d8712677d802742eed9d34df1f0eda581117dc0649a929a903ba823 SHA512 2e7259aa9e981c4a6a72e3f055e1475bb140e07785976fa586d8ebef2fe6013fb373cacee9500320cdf0a4cae56486555612ed2d9109415cf9016359b9cdba0a
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.1.0.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.1.0.ebuild
new file mode 100644
index 000000000000..5a709a924c55
--- /dev/null
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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"
+	SRC_URI="https://github.com/xbmc/visualization.projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.projectm-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	>=media-libs/libprojectm-3.1.0
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	# Delete bundled libprojectM
+	rm src/libprojectM -rf || die
+	default
+}
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 fbfcbfb612a2..f19d564570c0 100644
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,18 +6,18 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="ProjectM visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.projectm"
+HOMEPAGE="https://github.com/xbmc/visualization.projectm"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.projectm.git"
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.projectm.git"
 	inherit git-r3
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xbmc/visualization.projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/visualization.projectm-${PV}"
 	;;
 esac
@@ -27,12 +27,18 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999
-	=media-libs/kodi-platform-9999
-	media-libs/libprojectm
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
+	>=media-libs/libprojectm-3.1.0
 	virtual/opengl
 	"
 
 RDEPEND="
 	${DEPEND}
 	"
+
+src_prepare() {
+	# Delete bundled libprojectM
+	rm src/libprojectM -rf || die
+	default
+}
diff --git a/media-plugins/kodi-visualization-projectm/metadata.xml b/media-plugins/kodi-visualization-projectm/metadata.xml
index e72551f7ee08..516b635d6bbb 100644
--- a/media-plugins/kodi-visualization-projectm/metadata.xml
+++ b/media-plugins/kodi-visualization-projectm/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>ProjectM visualizer for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/visualization.projectm</remote-id>
+        <remote-id type="github">xbmc/visualization.projectm</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-visualization-shadertoy/Manifest b/media-plugins/kodi-visualization-shadertoy/Manifest
index 567b0f7e63c1..6c2c6c419f92 100644
--- a/media-plugins/kodi-visualization-shadertoy/Manifest
+++ b/media-plugins/kodi-visualization-shadertoy/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-visualization-shadertoy-1.1.5.tar.gz 11826868 BLAKE2B a18512c811e1412d63d4cfcd97804eaf90047603de592ed21fe2b1c24b77a21a3f9e859d86ab23f8f59ba3eacfa40f3028f5848c8b6d6f7e8acde19c1522e640 SHA512 557cc9567707ab53c63537f760b552c4129f45a4c99346acf9d00f8fea5249af1a8af9ea6fc8587e7ab6e24c8a686356e5bacf0a2cb34dcc8b38059c36127e43
+DIST kodi-visualization-shadertoy-1.1.8.tar.gz 11825753 BLAKE2B 1ab30e261d9e48806d7b6629b5aac687831f735b05d1cc48d6bacf146fe2f3e2d75758c490c474838e9d861f2bc1776d0fc9cee00d6dca9d5e87ec874dbd02fd SHA512 5cee18db177c0cc61bc46a4d457b559bd1a023d3ff51261eee8d4c4828df77571beda12dd726f30554bd16c7ad67e12d836c5a211a3d55321d92551eb337ddc6
 EBUILD kodi-visualization-shadertoy-1.1.5.ebuild 703 BLAKE2B 8db9e065d98d01ea38a745e032590053081479d13fe8f2031403ec2576326ecf6fe11dc182b157a8b87939ad2cf754a9d97132081f7e3ba3a61d663b02f05e78 SHA512 e6616a30af82973f51dbdaa0ef2897a8983a572d3a7456a2eb1da6f6f126a88579aa9bfe703c07e100515f5635b6ae1fc7de09fbd25057e128cd8a75280d7cce
-EBUILD kodi-visualization-shadertoy-9999.ebuild 703 BLAKE2B 8db9e065d98d01ea38a745e032590053081479d13fe8f2031403ec2576326ecf6fe11dc182b157a8b87939ad2cf754a9d97132081f7e3ba3a61d663b02f05e78 SHA512 e6616a30af82973f51dbdaa0ef2897a8983a572d3a7456a2eb1da6f6f126a88579aa9bfe703c07e100515f5635b6ae1fc7de09fbd25057e128cd8a75280d7cce
-MISC metadata.xml 444 BLAKE2B 161dfa76e0a2ecb1fc5ddb66c1732b5fbe870251560ee4fd36c93a0b18b280c37804192e2f58c01acf810b82f001101121706c7ac067cdd097c6854d8be9accd SHA512 fd48ce690812e3f9fa01c719f067e48297d399936119e86fc303fd73cdf49c40548122e4d66ad29c06715c4cc7fb555b827a761d1625d62e84b24f02454112ec
+EBUILD kodi-visualization-shadertoy-1.1.8.ebuild 733 BLAKE2B c29892cccfc9bbbfb6169ec53187408ae0885a7ffa1236e784885098ff931987ef3aec40855831b69e657507bcdcc4b374b6af415482b33034318e2b6ba9cfca SHA512 4b1ea57c7a6fe31fbbb3e7da47d2469e3c8e9d521119d8eee4384d49fdd57dc242ce180a012a1d4ebdcac551c1bb6015b9fc41a6a71eebe07c712cc1ad5cfa9d
+EBUILD kodi-visualization-shadertoy-9999.ebuild 734 BLAKE2B ee341b0ff6825f7f034d0c62eeaf4c8abf2305f269b5fabb19bc0882b8df8e6a99161b438923237177025c5c0c27c9b8209ac685ce7aea22af296825202cc366 SHA512 eacd80122b385da5b1744415128dc1b83e06886565a5f902464f381142bbdb8424465e70f1dcaa7a2979a322c22df2a298c154b57a0e1180887f6f12d1aa8a49
+MISC metadata.xml 440 BLAKE2B 8ca7ad0546c9c0590eff12d403b863109b99964ac6d5a9f73d05253ed65719f53ff8a043f1ef1a2f3ce4fb7a06d0e2ad3a5586c49308f22ab7e9690979d88050 SHA512 76e524e7318f8137a70002b265388a1cd107c8e970688ad5616b8895d38108760a06fa3a4e00abe46463ce7d346ef19756237eadb677c4ace52b44bff8a81f17
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.1.8.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.1.8.ebuild
new file mode 100644
index 000000000000..0a4999641de8
--- /dev/null
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.1.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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="Leia"
+	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="
+	=dev-libs/libplatform-2*
+	=media-tv/kodi-18*
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 cfc3de7a808e..a3666ad91cb2 100644
--- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Shadertoy visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.shadertoy"
+HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.shadertoy.git"
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.shadertoy.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.shadertoy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.shadertoy-${PV}"
+	SRC_URI="https://github.com/xbmc/visualization.shadertoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.shadertoy-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -28,7 +29,7 @@ IUSE=""
 
 DEPEND="
 	=dev-libs/libplatform-2*
-	media-tv/kodi
+	~media-tv/kodi-9999
 	virtual/opengl
 	"
 
diff --git a/media-plugins/kodi-visualization-shadertoy/metadata.xml b/media-plugins/kodi-visualization-shadertoy/metadata.xml
index 6031ec950cc5..5bb7e29b7f33 100644
--- a/media-plugins/kodi-visualization-shadertoy/metadata.xml
+++ b/media-plugins/kodi-visualization-shadertoy/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Shadertoy visualizer for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/visualization.shadertoy</remote-id>
+        <remote-id type="github">xbmc/visualization.shadertoy</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-visualization-spectrum/Manifest b/media-plugins/kodi-visualization-spectrum/Manifest
index a577fc5d5ab5..e545c7c34407 100644
--- a/media-plugins/kodi-visualization-spectrum/Manifest
+++ b/media-plugins/kodi-visualization-spectrum/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-visualization-spectrum-1.1.1.tar.gz 52357 BLAKE2B 25d19590b48173e59d8660d690dc33daa363148df6c4a67e9aca29392242f1ba9e41210030b72e8aa1198da778f11b36c93f052bd79315c6c58504f33784f9fc SHA512 7288f6d383a34415cb147c5263a20d79a4ee399ef85bdef86f115667967d4a71340dce911f8e7f3ff34a9dd58cd3784b5f97595231c5df6df3e813f16d09258c
+DIST kodi-visualization-spectrum-2.0.3.tar.gz 3087756 BLAKE2B e25161c72a5c093d15feafda831974030b91bd19d787f27cd8913c060d23993822160b00264d435699173ce0e7e7369fe848fcd5d5a31d234454bd705cedfa99 SHA512 ed4a67a9bd1b02bb5d33791bf1953075d993075ec473ac858e9154c867b51ed2ffc8edbffe49344193a28964a48ad945d5376f23fc983ba2d8f1247d26ef298e
 EBUILD kodi-visualization-spectrum-1.1.1.ebuild 672 BLAKE2B 81047ebd915b86eb518afa2459cc2f1203e94e4df524bae8adf1033698e14cc893db3b4d2bb3fa4aebec20268b128844ce475595a12b98c73a897fbfdeaacd8b SHA512 adc631d17f89638df6548fe27cbef9acbe1e1753bed353bc1cbcdbe2a376688260bfa9bdc80c9fab1e991304a2fc9e2ee54bb70f4c36fff122ec605822f83562
-EBUILD kodi-visualization-spectrum-9999.ebuild 672 BLAKE2B 81047ebd915b86eb518afa2459cc2f1203e94e4df524bae8adf1033698e14cc893db3b4d2bb3fa4aebec20268b128844ce475595a12b98c73a897fbfdeaacd8b SHA512 adc631d17f89638df6548fe27cbef9acbe1e1753bed353bc1cbcdbe2a376688260bfa9bdc80c9fab1e991304a2fc9e2ee54bb70f4c36fff122ec605822f83562
-MISC metadata.xml 442 BLAKE2B 9e17199a1d93bde10bbeda486af0ca21572bbaa7b55abfd1e03b3e14785298dfd89a52bb9b06dc2041b274adfa4d7245e2b9fb0c094afa0cc67f7ecf6870e6fb SHA512 8887efa27fd4c9b3f1d371d480a18f909d670f6e1c1d713cd85a4370cacced1a054575b0513d99ad5e5ee27807654b9f6f2d03220ed9c70bb24cb9e518971c60
+EBUILD kodi-visualization-spectrum-2.0.3.ebuild 662 BLAKE2B 87d284e6e59f235cda37e1b339dc8d1332f32d4e597ef4c9a540bf27e2b65110c6224660fe5e3908d3c9852932544ddcf661fe4c23d668ad6fd28a1eead91a1e SHA512 6b4eed836e15512d719153450f5b4fd73c31b2cedcba9e4d1377ee122abb7d5d273d289dc4565c28eb341610b6d49910e4ab20ac667f359cf8bd818ae3810211
+EBUILD kodi-visualization-spectrum-9999.ebuild 663 BLAKE2B eb29e59266ba10baf0fe6a9e89ae2706e4bfa75a0ded5612aabd2393a1de84c1c229dbb9af73289ec354cba23c0c85a89a4f706eb4086d7dd5182eb3a41c5460 SHA512 df157089d2342a1c24d310cd34105e89625b971d56b51c69ccaef65c05cab4ef6e493ca53401204f265e442e3724ba53039d4cb2ceb5b5c0523551e782adf656
+MISC metadata.xml 438 BLAKE2B 8662b3f30cdc08223e10e8fc8515a3afb59e199f33e645f1dd011465f2d0b02201f2b64e5aa0c269cde77f20e3ca091d4e72afd817985198da5e3bd8c0f054da SHA512 8d683f5aa11f95edbf8a91e43c85c1882e19400dc55a79116ce9527f9f89ea552da28ccf65ea9aec8a5b166d18638c01def152dcee57fb054575cc636c0f0a0a
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-2.0.3.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-2.0.3.ebuild
new file mode 100644
index 000000000000..b8ab2120a4bf
--- /dev/null
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-2.0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Spectrum visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.spectrum.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/visualization.spectrum/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.spectrum-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 6f6d23709086..dda12b97c730 100644
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,18 +6,18 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Spectrum visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.spectrum"
+HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.spectrum.git"
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.spectrum.git"
 	inherit git-r3
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.spectrum/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xbmc/visualization.spectrum/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/visualization.spectrum-${PV}"
 	;;
 esac
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	virtual/opengl
 	"
 
diff --git a/media-plugins/kodi-visualization-spectrum/metadata.xml b/media-plugins/kodi-visualization-spectrum/metadata.xml
index 924fb345441f..673ffc320649 100644
--- a/media-plugins/kodi-visualization-spectrum/metadata.xml
+++ b/media-plugins/kodi-visualization-spectrum/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Spectrum visualizer for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/visualization.spectrum</remote-id>
+        <remote-id type="github">xbmc/visualization.spectrum</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-visualization-waveform/Manifest b/media-plugins/kodi-visualization-waveform/Manifest
index e487d3e72389..487a9b0e334c 100644
--- a/media-plugins/kodi-visualization-waveform/Manifest
+++ b/media-plugins/kodi-visualization-waveform/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-visualization-waveform-1.1.0.tar.gz 42636 BLAKE2B 82a77554c57de7348823fce645fa6bc16bec384c345619997a24c93088b81b5703e20da4cfc3626eb651fe8403564d6aca23861a55adf2e84ba9a82ac5e1d536 SHA512 243696af3388506a52c46c8e636f5cbe973c916e1b03f24ad58327642721cf1a492fb16a7a0e69cd80732b8b435b009862dffca78dc8974f86cbb092a6aff195
+DIST kodi-visualization-waveform-2.0.1.tar.gz 43929 BLAKE2B 5ef24c80ca035ffe92e9c96b8d5a509bca7ce68679bc3e723fcd76b6a5eea70702caa6a8b802b26058131993d8b7f42e41a2cb43073ba2fff65356cdf5e333f3 SHA512 3ba3a3b92d7bbe5e82374daf92fe1054ee80fc316e8b63d0543248406ab7c341831f085f50221aa0bf9ea534c2eb37221c8c165aa553b8c8dbe5cae1b58c3229
 EBUILD kodi-visualization-waveform-1.1.0.ebuild 672 BLAKE2B 7e47626837ca4f65168a827c2c8d704944c19af5ed8fa24aa8b6b4833a6098c849152dc1eabafc0b1d573ddb5a3de592780e54cba120c37b8a56b75834bb7b20 SHA512 17c082490e34303abb5dec89300ec926a364ec057efff76044628a03b262228e2b37f426ea879423c70f5e8a1547089ffded1734372f9b9552e1792197b94efb
-EBUILD kodi-visualization-waveform-9999.ebuild 672 BLAKE2B 7e47626837ca4f65168a827c2c8d704944c19af5ed8fa24aa8b6b4833a6098c849152dc1eabafc0b1d573ddb5a3de592780e54cba120c37b8a56b75834bb7b20 SHA512 17c082490e34303abb5dec89300ec926a364ec057efff76044628a03b262228e2b37f426ea879423c70f5e8a1547089ffded1734372f9b9552e1792197b94efb
-MISC metadata.xml 442 BLAKE2B ff7e6d45b80d4c25bc7c932126feff7750e73e5fad5ea42a12c6094b3457550c74f139580f80d4cf773a366be899e6244289a57256c6d578e1f3dbad262cbf0f SHA512 db3d8281ce7009ffd837deb9688bcff3f9b5c3dd62ccc39f967c7608de237b36a8c5a7c88c9d2214411d3773972d65213a1b413b7ad31dad4e7908aa0706fe42
+EBUILD kodi-visualization-waveform-2.0.1.ebuild 702 BLAKE2B f6fc517ed61febf3197a735e36d0e31b27de4b9ebdde134c59350ef35b71bf7d6dc5d419dcfa597562ccb084f81c8ffe5c1da14fabddb478bed780f2d122dd09 SHA512 9789f3388ecb56378b1a8ce097b06d30c2bca2bb5aff926b127e3935b5c9fd52283a658a4b87213ce57958fa4f4df43ce0b1004418539441f5f206f12cdf5ddd
+EBUILD kodi-visualization-waveform-9999.ebuild 703 BLAKE2B 6533a4bbca2c9b792c8b3770579eebfb95a6802992617e05ab65d33e69da92d8ce942ac070b341289fc5bd7108b4de594ff3b6dbfd36cf269c8c56366329f5f4 SHA512 eb086c9db9eaefc78a30cab4d7b7382dc0f4db0b5efc5863c199c93f034af1a1d0125f5090dd1bac62afb0542d271b06804ad7cde656a80e6d2f6f04ca819530
+MISC metadata.xml 438 BLAKE2B 223c9bc0d06814774f32141ee66b19a512091bbcd1658eacb1a1ecdeaeb2c450ddaaa301f2e6914abaa98d34dfbb456c5bf5a94ac9fadfbf84e75421d6233b45 SHA512 7bb4e6ec9690bfe2742cfe205f1e88db4f51f67bc05ee918ca9e181fb707fae8e75887bea9128a3b2d1e8c6cdf5613599b912816bd9b5093877d311bfec8f851
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-2.0.1.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-2.0.1.ebuild
new file mode 100644
index 000000000000..6e0e2e772235
--- /dev/null
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Waveform visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.waveform"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.waveform.git"
+	inherit git-r3
+	;;
+*)
+	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}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
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 494532324f6a..745379d28395 100644
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Waveform visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.waveform"
+HOMEPAGE="https://github.com/xbmc/visualization.waveform"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.waveform.git"
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.waveform.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.waveform/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.waveform-${PV}"
+	SRC_URI="https://github.com/xbmc/visualization.waveform/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.waveform-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,7 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	virtual/opengl
 	"
 
diff --git a/media-plugins/kodi-visualization-waveform/metadata.xml b/media-plugins/kodi-visualization-waveform/metadata.xml
index 41ed7783d56a..039bae438254 100644
--- a/media-plugins/kodi-visualization-waveform/metadata.xml
+++ b/media-plugins/kodi-visualization-waveform/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Waveform visualizer for Kodi</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/visualization.waveform</remote-id>
+        <remote-id type="github">xbmc/visualization.waveform</remote-id>
     </upstream>
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
commit	536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree	697733f5cb713908dcf378e13fd15a798a906a91 /media-plugins
parent	f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)